From c3f3d41a26134c57e65bda0423583c95eea1c31f Mon Sep 17 00:00:00 2001
From: Christophe Battarel <christophe@altairis.fr>
Date: Tue, 3 Aug 2021 09:38:48 +0200
Subject: [PATCH 001/974]  NEW constant PROPAL_CLOSE_AS_SIGNED

---
 htdocs/comm/propal/card.php | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/htdocs/comm/propal/card.php b/htdocs/comm/propal/card.php
index 3c0d8dd9a28..0394df8f797 100644
--- a/htdocs/comm/propal/card.php
+++ b/htdocs/comm/propal/card.php
@@ -1913,10 +1913,11 @@ if ($action == 'create') {
 
 	if ($action == 'closeas') {
 		//Form to close proposal (signed or not)
-		$formquestion = array(
-			array('type' => 'select', 'name' => 'statut', 'label' => '<span class="fieldrequired">'.$langs->trans("CloseAs").'</span>', 'values' => array($object::STATUS_SIGNED => $object->LibStatut($object::STATUS_SIGNED), $object::STATUS_NOTSIGNED => $object->LibStatut($object::STATUS_NOTSIGNED))),
-			array('type' => 'text', 'name' => 'note_private', 'label' => $langs->trans("Note"), 'value' => '')				// Field to complete private note (not replace)
-		);
+		$formquestion = array();
+		if (empty($conf->global->PROPAL_CLOSE_AS_SIGNED)) {
+			$formquestion[] = array('type' => 'select', 'name' => 'statut', 'label' => '<span class="fieldrequired">'.$langs->trans("CloseAs").'</span>', 'values' => array($object::STATUS_SIGNED => $object->LibStatut($object::STATUS_SIGNED), $object::STATUS_NOTSIGNED => $object->LibStatut($object::STATUS_NOTSIGNED)));
+		}
+		$formquestion[] = array('type' => 'text', 'name' => 'note_private', 'label' => $langs->trans("Note"), 'value' => '');				// Field to complete private note (not replace)
 
 		if (!empty($conf->notification->enabled)) {
 			require_once DOL_DOCUMENT_ROOT.'/core/class/notify.class.php';
@@ -1926,7 +1927,11 @@ if ($action == 'create') {
 			));
 		}
 
-		$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('SetAcceptedRefused'), $text, 'confirm_closeas', $formquestion, '', 1, 250);
+		if (empty($conf->global->PROPAL_CLOSE_AS_SIGNED)) {
+			$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('SetAcceptedRefused'), $text, 'confirm_closeas', $formquestion, '', 1, 250);
+		} else {
+			$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"] . '?statut=3&id=' . $object->id, $langs->trans('Close'), $text, 'confirm_closeas', $formquestion, '', 1, 250);
+		}
 	} elseif ($action == 'delete') {
 		// Confirm delete
 		$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('DeleteProp'), $langs->trans('ConfirmDeleteProp', $object->ref), 'confirm_delete', '', 0, 1);

From 57729dfc839d8bdff87391e7d38a8251ee2797ab Mon Sep 17 00:00:00 2001
From: Christophe Battarel <christophe@altairis.fr>
Date: Tue, 3 Aug 2021 09:44:42 +0200
Subject: [PATCH 002/974]  NEW constant PROPAL_CLOSE_AS_SIGNED

---
 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 0394df8f797..f232a5bd9c5 100644
--- a/htdocs/comm/propal/card.php
+++ b/htdocs/comm/propal/card.php
@@ -1929,7 +1929,7 @@ if ($action == 'create') {
 
 		if (empty($conf->global->PROPAL_CLOSE_AS_SIGNED)) {
 			$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('SetAcceptedRefused'), $text, 'confirm_closeas', $formquestion, '', 1, 250);
-		} else {
+		} else {
 			$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"] . '?statut=3&id=' . $object->id, $langs->trans('Close'), $text, 'confirm_closeas', $formquestion, '', 1, 250);
 		}
 	} elseif ($action == 'delete') {

From 14567fb1152a6e47d8d86140761ad1f70459378d Mon Sep 17 00:00:00 2001
From: Christophe Battarel <christophe@altairis.fr>
Date: Tue, 3 Aug 2021 10:31:37 +0200
Subject: [PATCH 003/974] rename constant PROPAL_CLOSE_AS_SIGNED to
 PROPAL_SKIP_ACCEPT_REFUSE

---
 htdocs/comm/propal/card.php | 28 ++++++++++++++++++----------
 1 file changed, 18 insertions(+), 10 deletions(-)

diff --git a/htdocs/comm/propal/card.php b/htdocs/comm/propal/card.php
index f232a5bd9c5..251580b4c5d 100644
--- a/htdocs/comm/propal/card.php
+++ b/htdocs/comm/propal/card.php
@@ -1914,7 +1914,7 @@ if ($action == 'create') {
 	if ($action == 'closeas') {
 		//Form to close proposal (signed or not)
 		$formquestion = array();
-		if (empty($conf->global->PROPAL_CLOSE_AS_SIGNED)) {
+		if (empty($conf->global->PROPAL_SKIP_ACCEPT_REFUSE)) {
 			$formquestion[] = array('type' => 'select', 'name' => 'statut', 'label' => '<span class="fieldrequired">'.$langs->trans("CloseAs").'</span>', 'values' => array($object::STATUS_SIGNED => $object->LibStatut($object::STATUS_SIGNED), $object::STATUS_NOTSIGNED => $object->LibStatut($object::STATUS_NOTSIGNED)));
 		}
 		$formquestion[] = array('type' => 'text', 'name' => 'note_private', 'label' => $langs->trans("Note"), 'value' => '');				// Field to complete private note (not replace)
@@ -1927,7 +1927,7 @@ if ($action == 'create') {
 			));
 		}
 
-		if (empty($conf->global->PROPAL_CLOSE_AS_SIGNED)) {
+		if (empty($conf->global->PROPAL_SKIP_ACCEPT_REFUSE)) {
 			$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('SetAcceptedRefused'), $text, 'confirm_closeas', $formquestion, '', 1, 250);
 		} else {
 			$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"] . '?statut=3&id=' . $object->id, $langs->trans('Close'), $text, 'confirm_closeas', $formquestion, '', 1, 250);
@@ -2599,14 +2599,22 @@ if ($action == 'create') {
 					}
 				}
 
-				// Close as accepted/refused
-				if ($object->statut == Propal::STATUS_VALIDATED) {
-					if ($usercanclose) {
-						print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=closeas'.(empty($conf->global->MAIN_JUMP_TAG) ? '' : '#close').'"';
-						print '>'.$langs->trans('SetAcceptedRefused').'</a>';
-					} else {
-						print '<a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("NotEnoughPermissions").'"';
-						print '>'.$langs->trans('SetAcceptedRefused').'</a>';
+				if (empty($conf->global->PROPAL_SKIP_ACCEPT_REFUSE)) {
+					// Close as accepted/refused
+					if ($object->statut == Propal::STATUS_VALIDATED) {
+						if ($usercanclose) {
+							print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=closeas'.(empty($conf->global->MAIN_JUMP_TAG) ? '' : '#close').'"';
+							print '>'.$langs->trans('SetAcceptedRefused').'</a>';
+						} else {
+							print '<a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("NotEnoughPermissions").'"';
+							print '>'.$langs->trans('SetAcceptedRefused').'</a>';
+						}
+					}
+				} else {
+					// Set not signed (close)
+					if ($object->statut == Propal::STATUS_DRAFT && $usercanclose) {
+						print '<a class="butAction" href="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . '&amp;action=closeas' . (empty($conf->global->MAIN_JUMP_TAG) ? '' : '#close') . '"';
+						print '>' . $langs->trans('Close') . '</a>';
 					}
 				}
 

From 8e9d02efb7ff1d1a901b04036ab6718a6346ee44 Mon Sep 17 00:00:00 2001
From: Christophe Battarel <christophe@altairis.fr>
Date: Tue, 3 Aug 2021 10:37:37 +0200
Subject: [PATCH 004/974] draft close

---
 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 251580b4c5d..76e4dbe1c4f 100644
--- a/htdocs/comm/propal/card.php
+++ b/htdocs/comm/propal/card.php
@@ -658,7 +658,7 @@ if (empty($reshook)) {
 			$action = 'closeas';
 		} elseif (GETPOST('statut', 'int') == $object::STATUS_SIGNED || GETPOST('statut', 'int') == $object::STATUS_NOTSIGNED) {
 			// prevent browser refresh from closing proposal several times
-			if ($object->statut == $object::STATUS_VALIDATED) {
+			if ($object->statut == $object::STATUS_VALIDATED || ( ! empty($conf->global->PROPAL_SKIP_ACCEPT_REFUSE) && $object->statut == $object::STATUS_DRAFT)) {
 				$db->begin();
 
 				$result = $object->closeProposal($user, GETPOST('statut', 'int'), GETPOST('note_private', 'restricthtml'));

From dfbefed0f6ef56964cc1779582f2fc513ed8e353 Mon Sep 17 00:00:00 2001
From: Christophe Battarel <christophe@altairis.fr>
Date: Tue, 3 Aug 2021 10:58:40 +0200
Subject: [PATCH 005/974] remove PROPAL_REOPEN_TO_DRAFT

---
 htdocs/comm/propal/card.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/htdocs/comm/propal/card.php b/htdocs/comm/propal/card.php
index 76e4dbe1c4f..0557b54f5b3 100644
--- a/htdocs/comm/propal/card.php
+++ b/htdocs/comm/propal/card.php
@@ -256,6 +256,9 @@ if (empty($reshook)) {
 		// Validation
 		$idwarehouse = GETPOST('idwarehouse', 'int');
 		$result = $object->valid($user);
+		if ( $result > 0 && ! empty($conf->global->PROPAL_SKIP_ACCEPT_REFUSE) ) {
+			$result = $object->closeProposal($user, $object::STATUS_SIGNED);
+		}
 		if ($result >= 0) {
 			if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) {
 				$outputlangs = $langs;
@@ -680,7 +683,7 @@ if (empty($reshook)) {
 		if ($object->statut == Propal::STATUS_SIGNED || $object->statut == Propal::STATUS_NOTSIGNED || $object->statut == Propal::STATUS_BILLED) {
 			$db->begin();
 
-			$result = $object->reopen($user, 1);
+			$result = $object->reopen($user, empty($conf->global->PROPAL_SKIP_ACCEPT_REFUSE));
 			if ($result < 0) {
 				setEventMessages($object->error, $object->errors, 'errors');
 				$error++;

From b0d86d12fb8097df071c8c5f05a6e5710208c294 Mon Sep 17 00:00:00 2001
From: Christophe Battarel <christophe@altairis.fr>
Date: Thu, 18 Nov 2021 10:43:52 +0100
Subject: [PATCH 006/974] fix url on formextra

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

diff --git a/htdocs/core/tpl/extrafields_view.tpl.php b/htdocs/core/tpl/extrafields_view.tpl.php
index b5656c89339..15d529e01b6 100644
--- a/htdocs/core/tpl/extrafields_view.tpl.php
+++ b/htdocs/core/tpl/extrafields_view.tpl.php
@@ -243,7 +243,7 @@ if (empty($reshook) && isset($extrafields->attributes[$object->table_element]['l
 				if ($object->table_element == 'societe') {
 					$fieldid = 'socid';
 				}
-				print '<form enctype="multipart/form-data" action="'.$_SERVER["PHP_SELF"].'" method="post" name="formextra">';
+				print '<form enctype="multipart/form-data" action="'.$_SERVER["PHP_SELF"] . '?' . $fieldid . '=' . $object->id . '" method="post" name="formextra">';
 				print '<input type="hidden" name="action" value="update_extras">';
 				print '<input type="hidden" name="attribute" value="'.$tmpkeyextra.'">';
 				print '<input type="hidden" name="token" value="'.newToken().'">';

From ac740e0a93d82f1f0921515705778cdb3a0bff3a Mon Sep 17 00:00:00 2001
From: atm-lena <lena.papazian@atm-consulting.fr>
Date: Fri, 4 Mar 2022 11:28:03 +0100
Subject: [PATCH 007/974] Add pages to products list in inventory

---
 htdocs/product/inventory/inventory.php | 25 ++++++++++++++++++++++++-
 1 file changed, 24 insertions(+), 1 deletion(-)

diff --git a/htdocs/product/inventory/inventory.php b/htdocs/product/inventory/inventory.php
index 95c9e2972cb..fc8b7c5cc35 100644
--- a/htdocs/product/inventory/inventory.php
+++ b/htdocs/product/inventory/inventory.php
@@ -40,6 +40,16 @@ $confirm = GETPOST('confirm', 'alpha');
 $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');
+if (empty($page) || $page == -1) {
+	$page = 0;
+}
+$offset = $limit * $page;
+$pageprev = $page - 1;
+$pagenext = $page + 1;
+$savlimit = $limit;
 
 $fk_warehouse = GETPOST('fk_warehouse', 'int');
 $fk_product = GETPOST('fk_product', 'int');
@@ -228,6 +238,7 @@ if (empty($reshook)) {
 		$resql = $db->query($sql);
 		if ($resql) {
 			$num = $db->num_rows($resql);
+
 			$i = 0;
 			$totalarray = array();
 			$inventoryline = new InventoryLine($db);
@@ -284,7 +295,6 @@ if (empty($reshook)) {
 		}
 	}
 
-
 	$backurlforlist = DOL_URL_ROOT.'/product/inventory/list.php';
 	$backtopage = DOL_URL_ROOT.'/product/inventory/inventory.php?id='.$object->id;
 
@@ -396,6 +406,14 @@ jQuery(document).ready(function() {
 
 // Part to show record
 if ($object->id > 0) {
+
+	$param = '&id='.$object->id;
+	$param .= '&action=updateinventorylines';
+	if ($limit > 0 && $limit != $conf->liste_limit) {
+		$param .= '&limit='.urlencode($limit);
+	}
+	$paramwithsearch = $param;
+
 	$res = $object->fetch_optionals();
 
 	$head = inventoryPrepareHead($object);
@@ -905,6 +923,7 @@ if ($object->id > 0) {
 	$sql .= ' id.fk_product, id.batch, id.qty_stock, id.qty_view, id.qty_regulated, id.fk_movement';
 	$sql .= ' FROM '.MAIN_DB_PREFIX.'inventorydet as id';
 	$sql .= ' WHERE id.fk_inventory = '.((int) $object->id);
+	$sql .= $db->plimit($limit + 1, $offset);
 
 	$cacheOfProducts = array();
 	$cacheOfWarehouses = array();
@@ -914,6 +933,10 @@ if ($object->id > 0) {
 	if ($resql) {
 		$num = $db->num_rows($resql);
 
+		if (!empty($savlimit != 0) || $num > $limit || $page) {
+			print_fleche_navigation($page, $_SERVER["PHP_SELF"], $paramwithsearch, ($num > $limit), '<li class="pagination"><span>' . $langs->trans("Page") . ' ' . ($page + 1) . '</span></li>', '',$limit, $num);
+		}
+
 		$i = 0;
 		$hasinput = false;
 		$totalarray = array();

From f3fb0ffd8a37966ee2d27c3b9c9854a69d75d97e Mon Sep 17 00:00:00 2001
From: atm-lena <lena.papazian@atm-consulting.fr>
Date: Fri, 4 Mar 2022 16:44:15 +0100
Subject: [PATCH 008/974] Keep qty value between pages

---
 htdocs/core/actions_addupdatedelete.inc.php |  4 +-
 htdocs/product/inventory/inventory.php      | 64 ++++++++++++++++-----
 2 files changed, 52 insertions(+), 16 deletions(-)

diff --git a/htdocs/core/actions_addupdatedelete.inc.php b/htdocs/core/actions_addupdatedelete.inc.php
index 4857902b8cc..0a6151a5f60 100644
--- a/htdocs/core/actions_addupdatedelete.inc.php
+++ b/htdocs/core/actions_addupdatedelete.inc.php
@@ -28,6 +28,7 @@
 // $permissiontodelete must be defined
 // $backurlforlist must be defined
 // $backtopage may be defined
+// $gotopage
 // $triggermodname may be defined
 
 if (!empty($permissionedit) && empty($permissiontoadd)) {
@@ -348,8 +349,7 @@ if ($action == 'confirm_deleteline' && $confirm == 'yes' && !empty($permissionto
 		}
 
 		setEventMessages($langs->trans('RecordDeleted'), null, 'mesgs');
-
-		header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id);
+		header('Location: '.((empty($gotopage)) ? $_SERVER["PHP_SELF"].'?id='.$object->id : $gotopage));
 		exit;
 	} else {
 		$error++;
diff --git a/htdocs/product/inventory/inventory.php b/htdocs/product/inventory/inventory.php
index fc8b7c5cc35..480dbbaa27d 100644
--- a/htdocs/product/inventory/inventory.php
+++ b/htdocs/product/inventory/inventory.php
@@ -49,7 +49,6 @@ if (empty($page) || $page == -1) {
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
-$savlimit = $limit;
 
 $fk_warehouse = GETPOST('fk_warehouse', 'int');
 $fk_product = GETPOST('fk_product', 'int');
@@ -104,6 +103,13 @@ if (empty($conf->global->MAIN_USE_ADVANCED_PERMS)) {
 
 $now = dol_now();
 
+//Parameters Page
+$param = '&id='.$object->id;
+if ($limit > 0 && $limit != $conf->liste_limit) {
+	$param .= '&limit='.urlencode($limit);
+}
+$paramwithsearch = $param;
+
 
 /*
  * Actions
@@ -232,6 +238,7 @@ if (empty($reshook)) {
 		$sql .= ' id.fk_product, id.batch, id.qty_stock, id.qty_view, id.qty_regulated';
 		$sql .= ' FROM '.MAIN_DB_PREFIX.'inventorydet as id';
 		$sql .= ' WHERE id.fk_inventory = '.((int) $object->id);
+		$sql .= $db->plimit($limit, $offset);
 
 		$db->begin();
 
@@ -295,6 +302,10 @@ if (empty($reshook)) {
 		}
 	}
 
+	if($action == 'confirm_deleteline'){
+		$gotopage =  $_SERVER["PHP_SELF"].'?id='.$object->id.'&page='.$page.$paramwithsearch;
+	}
+
 	$backurlforlist = DOL_URL_ROOT.'/product/inventory/list.php';
 	$backtopage = DOL_URL_ROOT.'/product/inventory/inventory.php?id='.$object->id;
 
@@ -407,13 +418,6 @@ jQuery(document).ready(function() {
 // Part to show record
 if ($object->id > 0) {
 
-	$param = '&id='.$object->id;
-	$param .= '&action=updateinventorylines';
-	if ($limit > 0 && $limit != $conf->liste_limit) {
-		$param .= '&limit='.urlencode($limit);
-	}
-	$paramwithsearch = $param;
-
 	$res = $object->fetch_optionals();
 
 	$head = inventoryPrepareHead($object);
@@ -427,7 +431,7 @@ if ($object->id > 0) {
 	}
 	// Confirmation to delete line
 	if ($action == 'deleteline') {
-		$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id.'&lineid='.$lineid, $langs->trans('DeleteLine'), $langs->trans('ConfirmDeleteLine'), 'confirm_deleteline', '', 0, 1);
+		$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id.'&lineid='.$lineid.'&page='.$page.$paramwithsearch, $langs->trans('DeleteLine'), $langs->trans('ConfirmDeleteLine'), 'confirm_deleteline', '', 0, 1);
 	}
 
 	// Clone confirmation
@@ -923,7 +927,7 @@ if ($object->id > 0) {
 	$sql .= ' id.fk_product, id.batch, id.qty_stock, id.qty_view, id.qty_regulated, id.fk_movement';
 	$sql .= ' FROM '.MAIN_DB_PREFIX.'inventorydet as id';
 	$sql .= ' WHERE id.fk_inventory = '.((int) $object->id);
-	$sql .= $db->plimit($limit + 1, $offset);
+	$sql .= $db->plimit($limit, $offset);
 
 	$cacheOfProducts = array();
 	$cacheOfWarehouses = array();
@@ -933,8 +937,8 @@ if ($object->id > 0) {
 	if ($resql) {
 		$num = $db->num_rows($resql);
 
-		if (!empty($savlimit != 0) || $num > $limit || $page) {
-			print_fleche_navigation($page, $_SERVER["PHP_SELF"], $paramwithsearch, ($num > $limit), '<li class="pagination"><span>' . $langs->trans("Page") . ' ' . ($page + 1) . '</span></li>', '',$limit, $num);
+		if (!empty($limit != 0) || $num > $limit || $page) {
+			print_fleche_navigation($page, $_SERVER["PHP_SELF"], $paramwithsearch, ($num >= $limit), '<li class="pagination"><span>' . $langs->trans("Page") . ' ' . ($page + 1) . '</span></li>', '',$limit);
 		}
 
 		$i = 0;
@@ -1014,7 +1018,7 @@ if ($object->id > 0) {
 
 				// Picto delete line
 				print '<td class="right">';
-				print '<a class="reposition" href="'.DOL_URL_ROOT.'/product/inventory/inventory.php?id='.$object->id.'&lineid='.$obj->rowid.'&action=deleteline&token='.newToken().'">'.img_delete().'</a>';
+				print '<a class="reposition" href="'.DOL_URL_ROOT.'/product/inventory/inventory.php?id='.$object->id.'&lineid='.$obj->rowid.'&action=deleteline&page='.$page.$paramwithsearch.'&token='.newToken().'">'.img_delete().'</a>';
 				$qty_tmp = price2num(GETPOST("id_".$obj->rowid."_input_tmp", 'MS')) >= 0 ? GETPOST("id_".$obj->rowid."_input_tmp") : $qty_view;
 				print '<input type="hidden" class="maxwidth75 right realqty" name="id_'.$obj->rowid.'_input_tmp" id="id_'.$obj->rowid.'_input_tmp" value="'.$qty_tmp.'">';
 				print '</td>';
@@ -1048,7 +1052,6 @@ if ($object->id > 0) {
 
 	print '</div>';
 
-
 	// Call method to disable the button if no qty entered yet for inventory
 
 	if ($object->status != $object::STATUS_VALIDATED || !$hasinput) {
@@ -1060,6 +1063,39 @@ if ($object->id > 0) {
 				</script>';
 	}
 	print '</form>';
+
+
+	print '<script type="text/javascript">
+					$(document).ready(function() {
+
+                        $(".paginationnext:last").click(function(e){
+                            var form = $("#formrecord");
+   							var actionURL = "'.$_SERVER['PHP_SELF']."?page=".($page).$paramwithsearch.'";
+   							$.ajax({
+      					 	url: actionURL,
+        					data: form.serialize(),
+        					cache: false,
+        					success: function(result){
+           				 	window.location.href = "'.$_SERVER['PHP_SELF']."?page=".($page + 1).$paramwithsearch.'";
+    						}});
+    					});
+
+
+                         $(".paginationprevious:last").click(function(e){
+                         console.log(1);
+                            var form = $("#formrecord");
+   							var actionURL = "'.$_SERVER['PHP_SELF']."?page=".($page).$paramwithsearch.'";
+   							$.ajax({
+      					 	url: actionURL,
+        					data: form.serialize(),
+        					cache: false,
+        					success: function(result){
+           				 	window.location.href = "'.$_SERVER['PHP_SELF']."?page=".($page - 1).$paramwithsearch.'";
+       					 	}});
+						 });
+					});
+				</script>';
+
 }
 
 // End of page

From 4e8dd1b6a582f39374b9017000643ffbb0704c7e Mon Sep 17 00:00:00 2001
From: atm-lena <lena.papazian@atm-consulting.fr>
Date: Tue, 8 Mar 2022 10:02:30 +0100
Subject: [PATCH 009/974] Delete function disable button
 disablebuttonmakemovementandclose()

---
 htdocs/langs/en_US/stocks.lang         |  4 +--
 htdocs/product/inventory/inventory.php | 34 --------------------------
 2 files changed, 2 insertions(+), 36 deletions(-)

diff --git a/htdocs/langs/en_US/stocks.lang b/htdocs/langs/en_US/stocks.lang
index 98faab0c423..af06ce7e94c 100644
--- a/htdocs/langs/en_US/stocks.lang
+++ b/htdocs/langs/en_US/stocks.lang
@@ -251,7 +251,7 @@ SelectAStockMovementFileToImport=select a stock movement file to import
 InfoTemplateImport=Uploaded file needs to have this format (* are mandatory fields):<br>Source Warehouse* | Target Warehouse* | Product* | Quantity* | Lot/serial number<br>CSV character separator must be "<b>%s</b>"
 LabelOfInventoryMovemement=Inventory %s
 ReOpen=Reopen
-ConfirmFinish=Do you confirm the closing of the inventory ? This will generate all stock movements to update your stock to the real qty you entered into the inventory.
+ConfirmFinish=Do you confirm the closing of the inventory ? This will generate all stock movements to update your stock to the real qty you entered into the inventory.<br><br>No stock movement will be made on products that do not have an actual quantity entered.
 ObjectNotFound=%s not found
 MakeMovementsAndClose=Generate movements and close
 AutofillWithExpected=Fill real quantity with expected quantity
@@ -271,4 +271,4 @@ ErrorCantFindCodeInInventory=Can't find the following code in inventory
 QtyWasAddedToTheScannedBarcode=Success !! The quantity was added to all the requested barcode. You can close the Scanner tool.
 StockChangeDisabled=Change on stock disabled
 NoWarehouseDefinedForTerminal=No warehouse defined for terminal
-ClearQtys=Clear all quantities
\ No newline at end of file
+ClearQtys=Clear all quantities
diff --git a/htdocs/product/inventory/inventory.php b/htdocs/product/inventory/inventory.php
index 480dbbaa27d..385aae39248 100644
--- a/htdocs/product/inventory/inventory.php
+++ b/htdocs/product/inventory/inventory.php
@@ -393,28 +393,6 @@ $help_url = '';
 llxHeader('', $langs->trans('Inventory'), $help_url);
 
 
-// Disable button Generate movement if data were modified and not saved
-print '<script type="text/javascript">
-function disablebuttonmakemovementandclose() {
-	console.log("Disable button idbuttonmakemovementandclose until we save");
-	jQuery("#idbuttonmakemovementandclose").attr(\'disabled\',\'disabled\');
-	jQuery("#idbuttonmakemovementandclose").attr(\'title\',\''.dol_escape_js($langs->trans("SaveQtyFirst")).'\');
-	jQuery("#idbuttonmakemovementandclose").attr(\'class\',\'butActionRefused\');
-};
-
-jQuery(document).ready(function() {
-	jQuery(".realqty").keyup(function() {
-		console.log("keyup on realqty");
-		disablebuttonmakemovementandclose();
-	});
-	jQuery(".realqty").change(function() {
-		console.log("change on realqty");
-		disablebuttonmakemovementandclose();
-	});
-});
-</script>';
-
-
 // Part to show record
 if ($object->id > 0) {
 
@@ -607,7 +585,6 @@ if ($object->id > 0) {
 								objecttofill.value = object.innerText;
 							})
 							console.log("Values filled (after click on fillwithexpected)");
-							disablebuttonmakemovementandclose();
 							return false;
 				        });';
 				print '});';
@@ -858,7 +835,6 @@ if ($object->id > 0) {
 			id = id.split("_")[1];
 			tmpvalue = $("#id_"+id+"_input_tmp").val()
 			$("#id_"+id+"_input")[0].value = tmpvalue;
-			disablebuttonmakemovementandclose();
 			return false;	/* disable submit */
 		});
 	});';
@@ -1052,16 +1028,6 @@ if ($object->id > 0) {
 
 	print '</div>';
 
-	// Call method to disable the button if no qty entered yet for inventory
-
-	if ($object->status != $object::STATUS_VALIDATED || !$hasinput) {
-		print '<script type="text/javascript">
-					jQuery(document).ready(function() {
-						console.log("Call disablebuttonmakemovementandclose because status = '.((int) $object->status).' or $hasinput = '.((int) $hasinput).'");
-						disablebuttonmakemovementandclose();
-					});
-				</script>';
-	}
 	print '</form>';
 
 

From 85628bad219028699b53c1e4b708142b4a3a63a6 Mon Sep 17 00:00:00 2001
From: atm-lena <lena.papazian@atm-consulting.fr>
Date: Tue, 8 Mar 2022 10:20:58 +0100
Subject: [PATCH 010/974] Fix save button

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

diff --git a/htdocs/product/inventory/inventory.php b/htdocs/product/inventory/inventory.php
index 385aae39248..ea51080803e 100644
--- a/htdocs/product/inventory/inventory.php
+++ b/htdocs/product/inventory/inventory.php
@@ -516,7 +516,7 @@ if ($object->id > 0) {
 	print dol_get_fiche_end();
 
 
-	print '<form id="formrecord" name="formrecord" method="POST" action="'.$_SERVER["PHP_SELF"].'">';
+	print '<form id="formrecord" name="formrecord" method="POST" action="'.$_SERVER["PHP_SELF"].'?page='.$page.$paramwithsearch.'">';
 	print '<input type="hidden" name="token" value="'.newToken().'">';
 	print '<input type="hidden" name="action" value="updateinventorylines">';
 	print '<input type="hidden" name="id" value="'.$object->id.'">';

From 38e0a8817d4f9688398523ce77bcfc4be993a836 Mon Sep 17 00:00:00 2001
From: stickler-ci <support@stickler-ci.com>
Date: Tue, 8 Mar 2022 09:49:31 +0000
Subject: [PATCH 011/974] Fixing style errors.

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

diff --git a/htdocs/product/inventory/inventory.php b/htdocs/product/inventory/inventory.php
index ea51080803e..34aca5ef35f 100644
--- a/htdocs/product/inventory/inventory.php
+++ b/htdocs/product/inventory/inventory.php
@@ -302,7 +302,7 @@ if (empty($reshook)) {
 		}
 	}
 
-	if($action == 'confirm_deleteline'){
+	if ($action == 'confirm_deleteline') {
 		$gotopage =  $_SERVER["PHP_SELF"].'?id='.$object->id.'&page='.$page.$paramwithsearch;
 	}
 
@@ -395,7 +395,6 @@ llxHeader('', $langs->trans('Inventory'), $help_url);
 
 // Part to show record
 if ($object->id > 0) {
-
 	$res = $object->fetch_optionals();
 
 	$head = inventoryPrepareHead($object);
@@ -914,7 +913,7 @@ if ($object->id > 0) {
 		$num = $db->num_rows($resql);
 
 		if (!empty($limit != 0) || $num > $limit || $page) {
-			print_fleche_navigation($page, $_SERVER["PHP_SELF"], $paramwithsearch, ($num >= $limit), '<li class="pagination"><span>' . $langs->trans("Page") . ' ' . ($page + 1) . '</span></li>', '',$limit);
+			print_fleche_navigation($page, $_SERVER["PHP_SELF"], $paramwithsearch, ($num >= $limit), '<li class="pagination"><span>' . $langs->trans("Page") . ' ' . ($page + 1) . '</span></li>', '', $limit);
 		}
 
 		$i = 0;
@@ -1061,7 +1060,6 @@ if ($object->id > 0) {
 						 });
 					});
 				</script>';
-
 }
 
 // End of page

From 7a6a980b69fac8d00e548c24f58d3f9c5b29c62d Mon Sep 17 00:00:00 2001
From: stickler-ci <support@stickler-ci.com>
Date: Fri, 22 Apr 2022 07:36:56 +0000
Subject: [PATCH 012/974] Fixing style errors.

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

diff --git a/htdocs/product/inventory/inventory.php b/htdocs/product/inventory/inventory.php
index 05e8e50d514..0ee1806335c 100644
--- a/htdocs/product/inventory/inventory.php
+++ b/htdocs/product/inventory/inventory.php
@@ -1190,7 +1190,7 @@ if ($object->id > 0) {
 	}
 	print '</form>';
 
-print '<script type="text/javascript">
+	print '<script type="text/javascript">
 					$(document).ready(function() {
 
                         $(".paginationnext:last").click(function(e){

From e0ff5a01d1727f120cc2a8042d6a48f10126f5e9 Mon Sep 17 00:00:00 2001
From: atm-lena <lena.papazian@atm-consulting.fr>
Date: Fri, 29 Apr 2022 15:40:53 +0200
Subject: [PATCH 013/974] Close inventory : save before

---
 htdocs/product/inventory/inventory.php | 37 +++++++++-----------------
 1 file changed, 12 insertions(+), 25 deletions(-)

diff --git a/htdocs/product/inventory/inventory.php b/htdocs/product/inventory/inventory.php
index 05e8e50d514..9486d32dad2 100644
--- a/htdocs/product/inventory/inventory.php
+++ b/htdocs/product/inventory/inventory.php
@@ -426,30 +426,6 @@ $help_url = '';
 
 llxHeader('', $langs->trans('Inventory'), $help_url);
 
-
-// Disable button Generate movement if data were modified and not saved
-print '<script type="text/javascript">
-function disablebuttonmakemovementandclose() {
-	console.log("Disable button idbuttonmakemovementandclose until we save");
-	jQuery("#idbuttonmakemovementandclose").attr(\'disabled\',\'disabled\');
-	jQuery("#idbuttonmakemovementandclose").attr(\'onclick\', \'return false;\');
-	jQuery("#idbuttonmakemovementandclose").attr(\'title\',\''.dol_escape_js($langs->trans("SaveQtyFirst")).'\');
-	jQuery("#idbuttonmakemovementandclose").attr(\'class\',\'butActionRefused classfortooltip\');
-};
-
-jQuery(document).ready(function() {
-	jQuery(".realqty").keyup(function() {
-		console.log("keyup on realqty");
-		disablebuttonmakemovementandclose();
-	});
-	jQuery(".realqty").change(function() {
-		console.log("change on realqty");
-		disablebuttonmakemovementandclose();
-	});
-});
-</script>';
-
-
 // Part to show record
 if ($object->id > 0) {
 	$res = $object->fetch_optionals();
@@ -1207,7 +1183,6 @@ print '<script type="text/javascript">
 
 
                          $(".paginationprevious:last").click(function(e){
-                         console.log(1);
                             var form = $("#formrecord");
    							var actionURL = "'.$_SERVER['PHP_SELF']."?page=".($page).$paramwithsearch.'";
    							$.ajax({
@@ -1218,6 +1193,18 @@ print '<script type="text/javascript">
            				 	window.location.href = "'.$_SERVER['PHP_SELF']."?page=".($page - 1).$paramwithsearch.'";
        					 	}});
 						 });
+
+                          $("#idbuttonmakemovementandclose").click(function(e){
+                            var form = $("#formrecord");
+   							var actionURL = "'.$_SERVER['PHP_SELF']."?page=".($page).$paramwithsearch.'";
+   							$.ajax({
+      					 	url: actionURL,
+        					data: form.serialize(),
+        					cache: false,
+        					success: function(result){
+           				 	window.location.href = "'.$_SERVER['PHP_SELF']."?page=".($page - 1).$paramwithsearch.'&action=record";
+       					 	}});
+						 });
 					});
 				</script>';
 

From 7cf581148c74c5e7050558c09ce272a325253689 Mon Sep 17 00:00:00 2001
From: Christophe Battarel <christophe@altairis.fr>
Date: Mon, 16 May 2022 12:20:58 +0200
Subject: [PATCH 014/974] change buttons labels

---
 htdocs/comm/propal/card.php | 535 +++++++++++++++++++++++++-----------
 1 file changed, 378 insertions(+), 157 deletions(-)

diff --git a/htdocs/comm/propal/card.php b/htdocs/comm/propal/card.php
index 0557b54f5b3..8453f13658c 100644
--- a/htdocs/comm/propal/card.php
+++ b/htdocs/comm/propal/card.php
@@ -1,12 +1,12 @@
 <?php
-/* Copyright (C) 2001-2007  Rodolphe Quiedeville    <rodolphe@quiedeville.org>
+/* Copyright (C) 2001-2007 Rodolphe Quiedeville    <rodolphe@quiedeville.org>
  * Copyright (C) 2004-2014 Laurent Destailleur   <eldy@users.sourceforge.net>
  * Copyright (C) 2004      Eric Seigne           <eric.seigne@ryxeo.com>
  * Copyright (C) 2005      Marc Barilley / Ocebo <marc@ocebo.com>
  * Copyright (C) 2005-2012 Regis Houssin         <regis.houssin@inodbox.com>
  * Copyright (C) 2006      Andre Cianfarani      <acianfa@free.fr>
  * Copyright (C) 2010-2016 Juanjo Menent         <jmenent@2byte.es>
- * Copyright (C) 2010-2018 Philippe Grand        <philippe.grand@atoo-net.com>
+ * Copyright (C) 2010-2021 Philippe Grand        <philippe.grand@atoo-net.com>
  * Copyright (C) 2012-2013 Christophe Battarel   <christophe.battarel@altairis.fr>
  * Copyright (C) 2012      Cedric Salvador       <csalvador@gpcsolutions.fr>
  * Copyright (C) 2013-2014  Florian Henry           <florian.henry@open-concept.pro>
@@ -14,6 +14,7 @@
  * Copyright (C) 2016       Marcos García           <marcosgdf@gmail.com>
  * Copyright (C) 2018-2021  Frédéric France         <frederic.france@netlogic.fr>
  * Copyright (C) 2020	    Nicolas ZABOURI         <info@inovea-conseil.com>
+ * Copyright (C) 2022	    Gauthier VERDOL     <gauthier.verdol@atm-consulting.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -80,6 +81,7 @@ $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;
 
 // PDF
 $hidedetails = (GETPOST('hidedetails', 'int') ? GETPOST('hidedetails', 'int') : (!empty($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_DETAILS) ? 1 : 0));
@@ -116,12 +118,12 @@ $usercandelete = $user->rights->propal->supprimer;
 
 $usercanclose = ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && $usercancreate) || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->propal->propal_advance->close)));
 $usercanvalidate = ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && $usercancreate) || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->propal->propal_advance->validate)));
-$usercansend = (empty($conf->global->MAIN_USE_ADVANCED_PERMS) || $user->rights->propal->propal_advance->send);
+$usercansend = (empty($conf->global->MAIN_USE_ADVANCED_PERMS) || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->propal->propal_advance->send)));
 
 $usercancreateorder = $user->rights->commande->creer;
 $usercancreateinvoice = $user->rights->facture->creer;
 $usercancreatecontract = $user->rights->contrat->creer;
-$usercancreateintervention = $user->rights->ficheinter->creer;
+$usercancreateintervention = $user->hasRight('ficheinter', 'creer');
 $usercancreatepurchaseorder = ($user->rights->fournisseur->commande->creer || $user->rights->supplier_order->creer);
 
 $permissionnote = $usercancreate; // Used by the include of actions_setnotes.inc.php
@@ -147,8 +149,23 @@ if ($reshook < 0) {
 }
 
 if (empty($reshook)) {
+	$backurlforlist = DOL_URL_ROOT.'/comm/propal/list.php';
+
+	if (empty($backtopage) || ($cancel && empty($id))) {
+		if (empty($backtopage) || ($cancel && strpos($backtopage, '__ID__'))) {
+			if (empty($id) && (($action != 'add' && $action != 'create') || $cancel)) {
+				$backtopage = $backurlforlist;
+			} else {
+				$backtopage = DOL_URL_ROOT.'/comm/propal/card.php?id='.((!empty($id) && $id > 0) ? $id : '__ID__');
+			}
+		}
+	}
+
 	if ($cancel) {
-		if (!empty($backtopage)) {
+		if (!empty($backtopageforcancel)) {
+			header("Location: ".$backtopageforcancel);
+			exit;
+		} elseif (!empty($backtopage)) {
 			header("Location: ".$backtopage);
 			exit;
 		}
@@ -205,7 +222,7 @@ if (empty($reshook)) {
 					}
 				}
 
-				$result = $object->createFromClone($user, $socid, (GETPOSTISSET('entity') ? GETPOST('entity', 'int') : null));
+				$result = $object->createFromClone($user, $socid, (GETPOSTISSET('entity') ? GETPOST('entity', 'int') : null), (GETPOST('update_prices', 'aZ') ? true : false));
 				if ($result > 0) {
 					header("Location: ".$_SERVER['PHP_SELF'].'?id='.$result);
 					exit();
@@ -231,8 +248,11 @@ if (empty($reshook)) {
 		// Remove line
 		$result = $object->deleteline($lineid);
 		// reorder lines
-		if ($result) {
+		if ($result > 0) {
 			$object->line_order(true);
+		} else {
+			$langs->load("errors");
+			setEventMessages($object->error, $object->errors, 'errors');
 		}
 
 		if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) {
@@ -263,10 +283,10 @@ if (empty($reshook)) {
 			if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) {
 				$outputlangs = $langs;
 				$newlang = '';
-				if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id', 'aZ09')) {
+				if (!empty($conf->global->MAIN_MULTILANGS) && empty($newlang) && GETPOST('lang_id', 'aZ09')) {
 					$newlang = GETPOST('lang_id', 'aZ09');
 				}
-				if ($conf->global->MAIN_MULTILANGS && empty($newlang)) {
+				if (!empty($conf->global->MAIN_MULTILANGS) && empty($newlang)) {
 					$newlang = $object->thirdparty->default_lang;
 				}
 				if (!empty($newlang)) {
@@ -290,7 +310,7 @@ if (empty($reshook)) {
 			}
 		}
 	} elseif ($action == 'setdate' && $usercancreate) {
-		$datep = dol_mktime(12, 0, 0, $_POST['remonth'], $_POST['reday'], $_POST['reyear']);
+		$datep = dol_mktime(12, 0, 0, GETPOST('remonth', 'int'), GETPOST('reday', 'int'), GETPOST('reyear', 'int'));
 
 		if (empty($datep)) {
 			$error++;
@@ -304,7 +324,7 @@ if (empty($reshook)) {
 			}
 		}
 	} elseif ($action == 'setecheance' && $usercancreate) {
-		$result = $object->set_echeance($user, dol_mktime(12, 0, 0, $_POST['echmonth'], $_POST['echday'], $_POST['echyear']));
+		$result = $object->set_echeance($user, dol_mktime(12, 0, 0, GETPOST('echmonth', 'int'), GETPOST('echday', 'int'), GETPOST('echyear', 'int')));
 		if ($result >= 0) {
 			if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) {
 				$outputlangs = $langs;
@@ -327,7 +347,7 @@ if (empty($reshook)) {
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
 	} elseif ($action == 'setdate_livraison' && $usercancreate) {
-		$result = $object->setDeliveryDate($user, dol_mktime(12, 0, 0, $_POST['date_livraisonmonth'], $_POST['date_livraisonday'], $_POST['date_livraisonyear']));
+		$result = $object->setDeliveryDate($user, dol_mktime(12, 0, 0, GETPOST('date_livraisonmonth', 'int'), GETPOST('date_livraisonday', 'int'), GETPOST('date_livraisonyear', 'int')));
 		if ($result < 0) {
 			dol_print_error($db, $object->error);
 		}
@@ -385,10 +405,11 @@ if (empty($reshook)) {
 					$object->warehouse_id = GETPOST('warehouse_id', 'int');
 					$object->duree_validite = $duration;
 					$object->cond_reglement_id = GETPOST('cond_reglement_id');
+					$object->deposit_percent = GETPOST('cond_reglement_id_deposit_percent', 'alpha');
 					$object->mode_reglement_id = GETPOST('mode_reglement_id');
 					$object->fk_account = GETPOST('fk_account', 'int');
-					$object->remise_percent = price2num(GETPOST('remise_percent'), 2);
-					$object->remise_absolue = price2num(GETPOST('remise_absolue'), 'MU');
+					$object->remise_absolue = price2num(GETPOST('remise_absolue'), 'MU', 2);	// deprecated
+					$object->remise_percent = price2num(GETPOST('remise_percent'), '', 2);
 					$object->socid = GETPOST('socid', 'int');
 					$object->contact_id = GETPOST('contactid', 'int');
 					$object->fk_project = GETPOST('projectid', 'int');
@@ -417,6 +438,7 @@ if (empty($reshook)) {
 				$object->warehouse_id = GETPOST('warehouse_id', 'int');
 				$object->duree_validite = price2num(GETPOST('duree_validite', 'alpha'));
 				$object->cond_reglement_id = GETPOST('cond_reglement_id', 'int');
+				$object->deposit_percent = GETPOST('cond_reglement_id_deposit_percent', 'alpha');
 				$object->mode_reglement_id = GETPOST('mode_reglement_id', 'int');
 				$object->fk_account = GETPOST('fk_account', 'int');
 				$object->contact_id = GETPOST('contactid', 'int');
@@ -670,10 +692,62 @@ if (empty($reshook)) {
 					$error++;
 				}
 
+				$deposit = null;
+				$locationTarget = '';
+
+				$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'
+					&& ! empty($deposit_percent_from_payment_terms) && ! empty($conf->facture->enabled) && ! empty($user->rights->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'));
+					$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'));
+					}
+
+					$deposit = Facture::createDepositFromOrigin($object, $date, GETPOST('cond_reglement_id', 'int'), $user, 0, GETPOST('validate_generated_deposit', 'alpha') == 'on', $forceFields);
+
+					if ($deposit) {
+						setEventMessage('DepositGenerated');
+						$locationTarget = DOL_URL_ROOT . '/compta/facture/card.php?id=' . $deposit->id;
+					} else {
+						$error++;
+						setEventMessages($object->error, $object->errors, 'errors');
+					}
+				}
+
 				if (!$error) {
 					$db->commit();
+
+					if ($deposit && empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) {
+						$ret = $deposit->fetch($deposit->id); // Reload to get new records
+						$outputlangs = $langs;
+
+						if ($conf->global->MAIN_MULTILANGS) {
+							$outputlangs = new Translate('', $conf);
+							$outputlangs->setDefaultLang($deposit->thirdparty->default_lang);
+							$outputlangs->load('products');
+						}
+
+						$result = $deposit->generateDocument($deposit->model_pdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
+
+						if ($result < 0) {
+							setEventMessages($deposit->error, $deposit->errors, 'errors');
+						}
+					}
+
+					if ($locationTarget) {
+						header('Location: ' . $locationTarget);
+						exit;
+					}
 				} else {
 					$db->rollback();
+					$action = '';
 				}
 			}
 		}
@@ -805,7 +879,7 @@ if (empty($reshook)) {
 				}
 			}
 		}
-	} elseif ($action == 'addline' && GETPOST('submitforalllines', 'alpha') && GETPOST('vatforalllines', 'alpha') !== '') {
+	} elseif ($action == 'addline' && GETPOST('submitforalllines', 'alpha') && GETPOST('vatforalllines', 'alpha') !== '' && $usercancreate) {
 		// Define vat_rate
 		$vat_rate = (GETPOST('vatforalllines') ? GETPOST('vatforalllines') : 0);
 		$vat_rate = str_replace('*', '', $vat_rate);
@@ -814,6 +888,13 @@ if (empty($reshook)) {
 		foreach ($object->lines as $line) {
 			$result = $object->updateline($line->id, $line->subprice, $line->qty, $line->remise_percent, $vat_rate, $localtax1_rate, $localtax2_rate, $line->desc, 'HT', $line->info_bits, $line->special_code, $line->fk_parent_line, 0, $line->fk_fournprice, $line->pa_ht, $line->label, $line->product_type, $line->date_start, $line->date_end, $line->array_options, $line->fk_unit, $line->multicurrency_subprice);
 		}
+	} elseif ($action == 'addline' && GETPOST('submitforalllines', 'alpha') && GETPOST('remiseforalllines', 'alpha') !== '' && $usercancreate) {
+		// Define vat_rate
+		$remise_percent = (GETPOST('remiseforalllines') ? GETPOST('remiseforalllines') : 0);
+		$remise_percent = str_replace('*', '', $remise_percent);
+		foreach ($object->lines as $line) {
+			$result = $object->updateline($line->id, $line->subprice, $line->qty, $remise_percent, $line->tva_tx, $line->localtax1_tx, $line->localtax2_tx, $line->desc, 'HT', $line->info_bits, $line->special_code, $line->fk_parent_line, 0, $line->fk_fournprice, $line->pa_ht, $line->label, $line->product_type, $line->date_start, $line->date_end, $line->array_options, $line->fk_unit, $line->multicurrency_subprice);
+		}
 	} elseif ($action == 'addline' && $usercancreate) {		// Add line
 		// Set if we used free entry or predefined product
 		$predef = '';
@@ -823,14 +904,14 @@ if (empty($reshook)) {
 		$prod_entry_mode = GETPOST('prod_entry_mode');
 		if ($prod_entry_mode == 'free') {
 			$idprod = 0;
-			$tva_tx = (GETPOST('tva_tx') ? GETPOST('tva_tx') : 0);
+			$tva_tx = (GETPOST('tva_tx') ? price2num(GETPOST('tva_tx')) : 0);
 		} else {
 			$idprod = GETPOST('idprod', 'int');
 			$tva_tx = '';
 		}
 
-		$qty = price2num(GETPOST('qty'.$predef, 'alpha'), 'MS');
-		$remise_percent = price2num(GETPOST('remise_percent'.$predef), 2);
+		$qty = price2num(GETPOST('qty'.$predef, 'alpha'), 'MS', 2);
+		$remise_percent = price2num(GETPOST('remise_percent'.$predef), '', 2);
 		if (empty($remise_percent)) {
 			$remise_percent = 0;
 		}
@@ -1131,7 +1212,7 @@ if (empty($reshook)) {
 				setEventMessages($mesg, null, 'errors');
 			} else {
 				// Insert line
-				$result = $object->addline($desc, $pu_ht, $qty, $tva_tx, $localtax1_tx, $localtax2_tx, $idprod, $remise_percent, $price_base_type, $pu_ttc, $info_bits, $type, - 1, 0, GETPOST('fk_parent_line'), $fournprice, $buyingprice, $label, $date_start, $date_end, $array_options, $fk_unit, '', 0, $pu_ht_devise);
+				$result = $object->addline($desc, $pu_ht, $qty, $tva_tx, $localtax1_tx, $localtax2_tx, $idprod, $remise_percent, $price_base_type, $pu_ttc, $info_bits, $type, min($rank, count($object->lines) + 1), 0, GETPOST('fk_parent_line'), $fournprice, $buyingprice, $label, $date_start, $date_end, $array_options, $fk_unit, '', 0, $pu_ht_devise);
 
 				if ($result > 0) {
 					$db->commit();
@@ -1217,6 +1298,8 @@ if (empty($reshook)) {
 		$date_start = dol_mktime(GETPOST('date_starthour'), GETPOST('date_startmin'), GETPOST('date_startsec'), GETPOST('date_startmonth'), GETPOST('date_startday'), GETPOST('date_startyear'));
 		$date_end = dol_mktime(GETPOST('date_endhour'), GETPOST('date_endmin'), GETPOST('date_endsec'), GETPOST('date_endmonth'), GETPOST('date_endday'), GETPOST('date_endyear'));
 
+		$remise_percent = price2num(GETPOST('remise_percent'), '', 2);
+
 		// Extrafields
 		$extralabelsline = $extrafields->fetch_name_optionals_label($object->table_element_line);
 		$array_options = $extrafields->getOptionalsFromPost($object->table_element_line);
@@ -1229,7 +1312,7 @@ if (empty($reshook)) {
 		}
 
 		// Define special_code for special lines
-		$special_code = GETPOST('special_code');
+		$special_code = GETPOST('special_code', 'int');
 		if (!GETPOST('qty')) {
 			$special_code = 3;
 		}
@@ -1248,7 +1331,7 @@ if (empty($reshook)) {
 			}
 
 			$label = ((GETPOST('update_label') && GETPOST('product_label')) ? GETPOST('product_label') : '');
-			if (((!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && empty($user->rights->produit->ignore_price_min_advance)) || empty($conf->global->MAIN_USE_ADVANCED_PERMS)) && ($price_min && (price2num($pu_ht) * (1 - price2num(GETPOST('remise_percent'), 2) / 100) < price2num($price_min)))) {
+			if (((!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && empty($user->rights->produit->ignore_price_min_advance)) || empty($conf->global->MAIN_USE_ADVANCED_PERMS)) && ($price_min && (price2num($pu_ht) * (1 - $remise_percent / 100) < price2num($price_min)))) {
 				setEventMessages($langs->trans("CantBeLessThanMinPrice", price(price2num($price_min, 'MU'), 0, $langs, 0, 0, - 1, $conf->currency)), null, 'errors');
 				$error++;
 			}
@@ -1278,7 +1361,7 @@ if (empty($reshook)) {
 
 			$qty = price2num(GETPOST('qty', 'alpha'), 'MS');
 
-			$result = $object->updateline(GETPOST('lineid', 'int'), $pu_ht, $qty, price2num(GETPOST('remise_percent'), 2), $vat_rate, $localtax1_rate, $localtax2_rate, $description, 'HT', $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(GETPOST('lineid', 'int'), $pu_ht, $qty, $remise_percent, $vat_rate, $localtax1_rate, $localtax2_rate, $description, 'HT', $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();
@@ -1344,11 +1427,11 @@ if (empty($reshook)) {
 		$result = $object->set_demand_reason($user, GETPOST('demand_reason_id', 'int'));
 	} elseif ($action == 'setconditions' && $usercancreate) {
 		// Terms of payment
-		$result = $object->setPaymentTerms(GETPOST('cond_reglement_id', 'int'));
+		$result = $object->setPaymentTerms(GETPOST('cond_reglement_id', 'int'), GETPOST('cond_reglement_id_deposit_percent', 'alpha'));
 	} elseif ($action == 'setremisepercent' && $usercancreate) {
-		$result = $object->set_remise_percent($user, price2num(GETPOST('remise_percent')));
+		$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')));
+		$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'));
@@ -1428,7 +1511,7 @@ if (empty($reshook)) {
 	}
 
 	// Actions to build doc
-	$upload_dir = $conf->propal->multidir_output[$object->entity];
+	$upload_dir = !empty($conf->propal->multidir_output[$object->entity])?$conf->propal->multidir_output[$object->entity]:$conf->propal->dir_output;
 	$permissiontoadd = $usercancreate;
 	include DOL_DOCUMENT_ROOT.'/core/actions_builddoc.inc.php';
 }
@@ -1508,8 +1591,8 @@ if ($action == 'create') {
 
 			$cond_reglement_id 	= (!empty($objectsrc->cond_reglement_id) ? $objectsrc->cond_reglement_id : (!empty($soc->cond_reglement_id) ? $soc->cond_reglement_id : 0)); // TODO maybe add default value option
 			$mode_reglement_id 	= (!empty($objectsrc->mode_reglement_id) ? $objectsrc->mode_reglement_id : (!empty($soc->mode_reglement_id) ? $soc->mode_reglement_id : 0));
+			$remise_absolue 	= (!empty($objectsrc->remise_absolue) ? $objectsrc->remise_absolue : (!empty($soc->remise_absolue) ? $soc->remise_absolue : 0));	// deprecated
 			$remise_percent 	= (!empty($objectsrc->remise_percent) ? $objectsrc->remise_percent : (!empty($soc->remise_percent) ? $soc->remise_percent : 0));
-			$remise_absolue 	= (!empty($objectsrc->remise_absolue) ? $objectsrc->remise_absolue : (!empty($soc->remise_absolue) ? $soc->remise_absolue : 0));
 			$warehouse_id       = (!empty($objectsrc->warehouse_id) ? $objectsrc->warehouse_id : (!empty($soc->warehouse_id) ? $soc->warehouse_id : 0));
 			$dateinvoice = (empty($dateinvoice) ? (empty($conf->global->MAIN_AUTOFILL_DATE) ?-1 : '') : $dateinvoice);
 
@@ -1545,8 +1628,6 @@ if ($action == 'create') {
 		}
 	}
 
-	$object = new Propal($db);
-
 	print '<form name="addprop" action="'.$_SERVER["PHP_SELF"].'" method="POST">';
 	print '<input type="hidden" name="token" value="'.newToken().'">';
 	print '<input type="hidden" name="action" value="add">';
@@ -1562,18 +1643,19 @@ if ($action == 'create') {
 	print '<table class="border centpercent">';
 
 	// Reference
-	print '<tr><td class="titlefieldcreate fieldrequired">'.$langs->trans('Ref').'</td><td>'.$langs->trans("Draft").'</td></tr>';
+	print '<tr class="field_ref"><td class="titlefieldcreate fieldrequired">'.$langs->trans('Ref').'</td><td class="valuefieldcreate">'.$langs->trans("Draft").'</td></tr>';
 
 	// Ref customer
-	print '<tr><td>'.$langs->trans('RefCustomer').'</td><td>';
+	print '<tr class="field_ref_client"><td class="titlefieldcreate">'.$langs->trans('RefCustomer').'</td><td class="valuefieldcreate">';
 	print '<input type="text" name="ref_client" value="'.GETPOST('ref_client').'"></td>';
 	print '</tr>';
 
 	// Third party
-	print '<tr>';
-	print '<td class="fieldrequired">'.$langs->trans('Customer').'</td>';
+	print '<tr class="field_socid">';
+	print '<td class="titlefieldcreate fieldrequired">'.$langs->trans('Customer').'</td>';
+	$shipping_method_id = 0;
 	if ($socid > 0) {
-		print '<td>';
+		print '<td class="valuefieldcreate">';
 		print $soc->getNomUrl(1);
 		print '<input type="hidden" name="socid" value="'.$soc->id.'">';
 		print '</td>';
@@ -1582,7 +1664,7 @@ if ($action == 'create') {
 		}
 		//$warehouse_id       = $soc->warehouse_id;
 	} else {
-		print '<td>';
+		print '<td class="valuefieldcreate">';
 		print img_picto('', 'company').$form->select_company('', 'socid', '(s.client = 1 OR s.client = 2 OR s.client = 3) AND status=1', 'SelectThirdParty', 0, 0, null, 0, 'minwidth300 maxwidth500 widthcentpercentminusxx');
 		// reload page to retrieve customer informations
 		if (empty($conf->global->RELOAD_PAGE_ON_CUSTOMER_CHANGE_DISABLED)) {
@@ -1605,13 +1687,13 @@ if ($action == 'create') {
 
 	if ($socid > 0) {
 		// Contacts (ask contact only if thirdparty already defined).
-		print "<tr><td>".$langs->trans("DefaultContact").'</td><td>';
+		print '<tr class="field_contactid"><td class="titlefieldcreate">'.$langs->trans("DefaultContact").'</td><td class="valuefieldcreate">';
 		print img_picto('', 'contact');
 		print $form->selectcontacts($soc->id, $contactid, 'contactid', 1, '', '', 0, 'minwidth300');
 		print '</td></tr>';
 
 		// Third party discounts info line
-		print '<tr><td>'.$langs->trans('Discounts').'</td><td>';
+		print '<tr class="field_discount_info"><td class="titlefieldcreate">'.$langs->trans('Discounts').'</td><td class="valuefieldcreate">';
 
 		$absolute_discount = $soc->getAvailableDiscounts();
 
@@ -1623,45 +1705,45 @@ if ($action == 'create') {
 	}
 
 	// Date
-	print '<tr><td class="fieldrequired">'.$langs->trans('DatePropal').'</td><td>';
+	print '<tr class="field_addprop"><td class="titlefieldcreate fieldrequired">'.$langs->trans('DatePropal').'</td><td class="valuefieldcreate">';
 	print $form->selectDate('', '', '', '', '', "addprop", 1, 1);
 	print '</td></tr>';
 
 	// Validaty duration
-	print '<tr><td class="fieldrequired">'.$langs->trans("ValidityDuration").'</td><td>'.img_picto('', 'clock').'&ensp;<input name="duree_validite" class="width50" value="'.(GETPOSTISSET('duree_validite') ? GETPOST('duree_validite', 'alphanohtml') : $conf->global->PROPALE_VALIDITY_DURATION).'"> '.$langs->trans("days").'</td></tr>';
+	print '<tr class="field_duree_validitee"><td class="titlefieldcreate fieldrequired">'.$langs->trans("ValidityDuration").'</td><td class="valuefieldcreate">'.img_picto('', 'clock', 'class="paddingright"').'<input name="duree_validite" class="width50" value="'.(GETPOSTISSET('duree_validite') ? GETPOST('duree_validite', 'alphanohtml') : $conf->global->PROPALE_VALIDITY_DURATION).'"> '.$langs->trans("days").'</td></tr>';
 
 	// Terms of payment
-	print '<tr><td class="nowrap">'.$langs->trans('PaymentConditionsShort').'</td><td>';
+	print '<tr class="field_cond_reglement_id"><td class="nowrap">'.$langs->trans('PaymentConditionsShort').'</td><td>';
 	print img_picto('', 'paiment');
-	$form->select_conditions_paiements((GETPOSTISSET('cond_reglement_id') ? GETPOST('cond_reglement_id', 'int') : $soc->cond_reglement_id), 'cond_reglement_id', -1, 1);
+	$form->select_conditions_paiements((GETPOSTISSET('cond_reglement_id') && GETPOST('cond_reglement_id') != 0) ? GETPOST('cond_reglement_id', 'int') : $soc->cond_reglement_id, 'cond_reglement_id', 1, 1, 0, '', (GETPOSTISSET('cond_reglement_id_deposit_percent') ? GETPOST('cond_reglement_id_deposit_percent', 'alpha') : $soc->deposit_percent));
 	print '</td></tr>';
 
 	// Mode of payment
-	print '<tr><td>'.$langs->trans('PaymentMode').'</td><td>';
-	print img_picto('', 'bank').'&ensp;';
+	print '<tr class="field_mode_reglement_id"><td class="titlefieldcreate">'.$langs->trans('PaymentMode').'</td><td class="valuefieldcreate">';
+	print img_picto('', 'bank', 'class="pictofixedwidth"');
 	$form->select_types_paiements((GETPOSTISSET('mode_reglement_id') ? GETPOST('mode_reglement_id', 'int') : $soc->mode_reglement_id), 'mode_reglement_id', 'CRDT', 0, 1, 0, 0, 1, 'maxwidth200 widthcentpercentminusx');
 	print '</td></tr>';
 
 	// Bank Account
 	if (!empty($conf->global->BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL) && !empty($conf->banque->enabled)) {
-		print '<tr><td>'.$langs->trans('BankAccount').'</td><td>';
+		print '<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($soc->fk_account, 'fk_account', 0, '', 1, '', 0, 'maxwidth200 widthcentpercentminusx', 1);
 		print '</td></tr>';
 	}
 
 	// Source / Channel - What trigger creation
-	print '<tr><td>'.$langs->trans('Source').'</td><td>';
+	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('', 'demand_reason_id', "SRC_PROP", 1, 'maxwidth200 widthcentpercentminusx');
 	print '</td></tr>';
 
 	// Delivery delay
-	print '<tr class="fielddeliverydelay"><td>'.$langs->trans('AvailabilityPeriod');
+	print '<tr class="field_availability_id"><td class="titlefieldcreate">'.$langs->trans('AvailabilityPeriod');
 	if (!empty($conf->commande->enabled)) {
 		print ' ('.$langs->trans('AfterOrder').')';
 	}
-	print '</td><td>';
-	print img_picto('', 'clock').'&ensp;';
+	print '</td><td class="valuefieldcreate">';
+	print img_picto('', 'clock', 'class="pictofixedwidth"');
 	$form->selectAvailabilityDelay('', 'availability_id', '', 1, 'maxwidth200 widthcentpercentminusx');
 	print '</td></tr>';
 
@@ -1670,7 +1752,7 @@ if ($action == 'create') {
 		if (!empty($conf->global->SOCIETE_ASK_FOR_SHIPPING_METHOD) && !empty($soc->shipping_method_id)) {
 			$shipping_method_id = $soc->shipping_method_id;
 		}
-		print '<tr><td>'.$langs->trans('SendingMethod').'</td><td>';
+		print '<tr class="field_shipping_method_id"><td class="titlefieldcreate">'.$langs->trans('SendingMethod').'</td><td class="valuefieldcreate">';
 		print img_picto('', 'object_dollyrevert', 'class="pictofixedwidth"');
 		print $form->selectShippingMethod($shipping_method_id, 'shipping_method_id', '', 1, '', 0, 'maxwidth200 widthcentpercentminusx');
 		print '</td></tr>';
@@ -1680,15 +1762,15 @@ if ($action == 'create') {
 	if (!empty($conf->stock->enabled) && !empty($conf->global->WAREHOUSE_ASK_WAREHOUSE_DURING_PROPAL)) {
 		require_once DOL_DOCUMENT_ROOT.'/product/class/html.formproduct.class.php';
 		$formproduct = new FormProduct($db);
-		print '<tr><td>'.$langs->trans('Warehouse').'</td><td>';
+		print '<tr class="field_warehouse_id"><td class="titlefieldcreate">'.$langs->trans('Warehouse').'</td><td class="valuefieldcreate">';
 		print img_picto('', 'stock', 'class="pictofixedwidth"').$formproduct->selectWarehouses($warehouse_id, 'warehouse_id', '', 1, 0, 0, '', 0, 0, array(), 'maxwidth500 widthcentpercentminusxx');
 		print '</td></tr>';
 	}
 
 	// Delivery date (or manufacturing)
-	print '<tr><td>'.$langs->trans("DeliveryDate").'</td>';
-	print '<td>';
-	if ($conf->global->DATE_LIVRAISON_WEEK_DELAY != "") {
+	print '<tr class="field_date_livraison"><td class="titlefieldcreate">'.$langs->trans("DeliveryDate").'</td>';
+	print '<td class="valuefieldcreate">';
+	if (isset($conf->global->DATE_LIVRAISON_WEEK_DELAY) && is_numeric($conf->global->DATE_LIVRAISON_WEEK_DELAY)) {
 		$tmpdte = time() + ((7 * $conf->global->DATE_LIVRAISON_WEEK_DELAY) * 24 * 60 * 60);
 		$syear = date("Y", $tmpdte);
 		$smonth = date("m", $tmpdte);
@@ -1702,8 +1784,8 @@ if ($action == 'create') {
 	// Project
 	if (!empty($conf->projet->enabled)) {
 		$langs->load("projects");
-		print '<tr>';
-		print '<td>'.$langs->trans("Project").'</td><td>';
+		print '<tr class="field_projectid">';
+		print '<td class="titlefieldcreate">'.$langs->trans("Project").'</td><td class="valuefieldcreate">';
 		print img_picto('', 'project', 'class="pictofixedwidth"').$formproject->select_projects(($soc->id > 0 ? $soc->id : -1), $projectid, 'projectid', 0, 0, 1, 1, 0, 0, 0, '', 1, 0, 'maxwidth500 widthcentpercentminusxx');
 		print ' <a href="'.DOL_URL_ROOT.'/projet/card.php?socid='.$soc->id.'&action=create&status=1&backtopage='.urlencode($_SERVER["PHP_SELF"].'?action=create&socid='.$soc->id).'"><span class="fa fa-plus-circle valignmiddle paddingleft" title="'.$langs->trans("AddProject").'"></span></a>';
 		print '</td>';
@@ -1712,45 +1794,45 @@ if ($action == 'create') {
 
 	// Incoterms
 	if (!empty($conf->incoterm->enabled)) {
-		print '<tr>';
-		print '<td><label for="incoterm_id">'.$form->textwithpicto($langs->trans("IncotermLabel"), $soc->label_incoterms, 1).'</label></td>';
-		print '<td class="maxwidthonsmartphone">';
+		print '<tr class="field_incoterm_id">';
+		print '<td class="titlefieldcreate"><label for="incoterm_id">'.$form->textwithpicto($langs->trans("IncotermLabel"), $soc->label_incoterms, 1).'</label></td>';
+		print '<td  class="valuefieldcreate maxwidthonsmartphone">';
 		print $form->select_incoterms((!empty($soc->fk_incoterms) ? $soc->fk_incoterms : ''), (!empty($soc->location_incoterms) ? $soc->location_incoterms : ''));
 		print '</td></tr>';
 	}
 
 	// Template to use by default
-	print '<tr>';
-	print '<td>'.$langs->trans("DefaultModel").'</td>';
-	print '<td>';
-	print img_picto('', 'pdf').'&ensp;';
+	print '<tr class="field_model">';
+	print '<td class="titlefieldcreate">'.$langs->trans("DefaultModel").'</td>';
+	print '<td class="valuefieldcreate">';
+	print img_picto('', 'pdf', 'class="pictofixedwidth"');
 	$liste = ModelePDFPropales::liste_modeles($db);
-	$preselected = ($conf->global->PROPALE_ADDON_PDF_ODT_DEFAULT ? $conf->global->PROPALE_ADDON_PDF_ODT_DEFAULT : $conf->global->PROPALE_ADDON_PDF);
+	$preselected = (!empty($conf->global->PROPALE_ADDON_PDF_ODT_DEFAULT) ? $conf->global->PROPALE_ADDON_PDF_ODT_DEFAULT : getDolGlobalString("PROPALE_ADDON_PDF"));
 	print $form->selectarray('model', $liste, $preselected, 0, 0, 0, '', 0, 0, 0, '', 'maxwidth200 widthcentpercentminusx', 1);
 	print "</td></tr>";
 
 	// Multicurrency
 	if (!empty($conf->multicurrency->enabled)) {
-		print '<tr>';
-		print '<td>'.$form->editfieldkey('Currency', 'multicurrency_code', '', $object, 0).'</td>';
-		print '<td class="maxwidthonsmartphone">';
-		print $form->selectMultiCurrency($currency_code, 'multicurrency_code', 0);
+		print '<tr class="field_currency">';
+		print '<td class="titlefieldcreate">'.$form->editfieldkey('Currency', 'multicurrency_code', '', $object, 0).'</td>';
+		print '<td class="valuefieldcreate maxwidthonsmartphone">';
+		print img_picto('', 'currency', 'class="pictofixedwidth"').$form->selectMultiCurrency($currency_code, 'multicurrency_code', 0);
 		print '</td></tr>';
 	}
 
 	// Public note
-	print '<tr>';
-	print '<td class="tdtop">'.$langs->trans('NotePublic').'</td>';
-	print '<td valign="top">';
-	$note_public = $object->getDefaultCreateValueFor('note_public', (is_object($objectsrc) ? $objectsrc->note_public : null));
+	print '<tr class="field_note_public">';
+	print '<td class="titlefieldcreate tdtop">'.$langs->trans('NotePublic').'</td>';
+	print '<td class="valuefieldcreate">';
+	$note_public = $object->getDefaultCreateValueFor('note_public', (!empty($objectsrc) ? $objectsrc->note_public : null));
 	$doleditor = new DolEditor('note_public', $note_public, '', 80, 'dolibarr_notes', 'In', 0, false, empty($conf->global->FCKEDITOR_ENABLE_NOTE_PUBLIC) ? 0 : 1, ROWS_3, '90%');
 	print $doleditor->Create(1);
 
 	// Private note
 	if (empty($user->socid)) {
-		print '<tr>';
-		print '<td class="tdtop">'.$langs->trans('NotePrivate').'</td>';
-		print '<td valign="top">';
+		print '<tr class="field_note_private">';
+		print '<td class="titlefieldcreate tdtop">'.$langs->trans('NotePrivate').'</td>';
+		print '<td class="valuefieldcreate">';
 		$note_private = $object->getDefaultCreateValueFor('note_private', ((!empty($origin) && !empty($originid) && is_object($objectsrc)) ? $objectsrc->note_private : null));
 		$doleditor = new DolEditor('note_private', $note_private, '', 80, 'dolibarr_notes', 'In', 0, false, empty($conf->global->FCKEDITOR_ENABLE_NOTE_PRIVATE) ? 0 : 1, ROWS_3, '90%');
 		print $doleditor->Create(1);
@@ -1766,7 +1848,7 @@ if ($action == 'create') {
 		// TODO for compatibility
 		if ($origin == 'contrat') {
 			// Calcul contrat->price (HT), contrat->total (TTC), contrat->tva
-			$objectsrc->remise_absolue = $remise_absolue;
+			$objectsrc->remise_absolue = $remise_absolue;	// deprecated
 			$objectsrc->remise_percent = $remise_percent;
 			$objectsrc->update_price(1, - 1, 1);
 		}
@@ -1863,11 +1945,8 @@ if ($action == 'create') {
 	print dol_get_fiche_end();
 
 	$langs->load("bills");
-	print '<div class="center">';
-	print '<input type="submit" class="button" value="'.$langs->trans("CreateDraft").'">';
-	print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
-	print '<input type="button" class="button button-cancel" value="'.$langs->trans("Cancel").'" onClick="javascript:history.go(-1)">';
-	print '</div>';
+
+	print $form->buttonsSaveCancel("CreateDraft");
 
 	print "</form>";
 
@@ -1879,11 +1958,13 @@ if ($action == 'create') {
 		$title = $langs->trans('ProductsAndServices');
 		print load_fiche_titre($title);
 
+		print '<div class="div-table-responsive-no-min">';
 		print '<table class="noborder centpercent">';
 
 		$objectsrc->printOriginLinesList();
 
 		print '</table>';
+		print '</div>';
 	}
 } elseif ($object->id > 0) {
 	/*
@@ -1904,8 +1985,8 @@ if ($action == 'create') {
 		$formquestion = array(
 			// 'text' => $langs->trans("ConfirmClone"),
 			// array('type' => 'checkbox', 'name' => 'clone_content', 'label' => $langs->trans("CloneMainAttributes"), 'value' => 1),
-			// array('type' => 'checkbox', 'name' => 'update_prices', 'label' => $langs->trans("PuttingPricesUpToDate"), 'value' => 1),
-			array('type' => 'other', 'name' => 'socid', 'label' => $langs->trans("SelectThirdParty"), 'value' => $form->select_company(GETPOST('socid', 'int'), 'socid', '(s.client=1 OR s.client=2 OR s.client=3)'))
+			array('type' => 'other', 'name' => 'socid', 'label' => $langs->trans("SelectThirdParty"), 'value' => $form->select_company(GETPOST('socid', 'int'), 'socid', '(s.client=1 OR s.client=2 OR s.client=3)', '', 0, 0, null, 0, 'maxwidth300')),
+			array('type' => 'checkbox', 'name' => 'update_prices', 'label' => $langs->trans('PuttingPricesUpToDate'), 'value' => (!empty($conf->global->PROPOSAL_CLONE_UPDATE_PRICES) ? 1 : 0)),
 		);
 		if (!empty($conf->global->PROPAL_CLONE_DATE_DELIVERY) && !empty($object->delivery_date)) {
 			$formquestion[] = array('type' => 'date', 'name' => 'date_delivery', 'label' => $langs->trans("DeliveryDate"), 'value' => $object->delivery_date);
@@ -1922,6 +2003,129 @@ if ($action == 'create') {
 		}
 		$formquestion[] = array('type' => 'text', 'name' => 'note_private', 'label' => $langs->trans("Note"), 'value' => '');				// Field to complete private note (not replace)
 
+		$deposit_percent_from_payment_terms = getDictionaryValue('c_payment_term', 'deposit_percent', $object->cond_reglement_id);
+
+		if (! empty($deposit_percent_from_payment_terms) && ! empty($conf->facture->enabled) && ! empty($user->rights->facture->creer)) {
+			require_once DOL_DOCUMENT_ROOT . '/compta/facture/class/facture.class.php';
+
+			$object->fetchObjectLinked();
+
+			$eligibleForDepositGeneration = true;
+
+			if (array_key_exists('facture', $object->linkedObjects)) {
+				foreach ($object->linkedObjects['facture'] as $invoice) {
+					if ($invoice->type == Facture::TYPE_DEPOSIT) {
+						$eligibleForDepositGeneration = false;
+						break;
+					}
+				}
+			}
+
+			if ($eligibleForDepositGeneration && array_key_exists('commande', $object->linkedObjects)) {
+				foreach ($object->linkedObjects['commande'] as $order) {
+					$order->fetchObjectLinked();
+
+					if (array_key_exists('facture', $order->linkedObjects)) {
+						foreach ($order->linkedObjects['facture'] as $invoice) {
+							if ($invoice->type == Facture::TYPE_DEPOSIT) {
+								$eligibleForDepositGeneration = false;
+								break 2;
+							}
+						}
+					}
+				}
+			}
+
+
+			if ($eligibleForDepositGeneration) {
+				$formquestion[] = array(
+					'type' => 'checkbox',
+					'tdclass' => 'showonlyifsigned',
+					'name' => 'generate_deposit',
+					'label' => $form->textwithpicto($langs->trans('GenerateDeposit', $object->deposit_percent), $langs->trans('DepositGenerationPermittedByThePaymentTermsSelected'))
+				);
+
+				$formquestion[] = array(
+					'type' => 'date',
+					'tdclass' => 'fieldrequired showonlyifgeneratedeposit',
+					'name' => 'datef',
+					'label' => $langs->trans('DateInvoice'),
+					'value' => dol_now(),
+					'datenow' => true
+				);
+
+				if (! empty($conf->global->INVOICE_POINTOFTAX_DATE)) {
+					$formquestion[] = array(
+						'type' => 'date',
+						'tdclass' => 'fieldrequired showonlyifgeneratedeposit',
+						'name' => 'date_pointoftax',
+						'label' => $langs->trans('DatePointOfTax'),
+						'value' => dol_now(),
+						'datenow' => true
+					);
+				}
+
+				ob_start();
+				$form->select_conditions_paiements(0, 'cond_reglement_id', -1, 0, 0, 'minwidth200');
+				$paymentTermsSelect = ob_get_clean();
+
+				$formquestion[] = array(
+					'type' => 'other',
+					'tdclass' => 'fieldrequired showonlyifgeneratedeposit',
+					'name' => 'cond_reglement_id',
+					'label' => $langs->trans('PaymentTerm'),
+					'value' => $paymentTermsSelect
+				);
+
+				$formquestion[] = array(
+					'type' => 'checkbox',
+					'tdclass' => 'showonlyifgeneratedeposit',
+					'name' => 'validate_generated_deposit',
+					'label' => $langs->trans('ValidateGeneratedDeposit')
+				);
+
+				$formquestion[] = array(
+					'type' => 'onecolumn',
+					'value' => '
+						<script>
+							let signedValue = ' . $object::STATUS_SIGNED . ';
+
+							$(document).ready(function() {
+								$("[name=generate_deposit]").change(function () {
+									let $self = $(this);
+									let $target = $(".showonlyifgeneratedeposit").parent(".tagtr");
+
+									if (! $self.parents(".tagtr").is(":hidden") && $self.is(":checked")) {
+										$target.show();
+									} else {
+										$target.hide();
+									}
+
+									return true;
+								});
+
+								$("#statut").change(function() {
+									let $target = $(".showonlyifsigned").parent(".tagtr");
+
+									if ($(this).val() == signedValue) {
+										$target.show();
+									} else {
+										$target.hide();
+									}
+
+									$("[name=generate_deposit]").trigger("change");
+
+									return true;
+								});
+
+								$("#statut").trigger("change");
+							});
+						</script>
+					'
+				);
+			}
+		}
+
 		if (!empty($conf->notification->enabled)) {
 			require_once DOL_DOCUMENT_ROOT.'/core/class/notify.class.php';
 			$notify = new Notify($db);
@@ -1950,7 +2154,7 @@ if ($action == 'create') {
 
 		// We verify whether the object is provisionally numbering
 		$ref = substr($object->ref, 1, 4);
-		if ($ref == 'PROV') {
+		if ($ref == 'PROV' || $ref == '') {
 			$numref = $object->getNextNumRef($soc);
 			if (empty($numref)) {
 				$error++;
@@ -1968,6 +2172,21 @@ if ($action == 'create') {
 			$text .= $notify->confirmMessage('PROPAL_VALIDATE', $object->socid, $object);
 		}
 
+		// mandatoryPeriod
+		$nbMandated = 0;
+		foreach ($object->lines as $line) {
+			$res = $line->fetch_product();
+			if ($res  > 0  ) {
+				if ($line->product->isService() && $line->product->isMandatoryPeriod() && (empty($line->date_start) || empty($line->date_end) )) {
+					$nbMandated++;
+					break;
+				}
+			}
+		}
+		if ($nbMandated > 0) {
+			$text .= '<div><span class="clearboth nowraponall warning">'.$langs->trans("mandatoryPeriodNeedTobeSetMsgValidate").'</span></div>';
+		}
+
 		if (!$error) {
 			$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('ValidateProp'), $text, 'confirm_validate', '', 0, 1);
 		}
@@ -1995,17 +2214,17 @@ if ($action == 'create') {
 	$morehtmlref .= $form->editfieldkey("RefCustomer", 'ref_client', $object->ref_client, $object, $usercancreate, 'string', '', 0, 1);
 	$morehtmlref .= $form->editfieldval("RefCustomer", 'ref_client', $object->ref_client, $object, $usercancreate, 'string', '', null, null, '', 1);
 	// Thirdparty
-	$morehtmlref .= '<br>'.$langs->trans('ThirdParty').' : '.$object->thirdparty->getNomUrl(1, 'customer');
+	$morehtmlref .= '<br><span class="hideonsmartphone">'.$langs->trans('ThirdParty').' : </span>'.$object->thirdparty->getNomUrl(1, 'customer');
 	if (empty($conf->global->MAIN_DISABLE_OTHER_LINK) && $object->thirdparty->id > 0) {
 		$morehtmlref .= ' (<a href="'.DOL_URL_ROOT.'/comm/propal/list.php?socid='.$object->thirdparty->id.'&search_societe='.urlencode($object->thirdparty->name).'">'.$langs->trans("OtherProposals").'</a>)';
 	}
 	// Project
 	if (!empty($conf->projet->enabled)) {
 		$langs->load("projects");
-		$morehtmlref .= '<br>'.$langs->trans('Project').' ';
+		$morehtmlref .= '<br><span class="paddingrightonly">'.$langs->trans('Project').'</span>';
 		if ($usercancreate) {
 			if ($action != 'classify') {
-				$morehtmlref .= '<a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?action=classify&amp;id='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('SetProject')).'</a> : ';
+				$morehtmlref .= '<a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?action=classify&token='.newToken().'&id='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('SetProject')).'</a> : ';
 			}
 			if ($action == 'classify') {
 				//$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
@@ -2022,9 +2241,10 @@ if ($action == 'create') {
 			if (!empty($object->fk_project)) {
 				$proj = new Project($db);
 				$proj->fetch($object->fk_project);
-				$morehtmlref .= '<a href="'.DOL_URL_ROOT.'/projet/card.php?id='.$object->fk_project.'" title="'.$langs->trans('ShowProject').'">';
-				$morehtmlref .= $proj->ref;
-				$morehtmlref .= '</a>';
+				$morehtmlref .= ': '.$proj->getNomUrl(1);
+				if ($proj->title) {
+					$morehtmlref .= ' - '.$proj->title;
+				}
 			} else {
 				$morehtmlref .= '';
 			}
@@ -2058,6 +2278,8 @@ if ($action == 'create') {
 	$absolute_discount = price2num($absolute_discount, 'MT');
 	$absolute_creditnote = price2num($absolute_creditnote, 'MT');
 
+	$caneditfield = ($object->statut != Propal::STATUS_SIGNED && $object->statut != Propal::STATUS_BILLED);
+
 	$thirdparty = $soc;
 	$discount_type = 0;
 	$backtopage = urlencode($_SERVER["PHP_SELF"].'?id='.$object->id);
@@ -2071,17 +2293,17 @@ if ($action == 'create') {
 	print '<table class="nobordernopadding" width="100%"><tr><td>';
 	print $langs->trans('DatePropal');
 	print '</td>';
-	if ($action != 'editdate' && $object->statut == Propal::STATUS_DRAFT && $usercancreate) {
-		print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editdate&amp;id='.$object->id.'">'.img_edit($langs->trans('SetDate'), 1).'</a></td>';
+	if ($action != 'editdate' && $usercancreate && $caneditfield) {
+		print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editdate&token='.newToken().'&id='.$object->id.'">'.img_edit($langs->trans('SetDate'), 1).'</a></td>';
 	}
 	print '</tr></table>';
 	print '</td><td class="valuefield">';
-	if ($object->statut == Propal::STATUS_DRAFT && $action == 'editdate' && $usercancreate) {
+	if ($action == 'editdate' && $usercancreate && $caneditfield) {
 		print '<form name="editdate" 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, 're', '', '', 0, "editdate");
-		print '<input type="submit" class="button" value="'.$langs->trans('Modify').'">';
+		print '<input type="submit" class="button button-edit" value="'.$langs->trans('Modify').'">';
 		print '</form>';
 	} else {
 		if ($object->date) {
@@ -2098,17 +2320,17 @@ if ($action == 'create') {
 	print '<table class="nobordernopadding" width="100%"><tr><td>';
 	print $langs->trans('DateEndPropal');
 	print '</td>';
-	if ($action != 'editecheance' && $object->statut == Propal::STATUS_DRAFT && $usercancreate) {
-		print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editecheance&amp;id='.$object->id.'">'.img_edit($langs->trans('SetConditions'), 1).'</a></td>';
+	if ($action != 'editecheance' && $usercancreate && $caneditfield) {
+		print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editecheance&token='.newToken().'&id='.$object->id.'">'.img_edit($langs->trans('SetConditions'), 1).'</a></td>';
 	}
 	print '</tr></table>';
 	print '</td><td class="valuefield">';
-	if ($object->statut == Propal::STATUS_DRAFT && $action == 'editecheance' && $usercancreate) {
+	if ($action == 'editecheance' && $usercancreate && $caneditfield) {
 		print '<form name="editecheance" action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'" method="post">';
 		print '<input type="hidden" name="token" value="'.newToken().'">';
 		print '<input type="hidden" name="action" value="setecheance">';
 		print $form->selectDate($object->fin_validite, 'ech', '', '', '', "editecheance");
-		print '<input type="submit" class="button" value="'.$langs->trans('Modify').'">';
+		print '<input type="submit" class="button button-edit" value="'.$langs->trans('Modify').'">';
 		print '</form>';
 	} else {
 		if (!empty($object->fin_validite)) {
@@ -2128,31 +2350,31 @@ if ($action == 'create') {
 	print '<table class="nobordernopadding" width="100%"><tr><td>';
 	print $langs->trans('PaymentConditionsShort');
 	print '</td>';
-	if ($action != 'editconditions' && $object->statut == Propal::STATUS_DRAFT && $usercancreate) {
-		print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editconditions&amp;id='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('SetConditions'), 1).'</a></td>';
+	if ($action != 'editconditions' && $usercancreate && $caneditfield) {
+		print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editconditions&token='.newToken().'&id='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('SetConditions'), 1).'</a></td>';
 	}
 	print '</tr></table>';
 	print '</td><td class="valuefield">';
-	if ($object->statut == Propal::STATUS_DRAFT && $action == 'editconditions' && $usercancreate) {
-		$form->form_conditions_reglement($_SERVER['PHP_SELF'].'?id='.$object->id, $object->cond_reglement_id, 'cond_reglement_id');
+	if ($action == 'editconditions' && $usercancreate && $caneditfield) {
+		$form->form_conditions_reglement($_SERVER['PHP_SELF'].'?id='.$object->id, $object->cond_reglement_id, 'cond_reglement_id', 0, '', 1, $object->deposit_percent);
 	} else {
-		$form->form_conditions_reglement($_SERVER['PHP_SELF'].'?id='.$object->id, $object->cond_reglement_id, 'none');
+		$form->form_conditions_reglement($_SERVER['PHP_SELF'].'?id='.$object->id, $object->cond_reglement_id, 'none', 0, '', 1, $object->deposit_percent);
 	}
 	print '</td>';
 	print '</tr>';
 
 	// Payment mode
-	print '<tr>';
-	print '<td class="valuefield">';
-	print '<table class="nobordernopadding" width="100%"><tr><td>';
+	print '<tr class="field_mode_reglement_id">';
+	print '<td class="titlefieldcreate">';
+	print '<table class="nobordernopadding centpercent"><tr><td>';
 	print $langs->trans('PaymentMode');
 	print '</td>';
-	if ($action != 'editmode' && $object->statut == Propal::STATUS_DRAFT && $usercancreate) {
-		print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editmode&amp;id='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('SetMode'), 1).'</a></td>';
+	if ($action != 'editmode' && $usercancreate && $caneditfield) {
+		print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editmode&token='.newToken().'&id='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('SetMode'), 1).'</a></td>';
 	}
 	print '</tr></table>';
 	print '</td><td class="valuefieldcreate">';
-	if ($object->statut == Propal::STATUS_DRAFT && $action == 'editmode' && $usercancreate) {
+	if ($action == 'editmode' && $usercancreate && $caneditfield) {
 		$form->form_modes_reglement($_SERVER['PHP_SELF'].'?id='.$object->id, $object->mode_reglement_id, 'mode_reglement_id', 'CRDT', 1, 1);
 	} else {
 		$form->form_modes_reglement($_SERVER['PHP_SELF'].'?id='.$object->id, $object->mode_reglement_id, 'none');
@@ -2162,26 +2384,27 @@ if ($action == 'create') {
 	// Delivery date
 	$langs->load('deliveries');
 	print '<tr><td>';
-	print $form->editfieldkey($langs->trans('DeliveryDate'), 'date_livraison', $object->delivery_date, $object, $usercancreate, 'datepicker');
-	print '</td><td class="valuefield">';
-	print $form->editfieldval($langs->trans('DeliveryDate'), 'date_livraison', $object->delivery_date, $object, $usercancreate, 'datepicker');
+	print $form->editfieldkey($langs->trans('DeliveryDate'), 'date_livraison', $object->delivery_date, $object, $usercancreate && $caneditfield, 'datepicker');
+	print '</td><td class="valuefieldedit">';
+	print $form->editfieldval($langs->trans('DeliveryDate'), 'date_livraison', $object->delivery_date, $object, $usercancreate && $caneditfield, 'datepicker');
 	print '</td>';
 	print '</tr>';
 
 	// Delivery delay
 	print '<tr class="fielddeliverydelay"><td>';
 	print '<table class="nobordernopadding" width="100%"><tr><td>';
-	print $langs->trans('AvailabilityPeriod');
 	if (!empty($conf->commande->enabled)) {
-		print ' ('.$langs->trans('AfterOrder').')';
+		print $form->textwithpicto($langs->trans('AvailabilityPeriod'), $langs->trans('AvailabilityPeriod').' ('.$langs->trans('AfterOrder').')');
+	} else {
+		print $langs->trans('AvailabilityPeriod');
 	}
 	print '</td>';
-	if ($action != 'editavailability' && $object->statut == Propal::STATUS_DRAFT && $usercancreate) {
-		print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editavailability&amp;id='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('SetAvailability'), 1).'</a></td>';
+	if ($action != 'editavailability' && $usercancreate && $caneditfield) {
+		print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editavailability&token='.newToken().'&id='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('SetAvailability'), 1).'</a></td>';
 	}
 	print '</tr></table>';
 	print '</td><td class="valuefield">';
-	if ($object->statut == Propal::STATUS_DRAFT && $action == 'editavailability' && $usercancreate) {
+	if ($action == 'editavailability' && $usercancreate && $caneditfield) {
 		$form->form_availability($_SERVER['PHP_SELF'].'?id='.$object->id, $object->availability_id, 'availability_id', 1);
 	} else {
 		$form->form_availability($_SERVER['PHP_SELF'].'?id='.$object->id, $object->availability_id, 'none', 1);
@@ -2193,15 +2416,15 @@ if ($action == 'create') {
 	// Shipping Method
 	if (!empty($conf->expedition->enabled)) {
 		print '<tr><td>';
-		print '<table width="100%" class="nobordernopadding"><tr><td>';
+		print '<table class="nobordernopadding centpercent"><tr><td>';
 		print $langs->trans('SendingMethod');
 		print '</td>';
-		if ($action != 'editshippingmethod' && $usercancreate) {
-			print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editshippingmethod&amp;id='.$object->id.'">'.img_edit($langs->trans('SetShippingMode'), 1).'</a></td>';
+		if ($action != 'editshippingmethod' && $usercancreate && $caneditfield) {
+			print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editshippingmethod&token='.newToken().'&id='.$object->id.'">'.img_edit($langs->trans('SetShippingMode'), 1).'</a></td>';
 		}
 		print '</tr></table>';
 		print '</td><td class="valuefield">';
-		if ($action == 'editshippingmethod' && $usercancreate) {
+		if ($action == 'editshippingmethod' && $usercancreate && $caneditfield) {
 			$form->formSelectShippingMethod($_SERVER['PHP_SELF'].'?id='.$object->id, $object->shipping_method_id, 'shipping_method_id', 1);
 		} else {
 			$form->formSelectShippingMethod($_SERVER['PHP_SELF'].'?id='.$object->id, $object->shipping_method_id, 'none');
@@ -2215,7 +2438,7 @@ if ($action == 'create') {
 		$langs->load('stocks');
 		require_once DOL_DOCUMENT_ROOT.'/product/class/html.formproduct.class.php';
 		$formproduct = new FormProduct($db);
-		print '<tr><td>';
+		print '<tr class="field_warehouse_id"><td class="titlefieldcreate">';
 		$editenable = $usercancreate;
 		print $form->editfieldkey("Warehouse", 'warehouse', '', $object, $editenable);
 		print '</td><td class="valuefieldcreate">';
@@ -2230,15 +2453,15 @@ if ($action == 'create') {
 
 	// Origin of demand
 	print '<tr><td>';
-	print '<table class="nobordernopadding" width="100%"><tr><td>';
+	print '<table class="nobordernopadding centpercent"><tr><td>';
 	print $langs->trans('Source');
 	print '</td>';
-	if ($action != 'editdemandreason' && $object->statut == Propal::STATUS_DRAFT && $usercancreate) {
-		print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editdemandreason&amp;id='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('SetDemandReason'), 1).'</a></td>';
+	if ($action != 'editdemandreason' && $usercancreate) {
+		print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editdemandreason&token='.newToken().'&id='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('SetDemandReason'), 1).'</a></td>';
 	}
 	print '</tr></table>';
 	print '</td><td class="valuefield">';
-	if ($object->statut == Propal::STATUS_DRAFT && $action == 'editdemandreason' && $usercancreate) {
+	if ($action == 'editdemandreason' && $usercancreate) {
 		$form->formInputReason($_SERVER['PHP_SELF'].'?id='.$object->id, $object->demand_reason_id, 'demand_reason_id', 1);
 	} else {
 		$form->formInputReason($_SERVER['PHP_SELF'].'?id='.$object->id, $object->demand_reason_id, 'none');
@@ -2255,7 +2478,7 @@ if ($action == 'create') {
 		print $form->editfieldkey('Currency', 'multicurrency_code', '', $object, 0);
 		print '</td>';
 		if ($action != 'editmulticurrencycode' && $object->statut == $object::STATUS_DRAFT && $usercancreate) {
-			print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editmulticurrencycode&amp;id='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('SetMultiCurrencyCode'), 1).'</a></td>';
+			print '<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>';
 		print '</td><td class="valuefield">';
@@ -2275,7 +2498,7 @@ if ($action == 'create') {
 			print $form->editfieldkey('CurrencyRate', 'multicurrency_tx', '', $object, 0);
 			print '</td>';
 			if ($action != 'editmulticurrencyrate' && $object->statut == $object::STATUS_DRAFT && $object->multicurrency_code && $object->multicurrency_code != $conf->currency && $usercancreate) {
-				print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editmulticurrencyrate&amp;id='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('SetMultiCurrencyCode'), 1).'</a></td>';
+				print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editmulticurrencyrate&token='.newToken().'&id='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('SetMultiCurrencyCode'), 1).'</a></td>';
 			}
 			print '</tr></table>';
 			print '</td><td class="valuefield">';
@@ -2316,7 +2539,7 @@ if ($action == 'create') {
 		print $langs->trans('BankAccount');
 		print '</td>';
 		if ($action != 'editbankaccount' && $usercancreate) {
-			print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editbankaccount&amp;id='.$object->id.'">'.img_edit($langs->trans('SetBankAccount'), 1).'</a></td>';
+			print '<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>';
 		print '</td><td class="valuefield">';
@@ -2335,13 +2558,13 @@ if ($action == 'create') {
 	if ($totalWeight) {
 		print '<tr><td>'.$langs->trans("CalculatedWeight").'</td>';
 		print '<td class="valuefield">';
-		print showDimensionInBestUnit($totalWeight, 0, "weight", $langs, isset($conf->global->MAIN_WEIGHT_DEFAULT_ROUND) ? $conf->global->MAIN_WEIGHT_DEFAULT_ROUND : -1, isset($conf->global->MAIN_WEIGHT_DEFAULT_UNIT) ? $conf->global->MAIN_WEIGHT_DEFAULT_UNIT : 'no');
+		print showDimensionInBestUnit($totalWeight, 0, "weight", $langs, isset($conf->global->MAIN_WEIGHT_DEFAULT_ROUND) ? $conf->global->MAIN_WEIGHT_DEFAULT_ROUND : -1, isset($conf->global->MAIN_WEIGHT_DEFAULT_UNIT) ? $conf->global->MAIN_WEIGHT_DEFAULT_UNIT : 'no', 0);
 		print '</td></tr>';
 	}
 	if ($totalVolume) {
 		print '<tr><td>'.$langs->trans("CalculatedVolume").'</td>';
 		print '<td class="valuefield">';
-		print showDimensionInBestUnit($totalVolume, 0, "volume", $langs, isset($conf->global->MAIN_VOLUME_DEFAULT_ROUND) ? $conf->global->MAIN_VOLUME_DEFAULT_ROUND : -1, isset($conf->global->MAIN_VOLUME_DEFAULT_UNIT) ? $conf->global->MAIN_VOLUME_DEFAULT_UNIT : 'no');
+		print showDimensionInBestUnit($totalVolume, 0, "volume", $langs, isset($conf->global->MAIN_VOLUME_DEFAULT_ROUND) ? $conf->global->MAIN_VOLUME_DEFAULT_ROUND : -1, isset($conf->global->MAIN_VOLUME_DEFAULT_UNIT) ? $conf->global->MAIN_VOLUME_DEFAULT_UNIT : 'no', 0);
 		print '</td></tr>';
 	}
 
@@ -2351,18 +2574,18 @@ if ($action == 'create') {
 		print '<table width="100%" class="nobordernopadding"><tr><td>';
 		print $langs->trans('IncotermLabel');
 		print '<td><td class="right">';
-		if ($usercancreate) {
-			print '<a class="editfielda" href="'.DOL_URL_ROOT.'/comm/propal/card.php?id='.$object->id.'&action=editincoterm">'.img_edit().'</a>';
+		if ($action != 'editincoterm' && $usercancreate && $caneditfield) {
+			print '<a class="editfielda" href="'.DOL_URL_ROOT.'/comm/propal/card.php?id='.$object->id.'&action=editincoterm&token='.newToken().'">'.img_edit().'</a>';
 		} else {
 			print '&nbsp;';
 		}
 		print '</td></tr></table>';
 		print '</td>';
 		print '<td class="valuefield">';
-		if ($action != 'editincoterm') {
-			print $form->textwithpicto($object->display_incoterms(), $object->label_incoterms, 1);
-		} else {
+		if ($action == 'editincoterm' && $usercancreate && $caneditfield) {
 			print $form->select_incoterms((!empty($object->fk_incoterms) ? $object->fk_incoterms : ''), (!empty($object->location_incoterms) ? $object->location_incoterms : ''), $_SERVER['PHP_SELF'].'?id='.$object->id);
+		} else {
+			print $form->textwithpicto($object->display_incoterms(), $object->label_incoterms, 1);
 		}
 		print '</td></tr>';
 	}
@@ -2374,7 +2597,6 @@ if ($action == 'create') {
 
 	print '</div>';
 	print '<div class="fichehalfright">';
-	print '<div class="ficheaddleft">';
 	print '<div class="underbanner clearboth"></div>';
 
 	print '<table class="border tableforfield centpercent">';
@@ -2433,7 +2655,6 @@ if ($action == 'create') {
 		$formmargin->displayMarginInfos($object);
 	}
 
-	print '</div>';
 	print '</div>';
 	print '</div>';
 
@@ -2521,7 +2742,7 @@ if ($action == 'create') {
 				if (($object->statut == Propal::STATUS_DRAFT && $object->total_ttc >= 0 && count($object->lines) > 0)
 					|| ($object->statut == Propal::STATUS_DRAFT && !empty($conf->global->PROPAL_ENABLE_NEGATIVE) && count($object->lines) > 0)) {
 					if ($usercanvalidate) {
-						print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=validate">'.$langs->trans('Validate').'</a>';
+						print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=validate&token='.newToken().'">'.(empty($conf->global->PROPAL_SKIP_ACCEPT_REFUSE) ? $langs->trans('Validate') : $langs->trans('ValidateAndSign')).'</a>';
 					} else {
 						print '<a class="butActionRefused classfortooltip" href="#">'.$langs->trans('Validate').'</a>';
 					}
@@ -2533,12 +2754,12 @@ if ($action == 'create') {
 				}*/
 				// Edit
 				if ($object->statut == Propal::STATUS_VALIDATED && $usercancreate) {
-					print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=modif">'.$langs->trans('Modify').'</a>';
+					print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=modif&token='.newToken().'">'.$langs->trans('Modify').'</a>';
 				}
 
 				// ReOpen
-				if (($object->statut == Propal::STATUS_SIGNED || $object->statut == Propal::STATUS_NOTSIGNED || $object->statut == Propal::STATUS_BILLED) && $usercanclose) {
-					print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=reopen'.(empty($conf->global->MAIN_JUMP_TAG) ? '' : '#reopen').'"';
+				if ( (( ! empty($conf->global->PROPAL_REOPEN_UNSIGNED_ONLY) && $object->statut == Propal::STATUS_NOTSIGNED) || (empty($conf->global->PROPAL_REOPEN_UNSIGNED_ONLY) && ($object->statut == Propal::STATUS_SIGNED || $object->statut == Propal::STATUS_NOTSIGNED || $object->statut == Propal::STATUS_BILLED))) && $usercanclose) {
+					print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=reopen&token='.newToken().(empty($conf->global->MAIN_JUMP_TAG) ? '' : '#reopen').'"';
 					print '>'.$langs->trans('ReOpen').'</a>';
 				}
 
@@ -2546,7 +2767,7 @@ if ($action == 'create') {
 				if (empty($user->socid)) {
 					if ($object->statut == Propal::STATUS_VALIDATED || $object->statut == Propal::STATUS_SIGNED || !empty($conf->global->PROPOSAL_SENDBYEMAIL_FOR_ALL_STATUS)) {
 						if ($usercansend) {
-							print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=presend&mode=init#formmailbeforetitle">'.$langs->trans('SendMail').'</a>';
+							print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=presend&token='.newToken().'&mode=init#formmailbeforetitle">'.$langs->trans('SendMail').'</a>';
 						} else {
 							print '<a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("NotEnoughPermissions").'">'.$langs->trans('SendMail').'</a>';
 						}
@@ -2556,7 +2777,7 @@ if ($action == 'create') {
 				// Create a sale order
 				if (!empty($conf->commande->enabled) && $object->statut == Propal::STATUS_SIGNED) {
 					if ($usercancreateorder) {
-						print '<a class="butAction" href="'.DOL_URL_ROOT.'/commande/card.php?action=create&amp;origin='.$object->element.'&amp;originid='.$object->id.'&amp;socid='.$object->socid.'">'.$langs->trans("AddOrder").'</a>';
+						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>';
 					}
 				}
 
@@ -2564,7 +2785,7 @@ if ($action == 'create') {
 				if (!empty($conf->global->WORKFLOW_CAN_CREATE_PURCHASE_ORDER_FROM_PROPOSAL)) {
 					if ($object->statut == Propal::STATUS_SIGNED && ((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD)) || !empty($conf->supplier_order->enabled))) {
 						if ($usercancreatepurchaseorder) {
-							print '<a class="butAction" href="'.DOL_URL_ROOT.'/fourn/commande/card.php?action=create&amp;origin='.$object->element.'&amp;originid='.$object->id.'&amp;socid='.$object->socid.'">'.$langs->trans("AddPurchaseOrder").'</a>';
+							print '<a class="butAction" href="'.DOL_URL_ROOT.'/fourn/commande/card.php?action=create&origin='.$object->element.'&originid='.$object->id.'&socid='.$object->socid.'">'.$langs->trans("AddPurchaseOrder").'</a>';
 						}
 					}
 				}
@@ -2573,7 +2794,7 @@ if ($action == 'create') {
 				if (!empty($conf->service->enabled) && !empty($conf->ficheinter->enabled) && $object->statut == Propal::STATUS_SIGNED) {
 					if ($usercancreateintervention) {
 						$langs->load("interventions");
-						print '<a class="butAction" href="'.DOL_URL_ROOT.'/fichinter/card.php?action=create&amp;origin='.$object->element.'&amp;originid='.$object->id.'&amp;socid='.$object->socid.'">'.$langs->trans("AddIntervention").'</a>';
+						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>';
 					}
 				}
 
@@ -2582,20 +2803,20 @@ if ($action == 'create') {
 					$langs->load("contracts");
 
 					if ($usercancreatecontract) {
-						print '<a class="butAction" href="'.DOL_URL_ROOT.'/contrat/card.php?action=create&amp;origin='.$object->element.'&amp;originid='.$object->id.'&amp;socid='.$object->socid.'">'.$langs->trans('AddContract').'</a>';
+						print '<a class="butAction" href="'.DOL_URL_ROOT.'/contrat/card.php?action=create&origin='.$object->element.'&originid='.$object->id.'&socid='.$object->socid.'">'.$langs->trans('AddContract').'</a>';
 					}
 				}
 
 				// Create an invoice and classify billed
-				if ($object->statut == Propal::STATUS_SIGNED) {
+				if ($object->statut == Propal::STATUS_SIGNED && empty($conf->global->PROPOSAL_ARE_NOT_BILLABLE)) {
 					if (!empty($conf->facture->enabled) && $usercancreateinvoice) {
-						print '<a class="butAction" href="'.DOL_URL_ROOT.'/compta/facture/card.php?action=create&amp;origin='.$object->element.'&amp;originid='.$object->id.'&amp;socid='.$object->socid.'">'.$langs->trans("AddBill").'</a>';
+						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>';
 					}
 
 					$arrayofinvoiceforpropal = $object->getInvoiceArrayList();
 					if ((is_array($arrayofinvoiceforpropal) && count($arrayofinvoiceforpropal) > 0) || empty($conf->global->WORKFLOW_PROPAL_NEED_INVOICE_TO_BE_CLASSIFIED_BILLED)) {
 						if ($usercanclose) {
-							print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=classifybilled&amp;socid='.$object->socid.'">'.$langs->trans("ClassifyBilled").'</a>';
+							print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=classifybilled&token='.newToken().'&socid='.$object->socid.'">'.$langs->trans("ClassifyBilled").'</a>';
 						} else {
 							print '<a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("NotEnoughPermissions").'">'.$langs->trans("ClassifyBilled").'</a>';
 						}
@@ -2606,7 +2827,7 @@ if ($action == 'create') {
 					// Close as accepted/refused
 					if ($object->statut == Propal::STATUS_VALIDATED) {
 						if ($usercanclose) {
-							print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=closeas'.(empty($conf->global->MAIN_JUMP_TAG) ? '' : '#close').'"';
+							print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=closeas&token='.newToken().(empty($conf->global->MAIN_JUMP_TAG) ? '' : '#close').'"';
 							print '>'.$langs->trans('SetAcceptedRefused').'</a>';
 						} else {
 							print '<a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("NotEnoughPermissions").'"';
@@ -2616,19 +2837,19 @@ if ($action == 'create') {
 				} else {
 					// Set not signed (close)
 					if ($object->statut == Propal::STATUS_DRAFT && $usercanclose) {
-						print '<a class="butAction" href="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . '&amp;action=closeas' . (empty($conf->global->MAIN_JUMP_TAG) ? '' : '#close') . '"';
-						print '>' . $langs->trans('Close') . '</a>';
+						print '<a class="butAction" href="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . '&token='.newToken().'&action=closeas&token='.newToken() . (empty($conf->global->MAIN_JUMP_TAG) ? '' : '#close') . '"';
+						print '>' . $langs->trans('SetRefusedAndClose') . '</a>';
 					}
 				}
 
 				// Clone
 				if ($usercancreate) {
-					print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;socid='.$object->socid.'&amp;action=clone&amp;token='.newToken().'&amp;object='.$object->element.'">'.$langs->trans("ToClone").'</a>';
+					print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&socid='.$object->socid.'&action=clone&token='.newToken().'&object='.$object->element.'">'.$langs->trans("ToClone").'</a>';
 				}
 
 				// Delete
 				if ($usercandelete) {
-					print '<a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=delete&amp;token='.newToken().'"';
+					print '<a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=delete&token='.newToken().'"';
 					print '>'.$langs->trans('Delete').'</a>';
 				}
 			}
@@ -2666,7 +2887,7 @@ if ($action == 'create') {
 		$somethingshown = $form->showLinkedObjectBlock($object, $linktoelem, $compatibleImportElementsList);
 
 		// Show online signature link
-		$useonlinesignature = $conf->global->MAIN_FEATURES_LEVEL; // Replace this with 1 when feature to make online signature is ok
+		$useonlinesignature = 1;
 
 		if ($object->statut != Propal::STATUS_DRAFT && $useonlinesignature) {
 			print '<br><!-- Link to sign -->';
@@ -2674,14 +2895,14 @@ if ($action == 'create') {
 			print showOnlineSignatureUrl('proposal', $object->ref).'<br>';
 		}
 
-		print '</div><div class="fichehalfright"><div class="ficheaddleft">';
+		print '</div><div class="fichehalfright">';
 
 		// List of actions on element
 		include_once DOL_DOCUMENT_ROOT.'/core/class/html.formactions.class.php';
 		$formactions = new FormActions($db);
 		$somethingshown = $formactions->showactions($object, 'propal', $socid, 1);
 
-		print '</div></div></div>';
+		print '</div></div>';
 	}
 
 	// Presend form

From 99efd244d6f3f1ab9dfcb9d8fe1a12b6b7bcb2d2 Mon Sep 17 00:00:00 2001
From: atm-lena <lena.papazian@atm-consulting.fr>
Date: Thu, 16 Jun 2022 14:57:32 +0200
Subject: [PATCH 015/974] FIX Page limit GET / POST

---
 htdocs/product/inventory/inventory.php | 17 +++++++++--------
 htdocs/ticket/list.php                 |  1 -
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/htdocs/product/inventory/inventory.php b/htdocs/product/inventory/inventory.php
index ff21b499912..5e0bf2055e5 100644
--- a/htdocs/product/inventory/inventory.php
+++ b/htdocs/product/inventory/inventory.php
@@ -94,6 +94,14 @@ include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be includ
 //if ($user->socid > 0) $socid = $user->socid;
 //$result = restrictedArea($user, 'mymodule', $id);
 
+//Parameters Page
+$param = '&id='.$object->id;
+if ($limit > 0 && $limit != $conf->liste_limit) {
+	$param .= '&limit='.urlencode($limit);
+}
+$paramwithsearch = $param;
+
+
 if (empty($conf->global->MAIN_USE_ADVANCED_PERMS)) {
 	$permissiontoadd = $user->rights->stock->creer;
 	$permissiontodelete = $user->rights->stock->supprimer;
@@ -104,12 +112,6 @@ if (empty($conf->global->MAIN_USE_ADVANCED_PERMS)) {
 
 $now = dol_now();
 
-//Parameters Page
-$param = '&id='.$object->id;
-if ($limit > 0 && $limit != $conf->liste_limit) {
-	$param .= '&limit='.urlencode($limit);
-}
-$paramwithsearch = $param;
 
 
 /*
@@ -547,8 +549,7 @@ if ($object->id > 0) {
 
 	print dol_get_fiche_end();
 
-
-	print '<form id="formrecord" name="formrecord" method="POST" action="'.$_SERVER["PHP_SELF"].'?page='.$page.$paramwithsearch.'">';
+	print '<form id="formrecord" name="formrecord" method="POST" action="'.$_SERVER["PHP_SELF"].'?page='.$page.'&id='.$object->id.'">';
 	print '<input type="hidden" name="token" value="'.newToken().'">';
 	print '<input type="hidden" name="action" value="updateinventorylines">';
 	print '<input type="hidden" name="id" value="'.$object->id.'">';
diff --git a/htdocs/ticket/list.php b/htdocs/ticket/list.php
index a8314c4bf89..edc42dadccb 100644
--- a/htdocs/ticket/list.php
+++ b/htdocs/ticket/list.php
@@ -683,7 +683,6 @@ if ($search_dateclose_end) {
 	$param .= '&search_date_endmonth='.urlencode($tmparray['mon']);
 	$param .= '&search_date_endyear='.urlencode($tmparray['year']);
 }
-
 // List of mass actions available
 $arrayofmassactions = array(
 	//'presend'=>img_picto('', 'email', 'class="pictofixedwidth"').$langs->trans("SendByMail"),

From 4e1dc2792cefa577b274fcadda5ab966ab6a2635 Mon Sep 17 00:00:00 2001
From: atm-lena <lena.papazian@atm-consulting.fr>
Date: Tue, 5 Jul 2022 13:58:35 +0200
Subject: [PATCH 016/974] Add default workstation in service card

---
 .../install/mysql/migration/15.0.0-16.0.0.sql |   3 +
 htdocs/install/mysql/tables/llx_product.sql   |   1 +
 htdocs/langs/fr_FR/mrp.lang                   |   1 +
 htdocs/product/card.php                       |  21 +++
 .../product/class/html.formproduct.class.php  | 157 ++++++++++++++++++
 htdocs/product/class/product.class.php        |  11 +-
 6 files changed, 192 insertions(+), 2 deletions(-)

diff --git a/htdocs/install/mysql/migration/15.0.0-16.0.0.sql b/htdocs/install/mysql/migration/15.0.0-16.0.0.sql
index b57cab5b4eb..c2cb299a63c 100644
--- a/htdocs/install/mysql/migration/15.0.0-16.0.0.sql
+++ b/htdocs/install/mysql/migration/15.0.0-16.0.0.sql
@@ -648,4 +648,7 @@ ALTER TABLE llx_paiement MODIFY COLUMN ext_payment_id varchar(255);
 ALTER TABLE llx_payment_donation MODIFY COLUMN ext_payment_id varchar(255);
 ALTER TABLE llx_prelevement_facture_demande MODIFY COLUMN ext_payment_id varchar(255);
 
+ALTER TABLE llx_product ADD COLUMN fk_default_workstation integer DEFAULT NULL;
+
+
 
diff --git a/htdocs/install/mysql/tables/llx_product.sql b/htdocs/install/mysql/tables/llx_product.sql
index 83e8882caa7..9b124c8fede 100644
--- a/htdocs/install/mysql/tables/llx_product.sql
+++ b/htdocs/install/mysql/tables/llx_product.sql
@@ -107,4 +107,5 @@ create table llx_product
   mandatory_period              tinyint      DEFAULT 0,               -- is used to signal to the user that the start and end dates are mandatory for this type of product the fk_product_type == 1 (service) (non-blocking action)
 
   fk_default_bom                integer      DEFAULT NULL
+  fk_default_workstation        integer      DEFAULT NULL
 )ENGINE=innodb;
diff --git a/htdocs/langs/fr_FR/mrp.lang b/htdocs/langs/fr_FR/mrp.lang
index e65244b584f..6211db86e72 100644
--- a/htdocs/langs/fr_FR/mrp.lang
+++ b/htdocs/langs/fr_FR/mrp.lang
@@ -91,6 +91,7 @@ WorkstationSetup = Configuration du module Poste de travail
 WorkstationSetupPage = Configuration du module Poste de travail 
 WorkstationList=Liste des postes de travail
 WorkstationCreate=Ajouter un nouveau poste de travail
+DefaultWorkstation=Poste de travail par défaut
 ConfirmEnableWorkstation=Voulez-vous vraiment activer le poste de travail <b>%s</b>?
 EnableAWorkstation=Activer le module Poste de travail
 ConfirmDisableWorkstation=Voulez-vous vraiment désactiver la station de travail <b>%s</b>?
diff --git a/htdocs/product/card.php b/htdocs/product/card.php
index d0b7e4ece73..087c7bc11ce 100644
--- a/htdocs/product/card.php
+++ b/htdocs/product/card.php
@@ -52,6 +52,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/product.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/modules/product/modules_product.class.php';
+require_once DOL_DOCUMENT_ROOT.'/workstation/class/workstation.class.php';
 
 if (!empty($conf->propal->enabled)) {
 	require_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php';
@@ -552,6 +553,7 @@ if (empty($reshook)) {
 			$object->duration_value     	 = $duration_value;
 			$object->duration_unit      	 = $duration_unit;
 			$object->fk_default_warehouse	 = GETPOST('fk_default_warehouse');
+			$object->fk_default_workstation	 = GETPOST('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');
@@ -704,6 +706,7 @@ if (empty($reshook)) {
 				$object->status_batch = GETPOST('status_batch', 'aZ09');
 				$object->batch_mask = GETPOST('batch_mask', 'alpha');
 				$object->fk_default_warehouse   = GETPOST('fk_default_warehouse');
+				$object->fk_default_workstation   = GETPOST('fk_default_workstation');
 				// removed from update view so GETPOST always empty
 				/*
 				$object->seuil_stock_alerte     = GETPOST('seuil_stock_alerte');
@@ -1996,6 +1999,15 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 				print '</td></tr>';
 				*/
 			}
+
+			if($object->isService() && $conf->workstation->enabled) {
+				// Default workstation
+				print '<tr><td>'.$langs->trans("DefaultWorkstation").'</td><td>';
+				print img_picto($langs->trans("DefaultWorkstation"), 'workstation', 'class="pictofixedwidth"');
+				print $formproduct->selectWorkstations($object->fk_default_workstation, 'fk_default_workstation', 1);
+				print '</td></tr>';
+			}
+
 			/*
 			else
 			{
@@ -2475,6 +2487,15 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 				print '</td>';
 			}
 
+			if($object->isService() && $conf->workstation->enabled) {
+				$workstation = new Workstation($db);
+				$workstation->fetch($object->fk_default_workstation);
+
+				print '<tr><td>'.$langs->trans("DefaultWorkstation").'</td><td>';
+				print (!empty($workstation->id) ? $workstation->getNomUrl(1) : '');
+				print '</td>';
+			}
+
 			// Parent product.
 			if (!empty($conf->variants->enabled) && ($object->isProduct() || $object->isService())) {
 				$combination = new ProductCombination($db);
diff --git a/htdocs/product/class/html.formproduct.class.php b/htdocs/product/class/html.formproduct.class.php
index 4ede9e1e297..d6017877375 100644
--- a/htdocs/product/class/html.formproduct.class.php
+++ b/htdocs/product/class/html.formproduct.class.php
@@ -42,6 +42,7 @@ class FormProduct
 	// Cache arrays
 	public $cache_warehouses = array();
 	public $cache_lot = array();
+	public $cache_workstations = array();
 
 
 	/**
@@ -172,6 +173,63 @@ class FormProduct
 		}
 	}
 
+	/**
+	 * Load in cache array list of workstations
+	 * If fk_product is not 0, we do not use cache
+	 *
+	 * @param	int		    $fk_product			Add quantity of stock in label for product with id fk_product. Nothing if 0.
+	 * @param	array       $exclude            warehouses ids to exclude
+	 * @param   string      $orderBy            [='e.ref'] Order by
+	 * @return  int                             Nb of loaded lines, 0 if already loaded, <0 if KO
+	 * @throws  Exception
+	 */
+	public function loadWorkstations($fk_product = 0, $exclude = array(), $orderBy = 'w.ref')
+	{
+		global $conf, $langs;
+
+		if (empty($fk_product) && count($this->cache_workstations)) {
+			return 0; // Cache already loaded and we do not want a list with information specific to a product
+		}
+
+		$sql = "SELECT w.rowid, w.ref as label, w.type, w.nb_operators_required,w.thm_operator_estimated,w.thm_machine_estimated";
+		$sql .= " FROM ".$this->db->prefix()."workstation_workstation as w";
+		$sql .= " WHERE 1 = 1";
+		if (!empty($fk_product) && $fk_product > 0) {
+			$sql .= " AND w.fk_product = ".((int) $fk_product);
+		}
+		$sql .= " AND w.entity IN (".getEntity('workstation').")";
+
+		if (is_array($exclude) && !empty($exclude)) {
+			$sql .= ' AND w.rowid NOT IN('.$this->db->sanitize(implode(',', $exclude)).')';
+		}
+
+		$sql .= " ORDER BY ".$orderBy;
+
+		dol_syslog(get_class($this).'::loadWorkstations', LOG_DEBUG);
+		$resql = $this->db->query($sql);
+		if ($resql) {
+			$num = $this->db->num_rows($resql);
+			$i = 0;
+			while ($i < $num) {
+				$obj = $this->db->fetch_object($resql);
+
+				$this->cache_workstations[$obj->rowid]['id'] = $obj->rowid;
+				$this->cache_workstations[$obj->rowid]['ref'] = $obj->ref;
+				$this->cache_workstations[$obj->rowid]['label'] = $obj->label;
+				$this->cache_workstations[$obj->rowid]['type'] = $obj->type;
+				$this->cache_workstations[$obj->rowid]['nb_operators_required'] = $obj->nb_operators_required;
+				$this->cache_workstations[$obj->rowid]['thm_operator_estimated'] = $obj->thm_operator_estimated;
+				$this->cache_workstations[$obj->rowid]['thm_machine_estimated'] = $obj->thm_machine_estimated;
+				$i++;
+			}
+
+			return $num;
+		} else {
+			dol_print_error($this->db);
+			return -1;
+		}
+	}
+
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 * Return full path to current warehouse in $tab (recursive function)
@@ -320,6 +378,105 @@ class FormProduct
 		return $out;
 	}
 
+	/**
+	 *  Return list of workstations
+	 *
+	 *  @param  string|int  $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  int		    $empty			    1=Can be empty, 0 if not
+	 * 	@param	int		    $disabled		    1=Select is disabled
+	 * 	@param	int		    $fk_product		    Add quantity of stock in label for product with id fk_product. Nothing if 0.
+	 *  @param	string	    $empty_label	    Empty label if needed (only if $empty=1)
+	 *  @param	int	    	$forcecombo		    1=Force combo iso ajax select2
+	 *  @param	array	    $events			            Events to add to select2
+	 *  @param  string      $morecss                    Add more css classes to HTML select
+	 *  @param	array	    $exclude            Warehouses ids to exclude
+	 *  @param  int         $showfullpath       1=Show full path of name (parent ref into label), 0=Show only ref of current warehouse
+	 *  @param  string      $orderBy            [='e.ref'] Order by
+	 * 	@return string					        HTML select
+	 *
+	 *  @throws Exception
+	 */
+	public function selectWorkstations($selected = '', $htmlname = 'idworkstations', $empty = 0, $disabled = 0, $fk_product = 0, $empty_label = '', $forcecombo = 0, $events = array(), $morecss = 'minwidth200', $exclude = array(), $showfullpath = 1, $orderBy = 'e.ref')
+	{
+		global $conf, $langs, $user, $hookmanager;
+
+		dol_syslog(get_class($this)."::selectWorkstations $selected, $htmlname, $empty, $disabled, $fk_product, $empty_label, $forcecombo, $morecss", LOG_DEBUG);
+
+		$out = '';
+		if (!empty($fk_product) && $fk_product > 0) {
+			$this->cache_workstations = array();
+		}
+
+		$this->loadWorkstations($fk_product);
+		$nbofworkstations = count($this->cache_workstations);
+
+		if ($conf->use_javascript_ajax && !$forcecombo) {
+			include_once DOL_DOCUMENT_ROOT.'/core/lib/ajax.lib.php';
+			$comboenhancement = ajax_combobox($htmlname, $events);
+			$out .= $comboenhancement;
+		}
+
+		if (strpos($htmlname, 'search_') !== 0) {
+			if (empty($user->fk_workstation) || $user->fk_workstation == -1) {
+				if (($selected == '-2' || $selected == 'ifone') && !empty($conf->global->MAIN_DEFAULT_WORKSTATION)) {
+					$selected = $conf->global->MAIN_DEFAULT_WORKSTATION;
+				}
+			} else {
+				if (($selected == '-2' || $selected == 'ifone') && !empty($conf->global->MAIN_DEFAULT_WORKSTATION)) {
+					$selected = $user->fk_workstation;
+				}
+			}
+		}
+
+		$out .= '<select class="flat'.($morecss ? ' '.$morecss : '').'"'.($disabled ? ' disabled' : '').' id="'.$htmlname.'" name="'.($htmlname.($disabled ? '_disabled' : '')).'">';
+		if ($empty) {
+			$out .= '<option value="-1">'.($empty_label ? $empty_label : '&nbsp;').'</option>';
+		}
+		foreach ($this->cache_workstations as $id => $arraytypes) {
+
+			$label = $arraytypes['label'];
+
+			$out .= '<option value="'.$id.'"';
+			if ($selected == $id || (preg_match('/^ifone/', $selected) && $nbofworkstations == 1)) {
+				$out .= ' selected';
+			}
+			$out .= ' data-html="'.dol_escape_htmltag($label).'"';
+			$out .= '>';
+			$out .= $label;
+			$out .= '</option>';
+		}
+		$out .= '</select>';
+		if ($disabled) {
+			$out .= '<input type="hidden" name="'.$htmlname.'" value="'.(($selected > 0) ? $selected : '').'">';
+		}
+
+		$parameters = array(
+			'selected' => $selected,
+			'htmlname' => $htmlname,
+			'filterstatus' => $filterstatus,
+			'empty' => $empty,
+			'disabled ' => $disabled,
+			'fk_product' => $fk_product,
+			'empty_label' => $empty_label,
+			'forcecombo' => $forcecombo,
+			'events' => $events,
+			'morecss' => $morecss,
+			'exclude' => $exclude,
+			'showfullpath' => $showfullpath,
+			'orderBy' => $orderBy
+		);
+
+		$reshook = $hookmanager->executeHooks('selectWorkstations', $parameters, $this);
+		if ($reshook > 0) {
+			$out = $hookmanager->resPrint;
+		} elseif ($reshook == 0) {
+			$out .= $hookmanager->resPrint;
+		}
+
+		return $out;
+	}
+
 	/**
 	 *    Display form to select warehouse
 	 *
diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php
index 5a7990cd0a7..bd31782cbfc 100644
--- a/htdocs/product/class/product.class.php
+++ b/htdocs/product/class/product.class.php
@@ -238,6 +238,11 @@ class Product extends CommonObject
 	 */
 	public $duration_value;
 
+	/*
+	 * Service Workstation
+	 */
+	public $fk_default_workstation;
+
 	/**
 	 * Exoiration unit
 	 */
@@ -1147,6 +1152,7 @@ class Product extends CommonObject
 			$sql .= ", volume = ".($this->volume != '' ? "'".$this->db->escape($this->volume)."'" : 'null');
 			$sql .= ", volume_units = ".($this->volume_units != '' ? "'".$this->db->escape($this->volume_units)."'" : 'null');
 			$sql .= ", fk_default_warehouse = ".($this->fk_default_warehouse > 0 ? $this->db->escape($this->fk_default_warehouse) : 'null');
+			$sql .= ", fk_default_workstation = ".($this->fk_default_workstation > 0 ? $this->db->escape($this->fk_default_workstation) : 'null');
 			$sql .= ", seuil_stock_alerte = ".((isset($this->seuil_stock_alerte) && is_numeric($this->seuil_stock_alerte)) ? (float) $this->seuil_stock_alerte : 'null');
 			$sql .= ", description = '".$this->db->escape($this->description)."'";
 			$sql .= ", url = ".($this->url ? "'".$this->db->escape($this->url)."'" : 'null');
@@ -2290,7 +2296,7 @@ class Product extends CommonObject
 
 		$sql = "SELECT p.rowid, p.ref, p.ref_ext, p.label, p.description, p.url, p.note_public, p.note as note_private, p.customcode, p.fk_country, p.fk_state, p.lifetime, p.qc_frequency, p.price, p.price_ttc,";
 		$sql .= " p.price_min, p.price_min_ttc, p.price_base_type, p.cost_price, p.default_vat_code, p.tva_tx, p.recuperableonly as tva_npr, p.localtax1_tx, p.localtax2_tx, p.localtax1_type, p.localtax2_type, p.tosell,";
-		$sql .= " p.tobuy, p.fk_product_type, p.duration, p.fk_default_warehouse, p.seuil_stock_alerte, p.canvas, p.net_measure, p.net_measure_units, p.weight, p.weight_units,";
+		$sql .= " p.tobuy, p.fk_product_type, p.duration, p.fk_default_warehouse, p.fk_default_workstation, p.seuil_stock_alerte, p.canvas, p.net_measure, p.net_measure_units, p.weight, p.weight_units,";
 		$sql .= " p.length, p.length_units, p.width, p.width_units, p.height, p.height_units,";
 		$sql .= " p.surface, p.surface_units, p.volume, p.volume_units, p.barcode, p.fk_barcode_type, p.finished, p.fk_default_bom, p.mandatory_period,";
 		if (empty($conf->global->MAIN_PRODUCT_PERENTITY_SHARED)) {
@@ -2352,7 +2358,7 @@ class Product extends CommonObject
 		if ($separatedStock) {
 			$sql .= " GROUP BY p.rowid, p.ref, p.ref_ext, p.label, p.description, p.url, p.note_public, p.note, p.customcode, p.fk_country, p.fk_state, p.lifetime, p.qc_frequency, p.price, p.price_ttc,";
 			$sql .= " p.price_min, p.price_min_ttc, p.price_base_type, p.cost_price, p.default_vat_code, p.tva_tx, p.recuperableonly, p.localtax1_tx, p.localtax2_tx, p.localtax1_type, p.localtax2_type, p.tosell,";
-			$sql .= " p.tobuy, p.fk_product_type, p.duration, p.fk_default_warehouse, p.seuil_stock_alerte, p.canvas, p.net_measure, p.net_measure_units, p.weight, p.weight_units,";
+			$sql .= " p.tobuy, p.fk_product_type, p.duration, p.fk_default_warehouse, p.fk_default_workstation, p.seuil_stock_alerte, p.canvas, p.net_measure, p.net_measure_units, p.weight, p.weight_units,";
 			$sql .= " p.length, p.length_units, p.width, p.width_units, p.height, p.height_units,";
 			$sql .= " p.surface, p.surface_units, p.volume, p.volume_units, p.barcode, p.fk_barcode_type, p.finished,";
 			if (empty($conf->global->MAIN_PRODUCT_PERENTITY_SHARED)) {
@@ -2451,6 +2457,7 @@ class Product extends CommonObject
 				$this->accountancy_code_sell_export		= $obj->accountancy_code_sell_export;
 
 				$this->fk_default_warehouse            = $obj->fk_default_warehouse;
+				$this->fk_default_workstation            = $obj->fk_default_workstation;
 				$this->seuil_stock_alerte            = $obj->seuil_stock_alerte;
 				$this->desiredstock                    = $obj->desiredstock;
 				$this->stock_reel                    = $obj->stock;

From 5d18cfaef8ed834401d82813ee0ab87dfa0f3391 Mon Sep 17 00:00:00 2001
From: atm-lena <lena.papazian@atm-consulting.fr>
Date: Wed, 6 Jul 2022 08:47:32 +0200
Subject: [PATCH 017/974] Add select workstation in product card

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

diff --git a/htdocs/product/card.php b/htdocs/product/card.php
index 087c7bc11ce..f9ac8da8d05 100644
--- a/htdocs/product/card.php
+++ b/htdocs/product/card.php
@@ -1416,7 +1416,6 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 
 		// Description (used in invoice, propal...)
 		print '<tr><td class="tdtop">'.$langs->trans("Description").'</td><td>';
-
 		$doleditor = new DolEditor('desc', GETPOST('desc', 'restricthtml'), '', 160, 'dolibarr_details', '', false, true, getDolGlobalString('FCKEDITOR_ENABLE_PRODUCTDESC'), ROWS_4, '90%');
 		$doleditor->Create();
 
@@ -1460,6 +1459,14 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 			}
 		}
 
+		if($type == 1  && $conf->workstation->enabled){
+				// Default workstation
+				print '<tr><td>'.$langs->trans("DefaultWorkstation").'</td><td>';
+				print img_picto($langs->trans("DefaultWorkstation"), 'workstation', 'class="pictofixedwidth"');
+				print $formproduct->selectWorkstations($object->fk_default_workstation, 'fk_default_workstation', 1);
+				print '</td></tr>';
+		}
+
 		// Duration
 		if ($type == 1) {
 			print '<tr><td>'.$langs->trans("Duration").'</td><td>';

From 55f0dada340e9c557585966c010678ede18263b5 Mon Sep 17 00:00:00 2001
From: atm-lena <lena.papazian@atm-consulting.fr>
Date: Wed, 6 Jul 2022 13:55:43 +0200
Subject: [PATCH 018/974] WIP

---
 htdocs/bom/bom_card.php                  | 132 +++++++++++++++++------
 htdocs/bom/class/bom.class.php           | 113 +++++++++++++++----
 htdocs/bom/tpl/objectline_create.tpl.php | 113 ++++++++++++-------
 htdocs/bom/tpl/objectline_edit.tpl.php   |  59 ++++++----
 htdocs/bom/tpl/objectline_title.tpl.php  |  25 +++--
 htdocs/bom/tpl/objectline_view.tpl.php   |  66 ++++++++----
 htdocs/langs/fr_FR/mrp.lang              |   2 +
 7 files changed, 370 insertions(+), 140 deletions(-)

diff --git a/htdocs/bom/bom_card.php b/htdocs/bom/bom_card.php
index ee619a589e3..759c313cd3c 100644
--- a/htdocs/bom/bom_card.php
+++ b/htdocs/bom/bom_card.php
@@ -34,6 +34,8 @@ require_once DOL_DOCUMENT_ROOT.'/mrp/lib/mrp.lib.php';
 // Load translation files required by the page
 $langs->loadLangs(array("mrp", "other"));
 
+global $filtertype;
+
 // Get parameters
 $id = GETPOST('id', 'int');
 $ref        = GETPOST('ref', 'alpha');
@@ -541,50 +543,114 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 	 * Lines
 	 */
 
+
 	if (!empty($object->table_element_line)) {
-		print '	<form name="addproduct" id="addproduct" action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.(($action != 'editline') ? '' : '').'" method="POST">
-    	<input type="hidden" name="token" value="' . newToken().'">
-    	<input type="hidden" name="action" value="' . (($action != 'editline') ? 'addline' : 'updateline').'">
+
+		print load_fiche_titre($langs->trans('BOMProductsList'), '', 'product');
+
+		$res = $object->fetchLinesbytype(0);
+		$object->calculateCosts();
+
+		if($res > 0) {
+
+			print '	<form name="addproduct" id="addproduct" action="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . (($action != 'editline') ? '' : '') . '" method="POST">
+    	<input type="hidden" name="token" value="' . newToken() . '">
+    	<input type="hidden" name="action" value="' . (($action != 'editline') ? 'addline' : 'updateline') . '">
     	<input type="hidden" name="mode" value="">
 		<input type="hidden" name="page_y" value="">
-    	<input type="hidden" name="id" value="' . $object->id.'">
+    	<input type="hidden" name="id" value="' . $object->id . '">
     	';
 
-		if (!empty($conf->use_javascript_ajax) && $object->status == 0) {
-			include DOL_DOCUMENT_ROOT.'/core/tpl/ajaxrow.tpl.php';
-		}
-
-		print '<div class="div-table-responsive-no-min">';
-		if (!empty($object->lines) || ($object->status == $object::STATUS_DRAFT && $permissiontoadd && $action != 'selectlines' && $action != 'editline')) {
-			print '<table id="tablelines" class="noborder noshadow" width="100%">';
-		}
-
-		if (!empty($object->lines)) {
-			$object->printObjectLines($action, $mysoc, null, GETPOST('lineid', 'int'), 1, '/bom/tpl');
-		}
-
-		// Form to add new line
-		if ($object->status == 0 && $permissiontoadd && $action != 'selectlines') {
-			if ($action != 'editline') {
-				// Add products/services form
-
-
-				$parameters = array();
-				$reshook = $hookmanager->executeHooks('formAddObjectLine', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
-				if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
-				if (empty($reshook))
-					$object->formAddObjectLine(1, $mysoc, null, '/bom/tpl');
+			if (!empty($conf->use_javascript_ajax) && $object->status == 0) {
+				include DOL_DOCUMENT_ROOT . '/core/tpl/ajaxrow.tpl.php';
 			}
+
+			print '<div class="div-table-responsive-no-min">';
+			if (!empty($object->lines) || ($object->status == $object::STATUS_DRAFT && $permissiontoadd && $action != 'selectlines' && $action != 'editline')) {
+				print '<table id="tablelines" class="noborder noshadow" width="100%">';
+			}
+
+			if (!empty($object->lines)) {
+				$object->printObjectLines($action, $mysoc, null, GETPOST('lineid', 'int'), 1, '/bom/tpl');
+			}
+
+			// Form to add new line
+			if ($object->status == 0 && $permissiontoadd && $action != 'selectlines') {
+				if ($action != 'editline') {
+					// Add products/services form
+
+
+					$parameters = array();
+					$reshook = $hookmanager->executeHooks('formAddObjectLine', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
+					if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+					if (empty($reshook))
+						$object->formAddObjectLine(1, $mysoc, null, '/bom/tpl');
+				}
+			}
+
+			if (!empty($object->lines) || ($object->status == $object::STATUS_DRAFT && $permissiontoadd && $action != 'selectlines' && $action != 'editline')) {
+				print '</table>';
+			}
+			print '</div>';
+
+			print "</form>\n";
+
+			mrpCollapseBomManagement();
+
 		}
 
-		if (!empty($object->lines) || ($object->status == $object::STATUS_DRAFT && $permissiontoadd && $action != 'selectlines' && $action != 'editline')) {
-			print '</table>';
+		$filtertype = 1;
+
+
+		$res = $object->fetchLinesbytype(1);
+		$object->calculateCosts();
+
+		if($res > 0) {
+			print load_fiche_titre($langs->trans('BOMServicesList'), '', 'service');
+
+
+			print '	<form name="addproduct" id="addproduct" action="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . (($action != 'editline') ? '' : '') . '" method="POST">
+    		<input type="hidden" name="token" value="' . newToken() . '">
+    		<input type="hidden" name="action" value="' . (($action != 'editline') ? 'addline' : 'updateline') . '">
+    		<input type="hidden" name="mode" value="">
+			<input type="hidden" name="page_y" value="">
+    		<input type="hidden" name="id" value="' . $object->id . '">
+    		';
+
+			if (!empty($conf->use_javascript_ajax) && $object->status == 0) {
+				include DOL_DOCUMENT_ROOT . '/core/tpl/ajaxrow.tpl.php';
+			}
+
+			print '<div class="div-table-responsive-no-min">';
+			if (!empty($object->lines) || ($object->status == $object::STATUS_DRAFT && $permissiontoadd && $action != 'selectlines' && $action != 'editline')) {
+				print '<table id="tablelines" class="noborder noshadow" width="100%">';
+			}
+
+			if (!empty($object->lines)) {
+				$object->printObjectLines($action, $mysoc, null, GETPOST('lineid', 'int'), 1, '/bom/tpl');
+			}
+
+			// Form to add new line
+			if ($object->status == 0 && $permissiontoadd && $action != 'selectlines') {
+				if ($action != 'editline') {
+					// Add products/services form
+
+
+					$parameters = array();
+					$reshook = $hookmanager->executeHooks('formAddObjectLine', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
+					if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+					if (empty($reshook))
+						$object->formAddObjectLine(1, $mysoc, null, '/bom/tpl');
+				}
+			}
+
+			if (!empty($object->lines) || ($object->status == $object::STATUS_DRAFT && $permissiontoadd && $action != 'selectlines' && $action != 'editline')) {
+				print '</table>';
+			}
+			print '</div>';
 		}
-		print '</div>';
 
 		print "</form>\n";
-
-		mrpCollapseBomManagement();
 	}
 
 
diff --git a/htdocs/bom/class/bom.class.php b/htdocs/bom/class/bom.class.php
index 598c4c73945..f1c5803311b 100644
--- a/htdocs/bom/class/bom.class.php
+++ b/htdocs/bom/class/bom.class.php
@@ -23,6 +23,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.'/workstation/class/workstation.class.php';
 //require_once DOL_DOCUMENT_ROOT . '/societe/class/societe.class.php';
 //require_once DOL_DOCUMENT_ROOT . '/product/class/product.class.php';
 
@@ -399,6 +400,56 @@ class BOM extends CommonObject
 		return $result;
 	}
 
+	/**
+	 * Load object lines in memory from the database
+	 *
+	 * @return int         <0 if KO, 0 if not found, >0 if OK
+	 */
+	public function fetchLinesbytype($type = 0)
+	{
+		$this->lines = array();
+
+		$objectlineclassname = get_class($this).'Line';
+		if (!class_exists($objectlineclassname)) {
+			$this->error = 'Error, class '.$objectlineclassname.' not found during call of fetchLinesCommon';
+			return -1;
+		}
+
+		$objectline = new $objectlineclassname($this->db);
+
+		$sql = "SELECT ".$objectline->getFieldList('l');
+		$sql .= " FROM ".$this->db->prefix().$objectline->table_element." as l";
+		$sql .= " LEFT JOIN ".$this->db->prefix()."product as p ON p.rowid = l.fk_product";
+		$sql .= " WHERE l.fk_".$this->db->escape($this->element)." = ".((int) $this->id);
+		$sql .= " AND p.fk_product_type = ". $type;
+		if (isset($objectline->fields['position'])) {
+			$sql .= $this->db->order('position', 'ASC');
+		}
+
+		$resql = $this->db->query($sql);
+		if ($resql) {
+			$num_rows = $this->db->num_rows($resql);
+			$i = 0;
+			while ($i < $num_rows) {
+				$obj = $this->db->fetch_object($resql);
+				if ($obj) {
+					$newline = new $objectlineclassname($this->db);
+					$newline->setVarsFromFetchObj($obj);
+
+					$this->lines[] = $newline;
+				}
+				$i++;
+			}
+
+			return 1;
+		} else {
+			$this->error = $this->db->lasterror();
+			$this->errors[] = $this->error;
+			return -1;
+		}
+	}
+
+
 	/**
 	 * Load list of objects in memory from the database.
 	 *
@@ -1044,6 +1095,8 @@ class BOM extends CommonObject
 	 */
 	public function calculateCosts()
 	{
+		global $conf;
+
 		include_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
 		$this->unit_cost = 0;
 		$this->total_cost = 0;
@@ -1056,38 +1109,54 @@ class BOM extends CommonObject
 			foreach ($this->lines as &$line) {
 				$tmpproduct->cost_price = 0;
 				$tmpproduct->pmp = 0;
+				$result = $tmpproduct->fetch($line->fk_product, '', '', '', 0, 1, 1);	// We discard selling price and language loading
 
-				if (empty($line->fk_bom_child)) {
-					$result = $tmpproduct->fetch($line->fk_product, '', '', '', 0, 1, 1);	// We discard selling price and language loading
-					if ($result < 0) {
-						$this->error = $tmpproduct->error;
-						return -1;
-					}
-					$line->unit_cost = price2num((!empty($tmpproduct->cost_price)) ? $tmpproduct->cost_price : $tmpproduct->pmp);
-					if (empty($line->unit_cost)) {
-						if ($productFournisseur->find_min_price_product_fournisseur($line->fk_product) > 0) {
-							$line->unit_cost = $productFournisseur->fourn_unitprice;
+				if($tmpproduct->type == $tmpproduct::TYPE_PRODUCT) {
+					if (empty($line->fk_bom_child)) {
+						if ($result < 0) {
+							$this->error = $tmpproduct->error;
+							return -1;
+						}
+						$line->unit_cost = price2num((!empty($tmpproduct->cost_price)) ? $tmpproduct->cost_price : $tmpproduct->pmp);
+						if (empty($line->unit_cost)) {
+							if ($productFournisseur->find_min_price_product_fournisseur($line->fk_product) > 0) {
+								$line->unit_cost = $productFournisseur->fourn_unitprice;
+							}
+						}
+
+						$line->total_cost = price2num($line->qty * $line->unit_cost, 'MT');
+
+						$this->total_cost += $line->total_cost;
+					} else {
+						$bom_child = new BOM($this->db);
+						$res = $bom_child->fetch($line->fk_bom_child);
+						if ($res > 0) {
+							$bom_child->calculateCosts();
+							$line->childBom[] = $bom_child;
+							$this->total_cost += $bom_child->total_cost * $line->qty;
+						} else {
+							$this->error = $bom_child->error;
+							return -2;
 						}
 					}
-
-					$line->total_cost = price2num($line->qty * $line->unit_cost, 'MT');
-
-					$this->total_cost += $line->total_cost;
 				} else {
-					$bom_child= new BOM($this->db);
-					$res = $bom_child->fetch($line->fk_bom_child);
-					if ($res>0) {
-						$bom_child->calculateCosts();
-						$line->childBom[] = $bom_child;
-						$this->total_cost += $bom_child->total_cost  * $line->qty;
+					if(!($conf->workstation->enabled)) {
+						$line->total_cost = price2num($line->qty * $tmpproduct->cost_price, 'MT');
 					} else {
-						$this->error = $bom_child->error;
-						return -2;
+
+						if($tmpproduct->fk_default_workstation){
+							$workstation = new Workstation($this->db);
+							$workstation->fetch($tmpproduct->fk_default_workstation);
+
+							$line->total_cost = price2num($line->qty * $workstation->thm_operator_estimated, 'MT');
+						}
 					}
+					$this->total_cost += $line->total_cost;
 				}
 			}
 
 			$this->total_cost = price2num($this->total_cost, 'MT');
+
 			if ($this->qty > 0) {
 				$this->unit_cost = price2num($this->total_cost / $this->qty, 'MU');
 			} elseif ($this->qty < 0) {
diff --git a/htdocs/bom/tpl/objectline_create.tpl.php b/htdocs/bom/tpl/objectline_create.tpl.php
index 0a3a3b34e7a..82154dcb078 100644
--- a/htdocs/bom/tpl/objectline_create.tpl.php
+++ b/htdocs/bom/tpl/objectline_create.tpl.php
@@ -36,12 +36,17 @@ if (empty($object) || !is_object($object)) {
 }
 
 
-global $forceall, $forcetoshowtitlelines;
+global $forceall, $forcetoshowtitlelines, $filtertype;
 
 if (empty($forceall)) {
 	$forceall = 0;
 }
 
+if(empty($filtertype))	$filtertype = 0;
+if (!empty($object->element) && $object->element == 'contrat' && empty($conf->global->STOCK_SUPPORT_SERVICES)) {
+	$filtertype = -1;
+}
+
 
 // Define colspan for the button 'Add'
 $colspan = 3; // Columns: total ht + col edit + col delete
@@ -53,6 +58,7 @@ $objectline = new BOMLine($this->db);
 print "<!-- BEGIN PHP TEMPLATE objectline_create.tpl.php -->\n";
 
 $nolinesbefore = (count($this->lines) == 0 || $forcetoshowtitlelines);
+
 if ($nolinesbefore) {
 	print '<tr class="liste_titre nodrag nodrop">';
 	if (!empty($conf->global->MAIN_VIEW_LINE_NUMBER)) {
@@ -62,16 +68,25 @@ if ($nolinesbefore) {
 	print '<div id="add"></div><span class="hideonsmartphone">'.$langs->trans('AddNewLine').'</span>';
 	print '</td>';
 	print '<td class="linecolqty right">'.$langs->trans('Qty').'</td>';
-	if (!empty($conf->global->PRODUCT_USE_UNITS)) {
-		print '<td class="linecoluseunit left">';
-		print '<span id="title_units">';
-		print $langs->trans('Unit');
-		print '</span></td>';
+
+	if($filtertype != 1) {
+		if (!empty($conf->global->PRODUCT_USE_UNITS)) {
+			print '<td class="linecoluseunit left">';
+			print '<span id="title_units">';
+			print $langs->trans('Unit');
+			print '</span></td>';
+		}
+		print '<td class="linecolqtyfrozen right">' . $form->textwithpicto($langs->trans('QtyFrozen'), $langs->trans("QuantityConsumedInvariable")) . '</td>';
+		print '<td class="linecoldisablestockchange right">' . $form->textwithpicto($langs->trans('DisableStockChange'), $langs->trans('DisableStockChangeHelp')) . '</td>';
+		print '<td class="linecollost right">' . $form->textwithpicto($langs->trans('ManufacturingEfficiency'), $langs->trans('ValueOfMeansLoss')) . '</td>';
 	}
-	print '<td class="linecolqtyfrozen right">'.$form->textwithpicto($langs->trans('QtyFrozen'), $langs->trans("QuantityConsumedInvariable")).'</td>';
-	print '<td class="linecoldisablestockchange right">'.$form->textwithpicto($langs->trans('DisableStockChange'), $langs->trans('DisableStockChangeHelp')).'</td>';
-	print '<td class="linecollost right">'.$form->textwithpicto($langs->trans('ManufacturingEfficiency'), $langs->trans('ValueOfMeansLoss')).'</td>';
-	print '<td class="linecoledit" colspan="'.$colspan.'">&nbsp;</td>';
+	else {
+		print '<td class="linecolunit right">' . $form->textwithpicto($langs->trans('Unit'), '').'</td>';
+		if($conf->workstation->enabled) print '<td class="linecolworkstation right">' .  $form->textwithpicto($langs->trans('Workstation'), '') . '</td>';
+		print '<td class="linecoltotalcost right">' .  $form->textwithpicto($langs->trans('TotalCost'), '') . '</td>';
+	}
+
+	print '<td class="linecoledit" colspan="' . $colspan . '">&nbsp;</td>';
 	print '</tr>';
 }
 print '<tr class="pair nodrag nodrop nohoverpair'.(($nolinesbefore || $object->element == 'contrat') ? '' : ' liste_titre_create').'">';
@@ -88,14 +103,14 @@ print '<td class="bordertop nobottom linecoldescription minwidth500imp">';
 
 // Predefined product/service
 if (!empty($conf->product->enabled) || !empty($conf->service->enabled)) {
-	if (!empty($conf->global->BOM_SUB_BOM)) {
+	if($filtertype == 1){
+		print $langs->trans("Service");
+	}
+	elseif (!empty($conf->global->BOM_SUB_BOM)) {
 		print $langs->trans("Product");
 	}
 	echo '<span class="prod_entry_mode_predef">';
-	$filtertype = 0;
-	if (!empty($object->element) && $object->element == 'contrat' && empty($conf->global->STOCK_SUPPORT_SERVICES)) {
-		$filtertype = -1;
-	}
+
 	$statustoshow = -1;
 	if (!empty($conf->global->ENTREPOT_EXTRA_STATUS)) {
 		// hide products in closed warehouse, but show products for internal transfer
@@ -106,7 +121,7 @@ if (!empty($conf->product->enabled) || !empty($conf->service->enabled)) {
 
 	echo '</span>';
 }
-if (!empty($conf->global->BOM_SUB_BOM)) {
+if (!empty($conf->global->BOM_SUB_BOM) && $filtertype!=1) {
 	print '<br><span class="opacitymedium">'.$langs->trans("or").'</span><br>'.$langs->trans("BOM");
 	// TODO Add component to select a BOM
 	$form->select_bom();
@@ -118,35 +133,53 @@ $coldisplay++;
 print '<td class="bordertop nobottom linecolqty right"><input type="text" size="2" name="qty" id="qty" class="flat right" value="'.(GETPOSTISSET("qty") ? GETPOST("qty", 'alpha', 2) : 1).'">';
 print '</td>';
 
-if (!empty($conf->global->PRODUCT_USE_UNITS)) {
+if($filtertype != 1) {
+	if (!empty($conf->global->PRODUCT_USE_UNITS)) {
+		$coldisplay++;
+		print '<td class="nobottom linecoluseunit left">';
+		print '</td>';
+	}
+
 	$coldisplay++;
-	print '<td class="nobottom linecoluseunit left">';
+	print '<td class="bordertop nobottom linecolqtyfrozen right"><input type="checkbox" name="qty_frozen" id="qty_frozen" class="flat right" value="1"' . (GETPOST("qty_frozen", 'alpha') ? ' checked="checked"' : '') . '>';
+	print '</td>';
+
+	$coldisplay++;
+	print '<td class="bordertop nobottom linecoldisablestockchange right"><input type="checkbox" name="disable_stock_change" id="disable_stock_change" class="flat right" value="1"' . (GETPOST("disable_stock_change", 'alpha') ? ' checked="checked"' : '') . '">';
+	print '</td>';
+
+	$coldisplay++;
+	print '<td class="bordertop nobottom nowrap linecollost right">';
+	print '<input type="text" size="2" name="efficiency" id="efficiency" class="flat right" value="' . ((GETPOSTISSET("efficiency") && $action == 'addline') ? GETPOST("efficiency", 'alpha') : 1) . '">';
+	print '</td>';
+
+	$coldisplay++;
+	print '<td class="bordertop nobottom nowrap linecolcost right">';
+	print '&nbsp;';
+	print '</td>';
+} else {
+	$coldisplay++;
+	print '<td class="bordertop nobottom nowrap linecolcost right">';
+	print '&nbsp;';
+	print '</td>';
+
+	$coldisplay++;
+	print '<td class="bordertop nobottom nowrap linecolcost right">';
+	print '&nbsp;';
+	print '</td>';
+
+	$coldisplay++;
+	print '<td class="bordertop nobottom nowrap linecolcost right">';
+	print '&nbsp;';
 	print '</td>';
 }
 
-$coldisplay++;
-print '<td class="bordertop nobottom linecolqtyfrozen right"><input type="checkbox" name="qty_frozen" id="qty_frozen" class="flat right" value="1"'.(GETPOST("qty_frozen", 'alpha') ? ' checked="checked"' : '').'>';
-print '</td>';
+	$coldisplay += $colspan;
+	print '<td class="bordertop nobottom linecoledit center valignmiddle" colspan="' . $colspan . '">';
+	print '<input type="submit" class="button button-add" name="addline" id="addline" value="' . $langs->trans('Add') . '">';
+	print '</td>';
+	print '</tr>';
 
-$coldisplay++;
-print '<td class="bordertop nobottom linecoldisablestockchange right"><input type="checkbox" name="disable_stock_change" id="disable_stock_change" class="flat right" value="1"'.(GETPOST("disable_stock_change", 'alpha') ? ' checked="checked"' : '').'">';
-print '</td>';
-
-$coldisplay++;
-print '<td class="bordertop nobottom nowrap linecollost right">';
-print '<input type="text" size="2" name="efficiency" id="efficiency" class="flat right" value="'.((GETPOSTISSET("efficiency") && $action == 'addline') ?GETPOST("efficiency", 'alpha') : 1).'">';
-print '</td>';
-
-$coldisplay++;
-print '<td class="bordertop nobottom nowrap linecolcost right">';
-print '&nbsp;';
-print '</td>';
-
-$coldisplay += $colspan;
-print '<td class="bordertop nobottom linecoledit center valignmiddle" colspan="'.$colspan.'">';
-print '<input type="submit" class="button button-add" name="addline" id="addline" value="'.$langs->trans('Add').'">';
-print '</td>';
-print '</tr>';
 
 if (is_object($objectline)) {
 	print $objectline->showOptionals($extrafields, 'edit', array('style'=>$bcnd[$var], 'colspan'=>$coldisplay), '', '', 1, 'line');
diff --git a/htdocs/bom/tpl/objectline_edit.tpl.php b/htdocs/bom/tpl/objectline_edit.tpl.php
index e5f24fa994f..7812c2fcc16 100644
--- a/htdocs/bom/tpl/objectline_edit.tpl.php
+++ b/htdocs/bom/tpl/objectline_edit.tpl.php
@@ -38,12 +38,14 @@ if (empty($object) || !is_object($object)) {
 }
 
 
-global $forceall;
+global $forceall, $filtertype;
 
 if (empty($forceall)) {
 	$forceall = 0;
 }
 
+if(empty($filtertype))	$filtertype = 0;
+
 
 // Define colspan for the button 'Add'
 $colspan = 3; // Columns: total ht + col edit + col delete
@@ -108,28 +110,47 @@ if (($line->info_bits & 2) != 2) {
 }
 print '</td>';
 
-if (!empty($conf->global->PRODUCT_USE_UNITS)) {
+if($filtertype != 1) {
+	if (!empty($conf->global->PRODUCT_USE_UNITS)) {
+		$coldisplay++;
+		print '<td class="nobottom linecoluseunit left">';
+		print '</td>';
+	}
+
 	$coldisplay++;
-	print '<td class="nobottom linecoluseunit left">';
+	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>';
+
+	$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>';
+
+	$coldisplay++;
+	print '<td class="nobottom nowrap linecollost right">';
+	print '<input type="text" size="2" name="efficiency" id="efficiency" class="flat right" value="' . $line->efficiency . '"></td>';
+
+	$coldisplay++;
+	print '<td class="nobottom nowrap linecolcostprice right">';
+	print '</td>';
+} else {
+
+	$coldisplay++;
+	print '<td class="nobottom nowrap linecolcostprice right">';
+	print '</td>';
+
+	$coldisplay++;
+	print '<td class="nobottom nowrap linecolcostprice right">';
+	print '</td>';
+
+	$coldisplay++;
+	print '<td class="nobottom nowrap linecolcostprice right">';
+	print '</td>';
+
+	$coldisplay++;
+	print '<td class="nobottom nowrap linecolcostprice right">';
 	print '</td>';
 }
 
-$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>';
-
-$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>';
-
-$coldisplay++;
-print '<td class="nobottom nowrap linecollost right">';
-print '<input type="text" size="2" name="efficiency" id="efficiency" class="flat right" value="'.$line->efficiency.'"></td>';
-
-$coldisplay++;
-print '<td class="nobottom nowrap linecolcostprice right">';
-print '</td>';
-
 $coldisplay += $colspan;
 print '<td class="nobottom linecoledit center valignmiddle" colspan="'.$colspan.'">';
 $coldisplay += $colspan;
diff --git a/htdocs/bom/tpl/objectline_title.tpl.php b/htdocs/bom/tpl/objectline_title.tpl.php
index dff3a38ccd2..498002cc50c 100644
--- a/htdocs/bom/tpl/objectline_title.tpl.php
+++ b/htdocs/bom/tpl/objectline_title.tpl.php
@@ -38,6 +38,10 @@ if (empty($object) || !is_object($object)) {
 	print "Error, template page can't be called as URL";
 	exit;
 }
+
+global $filtertype;
+if(empty($filtertype))	$filtertype = 0;
+
 print "<!-- BEGIN PHP TEMPLATE objectline_title.tpl.php -->\n";
 
 
@@ -62,22 +66,31 @@ print '</td>';
 // Qty
 print '<td class="linecolqty right">'.$form->textwithpicto($langs->trans('Qty'), $langs->trans("QtyRequiredIfNoLoss")).'</td>';
 
-if (!empty($conf->global->PRODUCT_USE_UNITS)) {
-	print '<td class="linecoluseunit left">'.$langs->trans('Unit').'</td>';
-}
+if($filtertype != 1) {
+	if (!empty($conf->global->PRODUCT_USE_UNITS)) {
+		print '<td class="linecoluseunit left">' . $langs->trans('Unit') . '</td>';
+	}
 
 // Qty frozen
-print '<td class="linecolqtyfrozen right">'.$form->textwithpicto($langs->trans('QtyFrozen'), $langs->trans("QuantityConsumedInvariable")).'</td>';
+	print '<td class="linecolqtyfrozen right">' . $form->textwithpicto($langs->trans('QtyFrozen'), $langs->trans("QuantityConsumedInvariable")) . '</td>';
 
 // Disable stock change
-print '<td class="linecoldisablestockchange right">'.$form->textwithpicto($langs->trans('DisableStockChange'), $langs->trans('DisableStockChangeHelp')).'</td>';
+	print '<td class="linecoldisablestockchange right">' . $form->textwithpicto($langs->trans('DisableStockChange'), $langs->trans('DisableStockChangeHelp')) . '</td>';
 
 // Efficiency
-print '<td class="linecolefficiency right">'.$form->textwithpicto($langs->trans('ManufacturingEfficiency'), $langs->trans('ValueOfMeansLoss')).'</td>';
+	print '<td class="linecolefficiency right">' . $form->textwithpicto($langs->trans('ManufacturingEfficiency'), $langs->trans('ValueOfMeansLoss')) . '</td>';
+
+} else {
+
+	print '<td class="linecolunit right">' . $form->textwithpicto($langs->trans('Unit'), '').'</td>';
+
+	if($conf->workstation->enabled) print '<td class="linecolworkstation right">' .  $form->textwithpicto($langs->trans('Workstation'), '') . '</td>';
+}
 
 // Cost
 print '<td class="linecolcost right">'.$form->textwithpicto($langs->trans("TotalCost"), $langs->trans("BOMTotalCost")).'</td>';
 
+
 print '<td class="linecoledit"></td>'; // No width to allow autodim
 
 print '<td class="linecoldelete" style="width: 10px"></td>';
diff --git a/htdocs/bom/tpl/objectline_view.tpl.php b/htdocs/bom/tpl/objectline_view.tpl.php
index 61b394a3b0f..dee6bdbde60 100644
--- a/htdocs/bom/tpl/objectline_view.tpl.php
+++ b/htdocs/bom/tpl/objectline_view.tpl.php
@@ -34,12 +34,17 @@
  * $type, $text, $description, $line
  */
 
+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;
 }
 
+global $filtertype;
+if(empty($filtertype))	$filtertype = 0;
+
 
 global $forceall, $senderissupplier, $inputalsopricewithtax, $outputalsopricetotalwithtax, $langs;
 
@@ -100,29 +105,50 @@ $coldisplay++;
 echo price($line->qty, 0, '', 0, 0); // Yes, it is a quantity, not a price, but we just want the formating role of function price
 print '</td>';
 
-if (!empty($conf->global->PRODUCT_USE_UNITS)) {
-	print '<td class="linecoluseunit nowrap left">';
-	$label = $tmpproduct->getLabelOfUnit('long');
-	if ($label !== '') {
-		print $langs->trans($label);
+if($filtertype != 1) {
+	if (!empty($conf->global->PRODUCT_USE_UNITS)) {
+		print '<td class="linecoluseunit nowrap left">';
+		$label = $tmpproduct->getLabelOfUnit('long');
+		if ($label !== '') {
+			print $langs->trans($label);
+		}
+		print '</td>';
 	}
+
+	print '<td class="linecolqtyfrozen nowrap right">';
+	$coldisplay++;
+	echo $line->qty_frozen ? yn($line->qty_frozen) : '';
 	print '</td>';
+	print '<td class="linecoldisablestockchange nowrap right">';
+	$coldisplay++;
+	echo $line->disable_stock_change ? yn($line->disable_stock_change) : ''; // Yes, it is a quantity, not a price, but we just want the formating role of function price
+	print '</td>';
+
+	print '<td class="linecolefficiency nowrap right">';
+	$coldisplay++;
+	echo $line->efficiency;
+	print '</td>';
+} else {
+	$product = new Product($object->db);
+	$res = $product->fetch($line->fk_product);
+
+	//Unité
+	print '<td class="linecolunit nowrap right">';
+	$coldisplay++;
+	echo $product->duration_unit;
+	print '</td>';
+
+	//Poste de travail
+	if($conf->workstation->enabled) {
+		$workstation = new Workstation($object->db);
+		$workstation->fetch($product->fk_default_workstation);
+
+		print '<td class="linecolunit nowrap right">';
+		$coldisplay++;
+		echo $workstation->getNomUrl();
+		print '</td>';
+	}
 }
-
-print '<td class="linecolqtyfrozen nowrap right">';
-$coldisplay++;
-echo $line->qty_frozen ? yn($line->qty_frozen) : '';
-print '</td>';
-print '<td class="linecoldisablestockchange nowrap right">';
-$coldisplay++;
-echo $line->disable_stock_change ? yn($line->disable_stock_change) : ''; // Yes, it is a quantity, not a price, but we just want the formating role of function price
-print '</td>';
-
-print '<td class="linecolefficiency nowrap right">';
-$coldisplay++;
-echo $line->efficiency;
-print '</td>';
-
 $total_cost = 0;
 print '<td id="costline_'.$line->id.'" class="linecolcost nowrap right">';
 $coldisplay++;
diff --git a/htdocs/langs/fr_FR/mrp.lang b/htdocs/langs/fr_FR/mrp.lang
index 6211db86e72..f952be1100a 100644
--- a/htdocs/langs/fr_FR/mrp.lang
+++ b/htdocs/langs/fr_FR/mrp.lang
@@ -82,6 +82,8 @@ ProductsToProduce=Produits à produire
 UnitCost=Coût unitaire
 TotalCost=Coût total
 BOMTotalCost=Le coût de production de cette nomenclature basé sur chaque quantité et produit à consommer (utilise le prix de revient si défini, sinon le PMP si défini, sinon le meilleur prix d'achat)
+BOMProductsList=Liste des composants
+BOMServicesList=Liste des services
 GoOnTabProductionToProduceFirst=Vous devez avoir la production pour clôturer un Ordre de Fabrication (voir onglet '%s'). Mais vous pouvez l'annuler.
 ErrorAVirtualProductCantBeUsedIntoABomOrMo=Un kit ne peut pas être utilisé dans une Nomenclature ou un Ordre de fabrication.
 Workstation=Poste de travail

From 6925dc2ae13430d3c7f5308a53d74cbe4f3c0df8 Mon Sep 17 00:00:00 2001
From: atm-lena <lena.papazian@atm-consulting.fr>
Date: Wed, 6 Jul 2022 15:00:07 +0200
Subject: [PATCH 019/974] Edit unit bom line service

---
 htdocs/bom/bom_card.php                       | 16 ++++++++--------
 htdocs/bom/class/bom.class.php                |  1 +
 htdocs/bom/tpl/objectline_create.tpl.php      |  9 ++++++---
 htdocs/bom/tpl/objectline_edit.tpl.php        | 19 +++++++++++--------
 htdocs/bom/tpl/objectline_view.tpl.php        | 11 ++++++++++-
 .../install/mysql/migration/15.0.0-16.0.0.sql |  2 ++
 .../install/mysql/tables/llx_bom_bomline.sql  |  1 +
 7 files changed, 39 insertions(+), 20 deletions(-)

diff --git a/htdocs/bom/bom_card.php b/htdocs/bom/bom_card.php
index 759c313cd3c..d448551c95e 100644
--- a/htdocs/bom/bom_card.php
+++ b/htdocs/bom/bom_card.php
@@ -167,7 +167,7 @@ if (empty($reshook)) {
 		$qty_frozen = price2num(GETPOST('qty_frozen', 'alpha'), 'MS');
 		$disable_stock_change = GETPOST('disable_stock_change', 'int');
 		$efficiency = price2num(GETPOST('efficiency', 'alpha'));
-
+		$duration_unit = GETPOST('duration_unit','alphanohtml');
 		if ($qty == '') {
 			setEventMessages($langs->trans('ErrorFieldRequired', $langs->transnoentitiesnoconv('Qty')), null, 'errors');
 			$error++;
@@ -191,6 +191,7 @@ if (empty($reshook)) {
 			$bomline->qty_frozen = (int) $qty_frozen;
 			$bomline->disable_stock_change = (int) $disable_stock_change;
 			$bomline->efficiency = $efficiency;
+			$bomline->duration_unit = $duration_unit;
 
 			// Rang to use
 			$rangmax = $object->line_max(0);
@@ -225,6 +226,7 @@ if (empty($reshook)) {
 		$qty_frozen = price2num(GETPOST('qty_frozen', 'alpha'), 'MS');
 		$disable_stock_change = GETPOST('disable_stock_change', 'int');
 		$efficiency = price2num(GETPOST('efficiency', 'alpha'));
+		$duration_unit = GETPOST('duration_unit','alphanohtml');
 
 		if ($qty == '') {
 			setEventMessages($langs->trans('ErrorFieldRequired', $langs->transnoentitiesnoconv('Qty')), null, 'errors');
@@ -237,6 +239,7 @@ if (empty($reshook)) {
 		$bomline->qty_frozen = (int) $qty_frozen;
 		$bomline->disable_stock_change = (int) $disable_stock_change;
 		$bomline->efficiency = $efficiency;
+		$bomline->duration_unit = $duration_unit;
 
 		$result = $bomline->update($user);
 		if ($result <= 0) {
@@ -577,7 +580,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 			// Form to add new line
 			if ($object->status == 0 && $permissiontoadd && $action != 'selectlines') {
 				if ($action != 'editline') {
-					// Add products/services form
+					// Add products form
 
 
 					$parameters = array();
@@ -601,7 +604,6 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 
 		$filtertype = 1;
 
-
 		$res = $object->fetchLinesbytype(1);
 		$object->calculateCosts();
 
@@ -609,7 +611,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 			print load_fiche_titre($langs->trans('BOMServicesList'), '', 'service');
 
 
-			print '	<form name="addproduct" id="addproduct" action="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . (($action != 'editline') ? '' : '') . '" method="POST">
+			print '	<form name="addservice" id="addservice" action="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . (($action != 'editline') ? '' : '') . '" method="POST">
     		<input type="hidden" name="token" value="' . newToken() . '">
     		<input type="hidden" name="action" value="' . (($action != 'editline') ? 'addline' : 'updateline') . '">
     		<input type="hidden" name="mode" value="">
@@ -633,11 +635,9 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 			// Form to add new line
 			if ($object->status == 0 && $permissiontoadd && $action != 'selectlines') {
 				if ($action != 'editline') {
-					// Add products/services form
-
-
+					// Add services form
 					$parameters = array();
-					$reshook = $hookmanager->executeHooks('formAddObjectLine', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
+					$reshook = $hookmanager->executeHooks('formAddObjectServiceLine', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 					if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 					if (empty($reshook))
 						$object->formAddObjectLine(1, $mysoc, null, '/bom/tpl');
diff --git a/htdocs/bom/class/bom.class.php b/htdocs/bom/class/bom.class.php
index f1c5803311b..ae75c518990 100644
--- a/htdocs/bom/class/bom.class.php
+++ b/htdocs/bom/class/bom.class.php
@@ -1299,6 +1299,7 @@ class BOMLine extends CommonObjectLine
 		'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'),
+		'duration_unit' => array('type'=>'varchar(6)', '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,),
 	);
diff --git a/htdocs/bom/tpl/objectline_create.tpl.php b/htdocs/bom/tpl/objectline_create.tpl.php
index 82154dcb078..4a0fe79e4a1 100644
--- a/htdocs/bom/tpl/objectline_create.tpl.php
+++ b/htdocs/bom/tpl/objectline_create.tpl.php
@@ -29,6 +29,8 @@
  * $forceall (0 by default, 1 for supplier invoices/orders)
  */
 
+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: this template page cannot be called directly as an URL";
@@ -47,6 +49,7 @@ if (!empty($object->element) && $object->element == 'contrat' && empty($conf->gl
 	$filtertype = -1;
 }
 
+$formproduct = new FormProduct($object->db);
 
 // Define colspan for the button 'Add'
 $colspan = 3; // Columns: total ht + col edit + col delete
@@ -159,12 +162,12 @@ if($filtertype != 1) {
 	print '</td>';
 } else {
 	$coldisplay++;
-	print '<td class="bordertop nobottom nowrap linecolcost right">';
-	print '&nbsp;';
+	print '<td class="bordertop nobottom nowrap linecolunit right">';
+	print  $formproduct->selectMeasuringUnits("duration_unit", "time", (GETPOSTISSET('duration_value') ? GETPOST('duration_value', 'alpha') : 'h'), 0, 1);
 	print '</td>';
 
 	$coldisplay++;
-	print '<td class="bordertop nobottom nowrap linecolcost right">';
+	print '<td class="bordertop nobottom nowrap linecolworkstation right">';
 	print '&nbsp;';
 	print '</td>';
 
diff --git a/htdocs/bom/tpl/objectline_edit.tpl.php b/htdocs/bom/tpl/objectline_edit.tpl.php
index 7812c2fcc16..0790329c346 100644
--- a/htdocs/bom/tpl/objectline_edit.tpl.php
+++ b/htdocs/bom/tpl/objectline_edit.tpl.php
@@ -31,6 +31,9 @@
  * $inputalsopricewithtax (0 by default, 1 to also show column with unit price including tax)
  */
 
+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";
@@ -46,6 +49,8 @@ if (empty($forceall)) {
 
 if(empty($filtertype))	$filtertype = 0;
 
+$formproduct = new FormProduct($object->db);
+
 
 // Define colspan for the button 'Add'
 $colspan = 3; // Columns: total ht + col edit + col delete
@@ -135,20 +140,18 @@ if($filtertype != 1) {
 } else {
 
 	$coldisplay++;
-	print '<td class="nobottom nowrap linecolcostprice right">';
+	print '<td class="nobottom nowrap linecolunit right">';
+	print  $formproduct->selectMeasuringUnits("duration_unit", "time", (GETPOSTISSET('duration_value') ? GETPOST('duration_value', 'alpha') : 'h'), 0, 1);
+	print '</td>';
+
+	$coldisplay++;
+	print '<td class="nobottom nowrap linecolworkstation right">';
 	print '</td>';
 
 	$coldisplay++;
 	print '<td class="nobottom nowrap linecolcostprice right">';
 	print '</td>';
 
-	$coldisplay++;
-	print '<td class="nobottom nowrap linecolcostprice right">';
-	print '</td>';
-
-	$coldisplay++;
-	print '<td class="nobottom nowrap linecolcostprice right">';
-	print '</td>';
 }
 
 $coldisplay += $colspan;
diff --git a/htdocs/bom/tpl/objectline_view.tpl.php b/htdocs/bom/tpl/objectline_view.tpl.php
index dee6bdbde60..c16360e429d 100644
--- a/htdocs/bom/tpl/objectline_view.tpl.php
+++ b/htdocs/bom/tpl/objectline_view.tpl.php
@@ -135,7 +135,16 @@ if($filtertype != 1) {
 	//Unité
 	print '<td class="linecolunit nowrap right">';
 	$coldisplay++;
-	echo $product->duration_unit;
+	if ($line->qty > 1) {
+		$dur = array("i"=>$langs->trans("Minute"), "h"=>$langs->trans("Hours"), "d"=>$langs->trans("Days"), "w"=>$langs->trans("Weeks"), "m"=>$langs->trans("Months"), "y"=>$langs->trans("Years"));
+	} elseif ($product->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"));
+	}
+	if(!empty($line->duration_unit)){
+		print (isset($dur[$line->duration_unit]) ? "&nbsp;".$langs->trans($dur[$line->duration_unit])."&nbsp;" : '');
+	} else {
+		print (!empty($product->duration_unit) && isset($dur[$product->duration_unit]) ? "&nbsp;" . $langs->trans($dur[$product->duration_unit]) . "&nbsp;" : '');
+	}
 	print '</td>';
 
 	//Poste de travail
diff --git a/htdocs/install/mysql/migration/15.0.0-16.0.0.sql b/htdocs/install/mysql/migration/15.0.0-16.0.0.sql
index c2cb299a63c..3c31af497e9 100644
--- a/htdocs/install/mysql/migration/15.0.0-16.0.0.sql
+++ b/htdocs/install/mysql/migration/15.0.0-16.0.0.sql
@@ -650,5 +650,7 @@ ALTER TABLE llx_prelevement_facture_demande MODIFY COLUMN ext_payment_id varchar
 
 ALTER TABLE llx_product ADD COLUMN fk_default_workstation integer DEFAULT NULL;
 
+ALTER TABLE llx_bom_bomline ADD COLUMN duration_unit varchar(6) DEFAULT NULL;
+
 
 
diff --git a/htdocs/install/mysql/tables/llx_bom_bomline.sql b/htdocs/install/mysql/tables/llx_bom_bomline.sql
index e7eae15fc15..c93484db92a 100644
--- a/htdocs/install/mysql/tables/llx_bom_bomline.sql
+++ b/htdocs/install/mysql/tables/llx_bom_bomline.sql
@@ -25,6 +25,7 @@ CREATE TABLE llx_bom_bomline(
     qty_frozen smallint DEFAULT 0,
     disable_stock_change smallint DEFAULT 0, 
 	efficiency double(24,8) NOT NULL DEFAULT 1,
+	duration_unit varchar(6) NULL,
 	position integer NOT NULL DEFAULT 0
 	-- END MODULEBUILDER FIELDS
 ) ENGINE=innodb;

From dadff083a414012c8ffd04f5029c0ab5cb8cb959 Mon Sep 17 00:00:00 2001
From: atm-lena <lena.papazian@atm-consulting.fr>
Date: Wed, 6 Jul 2022 16:17:22 +0200
Subject: [PATCH 020/974] Change unit dynamic

---
 htdocs/bom/ajax/ajax.php                 | 79 ++++++++++++++++++++++++
 htdocs/bom/class/bom.class.php           | 10 +--
 htdocs/bom/tpl/objectline_create.tpl.php | 19 ++++++
 htdocs/bom/tpl/objectline_view.tpl.php   |  4 +-
 4 files changed, 105 insertions(+), 7 deletions(-)
 create mode 100644 htdocs/bom/ajax/ajax.php

diff --git a/htdocs/bom/ajax/ajax.php b/htdocs/bom/ajax/ajax.php
new file mode 100644
index 00000000000..d8ea9650b09
--- /dev/null
+++ b/htdocs/bom/ajax/ajax.php
@@ -0,0 +1,79 @@
+<?php
+/**
+ * Copyright (C) 2020 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       htdocs/public/ticket/ajax/ajax.php
+ *	\brief      Ajax component for Ticket.
+ */
+
+if (!defined('NOTOKENRENEWAL')) {
+	define('NOTOKENRENEWAL', '1'); // Disables token renewal
+}
+if (!defined('NOREQUIREHTML')) {
+	define('NOREQUIREHTML', '1');
+}
+if (!defined('NOREQUIREAJAX')) {
+	define('NOREQUIREAJAX', '1');
+}
+if (!defined('NOREQUIRESOC')) {
+	define('NOREQUIRESOC', '1');
+}
+if (!defined('NOCSRFCHECK')) {
+	define('NOCSRFCHECK', '1');
+}
+// Do not check anti CSRF attack test
+if (!defined('NOREQUIREMENU')) {
+	define('NOREQUIREMENU', '1');
+}
+// If there is no need to load and show top and left menu
+if (!defined("NOLOGIN")) {
+	define("NOLOGIN", '1');
+}
+if (!defined('NOIPCHECK')) {
+	define('NOIPCHECK', '1'); // Do not check IP defined into conf $dolibarr_main_restrict_ip
+}
+if (!defined('NOBROWSERNOTIF')) {
+	define('NOBROWSERNOTIF', '1');
+}
+
+include_once '../../main.inc.php'; // Load $user and permissions
+require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
+
+
+$action = GETPOST('action', 'aZ09');
+$idproduct = GETPOST('idproduct', 'int');
+
+
+/*
+ * View
+ */
+
+top_httphead();
+
+if ($action == 'getDurationUnitByProduct') {
+
+	$product = new Product($db);
+	$res = $product->fetch($idproduct);
+
+	if($res > 0){
+		$return = $product->duration_unit;
+	}
+
+	echo json_encode($return);
+	exit();
+}
diff --git a/htdocs/bom/class/bom.class.php b/htdocs/bom/class/bom.class.php
index ae75c518990..9638778db43 100644
--- a/htdocs/bom/class/bom.class.php
+++ b/htdocs/bom/class/bom.class.php
@@ -1140,17 +1140,17 @@ class BOM extends CommonObject
 						}
 					}
 				} else {
-					if(!($conf->workstation->enabled)) {
-						$line->total_cost = price2num($line->qty * $tmpproduct->cost_price, 'MT');
-					} else {
-
-						if($tmpproduct->fk_default_workstation){
+					if($conf->workstation->enabled){
+						if($tmpproduct->fk_default_workstation) {
 							$workstation = new Workstation($this->db);
 							$workstation->fetch($tmpproduct->fk_default_workstation);
 
 							$line->total_cost = price2num($line->qty * $workstation->thm_operator_estimated, 'MT');
 						}
+					} else {
+						$line->total_cost = price2num($line->qty * $tmpproduct->cost_price, 'MT');
 					}
+
 					$this->total_cost += $line->total_cost;
 				}
 			}
diff --git a/htdocs/bom/tpl/objectline_create.tpl.php b/htdocs/bom/tpl/objectline_create.tpl.php
index 4a0fe79e4a1..7a022c1172c 100644
--- a/htdocs/bom/tpl/objectline_create.tpl.php
+++ b/htdocs/bom/tpl/objectline_create.tpl.php
@@ -210,7 +210,26 @@ jQuery(document).ready(function() {
 				   if (editor) { editor.focus(); }
 			}
 			}
+
 	});
+	<?php if($filtertype == 1) { ?>
+	$('#idprod:nth-child(2)').change(function(){
+			var idproduct = $(this).val();
+
+			console.log(idproduct);
+			$.ajax({
+				url : "<?php echo dol_buildpath('/bom/ajax/ajax.php',1); ?>"
+				,type: 'POST'
+				,data: {
+					'action': 'getDurationUnitByProduct'
+					,'idproduct' : idproduct
+				}
+			}).done(function(data) {
+				var data = JSON.parse(data);
+				$('#duration_unit').val(data).change();;
+			});
+	});
+	<?php } ?>
 });
 
 </script>
diff --git a/htdocs/bom/tpl/objectline_view.tpl.php b/htdocs/bom/tpl/objectline_view.tpl.php
index c16360e429d..540146b14fa 100644
--- a/htdocs/bom/tpl/objectline_view.tpl.php
+++ b/htdocs/bom/tpl/objectline_view.tpl.php
@@ -136,9 +136,9 @@ if($filtertype != 1) {
 	print '<td class="linecolunit nowrap right">';
 	$coldisplay++;
 	if ($line->qty > 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("s"=>$langs->trans("Seconds"), "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 ($product->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("s"=>$langs->trans("Second"), "i"=>$langs->trans("Minute"), "h"=>$langs->trans("Hour"), "d"=>$langs->trans("Day"), "w"=>$langs->trans("Week"), "m"=>$langs->trans("Month"), "y"=>$langs->trans("Year"));
 	}
 	if(!empty($line->duration_unit)){
 		print (isset($dur[$line->duration_unit]) ? "&nbsp;".$langs->trans($dur[$line->duration_unit])."&nbsp;" : '');

From 503e2310ea6e74e6d95ae562c76c98af33656866 Mon Sep 17 00:00:00 2001
From: atm-lena <lena.papazian@atm-consulting.fr>
Date: Wed, 6 Jul 2022 16:51:50 +0200
Subject: [PATCH 021/974] WIP

---
 htdocs/bom/class/bom.class.php          | 12 ++++++++++--
 htdocs/bom/tpl/objectline_edit.tpl.php  |  2 +-
 htdocs/bom/tpl/objectline_title.tpl.php | 11 ++++++++---
 htdocs/langs/fr_FR/mrp.lang             |  1 +
 4 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/htdocs/bom/class/bom.class.php b/htdocs/bom/class/bom.class.php
index 9638778db43..3366ae1dda1 100644
--- a/htdocs/bom/class/bom.class.php
+++ b/htdocs/bom/class/bom.class.php
@@ -1140,15 +1140,23 @@ class BOM extends CommonObject
 						}
 					}
 				} else {
+
+					if($line->duration_unit == 's') $qty =  $line->qty / 3600;
+					if($line->duration_unit == 'i') $qty = $line->qty / 60;
+					if($line->duration_unit == 'd') $qty = $line->qty * 24;
+					if($line->duration_unit == 'w') $qty = $line->qty * 24 * 7;
+					if($line->duration_unit == 'm') $qty = $line->qty * 730.484;
+					if($line->duration_unit == 'y') $qty = $line->qty * 365 * 24;
+
 					if($conf->workstation->enabled){
 						if($tmpproduct->fk_default_workstation) {
 							$workstation = new Workstation($this->db);
 							$workstation->fetch($tmpproduct->fk_default_workstation);
 
-							$line->total_cost = price2num($line->qty * $workstation->thm_operator_estimated, 'MT');
+							$line->total_cost = price2num($qty * $workstation->thm_operator_estimated, 'MT');
 						}
 					} else {
-						$line->total_cost = price2num($line->qty * $tmpproduct->cost_price, 'MT');
+						$line->total_cost = price2num($qty * $tmpproduct->cost_price, 'MT');
 					}
 
 					$this->total_cost += $line->total_cost;
diff --git a/htdocs/bom/tpl/objectline_edit.tpl.php b/htdocs/bom/tpl/objectline_edit.tpl.php
index 0790329c346..b669c936412 100644
--- a/htdocs/bom/tpl/objectline_edit.tpl.php
+++ b/htdocs/bom/tpl/objectline_edit.tpl.php
@@ -141,7 +141,7 @@ if($filtertype != 1) {
 
 	$coldisplay++;
 	print '<td class="nobottom nowrap linecolunit right">';
-	print  $formproduct->selectMeasuringUnits("duration_unit", "time", (GETPOSTISSET('duration_value') ? GETPOST('duration_value', 'alpha') : 'h'), 0, 1);
+	print  $formproduct->selectMeasuringUnits("duration_unit", "time", ($line->duration_unit) ? $line->duration_unit : '', 0, 1);
 	print '</td>';
 
 	$coldisplay++;
diff --git a/htdocs/bom/tpl/objectline_title.tpl.php b/htdocs/bom/tpl/objectline_title.tpl.php
index 498002cc50c..d4cab0cb8e7 100644
--- a/htdocs/bom/tpl/objectline_title.tpl.php
+++ b/htdocs/bom/tpl/objectline_title.tpl.php
@@ -57,7 +57,7 @@ if (!empty($conf->global->MAIN_VIEW_LINE_NUMBER)) {
 
 // Product or sub-bom
 print '<td class="linecoldescription">'.$langs->trans('Description');
-if (!empty($conf->global->BOM_SUB_BOM)) {
+if (!empty($conf->global->BOM_SUB_BOM) && $filtertype != 1) {
 	print ' &nbsp; <a id="show_all" href="#">'.img_picto('', 'folder-open', 'class="paddingright"').$langs->trans("ExpandAll").'</a>&nbsp;&nbsp;';
 	print '<a id="hide_all" href="#">'.img_picto('', 'folder', 'class="paddingright"').$langs->trans("UndoExpandAll").'</a>&nbsp;';
 }
@@ -80,15 +80,20 @@ if($filtertype != 1) {
 // Efficiency
 	print '<td class="linecolefficiency right">' . $form->textwithpicto($langs->trans('ManufacturingEfficiency'), $langs->trans('ValueOfMeansLoss')) . '</td>';
 
+	// Cost
+	print '<td class="linecolcost right">'.$form->textwithpicto($langs->trans("TotalCost"), $langs->trans("BOMTotalCost")).'</td>';
+
 } else {
 
 	print '<td class="linecolunit right">' . $form->textwithpicto($langs->trans('Unit'), '').'</td>';
 
 	if($conf->workstation->enabled) print '<td class="linecolworkstation right">' .  $form->textwithpicto($langs->trans('Workstation'), '') . '</td>';
+
+	// Cost
+	print '<td class="linecolcost right">'.$form->textwithpicto($langs->trans("TotalCost"), $langs->trans("BOMTotalCostService")).'</td>';
 }
 
-// Cost
-print '<td class="linecolcost right">'.$form->textwithpicto($langs->trans("TotalCost"), $langs->trans("BOMTotalCost")).'</td>';
+
 
 
 print '<td class="linecoledit"></td>'; // No width to allow autodim
diff --git a/htdocs/langs/fr_FR/mrp.lang b/htdocs/langs/fr_FR/mrp.lang
index f952be1100a..845657408d8 100644
--- a/htdocs/langs/fr_FR/mrp.lang
+++ b/htdocs/langs/fr_FR/mrp.lang
@@ -82,6 +82,7 @@ ProductsToProduce=Produits à produire
 UnitCost=Coût unitaire
 TotalCost=Coût total
 BOMTotalCost=Le coût de production de cette nomenclature basé sur chaque quantité et produit à consommer (utilise le prix de revient si défini, sinon le PMP si défini, sinon le meilleur prix d'achat)
+BOMTotalService=Si le module "Poste de travail" est activé, alors le calcul est "quantité (convertie en heures) x thm du poste de travail", sinon "quantité (convertie en heures) x prix de revient du service"
 BOMProductsList=Liste des composants
 BOMServicesList=Liste des services
 GoOnTabProductionToProduceFirst=Vous devez avoir la production pour clôturer un Ordre de Fabrication (voir onglet '%s'). Mais vous pouvez l'annuler.

From 16415a1c92ec249c3ace39c28075aab00310feeb Mon Sep 17 00:00:00 2001
From: atm-lena <lena.papazian@atm-consulting.fr>
Date: Wed, 6 Jul 2022 17:28:29 +0200
Subject: [PATCH 022/974] Clean Code

---
 htdocs/bom/ajax/ajax.php                 |  4 ++--
 htdocs/bom/bom_card.php                  | 12 ++++++------
 htdocs/bom/class/bom.class.php           | 17 ++++++++++++-----
 htdocs/bom/tpl/objectline_create.tpl.php |  8 +++-----
 htdocs/bom/tpl/objectline_view.tpl.php   | 11 ++++-------
 htdocs/product/card.php                  |  2 +-
 6 files changed, 28 insertions(+), 26 deletions(-)

diff --git a/htdocs/bom/ajax/ajax.php b/htdocs/bom/ajax/ajax.php
index d8ea9650b09..ef99ab214d1 100644
--- a/htdocs/bom/ajax/ajax.php
+++ b/htdocs/bom/ajax/ajax.php
@@ -17,8 +17,8 @@
  */
 
 /**
- *	\file       htdocs/public/ticket/ajax/ajax.php
- *	\brief      Ajax component for Ticket.
+ *	\file       htdocs/bom/ajax/ajax.php
+ *	\brief      Ajax component for BOM.
  */
 
 if (!defined('NOTOKENRENEWAL')) {
diff --git a/htdocs/bom/bom_card.php b/htdocs/bom/bom_card.php
index d448551c95e..0700bad4c2a 100644
--- a/htdocs/bom/bom_card.php
+++ b/htdocs/bom/bom_card.php
@@ -546,16 +546,16 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 	 * Lines
 	 */
 
-
 	if (!empty($object->table_element_line)) {
 
-		print load_fiche_titre($langs->trans('BOMProductsList'), '', 'product');
-
-		$res = $object->fetchLinesbytype(0);
+		//Products
+		$res = $object->fetchLinesbytypeproduct(0);
 		$object->calculateCosts();
 
 		if($res > 0) {
 
+			print load_fiche_titre($langs->trans('BOMProductsList'), '', 'product');
+
 			print '	<form name="addproduct" id="addproduct" action="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . (($action != 'editline') ? '' : '') . '" method="POST">
     	<input type="hidden" name="token" value="' . newToken() . '">
     	<input type="hidden" name="action" value="' . (($action != 'editline') ? 'addline' : 'updateline') . '">
@@ -602,9 +602,9 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 
 		}
 
+		//Services
 		$filtertype = 1;
-
-		$res = $object->fetchLinesbytype(1);
+		$res = $object->fetchLinesbytypeproduct(1);
 		$object->calculateCosts();
 
 		if($res > 0) {
diff --git a/htdocs/bom/class/bom.class.php b/htdocs/bom/class/bom.class.php
index 3366ae1dda1..15d16c4c9fa 100644
--- a/htdocs/bom/class/bom.class.php
+++ b/htdocs/bom/class/bom.class.php
@@ -401,11 +401,13 @@ class BOM extends CommonObject
 	}
 
 	/**
-	 * Load object lines in memory from the database
+	 * Load object lines in memory from the database by type of product
 	 *
+	 * 	@param int    $typeproduct   0 type product, 1 type service
+
 	 * @return int         <0 if KO, 0 if not found, >0 if OK
 	 */
-	public function fetchLinesbytype($type = 0)
+	public function fetchLinesbytypeproduct($typeproduct = 0)
 	{
 		$this->lines = array();
 
@@ -421,7 +423,7 @@ class BOM extends CommonObject
 		$sql .= " FROM ".$this->db->prefix().$objectline->table_element." as l";
 		$sql .= " LEFT JOIN ".$this->db->prefix()."product as p ON p.rowid = l.fk_product";
 		$sql .= " WHERE l.fk_".$this->db->escape($this->element)." = ".((int) $this->id);
-		$sql .= " AND p.fk_product_type = ". $type;
+		$sql .= " AND p.fk_product_type = ". $typeproduct;
 		if (isset($objectline->fields['position'])) {
 			$sql .= $this->db->order('position', 'ASC');
 		}
@@ -1141,6 +1143,7 @@ class BOM extends CommonObject
 					}
 				} else {
 
+					//Convert qty to hour
 					if($line->duration_unit == 's') $qty =  $line->qty / 3600;
 					if($line->duration_unit == 'i') $qty = $line->qty / 60;
 					if($line->duration_unit == 'd') $qty = $line->qty * 24;
@@ -1151,9 +1154,13 @@ class BOM extends CommonObject
 					if($conf->workstation->enabled){
 						if($tmpproduct->fk_default_workstation) {
 							$workstation = new Workstation($this->db);
-							$workstation->fetch($tmpproduct->fk_default_workstation);
+							$res = $workstation->fetch($tmpproduct->fk_default_workstation);
 
-							$line->total_cost = price2num($qty * $workstation->thm_operator_estimated, 'MT');
+							if($res > 0) $line->total_cost = price2num($qty * $workstation->thm_operator_estimated, 'MT');
+							else {
+								$this->error = $workstation->error;
+								return -3;
+							}
 						}
 					} else {
 						$line->total_cost = price2num($qty * $tmpproduct->cost_price, 'MT');
diff --git a/htdocs/bom/tpl/objectline_create.tpl.php b/htdocs/bom/tpl/objectline_create.tpl.php
index 7a022c1172c..f2f660bc711 100644
--- a/htdocs/bom/tpl/objectline_create.tpl.php
+++ b/htdocs/bom/tpl/objectline_create.tpl.php
@@ -163,7 +163,7 @@ if($filtertype != 1) {
 } else {
 	$coldisplay++;
 	print '<td class="bordertop nobottom nowrap linecolunit right">';
-	print  $formproduct->selectMeasuringUnits("duration_unit", "time", (GETPOSTISSET('duration_value') ? GETPOST('duration_value', 'alpha') : 'h'), 0, 1);
+	print  $formproduct->selectMeasuringUnits("duration_unit", "time", 'h', 0, 1);
 	print '</td>';
 
 	$coldisplay++;
@@ -196,8 +196,6 @@ jQuery(document).ready(function() {
 	/* When changing predefined product, we reload list of supplier prices required for margin combo */
 	$("#idprod").change(function()
 	{
-		console.log("#idprod change triggered");
-
 		  /* To set focus */
 		  if (jQuery('#idprod').val() > 0)
 			{
@@ -212,11 +210,11 @@ jQuery(document).ready(function() {
 			}
 
 	});
+
+	//change unit selected if we change service selected
 	<?php if($filtertype == 1) { ?>
 	$('#idprod:nth-child(2)').change(function(){
 			var idproduct = $(this).val();
-
-			console.log(idproduct);
 			$.ajax({
 				url : "<?php echo dol_buildpath('/bom/ajax/ajax.php',1); ?>"
 				,type: 'POST'
diff --git a/htdocs/bom/tpl/objectline_view.tpl.php b/htdocs/bom/tpl/objectline_view.tpl.php
index 540146b14fa..1699c968794 100644
--- a/htdocs/bom/tpl/objectline_view.tpl.php
+++ b/htdocs/bom/tpl/objectline_view.tpl.php
@@ -129,32 +129,29 @@ if($filtertype != 1) {
 	echo $line->efficiency;
 	print '</td>';
 } else {
-	$product = new Product($object->db);
-	$res = $product->fetch($line->fk_product);
-
 	//Unité
 	print '<td class="linecolunit nowrap right">';
 	$coldisplay++;
 	if ($line->qty > 1) {
 		$dur = array("s"=>$langs->trans("Seconds"), "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 ($product->duration_value > 0) {
+	} elseif ($tmpproduct->duration_value > 0) {
 		$dur = array("s"=>$langs->trans("Second"), "i"=>$langs->trans("Minute"), "h"=>$langs->trans("Hour"), "d"=>$langs->trans("Day"), "w"=>$langs->trans("Week"), "m"=>$langs->trans("Month"), "y"=>$langs->trans("Year"));
 	}
 	if(!empty($line->duration_unit)){
 		print (isset($dur[$line->duration_unit]) ? "&nbsp;".$langs->trans($dur[$line->duration_unit])."&nbsp;" : '');
 	} else {
-		print (!empty($product->duration_unit) && isset($dur[$product->duration_unit]) ? "&nbsp;" . $langs->trans($dur[$product->duration_unit]) . "&nbsp;" : '');
+		print (!empty($tmpproduct->duration_unit) && isset($dur[$tmpproduct->duration_unit]) ? "&nbsp;" . $langs->trans($dur[$tmpproduct->duration_unit]) . "&nbsp;" : '');
 	}
 	print '</td>';
 
 	//Poste de travail
 	if($conf->workstation->enabled) {
 		$workstation = new Workstation($object->db);
-		$workstation->fetch($product->fk_default_workstation);
+		$res = $workstation->fetch($tmpproduct->fk_default_workstation);
 
 		print '<td class="linecolunit nowrap right">';
 		$coldisplay++;
-		echo $workstation->getNomUrl();
+		if($res > 0) echo $workstation->getNomUrl();
 		print '</td>';
 	}
 }
diff --git a/htdocs/product/card.php b/htdocs/product/card.php
index f9ac8da8d05..eb215839fb1 100644
--- a/htdocs/product/card.php
+++ b/htdocs/product/card.php
@@ -2496,7 +2496,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 
 			if($object->isService() && $conf->workstation->enabled) {
 				$workstation = new Workstation($db);
-				$workstation->fetch($object->fk_default_workstation);
+				$res = $workstation->fetch($object->fk_default_workstation);
 
 				print '<tr><td>'.$langs->trans("DefaultWorkstation").'</td><td>';
 				print (!empty($workstation->id) ? $workstation->getNomUrl(1) : '');

From 7c82fc5da6e1079c5c24372a719d525749cf4bf0 Mon Sep 17 00:00:00 2001
From: atm-lena <lena.papazian@atm-consulting.fr>
Date: Fri, 8 Jul 2022 10:04:16 +0200
Subject: [PATCH 023/974] WIP

---
 htdocs/bom/bom_card.php                 | 3 ++-
 htdocs/bom/class/bom.class.php          | 3 ++-
 htdocs/bom/tpl/objectline_title.tpl.php | 2 +-
 htdocs/bom/tpl/objectline_view.tpl.php  | 2 +-
 htdocs/langs/fr_FR/mrp.lang             | 2 +-
 5 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/htdocs/bom/bom_card.php b/htdocs/bom/bom_card.php
index 0700bad4c2a..46105f2b2cb 100644
--- a/htdocs/bom/bom_card.php
+++ b/htdocs/bom/bom_card.php
@@ -620,12 +620,13 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
     		';
 
 			if (!empty($conf->use_javascript_ajax) && $object->status == 0) {
+				$tagidfortablednd = 'tablelinesservice';
 				include DOL_DOCUMENT_ROOT . '/core/tpl/ajaxrow.tpl.php';
 			}
 
 			print '<div class="div-table-responsive-no-min">';
 			if (!empty($object->lines) || ($object->status == $object::STATUS_DRAFT && $permissiontoadd && $action != 'selectlines' && $action != 'editline')) {
-				print '<table id="tablelines" class="noborder noshadow" width="100%">';
+				print '<table id="tablelinesservice" class="noborder noshadow" width="100%">';
 			}
 
 			if (!empty($object->lines)) {
diff --git a/htdocs/bom/class/bom.class.php b/htdocs/bom/class/bom.class.php
index 15d16c4c9fa..cb520579d74 100644
--- a/htdocs/bom/class/bom.class.php
+++ b/htdocs/bom/class/bom.class.php
@@ -1144,8 +1144,9 @@ class BOM extends CommonObject
 				} else {
 
 					//Convert qty to hour
-					if($line->duration_unit == 's') $qty =  $line->qty / 3600;
+					if($line->duration_unit == 's') $qty = $line->qty / 3600;
 					if($line->duration_unit == 'i') $qty = $line->qty / 60;
+					if($line->duration_unit == 'h') $qty = $line->qty;
 					if($line->duration_unit == 'd') $qty = $line->qty * 24;
 					if($line->duration_unit == 'w') $qty = $line->qty * 24 * 7;
 					if($line->duration_unit == 'm') $qty = $line->qty * 730.484;
diff --git a/htdocs/bom/tpl/objectline_title.tpl.php b/htdocs/bom/tpl/objectline_title.tpl.php
index d4cab0cb8e7..317908a749e 100644
--- a/htdocs/bom/tpl/objectline_title.tpl.php
+++ b/htdocs/bom/tpl/objectline_title.tpl.php
@@ -64,7 +64,7 @@ if (!empty($conf->global->BOM_SUB_BOM) && $filtertype != 1) {
 print '</td>';
 
 // Qty
-print '<td class="linecolqty right">'.$form->textwithpicto($langs->trans('Qty'), $langs->trans("QtyRequiredIfNoLoss")).'</td>';
+print '<td class="linecolqty right">'.$form->textwithpicto($langs->trans('Qty'), ($filtertype != 1) ? $langs->trans("QtyRequiredIfNoLoss") : '').'</td>';
 
 if($filtertype != 1) {
 	if (!empty($conf->global->PRODUCT_USE_UNITS)) {
diff --git a/htdocs/bom/tpl/objectline_view.tpl.php b/htdocs/bom/tpl/objectline_view.tpl.php
index 1699c968794..cef6b520264 100644
--- a/htdocs/bom/tpl/objectline_view.tpl.php
+++ b/htdocs/bom/tpl/objectline_view.tpl.php
@@ -65,7 +65,7 @@ if (empty($outputalsopricetotalwithtax)) {
 }
 
 // add html5 elements
-$domData  = ' data-element="'.$line->element.'"';
+$domData  = ' data-element="'.$line->element.'service"';
 $domData .= ' data-id="'.$line->id.'"';
 $domData .= ' data-qty="'.$line->qty.'"';
 $domData .= ' data-product_type="'.$line->product_type.'"';
diff --git a/htdocs/langs/fr_FR/mrp.lang b/htdocs/langs/fr_FR/mrp.lang
index 845657408d8..fc2563b8518 100644
--- a/htdocs/langs/fr_FR/mrp.lang
+++ b/htdocs/langs/fr_FR/mrp.lang
@@ -82,7 +82,7 @@ ProductsToProduce=Produits à produire
 UnitCost=Coût unitaire
 TotalCost=Coût total
 BOMTotalCost=Le coût de production de cette nomenclature basé sur chaque quantité et produit à consommer (utilise le prix de revient si défini, sinon le PMP si défini, sinon le meilleur prix d'achat)
-BOMTotalService=Si le module "Poste de travail" est activé, alors le calcul est "quantité (convertie en heures) x thm du poste de travail", sinon "quantité (convertie en heures) x prix de revient du service"
+BOMTotalCostService=Si le module "Poste de travail" est activé, alors le calcul est "quantité (convertie en heures) x thm du poste de travail", sinon "quantité (convertie en heures) x prix de revient du service"
 BOMProductsList=Liste des composants
 BOMServicesList=Liste des services
 GoOnTabProductionToProduceFirst=Vous devez avoir la production pour clôturer un Ordre de Fabrication (voir onglet '%s'). Mais vous pouvez l'annuler.

From d42d910c0820cc477d12ac5ec792936ae57bc5d1 Mon Sep 17 00:00:00 2001
From: atm-lena <lena.papazian@atm-consulting.fr>
Date: Fri, 8 Jul 2022 16:02:31 +0200
Subject: [PATCH 024/974] FIX Retours

---
 htdocs/bom/bom_card.php                  | 4 +++-
 htdocs/bom/class/bom.class.php           | 2 +-
 htdocs/bom/tpl/objectline_create.tpl.php | 7 ++++---
 htdocs/bom/tpl/objectline_title.tpl.php  | 2 +-
 4 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/htdocs/bom/bom_card.php b/htdocs/bom/bom_card.php
index 46105f2b2cb..d4dd367e95e 100644
--- a/htdocs/bom/bom_card.php
+++ b/htdocs/bom/bom_card.php
@@ -160,7 +160,7 @@ if (empty($reshook)) {
 				$idprod = $bom_child->fk_product;
 			}
 		} else {
-			$idprod = (int) GETPOST('idprod', 'int');
+			$idprod = (!empty(GETPOST('idprodservice', 'int')) ? GETPOST('idprodservice', 'int') : (int) GETPOST('idprod', 'int'));
 		}
 
 		$qty = price2num(GETPOST('qty', 'alpha'), 'MS');
@@ -205,6 +205,7 @@ if (empty($reshook)) {
 				$action = '';
 			} else {
 				unset($_POST['idprod']);
+				unset($_POST['idprodservice']);
 				unset($_POST['qty']);
 				unset($_POST['qty_frozen']);
 				unset($_POST['disable_stock_change']);
@@ -247,6 +248,7 @@ if (empty($reshook)) {
 			$action = '';
 		} else {
 			unset($_POST['idprod']);
+			unset($_POST['idprodservice']);
 			unset($_POST['qty']);
 			unset($_POST['qty_frozen']);
 			unset($_POST['disable_stock_change']);
diff --git a/htdocs/bom/class/bom.class.php b/htdocs/bom/class/bom.class.php
index cb520579d74..3f3d88aad36 100644
--- a/htdocs/bom/class/bom.class.php
+++ b/htdocs/bom/class/bom.class.php
@@ -1157,7 +1157,7 @@ class BOM extends CommonObject
 							$workstation = new Workstation($this->db);
 							$res = $workstation->fetch($tmpproduct->fk_default_workstation);
 
-							if($res > 0) $line->total_cost = price2num($qty * $workstation->thm_operator_estimated, 'MT');
+							if($res > 0) $line->total_cost = price2num($qty * ($workstation->thm_operator_estimated + $workstation->thm_machine_estimated), 'MT');
 							else {
 								$this->error = $workstation->error;
 								return -3;
diff --git a/htdocs/bom/tpl/objectline_create.tpl.php b/htdocs/bom/tpl/objectline_create.tpl.php
index f2f660bc711..3eea9235043 100644
--- a/htdocs/bom/tpl/objectline_create.tpl.php
+++ b/htdocs/bom/tpl/objectline_create.tpl.php
@@ -117,9 +117,10 @@ if (!empty($conf->product->enabled) || !empty($conf->service->enabled)) {
 	$statustoshow = -1;
 	if (!empty($conf->global->ENTREPOT_EXTRA_STATUS)) {
 		// hide products in closed warehouse, but show products for internal transfer
-		$form->select_produits(GETPOST('idprod', 'int'), 'idprod', $filtertype, $conf->product->limit_size, $buyer->price_level, $statustoshow, 2, '', 1, array(), $buyer->id, '1', 0, 'maxwidth500', 0, 'warehouseopen,warehouseinternal', GETPOST('combinations', 'array'));
-	} else {
-		$form->select_produits(GETPOST('idprod', 'int'), 'idprod', $filtertype, $conf->product->limit_size, $buyer->price_level, $statustoshow, 2, '', 1, array(), $buyer->id, '1', 0, 'maxwidth500', 0, '', GETPOST('combinations', 'array'));
+		$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'));
+	}
+	else {
+		$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'));
 	}
 
 	echo '</span>';
diff --git a/htdocs/bom/tpl/objectline_title.tpl.php b/htdocs/bom/tpl/objectline_title.tpl.php
index 317908a749e..9ed44d8f503 100644
--- a/htdocs/bom/tpl/objectline_title.tpl.php
+++ b/htdocs/bom/tpl/objectline_title.tpl.php
@@ -87,7 +87,7 @@ if($filtertype != 1) {
 
 	print '<td class="linecolunit right">' . $form->textwithpicto($langs->trans('Unit'), '').'</td>';
 
-	if($conf->workstation->enabled) print '<td class="linecolworkstation right">' .  $form->textwithpicto($langs->trans('Workstation'), '') . '</td>';
+	if($conf->workstation->enabled) print '<td class="linecolworkstation right">' .  $form->textwithpicto($langs->trans('DefaultWorkstation'), '') . '</td>';
 
 	// Cost
 	print '<td class="linecolcost right">'.$form->textwithpicto($langs->trans("TotalCost"), $langs->trans("BOMTotalCostService")).'</td>';

From 6564333e55ca335fec5ec58cbede492d93fed52b Mon Sep 17 00:00:00 2001
From: atm-lena <lena.papazian@atm-consulting.fr>
Date: Tue, 12 Jul 2022 09:16:52 +0200
Subject: [PATCH 025/974] Change sjquery on select2

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

diff --git a/htdocs/bom/tpl/objectline_create.tpl.php b/htdocs/bom/tpl/objectline_create.tpl.php
index 3eea9235043..55b14a0f650 100644
--- a/htdocs/bom/tpl/objectline_create.tpl.php
+++ b/htdocs/bom/tpl/objectline_create.tpl.php
@@ -214,7 +214,7 @@ jQuery(document).ready(function() {
 
 	//change unit selected if we change service selected
 	<?php if($filtertype == 1) { ?>
-	$('#idprod:nth-child(2)').change(function(){
+	$('#idprodservice').change(function(){
 			var idproduct = $(this).val();
 			$.ajax({
 				url : "<?php echo dol_buildpath('/bom/ajax/ajax.php',1); ?>"

From 8a36e2e9d8a21c9499279d0ade31282f90c4583c Mon Sep 17 00:00:00 2001
From: atm-lena <lena.papazian@atm-consulting.fr>
Date: Tue, 12 Jul 2022 09:21:51 +0200
Subject: [PATCH 026/974] =?UTF-8?q?M=C3=A0j=20column=20fk=5Ffedault=5Fwork?=
 =?UTF-8?q?statio=20and=20duration=5Funit?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/htdocs/install/mysql/migration/16.0.0-17.0.0.sql b/htdocs/install/mysql/migration/16.0.0-17.0.0.sql
index fa61ba725de..fb1ba0a8da2 100644
--- a/htdocs/install/mysql/migration/16.0.0-17.0.0.sql
+++ b/htdocs/install/mysql/migration/16.0.0-17.0.0.sql
@@ -55,3 +55,6 @@ ALTER TABLE llx_facture_fourn ADD COLUMN close_missing_amount double(24, 8) afte
 
 -- Allow users to make subscriptions of any amount during membership subscription 
 ALTER TABLE llx_adherent_type ADD COLUMN caneditamount integer DEFAULT 0 AFTER amount;
+
+ALTER TABLE llx_product ADD COLUMN fk_default_workstation integer DEFAULT NULL;
+ALTER TABLE llx_bom_bomline ADD COLUMN duration_unit varchar(6) DEFAULT NULL;

From c068eebc4361de2920005f2488c9512f235d36ce Mon Sep 17 00:00:00 2001
From: atm-lena <lena.papazian@atm-consulting.fr>
Date: Tue, 12 Jul 2022 10:03:31 +0200
Subject: [PATCH 027/974] Add function "convertDurationtoHour"

---
 htdocs/bom/class/bom.class.php |  9 ++-------
 htdocs/core/lib/date.lib.php   | 21 +++++++++++++++++++++
 2 files changed, 23 insertions(+), 7 deletions(-)

diff --git a/htdocs/bom/class/bom.class.php b/htdocs/bom/class/bom.class.php
index 1f3dd041aad..16c780a5751 100644
--- a/htdocs/bom/class/bom.class.php
+++ b/htdocs/bom/class/bom.class.php
@@ -24,6 +24,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.'/workstation/class/workstation.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
 //require_once DOL_DOCUMENT_ROOT . '/societe/class/societe.class.php';
 //require_once DOL_DOCUMENT_ROOT . '/product/class/product.class.php';
 
@@ -1128,13 +1129,7 @@ class BOM extends CommonObject
 				} else {
 
 					//Convert qty to hour
-					if($line->duration_unit == 's') $qty = $line->qty / 3600;
-					if($line->duration_unit == 'i') $qty = $line->qty / 60;
-					if($line->duration_unit == 'h') $qty = $line->qty;
-					if($line->duration_unit == 'd') $qty = $line->qty * 24;
-					if($line->duration_unit == 'w') $qty = $line->qty * 24 * 7;
-					if($line->duration_unit == 'm') $qty = $line->qty * 730.484;
-					if($line->duration_unit == 'y') $qty = $line->qty * 365 * 24;
+					$qty = convertDurationtoHour($line->qty, $line->duration_unit);
 
 					if($conf->workstation->enabled){
 						if($tmpproduct->fk_default_workstation) {
diff --git a/htdocs/core/lib/date.lib.php b/htdocs/core/lib/date.lib.php
index 558ba2aa322..98a17e062ee 100644
--- a/htdocs/core/lib/date.lib.php
+++ b/htdocs/core/lib/date.lib.php
@@ -318,6 +318,27 @@ function convertSecondToTime($iSecond, $format = 'all', $lengthOfDay = 86400, $l
 }
 
 
+/**	  	Convert duration to hour
+ *
+ *    	@param      int		$duration_value		Duration value
+ *    	@param      int		$duration_unit		Duration unit
+ *      @return     int $result
+ */
+function convertDurationtoHour($duration_value, $duration_unit)
+{
+	$result = 0;
+
+	if($duration_unit == 's') $result = $duration_value / 3600;
+	if($duration_unit == 'i') $result = $duration_value / 60;
+	if($duration_unit == 'h') $result = $duration_value;
+	if($duration_unit == 'd') $result = $duration_value * 24;
+	if($duration_unit == 'w') $result = $duration_value * 24 * 7;
+	if($duration_unit == 'm') $result = $duration_value * 730.484;
+	if($duration_unit == 'y') $result = $duration_value * 365 * 24;
+
+	return $result;
+}
+
 /**
  * Generate a SQL string to make a filter into a range (for second of date until last second of date).
  * This method allows to maje SQL request that will deal correctly the timezone of server.

From a41dee9e06b3d2b74f27dc5e669c7eb90e46b1de Mon Sep 17 00:00:00 2001
From: stickler-ci <support@stickler-ci.com>
Date: Tue, 12 Jul 2022 08:09:45 +0000
Subject: [PATCH 028/974] Fixing style errors.

---
 htdocs/bom/ajax/ajax.php                      |  3 +--
 htdocs/bom/bom_card.php                       | 11 ++++-----
 htdocs/bom/class/bom.class.php                |  9 ++++----
 htdocs/bom/tpl/objectline_create.tpl.php      | 23 ++++++++-----------
 htdocs/bom/tpl/objectline_edit.tpl.php        |  5 ++--
 htdocs/bom/tpl/objectline_title.tpl.php       | 14 +++++------
 htdocs/bom/tpl/objectline_view.tpl.php        | 10 ++++----
 htdocs/core/lib/date.lib.php                  | 14 +++++------
 htdocs/product/card.php                       |  6 ++---
 .../product/class/html.formproduct.class.php  |  1 -
 10 files changed, 42 insertions(+), 54 deletions(-)

diff --git a/htdocs/bom/ajax/ajax.php b/htdocs/bom/ajax/ajax.php
index ef99ab214d1..2ad12cc60a3 100644
--- a/htdocs/bom/ajax/ajax.php
+++ b/htdocs/bom/ajax/ajax.php
@@ -66,11 +66,10 @@ $idproduct = GETPOST('idproduct', 'int');
 top_httphead();
 
 if ($action == 'getDurationUnitByProduct') {
-
 	$product = new Product($db);
 	$res = $product->fetch($idproduct);
 
-	if($res > 0){
+	if ($res > 0) {
 		$return = $product->duration_unit;
 	}
 
diff --git a/htdocs/bom/bom_card.php b/htdocs/bom/bom_card.php
index d4dd367e95e..1abc33f9bce 100644
--- a/htdocs/bom/bom_card.php
+++ b/htdocs/bom/bom_card.php
@@ -167,7 +167,7 @@ if (empty($reshook)) {
 		$qty_frozen = price2num(GETPOST('qty_frozen', 'alpha'), 'MS');
 		$disable_stock_change = GETPOST('disable_stock_change', 'int');
 		$efficiency = price2num(GETPOST('efficiency', 'alpha'));
-		$duration_unit = GETPOST('duration_unit','alphanohtml');
+		$duration_unit = GETPOST('duration_unit', 'alphanohtml');
 		if ($qty == '') {
 			setEventMessages($langs->trans('ErrorFieldRequired', $langs->transnoentitiesnoconv('Qty')), null, 'errors');
 			$error++;
@@ -227,7 +227,7 @@ if (empty($reshook)) {
 		$qty_frozen = price2num(GETPOST('qty_frozen', 'alpha'), 'MS');
 		$disable_stock_change = GETPOST('disable_stock_change', 'int');
 		$efficiency = price2num(GETPOST('efficiency', 'alpha'));
-		$duration_unit = GETPOST('duration_unit','alphanohtml');
+		$duration_unit = GETPOST('duration_unit', 'alphanohtml');
 
 		if ($qty == '') {
 			setEventMessages($langs->trans('ErrorFieldRequired', $langs->transnoentitiesnoconv('Qty')), null, 'errors');
@@ -549,13 +549,11 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 	 */
 
 	if (!empty($object->table_element_line)) {
-
 		//Products
 		$res = $object->fetchLinesbytypeproduct(0);
 		$object->calculateCosts();
 
-		if($res > 0) {
-
+		if ($res > 0) {
 			print load_fiche_titre($langs->trans('BOMProductsList'), '', 'product');
 
 			print '	<form name="addproduct" id="addproduct" action="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . (($action != 'editline') ? '' : '') . '" method="POST">
@@ -601,7 +599,6 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 			print "</form>\n";
 
 			mrpCollapseBomManagement();
-
 		}
 
 		//Services
@@ -609,7 +606,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 		$res = $object->fetchLinesbytypeproduct(1);
 		$object->calculateCosts();
 
-		if($res > 0) {
+		if ($res > 0) {
 			print load_fiche_titre($langs->trans('BOMServicesList'), '', 'service');
 
 
diff --git a/htdocs/bom/class/bom.class.php b/htdocs/bom/class/bom.class.php
index 16c780a5751..c0eb5e802ea 100644
--- a/htdocs/bom/class/bom.class.php
+++ b/htdocs/bom/class/bom.class.php
@@ -1098,7 +1098,7 @@ class BOM extends CommonObject
 				$tmpproduct->pmp = 0;
 				$result = $tmpproduct->fetch($line->fk_product, '', '', '', 0, 1, 1);	// We discard selling price and language loading
 
-				if($tmpproduct->type == $tmpproduct::TYPE_PRODUCT) {
+				if ($tmpproduct->type == $tmpproduct::TYPE_PRODUCT) {
 					if (empty($line->fk_bom_child)) {
 						if ($result < 0) {
 							$this->error = $tmpproduct->error;
@@ -1127,16 +1127,15 @@ class BOM extends CommonObject
 						}
 					}
 				} else {
-
 					//Convert qty to hour
 					$qty = convertDurationtoHour($line->qty, $line->duration_unit);
 
-					if($conf->workstation->enabled){
-						if($tmpproduct->fk_default_workstation) {
+					if ($conf->workstation->enabled) {
+						if ($tmpproduct->fk_default_workstation) {
 							$workstation = new Workstation($this->db);
 							$res = $workstation->fetch($tmpproduct->fk_default_workstation);
 
-							if($res > 0) $line->total_cost = price2num($qty * ($workstation->thm_operator_estimated + $workstation->thm_machine_estimated), 'MT');
+							if ($res > 0) $line->total_cost = price2num($qty * ($workstation->thm_operator_estimated + $workstation->thm_machine_estimated), 'MT');
 							else {
 								$this->error = $workstation->error;
 								return -3;
diff --git a/htdocs/bom/tpl/objectline_create.tpl.php b/htdocs/bom/tpl/objectline_create.tpl.php
index 55b14a0f650..ff257d6ab72 100644
--- a/htdocs/bom/tpl/objectline_create.tpl.php
+++ b/htdocs/bom/tpl/objectline_create.tpl.php
@@ -44,7 +44,7 @@ if (empty($forceall)) {
 	$forceall = 0;
 }
 
-if(empty($filtertype))	$filtertype = 0;
+if (empty($filtertype))	$filtertype = 0;
 if (!empty($object->element) && $object->element == 'contrat' && empty($conf->global->STOCK_SUPPORT_SERVICES)) {
 	$filtertype = -1;
 }
@@ -72,7 +72,7 @@ if ($nolinesbefore) {
 	print '</td>';
 	print '<td class="linecolqty right">'.$langs->trans('Qty').'</td>';
 
-	if($filtertype != 1) {
+	if ($filtertype != 1) {
 		if (!empty($conf->global->PRODUCT_USE_UNITS)) {
 			print '<td class="linecoluseunit left">';
 			print '<span id="title_units">';
@@ -82,10 +82,9 @@ if ($nolinesbefore) {
 		print '<td class="linecolqtyfrozen right">' . $form->textwithpicto($langs->trans('QtyFrozen'), $langs->trans("QuantityConsumedInvariable")) . '</td>';
 		print '<td class="linecoldisablestockchange right">' . $form->textwithpicto($langs->trans('DisableStockChange'), $langs->trans('DisableStockChangeHelp')) . '</td>';
 		print '<td class="linecollost right">' . $form->textwithpicto($langs->trans('ManufacturingEfficiency'), $langs->trans('ValueOfMeansLoss')) . '</td>';
-	}
-	else {
+	} else {
 		print '<td class="linecolunit right">' . $form->textwithpicto($langs->trans('Unit'), '').'</td>';
-		if($conf->workstation->enabled) print '<td class="linecolworkstation right">' .  $form->textwithpicto($langs->trans('Workstation'), '') . '</td>';
+		if ($conf->workstation->enabled) print '<td class="linecolworkstation right">' .  $form->textwithpicto($langs->trans('Workstation'), '') . '</td>';
 		print '<td class="linecoltotalcost right">' .  $form->textwithpicto($langs->trans('TotalCost'), '') . '</td>';
 	}
 
@@ -106,10 +105,9 @@ print '<td class="bordertop nobottom linecoldescription minwidth500imp">';
 
 // Predefined product/service
 if (!empty($conf->product->enabled) || !empty($conf->service->enabled)) {
-	if($filtertype == 1){
+	if ($filtertype == 1) {
 		print $langs->trans("Service");
-	}
-	elseif (!empty($conf->global->BOM_SUB_BOM)) {
+	} elseif (!empty($conf->global->BOM_SUB_BOM)) {
 		print $langs->trans("Product");
 	}
 	echo '<span class="prod_entry_mode_predef">';
@@ -118,8 +116,7 @@ if (!empty($conf->product->enabled) || !empty($conf->service->enabled)) {
 	if (!empty($conf->global->ENTREPOT_EXTRA_STATUS)) {
 		// hide products in closed warehouse, but show products for internal transfer
 		$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'));
-	}
-	else {
+	} else {
 		$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'));
 	}
 
@@ -137,7 +134,7 @@ $coldisplay++;
 print '<td class="bordertop nobottom linecolqty right"><input type="text" size="2" name="qty" id="qty" class="flat right" value="'.(GETPOSTISSET("qty") ? GETPOST("qty", 'alpha', 2) : 1).'">';
 print '</td>';
 
-if($filtertype != 1) {
+if ($filtertype != 1) {
 	if (!empty($conf->global->PRODUCT_USE_UNITS)) {
 		$coldisplay++;
 		print '<td class="nobottom linecoluseunit left">';
@@ -213,11 +210,11 @@ jQuery(document).ready(function() {
 	});
 
 	//change unit selected if we change service selected
-	<?php if($filtertype == 1) { ?>
+	<?php if ($filtertype == 1) { ?>
 	$('#idprodservice').change(function(){
 			var idproduct = $(this).val();
 			$.ajax({
-				url : "<?php echo dol_buildpath('/bom/ajax/ajax.php',1); ?>"
+				url : "<?php echo dol_buildpath('/bom/ajax/ajax.php', 1); ?>"
 				,type: 'POST'
 				,data: {
 					'action': 'getDurationUnitByProduct'
diff --git a/htdocs/bom/tpl/objectline_edit.tpl.php b/htdocs/bom/tpl/objectline_edit.tpl.php
index b669c936412..b803277f359 100644
--- a/htdocs/bom/tpl/objectline_edit.tpl.php
+++ b/htdocs/bom/tpl/objectline_edit.tpl.php
@@ -47,7 +47,7 @@ if (empty($forceall)) {
 	$forceall = 0;
 }
 
-if(empty($filtertype))	$filtertype = 0;
+if (empty($filtertype))	$filtertype = 0;
 
 $formproduct = new FormProduct($object->db);
 
@@ -115,7 +115,7 @@ if (($line->info_bits & 2) != 2) {
 }
 print '</td>';
 
-if($filtertype != 1) {
+if ($filtertype != 1) {
 	if (!empty($conf->global->PRODUCT_USE_UNITS)) {
 		$coldisplay++;
 		print '<td class="nobottom linecoluseunit left">';
@@ -151,7 +151,6 @@ if($filtertype != 1) {
 	$coldisplay++;
 	print '<td class="nobottom nowrap linecolcostprice right">';
 	print '</td>';
-
 }
 
 $coldisplay += $colspan;
diff --git a/htdocs/bom/tpl/objectline_title.tpl.php b/htdocs/bom/tpl/objectline_title.tpl.php
index 9ed44d8f503..f93fb59fe0d 100644
--- a/htdocs/bom/tpl/objectline_title.tpl.php
+++ b/htdocs/bom/tpl/objectline_title.tpl.php
@@ -40,7 +40,7 @@ if (empty($object) || !is_object($object)) {
 }
 
 global $filtertype;
-if(empty($filtertype))	$filtertype = 0;
+if (empty($filtertype))	$filtertype = 0;
 
 print "<!-- BEGIN PHP TEMPLATE objectline_title.tpl.php -->\n";
 
@@ -66,28 +66,26 @@ print '</td>';
 // Qty
 print '<td class="linecolqty right">'.$form->textwithpicto($langs->trans('Qty'), ($filtertype != 1) ? $langs->trans("QtyRequiredIfNoLoss") : '').'</td>';
 
-if($filtertype != 1) {
+if ($filtertype != 1) {
 	if (!empty($conf->global->PRODUCT_USE_UNITS)) {
 		print '<td class="linecoluseunit left">' . $langs->trans('Unit') . '</td>';
 	}
 
-// Qty frozen
+	// Qty frozen
 	print '<td class="linecolqtyfrozen right">' . $form->textwithpicto($langs->trans('QtyFrozen'), $langs->trans("QuantityConsumedInvariable")) . '</td>';
 
-// Disable stock change
+	// Disable stock change
 	print '<td class="linecoldisablestockchange right">' . $form->textwithpicto($langs->trans('DisableStockChange'), $langs->trans('DisableStockChangeHelp')) . '</td>';
 
-// Efficiency
+	// Efficiency
 	print '<td class="linecolefficiency right">' . $form->textwithpicto($langs->trans('ManufacturingEfficiency'), $langs->trans('ValueOfMeansLoss')) . '</td>';
 
 	// Cost
 	print '<td class="linecolcost right">'.$form->textwithpicto($langs->trans("TotalCost"), $langs->trans("BOMTotalCost")).'</td>';
-
 } else {
-
 	print '<td class="linecolunit right">' . $form->textwithpicto($langs->trans('Unit'), '').'</td>';
 
-	if($conf->workstation->enabled) print '<td class="linecolworkstation right">' .  $form->textwithpicto($langs->trans('DefaultWorkstation'), '') . '</td>';
+	if ($conf->workstation->enabled) print '<td class="linecolworkstation right">' .  $form->textwithpicto($langs->trans('DefaultWorkstation'), '') . '</td>';
 
 	// Cost
 	print '<td class="linecolcost right">'.$form->textwithpicto($langs->trans("TotalCost"), $langs->trans("BOMTotalCostService")).'</td>';
diff --git a/htdocs/bom/tpl/objectline_view.tpl.php b/htdocs/bom/tpl/objectline_view.tpl.php
index cef6b520264..2c9758f2176 100644
--- a/htdocs/bom/tpl/objectline_view.tpl.php
+++ b/htdocs/bom/tpl/objectline_view.tpl.php
@@ -43,7 +43,7 @@ if (empty($object) || !is_object($object)) {
 }
 
 global $filtertype;
-if(empty($filtertype))	$filtertype = 0;
+if (empty($filtertype))	$filtertype = 0;
 
 
 global $forceall, $senderissupplier, $inputalsopricewithtax, $outputalsopricetotalwithtax, $langs;
@@ -105,7 +105,7 @@ $coldisplay++;
 echo price($line->qty, 0, '', 0, 0); // Yes, it is a quantity, not a price, but we just want the formating role of function price
 print '</td>';
 
-if($filtertype != 1) {
+if ($filtertype != 1) {
 	if (!empty($conf->global->PRODUCT_USE_UNITS)) {
 		print '<td class="linecoluseunit nowrap left">';
 		$label = $tmpproduct->getLabelOfUnit('long');
@@ -137,7 +137,7 @@ if($filtertype != 1) {
 	} elseif ($tmpproduct->duration_value > 0) {
 		$dur = array("s"=>$langs->trans("Second"), "i"=>$langs->trans("Minute"), "h"=>$langs->trans("Hour"), "d"=>$langs->trans("Day"), "w"=>$langs->trans("Week"), "m"=>$langs->trans("Month"), "y"=>$langs->trans("Year"));
 	}
-	if(!empty($line->duration_unit)){
+	if (!empty($line->duration_unit)) {
 		print (isset($dur[$line->duration_unit]) ? "&nbsp;".$langs->trans($dur[$line->duration_unit])."&nbsp;" : '');
 	} else {
 		print (!empty($tmpproduct->duration_unit) && isset($dur[$tmpproduct->duration_unit]) ? "&nbsp;" . $langs->trans($dur[$tmpproduct->duration_unit]) . "&nbsp;" : '');
@@ -145,13 +145,13 @@ if($filtertype != 1) {
 	print '</td>';
 
 	//Poste de travail
-	if($conf->workstation->enabled) {
+	if ($conf->workstation->enabled) {
 		$workstation = new Workstation($object->db);
 		$res = $workstation->fetch($tmpproduct->fk_default_workstation);
 
 		print '<td class="linecolunit nowrap right">';
 		$coldisplay++;
-		if($res > 0) echo $workstation->getNomUrl();
+		if ($res > 0) echo $workstation->getNomUrl();
 		print '</td>';
 	}
 }
diff --git a/htdocs/core/lib/date.lib.php b/htdocs/core/lib/date.lib.php
index 98a17e062ee..3e52099a41b 100644
--- a/htdocs/core/lib/date.lib.php
+++ b/htdocs/core/lib/date.lib.php
@@ -328,13 +328,13 @@ function convertDurationtoHour($duration_value, $duration_unit)
 {
 	$result = 0;
 
-	if($duration_unit == 's') $result = $duration_value / 3600;
-	if($duration_unit == 'i') $result = $duration_value / 60;
-	if($duration_unit == 'h') $result = $duration_value;
-	if($duration_unit == 'd') $result = $duration_value * 24;
-	if($duration_unit == 'w') $result = $duration_value * 24 * 7;
-	if($duration_unit == 'm') $result = $duration_value * 730.484;
-	if($duration_unit == 'y') $result = $duration_value * 365 * 24;
+	if ($duration_unit == 's') $result = $duration_value / 3600;
+	if ($duration_unit == 'i') $result = $duration_value / 60;
+	if ($duration_unit == 'h') $result = $duration_value;
+	if ($duration_unit == 'd') $result = $duration_value * 24;
+	if ($duration_unit == 'w') $result = $duration_value * 24 * 7;
+	if ($duration_unit == 'm') $result = $duration_value * 730.484;
+	if ($duration_unit == 'y') $result = $duration_value * 365 * 24;
 
 	return $result;
 }
diff --git a/htdocs/product/card.php b/htdocs/product/card.php
index 23fdd431696..b8796391e81 100644
--- a/htdocs/product/card.php
+++ b/htdocs/product/card.php
@@ -1468,7 +1468,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 			}
 		}
 
-		if($type == 1  && $conf->workstation->enabled){
+		if ($type == 1  && $conf->workstation->enabled) {
 				// Default workstation
 				print '<tr><td>'.$langs->trans("DefaultWorkstation").'</td><td>';
 				print img_picto($langs->trans("DefaultWorkstation"), 'workstation', 'class="pictofixedwidth"');
@@ -2016,7 +2016,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 				*/
 			}
 
-			if($object->isService() && $conf->workstation->enabled) {
+			if ($object->isService() && $conf->workstation->enabled) {
 				// Default workstation
 				print '<tr><td>'.$langs->trans("DefaultWorkstation").'</td><td>';
 				print img_picto($langs->trans("DefaultWorkstation"), 'workstation', 'class="pictofixedwidth"');
@@ -2505,7 +2505,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 				print '</td>';
 			}
 
-			if($object->isService() && $conf->workstation->enabled) {
+			if ($object->isService() && $conf->workstation->enabled) {
 				$workstation = new Workstation($db);
 				$res = $workstation->fetch($object->fk_default_workstation);
 
diff --git a/htdocs/product/class/html.formproduct.class.php b/htdocs/product/class/html.formproduct.class.php
index d6017877375..0ac039b55ec 100644
--- a/htdocs/product/class/html.formproduct.class.php
+++ b/htdocs/product/class/html.formproduct.class.php
@@ -434,7 +434,6 @@ class FormProduct
 			$out .= '<option value="-1">'.($empty_label ? $empty_label : '&nbsp;').'</option>';
 		}
 		foreach ($this->cache_workstations as $id => $arraytypes) {
-
 			$label = $arraytypes['label'];
 
 			$out .= '<option value="'.$id.'"';

From b5d2e0f4bc24d5cb18c7e71597168a471524c687 Mon Sep 17 00:00:00 2001
From: atm-lena <lena.papazian@atm-consulting.fr>
Date: Tue, 12 Jul 2022 12:23:23 +0200
Subject: [PATCH 029/974] Clean travis return

---
 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 c0eb5e802ea..db03f6bf0bd 100644
--- a/htdocs/bom/class/bom.class.php
+++ b/htdocs/bom/class/bom.class.php
@@ -424,7 +424,7 @@ class BOM extends CommonObject
 		$sql .= " FROM ".$this->db->prefix().$objectline->table_element." as l";
 		$sql .= " LEFT JOIN ".$this->db->prefix()."product as p ON p.rowid = l.fk_product";
 		$sql .= " WHERE l.fk_".$this->db->escape($this->element)." = ".((int) $this->id);
-		$sql .= " AND p.fk_product_type = ". $typeproduct;
+		$sql .= " AND p.fk_product_type = ". ((int) $typeproduct);
 		if (isset($objectline->fields['position'])) {
 			$sql .= $this->db->order('position', 'ASC');
 		}

From cc5a5e40d92a11435ee4687e5633d0f6c11cc2bc Mon Sep 17 00:00:00 2001
From: atm-lena <lena.papazian@atm-consulting.fr>
Date: Tue, 12 Jul 2022 14:56:25 +0200
Subject: [PATCH 030/974] FIX

---
 htdocs/bom/bom_card.php        | 152 ++++++++++++++++-----------------
 htdocs/bom/class/bom.class.php |   2 +-
 2 files changed, 75 insertions(+), 79 deletions(-)

diff --git a/htdocs/bom/bom_card.php b/htdocs/bom/bom_card.php
index 1abc33f9bce..ce9a284200b 100644
--- a/htdocs/bom/bom_card.php
+++ b/htdocs/bom/bom_card.php
@@ -553,10 +553,9 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 		$res = $object->fetchLinesbytypeproduct(0);
 		$object->calculateCosts();
 
-		if ($res > 0) {
-			print load_fiche_titre($langs->trans('BOMProductsList'), '', 'product');
+		print ($res == 0 && $object->status >= $object::STATUS_VALIDATED) ? '' : load_fiche_titre($langs->trans('BOMProductsList'), '', 'product');
 
-			print '	<form name="addproduct" id="addproduct" action="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . (($action != 'editline') ? '' : '') . '" method="POST">
+		print '	<form name="addproduct" id="addproduct" action="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . (($action != 'editline') ? '' : '') . '" method="POST">
     	<input type="hidden" name="token" value="' . newToken() . '">
     	<input type="hidden" name="action" value="' . (($action != 'editline') ? 'addline' : 'updateline') . '">
     	<input type="hidden" name="mode" value="">
@@ -564,95 +563,92 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
     	<input type="hidden" name="id" value="' . $object->id . '">
     	';
 
-			if (!empty($conf->use_javascript_ajax) && $object->status == 0) {
-				include DOL_DOCUMENT_ROOT . '/core/tpl/ajaxrow.tpl.php';
-			}
-
-			print '<div class="div-table-responsive-no-min">';
-			if (!empty($object->lines) || ($object->status == $object::STATUS_DRAFT && $permissiontoadd && $action != 'selectlines' && $action != 'editline')) {
-				print '<table id="tablelines" class="noborder noshadow" width="100%">';
-			}
-
-			if (!empty($object->lines)) {
-				$object->printObjectLines($action, $mysoc, null, GETPOST('lineid', 'int'), 1, '/bom/tpl');
-			}
-
-			// Form to add new line
-			if ($object->status == 0 && $permissiontoadd && $action != 'selectlines') {
-				if ($action != 'editline') {
-					// Add products form
-
-
-					$parameters = array();
-					$reshook = $hookmanager->executeHooks('formAddObjectLine', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
-					if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
-					if (empty($reshook))
-						$object->formAddObjectLine(1, $mysoc, null, '/bom/tpl');
-				}
-			}
-
-			if (!empty($object->lines) || ($object->status == $object::STATUS_DRAFT && $permissiontoadd && $action != 'selectlines' && $action != 'editline')) {
-				print '</table>';
-			}
-			print '</div>';
-
-			print "</form>\n";
-
-			mrpCollapseBomManagement();
+		if (!empty($conf->use_javascript_ajax) && $object->status == 0) {
+			include DOL_DOCUMENT_ROOT . '/core/tpl/ajaxrow.tpl.php';
 		}
 
+		print '<div class="div-table-responsive-no-min">';
+		if (!empty($object->lines) || ($object->status == $object::STATUS_DRAFT && $permissiontoadd && $action != 'selectlines' && $action != 'editline')) {
+			print '<table id="tablelines" class="noborder noshadow" width="100%">';
+		}
+
+		if (!empty($object->lines)) {
+			$object->printObjectLines($action, $mysoc, null, GETPOST('lineid', 'int'), 1, '/bom/tpl');
+		}
+
+		// Form to add new line
+		if ($object->status == 0 && $permissiontoadd && $action != 'selectlines') {
+			if ($action != 'editline') {
+				// Add products form
+
+
+				$parameters = array();
+				$reshook = $hookmanager->executeHooks('formAddObjectLine', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
+				if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+				if (empty($reshook))
+					$object->formAddObjectLine(1, $mysoc, null, '/bom/tpl');
+			}
+		}
+
+		if (!empty($object->lines) || ($object->status == $object::STATUS_DRAFT && $permissiontoadd && $action != 'selectlines' && $action != 'editline')) {
+			print '</table>';
+		}
+		print '</div>';
+
+		print "</form>\n";
+
+		mrpCollapseBomManagement();
+
+
 		//Services
 		$filtertype = 1;
 		$res = $object->fetchLinesbytypeproduct(1);
 		$object->calculateCosts();
 
-		if ($res > 0) {
-			print load_fiche_titre($langs->trans('BOMServicesList'), '', 'service');
+		print ($res == 0 && $object->status >= $object::STATUS_VALIDATED) ? '' : load_fiche_titre($langs->trans('BOMServicesList'), '', 'service');
 
+		print '	<form name="addservice" id="addservice" action="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . (($action != 'editline') ? '' : '') . '" method="POST">
+    	<input type="hidden" name="token" value="' . newToken() . '">
+    	<input type="hidden" name="action" value="' . (($action != 'editline') ? 'addline' : 'updateline') . '">
+    	<input type="hidden" name="mode" value="">
+		<input type="hidden" name="page_y" value="">    		<input type="hidden" name="id" value="' . $object->id . '">
+    	';
 
-			print '	<form name="addservice" id="addservice" action="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . (($action != 'editline') ? '' : '') . '" method="POST">
-    		<input type="hidden" name="token" value="' . newToken() . '">
-    		<input type="hidden" name="action" value="' . (($action != 'editline') ? 'addline' : 'updateline') . '">
-    		<input type="hidden" name="mode" value="">
-			<input type="hidden" name="page_y" value="">
-    		<input type="hidden" name="id" value="' . $object->id . '">
-    		';
-
-			if (!empty($conf->use_javascript_ajax) && $object->status == 0) {
-				$tagidfortablednd = 'tablelinesservice';
-				include DOL_DOCUMENT_ROOT . '/core/tpl/ajaxrow.tpl.php';
-			}
-
-			print '<div class="div-table-responsive-no-min">';
-			if (!empty($object->lines) || ($object->status == $object::STATUS_DRAFT && $permissiontoadd && $action != 'selectlines' && $action != 'editline')) {
-				print '<table id="tablelinesservice" class="noborder noshadow" width="100%">';
-			}
-
-			if (!empty($object->lines)) {
-				$object->printObjectLines($action, $mysoc, null, GETPOST('lineid', 'int'), 1, '/bom/tpl');
-			}
-
-			// Form to add new line
-			if ($object->status == 0 && $permissiontoadd && $action != 'selectlines') {
-				if ($action != 'editline') {
-					// Add services form
-					$parameters = array();
-					$reshook = $hookmanager->executeHooks('formAddObjectServiceLine', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
-					if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
-					if (empty($reshook))
-						$object->formAddObjectLine(1, $mysoc, null, '/bom/tpl');
-				}
-			}
-
-			if (!empty($object->lines) || ($object->status == $object::STATUS_DRAFT && $permissiontoadd && $action != 'selectlines' && $action != 'editline')) {
-				print '</table>';
-			}
-			print '</div>';
+		if (!empty($conf->use_javascript_ajax) && $object->status == 0) {
+			$tagidfortablednd = 'tablelinesservice';
+			include DOL_DOCUMENT_ROOT . '/core/tpl/ajaxrow.tpl.php';
 		}
 
+		print '<div class="div-table-responsive-no-min">';
+		if (!empty($object->lines) || ($object->status == $object::STATUS_DRAFT && $permissiontoadd && $action != 'selectlines' && $action != 'editline')) {
+			print '<table id="tablelinesservice" class="noborder noshadow" width="100%">';
+		}
+
+		if (!empty($object->lines)) {
+			$object->printObjectLines($action, $mysoc, null, GETPOST('lineid', 'int'), 1, '/bom/tpl');
+		}
+
+		// Form to add new line
+		if ($object->status == 0 && $permissiontoadd && $action != 'selectlines') {
+			if ($action != 'editline') {
+				// Add services form
+				$parameters = array();
+				$reshook = $hookmanager->executeHooks('formAddObjectServiceLine', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
+				if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+				if (empty($reshook))
+					$object->formAddObjectLine(1, $mysoc, null, '/bom/tpl');
+			}
+		}
+
+		if (!empty($object->lines) || ($object->status == $object::STATUS_DRAFT && $permissiontoadd && $action != 'selectlines' && $action != 'editline')) {
+			print '</table>';
+		}
+		print '</div>';
+
 		print "</form>\n";
 	}
 
+	$res = $object->fetchLines();
 
 	// Buttons for actions
 
diff --git a/htdocs/bom/class/bom.class.php b/htdocs/bom/class/bom.class.php
index db03f6bf0bd..e3aa0180cf5 100644
--- a/htdocs/bom/class/bom.class.php
+++ b/htdocs/bom/class/bom.class.php
@@ -444,7 +444,7 @@ class BOM extends CommonObject
 				$i++;
 			}
 
-			return 1;
+			return $num_rows;
 		} else {
 			$this->error = $this->db->lasterror();
 			$this->errors[] = $this->error;

From 7f1a17bcc97a14b47c48ddfcf4677614b34332f7 Mon Sep 17 00:00:00 2001
From: atm-lena <lena.papazian@atm-consulting.fr>
Date: Wed, 20 Jul 2022 15:38:37 +0200
Subject: [PATCH 031/974] Change fk_unit service lines management

---
 htdocs/bom/ajax/ajax.php                         |  8 ++++----
 htdocs/bom/bom_card.php                          | 10 ++++++----
 htdocs/bom/class/bom.class.php                   |  5 +++--
 htdocs/bom/tpl/objectline_create.tpl.php         | 12 +++++++++---
 htdocs/bom/tpl/objectline_edit.tpl.php           |  2 +-
 htdocs/bom/tpl/objectline_view.tpl.php           | 16 +++++++---------
 htdocs/core/class/cunits.class.php               |  7 ++++---
 htdocs/core/lib/functions.lib.php                |  6 +++++-
 htdocs/install/mysql/migration/16.0.0-17.0.0.sql |  2 +-
 htdocs/install/mysql/tables/llx_bom_bomline.sql  |  2 +-
 10 files changed, 41 insertions(+), 29 deletions(-)

diff --git a/htdocs/bom/ajax/ajax.php b/htdocs/bom/ajax/ajax.php
index 2ad12cc60a3..fac4fee6ef4 100644
--- a/htdocs/bom/ajax/ajax.php
+++ b/htdocs/bom/ajax/ajax.php
@@ -53,6 +53,7 @@ if (!defined('NOBROWSERNOTIF')) {
 
 include_once '../../main.inc.php'; // Load $user and permissions
 require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/cunits.class.php';
 
 
 $action = GETPOST('action', 'aZ09');
@@ -69,10 +70,9 @@ if ($action == 'getDurationUnitByProduct') {
 	$product = new Product($db);
 	$res = $product->fetch($idproduct);
 
-	if ($res > 0) {
-		$return = $product->duration_unit;
-	}
+	$cUnit = new CUnits($db);
+	$fk_unit = $cUnit->getUnitFromCode($product->duration_unit, 'short_label','time');
 
-	echo json_encode($return);
+	echo json_encode($fk_unit);
 	exit();
 }
diff --git a/htdocs/bom/bom_card.php b/htdocs/bom/bom_card.php
index ce9a284200b..026f055fb8c 100644
--- a/htdocs/bom/bom_card.php
+++ b/htdocs/bom/bom_card.php
@@ -167,7 +167,7 @@ if (empty($reshook)) {
 		$qty_frozen = price2num(GETPOST('qty_frozen', 'alpha'), 'MS');
 		$disable_stock_change = GETPOST('disable_stock_change', 'int');
 		$efficiency = price2num(GETPOST('efficiency', 'alpha'));
-		$duration_unit = GETPOST('duration_unit', 'alphanohtml');
+		$fk_unit = GETPOST('fk_unit', 'alphanohtml');
 		if ($qty == '') {
 			setEventMessages($langs->trans('ErrorFieldRequired', $langs->transnoentitiesnoconv('Qty')), null, 'errors');
 			$error++;
@@ -191,7 +191,7 @@ if (empty($reshook)) {
 			$bomline->qty_frozen = (int) $qty_frozen;
 			$bomline->disable_stock_change = (int) $disable_stock_change;
 			$bomline->efficiency = $efficiency;
-			$bomline->duration_unit = $duration_unit;
+			$bomline->fk_unit = $fk_unit;
 
 			// Rang to use
 			$rangmax = $object->line_max(0);
@@ -227,7 +227,7 @@ if (empty($reshook)) {
 		$qty_frozen = price2num(GETPOST('qty_frozen', 'alpha'), 'MS');
 		$disable_stock_change = GETPOST('disable_stock_change', 'int');
 		$efficiency = price2num(GETPOST('efficiency', 'alpha'));
-		$duration_unit = GETPOST('duration_unit', 'alphanohtml');
+		$fk_unit = GETPOST('fk_unit', 'alphanohtml');
 
 		if ($qty == '') {
 			setEventMessages($langs->trans('ErrorFieldRequired', $langs->transnoentitiesnoconv('Qty')), null, 'errors');
@@ -240,7 +240,9 @@ if (empty($reshook)) {
 		$bomline->qty_frozen = (int) $qty_frozen;
 		$bomline->disable_stock_change = (int) $disable_stock_change;
 		$bomline->efficiency = $efficiency;
-		$bomline->duration_unit = $duration_unit;
+
+		require_once DOL_DOCUMENT_ROOT.'/core/class/cunits.class.php';
+		$bomline->fk_unit = $fk_unit;
 
 		$result = $bomline->update($user);
 		if ($result <= 0) {
diff --git a/htdocs/bom/class/bom.class.php b/htdocs/bom/class/bom.class.php
index e3aa0180cf5..f74a1d69263 100644
--- a/htdocs/bom/class/bom.class.php
+++ b/htdocs/bom/class/bom.class.php
@@ -1128,7 +1128,8 @@ class BOM extends CommonObject
 					}
 				} else {
 					//Convert qty to hour
-					$qty = convertDurationtoHour($line->qty, $line->duration_unit);
+					$unit = measuringUnitString($line->fk_unit);
+					$qty = convertDurationtoHour($line->qty, $unit);
 
 					if ($conf->workstation->enabled) {
 						if ($tmpproduct->fk_default_workstation) {
@@ -1293,7 +1294,7 @@ class BOMLine extends CommonObjectLine
 		'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'),
-		'duration_unit' => array('type'=>'varchar(6)', 'label'=>'Unit', 'enabled'=>1, 'visible'=>1, 'position'=>120, 'notnull'=>-1,),
+		'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,),
 	);
diff --git a/htdocs/bom/tpl/objectline_create.tpl.php b/htdocs/bom/tpl/objectline_create.tpl.php
index ff257d6ab72..f8fa20e1db4 100644
--- a/htdocs/bom/tpl/objectline_create.tpl.php
+++ b/htdocs/bom/tpl/objectline_create.tpl.php
@@ -160,8 +160,11 @@ if ($filtertype != 1) {
 	print '</td>';
 } else {
 	$coldisplay++;
+	require_once DOL_DOCUMENT_ROOT.'/core/class/cunits.class.php';
+	$cUnit = new CUnits($this->db);
+	$fk_unit_default = $cUnit->getUnitFromCode('h', 'short_label','time');
 	print '<td class="bordertop nobottom nowrap linecolunit right">';
-	print  $formproduct->selectMeasuringUnits("duration_unit", "time", 'h', 0, 1);
+	print  $formproduct->selectMeasuringUnits("fk_unit", "time", $fk_unit_default, 0, 0);
 	print '</td>';
 
 	$coldisplay++;
@@ -212,7 +215,8 @@ jQuery(document).ready(function() {
 	//change unit selected if we change service selected
 	<?php if ($filtertype == 1) { ?>
 	$('#idprodservice').change(function(){
-			var idproduct = $(this).val();
+		var idproduct = $(this).val();
+
 			$.ajax({
 				url : "<?php echo dol_buildpath('/bom/ajax/ajax.php', 1); ?>"
 				,type: 'POST'
@@ -221,8 +225,10 @@ jQuery(document).ready(function() {
 					,'idproduct' : idproduct
 				}
 			}).done(function(data) {
+
+				console.log(data);
 				var data = JSON.parse(data);
-				$('#duration_unit').val(data).change();;
+				$("#fk_unit").val(data).change();
 			});
 	});
 	<?php } ?>
diff --git a/htdocs/bom/tpl/objectline_edit.tpl.php b/htdocs/bom/tpl/objectline_edit.tpl.php
index b803277f359..d7505207f4c 100644
--- a/htdocs/bom/tpl/objectline_edit.tpl.php
+++ b/htdocs/bom/tpl/objectline_edit.tpl.php
@@ -141,7 +141,7 @@ if ($filtertype != 1) {
 
 	$coldisplay++;
 	print '<td class="nobottom nowrap linecolunit right">';
-	print  $formproduct->selectMeasuringUnits("duration_unit", "time", ($line->duration_unit) ? $line->duration_unit : '', 0, 1);
+	print  $formproduct->selectMeasuringUnits("fk_unit", "time", ($line->fk_unit) ? $line->fk_unit : '', 0, 0);
 	print '</td>';
 
 	$coldisplay++;
diff --git a/htdocs/bom/tpl/objectline_view.tpl.php b/htdocs/bom/tpl/objectline_view.tpl.php
index 2c9758f2176..7c436d5721e 100644
--- a/htdocs/bom/tpl/objectline_view.tpl.php
+++ b/htdocs/bom/tpl/objectline_view.tpl.php
@@ -132,16 +132,14 @@ if ($filtertype != 1) {
 	//Unité
 	print '<td class="linecolunit nowrap right">';
 	$coldisplay++;
-	if ($line->qty > 1) {
-		$dur = array("s"=>$langs->trans("Seconds"), "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 ($tmpproduct->duration_value > 0) {
-		$dur = array("s"=>$langs->trans("Second"), "i"=>$langs->trans("Minute"), "h"=>$langs->trans("Hour"), "d"=>$langs->trans("Day"), "w"=>$langs->trans("Week"), "m"=>$langs->trans("Month"), "y"=>$langs->trans("Year"));
-	}
-	if (!empty($line->duration_unit)) {
-		print (isset($dur[$line->duration_unit]) ? "&nbsp;".$langs->trans($dur[$line->duration_unit])."&nbsp;" : '');
-	} else {
-		print (!empty($tmpproduct->duration_unit) && isset($dur[$tmpproduct->duration_unit]) ? "&nbsp;" . $langs->trans($dur[$tmpproduct->duration_unit]) . "&nbsp;" : '');
+
+	if (!empty($line->fk_unit)) {
+		require_once DOL_DOCUMENT_ROOT.'/core/class/cunits.class.php';
+		$unit = new CUnits($this->db);
+		$unit->fetch($line->fk_unit);
+		print (isset($unit->label) ? "&nbsp;".$langs->trans(ucwords($unit->label))."&nbsp;" : '');
 	}
+
 	print '</td>';
 
 	//Poste de travail
diff --git a/htdocs/core/class/cunits.class.php b/htdocs/core/class/cunits.class.php
index dfc22fd37ec..9ad1f77e84a 100644
--- a/htdocs/core/class/cunits.class.php
+++ b/htdocs/core/class/cunits.class.php
@@ -420,15 +420,16 @@ class CUnits // extends CommonObject
 	 * Get unit from code
 	 * @param string $code code of unit
 	 * @param string $mode 0= id , short_label=Use short label as value, code=use code
+	 * @param string $unit_type weight,size,surface,volume,qty,time...
 	 * @return int            <0 if KO, Id of code if OK
 	 */
-	public function getUnitFromCode($code, $mode = 'code')
+	public function getUnitFromCode($code, $mode = 'code', $unit_type='')
 	{
 
 		if ($mode == 'short_label') {
-			return dol_getIdFromCode($this->db, $code, 'c_units', 'short_label', 'rowid');
+			return dol_getIdFromCode($this->db, $code, 'c_units', 'short_label', 'rowid',0, ' AND unit_type = "'.$unit_type.'"');
 		} elseif ($mode == 'code') {
-			return dol_getIdFromCode($this->db, $code, 'c_units', 'code', 'rowid');
+			return dol_getIdFromCode($this->db, $code, 'c_units', 'code', 'rowid',0, ' AND unit_type = "'. $unit_type .'"');
 		}
 
 		return $code;
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 381280289ee..8f08d77c6fb 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -8504,10 +8504,11 @@ function dol_osencode($str)
  * 		@param	string	$fieldkey		Field to search the key into
  * 		@param	string	$fieldid		Field to get
  *      @param  int		$entityfilter	Filter by entity
+ * 	    @param	string		$filters	Filter on other fields
  *      @return int						<0 if KO, Id of code if OK
  *      @see $langs->getLabelFromKey
  */
-function dol_getIdFromCode($db, $key, $tablename, $fieldkey = 'code', $fieldid = 'id', $entityfilter = 0)
+function dol_getIdFromCode($db, $key, $tablename, $fieldkey = 'code', $fieldid = 'id', $entityfilter = 0, $filters = array())
 {
 	global $cache_codes;
 
@@ -8529,6 +8530,9 @@ function dol_getIdFromCode($db, $key, $tablename, $fieldkey = 'code', $fieldid =
 	if (!empty($entityfilter)) {
 		$sql .= " AND entity IN (".getEntity($tablename).")";
 	}
+	if ($filters) {
+		$sql .= $filters;
+	}
 
 	$resql = $db->query($sql);
 	if ($resql) {
diff --git a/htdocs/install/mysql/migration/16.0.0-17.0.0.sql b/htdocs/install/mysql/migration/16.0.0-17.0.0.sql
index fb1ba0a8da2..051889a3dde 100644
--- a/htdocs/install/mysql/migration/16.0.0-17.0.0.sql
+++ b/htdocs/install/mysql/migration/16.0.0-17.0.0.sql
@@ -57,4 +57,4 @@ ALTER TABLE llx_facture_fourn ADD COLUMN close_missing_amount double(24, 8) afte
 ALTER TABLE llx_adherent_type ADD COLUMN caneditamount integer DEFAULT 0 AFTER amount;
 
 ALTER TABLE llx_product ADD COLUMN fk_default_workstation integer DEFAULT NULL;
-ALTER TABLE llx_bom_bomline ADD COLUMN duration_unit varchar(6) DEFAULT NULL;
+ALTER TABLE llx_bom_bomline ADD COLUMN fk_unit integer DEFAULT NULL;
diff --git a/htdocs/install/mysql/tables/llx_bom_bomline.sql b/htdocs/install/mysql/tables/llx_bom_bomline.sql
index c93484db92a..eae1f6c6662 100644
--- a/htdocs/install/mysql/tables/llx_bom_bomline.sql
+++ b/htdocs/install/mysql/tables/llx_bom_bomline.sql
@@ -25,7 +25,7 @@ CREATE TABLE llx_bom_bomline(
     qty_frozen smallint DEFAULT 0,
     disable_stock_change smallint DEFAULT 0, 
 	efficiency double(24,8) NOT NULL DEFAULT 1,
-	duration_unit varchar(6) NULL,
+	fk_unit integer NULL,
 	position integer NOT NULL DEFAULT 0
 	-- END MODULEBUILDER FIELDS
 ) ENGINE=innodb;

From 9ef883e7b007d9073868a64d32a7f14278f068f1 Mon Sep 17 00:00:00 2001
From: stickler-ci <support@stickler-ci.com>
Date: Wed, 20 Jul 2022 13:42:33 +0000
Subject: [PATCH 032/974] Fixing style errors.

---
 htdocs/bom/ajax/ajax.php                 | 2 +-
 htdocs/bom/tpl/objectline_create.tpl.php | 2 +-
 htdocs/core/class/cunits.class.php       | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/htdocs/bom/ajax/ajax.php b/htdocs/bom/ajax/ajax.php
index fac4fee6ef4..2a57752edde 100644
--- a/htdocs/bom/ajax/ajax.php
+++ b/htdocs/bom/ajax/ajax.php
@@ -71,7 +71,7 @@ if ($action == 'getDurationUnitByProduct') {
 	$res = $product->fetch($idproduct);
 
 	$cUnit = new CUnits($db);
-	$fk_unit = $cUnit->getUnitFromCode($product->duration_unit, 'short_label','time');
+	$fk_unit = $cUnit->getUnitFromCode($product->duration_unit, 'short_label', 'time');
 
 	echo json_encode($fk_unit);
 	exit();
diff --git a/htdocs/bom/tpl/objectline_create.tpl.php b/htdocs/bom/tpl/objectline_create.tpl.php
index f8fa20e1db4..43982ed9a7d 100644
--- a/htdocs/bom/tpl/objectline_create.tpl.php
+++ b/htdocs/bom/tpl/objectline_create.tpl.php
@@ -162,7 +162,7 @@ if ($filtertype != 1) {
 	$coldisplay++;
 	require_once DOL_DOCUMENT_ROOT.'/core/class/cunits.class.php';
 	$cUnit = new CUnits($this->db);
-	$fk_unit_default = $cUnit->getUnitFromCode('h', 'short_label','time');
+	$fk_unit_default = $cUnit->getUnitFromCode('h', 'short_label', 'time');
 	print '<td class="bordertop nobottom nowrap linecolunit right">';
 	print  $formproduct->selectMeasuringUnits("fk_unit", "time", $fk_unit_default, 0, 0);
 	print '</td>';
diff --git a/htdocs/core/class/cunits.class.php b/htdocs/core/class/cunits.class.php
index 9ad1f77e84a..3104ccd347d 100644
--- a/htdocs/core/class/cunits.class.php
+++ b/htdocs/core/class/cunits.class.php
@@ -423,13 +423,13 @@ class CUnits // extends CommonObject
 	 * @param string $unit_type weight,size,surface,volume,qty,time...
 	 * @return int            <0 if KO, Id of code if OK
 	 */
-	public function getUnitFromCode($code, $mode = 'code', $unit_type='')
+	public function getUnitFromCode($code, $mode = 'code', $unit_type = '')
 	{
 
 		if ($mode == 'short_label') {
-			return dol_getIdFromCode($this->db, $code, 'c_units', 'short_label', 'rowid',0, ' AND unit_type = "'.$unit_type.'"');
+			return dol_getIdFromCode($this->db, $code, 'c_units', 'short_label', 'rowid', 0, ' AND unit_type = "'.$unit_type.'"');
 		} elseif ($mode == 'code') {
-			return dol_getIdFromCode($this->db, $code, 'c_units', 'code', 'rowid',0, ' AND unit_type = "'. $unit_type .'"');
+			return dol_getIdFromCode($this->db, $code, 'c_units', 'code', 'rowid', 0, ' AND unit_type = "'. $unit_type .'"');
 		}
 
 		return $code;

From e4ec999b455457098403cd19b2ca16d3fed88ac0 Mon Sep 17 00:00:00 2001
From: atm-lena <lena.papazian@atm-consulting.fr>
Date: Thu, 21 Jul 2022 14:33:50 +0200
Subject: [PATCH 033/974] Retour stickler

---
 htdocs/bom/tpl/objectline_edit.tpl.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/htdocs/bom/tpl/objectline_edit.tpl.php b/htdocs/bom/tpl/objectline_edit.tpl.php
index d7505207f4c..0ce88fa359c 100644
--- a/htdocs/bom/tpl/objectline_edit.tpl.php
+++ b/htdocs/bom/tpl/objectline_edit.tpl.php
@@ -138,7 +138,6 @@ if ($filtertype != 1) {
 	print '<td class="nobottom nowrap linecolcostprice right">';
 	print '</td>';
 } else {
-
 	$coldisplay++;
 	print '<td class="nobottom nowrap linecolunit right">';
 	print  $formproduct->selectMeasuringUnits("fk_unit", "time", ($line->fk_unit) ? $line->fk_unit : '', 0, 0);

From 420b2c1651283811f7665e4577ad5794c5adb6d2 Mon Sep 17 00:00:00 2001
From: atm-lena <lena.papazian@atm-consulting.fr>
Date: Wed, 17 Aug 2022 09:44:20 +0200
Subject: [PATCH 034/974] FIX : display labl in workstation select, no ref

---
 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 0ac039b55ec..a21ff6348e6 100644
--- a/htdocs/product/class/html.formproduct.class.php
+++ b/htdocs/product/class/html.formproduct.class.php
@@ -191,7 +191,7 @@ class FormProduct
 			return 0; // Cache already loaded and we do not want a list with information specific to a product
 		}
 
-		$sql = "SELECT w.rowid, w.ref as label, w.type, w.nb_operators_required,w.thm_operator_estimated,w.thm_machine_estimated";
+		$sql = "SELECT w.rowid, w.ref as ref, w.label as label, w.type, w.nb_operators_required,w.thm_operator_estimated,w.thm_machine_estimated";
 		$sql .= " FROM ".$this->db->prefix()."workstation_workstation as w";
 		$sql .= " WHERE 1 = 1";
 		if (!empty($fk_product) && $fk_product > 0) {

From 9ec0c9963ac90f3404a8df0de0352a16119eb10e Mon Sep 17 00:00:00 2001
From: atm-lena <lena.papazian@atm-consulting.fr>
Date: Wed, 17 Aug 2022 10:26:25 +0200
Subject: [PATCH 035/974] FIX : total cost line => bad convert

---
 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 ac73ab58475..c57a5816517 100644
--- a/htdocs/bom/class/bom.class.php
+++ b/htdocs/bom/class/bom.class.php
@@ -1128,7 +1128,7 @@ class BOM extends CommonObject
 					}
 				} else {
 					//Convert qty to hour
-					$unit = measuringUnitString($line->fk_unit);
+					$unit = measuringUnitString($line->fk_unit, '', '', 1);
 					$qty = convertDurationtoHour($line->qty, $unit);
 
 					if ($conf->workstation->enabled) {

From 8328923e096809480f45792185e85952dd6adfa0 Mon Sep 17 00:00:00 2001
From: Anthony Berton <bertonanthony@gmail.com>
Date: Mon, 22 Aug 2022 17:18:31 +0200
Subject: [PATCH 036/974] update date

---
 htdocs/comm/propal/card.php               | 23 +++++++++++++++++++++--
 htdocs/comm/propal/class/propal.class.php |  2 +-
 2 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/htdocs/comm/propal/card.php b/htdocs/comm/propal/card.php
index c05554d2242..ad5722eb187 100644
--- a/htdocs/comm/propal/card.php
+++ b/htdocs/comm/propal/card.php
@@ -315,9 +315,28 @@ if (empty($reshook)) {
 		}
 
 		if (!$error) {
+			if (isset($object->duree_validite) && !empty($object->fin_validite)) {
+				$object->fin_validite = $datep + ($object->duree_validite * 24 * 3600);
+			}
 			$result = $object->set_date($user, $datep);
 			if ($result < 0) {
 				dol_print_error($db, $object->error);
+			} elseif (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) {
+				$outputlangs = $langs;
+				$newlang = '';
+				if (!empty($conf->global->MAIN_MULTILANGS) && empty($newlang) && GETPOST('lang_id', 'aZ09')) $newlang = GETPOST('lang_id', 'aZ09');
+				if (!empty($conf->global->MAIN_MULTILANGS) && empty($newlang))	$newlang = $object->thirdparty->default_lang;
+				if (!empty($newlang)) {
+					$outputlangs = new Translate("", $conf);
+					$outputlangs->setDefaultLang($newlang);
+				}
+				$model = $object->model_pdf;
+				$ret = $object->fetch($id); // Reload to get new records
+				if ($ret > 0) {
+					$object->fetch_thirdparty();
+				}
+
+				$object->generateDocument($model, $outputlangs, $hidedetails, $hidedesc, $hideref);
 			}
 		}
 	} elseif ($action == 'setecheance' && $usercancreate) {
@@ -326,8 +345,8 @@ if (empty($reshook)) {
 			if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) {
 				$outputlangs = $langs;
 				$newlang = '';
-				if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id', 'aZ09')) $newlang = GETPOST('lang_id', 'aZ09');
-				if ($conf->global->MAIN_MULTILANGS && empty($newlang))	$newlang = $object->thirdparty->default_lang;
+				if (!empty($conf->global->MAIN_MULTILANGS) && empty($newlang) && GETPOST('lang_id', 'aZ09')) $newlang = GETPOST('lang_id', 'aZ09');
+				if (!empty($conf->global->MAIN_MULTILANGS) && empty($newlang))	$newlang = $object->thirdparty->default_lang;
 				if (!empty($newlang)) {
 					$outputlangs = new Translate("", $conf);
 					$outputlangs->setDefaultLang($newlang);
diff --git a/htdocs/comm/propal/class/propal.class.php b/htdocs/comm/propal/class/propal.class.php
index d0524ec895f..5924cfc9d67 100644
--- a/htdocs/comm/propal/class/propal.class.php
+++ b/htdocs/comm/propal/class/propal.class.php
@@ -2066,7 +2066,7 @@ class Propal extends CommonObject
 
 			$this->db->begin();
 
-			$sql = "UPDATE ".MAIN_DB_PREFIX."propal SET datep = '".$this->db->idate($date)."'";
+			$sql = "UPDATE ".MAIN_DB_PREFIX."propal SET datep = '".$this->db->idate($date)."',fin_validite = '".$this->db->idate($this->fin_validite)."'";
 			$sql .= " WHERE rowid = ".((int) $this->id)." AND fk_statut = ".self::STATUS_DRAFT;
 
 			dol_syslog(__METHOD__, LOG_DEBUG);

From 5a4d5d7f97e8dd328bb00e5d8b0296f43b61f857 Mon Sep 17 00:00:00 2001
From: Anthony Berton <bertonanthony@gmail.com>
Date: Tue, 23 Aug 2022 08:56:00 +0200
Subject: [PATCH 037/974] set_echeance no in set_date

---
 htdocs/comm/propal/card.php               | 24 +++++++++++++----------
 htdocs/comm/propal/class/propal.class.php |  4 ++--
 2 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/htdocs/comm/propal/card.php b/htdocs/comm/propal/card.php
index ad5722eb187..c5bf5bbf80f 100644
--- a/htdocs/comm/propal/card.php
+++ b/htdocs/comm/propal/card.php
@@ -315,10 +315,11 @@ if (empty($reshook)) {
 		}
 
 		if (!$error) {
-			if (isset($object->duree_validite) && !empty($object->fin_validite)) {
-				$object->fin_validite = $datep + ($object->duree_validite * 24 * 3600);
-			}
 			$result = $object->set_date($user, $datep);
+			if ($result > 0 && !empty($object->duree_validite) && !empty($object->fin_validite)) {
+				$datev = $datep + ($object->duree_validite * 24 * 3600);
+				$result = $object->set_echeance($user, $datev, 1);
+			}
 			if ($result < 0) {
 				dol_print_error($db, $object->error);
 			} elseif (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) {
@@ -2301,13 +2302,16 @@ if ($action == 'create') {
 	// Date of proposal
 	print '<tr>';
 	print '<td>';
-	print '<table class="nobordernopadding" width="100%"><tr><td>';
-	print $langs->trans('DatePropal');
-	print '</td>';
-	if ($action != 'editdate' && $usercancreate && $caneditfield) {
-		print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editdate&token='.newToken().'&id='.$object->id.'">'.img_edit($langs->trans('SetDate'), 1).'</a></td>';
-	}
-	print '</tr></table>';
+	// print '<table class="nobordernopadding" width="100%"><tr><td>';
+	// print $langs->trans('DatePropal');
+	// print '</td>';
+	// if ($action != 'editdate' && $usercancreate && $caneditfield) {
+	// 	print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editdate&token='.newToken().'&id='.$object->id.'">'.img_edit($langs->trans('SetDate'), 1).'</a></td>';
+	// }
+
+	// print '</tr></table>';
+	$editenable = $usercancreate && $caneditfield && $object->statut == Propal::STATUS_DRAFT;
+	print $form->editfieldkey("DatePropal", 'date', '', $object, $editenable);
 	print '</td><td class="valuefield">';
 	if ($action == 'editdate' && $usercancreate && $caneditfield) {
 		print '<form name="editdate" action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'" method="post">';
diff --git a/htdocs/comm/propal/class/propal.class.php b/htdocs/comm/propal/class/propal.class.php
index 5924cfc9d67..cd56fac3e7b 100644
--- a/htdocs/comm/propal/class/propal.class.php
+++ b/htdocs/comm/propal/class/propal.class.php
@@ -384,7 +384,7 @@ class Propal extends CommonObject
 		$this->socid = $socid;
 		$this->id = $propalid;
 
-		$this->duree_validite = ((int) $conf->global->PROPALE_VALIDITY_DURATION);
+		$this->duree_validite = isset($conf->global->PROPALE_VALIDITY_DURATION)?((int) $conf->global->PROPALE_VALIDITY_DURATION):0;
 	}
 
 
@@ -2066,7 +2066,7 @@ class Propal extends CommonObject
 
 			$this->db->begin();
 
-			$sql = "UPDATE ".MAIN_DB_PREFIX."propal SET datep = '".$this->db->idate($date)."',fin_validite = '".$this->db->idate($this->fin_validite)."'";
+			$sql = "UPDATE ".MAIN_DB_PREFIX."propal SET datep = '".$this->db->idate($date)."'";
 			$sql .= " WHERE rowid = ".((int) $this->id)." AND fk_statut = ".self::STATUS_DRAFT;
 
 			dol_syslog(__METHOD__, LOG_DEBUG);

From 1a15582c49f790e75460d04e74aee241aa61f388 Mon Sep 17 00:00:00 2001
From: stickler-ci <support@stickler-ci.com>
Date: Wed, 24 Aug 2022 09:43:48 +0000
Subject: [PATCH 038/974] Fixing style errors.

---
 htdocs/bom/bom_card.php | 154 ++++++++++++++++++++--------------------
 1 file changed, 77 insertions(+), 77 deletions(-)

diff --git a/htdocs/bom/bom_card.php b/htdocs/bom/bom_card.php
index f1823e7a79a..e66462d8584 100644
--- a/htdocs/bom/bom_card.php
+++ b/htdocs/bom/bom_card.php
@@ -147,93 +147,93 @@ if (empty($reshook)) {
 	include DOL_DOCUMENT_ROOT.'/core/actions_sendmails.inc.php';
 
 	// Add line
-	if ($action == 'addline' && $user->rights->bom->write) {
-		$langs->load('errors');
-		$error = 0;
+if ($action == 'addline' && $user->rights->bom->write) {
+	$langs->load('errors');
+	$error = 0;
 
-		// Set if we used free entry or predefined product
-		$bom_child_id = (int) GETPOST('bom_id', 'int');
-		if ($bom_child_id > 0) {
-			$bom_child = new BOM($db);
-			$res = $bom_child->fetch($bom_child_id);
-			if ($res) {
-				$idprod = $bom_child->fk_product;
-			}
-		} else {
-			$idprod = (!empty(GETPOST('idprodservice', 'int')) ? GETPOST('idprodservice', 'int') : (int) GETPOST('idprod', 'int'));
-		}
-
-		$qty = price2num(GETPOST('qty', 'alpha'), 'MS');
-		$qty_frozen = price2num(GETPOST('qty_frozen', 'alpha'), 'MS');
-		$disable_stock_change = GETPOST('disable_stock_change', 'int');
-		$efficiency = price2num(GETPOST('efficiency', 'alpha'));
-		$fk_unit = GETPOST('fk_unit', 'alphanohtml');
-		if ($qty == '') {
-			setEventMessages($langs->trans('ErrorFieldRequired', $langs->transnoentitiesnoconv('Qty')), null, 'errors');
-			$error++;
-		}
-		if (!($idprod > 0)) {
-			setEventMessages($langs->trans('ErrorFieldRequired', $langs->transnoentitiesnoconv('Product')), null, 'errors');
-			$error++;
-		}
-
-		if ($object->fk_product == $idprod) {
-			setEventMessages($langs->trans('TheProductXIsAlreadyTheProductToProduce'), null, 'errors');
-			$error++;
-		}
-
-		if (!$error) {
-			$result = $object->addLine($idprod, $qty, $qty_frozen, $disable_stock_change, $efficiency, -1, $bom_child_id, null);
-
-			if ($result <= 0) {
-				setEventMessages($object->error, $object->errors, 'errors');
-				$action = '';
-			} else {
-				unset($_POST['idprod']);
-				unset($_POST['idprodservice']);
-				unset($_POST['qty']);
-				unset($_POST['qty_frozen']);
-				unset($_POST['disable_stock_change']);
-
-				$object->fetchLines();
-
-				$object->calculateCosts();
-			}
+	// Set if we used free entry or predefined product
+	$bom_child_id = (int) GETPOST('bom_id', 'int');
+	if ($bom_child_id > 0) {
+		$bom_child = new BOM($db);
+		$res = $bom_child->fetch($bom_child_id);
+		if ($res) {
+			$idprod = $bom_child->fk_product;
 		}
+	} else {
+		$idprod = (!empty(GETPOST('idprodservice', 'int')) ? GETPOST('idprodservice', 'int') : (int) GETPOST('idprod', 'int'));
 	}
 
-	// Update line
-	if ($action == 'updateline' && $user->rights->bom->write) {
-		$langs->load('errors');
-		$error = 0;
+	$qty = price2num(GETPOST('qty', 'alpha'), 'MS');
+	$qty_frozen = price2num(GETPOST('qty_frozen', 'alpha'), 'MS');
+	$disable_stock_change = GETPOST('disable_stock_change', 'int');
+	$efficiency = price2num(GETPOST('efficiency', 'alpha'));
+	$fk_unit = GETPOST('fk_unit', 'alphanohtml');
+	if ($qty == '') {
+		setEventMessages($langs->trans('ErrorFieldRequired', $langs->transnoentitiesnoconv('Qty')), null, 'errors');
+		$error++;
+	}
+	if (!($idprod > 0)) {
+		setEventMessages($langs->trans('ErrorFieldRequired', $langs->transnoentitiesnoconv('Product')), null, 'errors');
+		$error++;
+	}
 
-		// 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');
-		$efficiency = price2num(GETPOST('efficiency', 'alpha'));
-		$fk_unit = GETPOST('fk_unit', 'alphanohtml');
+	if ($object->fk_product == $idprod) {
+		setEventMessages($langs->trans('TheProductXIsAlreadyTheProductToProduce'), null, 'errors');
+		$error++;
+	}
 
-		if ($qty == '') {
-			setEventMessages($langs->trans('ErrorFieldRequired', $langs->transnoentitiesnoconv('Qty')), null, 'errors');
-			$error++;
+	if (!$error) {
+		$result = $object->addLine($idprod, $qty, $qty_frozen, $disable_stock_change, $efficiency, -1, $bom_child_id, null);
+
+		if ($result <= 0) {
+			setEventMessages($object->error, $object->errors, 'errors');
+			$action = '';
+		} else {
+			unset($_POST['idprod']);
+			unset($_POST['idprodservice']);
+			unset($_POST['qty']);
+			unset($_POST['qty_frozen']);
+			unset($_POST['disable_stock_change']);
+
+			$object->fetchLines();
+
+			$object->calculateCosts();
 		}
+	}
+}
 
-		if (!$error) {
-			$bomline = new BOMLine($db);
-			$bomline->fetch($lineid);
+	// Update line
+if ($action == 'updateline' && $user->rights->bom->write) {
+	$langs->load('errors');
+	$error = 0;
 
-			$result = $object->updateLine($lineid, $qty, (int) $qty_frozen, (int) $disable_stock_change, $efficiency, $bomline->position, $bomline->import_key);
+	// 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');
+	$efficiency = price2num(GETPOST('efficiency', 'alpha'));
+	$fk_unit = GETPOST('fk_unit', 'alphanohtml');
 
-			if ($result <= 0) {
-				setEventMessages($object->error, $object->errors, 'errors');
-				$action = '';
-			} else {
-				unset($_POST['idprod']);
-				unset($_POST['idprodservice']);
-				unset($_POST['qty']);
-				unset($_POST['qty_frozen']);
-				unset($_POST['disable_stock_change']);
+	if ($qty == '') {
+		setEventMessages($langs->trans('ErrorFieldRequired', $langs->transnoentitiesnoconv('Qty')), null, 'errors');
+		$error++;
+	}
+
+	if (!$error) {
+		$bomline = new BOMLine($db);
+		$bomline->fetch($lineid);
+
+		$result = $object->updateLine($lineid, $qty, (int) $qty_frozen, (int) $disable_stock_change, $efficiency, $bomline->position, $bomline->import_key);
+
+		if ($result <= 0) {
+			setEventMessages($object->error, $object->errors, 'errors');
+			$action = '';
+		} else {
+			unset($_POST['idprod']);
+			unset($_POST['idprodservice']);
+			unset($_POST['qty']);
+			unset($_POST['qty_frozen']);
+			unset($_POST['disable_stock_change']);
 
 			$object->fetchLines();
 

From f5d7f66ca06b6add32898630b937e7a5b45f8332 Mon Sep 17 00:00:00 2001
From: atm-lena <lena.papazian@atm-consulting.fr>
Date: Wed, 24 Aug 2022 11:53:25 +0200
Subject: [PATCH 039/974] Ajout gestion fk_unit

---
 htdocs/bom/bom_card.php        | 5 +++--
 htdocs/bom/class/bom.class.php | 6 ++++--
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/htdocs/bom/bom_card.php b/htdocs/bom/bom_card.php
index f1823e7a79a..eb75494e01c 100644
--- a/htdocs/bom/bom_card.php
+++ b/htdocs/bom/bom_card.php
@@ -183,7 +183,7 @@ if (empty($reshook)) {
 		}
 
 		if (!$error) {
-			$result = $object->addLine($idprod, $qty, $qty_frozen, $disable_stock_change, $efficiency, -1, $bom_child_id, null);
+			$result = $object->addLine($idprod, $qty, $qty_frozen, $disable_stock_change, $efficiency, -1, $bom_child_id, null, $fk_unit);
 
 			if ($result <= 0) {
 				setEventMessages($object->error, $object->errors, 'errors');
@@ -223,7 +223,7 @@ if (empty($reshook)) {
 			$bomline = new BOMLine($db);
 			$bomline->fetch($lineid);
 
-			$result = $object->updateLine($lineid, $qty, (int) $qty_frozen, (int) $disable_stock_change, $efficiency, $bomline->position, $bomline->import_key);
+			$result = $object->updateLine($lineid, $qty, (int) $qty_frozen, (int) $disable_stock_change, $efficiency, $bomline->position, $bomline->import_key, $fk_unit);
 
 			if ($result <= 0) {
 				setEventMessages($object->error, $object->errors, 'errors');
@@ -234,6 +234,7 @@ if (empty($reshook)) {
 				unset($_POST['qty']);
 				unset($_POST['qty_frozen']);
 				unset($_POST['disable_stock_change']);
+			}
 
 			$object->fetchLines();
 
diff --git a/htdocs/bom/class/bom.class.php b/htdocs/bom/class/bom.class.php
index 72aed7146a3..2b576fc0b5f 100644
--- a/htdocs/bom/class/bom.class.php
+++ b/htdocs/bom/class/bom.class.php
@@ -569,7 +569,7 @@ class BOM extends CommonObject
 	 * @param	string	$import_key				Import Key
 	 * @return	int								<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)
+	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='')
 	{
 		global $mysoc, $conf, $langs, $user;
 
@@ -637,6 +637,7 @@ class BOM extends CommonObject
 			$this->line->fk_bom_child = $fk_bom_child;
 			$this->line->import_key = $import_key;
 			$this->line->position = $rankToUse;
+			$this->line->fk_unit = $fk_unit;
 
 			$result = $this->line->create($user);
 
@@ -668,7 +669,7 @@ class BOM extends CommonObject
 	 * @param	string	$import_key				Import Key
 	 * @return	int								<0 if KO, Id of updated BOM-Line if OK
 	 */
-	public function updateLine($rowid, $qty, $qty_frozen = 0, $disable_stock_change = 0, $efficiency = 1.0, $position = -1, $import_key = null)
+	public function updateLine($rowid, $qty, $qty_frozen = 0, $disable_stock_change = 0, $efficiency = 1.0, $position = -1, $import_key = null, $fk_unit)
 	{
 		global $mysoc, $conf, $langs, $user;
 
@@ -738,6 +739,7 @@ class BOM extends CommonObject
 			$this->line->efficiency = $efficiency;
 			$this->line->import_key = $import_key;
 			$this->line->position = $rankToUse;
+			$this->line->fk_unit = $fk_unit;
 
 			$result = $this->line->update($user);
 

From ab2b445b53ce807408fb293ce8af9573af1affee Mon Sep 17 00:00:00 2001
From: atm-lena <lena.papazian@atm-consulting.fr>
Date: Wed, 24 Aug 2022 12:15:28 +0200
Subject: [PATCH 040/974] FIX accolade et gestion fk_unit

---
 htdocs/bom/bom_card.php | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/htdocs/bom/bom_card.php b/htdocs/bom/bom_card.php
index e66462d8584..3c188077237 100644
--- a/htdocs/bom/bom_card.php
+++ b/htdocs/bom/bom_card.php
@@ -183,7 +183,7 @@ if ($action == 'addline' && $user->rights->bom->write) {
 	}
 
 	if (!$error) {
-		$result = $object->addLine($idprod, $qty, $qty_frozen, $disable_stock_change, $efficiency, -1, $bom_child_id, null);
+		$result = $object->addLine($idprod, $qty, $qty_frozen, $disable_stock_change, $efficiency, -1, $bom_child_id, null, $fk_unit);
 
 		if ($result <= 0) {
 			setEventMessages($object->error, $object->errors, 'errors');
@@ -195,10 +195,11 @@ if ($action == 'addline' && $user->rights->bom->write) {
 			unset($_POST['qty_frozen']);
 			unset($_POST['disable_stock_change']);
 
-			$object->fetchLines();
-
-			$object->calculateCosts();
 		}
+
+		$object->fetchLines();
+
+		$object->calculateCosts();
 	}
 }
 
@@ -223,7 +224,7 @@ if ($action == 'updateline' && $user->rights->bom->write) {
 		$bomline = new BOMLine($db);
 		$bomline->fetch($lineid);
 
-		$result = $object->updateLine($lineid, $qty, (int) $qty_frozen, (int) $disable_stock_change, $efficiency, $bomline->position, $bomline->import_key);
+		$result = $object->updateLine($lineid, $qty, (int) $qty_frozen, (int) $disable_stock_change, $efficiency, $bomline->position, $bomline->import_key, $fk_unit);
 
 		if ($result <= 0) {
 			setEventMessages($object->error, $object->errors, 'errors');
@@ -235,10 +236,11 @@ if ($action == 'updateline' && $user->rights->bom->write) {
 			unset($_POST['qty_frozen']);
 			unset($_POST['disable_stock_change']);
 
-			$object->fetchLines();
-
-			$object->calculateCosts();
 		}
+
+		$object->fetchLines();
+
+		$object->calculateCosts();
 	}
 }
 
@@ -619,6 +621,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 				if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 				if (empty($reshook))
 					$object->formAddObjectLine(1, $mysoc, null, '/bom/tpl');
+				}
 			}
 		}
 

From 8f336b1e505eabd96f0667eac015dcca720b0244 Mon Sep 17 00:00:00 2001
From: stickler-ci <support@stickler-ci.com>
Date: Wed, 24 Aug 2022 10:20:16 +0000
Subject: [PATCH 041/974] Fixing style errors.

---
 htdocs/bom/bom_card.php        | 722 ++++++++++++++++-----------------
 htdocs/bom/class/bom.class.php |   2 +-
 2 files changed, 361 insertions(+), 363 deletions(-)

diff --git a/htdocs/bom/bom_card.php b/htdocs/bom/bom_card.php
index 3c188077237..a80792705ee 100644
--- a/htdocs/bom/bom_card.php
+++ b/htdocs/bom/bom_card.php
@@ -147,328 +147,326 @@ if (empty($reshook)) {
 	include DOL_DOCUMENT_ROOT.'/core/actions_sendmails.inc.php';
 
 	// Add line
-if ($action == 'addline' && $user->rights->bom->write) {
-	$langs->load('errors');
-	$error = 0;
+	if ($action == 'addline' && $user->rights->bom->write) {
+		$langs->load('errors');
+		$error = 0;
 
-	// Set if we used free entry or predefined product
-	$bom_child_id = (int) GETPOST('bom_id', 'int');
-	if ($bom_child_id > 0) {
-		$bom_child = new BOM($db);
-		$res = $bom_child->fetch($bom_child_id);
-		if ($res) {
-			$idprod = $bom_child->fk_product;
-		}
-	} else {
-		$idprod = (!empty(GETPOST('idprodservice', 'int')) ? GETPOST('idprodservice', 'int') : (int) GETPOST('idprod', 'int'));
-	}
-
-	$qty = price2num(GETPOST('qty', 'alpha'), 'MS');
-	$qty_frozen = price2num(GETPOST('qty_frozen', 'alpha'), 'MS');
-	$disable_stock_change = GETPOST('disable_stock_change', 'int');
-	$efficiency = price2num(GETPOST('efficiency', 'alpha'));
-	$fk_unit = GETPOST('fk_unit', 'alphanohtml');
-	if ($qty == '') {
-		setEventMessages($langs->trans('ErrorFieldRequired', $langs->transnoentitiesnoconv('Qty')), null, 'errors');
-		$error++;
-	}
-	if (!($idprod > 0)) {
-		setEventMessages($langs->trans('ErrorFieldRequired', $langs->transnoentitiesnoconv('Product')), null, 'errors');
-		$error++;
-	}
-
-	if ($object->fk_product == $idprod) {
-		setEventMessages($langs->trans('TheProductXIsAlreadyTheProductToProduce'), null, 'errors');
-		$error++;
-	}
-
-	if (!$error) {
-		$result = $object->addLine($idprod, $qty, $qty_frozen, $disable_stock_change, $efficiency, -1, $bom_child_id, null, $fk_unit);
-
-		if ($result <= 0) {
-			setEventMessages($object->error, $object->errors, 'errors');
-			$action = '';
+		// Set if we used free entry or predefined product
+		$bom_child_id = (int) GETPOST('bom_id', 'int');
+		if ($bom_child_id > 0) {
+			$bom_child = new BOM($db);
+			$res = $bom_child->fetch($bom_child_id);
+			if ($res) {
+				$idprod = $bom_child->fk_product;
+			}
 		} else {
-			unset($_POST['idprod']);
-			unset($_POST['idprodservice']);
-			unset($_POST['qty']);
-			unset($_POST['qty_frozen']);
-			unset($_POST['disable_stock_change']);
-
+			$idprod = (!empty(GETPOST('idprodservice', 'int')) ? GETPOST('idprodservice', 'int') : (int) GETPOST('idprod', 'int'));
 		}
 
-		$object->fetchLines();
+		$qty = price2num(GETPOST('qty', 'alpha'), 'MS');
+		$qty_frozen = price2num(GETPOST('qty_frozen', 'alpha'), 'MS');
+		$disable_stock_change = GETPOST('disable_stock_change', 'int');
+		$efficiency = price2num(GETPOST('efficiency', 'alpha'));
+		$fk_unit = GETPOST('fk_unit', 'alphanohtml');
+		if ($qty == '') {
+			setEventMessages($langs->trans('ErrorFieldRequired', $langs->transnoentitiesnoconv('Qty')), null, 'errors');
+			$error++;
+		}
+		if (!($idprod > 0)) {
+			setEventMessages($langs->trans('ErrorFieldRequired', $langs->transnoentitiesnoconv('Product')), null, 'errors');
+			$error++;
+		}
 
-		$object->calculateCosts();
+		if ($object->fk_product == $idprod) {
+			setEventMessages($langs->trans('TheProductXIsAlreadyTheProductToProduce'), null, 'errors');
+			$error++;
+		}
+
+		if (!$error) {
+			$result = $object->addLine($idprod, $qty, $qty_frozen, $disable_stock_change, $efficiency, -1, $bom_child_id, null, $fk_unit);
+
+			if ($result <= 0) {
+				setEventMessages($object->error, $object->errors, 'errors');
+				$action = '';
+			} else {
+				unset($_POST['idprod']);
+				unset($_POST['idprodservice']);
+				unset($_POST['qty']);
+				unset($_POST['qty_frozen']);
+				unset($_POST['disable_stock_change']);
+			}
+
+			$object->fetchLines();
+
+			$object->calculateCosts();
+		}
 	}
-}
 
 	// Update line
-if ($action == 'updateline' && $user->rights->bom->write) {
-	$langs->load('errors');
-	$error = 0;
+	if ($action == 'updateline' && $user->rights->bom->write) {
+		$langs->load('errors');
+		$error = 0;
 
-	// 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');
-	$efficiency = price2num(GETPOST('efficiency', 'alpha'));
-	$fk_unit = GETPOST('fk_unit', 'alphanohtml');
-
-	if ($qty == '') {
-		setEventMessages($langs->trans('ErrorFieldRequired', $langs->transnoentitiesnoconv('Qty')), null, 'errors');
-		$error++;
-	}
-
-	if (!$error) {
-		$bomline = new BOMLine($db);
-		$bomline->fetch($lineid);
-
-		$result = $object->updateLine($lineid, $qty, (int) $qty_frozen, (int) $disable_stock_change, $efficiency, $bomline->position, $bomline->import_key, $fk_unit);
-
-		if ($result <= 0) {
-			setEventMessages($object->error, $object->errors, 'errors');
-			$action = '';
-		} else {
-			unset($_POST['idprod']);
-			unset($_POST['idprodservice']);
-			unset($_POST['qty']);
-			unset($_POST['qty_frozen']);
-			unset($_POST['disable_stock_change']);
+		// 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');
+		$efficiency = price2num(GETPOST('efficiency', 'alpha'));
+		$fk_unit = GETPOST('fk_unit', 'alphanohtml');
 
+		if ($qty == '') {
+			setEventMessages($langs->trans('ErrorFieldRequired', $langs->transnoentitiesnoconv('Qty')), null, 'errors');
+			$error++;
 		}
 
-		$object->fetchLines();
+		if (!$error) {
+			$bomline = new BOMLine($db);
+			$bomline->fetch($lineid);
 
-		$object->calculateCosts();
-	}
-}
+			$result = $object->updateLine($lineid, $qty, (int) $qty_frozen, (int) $disable_stock_change, $efficiency, $bomline->position, $bomline->import_key, $fk_unit);
 
+			if ($result <= 0) {
+				setEventMessages($object->error, $object->errors, 'errors');
+				$action = '';
+			} else {
+				unset($_POST['idprod']);
+				unset($_POST['idprodservice']);
+				unset($_POST['qty']);
+				unset($_POST['qty_frozen']);
+				unset($_POST['disable_stock_change']);
+			}
 
+			$object->fetchLines();
 
-/*
- * View
- */
-
-$form = new Form($db);
-$formfile = new FormFile($db);
-
-
-$title = $langs->trans('BOM');
-$help_url ='EN:Module_BOM';
-llxHeader('', $title, $help_url);
-
-// Part to create
-if ($action == 'create') {
-	print load_fiche_titre($langs->trans("NewBOM"), '', 'bom');
-
-	print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">';
-	print '<input type="hidden" name="token" value="'.newToken().'">';
-	print '<input type="hidden" name="action" value="add">';
-	print '<input type="hidden" name="backtopage" value="'.$backtopage.'">';
-
-	print dol_get_fiche_head(array(), '');
-
-	print '<table class="border centpercent tableforfieldcreate">'."\n";
-
-	// Common attributes
-	include DOL_DOCUMENT_ROOT.'/core/tpl/commonfields_add.tpl.php';
-
-	// Other attributes
-	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_add.tpl.php';
-
-	print '</table>'."\n";
-
-	print dol_get_fiche_end();
-
-	print $form->buttonsSaveCancel("Create");
-
-	print '</form>';
-}
-
-// Part to edit record
-if (($id || $ref) && $action == 'edit') {
-	print load_fiche_titre($langs->trans("BillOfMaterials"), '', 'cubes');
-
-	print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">';
-	print '<input type="hidden" name="token" value="'.newToken().'">';
-	print '<input type="hidden" name="action" value="update">';
-	print '<input type="hidden" name="backtopage" value="'.$backtopage.'">';
-	print '<input type="hidden" name="id" value="'.$object->id.'">';
-
-	print dol_get_fiche_head();
-
-	//$object->fields['keyfield']['disabled'] = 1;
-
-	print '<table class="border centpercent tableforfieldedit">'."\n";
-
-	// Common attributes
-	include DOL_DOCUMENT_ROOT.'/core/tpl/commonfields_edit.tpl.php';
-
-	// Other attributes
-	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_edit.tpl.php';
-
-	print '</table>';
-
-	print dol_get_fiche_end();
-
-	print $form->buttonsSaveCancel("Create");
-
-	print '</form>';
-}
-
-// Part to show record
-if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'create'))) {
-	$head = bomPrepareHead($object);
-	print dol_get_fiche_head($head, 'card', $langs->trans("BillOfMaterials"), -1, 'bom');
-
-	$formconfirm = '';
-
-	// Confirmation to delete
-	if ($action == 'delete') {
-		$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('DeleteBillOfMaterials'), $langs->trans('ConfirmDeleteBillOfMaterials'), 'confirm_delete', '', 0, 1);
-	}
-	// Confirmation to delete line
-	if ($action == 'deleteline') {
-		$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id.'&lineid='.$lineid, $langs->trans('DeleteLine'), $langs->trans('ConfirmDeleteLine'), 'confirm_deleteline', '', 0, 1);
+			$object->calculateCosts();
+		}
 	}
 
-	// Confirmation of validation
-	if ($action == 'validate') {
-		// We check that object has a temporary ref
-		$ref = substr($object->ref, 1, 4);
-		if ($ref == 'PROV') {
-			$object->fetch_product();
-			$numref = $object->getNextNumRef($object->product);
-		} else {
-			$numref = $object->ref;
+
+
+	/*
+	* View
+	*/
+
+	$form = new Form($db);
+	$formfile = new FormFile($db);
+
+
+	$title = $langs->trans('BOM');
+	$help_url ='EN:Module_BOM';
+	llxHeader('', $title, $help_url);
+
+	// Part to create
+	if ($action == 'create') {
+		print load_fiche_titre($langs->trans("NewBOM"), '', 'bom');
+
+		print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">';
+		print '<input type="hidden" name="token" value="'.newToken().'">';
+		print '<input type="hidden" name="action" value="add">';
+		print '<input type="hidden" name="backtopage" value="'.$backtopage.'">';
+
+		print dol_get_fiche_head(array(), '');
+
+		print '<table class="border centpercent tableforfieldcreate">'."\n";
+
+		// Common attributes
+		include DOL_DOCUMENT_ROOT.'/core/tpl/commonfields_add.tpl.php';
+
+		// Other attributes
+		include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_add.tpl.php';
+
+		print '</table>'."\n";
+
+		print dol_get_fiche_end();
+
+		print $form->buttonsSaveCancel("Create");
+
+		print '</form>';
+	}
+
+	// Part to edit record
+	if (($id || $ref) && $action == 'edit') {
+		print load_fiche_titre($langs->trans("BillOfMaterials"), '', 'cubes');
+
+		print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">';
+		print '<input type="hidden" name="token" value="'.newToken().'">';
+		print '<input type="hidden" name="action" value="update">';
+		print '<input type="hidden" name="backtopage" value="'.$backtopage.'">';
+		print '<input type="hidden" name="id" value="'.$object->id.'">';
+
+		print dol_get_fiche_head();
+
+		//$object->fields['keyfield']['disabled'] = 1;
+
+		print '<table class="border centpercent tableforfieldedit">'."\n";
+
+		// Common attributes
+		include DOL_DOCUMENT_ROOT.'/core/tpl/commonfields_edit.tpl.php';
+
+		// Other attributes
+		include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_edit.tpl.php';
+
+		print '</table>';
+
+		print dol_get_fiche_end();
+
+		print $form->buttonsSaveCancel("Create");
+
+		print '</form>';
+	}
+
+	// Part to show record
+	if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'create'))) {
+		$head = bomPrepareHead($object);
+		print dol_get_fiche_head($head, 'card', $langs->trans("BillOfMaterials"), -1, 'bom');
+
+		$formconfirm = '';
+
+		// Confirmation to delete
+		if ($action == 'delete') {
+			$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('DeleteBillOfMaterials'), $langs->trans('ConfirmDeleteBillOfMaterials'), 'confirm_delete', '', 0, 1);
+		}
+		// Confirmation to delete line
+		if ($action == 'deleteline') {
+			$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id.'&lineid='.$lineid, $langs->trans('DeleteLine'), $langs->trans('ConfirmDeleteLine'), 'confirm_deleteline', '', 0, 1);
 		}
 
-		$text = $langs->trans('ConfirmValidateBom', $numref);
-		/*if (! empty($conf->notification->enabled))
-		{
+		// Confirmation of validation
+		if ($action == 'validate') {
+			// We check that object has a temporary ref
+			$ref = substr($object->ref, 1, 4);
+			if ($ref == 'PROV') {
+				$object->fetch_product();
+				$numref = $object->getNextNumRef($object->product);
+			} else {
+				$numref = $object->ref;
+			}
+
+			$text = $langs->trans('ConfirmValidateBom', $numref);
+			/*if (! empty($conf->notification->enabled))
+			{
 			require_once DOL_DOCUMENT_ROOT . '/core/class/notify.class.php';
 			$notify = new Notify($db);
 			$text .= '<br>';
 			$text .= $notify->confirmMessage('BOM_VALIDATE', $object->socid, $object);
-		}*/
+			}*/
 
-		$formquestion = array();
-		if (!empty($conf->bom->enabled)) {
-			$langs->load("mrp");
-			$forcecombo = 0;
-			if ($conf->browser->name == 'ie') {
-				$forcecombo = 1; // There is a bug in IE10 that make combo inside popup crazy
-			}
-			$formquestion = array(
+			$formquestion = array();
+			if (!empty($conf->bom->enabled)) {
+				$langs->load("mrp");
+				$forcecombo = 0;
+				if ($conf->browser->name == 'ie') {
+					$forcecombo = 1; // There is a bug in IE10 that make combo inside popup crazy
+				}
+				$formquestion = array(
 				// 'text' => $langs->trans("ConfirmClone"),
 				// array('type' => 'checkbox', 'name' => 'clone_content', 'label' => $langs->trans("CloneMainAttributes"), 'value' => 1),
 				// array('type' => 'checkbox', 'name' => 'update_prices', 'label' => $langs->trans("PuttingPricesUpToDate"), 'value' => 1),
-			);
+				);
+			}
+
+			$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('Validate'), $text, 'confirm_validate', $formquestion, 0, 1, 220);
 		}
 
-		$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('Validate'), $text, 'confirm_validate', $formquestion, 0, 1, 220);
-	}
-
-	// Confirmation of closing
-	if ($action == 'close') {
-		$text = $langs->trans('ConfirmCloseBom', $object->ref);
-		/*if (! empty($conf->notification->enabled))
-		{
+		// Confirmation of closing
+		if ($action == 'close') {
+			$text = $langs->trans('ConfirmCloseBom', $object->ref);
+			/*if (! empty($conf->notification->enabled))
+			{
 			require_once DOL_DOCUMENT_ROOT . '/core/class/notify.class.php';
 			$notify = new Notify($db);
 			$text .= '<br>';
 			$text .= $notify->confirmMessage('BOM_CLOSE', $object->socid, $object);
-		}*/
+			}*/
 
-		$formquestion = array();
-		if (!empty($conf->bom->enabled)) {
-			$langs->load("mrp");
-			$forcecombo = 0;
-			if ($conf->browser->name == 'ie') {
-				$forcecombo = 1; // There is a bug in IE10 that make combo inside popup crazy
-			}
-			$formquestion = array(
+			$formquestion = array();
+			if (!empty($conf->bom->enabled)) {
+				$langs->load("mrp");
+				$forcecombo = 0;
+				if ($conf->browser->name == 'ie') {
+					$forcecombo = 1; // There is a bug in IE10 that make combo inside popup crazy
+				}
+				$formquestion = array(
 				// 'text' => $langs->trans("ConfirmClone"),
 				// array('type' => 'checkbox', 'name' => 'clone_content', 'label' => $langs->trans("CloneMainAttributes"), 'value' => 1),
 				// array('type' => 'checkbox', 'name' => 'update_prices', 'label' => $langs->trans("PuttingPricesUpToDate"), 'value' => 1),
-			);
+				);
+			}
+
+			$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('Close'), $text, 'confirm_close', $formquestion, 0, 1, 220);
 		}
 
-		$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('Close'), $text, 'confirm_close', $formquestion, 0, 1, 220);
-	}
+		// Confirmation of reopen
+		if ($action == 'reopen') {
+			$text = $langs->trans('ConfirmReopenBom', $object->ref);
+			/*if (! empty($conf->notification->enabled))
+			 {
+			 require_once DOL_DOCUMENT_ROOT . '/core/class/notify.class.php';
+			 $notify = new Notify($db);
+			 $text .= '<br>';
+			 $text .= $notify->confirmMessage('BOM_CLOSE', $object->socid, $object);
+			 }*/
 
-	// Confirmation of reopen
-	if ($action == 'reopen') {
-		$text = $langs->trans('ConfirmReopenBom', $object->ref);
-		/*if (! empty($conf->notification->enabled))
-		 {
-		 require_once DOL_DOCUMENT_ROOT . '/core/class/notify.class.php';
-		 $notify = new Notify($db);
-		 $text .= '<br>';
-		 $text .= $notify->confirmMessage('BOM_CLOSE', $object->socid, $object);
-		 }*/
-
-		$formquestion = array();
-		if (!empty($conf->bom->enabled)) {
-			$langs->load("mrp");
-			require_once DOL_DOCUMENT_ROOT.'/product/class/html.formproduct.class.php';
-			$forcecombo = 0;
-			if ($conf->browser->name == 'ie') {
-				$forcecombo = 1; // There is a bug in IE10 that make combo inside popup crazy
-			}
-			$formquestion = array(
+			$formquestion = array();
+			if (!empty($conf->bom->enabled)) {
+				$langs->load("mrp");
+				require_once DOL_DOCUMENT_ROOT.'/product/class/html.formproduct.class.php';
+				$forcecombo = 0;
+				if ($conf->browser->name == 'ie') {
+					$forcecombo = 1; // There is a bug in IE10 that make combo inside popup crazy
+				}
+				$formquestion = array(
 				// 'text' => $langs->trans("ConfirmClone"),
 				// array('type' => 'checkbox', 'name' => 'clone_content', 'label' => $langs->trans("CloneMainAttributes"), 'value' => 1),
 				// array('type' => 'checkbox', 'name' => 'update_prices', 'label' => $langs->trans("PuttingPricesUpToDate"), 'value' => 1),
-			);
+				);
+			}
+
+			$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('ReOpen'), $text, 'confirm_reopen', $formquestion, 0, 1, 220);
 		}
 
-		$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('ReOpen'), $text, 'confirm_reopen', $formquestion, 0, 1, 220);
-	}
+		// Clone confirmation
+		if ($action == 'clone') {
+			// Create an array for form
+			$formquestion = array();
+			$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('ToClone'), $langs->trans('ConfirmCloneBillOfMaterials', $object->ref), 'confirm_clone', $formquestion, 'yes', 1);
+		}
 
-	// Clone confirmation
-	if ($action == 'clone') {
-		// Create an array for form
-		$formquestion = array();
-		$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('ToClone'), $langs->trans('ConfirmCloneBillOfMaterials', $object->ref), 'confirm_clone', $formquestion, 'yes', 1);
-	}
+		// Confirmation of action xxxx
+		if ($action == 'setdraft') {
+			$text = $langs->trans('ConfirmSetToDraft', $object->ref);
 
-	// Confirmation of action xxxx
-	if ($action == 'setdraft') {
-		$text = $langs->trans('ConfirmSetToDraft', $object->ref);
+			$formquestion = array();
+			$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('SetToDraft'), $text, 'confirm_setdraft', $formquestion, 0, 1, 220);
+		}
 
-		$formquestion = array();
-		$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('SetToDraft'), $text, 'confirm_setdraft', $formquestion, 0, 1, 220);
-	}
+		// Call Hook formConfirm
+		$parameters = array('formConfirm' => $formconfirm, 'lineid' => $lineid);
+		$reshook = $hookmanager->executeHooks('formConfirm', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
+		if (empty($reshook)) {
+			$formconfirm .= $hookmanager->resPrint;
+		} elseif ($reshook > 0) {
+			$formconfirm = $hookmanager->resPrint;
+		}
 
-	// Call Hook formConfirm
-	$parameters = array('formConfirm' => $formconfirm, 'lineid' => $lineid);
-	$reshook = $hookmanager->executeHooks('formConfirm', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
-	if (empty($reshook)) {
-		$formconfirm .= $hookmanager->resPrint;
-	} elseif ($reshook > 0) {
-		$formconfirm = $hookmanager->resPrint;
-	}
-
-	// Print form confirm
-	print $formconfirm;
+		// Print form confirm
+		print $formconfirm;
 
 
-	// Object card
-	// ------------------------------------------------------------
-	$linkback = '<a href="'.DOL_URL_ROOT.'/bom/bom_list.php?restore_lastsearch_values=1'.(!empty($socid) ? '&socid='.$socid : '').'">'.$langs->trans("BackToList").'</a>';
+		// Object card
+		// ------------------------------------------------------------
+		$linkback = '<a href="'.DOL_URL_ROOT.'/bom/bom_list.php?restore_lastsearch_values=1'.(!empty($socid) ? '&socid='.$socid : '').'">'.$langs->trans("BackToList").'</a>';
 
-	$morehtmlref = '<div class="refidno">';
-	/*
-	// Ref bis
-	$morehtmlref.=$form->editfieldkey("RefBis", 'ref_client', $object->ref_client, $object, $user->rights->bom->creer, 'string', '', 0, 1);
-	$morehtmlref.=$form->editfieldval("RefBis", 'ref_client', $object->ref_client, $object, $user->rights->bom->creer, 'string', '', null, null, '', 1);
-	// Thirdparty
-	$morehtmlref.='<br>'.$langs->trans('ThirdParty') . ' : ' . $soc->getNomUrl(1);
-	// Project
-	if (! empty($conf->project->enabled))
-	{
+		$morehtmlref = '<div class="refidno">';
+		/*
+		// Ref bis
+		$morehtmlref.=$form->editfieldkey("RefBis", 'ref_client', $object->ref_client, $object, $user->rights->bom->creer, 'string', '', 0, 1);
+		$morehtmlref.=$form->editfieldval("RefBis", 'ref_client', $object->ref_client, $object, $user->rights->bom->creer, 'string', '', null, null, '', 1);
+		// Thirdparty
+		$morehtmlref.='<br>'.$langs->trans('ThirdParty') . ' : ' . $soc->getNomUrl(1);
+		// Project
+		if (! empty($conf->project->enabled))
+		{
 		$langs->load("projects");
 		$morehtmlref.='<br>'.$langs->trans('Project') . ' ';
 		if ($permissiontoadd)
@@ -495,51 +493,51 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 				$morehtmlref.='';
 			}
 		}
-	}
-	*/
-	$morehtmlref .= '</div>';
+		}
+		*/
+		$morehtmlref .= '</div>';
 
 
-	dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $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>';
-	print '<table class="border centpercent tableforfield">'."\n";
+		print '<div class="fichecenter">';
+		print '<div class="fichehalfleft">';
+		print '<div class="underbanner clearboth"></div>';
+		print '<table class="border centpercent tableforfield">'."\n";
 
-	// Common attributes
-	$keyforbreak = 'duration';
-	include DOL_DOCUMENT_ROOT.'/core/tpl/commonfields_view.tpl.php';
-	$object->calculateCosts();
-	print '<tr><td>'.$form->textwithpicto($langs->trans("TotalCost"), $langs->trans("BOMTotalCost")).'</td><td><span class="amount">'.price($object->total_cost).'</span></td></tr>';
-	print '<tr><td>'.$langs->trans("UnitCost").'</td><td>'.price($object->unit_cost).'</td></tr>';
-
-	// Other attributes
-	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_view.tpl.php';
-
-	print '</table>';
-	print '</div>';
-	print '</div>';
-
-	print '<div class="clearboth"></div>';
-
-	print dol_get_fiche_end();
-
-
-
-	/*
-	 * Lines
-	 */
-
-	if (!empty($object->table_element_line)) {
-		//Products
-		$res = $object->fetchLinesbytypeproduct(0);
+		// Common attributes
+		$keyforbreak = 'duration';
+		include DOL_DOCUMENT_ROOT.'/core/tpl/commonfields_view.tpl.php';
 		$object->calculateCosts();
+		print '<tr><td>'.$form->textwithpicto($langs->trans("TotalCost"), $langs->trans("BOMTotalCost")).'</td><td><span class="amount">'.price($object->total_cost).'</span></td></tr>';
+		print '<tr><td>'.$langs->trans("UnitCost").'</td><td>'.price($object->unit_cost).'</td></tr>';
 
-		print ($res == 0 && $object->status >= $object::STATUS_VALIDATED) ? '' : load_fiche_titre($langs->trans('BOMProductsList'), '', 'product');
+		// Other attributes
+		include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_view.tpl.php';
 
-		print '	<form name="addproduct" id="addproduct" action="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . (($action != 'editline') ? '' : '') . '" method="POST">
+		print '</table>';
+		print '</div>';
+		print '</div>';
+
+		print '<div class="clearboth"></div>';
+
+		print dol_get_fiche_end();
+
+
+
+		/*
+		 * Lines
+		 */
+
+		if (!empty($object->table_element_line)) {
+			//Products
+			$res = $object->fetchLinesbytypeproduct(0);
+			$object->calculateCosts();
+
+			print ($res == 0 && $object->status >= $object::STATUS_VALIDATED) ? '' : load_fiche_titre($langs->trans('BOMProductsList'), '', 'product');
+
+			print '	<form name="addproduct" id="addproduct" action="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . (($action != 'editline') ? '' : '') . '" method="POST">
     	<input type="hidden" name="token" value="' . newToken() . '">
     	<input type="hidden" name="action" value="' . (($action != 'editline') ? 'addline' : 'updateline') . '">
     	<input type="hidden" name="mode" value="">
@@ -547,79 +545,79 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
     	<input type="hidden" name="id" value="' . $object->id . '">
     	';
 
-		if (!empty($conf->use_javascript_ajax) && $object->status == 0) {
-			include DOL_DOCUMENT_ROOT.'/core/tpl/ajaxrow.tpl.php';
-		}
-
-		print '<div class="div-table-responsive-no-min">';
-		if (!empty($object->lines) || ($object->status == $object::STATUS_DRAFT && $permissiontoadd && $action != 'selectlines' && $action != 'editline')) {
-			print '<table id="tablelines" class="noborder noshadow" width="100%">';
-		}
-
-		if (!empty($object->lines)) {
-			$object->printObjectLines($action, $mysoc, null, GETPOST('lineid', 'int'), 1, '/bom/tpl');
-		}
-
-		// Form to add new line
-		if ($object->status == 0 && $permissiontoadd && $action != 'selectlines') {
-			if ($action != 'editline') {
-				// Add products/services form
-
-
-				$parameters = array();
-				$reshook = $hookmanager->executeHooks('formAddObjectLine', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
-				if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
-				if (empty($reshook))
-					$object->formAddObjectLine(1, $mysoc, null, '/bom/tpl');
+			if (!empty($conf->use_javascript_ajax) && $object->status == 0) {
+				include DOL_DOCUMENT_ROOT.'/core/tpl/ajaxrow.tpl.php';
 			}
-		}
 
-		if (!empty($object->lines) || ($object->status == $object::STATUS_DRAFT && $permissiontoadd && $action != 'selectlines' && $action != 'editline')) {
-			print '</table>';
-		}
-		print '</div>';
+			print '<div class="div-table-responsive-no-min">';
+			if (!empty($object->lines) || ($object->status == $object::STATUS_DRAFT && $permissiontoadd && $action != 'selectlines' && $action != 'editline')) {
+				print '<table id="tablelines" class="noborder noshadow" width="100%">';
+			}
 
-		print "</form>\n";
+			if (!empty($object->lines)) {
+				$object->printObjectLines($action, $mysoc, null, GETPOST('lineid', 'int'), 1, '/bom/tpl');
+			}
 
-		mrpCollapseBomManagement();
+			// Form to add new line
+			if ($object->status == 0 && $permissiontoadd && $action != 'selectlines') {
+				if ($action != 'editline') {
+					// Add products/services form
 
 
-		//Services
-		$filtertype = 1;
-		$res = $object->fetchLinesbytypeproduct(1);
-		$object->calculateCosts();
+					$parameters = array();
+					$reshook = $hookmanager->executeHooks('formAddObjectLine', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
+					if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+					if (empty($reshook))
+					$object->formAddObjectLine(1, $mysoc, null, '/bom/tpl');
+				}
+			}
 
-		print ($res == 0 && $object->status >= $object::STATUS_VALIDATED) ? '' : load_fiche_titre($langs->trans('BOMServicesList'), '', 'service');
+			if (!empty($object->lines) || ($object->status == $object::STATUS_DRAFT && $permissiontoadd && $action != 'selectlines' && $action != 'editline')) {
+				print '</table>';
+			}
+			print '</div>';
 
-		print '	<form name="addservice" id="addservice" action="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . (($action != 'editline') ? '' : '') . '" method="POST">
+			print "</form>\n";
+
+			mrpCollapseBomManagement();
+
+
+			//Services
+			$filtertype = 1;
+			$res = $object->fetchLinesbytypeproduct(1);
+			$object->calculateCosts();
+
+			print ($res == 0 && $object->status >= $object::STATUS_VALIDATED) ? '' : load_fiche_titre($langs->trans('BOMServicesList'), '', 'service');
+
+			print '	<form name="addservice" id="addservice" action="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . (($action != 'editline') ? '' : '') . '" method="POST">
     	<input type="hidden" name="token" value="' . newToken() . '">
     	<input type="hidden" name="action" value="' . (($action != 'editline') ? 'addline' : 'updateline') . '">
     	<input type="hidden" name="mode" value="">
 		<input type="hidden" name="page_y" value="">    		<input type="hidden" name="id" value="' . $object->id . '">
     	';
 
-		if (!empty($conf->use_javascript_ajax) && $object->status == 0) {
-			$tagidfortablednd = 'tablelinesservice';
-			include DOL_DOCUMENT_ROOT . '/core/tpl/ajaxrow.tpl.php';
-		}
+			if (!empty($conf->use_javascript_ajax) && $object->status == 0) {
+				$tagidfortablednd = 'tablelinesservice';
+				include DOL_DOCUMENT_ROOT . '/core/tpl/ajaxrow.tpl.php';
+			}
 
-		print '<div class="div-table-responsive-no-min">';
-		if (!empty($object->lines) || ($object->status == $object::STATUS_DRAFT && $permissiontoadd && $action != 'selectlines' && $action != 'editline')) {
-			print '<table id="tablelinesservice" class="noborder noshadow" width="100%">';
-		}
+			print '<div class="div-table-responsive-no-min">';
+			if (!empty($object->lines) || ($object->status == $object::STATUS_DRAFT && $permissiontoadd && $action != 'selectlines' && $action != 'editline')) {
+				print '<table id="tablelinesservice" class="noborder noshadow" width="100%">';
+			}
 
-		if (!empty($object->lines)) {
-			$object->printObjectLines($action, $mysoc, null, GETPOST('lineid', 'int'), 1, '/bom/tpl');
-		}
+			if (!empty($object->lines)) {
+				$object->printObjectLines($action, $mysoc, null, GETPOST('lineid', 'int'), 1, '/bom/tpl');
+			}
 
-		// Form to add new line
-		if ($object->status == 0 && $permissiontoadd && $action != 'selectlines') {
-			if ($action != 'editline') {
-				// Add services form
-				$parameters = array();
-				$reshook = $hookmanager->executeHooks('formAddObjectServiceLine', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
-				if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
-				if (empty($reshook))
+			// Form to add new line
+			if ($object->status == 0 && $permissiontoadd && $action != 'selectlines') {
+				if ($action != 'editline') {
+					// Add services form
+					$parameters = array();
+					$reshook = $hookmanager->executeHooks('formAddObjectServiceLine', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
+					if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+					if (empty($reshook))
 					$object->formAddObjectLine(1, $mysoc, null, '/bom/tpl');
 				}
 			}
diff --git a/htdocs/bom/class/bom.class.php b/htdocs/bom/class/bom.class.php
index 2b576fc0b5f..d5f3351770e 100644
--- a/htdocs/bom/class/bom.class.php
+++ b/htdocs/bom/class/bom.class.php
@@ -569,7 +569,7 @@ class BOM extends CommonObject
 	 * @param	string	$import_key				Import Key
 	 * @return	int								<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='')
+	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 = '')
 	{
 		global $mysoc, $conf, $langs, $user;
 

From 804480ca2d07f80025927c7a4c33124aba8def6e Mon Sep 17 00:00:00 2001
From: JC Prieto <jcprieto@virtual20.com>
Date: Thu, 25 Aug 2022 12:51:18 +0200
Subject: [PATCH 042/974] Update card.php

Same behavior as  products with not lot. (See line 1338).
---
 htdocs/expedition/card.php | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/htdocs/expedition/card.php b/htdocs/expedition/card.php
index 4bec4220c6c..1bd4ca72dc2 100644
--- a/htdocs/expedition/card.php
+++ b/htdocs/expedition/card.php
@@ -1445,6 +1445,11 @@ if ($action == 'create') {
 							}
 
 							foreach ($product->stock_warehouse as $warehouse_id => $stock_warehouse) {
+								if (!empty($warehousePicking) && !in_array($warehouse_id, $warehousePicking)) {
+									// if a warehouse was selected by user, picking is limited to this warehouse and his children. 
+									
+									continue;
+								}
 								$tmpwarehouseObject->fetch($warehouse_id);
 								if (($stock_warehouse->real > 0) && (count($stock_warehouse->detail_batch))) {
 									foreach ($stock_warehouse->detail_batch as $dbatch) {

From 215f89d5452abdde7282077a7d48ba49d25333a1 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 25 Aug 2022 23:44:57 +0200
Subject: [PATCH 043/974] Fix phpcs

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

diff --git a/htdocs/expedition/card.php b/htdocs/expedition/card.php
index 1bd4ca72dc2..e8bfb0249b1 100644
--- a/htdocs/expedition/card.php
+++ b/htdocs/expedition/card.php
@@ -1446,8 +1446,7 @@ if ($action == 'create') {
 
 							foreach ($product->stock_warehouse as $warehouse_id => $stock_warehouse) {
 								if (!empty($warehousePicking) && !in_array($warehouse_id, $warehousePicking)) {
-									// if a warehouse was selected by user, picking is limited to this warehouse and his children. 
-									
+									// if a warehouse was selected by user, picking is limited to this warehouse and his children.
 									continue;
 								}
 								$tmpwarehouseObject->fetch($warehouse_id);

From 2b4391019b28b1680021833bec695ff355652030 Mon Sep 17 00:00:00 2001
From: atm-lena <lena.papazian@atm-consulting.fr>
Date: Fri, 26 Aug 2022 08:55:11 +0200
Subject: [PATCH 044/974] Add forcecombo parameter to select dol user function

---
 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 c2d2eeced9a..8c941c8f20b 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -1921,7 +1921,7 @@ class Form
 	 * 	@return	string							HTML select string
 	 *  @see select_dolgroups()
 	 */
-	public function select_dolusers($selected = '', $htmlname = 'userid', $show_empty = 0, $exclude = null, $disabled = 0, $include = '', $enableonly = '', $force_entity = '0', $maxlength = 0, $showstatus = 0, $morefilter = '', $show_every = 0, $enableonlytext = '', $morecss = '', $noactive = 0, $outputmode = 0, $multiple = false)
+	public function select_dolusers($selected = '', $htmlname = 'userid', $show_empty = 0, $exclude = null, $disabled = 0, $include = '', $enableonly = '', $force_entity = '0', $maxlength = 0, $showstatus = 0, $morefilter = '', $show_every = 0, $enableonlytext = '', $morecss = '', $noactive = 0, $outputmode = 0, $multiple = false, $forcecombo = 0)
 	{
 		// phpcs:enable
 		global $conf, $user, $langs, $hookmanager;
@@ -2124,7 +2124,7 @@ class Form
 			}
 			$out .= '</select>';
 
-			if ($num) {
+			if ($num && !$forcecombo) {
 				// Enhance with select2
 				include_once DOL_DOCUMENT_ROOT.'/core/lib/ajax.lib.php';
 				$out .= ajax_combobox($htmlname);

From 68994752cdacaeb01dc0febcc60d574b4cc8e5c9 Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis.houssin@inodbox.com>
Date: Fri, 26 Aug 2022 11:08:39 +0200
Subject: [PATCH 045/974] FIX multiple php8 compatibility

---
 htdocs/comm/action/card.php           | 2 +-
 htdocs/core/class/html.form.class.php | 4 ++--
 htdocs/core/lib/functions.lib.php     | 2 +-
 htdocs/societe/index.php              | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/htdocs/comm/action/card.php b/htdocs/comm/action/card.php
index e543b7e6bd1..1f058b3c820 100644
--- a/htdocs/comm/action/card.php
+++ b/htdocs/comm/action/card.php
@@ -1320,7 +1320,7 @@ if ($action == 'create') {
 	// Description
 	print '<tr><td class="tdtop">'.$langs->trans("Description").'</td><td>';
 	require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
-	$doleditor = new DolEditor('note', (GETPOSTISSET('note') ? GETPOST('note', 'restricthtml') : $object->note_private), '', 120, 'dolibarr_notes', 'In', true, true, $conf->fckeditor->enabled, ROWS_4, '90%');
+	$doleditor = new DolEditor('note', (GETPOSTISSET('note') ? GETPOST('note', 'restricthtml') : $object->note_private), '', 120, 'dolibarr_notes', 'In', true, true, isModEnabled('fckeditor'), ROWS_4, '90%');
 	$doleditor->Create();
 	print '</td></tr>';
 
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index c2d2eeced9a..e95eac4ac06 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -6451,8 +6451,8 @@ class Form
 				} elseif ($usecalendar == 'jquery') {
 					if (!$disabled) {
 						// Output javascript for datepicker
-						$minYear = $conf->global->MIN_YEAR_SELECT_DATE ? $conf->global->MIN_YEAR_SELECT_DATE : (date('Y') - 100);
-						$maxYear = $conf->global->MAX_YEAR_SELECT_DATE ? $conf->global->MAX_YEAR_SELECT_DATE : (date('Y') + 100);
+						$minYear = getDolGlobalString('MIN_YEAR_SELECT_DATE', date('Y') - 100);
+						$maxYear = getDolGlobalString('MAX_YEAR_SELECT_DATE', date('Y') + 100);
 
 						$retstring .= "<script type='text/javascript'>";
 						$retstring .= "$(function(){ $('#".$prefix."').datepicker({
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 5ec394fa48e..e3a1f8f12dd 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -7029,7 +7029,7 @@ function dol_html_entity_decode($a, $b, $c = 'UTF-8', $keepsomeentities = 0)
 	if ($keepsomeentities) {
 		$newstring = strtr($newstring, array('&amp;'=>'__andamp__', '&lt;'=>'__andlt__', '&gt;'=>'__andgt__', '"'=>'__dquot__'));
 	}
-	$newstring = html_entity_decode($newstring, $b, $c);
+	$newstring = html_entity_decode((string) $newstring, (int) $b, (string) $c);
 	if ($keepsomeentities) {
 		$newstring = strtr($newstring, array('__andamp__'=>'&amp;', '__andlt__'=>'&lt;', '__andgt__'=>'&gt;', '__dquot__'=>'"'));
 	}
diff --git a/htdocs/societe/index.php b/htdocs/societe/index.php
index a13d8a3de99..b7b7fc95c6f 100644
--- a/htdocs/societe/index.php
+++ b/htdocs/societe/index.php
@@ -150,7 +150,7 @@ if (!empty($conf->use_javascript_ajax) && ((round($third['prospect']) ? 1 : 0) +
 	if (isModEnabled('societe') && $user->rights->societe->lire && empty($conf->global->SOCIETE_DISABLE_CUSTOMERS) && empty($conf->global->SOCIETE_DISABLE_CUSTOMERS_STATS)) {
 		$dataseries[] = array($langs->trans("Customers"), round($third['customer']));
 	}
-	if ((($conf->fournisseur->enabled && $user->rights->fournisseur->facture->lire && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD)) || (isModEnabled('supplier_order') && $user->rights->supplier_order->lire) || (isModEnabled('supplier_invoice') && $user->rights->supplier_invoice->lire)) && empty($conf->global->SOCIETE_DISABLE_SUPPLIERS_STATS)) {
+	if (((isModEnabled('fournisseur') && $user->rights->fournisseur->facture->lire && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD)) || (isModEnabled('supplier_order') && $user->rights->supplier_order->lire) || (isModEnabled('supplier_invoice') && $user->rights->supplier_invoice->lire)) && empty($conf->global->SOCIETE_DISABLE_SUPPLIERS_STATS)) {
 		$dataseries[] = array($langs->trans("Suppliers"), round($third['supplier']));
 	}
 	if (isModEnabled('societe')) {

From 0188629cf6540f19b867eeff7bba2e54d45cde4f Mon Sep 17 00:00:00 2001
From: Faustin <faustin.boitel@bordeaux-inp.fr>
Date: Fri, 26 Aug 2022 15:21:35 +0200
Subject: [PATCH 046/974] Oauth ui for tickets and emailing

---
 htdocs/admin/mails.php                |   8 +-
 htdocs/admin/mails_emailing.php       | 124 ++++++++++++++++++++++++--
 htdocs/admin/mails_ticket.php         | 116 +++++++++++++++++++++++-
 htdocs/core/class/CMailFile.class.php |   6 +-
 4 files changed, 236 insertions(+), 18 deletions(-)

diff --git a/htdocs/admin/mails.php b/htdocs/admin/mails.php
index 0504315075d..5a3ce412767 100644
--- a/htdocs/admin/mails.php
+++ b/htdocs/admin/mails.php
@@ -261,9 +261,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\')
@@ -290,9 +290,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() {
diff --git a/htdocs/admin/mails_emailing.php b/htdocs/admin/mails_emailing.php
index f7203d88474..2c255a164ec 100644
--- a/htdocs/admin/mails_emailing.php
+++ b/htdocs/admin/mails_emailing.php
@@ -71,7 +71,15 @@ if ($action == 'update' && !$cancel) {
 	dolibarr_set_const($db, "MAIN_MAIL_SMTP_PORT_EMAILING", GETPOST("MAIN_MAIL_SMTP_PORT_EMAILING"), 'chaine', 0, '', $conf->entity);
 	dolibarr_set_const($db, "MAIN_MAIL_SMTP_SERVER_EMAILING", GETPOST("MAIN_MAIL_SMTP_SERVER_EMAILING"), 'chaine', 0, '', $conf->entity);
 	dolibarr_set_const($db, "MAIN_MAIL_SMTPS_ID_EMAILING", GETPOST("MAIN_MAIL_SMTPS_ID_EMAILING"), 'chaine', 0, '', $conf->entity);
-	dolibarr_set_const($db, "MAIN_MAIL_SMTPS_PW_EMAILING", GETPOST("MAIN_MAIL_SMTPS_PW_EMAILING"), 'chaine', 0, '', $conf->entity);
+	if (GETPOSTISSET("MAIN_MAIL_SMTPS_PW_EMAILING")) {
+		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);
+	}
+	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_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);
 	dolibarr_set_const($db, "MAIN_MAIL_EMAIL_SMTP_ALLOW_SELF_SIGNED_EMAILING", GETPOST("MAIN_MAIL_EMAIL_SMTP_ALLOW_SELF_SIGNED_EMAILING"), 'chaine', 0, '', $conf->entity);
@@ -145,6 +153,24 @@ if (version_compare(phpversion(), '7.0', '>=')) {
 	$listofmethods['swiftmailer'] = 'Swift Mailer socket library';
 }
 
+// List of oauth services
+$oauthservices = array();
+
+foreach ($conf->global as $key => $val) {
+	if (!empty($val) && preg_match('/^OAUTH_.*_ID$/', $key)) {
+		$key = preg_replace('/^OAUTH_/', '', $key);
+		$key = preg_replace('/_ID$/', '', $key);
+		if (preg_match('/^.*-/', $key)) {
+			$name = preg_replace('/^.*-/', '', $key);
+		} else {
+			$name = $langs->trans("NoName");
+		}
+		$provider = preg_replace('/-.*$/', '', $key);
+		$provider = ucfirst(strtolower($provider));
+
+		$oauthservices[$key] = $name." (".$provider.")";
+	}
+}
 
 if ($action == 'edit') {
 	if ($conf->use_javascript_ajax) {
@@ -170,6 +196,8 @@ if ($action == 'edit') {
                             jQuery("#MAIN_MAIL_EMAIL_STARTTLS_EMAILING").prop("disabled", true);
                             jQuery("#MAIN_MAIL_EMAIL_SMTP_ALLOW_SELF_SIGNED_EMAILING").val(0);
                             jQuery("#MAIN_MAIL_EMAIL_SMTP_ALLOW_SELF_SIGNED_EMAILING").prop("disabled", true);
+														jQuery(".smtp_method").hide();
+                            jQuery(".smtp_auth_method").hide();
                             ';
 		if ($linuxlike) {
 			print '
@@ -201,9 +229,11 @@ if ($action == 'edit') {
                             jQuery("#MAIN_MAIL_SMTP_PORT_EMAILING").removeAttr("disabled");
                             jQuery("#MAIN_MAIL_SMTP_SERVER_EMAILING").show();
                             jQuery("#MAIN_MAIL_SMTP_PORT_EMAILING").show();
+														jQuery("#smtp_port_mess").hide();
                             jQuery("#smtp_server_mess").hide();
-			                jQuery("#smtp_port_mess").hide();
-						}
+														jQuery(".smtp_method").show();
+                            jQuery(".smtp_auth_method").show();
+													}
                         if (jQuery("#MAIN_MAIL_SENDMODE_EMAILING").val()==\'swiftmailer\')
                         {
                             jQuery(".drag").show();
@@ -219,12 +249,35 @@ if ($action == 'edit') {
                             jQuery("#MAIN_MAIL_SMTP_PORT_EMAILING").show();
                             jQuery("#smtp_server_mess").hide();
                             jQuery("#smtp_port_mess").hide();
+														jQuery(".smtp_method").show();
+														jQuery(".smtp_auth_method").show();
                         }
                     }
+										function change_smtp_auth_method() {
+											console.log(jQuery("#radio_pw").prop("checked"));
+											if (jQuery("#MAIN_MAIL_SENDMODE_EMAILING").val()==\'smtps\' && jQuery("#radio_oauth").prop("checked")) {
+												jQuery(".smtp_oauth_service").show();
+												jQuery(".smtp_pw").hide();
+											} else if (jQuery("#MAIN_MAIL_SENDMODE_EMAILING").val()==\'swiftmailer\' && jQuery("#radio_oauth").prop("checked")) {
+												jQuery(".smtp_oauth_service").show();
+												jQuery(".smtp_pw").hide();
+											} else if(jQuery("#MAIN_MAIL_SENDMODE_EMAILING").val()==\'mail\' || jQuery("#MAIN_MAIL_SENDMODE_EMAILING").val()==\'default\'){
+												jQuery(".smtp_oauth_service").hide();
+												jQuery(".smtp_pw").hide();
+											} else {
+												jQuery(".smtp_oauth_service").hide();
+												jQuery(".smtp_pw").show();
+											}
+										}
                     initfields();
-                    jQuery("#MAIN_MAIL_SENDMODE_EMAILING").change(function() {
+										change_smtp_auth_method();
+										jQuery("#MAIN_MAIL_SENDMODE_EMAILING").change(function() {
                         initfields();
-                    });
+											change_smtp_auth_method();
+										});
+										jQuery("#radio_pw, #radio_oauth").change(function() {
+											change_smtp_auth_method();
+										});
 					jQuery("#MAIN_MAIL_EMAIL_TLS_EMAILING").change(function() {
 						if (jQuery("#MAIN_MAIL_EMAIL_TLS_EMAILING").val() == 1)
 							jQuery("#MAIN_MAIL_EMAIL_STARTTLS_EMAILING").val(0);
@@ -237,7 +290,7 @@ if ($action == 'edit') {
 						else
 							jQuery("#MAIN_MAIL_EMAIL_SMTP_ALLOW_SELF_SIGNED_EMAILING").val(0);
 					});
-               })';
+        })';
 		print '</script>'."\n";
 	}
 
@@ -354,10 +407,28 @@ if ($action == 'edit') {
 		print '</td></tr>';
 	}
 
+		// OAUTH
+	if (!empty($conf->use_javascript_ajax) || (isset($conf->global->MAIN_MAIL_SENDMODE_EMAILING) && in_array($conf->global->MAIN_MAIL_SENDMODE_EMAILING, array('smtps', 'swiftmailer')))) {
+		print '<tr class="oddeven smtp_auth_method hideifdefault"><td>'.$langs->trans("MAIN_MAIL_SMTPS_AUTH_TYPE").'</td><td>';
+		if (empty($conf->multicompany->enabled) || ($user->admin && !$user->entity)) {
+			print '<input type="radio" id="radio_pw" name="MAIN_MAIL_SMTPS_AUTH_TYPE_EMAILING" value="LOGIN"'.(getDolGlobalString('MAIN_MAIL_SMTPS_AUTH_TYPE_EMAILING') == 'LOGIN' ? ' checked' : '').'> ';
+			print '<label for="radio_pw" >'.$langs->trans("UsePassword").'</label>';
+			print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
+			print '<input type="radio" id="radio_oauth" name="MAIN_MAIL_SMTPS_AUTH_TYPE_EMAILING" value="XOAUTH2"'.(getDolGlobalString('MAIN_MAIL_SMTPS_AUTH_TYPE_EMAILING') == 'XOAUTH2' ? ' checked' : '').'> ';
+			print '<label for="radio_oauth" >'.$form->textwithpicto($langs->trans("UseOauth"), $langs->trans("OauthNotAvailableForAllAndHadToBeCreatedBefore")).'</label>';
+		} else {
+			$value = getDolGlobalString('MAIN_MAIL_SMTPS_AUTH_TYPE_EMAILING', 'LOGIN');
+			$htmltext = $langs->trans("ContactSuperAdminForChange");
+			print $form->textwithpicto($langs->trans("MAIN_MAIL_SMTPS_AUTH_TYPE_EMAILING"), $htmltext, 1, 'superadmin');
+			print '<input type="hidden" id="MAIN_MAIL_SMTPS_AUTH_TYPE" name="MAIN_MAIL_SMTPS_AUTH_TYPE_EMAILING" value="'.$value.'">';
+		}
+		print '</td></tr>';
+	}
+
 	// PW
 	if (!empty($conf->use_javascript_ajax) || (isset($conf->global->MAIN_MAIL_SENDMODE_EMAILING) && in_array($conf->global->MAIN_MAIL_SENDMODE_EMAILING, array('smtps', 'swiftmailer')))) {
 		$mainsmtppw = (!empty($conf->global->MAIN_MAIL_SMTPS_PW_EMAILING) ? $conf->global->MAIN_MAIL_SMTPS_PW_EMAILING : '');
-		print '<tr class="drag drop oddeven hideifdefault"><td>' . $langs->trans("MAIN_MAIL_SMTPS_PW") . '</td><td>';
+		print '<tr class="drag drop oddeven smtp_pw hideifdefault"><td>' . $langs->trans("MAIN_MAIL_SMTPS_PW") . '</td><td>';
 		// SuperAdministrator access only
 		if (!isModEnabled('multicompany') || ($user->admin && !$user->entity)) {
 			print '<input class="flat" type="password" name="MAIN_MAIL_SMTPS_PW_EMAILING" size="32" value="' . $mainsmtppw . '">';
@@ -369,6 +440,26 @@ if ($action == 'edit') {
 		print '</td></tr>';
 	}
 
+		// OAUTH service provider
+	if (!empty($conf->use_javascript_ajax) || (isset($conf->global->MAIN_MAIL_SENDMODE_EMAILING) && in_array($conf->global->MAIN_MAIL_SENDMODE_EMAILING, array('smtps', 'swiftmailer')))) {
+		print '<tr class="oddeven smtp_oauth_service hideifdefault"><td>'.$langs->trans("MAIN_MAIL_SMTPS_OAUTH_SERVICE").'</td><td>';
+
+		// SuperAdministrator access only
+		if ((empty($conf->global->MAIN_MODULE_MULTICOMPANY)) || ($user->admin && !$user->entity)) {
+			print $form->selectarray('MAIN_MAIL_SMTPS_OAUTH_SERVICE_EMAILING', $oauthservices, $conf->global->MAIN_MAIL_SMTPS_OAUTH_SERVICE_EMAILING);
+		} else {
+			$text = $oauthservices[$conf->global->MAIN_MAIL_SMTPS_OAUTH_SERVICE_EMAILING];
+			if (empty($text)) {
+				$text = $langs->trans("Undefined");
+			}
+			$htmltext = $langs->trans("ContactSuperAdminForChange");
+			print $form->textwithpicto($text, $htmltext, 1, 'superadmin');
+			print '<input type="hidden" name="MAIN_MAIL_SMTPS_OAUTH_SERVICE_EMAILING" value="'.$conf->global->MAIN_MAIL_SMTPS_OAUTH_SERVICE_EMAILING.'">';
+		}
+		print '</td></tr>';
+	}
+
+
 	// TLS
 	print '<tr class="oddeven hideifdefault"><td>'.$langs->trans("MAIN_MAIL_EMAIL_TLS").'</td><td>';
 	if (!empty($conf->use_javascript_ajax) || (isset($conf->global->MAIN_MAIL_SENDMODE_EMAILING) && in_array($conf->global->MAIN_MAIL_SENDMODE_EMAILING, array('smtps', 'swiftmailer')))) {
@@ -458,11 +549,28 @@ if ($action == 'edit') {
 			print '<tr class="oddeven hideifdefault"><td>'.$langs->trans("MAIN_MAIL_SMTPS_ID").'</td><td>'.getDolGlobalString('MAIN_MAIL_SMTPS_ID_EMAILING').'</td></tr>';
 		}
 
+		// AUTH method
+		if (in_array(getDolGlobalString('MAIN_MAIL_SENDMODE_EMAILING'), array('smtps', 'swiftmailer'))) {
+			$authtype = getDolGlobalString('MAIN_MAIL_SMTPS_AUTH_TYPE_EMAILING', 'LOGIN');
+			$text = ($authtype === "LOGIN") ? $langs->trans("UsePassword") : ($authtype === "XOAUTH2" ?  $langs->trans("UseOauth") : '') ;
+			print '<tr class="oddeven hideifdefault"><td>'.$langs->trans("MAIN_MAIL_SMTPS_AUTH_TYPE_EMAILING").'</td><td>'.$text.'</td></tr>';
+		}
+
 		// SMTPS PW
-		if (isset($conf->global->MAIN_MAIL_SENDMODE_EMAILING) && in_array($conf->global->MAIN_MAIL_SENDMODE_EMAILING, array('smtps', 'swiftmailer'))) {
+		if (isset($conf->global->MAIN_MAIL_SENDMODE_EMAILING) && in_array($conf->global->MAIN_MAIL_SENDMODE_EMAILING, array('smtps', 'swiftmailer')) && getDolGlobalString('MAIN_MAIL_SMTPS_AUTH_TYPE') != "XOAUTH2") {
 			print '<tr class="oddeven hideifdefault"><td>'.$langs->trans("MAIN_MAIL_SMTPS_PW").'</td><td>'.preg_replace('/./', '*', getDolGlobalString('MAIN_MAIL_SMTPS_PW_EMAILING')).'</td></tr>';
 		}
 
+		// SMTPS oauth service
+		if (in_array(getDolGlobalString('MAIN_MAIL_SENDMODE_EMAILING'), array('smtps', 'swiftmailer')) && getDolGlobalString('MAIN_MAIL_SMTPS_AUTH_TYPE_EMAILING') === "XOAUTH2") {
+			$text = $oauthservices[$conf->global->MAIN_MAIL_SMTPS_OAUTH_SERVICE_EMAILING];
+			if (empty($text)) {
+				$text = $langs->trans("Undefined").img_warning();
+			}
+			print '<tr class="oddeven hideifdefault"><td>'.$langs->trans("MAIN_MAIL_SMTPS_OAUTH_SERVICE_EMAILING").'</td><td>'.$text.'</td></tr>';
+		}
+
+
 		// TLS
 		print '<tr class="oddeven hideifdefault"><td>'.$langs->trans("MAIN_MAIL_EMAIL_TLS").'</td><td>';
 		if (isset($conf->global->MAIN_MAIL_SENDMODE_EMAILING) && in_array($conf->global->MAIN_MAIL_SENDMODE_EMAILING, array('smtps', 'swiftmailer'))) {
diff --git a/htdocs/admin/mails_ticket.php b/htdocs/admin/mails_ticket.php
index a439bdabcf0..e9bf9ccb238 100644
--- a/htdocs/admin/mails_ticket.php
+++ b/htdocs/admin/mails_ticket.php
@@ -66,8 +66,15 @@ if ($action == 'update' && !$cancel) {
 	dolibarr_set_const($db, "MAIN_MAIL_SMTP_PORT_TICKET", GETPOST("MAIN_MAIL_SMTP_PORT_TICKET"), 'chaine', 0, '', $conf->entity);
 	dolibarr_set_const($db, "MAIN_MAIL_SMTP_SERVER_TICKET", GETPOST("MAIN_MAIL_SMTP_SERVER_TICKET"), 'chaine', 0, '', $conf->entity);
 	dolibarr_set_const($db, "MAIN_MAIL_SMTPS_ID_TICKET", GETPOST("MAIN_MAIL_SMTPS_ID_TICKET"), 'chaine', 0, '', $conf->entity);
-	dolibarr_set_const($db, "MAIN_MAIL_SMTPS_PW_TICKET", GETPOST("MAIN_MAIL_SMTPS_PW_TICKET"), 'chaine', 0, '', $conf->entity);
-	dolibarr_set_const($db, "MAIN_MAIL_EMAIL_TLS_TICKET", GETPOST("MAIN_MAIL_EMAIL_TLS_TICKET"), 'chaine', 0, '', $conf->entity);
+	if (GETPOSTISSET("MAIN_MAIL_SMTPS_PW_TICKET")) {
+		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);
+	}
+	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_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);
 
 	header("Location: ".$_SERVER["PHP_SELF"]."?mainmenu=home&leftmenu=setup");
@@ -139,6 +146,25 @@ if (version_compare(phpversion(), '7.0', '>=')) {
 	$listofmethods['swiftmailer'] = 'Swift Mailer socket library';
 }
 
+// List of oauth services
+$oauthservices = array();
+
+foreach ($conf->global as $key => $val) {
+	if (!empty($val) && preg_match('/^OAUTH_.*_ID$/', $key)) {
+		$key = preg_replace('/^OAUTH_/', '', $key);
+		$key = preg_replace('/_ID$/', '', $key);
+		if (preg_match('/^.*-/', $key)) {
+			$name = preg_replace('/^.*-/', '', $key);
+		} else {
+			$name = $langs->trans("NoName");
+		}
+		$provider = preg_replace('/-.*$/', '', $key);
+		$provider = ucfirst(strtolower($provider));
+
+		$oauthservices[$key] = $name." (".$provider.")";
+	}
+}
+
 
 if ($action == 'edit') {
 	if ($conf->use_javascript_ajax) {
@@ -162,6 +188,8 @@ if ($action == 'edit') {
                             jQuery("#MAIN_MAIL_EMAIL_TLS_TICKET").prop("disabled", true);
                             jQuery("#MAIN_MAIL_EMAIL_STARTTLS_TICKET").val(0);
                             jQuery("#MAIN_MAIL_EMAIL_STARTTLS_TICKET").prop("disabled", true);
+														jQuery(".smtp_method").hide();
+                            jQuery(".smtp_auth_method").hide();
                             ';
 		if ($linuxlike) {
 			print '
@@ -192,7 +220,9 @@ if ($action == 'edit') {
                             jQuery("#MAIN_MAIL_SMTP_SERVER_TICKET").show();
                             jQuery("#MAIN_MAIL_SMTP_PORT_TICKET").show();
                             jQuery("#smtp_server_mess").hide();
-			                jQuery("#smtp_port_mess").hide();
+														jQuery("#smtp_port_mess").hide();
+														jQuery(".smtp_method").show();
+                            jQuery(".smtp_auth_method").show();
 						}
                         if (jQuery("#MAIN_MAIL_SENDMODE_TICKET").val()==\'swiftmailer\')
                         {
@@ -207,12 +237,37 @@ if ($action == 'edit') {
                             jQuery("#MAIN_MAIL_SMTP_PORT_TICKET").show();
                             jQuery("#smtp_server_mess").hide();
                             jQuery("#smtp_port_mess").hide();
+														jQuery(".smtp_method").show();
+														jQuery(".smtp_auth_method").show();
                         }
                     }
+										function change_smtp_auth_method() {
+											console.log(jQuery("#radio_pw").prop("checked"));
+											if (jQuery("#MAIN_MAIL_SENDMODE_TICKET").val()==\'smtps\' && jQuery("#radio_oauth").prop("checked")) {
+												jQuery(".smtp_oauth_service").show();
+												jQuery(".smtp_pw").hide();
+											} else if (jQuery("#MAIN_MAIL_SENDMODE_TICKET").val()==\'swiftmailer\' && jQuery("#radio_oauth").prop("checked")) {
+												jQuery(".smtp_oauth_service").show();
+												jQuery(".smtp_pw").hide();
+											} else if(jQuery("#MAIN_MAIL_SENDMODE_TICKET").val()==\'mail\' || jQuery("#MAIN_MAIL_SENDMODE_TICKET").val()==\'default\'){
+												jQuery(".smtp_oauth_service").hide();
+												jQuery(".smtp_pw").hide();
+											} else {
+												jQuery(".smtp_oauth_service").hide();
+												jQuery(".smtp_pw").show();
+											}
+										}
                     initfields();
+										change_smtp_auth_method();
+
                     jQuery("#MAIN_MAIL_SENDMODE_TICKET").change(function() {
                         initfields();
+											change_smtp_auth_method();
+
                     });
+										jQuery("#radio_pw, #radio_oauth").change(function() {
+											change_smtp_auth_method();
+										});
 					jQuery("#MAIN_MAIL_EMAIL_TLS").change(function() {
 						if (jQuery("#MAIN_MAIL_EMAIL_STARTTLS_TICKET").val() == 1)
 							jQuery("#MAIN_MAIL_EMAIL_STARTTLS_TICKET").val(0);
@@ -333,10 +388,29 @@ if ($action == 'edit') {
 		print '</td></tr>';
 	}
 
+	// OAUTH
+	if (!empty($conf->use_javascript_ajax) || (isset($conf->global->MAIN_MAIL_SENDMODE_TICKET) && in_array($conf->global->MAIN_MAIL_SENDMODE_TICKET, array('smtps', 'swiftmailer')))) {
+		print '<tr class="oddeven smtp_auth_method hideifdefault"><td>'.$langs->trans("MAIN_MAIL_SMTPS_AUTH_TYPE").'</td><td>';
+		if (empty($conf->multicompany->enabled) || ($user->admin && !$user->entity)) {
+			print '<input type="radio" id="radio_pw" name="MAIN_MAIL_SMTPS_AUTH_TYPE_TICKET" value="LOGIN"'.(getDolGlobalString('MAIN_MAIL_SMTPS_AUTH_TYPE_TICKET') == 'LOGIN' ? ' checked' : '').'> ';
+			print '<label for="radio_pw" >'.$langs->trans("UsePassword").'</label>';
+			print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
+			print '<input type="radio" id="radio_oauth" name="MAIN_MAIL_SMTPS_AUTH_TYPE_TICKET" value="XOAUTH2"'.(getDolGlobalString('MAIN_MAIL_SMTPS_AUTH_TYPE_TICKET') == 'XOAUTH2' ? ' checked' : '').'> ';
+			print '<label for="radio_oauth" >'.$form->textwithpicto($langs->trans("UseOauth"), $langs->trans("OauthNotAvailableForAllAndHadToBeCreatedBefore")).'</label>';
+		} else {
+			$value = getDolGlobalString('MAIN_MAIL_SMTPS_AUTH_TYPE_TICKET', 'LOGIN');
+			$htmltext = $langs->trans("ContactSuperAdminForChange");
+			print $form->textwithpicto($langs->trans("MAIN_MAIL_SMTPS_AUTH_TYPE_TICKET"), $htmltext, 1, 'superadmin');
+			print '<input type="hidden" id="MAIN_MAIL_SMTPS_AUTH_TYPE" name="MAIN_MAIL_SMTPS_AUTH_TYPE_TICKET" value="'.$value.'">';
+		}
+		print '</td></tr>';
+	}
+
+
 	// PW
 	if (!empty($conf->use_javascript_ajax) || (isset($conf->global->MAIN_MAIL_SENDMODE_TICKET) && in_array($conf->global->MAIN_MAIL_SENDMODE_TICKET, array('smtps', 'swiftmailer')))) {
 		$mainsmtppw = (!empty($conf->global->MAIN_MAIL_SMTPS_PW_TICKET) ? $conf->global->MAIN_MAIL_SMTPS_PW_TICKET : '');
-		print '<tr class="drag drop oddeven hideifdefault"><td>'.$langs->trans("MAIN_MAIL_SMTPS_PW").'</td><td>';
+		print '<tr class="drag drop oddeven smtp_pw hideifdefault"><td>'.$langs->trans("MAIN_MAIL_SMTPS_PW").'</td><td>';
 		// SuperAdministrator access only
 		if (empty($conf->multicompany->enabled) || ($user->admin && !$user->entity)) {
 			print '<input class="flat" type="password" name="MAIN_MAIL_SMTPS_PW_TICKET" size="32" value="'.$mainsmtppw.'">';
@@ -348,6 +422,24 @@ if ($action == 'edit') {
 		print '</td></tr>';
 	}
 
+	// OAUTH service provider
+	if (!empty($conf->use_javascript_ajax) || (isset($conf->global->MAIN_MAIL_SENDMODE_TICKET) && in_array($conf->global->MAIN_MAIL_SENDMODE_TICKET, array('smtps', 'swiftmailer')))) {
+		print '<tr class="oddeven smtp_oauth_service hideifdefault"><td>'.$langs->trans("MAIN_MAIL_SMTPS_OAUTH_SERVICE").'</td><td>';
+		// SuperAdministrator access only
+		if ((empty($conf->global->MAIN_MODULE_MULTICOMPANY)) || ($user->admin && !$user->entity)) {
+			print $form->selectarray('MAIN_MAIL_SMTPS_OAUTH_SERVICE_TICKET', $oauthservices, $conf->global->MAIN_MAIL_SMTPS_OAUTH_SERVICE_TICKET);
+		} else {
+			$text = $oauthservices[$conf->global->MAIN_MAIL_SMTPS_OAUTH_SERVICE_TICKET];
+			if (empty($text)) {
+				$text = $langs->trans("Undefined");
+			}
+			$htmltext = $langs->trans("ContactSuperAdminForChange");
+			print $form->textwithpicto($text, $htmltext, 1, 'superadmin');
+			print '<input type="hidden" name="MAIN_MAIL_SMTPS_OAUTH_SERVICE_TICKET" value="'.$conf->global->MAIN_MAIL_SMTPS_OAUTH_SERVICE_TICKET.'">';
+		}
+		print '</td></tr>';
+	}
+
 	// TLS
 
 	print '<tr class="oddeven hideifdefault"><td>'.$langs->trans("MAIN_MAIL_EMAIL_TLS").'</td><td>';
@@ -425,11 +517,27 @@ if ($action == 'edit') {
 			print '<tr class="oddeven hideifdefault"><td>'.$langs->trans("MAIN_MAIL_SMTPS_ID").'</td><td>'.$conf->global->MAIN_MAIL_SMTPS_ID_TICKET.'</td></tr>';
 		}
 
+		// AUTH method
+		if (in_array(getDolGlobalString('MAIN_MAIL_SENDMODE_TICKET'), array('smtps', 'swiftmailer'))) {
+			$authtype = getDolGlobalString('MAIN_MAIL_SMTPS_AUTH_TYPE_TICKET', 'LOGIN');
+			$text = ($authtype === "LOGIN") ? $langs->trans("UsePassword") : ($authtype === "XOAUTH2" ?  $langs->trans("UseOauth") : '') ;
+			print '<tr class="oddeven hideifdefault"><td>'.$langs->trans("MAIN_MAIL_SMTPS_AUTH_TYPE_TICKET").'</td><td>'.$text.'</td></tr>';
+		}
+
 		// SMTPS PW
 		if (isset($conf->global->MAIN_MAIL_SENDMODE_TICKET) && in_array($conf->global->MAIN_MAIL_SENDMODE_TICKET, array('smtps', 'swiftmailer'))) {
 			print '<tr class="oddeven hideifdefault"><td>'.$langs->trans("MAIN_MAIL_SMTPS_PW").'</td><td>'.preg_replace('/./', '*', $conf->global->MAIN_MAIL_SMTPS_PW_TICKET).'</td></tr>';
 		}
 
+		// SMTPS oauth service
+		if (in_array(getDolGlobalString('MAIN_MAIL_SENDMODE_TICKET'), array('smtps', 'swiftmailer')) && getDolGlobalString('MAIN_MAIL_SMTPS_AUTH_TYPE_TICKET') === "XOAUTH2") {
+			$text = $oauthservices[$conf->global->MAIN_MAIL_SMTPS_OAUTH_SERVICE_TICKET];
+			if (empty($text)) {
+				$text = $langs->trans("Undefined").img_warning();
+			}
+			print '<tr class="oddeven hideifdefault"><td>'.$langs->trans("MAIN_MAIL_SMTPS_OAUTH_SERVICE_TICKET").'</td><td>'.$text.'</td></tr>';
+		}
+
 		// TLS
 		print '<tr class="oddeven hideifdefault"><td>'.$langs->trans("MAIN_MAIL_EMAIL_TLS").'</td><td>';
 		if (isset($conf->global->MAIN_MAIL_SENDMODE_TICKET) && in_array($conf->global->MAIN_MAIL_SENDMODE_TICKET, array('smtps', 'swiftmailer'))) {
diff --git a/htdocs/core/class/CMailFile.class.php b/htdocs/core/class/CMailFile.class.php
index a9518ee6dab..42dcd1d493b 100644
--- a/htdocs/core/class/CMailFile.class.php
+++ b/htdocs/core/class/CMailFile.class.php
@@ -691,11 +691,11 @@ class CMailFile
 			}
 
 			$keyforsmtpserver = 'MAIN_MAIL_SMTP_SERVER';
-			$keyforsmtpauthtype = "MAIN_MAIL_SMTPS_AUTH_TYPE";
-			$keyforsmtpoauthservice = "MAIN_MAIL_SMTPS_OAUTH_SERVICE";
 			$keyforsmtpport  = 'MAIN_MAIL_SMTP_PORT';
 			$keyforsmtpid    = 'MAIN_MAIL_SMTPS_ID';
 			$keyforsmtppw    = 'MAIN_MAIL_SMTPS_PW';
+			$keyforsmtpauthtype = 'MAIN_MAIL_SMTPS_AUTH_TYPE';
+			$keyforsmtpoauthservice = 'MAIN_MAIL_SMTPS_OAUTH_SERVICE';
 			$keyfortls       = 'MAIN_MAIL_EMAIL_TLS';
 			$keyforstarttls  = 'MAIN_MAIL_EMAIL_STARTTLS';
 			$keyforsslseflsigned = 'MAIN_MAIL_EMAIL_SMTP_ALLOW_SELF_SIGNED';
@@ -708,6 +708,8 @@ class CMailFile
 					$keyforsmtpport   = 'MAIN_MAIL_SMTP_PORT_'.$smtpContextKey;
 					$keyforsmtpid     = 'MAIN_MAIL_SMTPS_ID_'.$smtpContextKey;
 					$keyforsmtppw     = 'MAIN_MAIL_SMTPS_PW_'.$smtpContextKey;
+					$keyforsmtpauthtype = 'MAIN_MAIL_SMTPS_AUTH_TYPE_'.$smtpContextKey;
+					$keyforsmtpoauthservice = 'MAIN_MAIL_SMTPS_OAUTH_SERVICE_'.$smtpContextKey;
 					$keyfortls        = 'MAIN_MAIL_EMAIL_TLS_'.$smtpContextKey;
 					$keyforstarttls   = 'MAIN_MAIL_EMAIL_STARTTLS_'.$smtpContextKey;
 					$keyforsslseflsigned = 'MAIN_MAIL_EMAIL_SMTP_ALLOW_SELF_SIGNED_'.$smtpContextKey;

From 3f47401dc46994ddb24ad89dd8acb8a4f0d16db2 Mon Sep 17 00:00:00 2001
From: Faustin <faustin.boitel@bordeaux-inp.fr>
Date: Fri, 26 Aug 2022 15:27:23 +0200
Subject: [PATCH 047/974] password display

---
 htdocs/admin/mails_emailing.php | 2 +-
 htdocs/admin/mails_ticket.php   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/admin/mails_emailing.php b/htdocs/admin/mails_emailing.php
index 2c255a164ec..99210bffade 100644
--- a/htdocs/admin/mails_emailing.php
+++ b/htdocs/admin/mails_emailing.php
@@ -557,7 +557,7 @@ if ($action == 'edit') {
 		}
 
 		// SMTPS PW
-		if (isset($conf->global->MAIN_MAIL_SENDMODE_EMAILING) && in_array($conf->global->MAIN_MAIL_SENDMODE_EMAILING, array('smtps', 'swiftmailer')) && getDolGlobalString('MAIN_MAIL_SMTPS_AUTH_TYPE') != "XOAUTH2") {
+		if (isset($conf->global->MAIN_MAIL_SENDMODE_EMAILING) && in_array($conf->global->MAIN_MAIL_SENDMODE_EMAILING, array('smtps', 'swiftmailer')) && getDolGlobalString('MAIN_MAIL_SMTPS_AUTH_TYPE_EMAILING') != "XOAUTH2") {
 			print '<tr class="oddeven hideifdefault"><td>'.$langs->trans("MAIN_MAIL_SMTPS_PW").'</td><td>'.preg_replace('/./', '*', getDolGlobalString('MAIN_MAIL_SMTPS_PW_EMAILING')).'</td></tr>';
 		}
 
diff --git a/htdocs/admin/mails_ticket.php b/htdocs/admin/mails_ticket.php
index e9bf9ccb238..2ddef2e0d66 100644
--- a/htdocs/admin/mails_ticket.php
+++ b/htdocs/admin/mails_ticket.php
@@ -525,7 +525,7 @@ if ($action == 'edit') {
 		}
 
 		// SMTPS PW
-		if (isset($conf->global->MAIN_MAIL_SENDMODE_TICKET) && in_array($conf->global->MAIN_MAIL_SENDMODE_TICKET, array('smtps', 'swiftmailer'))) {
+		if (isset($conf->global->MAIN_MAIL_SENDMODE_TICKET) && in_array($conf->global->MAIN_MAIL_SENDMODE_TICKET, array('smtps', 'swiftmailer')) && getDolGlobalString('MAIN_MAIL_SMTPS_AUTH_TYPE_TICKET') != "XOAUTH2") {
 			print '<tr class="oddeven hideifdefault"><td>'.$langs->trans("MAIN_MAIL_SMTPS_PW").'</td><td>'.preg_replace('/./', '*', $conf->global->MAIN_MAIL_SMTPS_PW_TICKET).'</td></tr>';
 		}
 

From c2d87ad75ca4317c11c41866be149f7c550d016f Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Fri, 26 Aug 2022 17:03:20 +0200
Subject: [PATCH 048/974] TakePos - Use isModEnabled

---
 htdocs/takepos/admin/receipt.php  |  6 +++---
 htdocs/takepos/admin/setup.php    |  6 +++---
 htdocs/takepos/admin/terminal.php | 10 +++++-----
 htdocs/takepos/ajax/ajax.php      |  2 +-
 htdocs/takepos/index.php          |  8 ++++----
 htdocs/takepos/invoice.php        | 26 +++++++++++++-------------
 htdocs/takepos/pay.php            |  2 +-
 htdocs/takepos/receipt.php        |  4 ++--
 8 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/htdocs/takepos/admin/receipt.php b/htdocs/takepos/admin/receipt.php
index bf5f5e8b931..9fffef6ca0c 100644
--- a/htdocs/takepos/admin/receipt.php
+++ b/htdocs/takepos/admin/receipt.php
@@ -69,7 +69,7 @@ if (GETPOST('action', 'alpha') == 'set') {
 } elseif (GETPOST('action', 'alpha') == 'setmethod') {
 	dolibarr_set_const($db, "TAKEPOS_PRINT_METHOD", GETPOST('value', 'alpha'), 'chaine', 0, '', $conf->entity);
 	// TakePOS connector require ReceiptPrinter module
-	if ($conf->global->TAKEPOS_PRINT_METHOD == "takeposconnector" && !$conf->receiptprinter->enabled) {
+	if ($conf->global->TAKEPOS_PRINT_METHOD == "takeposconnector" && !isModEnabled('receiptprinter')) {
 		activateModule("modReceiptPrinter");
 	}
 }
@@ -119,14 +119,14 @@ print '<tr class="oddeven"><td>';
 print $langs->trans('DolibarrReceiptPrinter');
 print '<td>';
 print $langs->trans('ReceiptPrinterMethodDescription');
-if ($conf->receiptprinter->enabled) {
+if (isModEnabled('receiptprinter')) {
 	if ($conf->global->TAKEPOS_PRINT_METHOD == "receiptprinter") {
 		print '<br>';
 		print img_picto('', 'printer', 'class="paddingright"').'<a href="'.DOL_URL_ROOT.'/admin/receiptprinter.php">'.$langs->trans("Setup").'</a>';
 	}
 }
 print '</td><td class="right">';
-if ($conf->receiptprinter->enabled) {
+if (isModEnabled('receiptprinter')) {
 	if ($conf->global->TAKEPOS_PRINT_METHOD == "receiptprinter") {
 		print img_picto($langs->trans("Activated"), 'switch_on');
 	} else {
diff --git a/htdocs/takepos/admin/setup.php b/htdocs/takepos/admin/setup.php
index 849c5c56481..3dae4fb13a9 100644
--- a/htdocs/takepos/admin/setup.php
+++ b/htdocs/takepos/admin/setup.php
@@ -82,7 +82,7 @@ if ($action == 'set') {
 		$res = dolibarr_set_const($db, "TAKEPOS_SUMUP_AFFILIATE", GETPOST('TAKEPOS_SUMUP_AFFILIATE', 'alpha'), 'chaine', 0, '', $conf->entity);
 		$res = dolibarr_set_const($db, "TAKEPOS_SUMUP_APPID", GETPOST('TAKEPOS_SUMUP_APPID', 'alpha'), 'chaine', 0, '', $conf->entity);
 	}
-	if (!empty($conf->barcode->enabled)) {
+	if (isModEnabled('barcode')) {
 		$res = dolibarr_set_const($db, 'TAKEPOS_BARCODE_RULE_TO_INSERT_PRODUCT', GETPOST('TAKEPOS_BARCODE_RULE_TO_INSERT_PRODUCT', 'alpha'), 'chaine', 0, '', $conf->entity);
 	}
 
@@ -263,7 +263,7 @@ print '<input type="number" name="TAKEPOS_NUM_TERMINALS" min="1" value="' . (emp
 print "</td></tr>\n";
 
 // Services
-if (!empty($conf->service->enabled)) {
+if (isModEnabled('service')) {
 	print '<tr class="oddeven"><td>';
 	print $langs->trans("CashdeskShowServices");
 	print '<td colspan="2">';
@@ -388,7 +388,7 @@ print ajax_constantonoff("TAKEPOS_SHOW_HT", array(), $conf->entity, 0, 0, 1, 0);
 print "</td></tr>\n";
 
 // Barcode rule to insert product
-if (!empty($conf->barcode->enabled)) {
+if (isModEnabled('barcode')) {
 	print '<tr class="oddeven"><td>';
 	print $form->textwithpicto($langs->trans("TakeposBarcodeRuleToInsertProduct"), $langs->trans("TakeposBarcodeRuleToInsertProductDesc"));
 	print '<td colspan="2">';
diff --git a/htdocs/takepos/admin/terminal.php b/htdocs/takepos/admin/terminal.php
index f6562d81693..4854f39ba03 100644
--- a/htdocs/takepos/admin/terminal.php
+++ b/htdocs/takepos/admin/terminal.php
@@ -149,7 +149,7 @@ print $form->select_company($conf->global->{'CASHDESK_ID_THIRDPARTY'.$terminalto
 print '</td></tr>';
 
 $atleastonefound = 0;
-if (!empty($conf->banque->enabled)) {
+if (isModEnabled('banque')) {
 	print '<tr class="oddeven"><td>'.$langs->trans("CashDeskBankAccountForSell").'</td>';
 	print '<td>';
 	print img_picto('', 'bank_account', 'class="pictofixedwidth"');
@@ -202,10 +202,10 @@ if (!empty($conf->banque->enabled)) {
 	}
 }
 
-if (!empty($conf->stock->enabled)) {
+if (isModEnabled('stock')) {
 	print '<tr class="oddeven"><td>'.$langs->trans("CashDeskDoNotDecreaseStock").'</td>'; // Force warehouse (this is not a default value)
 	print '<td>';
-	if (empty($conf->productbatch->enabled) || !empty($conf->global->CASHDESK_FORCE_DECREASE_STOCK)) {
+	if (!isModEnabled('productbatch') || !empty($conf->global->CASHDESK_FORCE_DECREASE_STOCK)) {
 		print $form->selectyesno('CASHDESK_NO_DECREASE_STOCK'.$terminal, $conf->global->{'CASHDESK_NO_DECREASE_STOCK'.$terminal}, 1);
 	} else {
 		if (!$conf->global->{'CASHDESK_NO_DECREASE_STOCK'.$terminal}) {
@@ -230,7 +230,7 @@ if (!empty($conf->stock->enabled)) {
 	}
 	print '</td></tr>';
 
-	if (!empty($conf->productbatch->enabled) && !empty($conf->global->CASHDESK_FORCE_DECREASE_STOCK) && !$conf->global->{'CASHDESK_NO_DECREASE_STOCK'.$terminal}) {
+	if (isModEnabled('productbatch') && !empty($conf->global->CASHDESK_FORCE_DECREASE_STOCK) && !$conf->global->{'CASHDESK_NO_DECREASE_STOCK'.$terminal}) {
 		print '<tr class="oddeven"><td>'.$langs->trans('CashDeskForceDecreaseStockLabel').'</td>';
 		print '<td>';
 		print '<span class="opacitymedium">'.$langs->trans('CashDeskForceDecreaseStockDesc').'</span>';
@@ -403,7 +403,7 @@ print '</td></tr>';
 print '</table>';
 print '</div>';
 
-if ($atleastonefound == 0 && !empty($conf->banque->enabled)) {
+if ($atleastonefound == 0 && isModEnabled('banque')) {
 	print info_admin($langs->trans("AtLeastOneDefaultBankAccountMandatory"), 0, 0, 'error');
 }
 
diff --git a/htdocs/takepos/ajax/ajax.php b/htdocs/takepos/ajax/ajax.php
index 9f7483319b3..6f84fccb9c8 100644
--- a/htdocs/takepos/ajax/ajax.php
+++ b/htdocs/takepos/ajax/ajax.php
@@ -123,7 +123,7 @@ if ($action == 'getProducts') {
 	}
 
 	$barcode_rules = getDolGlobalString('TAKEPOS_BARCODE_RULE_TO_INSERT_PRODUCT');
-	if (!empty($conf->barcode->enabled) && !empty($barcode_rules)) {
+	if (isModEnabled('barcode') && !empty($barcode_rules)) {
 		$barcode_rules_list = array();
 
 		// get barcode rules
diff --git a/htdocs/takepos/index.php b/htdocs/takepos/index.php
index ee6a6c85d80..16ac171b2ef 100644
--- a/htdocs/takepos/index.php
+++ b/htdocs/takepos/index.php
@@ -967,7 +967,7 @@ if (empty($conf->global->TAKEPOS_HIDE_HEAD_BAR)) {
 				?>
 				</a>
 				<?php
-				if (!empty($conf->multicurrency->enabled)) {
+				if (isModEnabled('multicurrency')) {
 					print '<a class="valignmiddle tdoverflowmax100" id="multicurrency" onclick="ModalBox(\'ModalCurrency\');" title=""><span class="fas fa-coins paddingrightonly"></span>';
 					print '<span class="hideonsmartphone">'.$langs->trans("Currency").'</span>';
 					print '</a>';
@@ -981,7 +981,7 @@ if (empty($conf->global->TAKEPOS_HIDE_HEAD_BAR)) {
 				<!-- More info about customer -->
 				<div class="inline-block valignmiddle tdoverflowmax150onsmartphone" id="moreinfo"></div>
 				<?php
-				if (!empty($conf->stock->enabled)) {
+				if (isModEnabled('stock')) {
 					?>
 				<!-- More info about warehouse -->
 				<div class="inline-block valignmiddle tdoverflowmax150onsmartphone" id="infowarehouse"></div>
@@ -1031,7 +1031,7 @@ if (empty($conf->global->TAKEPOS_HIDE_HEAD_BAR)) {
 </div>
 
 <!-- Modal multicurrency box -->
-<?php if (!empty($conf->multicurrency->enabled)) { ?>
+<?php if (isModEnabled('multicurrency')) { ?>
 <div id="ModalCurrency" class="modal">
 	<div class="modal-content">
 		<div class="modal-header">
@@ -1137,7 +1137,7 @@ if (isset($_SESSION["takeposterminal"]) && $_SESSION["takeposterminal"]) {
 		}
 	}
 
-	if (empty($paiementsModes) && !empty($conf->banque->enabled)) {
+	if (empty($paiementsModes) && isModEnabled('banque')) {
 		$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 bdc11c79b2f..0ba87cce069 100644
--- a/htdocs/takepos/invoice.php
+++ b/htdocs/takepos/invoice.php
@@ -171,7 +171,7 @@ if ($invoice->socid > 0) {
 }
 
 // Change the currency of invoice if it was modified
-if (!empty($conf->multicurrency->enabled) && !empty($_SESSION["takeposcustomercurrency"])) {
+if (isModEnabled('multicurrency') && !empty($_SESSION["takeposcustomercurrency"])) {
 	if ($invoice->multicurrency_code != $_SESSION["takeposcustomercurrency"]) {
 		$invoice->setMulticurrencyCode($_SESSION["takeposcustomercurrency"]);
 	}
@@ -205,7 +205,7 @@ if (empty($reshook)) {
 			}
 		}
 
-		if ($bankaccount <= 0 && $pay != "delayed" && !empty($conf->banque->enabled)) {
+		if ($bankaccount <= 0 && $pay != "delayed" && isModEnabled('banque')) {
 			$errormsg = $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("BankAccount"));
 			$error++;
 		}
@@ -261,14 +261,14 @@ if (empty($reshook)) {
 			$error++;
 			dol_syslog('Sale without lines');
 			dol_htmloutput_errors($langs->trans("NoLinesToBill", "TakePos"), null, 1);
-		} elseif (!empty($conf->stock->enabled) && $conf->global->$constantforkey != "1") {
+		} elseif (isModEnabled('stock') && $conf->global->$constantforkey != "1") {
 			$savconst = $conf->global->STOCK_CALCULATE_ON_BILL;
 			$conf->global->STOCK_CALCULATE_ON_BILL = 1;
 
 			$constantforkey = 'CASHDESK_ID_WAREHOUSE'.$_SESSION["takeposterminal"];
 			dol_syslog("Validate invoice with stock change into warehouse defined into constant ".$constantforkey." = ".$conf->global->$constantforkey);
 			$batch_rule = 0;
-			if (!empty($conf->productbatch->enabled) && !empty($conf->global->CASHDESK_FORCE_DECREASE_STOCK)) {
+			if (isModEnabled('productbatch') && !empty($conf->global->CASHDESK_FORCE_DECREASE_STOCK)) {
 				require_once DOL_DOCUMENT_ROOT.'/product/class/productbatch.class.php';
 				$batch_rule = Productbatch::BATCH_RULE_SELLBY_EATBY_DATES_FIRST;
 			}
@@ -457,13 +457,13 @@ if (empty($reshook)) {
 		$creditnote->update_price(1);
 
 		$constantforkey = 'CASHDESK_NO_DECREASE_STOCK'.$_SESSION["takeposterminal"];
-		if (!empty($conf->stock->enabled) && $conf->global->$constantforkey != "1") {
+		if (isModEnabled('stock') && $conf->global->$constantforkey != "1") {
 			$savconst = $conf->global->STOCK_CALCULATE_ON_BILL;
 			$conf->global->STOCK_CALCULATE_ON_BILL = 1;
 			$constantforkey = 'CASHDESK_ID_WAREHOUSE'.$_SESSION["takeposterminal"];
 			dol_syslog("Validate invoice with stock change into warehouse defined into constant ".$constantforkey." = ".$conf->global->$constantforkey);
 			$batch_rule = 0;
-			if (!empty($conf->productbatch->enabled) && !empty($conf->global->CASHDESK_FORCE_DECREASE_STOCK)) {
+			if (isModEnabled('productbatch') && !empty($conf->global->CASHDESK_FORCE_DECREASE_STOCK)) {
 				require_once DOL_DOCUMENT_ROOT.'/product/class/productbatch.class.php';
 				$batch_rule = Productbatch::BATCH_RULE_SELLBY_EATBY_DATES_FIRST;
 			}
@@ -1163,7 +1163,7 @@ $( document ).ready(function() {
 
 	$idwarehouse = 0;
 	$constantforkey = 'CASHDESK_NO_DECREASE_STOCK'. (isset($_SESSION["takeposterminal"]) ? $_SESSION["takeposterminal"] : '');
-	if (!empty($conf->stock->enabled)) {
+	if (isModEnabled('stock')) {
 		if (getDolGlobalString("$constantforkey") != "1") {
 			$constantforkey = 'CASHDESK_ID_WAREHOUSE'. (isset($_SESSION["takeposterminal"]) ? $_SESSION["takeposterminal"] : '');
 			$idwarehouse = getDolGlobalString($constantforkey);
@@ -1199,7 +1199,7 @@ $( document ).ready(function() {
 
 	// Module Adherent
 	$s = '';
-	if (!empty($conf->adherent->enabled) && $invoice->socid > 0 && $invoice->socid != $conf->global->$constforcompanyid) {
+	if (isModEnabled('adherent') && $invoice->socid > 0 && $invoice->socid != $conf->global->$constforcompanyid) {
 		$s = '<span class="small">';
 		require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
 		$langs->load("members");
@@ -1320,7 +1320,7 @@ if (empty($_SESSION["basiclayout"]) || $_SESSION["basiclayout"] != 1) {
 		// In phone version only show when it is invoice page
 		if (empty($mobilepage) || $mobilepage == "invoice") {
 			print '<span id="linecolht-span-total" style="font-size:1.3em; font-weight: bold;">' . price($invoice->total_ht, 1, '', 1, -1, -1, $conf->currency) . '</span>';
-			if (!empty($conf->multicurrency->enabled) && $_SESSION["takeposcustomercurrency"] != "" && $conf->currency != $_SESSION["takeposcustomercurrency"]) {
+			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
 				include_once DOL_DOCUMENT_ROOT . '/multicurrency/class/multicurrency.class.php';
 				$multicurrency = new MultiCurrency($db);
@@ -1336,7 +1336,7 @@ if (empty($_SESSION["basiclayout"]) || $_SESSION["basiclayout"] != 1) {
 	// In phone version only show when it is invoice page
 	if (empty($mobilepage) || $mobilepage == "invoice") {
 		print '<span id="linecolht-span-total" style="font-size:1.3em; font-weight: bold;">'.price($invoice->total_ttc, 1, '', 1, -1, -1, $conf->currency).'</span>';
-		if (!empty($conf->multicurrency->enabled) && !empty($_SESSION["takeposcustomercurrency"]) && $conf->currency != $_SESSION["takeposcustomercurrency"]) {
+		if (isModEnabled('multicurrency') && !empty($_SESSION["takeposcustomercurrency"]) && $conf->currency != $_SESSION["takeposcustomercurrency"]) {
 			//Only show customer currency if multicurrency module is enabled, if currency selected and if this currency selected is not the same as main currency
 			include_once DOL_DOCUMENT_ROOT.'/multicurrency/class/multicurrency.class.php';
 			$multicurrency = new MultiCurrency($db);
@@ -1568,7 +1568,7 @@ if ($placeid > 0) {
 
 				$htmlforlines .= '<td class="right">'.vatrate($line->remise_percent, true).'</td>';
 				$htmlforlines .= '<td class="right">';
-				if (!empty($conf->stock->enabled) && !empty($user->rights->stock->mouvement->lire)) {
+				if (isModEnabled('stock') && !empty($user->rights->stock->mouvement->lire)) {
 					$constantforkey = 'CASHDESK_ID_WAREHOUSE'.$_SESSION["takeposterminal"];
 					if (!empty($conf->global->$constantforkey) && $line->fk_product > 0 && empty($conf->global->TAKEPOS_HIDE_STOCK_ON_LINE)) {
 						$sql = "SELECT e.rowid, e.ref, e.lieu, e.fk_parent, e.statut, ps.reel, ps.rowid as product_stock_id, p.pmp";
@@ -1605,7 +1605,7 @@ if ($placeid > 0) {
 				if (getDolGlobalString('TAKEPOS_SHOW_HT')) {
 					$htmlforlines .= '<td class="right classfortooltip" title="'.$moreinfo.'">';
 					$htmlforlines .= price($line->total_ht, 1, '', 1, -1, -1, $conf->currency);
-					if (!empty($conf->multicurrency->enabled) && !empty($_SESSION["takeposcustomercurrency"]) && $conf->currency != $_SESSION["takeposcustomercurrency"]) {
+					if (isModEnabled('multicurrency') && !empty($_SESSION["takeposcustomercurrency"]) && $conf->currency != $_SESSION["takeposcustomercurrency"]) {
 						//Only show customer currency if multicurrency module is enabled, if currency selected and if this currency selected is not the same as main currency
 						include_once DOL_DOCUMENT_ROOT.'/multicurrency/class/multicurrency.class.php';
 						$multicurrency = new MultiCurrency($db);
@@ -1616,7 +1616,7 @@ if ($placeid > 0) {
 				}
 				$htmlforlines .= '<td class="right classfortooltip" title="'.$moreinfo.'">';
 				$htmlforlines .= price($line->total_ttc, 1, '', 1, -1, -1, $conf->currency);
-				if (!empty($conf->multicurrency->enabled) && !empty($_SESSION["takeposcustomercurrency"]) && $conf->currency != $_SESSION["takeposcustomercurrency"]) {
+				if (isModEnabled('multicurrency') && !empty($_SESSION["takeposcustomercurrency"]) && $conf->currency != $_SESSION["takeposcustomercurrency"]) {
 					//Only show customer currency if multicurrency module is enabled, if currency selected and if this currency selected is not the same as main currency
 					include_once DOL_DOCUMENT_ROOT.'/multicurrency/class/multicurrency.class.php';
 					$multicurrency = new MultiCurrency($db);
diff --git a/htdocs/takepos/pay.php b/htdocs/takepos/pay.php
index 40d873654c6..ca6a3d2f630 100644
--- a/htdocs/takepos/pay.php
+++ b/htdocs/takepos/pay.php
@@ -111,7 +111,7 @@ if ($resql) {
 			$arrayOfValidBankAccount[$conf->global->$accountname] = $conf->global->$accountname;
 			$arrayOfValidPaymentModes[] = $obj;
 		}
-		if (empty($conf->banque->enabled)) {
+		if (!isModEnabled('banque')) {
 			if ($paycode == 'CASH' || $paycode == 'CB') $arrayOfValidPaymentModes[] = $obj;
 		}
 	}
diff --git a/htdocs/takepos/receipt.php b/htdocs/takepos/receipt.php
index 41c15ca610b..fafee970bae 100644
--- a/htdocs/takepos/receipt.php
+++ b/htdocs/takepos/receipt.php
@@ -258,7 +258,7 @@ if ($conf->global->TAKEPOS_SHOW_CUSTOMER) {
 					  } ?></td>
 </tr>
 <?php
-if (!empty($conf->multicurrency->enabled) && $_SESSION["takeposcustomercurrency"] != "" && $conf->currency != $_SESSION["takeposcustomercurrency"]) {
+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
 	include_once DOL_DOCUMENT_ROOT.'/multicurrency/class/multicurrency.class.php';
 	$multicurrency = new MultiCurrency($db);
@@ -288,7 +288,7 @@ if ($conf->global->TAKEPOS_PRINT_PAYMENT_METHOD) {
 			echo $langs->transnoentitiesnoconv("PaymentTypeShort".$row->code);
 			echo '</td>';
 			echo '<td class="right">';
-			$amount_payment = (!empty($conf->multicurrency->enabled) && $object->multicurrency_tx != 1) ? $row->multicurrency_amount : $row->amount;
+			$amount_payment = (isModEnabled('multicurrency') && $object->multicurrency_tx != 1) ? $row->multicurrency_amount : $row->amount;
 			if ($row->code == "LIQ") {
 				$amount_payment = $amount_payment + $row->pos_change; // Show amount with excess received if is cash payment
 			}

From ecf4fed1f059e520821faa25d8dcdc37b4092410 Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Fri, 26 Aug 2022 17:13:29 +0200
Subject: [PATCH 049/974] PHP8 Warnings

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

diff --git a/htdocs/core/lib/takepos.lib.php b/htdocs/core/lib/takepos.lib.php
index d983f0298ce..d8c380a0411 100644
--- a/htdocs/core/lib/takepos.lib.php
+++ b/htdocs/core/lib/takepos.lib.php
@@ -1,5 +1,6 @@
 <?php
-/* Copyright (C) 2009 Laurent Destailleur  <eldy@users.sourceforge.net>
+/* Copyright (C) 2009       Laurent Destailleur <eldy@users.sourceforge.net>
+ * Copyright (C) 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
@@ -53,7 +54,8 @@ function takepos_admin_prepare_head()
 	$head[$h][2] = 'bar';
 	$h++;
 
-	$numterminals = max(1, $conf->global->TAKEPOS_NUM_TERMINALS);
+	$numterminals = !empty($conf->global->TAKEPOS_NUM_TERMINALS) ? $conf->global->TAKEPOS_NUM_TERMINALS : 1;
+	$numterminals = max(1, $numterminals);
 	for ($i = 1; $i <= $numterminals; $i++) {
 		$head[$h][0] = DOL_URL_ROOT.'/takepos/admin/terminal.php?terminal='.$i;
 		$head[$h][1] = $langs->trans("Terminal")." ".$i;

From c581024c8c39bf45e60fc503a373ced50099ba9b Mon Sep 17 00:00:00 2001
From: Yoan Mollard <ymollard@users.noreply.github.com>
Date: Wed, 3 Aug 2022 03:02:07 +0200
Subject: [PATCH 050/974] NEW: Public counters feature

---
 htdocs/adherents/admin/website.php |  9 +++++++++
 htdocs/langs/en_US/members.lang    |  1 +
 htdocs/public/members/new.php      | 11 +++++++++--
 3 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/htdocs/adherents/admin/website.php b/htdocs/adherents/admin/website.php
index 884c6e67be2..b4c40936bbf 100644
--- a/htdocs/adherents/admin/website.php
+++ b/htdocs/adherents/admin/website.php
@@ -58,6 +58,7 @@ if ($action == 'update') {
 	$public = GETPOST('MEMBER_ENABLE_PUBLIC');
 	$amount = price2num(GETPOST('MEMBER_NEWFORM_AMOUNT'), 'MT', 2);
 	$editamount = GETPOST('MEMBER_NEWFORM_EDITAMOUNT');
+	$publiccounters = GETPOST('MEMBER_COUNTERS_ARE_PUBLIC');
 	$payonline = GETPOST('MEMBER_NEWFORM_PAYONLINE');
 	$forcetype = GETPOST('MEMBER_NEWFORM_FORCETYPE', 'int');
 	$forcemorphy = GETPOST('MEMBER_NEWFORM_FORCEMORPHY', 'aZ09');
@@ -65,6 +66,7 @@ if ($action == 'update') {
 	$res = dolibarr_set_const($db, "MEMBER_ENABLE_PUBLIC", $public, 'chaine', 0, '', $conf->entity);
 	$res = dolibarr_set_const($db, "MEMBER_NEWFORM_AMOUNT", $amount, 'chaine', 0, '', $conf->entity);
 	$res = dolibarr_set_const($db, "MEMBER_NEWFORM_EDITAMOUNT", $editamount, 'chaine', 0, '', $conf->entity);
+	$res = dolibarr_set_const($db, "MEMBER_COUNTERS_ARE_PUBLIC", $publiccounters, 'chaine', 0, '', $conf->entity);
 	$res = dolibarr_set_const($db, "MEMBER_NEWFORM_PAYONLINE", $payonline, 'chaine', 0, '', $conf->entity);
 	if ($forcetype < 0) {
 		$res = dolibarr_del_const($db, "MEMBER_NEWFORM_FORCETYPE", $conf->entity);
@@ -216,6 +218,13 @@ if (!empty($conf->global->MEMBER_ENABLE_PUBLIC)) {
 	print $form->selectyesno("MEMBER_NEWFORM_EDITAMOUNT", (!empty($conf->global->MEMBER_NEWFORM_EDITAMOUNT) ? $conf->global->MEMBER_NEWFORM_EDITAMOUNT : 0), 1);
 	print "</td></tr>\n";
 
+	// SHow counter of validated members publicly 
+	print '<tr class="oddeven" id="tredit"><td>';
+	print $langs->trans("MemberCountersArePublic");
+	print '</td><td>';
+	print $form->selectyesno("MEMBER_COUNTERS_ARE_PUBLIC", (!empty($conf->global->MEMBER_COUNTERS_ARE_PUBLIC) ? $conf->global->MEMBER_COUNTERS_ARE_PUBLIC : 0), 1);
+	print "</td></tr>\n";
+
 	// Jump to an online payment page
 	print '<tr class="oddeven" id="trpayment"><td>';
 	print $langs->trans("MEMBER_NEWFORM_PAYONLINE");
diff --git a/htdocs/langs/en_US/members.lang b/htdocs/langs/en_US/members.lang
index e4ca610c44f..aebe3affdae 100644
--- a/htdocs/langs/en_US/members.lang
+++ b/htdocs/langs/en_US/members.lang
@@ -15,6 +15,7 @@ ErrorMemberIsAlreadyLinkedToThisThirdParty=Another member (name: <b>%s</b>, logi
 ErrorUserPermissionAllowsToLinksToItselfOnly=For security reasons, you must be granted permissions to edit all users to be able to link a member to a user that is not yours.
 SetLinkToUser=Link to a Dolibarr user
 SetLinkToThirdParty=Link to a Dolibarr third party
+MemberCountersArePublic=Counters of valid members are public
 MembersCards=Generation of cards for members
 MembersList=List of members
 MembersListToValid=List of draft members (to be validated)
diff --git a/htdocs/public/members/new.php b/htdocs/public/members/new.php
index c409703862c..531bfcfd152 100644
--- a/htdocs/public/members/new.php
+++ b/htdocs/public/members/new.php
@@ -753,10 +753,14 @@ if (!empty($conf->global->MEMBER_SKIP_TABLE) || !empty($conf->global->MEMBER_NEW
 	foreach ($measuringUnits->records as $lines)
 		$units[$lines->short_label] = $langs->trans(ucfirst($lines->label));
 
-	$sql = "SELECT d.rowid, d.libelle as label, d.subscription, d.amount, d.caneditamount, d.vote, d.note, d.duration, d.statut as status, d.morphy";
+	$publiccounters = $conf->global->MEMBER_COUNTERS_ARE_PUBLIC;
+
+	$sql = "SELECT d.rowid, d.libelle as label, d.subscription, d.amount, d.caneditamount, d.vote, d.note, d.duration, d.statut as status, d.morphy, COUNT(a.rowid) AS membercount";
 	$sql .= " FROM ".MAIN_DB_PREFIX."adherent_type as d";
+	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."adherent as a";
+	$sql .= " ON d.rowid = a.fk_adherent_type AND a.statut>0";
 	$sql .= " WHERE d.entity IN (".getEntity('member_type').")";
-	$sql .= " AND d.statut=1";
+	$sql .= " AND d.statut=1 GROUP BY d.rowid";
 
 	$result = $db->query($sql);
 	if ($result) {
@@ -772,6 +776,7 @@ if (!empty($conf->global->MEMBER_SKIP_TABLE) || !empty($conf->global->MEMBER_NEW
 		print '<th class="center">'.$langs->trans("Amount").'</th>';
 		print '<th class="center">'.$langs->trans("MembersNature").'</th>';
 		print '<th class="center">'.$langs->trans("VoteAllowed").'</th>';
+		if($publiccounters) print '<th class="center">'.$langs->trans("Members").'</th>';
 		print '<th class="center">'.$langs->trans("NewSubscription").'</th>';
 		print "</tr>\n";
 
@@ -811,6 +816,8 @@ if (!empty($conf->global->MEMBER_SKIP_TABLE) || !empty($conf->global->MEMBER_NEW
 			}
 			print '</td>';
 			print '<td class="center">'.yn($objp->vote).'</td>';
+			$membercount = $objp->membercount>0? $objp->membercount: "–";
+			if($publiccounters) print '<td class="center">'.$membercount.'</td>';
 			print '<td class="center"><button class="button button-save reposition" name="typeid" type="submit" name="submit" value="'.$objp->rowid.'">'.$langs->trans("GetMembershipButtonLabel").'</button></td>';
 			print "</tr>";
 			$i++;

From 0427cce9b262a2062a4e6904ea1dda1db796a9f5 Mon Sep 17 00:00:00 2001
From: stickler-ci <support@stickler-ci.com>
Date: Fri, 26 Aug 2022 19:23:51 +0000
Subject: [PATCH 051/974] Fixing style errors.

---
 htdocs/adherents/admin/website.php | 2 +-
 htdocs/public/members/new.php      | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/htdocs/adherents/admin/website.php b/htdocs/adherents/admin/website.php
index b4c40936bbf..4ea40427de7 100644
--- a/htdocs/adherents/admin/website.php
+++ b/htdocs/adherents/admin/website.php
@@ -218,7 +218,7 @@ if (!empty($conf->global->MEMBER_ENABLE_PUBLIC)) {
 	print $form->selectyesno("MEMBER_NEWFORM_EDITAMOUNT", (!empty($conf->global->MEMBER_NEWFORM_EDITAMOUNT) ? $conf->global->MEMBER_NEWFORM_EDITAMOUNT : 0), 1);
 	print "</td></tr>\n";
 
-	// SHow counter of validated members publicly 
+	// SHow counter of validated members publicly
 	print '<tr class="oddeven" id="tredit"><td>';
 	print $langs->trans("MemberCountersArePublic");
 	print '</td><td>';
diff --git a/htdocs/public/members/new.php b/htdocs/public/members/new.php
index 531bfcfd152..25ad932456a 100644
--- a/htdocs/public/members/new.php
+++ b/htdocs/public/members/new.php
@@ -776,7 +776,7 @@ if (!empty($conf->global->MEMBER_SKIP_TABLE) || !empty($conf->global->MEMBER_NEW
 		print '<th class="center">'.$langs->trans("Amount").'</th>';
 		print '<th class="center">'.$langs->trans("MembersNature").'</th>';
 		print '<th class="center">'.$langs->trans("VoteAllowed").'</th>';
-		if($publiccounters) print '<th class="center">'.$langs->trans("Members").'</th>';
+		if ($publiccounters) print '<th class="center">'.$langs->trans("Members").'</th>';
 		print '<th class="center">'.$langs->trans("NewSubscription").'</th>';
 		print "</tr>\n";
 
@@ -817,7 +817,7 @@ if (!empty($conf->global->MEMBER_SKIP_TABLE) || !empty($conf->global->MEMBER_NEW
 			print '</td>';
 			print '<td class="center">'.yn($objp->vote).'</td>';
 			$membercount = $objp->membercount>0? $objp->membercount: "–";
-			if($publiccounters) print '<td class="center">'.$membercount.'</td>';
+			if ($publiccounters) print '<td class="center">'.$membercount.'</td>';
 			print '<td class="center"><button class="button button-save reposition" name="typeid" type="submit" name="submit" value="'.$objp->rowid.'">'.$langs->trans("GetMembershipButtonLabel").'</button></td>';
 			print "</tr>";
 			$i++;

From a4be13595e915586611fee9e4a395f4c106c5efd Mon Sep 17 00:00:00 2001
From: Yoan Mollard <ymollard@users.noreply.github.com>
Date: Wed, 3 Aug 2022 02:28:16 +0200
Subject: [PATCH 052/974] Fix: missing caneditamount choice during edition

---
 htdocs/adherents/type.php | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/htdocs/adherents/type.php b/htdocs/adherents/type.php
index b40d7772e99..b6463e006a9 100644
--- a/htdocs/adherents/type.php
+++ b/htdocs/adherents/type.php
@@ -178,6 +178,7 @@ if ($action == 'update' && $user->rights->adherent->configurer) {
 	$object->status	= (int) $status;
 	$object->subscription = (int) $subscription;
 	$object->amount = ($amount == '' ? '' : price2num($amount, 'MT'));
+	$object->caneditamount = $caneditamount;
 	$object->duration_value = $duration_value;
 	$object->duration_unit = $duration_unit;
 	$object->note = trim($comment);
@@ -828,6 +829,10 @@ if ($rowid > 0) {
 		print '">';
 		print '</td></tr>';
 
+		print '<tr><td>'.$form->textwithpicto($langs->trans("CanEditAmountShort"), $langs->transnoentities("CanEditAmountDetail")).'</td><td>';
+		print $form->selectyesno("caneditamount", $object->caneditamount);
+		print '</td></tr>';
+
 		print '<tr><td>'.$langs->trans("VoteAllowed").'</td><td>';
 		print $form->selectyesno("vote", $object->vote, 1);
 		print '</td></tr>';

From d88647f57406b31e3e87538e26d01f6cdeced6c9 Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Sat, 27 Aug 2022 05:39:27 +0200
Subject: [PATCH 053/974] Page name in description

---
 htdocs/takepos/admin/other.php   | 2 +-
 htdocs/takepos/admin/receipt.php | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/htdocs/takepos/admin/other.php b/htdocs/takepos/admin/other.php
index 64088473c69..6200fce8768 100644
--- a/htdocs/takepos/admin/other.php
+++ b/htdocs/takepos/admin/other.php
@@ -17,7 +17,7 @@
  */
 
 /**
- *	\file       htdocs/takepos/admin/setup.php
+ *	\file       htdocs/takepos/admin/other.php
  *	\ingroup    takepos
  *	\brief      Setup page for TakePos module
  */
diff --git a/htdocs/takepos/admin/receipt.php b/htdocs/takepos/admin/receipt.php
index 9fffef6ca0c..bc84c809c0e 100644
--- a/htdocs/takepos/admin/receipt.php
+++ b/htdocs/takepos/admin/receipt.php
@@ -19,7 +19,7 @@
  */
 
 /**
- *	\file       htdocs/takepos/admin/terminal.php
+ *	\file       htdocs/takepos/admin/receipt.php
  *	\ingroup    takepos
  *	\brief      Setup page for TakePos module
  */
@@ -69,7 +69,7 @@ if (GETPOST('action', 'alpha') == 'set') {
 } elseif (GETPOST('action', 'alpha') == 'setmethod') {
 	dolibarr_set_const($db, "TAKEPOS_PRINT_METHOD", GETPOST('value', 'alpha'), 'chaine', 0, '', $conf->entity);
 	// TakePOS connector require ReceiptPrinter module
-	if ($conf->global->TAKEPOS_PRINT_METHOD == "takeposconnector" && !isModEnabled('receiptprinter')) {
+	if ($conf->global->TAKEPOS_PRINT_METHOD == "takeposconnector" && isModEnabled('receiptprinter')) {
 		activateModule("modReceiptPrinter");
 	}
 }

From cca9dd6c81e47bbc967b7d162f15bba4a8e52f66 Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Sat, 27 Aug 2022 05:49:28 +0200
Subject: [PATCH 054/974] PHP8 Warnings

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

diff --git a/htdocs/core/lib/takepos.lib.php b/htdocs/core/lib/takepos.lib.php
index d8c380a0411..049c2308a22 100644
--- a/htdocs/core/lib/takepos.lib.php
+++ b/htdocs/core/lib/takepos.lib.php
@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2009       Laurent Destailleur <eldy@users.sourceforge.net>
- * Copyright (C) 2022       Alexandre Spangaro	<aspangaro@open-dsi.fr>
+ * Copyright (C) 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
@@ -54,8 +54,7 @@ function takepos_admin_prepare_head()
 	$head[$h][2] = 'bar';
 	$h++;
 
-	$numterminals = !empty($conf->global->TAKEPOS_NUM_TERMINALS) ? $conf->global->TAKEPOS_NUM_TERMINALS : 1;
-	$numterminals = max(1, $numterminals);
+	$numterminals = max(1, getDolGlobalInt('TAKEPOS_NUM_TERMINALS', 1));
 	for ($i = 1; $i <= $numterminals; $i++) {
 		$head[$h][0] = DOL_URL_ROOT.'/takepos/admin/terminal.php?terminal='.$i;
 		$head[$h][1] = $langs->trans("Terminal")." ".$i;

From f5e19ea1b9947b59d236f09e7212453f79ee364e Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Sat, 27 Aug 2022 06:33:33 +0200
Subject: [PATCH 055/974] PHP8 Warnings

---
 htdocs/takepos/admin/bar.php | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/htdocs/takepos/admin/bar.php b/htdocs/takepos/admin/bar.php
index db6d6c8c67d..2f37de1a1b0 100644
--- a/htdocs/takepos/admin/bar.php
+++ b/htdocs/takepos/admin/bar.php
@@ -1,6 +1,7 @@
 <?php
-/* Copyright (C) 2008-2011 Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) 2011-2017 Juanjo Menent		<jmenent@2byte.es>
+/* Copyright (C) 2008-2011  Laurent Destailleur <eldy@users.sourceforge.net>
+ * Copyright (C) 2011-2017  Juanjo Menent		<jmenent@2byte.es>
+ * Copyright (C) 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
@@ -67,7 +68,7 @@ if (GETPOST('action', 'alpha') == 'set') {
 	}
 }
 
-if ($conf->global->TAKEPOS_ORDER_NOTES == 1) {
+if (getDolGlobalInt('TAKEPOS_ORDER_NOTES') == 1) {
 	$extrafields = new ExtraFields($db);
 	$extrafields->addExtraField('order_notes', 'Order notes', 'varchar', 0, 255, 'facturedet', 0, 0, '', '', 0, '', 0, 1);
 }
@@ -79,6 +80,7 @@ if ($conf->global->TAKEPOS_ORDER_NOTES == 1) {
 $form = new Form($db);
 $formproduct = new FormProduct($db);
 
+$arrayofjs = array();
 $arrayofcss = array("/takepos/css/colorbox.css");
 
 llxHeader('', $langs->trans("CashDeskSetup"), '', '', 0, 0, $arrayofjs, $arrayofcss);
@@ -112,7 +114,7 @@ print '</center>';
 
 print '<br>';
 
-if ($conf->global->TAKEPOS_BAR_RESTAURANT) {
+if (getDolGlobalInt('TAKEPOS_BAR_RESTAURANT')) {
 	print '<br>';
 	print '<a href="" onclick="Floors(); return false;"><span class="fa fa-glass-cheers"></span> '.$langs->trans("DefineTablePlan").'</a><br>';
 	print '<br><br>';
@@ -171,12 +173,12 @@ if ($conf->global->TAKEPOS_BAR_RESTAURANT) {
 	print ajax_constantonoff("TAKEPOS_SUPPLEMENTS", array(), $conf->entity, 0, 0, 1, 0);
 	print '</td></tr>';
 
-	if ($conf->global->TAKEPOS_SUPPLEMENTS) {
+	if (getDolGlobalInt('TAKEPOS_SUPPLEMENTS')) {
 		print '<tr class="oddeven"><td>';
 		print $langs->trans("SupplementCategory");
 		print '</td>';
 		print '<td class="center">';
-		print $form->select_all_categories(Categorie::TYPE_PRODUCT, $conf->global->TAKEPOS_SUPPLEMENTS_CATEGORY, 'TAKEPOS_SUPPLEMENTS_CATEGORY', 64, 0, 0);
+		print $form->select_all_categories(Categorie::TYPE_PRODUCT, getDolGlobalString('TAKEPOS_SUPPLEMENTS_CATEGORY'), 'TAKEPOS_SUPPLEMENTS_CATEGORY', 64, 0, 0);
 		print ajax_combobox('TAKEPOS_SUPPLEMENTS_CATEGORY');
 		print "</td></tr>\n";
 	}
@@ -203,8 +205,8 @@ if ($conf->global->TAKEPOS_BAR_RESTAURANT) {
 	print $form->buttonsSaveCancel("Save", '');
 }
 
-if (!empty($conf->global->TAKEPOS_BAR_RESTAURANT)) {
-	if ($conf->global->TAKEPOS_QR_MENU) {
+if (getDolGlobalInt('TAKEPOS_BAR_RESTAURANT')) {
+	if (getDolGlobalInt('TAKEPOS_QR_MENU')) {
 		$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
 		print '<br>';
@@ -221,7 +223,7 @@ if (!empty($conf->global->TAKEPOS_BAR_RESTAURANT)) {
 		print '</table>';
 	}
 
-	if ($conf->global->TAKEPOS_AUTO_ORDER) {
+	if (getDolGlobalInt('TAKEPOS_AUTO_ORDER')) {
 		print '<br>';
 		print '<table class="noborder centpercent">';
 		print '<tr class="liste_titre">';

From ad788abdb853b7e2224c20fb04aeab33c3761332 Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Sat, 27 Aug 2022 06:35:19 +0200
Subject: [PATCH 056/974] Review Use Ajax constantonoff

---
 htdocs/takepos/admin/receipt.php | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/htdocs/takepos/admin/receipt.php b/htdocs/takepos/admin/receipt.php
index bf5f5e8b931..6c390aabe73 100644
--- a/htdocs/takepos/admin/receipt.php
+++ b/htdocs/takepos/admin/receipt.php
@@ -1,8 +1,9 @@
 <?php
-/* Copyright (C) 2008-2011 Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) 2011-2017 Juanjo Menent		<jmenent@2byte.es>
- * Copyright (C) 2019 Andreu Bisquerra Gaya		<jove@bisquerra.com>
- * Copyright (C) 2021    Nicolas ZABOURI    <info@inovea-conseil.com>
+/* Copyright (C) 2008-2011  Laurent Destailleur     <eldy@users.sourceforge.net>
+ * Copyright (C) 2011-2017  Juanjo Menent           <jmenent@2byte.es>
+ * Copyright (C) 2019       Andreu Bisquerra Gaya   <jove@bisquerra.com>
+ * Copyright (C) 2021       Nicolas ZABOURI         <info@inovea-conseil.com>
+ * Copyright (C) 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
@@ -47,10 +48,7 @@ if (GETPOST('action', 'alpha') == 'set') {
 	$res = dolibarr_set_const($db, "TAKEPOS_HEADER", GETPOST('TAKEPOS_HEADER', 'restricthtml'), 'chaine', 0, '', $conf->entity);
 	$res = dolibarr_set_const($db, "TAKEPOS_FOOTER", GETPOST('TAKEPOS_FOOTER', 'restricthtml'), 'chaine', 0, '', $conf->entity);
 	$res = dolibarr_set_const($db, "TAKEPOS_RECEIPT_NAME", GETPOST('TAKEPOS_RECEIPT_NAME', 'alpha'), 'chaine', 0, '', $conf->entity);
-	$res = dolibarr_set_const($db, "TAKEPOS_SHOW_CUSTOMER", GETPOST('TAKEPOS_SHOW_CUSTOMER', 'alpha'), 'chaine', 0, '', $conf->entity);
-	$res = dolibarr_set_const($db, "TAKEPOS_AUTO_PRINT_TICKETS", GETPOST('TAKEPOS_AUTO_PRINT_TICKETS', 'int'), 'int', 0, '', $conf->entity);
 	$res = dolibarr_set_const($db, "TAKEPOS_PRINT_SERVER", GETPOST('TAKEPOS_PRINT_SERVER', 'alpha'), 'chaine', 0, '', $conf->entity);
-	$res = dolibarr_set_const($db, "TAKEPOS_PRINT_PAYMENT_METHOD", GETPOST('TAKEPOS_PRINT_PAYMENT_METHOD', 'alpha'), 'chaine', 0, '', $conf->entity);
 	$res = dolibarr_set_const($db, 'TAKEPOS_PRINT_WITHOUT_DETAILS_LABEL_DEFAULT', GETPOST('TAKEPOS_PRINT_WITHOUT_DETAILS_LABEL_DEFAULT', 'alphanohtml'), 'chaine', 0, '', $conf->entity);
 
 	dol_syslog("admin/cashdesk: level ".GETPOST('level', 'alpha'));
@@ -221,14 +219,14 @@ if ($conf->global->TAKEPOS_PRINT_METHOD == "browser" || $conf->global->TAKEPOS_P
 	print '<tr class="oddeven"><td>';
 	print $langs->trans('PrintCustomerOnReceipts');
 	print '<td colspan="2">';
-	print $form->selectyesno("TAKEPOS_SHOW_CUSTOMER", $conf->global->TAKEPOS_SHOW_CUSTOMER, 1);
+	print ajax_constantonoff("TAKEPOS_SHOW_CUSTOMER", array(), $conf->entity, 0, 0, 1, 0);
 	print "</td></tr>\n";
 
 	// Print payment method
 	print '<tr class="oddeven"><td>';
 	print $langs->trans('PrintPaymentMethodOnReceipts');
 	print '<td colspan="2">';
-	print $form->selectyesno("TAKEPOS_PRINT_PAYMENT_METHOD", $conf->global->TAKEPOS_PRINT_PAYMENT_METHOD, 1);
+	print ajax_constantonoff("TAKEPOS_PRINT_PAYMENT_METHOD", array(), $conf->entity, 0, 0, 1, 0);
 	print "</td></tr>\n";
 }
 
@@ -236,7 +234,7 @@ if ($conf->global->TAKEPOS_PRINT_METHOD == "browser" || $conf->global->TAKEPOS_P
 print '<tr class="oddeven"><td>';
 print $langs->trans("AutoPrintTickets");
 print '<td colspan="2">';
-print $form->selectyesno("TAKEPOS_AUTO_PRINT_TICKETS", $conf->global->TAKEPOS_AUTO_PRINT_TICKETS, 1);
+print ajax_constantonoff("TAKEPOS_AUTO_PRINT_TICKETS", array(), $conf->entity, 0, 0, 1, 0);
 print "</td></tr>\n";
 
 

From b1662d535e8031195b5824fc60ad4c3a45627f63 Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Sat, 27 Aug 2022 06:35:47 +0200
Subject: [PATCH 057/974] Class css

---
 htdocs/takepos/admin/setup.php | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/htdocs/takepos/admin/setup.php b/htdocs/takepos/admin/setup.php
index 849c5c56481..c1e043e089a 100644
--- a/htdocs/takepos/admin/setup.php
+++ b/htdocs/takepos/admin/setup.php
@@ -1,7 +1,8 @@
 <?php
-/* Copyright (C) 2008-2011 Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) 2011-2017 Juanjo Menent		<jmenent@2byte.es>
- * Copyright (C) 2021    Nicolas ZABOURI    <info@inovea-conseil.com>
+/* Copyright (C) 2008-2011  Laurent Destailleur <eldy@users.sourceforge.net>
+ * Copyright (C) 2011-2017  Juanjo Menent       <jmenent@2byte.es>
+ * Copyright (C) 2021       Nicolas ZABOURI     <info@inovea-conseil.com>
+ * Copyright (C) 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
@@ -142,13 +143,13 @@ $dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
 
 print load_fiche_titre($langs->trans('CashDeskRefNumberingModules'), '', '');
 
-print '<table class="noborder" width="100%">';
+print '<table class="noborder centpercent">';
 print '<tr class="liste_titre">';
 print '<td>'.$langs->trans("Name")."</td>\n";
 print '<td>'.$langs->trans("Description")."</td>\n";
 print '<td class="nowrap">'.$langs->trans("Example")."</td>\n";
-print '<td align="center" width="60">'.$langs->trans("Status").'</td>';
-print '<td align="center" width="16">'.$langs->trans("ShortInfo").'</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();

From e36cc581ee97267955effe00d8afaa53b1acc2b2 Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Sat, 27 Aug 2022 08:19:33 +0200
Subject: [PATCH 058/974] PHP8 Warnings

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

diff --git a/htdocs/takepos/admin/setup.php b/htdocs/takepos/admin/setup.php
index c1e043e089a..a7a3183fa33 100644
--- a/htdocs/takepos/admin/setup.php
+++ b/htdocs/takepos/admin/setup.php
@@ -79,7 +79,7 @@ if ($action == 'set') {
 	$res = dolibarr_set_const($db, "TAKEPOS_NUM_TERMINALS", GETPOST('TAKEPOS_NUM_TERMINALS', 'alpha'), 'chaine', 0, '', $conf->entity);
 	$res = dolibarr_set_const($db, "TAKEPOS_ADDON", GETPOST('TAKEPOS_ADDON', 'alpha'), 'int', 0, '', $conf->entity);
 	$res = dolibarr_set_const($db, "TAKEPOS_EMAIL_TEMPLATE_INVOICE", GETPOST('TAKEPOS_EMAIL_TEMPLATE_INVOICE', 'alpha'), 'chaine', 0, '', $conf->entity);
-	if (!empty($conf->global->TAKEPOS_ENABLE_SUMUP)) {
+	if (getDolGlobalInt('TAKEPOS_ENABLE_SUMUP')) {
 		$res = dolibarr_set_const($db, "TAKEPOS_SUMUP_AFFILIATE", GETPOST('TAKEPOS_SUMUP_AFFILIATE', 'alpha'), 'chaine', 0, '', $conf->entity);
 		$res = dolibarr_set_const($db, "TAKEPOS_SUMUP_APPID", GETPOST('TAKEPOS_SUMUP_APPID', 'alpha'), 'chaine', 0, '', $conf->entity);
 	}
@@ -459,7 +459,7 @@ print '</div>';
 
 
 // Sumup options
-if ($conf->global->TAKEPOS_ENABLE_SUMUP) {
+if (getDolGlobalInt('TAKEPOS_ENABLE_SUMUP')) {
 	print '<br>';
 
 	print '<div class="div-table-responsive-no-min">';

From 612bedb03960cc18c42325ea0e8b01ebbb107eff Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Sat, 27 Aug 2022 08:19:39 +0200
Subject: [PATCH 059/974] PHP8 Warnings

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

diff --git a/htdocs/takepos/admin/terminal.php b/htdocs/takepos/admin/terminal.php
index f6562d81693..5a3bc212f05 100644
--- a/htdocs/takepos/admin/terminal.php
+++ b/htdocs/takepos/admin/terminal.php
@@ -1,6 +1,7 @@
 <?php
-/* Copyright (C) 2008-2011 Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) 2011-2017 Juanjo Menent		<jmenent@2byte.es>
+/* Copyright (C) 2008-2011  Laurent Destailleur <eldy@users.sourceforge.net>
+ * Copyright (C) 2011-2017  Juanjo Menent       <jmenent@2byte.es>
+ * Copyright (C) 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
@@ -73,7 +74,7 @@ if (GETPOST('action', 'alpha') == 'set') {
 	$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 (!empty($conf->global->TAKEPOS_ENABLE_SUMUP)) {
+	if (getDolGlobalInt('TAKEPOS_ENABLE_SUMUP')) {
 		$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) {
@@ -145,7 +146,7 @@ print "</tr>\n";
 
 print '<tr class="oddeven"><td class="fieldrequired">'.$langs->trans("CashDeskThirdPartyForSell").'</td>';
 print '<td>';
-print $form->select_company($conf->global->{'CASHDESK_ID_THIRDPARTY'.$terminaltouse}, 'socid', '(s.client IN (1, 3) AND s.status = 1)', 1, 0, 0, array(), 0);
+print $form->select_company(getDolGlobalInt('CASHDESK_ID_THIRDPARTY'.$terminaltouse), 'socid', '(s.client IN (1, 3) AND s.status = 1)', 1, 0, 0, array(), 0);
 print '</td></tr>';
 
 $atleastonefound = 0;
@@ -153,33 +154,33 @@ if (!empty($conf->banque->enabled)) {
 	print '<tr class="oddeven"><td>'.$langs->trans("CashDeskBankAccountForSell").'</td>';
 	print '<td>';
 	print img_picto('', 'bank_account', 'class="pictofixedwidth"');
-	$form->select_comptes($conf->global->{'CASHDESK_ID_BANKACCOUNT_CASH'.$terminaltouse}, 'CASHDESK_ID_BANKACCOUNT_CASH'.$terminaltouse, 0, "courant=2", 1);
-	if (!empty($conf->global->{'CASHDESK_ID_BANKACCOUNT_CASH'.$terminaltouse})) {
+	$form->select_comptes(getDolGlobalInt('CASHDESK_ID_BANKACCOUNT_CASH'.$terminaltouse), 'CASHDESK_ID_BANKACCOUNT_CASH'.$terminaltouse, 0, "courant=2", 1);
+	if (getDolGlobalInt('CASHDESK_ID_BANKACCOUNT_CASH'.$terminaltouse)) {
 		$atleastonefound++;
 	}
 	print '</td></tr>';
 	print '<tr class="oddeven"><td>'.$langs->trans("CashDeskBankAccountForCheque").'</td>';
 	print '<td>';
 	print img_picto('', 'bank_account', 'class="pictofixedwidth"');
-	$form->select_comptes($conf->global->{'CASHDESK_ID_BANKACCOUNT_CHEQUE'.$terminaltouse}, 'CASHDESK_ID_BANKACCOUNT_CHEQUE'.$terminaltouse, 0, "courant=1", 1);
-	if (!empty($conf->global->{'CASHDESK_ID_BANKACCOUNT_CHEQUE'.$terminaltouse})) {
+	$form->select_comptes(getDolGlobalInt('CASHDESK_ID_BANKACCOUNT_CHEQUE'.$terminaltouse), 'CASHDESK_ID_BANKACCOUNT_CHEQUE'.$terminaltouse, 0, "courant=1", 1);
+	if (getDolGlobalInt('CASHDESK_ID_BANKACCOUNT_CHEQUE'.$terminaltouse)) {
 		$atleastonefound++;
 	}
 	print '</td></tr>';
 	print '<tr class="oddeven"><td>'.$langs->trans("CashDeskBankAccountForCB").'</td>';
 	print '<td>';
 	print img_picto('', 'bank_account', 'class="pictofixedwidth"');
-	$form->select_comptes($conf->global->{'CASHDESK_ID_BANKACCOUNT_CB'.$terminaltouse}, 'CASHDESK_ID_BANKACCOUNT_CB'.$terminaltouse, 0, "courant=1", 1);
-	if (!empty($conf->global->{'CASHDESK_ID_BANKACCOUNT_CB'.$terminaltouse})) {
+	$form->select_comptes(getDolGlobalInt('CASHDESK_ID_BANKACCOUNT_CB'.$terminaltouse), 'CASHDESK_ID_BANKACCOUNT_CB'.$terminaltouse, 0, "courant=1", 1);
+	if (getDolGlobalInt('CASHDESK_ID_BANKACCOUNT_CB'.$terminaltouse)) {
 		$atleastonefound++;
 	}
 	print '</td></tr>';
-	if ($conf->global->TAKEPOS_ENABLE_SUMUP) {
+	if (getDolGlobalInt('TAKEPOS_ENABLE_SUMUP')) {
 		print '<tr class="oddeven"><td>'.$langs->trans("CashDeskBankAccountForSumup").'</td>';
 		print '<td>';
 		print img_picto('', 'bank_account', 'class="pictofixedwidth"');
-		$form->select_comptes($conf->global->{'CASHDESK_ID_BANKACCOUNT_SUMUP'.$terminaltouse}, 'CASHDESK_ID_BANKACCOUNT_SUMUP'.$terminaltouse, 0, "courant=1", 1);
-		if (!empty($conf->global->{'CASHDESK_ID_BANKACCOUNT_SUMUP'.$terminaltouse})) {
+		$form->select_comptes(getDolGlobalInt('CASHDESK_ID_BANKACCOUNT_SUMUP'.$terminaltouse), 'CASHDESK_ID_BANKACCOUNT_SUMUP'.$terminaltouse, 0, "courant=1", 1);
+		if (getDolGlobalInt('CASHDESK_ID_BANKACCOUNT_SUMUP'.$terminaltouse)) {
 			$atleastonefound++;
 		}
 		print '</td></tr>';
@@ -197,7 +198,7 @@ if (!empty($conf->banque->enabled)) {
 		}
 		$cour = preg_match('/^LIQ.*/', $modep->code) ? 2 : 1;
 		print img_picto('', 'bank_account', 'class="pictofixedwidth"');
-		$form->select_comptes($conf->global->$name, $name, 0, "courant=".$cour, 1);
+		$form->select_comptes(getDolGlobalInt($name), $name, 0, "courant=".$cour, 1);
 		print '</td></tr>';
 	}
 }
@@ -205,10 +206,10 @@ if (!empty($conf->banque->enabled)) {
 if (!empty($conf->stock->enabled)) {
 	print '<tr class="oddeven"><td>'.$langs->trans("CashDeskDoNotDecreaseStock").'</td>'; // Force warehouse (this is not a default value)
 	print '<td>';
-	if (empty($conf->productbatch->enabled) || !empty($conf->global->CASHDESK_FORCE_DECREASE_STOCK)) {
-		print $form->selectyesno('CASHDESK_NO_DECREASE_STOCK'.$terminal, $conf->global->{'CASHDESK_NO_DECREASE_STOCK'.$terminal}, 1);
+	if (empty($conf->productbatch->enabled) || getDolGlobalInt('CASHDESK_FORCE_DECREASE_STOCK')) {
+		print $form->selectyesno('CASHDESK_NO_DECREASE_STOCK'.$terminal, getDolGlobalInt('CASHDESK_NO_DECREASE_STOCK'.$terminal), 1);
 	} else {
-		if (!$conf->global->{'CASHDESK_NO_DECREASE_STOCK'.$terminal}) {
+		if (getDolGlobalInt('CASHDESK_NO_DECREASE_STOCK'.$terminal)) {
 			$res = dolibarr_set_const($db, "CASHDESK_NO_DECREASE_STOCK".$terminal, 1, 'chaine', 0, '', $conf->entity);
 		}
 		print $langs->trans("Yes").'<br>';
@@ -286,11 +287,11 @@ if ($conf->global->TAKEPOS_PRINT_METHOD == "receiptprinter" || $conf->global->TA
 
 print '<tr class="oddeven"><td>'.$langs->trans('CashDeskReaderKeyCodeForEnter').'</td>';
 print '<td>';
-print '<input type="text" name="CASHDESK_READER_KEYCODE_FOR_ENTER'.$terminaltouse.'" value="'.$conf->global->{'CASHDESK_READER_KEYCODE_FOR_ENTER'.$terminaltouse}.'" />';
+print '<input type="text" name="CASHDESK_READER_KEYCODE_FOR_ENTER'.$terminaltouse.'" value="'.getDolGlobalString('CASHDESK_READER_KEYCODE_FOR_ENTER'.$terminaltouse).'" />';
 print '</td></tr>';
 
 // Numbering module
-if ($conf->global->TAKEPOS_ADDON == "terminal") {
+if (getDolGlobalString('TAKEPOS_ADDON') == "terminal") {
 	print '<tr class="oddeven"><td>';
 	print $langs->trans("BillsNumberingModule");
 	print '<td colspan="2">';
@@ -379,7 +380,7 @@ if (empty($conf->global->PDF_ALLOW_HTML_FOR_FREE_TEXT)) {
 	print '<textarea name="'.$variablename.'" class="flat" cols="120">'.$conf->global->{$variablename}.'</textarea>';
 } else {
 	include_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
-	$doleditor = new DolEditor($variablename, $conf->global->{$variablename}, '', 80, 'dolibarr_notes');
+	$doleditor = new DolEditor($variablename, getDolGlobalString($variablename), '', 80, 'dolibarr_notes');
 	print $doleditor->Create();
 }
 print '</td></tr>';
@@ -395,7 +396,7 @@ if (empty($conf->global->PDF_ALLOW_HTML_FOR_FREE_TEXT)) {
 	print '<textarea name="'.$variablename.'" class="flat" cols="120">'.$conf->global->{$variablename}.'</textarea>';
 } else {
 	include_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
-	$doleditor = new DolEditor($variablename, $conf->global->{$variablename}, '', 80, 'dolibarr_notes');
+	$doleditor = new DolEditor($variablename, getDolGlobalString($variablename), '', 80, 'dolibarr_notes');
 	print $doleditor->Create();
 }
 print '</td></tr>';

From 4543aeeff04ac999b0915a243024cebef05d34a4 Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Sat, 27 Aug 2022 08:19:49 +0200
Subject: [PATCH 060/974] PHP8 Warnings

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

diff --git a/htdocs/takepos/pay.php b/htdocs/takepos/pay.php
index 40d873654c6..a1b01867a3f 100644
--- a/htdocs/takepos/pay.php
+++ b/htdocs/takepos/pay.php
@@ -425,7 +425,7 @@ while ($i < count($arrayOfValidPaymentModes)) {
 }
 
 $keyforsumupbank = "CASHDESK_ID_BANKACCOUNT_SUMUP".$_SESSION["takeposterminal"];
-if ($conf->global->TAKEPOS_ENABLE_SUMUP) {
+if (getDolGlobalInt('TAKEPOS_ENABLE_SUMUP')) {
 	if (!empty($conf->global->$keyforsumupbank)) {
 		print '<button type="button" class="calcbutton2" onclick="ValidateSumup();">Sumup</button>';
 	} else {

From 375f400565da72d9cf0a4f80abf94cfc36582c1d Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Sat, 27 Aug 2022 08:28:39 +0200
Subject: [PATCH 061/974] PHP8 Warnings

---
 htdocs/takepos/admin/receipt.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/htdocs/takepos/admin/receipt.php b/htdocs/takepos/admin/receipt.php
index 6c390aabe73..47a23262b3b 100644
--- a/htdocs/takepos/admin/receipt.php
+++ b/htdocs/takepos/admin/receipt.php
@@ -118,14 +118,14 @@ print $langs->trans('DolibarrReceiptPrinter');
 print '<td>';
 print $langs->trans('ReceiptPrinterMethodDescription');
 if ($conf->receiptprinter->enabled) {
-	if ($conf->global->TAKEPOS_PRINT_METHOD == "receiptprinter") {
+	if (getDolGlobalString('TAKEPOS_PRINT_METHOD') == "receiptprinter") {
 		print '<br>';
 		print img_picto('', 'printer', 'class="paddingright"').'<a href="'.DOL_URL_ROOT.'/admin/receiptprinter.php">'.$langs->trans("Setup").'</a>';
 	}
 }
 print '</td><td class="right">';
 if ($conf->receiptprinter->enabled) {
-	if ($conf->global->TAKEPOS_PRINT_METHOD == "receiptprinter") {
+	if (getDolGlobalString('TAKEPOS_PRINT_METHOD') == "receiptprinter") {
 		print img_picto($langs->trans("Activated"), 'switch_on');
 	} else {
 		print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=setmethod&token='.newToken().'&value=receiptprinter">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
@@ -146,7 +146,7 @@ print $langs->trans('TakeposConnectorMethodDescription');
 if ($conf->global->TAKEPOS_PRINT_METHOD == "takeposconnector") {
 	print '<br>';
 	print $langs->trans("URL")." / ".$langs->trans("IPAddress").' (<a href="http://en.takepos.com/connector" target="_blank" rel="noopener noreferrer external">'.$langs->trans("TakeposConnectorNecesary").'</a>)';
-	print ' <input type="text" class="minwidth200" id="TAKEPOS_PRINT_SERVER" name="TAKEPOS_PRINT_SERVER" value="'.$conf->global->TAKEPOS_PRINT_SERVER.'">';
+	print ' <input type="text" class="minwidth200" id="TAKEPOS_PRINT_SERVER" name="TAKEPOS_PRINT_SERVER" value="'.getDolGlobalString('TAKEPOS_PRINT_SERVER').'">';
 }
 
 print '</td><td class="right">';
@@ -245,7 +245,7 @@ print '<td colspan="2">';
 print ajax_constantonoff("TAKEPOS_SHOW_HT_RECEIPT", array(), $conf->entity, 0, 0, 1, 0);
 print "</td></tr>\n";
 
-if ($conf->global->TAKEPOS_PRINT_METHOD == "takeposconnector" && filter_var($conf->global->TAKEPOS_PRINT_SERVER, FILTER_VALIDATE_URL) == true) {
+if (getDolGlobalString('TAKEPOS_PRINT_METHOD') == "takeposconnector" && filter_var(getDolGlobalString('TAKEPOS_PRINT_SERVER'), FILTER_VALIDATE_URL) == true) {
 	print '<tr class="oddeven"><td>';
 	print $langs->trans('WeighingScale');
 	print '<td colspan="2">';
@@ -253,7 +253,7 @@ if ($conf->global->TAKEPOS_PRINT_METHOD == "takeposconnector" && filter_var($con
 	print "</td></tr>\n";
 }
 
-if ($conf->global->TAKEPOS_PRINT_METHOD == "takeposconnector" && filter_var($conf->global->TAKEPOS_PRINT_SERVER, FILTER_VALIDATE_URL) == true) {
+if ($conf->global->TAKEPOS_PRINT_METHOD == "takeposconnector" && filter_var(getDolGlobalString('TAKEPOS_PRINT_SERVER'), FILTER_VALIDATE_URL) == true) {
 	print '<tr class="oddeven"><td>';
 	print $langs->trans('CustomerDisplay');
 	print '<td colspan="2">';

From 138e087737fe95b966c1e9e42886581150fe4c18 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 27 Aug 2022 11:45:02 +0200
Subject: [PATCH 062/974] Fix phpcs

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

diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 718c6372481..0107dd8641d 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -1918,6 +1918,7 @@ class Form
 	 *  @param  int     		$noactive       Show only active users (this will also happened whatever is this option if USER_HIDE_INACTIVE_IN_COMBOBOX is on).
 	 *  @param  int				$outputmode     0=HTML select string, 1=Array
 	 *  @param  bool			$multiple       add [] in the name of element and add 'multiple' attribut
+	 *  @param  int				$forcecombo     Force the component to be a simple combo box without ajax
 	 * 	@return	string							HTML select string
 	 *  @see select_dolgroups()
 	 */

From 765b8053cf2f0c968378e65136672a9f5936e442 Mon Sep 17 00:00:00 2001
From: UT from dolibit <45215329+dolibit-ut@users.noreply.github.com>
Date: Sat, 27 Aug 2022 12:21:01 +0200
Subject: [PATCH 063/974] Update card.php

---
 htdocs/commande/card.php | 101 +++++++++++++++++++++------------------
 1 file changed, 54 insertions(+), 47 deletions(-)

diff --git a/htdocs/commande/card.php b/htdocs/commande/card.php
index b7ef455f515..a13f6706aa7 100644
--- a/htdocs/commande/card.php
+++ b/htdocs/commande/card.php
@@ -30,59 +30,64 @@
  */
 
 /**
- * \file 	htdocs/commande/card.php
- * \ingroup commande
- * \brief 	Page to show customer order
+ *   \file      htdocs/commande/card.php
+ *   \ingroup   commande
+ *   \brief     Page to show customer order
  */
 
 require '../main.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formorder.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formmargin.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/modules/commande/modules_commande.php';
-require_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
-require_once DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/order.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/order.lib.php';
+
+require_once DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php';
+require_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
+
 if (isModEnabled("propal")) {
 	require_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php';
-}
-if (!empty($conf->project->enabled)) {
-	require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
-	require_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php';
-}
+	}
 
-require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
+if (!empty($conf->project->enabled)) {
+	require_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php';
+	require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
+	}
 
 if (!empty($conf->variants->enabled)) {
 	require_once DOL_DOCUMENT_ROOT.'/variants/class/ProductCombination.class.php';
-}
+	}
+
 
 // Load translation files required by the page
 $langs->loadLangs(array('orders', 'sendings', 'companies', 'bills', 'propal', 'deliveries', 'products', 'other'));
+
 if (!empty($conf->incoterm->enabled)) {
 	$langs->load('incoterm');
-}
+	}
 if (!empty($conf->margin->enabled)) {
 	$langs->load('margins');
-}
+	}
 if (!empty($conf->productbatch->enabled)) {
-	$langs->load("productbatch");
-}
+	$langs->load('productbatch');
+	}
 
-$id = (GETPOST('id', 'int') ? GETPOST('id', 'int') : GETPOST('orderid', 'int'));
-$ref = GETPOST('ref', 'alpha');
-$socid = GETPOST('socid', 'int');
-$action = GETPOST('action', 'aZ09');
-$cancel = GETPOST('cancel', 'alpha');
-$confirm = GETPOST('confirm', 'alpha');
-$lineid = GETPOST('lineid', 'int');
-$contactid = GETPOST('contactid', 'int');
-$projectid = GETPOST('projectid', 'int');
-$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;
+
+$id        = (GETPOST('id', 'int') ? GETPOST('id', 'int') : GETPOST('orderid', 'int'));
+$ref       =  GETPOST('ref', 'alpha');
+$socid     =  GETPOST('socid', 'int');
+$action    =  GETPOST('action', 'aZ09');
+$cancel    =  GETPOST('cancel', 'alpha');
+$confirm   =  GETPOST('confirm', 'alpha');
+$lineid    =  GETPOST('lineid', 'int');
+$contactid =  GETPOST('contactid', 'int');
+$projectid =  GETPOST('projectid', 'int');
+$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;
 
 // PDF
 $hidedetails = (GETPOST('hidedetails', 'int') ? GETPOST('hidedetails', 'int') : (!empty($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_DETAILS) ? 1 : 0));
@@ -106,25 +111,27 @@ $extrafields = new ExtraFields($db);
 $extrafields->fetch_name_optionals_label($object->table_element);
 
 // Load object
-include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be include, not include_once
+include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php';     // Must be include, not include_once
+
+// Permissions / Rights
+$usercanread    =  $user->hasRight("commande", "lire");
+$usercancreate  =  $user->hasRight("commande", "creer");
+$usercandelete  =  $user->hasRight("commande", "supprimer");
 
-$usercanread = $user->hasRight("commande", "lire");
-$usercancreate = $user->hasRight("commande", "creer");
-$usercandelete = $user->hasRight("commande", "supprimer");
 // Advanced permissions
+$usercanclose       =  ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($usercancreate)) || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && $user->hasRight('commande', 'order_advance', 'close')));
+$usercanvalidate    =  ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && $usercancreate) || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && $user->hasRight('commande', 'order_advance', 'validate')));
+$usercancancel      =  ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && $usercancreate) || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && $user->hasRight('commande', 'order_advance', 'annuler')));
+$usercansend        =   (empty($conf->global->MAIN_USE_ADVANCED_PERMS) || $user->hasRight('commande', 'order_advance', 'send'));
+$usercangeneretedoc =   (empty($conf->global->MAIN_USE_ADVANCED_PERMS) || $user->hasRight('commande', 'order_advance', 'generetedoc'));
 
-$usercanclose = ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($usercancreate)) || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && $user->hasRight('commande', 'order_advance', 'close')));
-$usercanvalidate = ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && $usercancreate) || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && $user->hasRight('commande', 'order_advance', 'validate')));
-$usercancancel = ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && $usercancreate) || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && $user->hasRight('commande', 'order_advance', 'annuler')));
-$usercansend = (empty($conf->global->MAIN_USE_ADVANCED_PERMS) || $user->hasRight('commande', 'order_advance', 'send'));
-$usercangeneretedoc = (empty($conf->global->MAIN_USE_ADVANCED_PERMS) || $user->hasRight('commande', 'order_advance', 'generetedoc'));
-
-$usermustrespectpricemin = ((!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && empty($user->rights->produit->ignore_price_min_advance)) || empty($conf->global->MAIN_USE_ADVANCED_PERMS));
+$usermustrespectpricemin    = ((!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && empty($user->rights->produit->ignore_price_min_advance)) || empty($conf->global->MAIN_USE_ADVANCED_PERMS));
 $usercancreatepurchaseorder = ($user->hasRight('fournisseur', 'commande', 'creer') || $user->hasRight('supplier_order', 'creer'));
 
-$permissionnote = $usercancreate; // Used by the include of actions_setnotes.inc.php
-$permissiondellink = $usercancreate; // Used by the include of actions_dellink.inc.php
-$permissiontoadd = $usercancreate; // Used by the include of actions_addupdatedelete.inc.php and actions_lineupdown.inc.php
+$permissionnote    = $usercancreate;     //  Used by the include of actions_setnotes.inc.php
+$permissiondellink = $usercancreate;     //  Used by the include of actions_dellink.inc.php
+$permissiontoadd   = $usercancreate;     //  Used by the include of actions_addupdatedelete.inc.php and actions_lineupdown.inc.php
+
 
 $error = 0;
 
@@ -166,11 +173,11 @@ if (empty($reshook)) {
 		$action = '';
 	}
 
-	include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be include, not include_once
+	include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php';    // Must be include, not include_once
 
-	include DOL_DOCUMENT_ROOT.'/core/actions_dellink.inc.php'; // Must be include, not include_once
+	include DOL_DOCUMENT_ROOT.'/core/actions_dellink.inc.php';     // Must be include, not include_once
 
-	include DOL_DOCUMENT_ROOT.'/core/actions_lineupdown.inc.php'; // Must be include, not include_once
+	include DOL_DOCUMENT_ROOT.'/core/actions_lineupdown.inc.php';  // Must be include, not include_once
 
 	// Action clone object
 	if ($action == 'confirm_clone' && $confirm == 'yes' && $usercancreate) {

From 2ee2dfeea2b0b22936e4598b243400e6ce9f9d7c Mon Sep 17 00:00:00 2001
From: stickler-ci <support@stickler-ci.com>
Date: Sat, 27 Aug 2022 10:26:09 +0000
Subject: [PATCH 064/974] Fixing style errors.

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

diff --git a/htdocs/commande/card.php b/htdocs/commande/card.php
index a13f6706aa7..b97bf147dbb 100644
--- a/htdocs/commande/card.php
+++ b/htdocs/commande/card.php
@@ -50,16 +50,16 @@ require_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
 
 if (isModEnabled("propal")) {
 	require_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php';
-	}
+}
 
 if (!empty($conf->project->enabled)) {
 	require_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php';
 	require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
-	}
+}
 
 if (!empty($conf->variants->enabled)) {
 	require_once DOL_DOCUMENT_ROOT.'/variants/class/ProductCombination.class.php';
-	}
+}
 
 
 // Load translation files required by the page
@@ -67,13 +67,13 @@ $langs->loadLangs(array('orders', 'sendings', 'companies', 'bills', 'propal', 'd
 
 if (!empty($conf->incoterm->enabled)) {
 	$langs->load('incoterm');
-	}
+}
 if (!empty($conf->margin->enabled)) {
 	$langs->load('margins');
-	}
+}
 if (!empty($conf->productbatch->enabled)) {
 	$langs->load('productbatch');
-	}
+}
 
 
 $id        = (GETPOST('id', 'int') ? GETPOST('id', 'int') : GETPOST('orderid', 'int'));

From 434f0a786b8e2542858fbef06d449270b13ad3cd Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 27 Aug 2022 12:27:47 +0200
Subject: [PATCH 065/974] Clean code

---
 htdocs/zapier/admin/setup.php         |  1 -
 htdocs/zapier/lib/zapier_hook.lib.php | 91 ---------------------------
 2 files changed, 92 deletions(-)
 delete mode 100644 htdocs/zapier/lib/zapier_hook.lib.php

diff --git a/htdocs/zapier/admin/setup.php b/htdocs/zapier/admin/setup.php
index 58ede898f17..90e2b8b8283 100644
--- a/htdocs/zapier/admin/setup.php
+++ b/htdocs/zapier/admin/setup.php
@@ -98,7 +98,6 @@ if ($action == 'edit') {
 
 	print '</form>';
 	print '<br>';
-	
 } else {
 	if (!empty($arrayofparameters)) {
 		print '<table class="noborder centpercent">';
diff --git a/htdocs/zapier/lib/zapier_hook.lib.php b/htdocs/zapier/lib/zapier_hook.lib.php
deleted file mode 100644
index 260cb8847e2..00000000000
--- a/htdocs/zapier/lib/zapier_hook.lib.php
+++ /dev/null
@@ -1,91 +0,0 @@
-<?php
-/* Copyright (C) ---Put here your own copyright and developer email---
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-/**
- * \file    htdocs/zapier/lib/zapier_hook.lib.php
- * \ingroup zapier
- * \brief   Library files with common functions for Zapier
- */
-
-/**
- * Prepare array of tabs for MyObject
- *
- * @param	MyObject	$object		MyObject
- * @return 	array					Array of tabs
- */
-
-function myobjectPrepareHead($object)
-{
-	global $db, $langs, $conf;
-
-	$langs->load("mymodule@mymodule");
-
-	$h = 0;
-	$head = array();
-
-	$head[$h][0] = dol_buildpath("/mymodule/myobject_card.php", 1).'?id='.$object->id;
-	$head[$h][1] = $langs->trans("Card");
-	$head[$h][2] = 'card';
-	$h++;
-
-	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++;
-		}
-		$head[$h][0] = dol_buildpath('/mymodule/myobject_note.php', 1).'?id='.$object->id;
-		$head[$h][1] = $langs->trans('Notes');
-		if ($nbNote > 0) {
-			$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->mymodule->dir_output."/myobject/".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("/mymodule/myobject_document.php", 1).'?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][2] = 'document';
-	$h++;
-
-	$head[$h][0] = dol_buildpath("/mymodule/myobject_agenda.php", 1).'?id='.$object->id;
-	$head[$h][1] = $langs->trans("Events");
-	$head[$h][2] = 'agenda';
-	$h++;
-
-	// Show more tabs from modules
-	// Entries must be declared in modules descriptor with line
-	//$this->tabs = array(
-	//	'entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__'
-	//); // to add new tab
-	//$this->tabs = array(
-	//	'entity:-tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__'
-	//); // to remove a tab
-	complete_head_from_modules($conf, $langs, $object, $head, $h, 'myobject@mymodule');
-
-	return $head;
-}

From 9bd7c28ffceff75417a58d86f5388a4cc7d474ed Mon Sep 17 00:00:00 2001
From: UT from dolibit <45215329+dolibit-ut@users.noreply.github.com>
Date: Sat, 27 Aug 2022 12:32:36 +0200
Subject: [PATCH 066/974] Update card.php

add section seperators

// General $Variables
// Permissions
// Advanced Permissions

..
---
 htdocs/compta/facture/card.php | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/htdocs/compta/facture/card.php b/htdocs/compta/facture/card.php
index c5d1bf2d8bf..2db9644b115 100644
--- a/htdocs/compta/facture/card.php
+++ b/htdocs/compta/facture/card.php
@@ -37,11 +37,13 @@
  * \brief 	Page to create/see an invoice
  */
 
+// require & require_once
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture-rec.class.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/paiement/class/paiement.class.php';
+
 require_once DOL_DOCUMENT_ROOT.'/core/modules/facture/modules_facture.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/discount.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
@@ -51,6 +53,7 @@ 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';
 require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
+
 if (!empty($conf->commande->enabled)) {
 	require_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
 }
@@ -69,16 +72,19 @@ if (!empty($conf->accounting->enabled)) {
 
 // Load translation files required by the page
 $langs->loadLangs(array('bills', 'companies', 'compta', 'products', 'banks', 'main', 'withdrawals'));
+
 if (!empty($conf->incoterm->enabled)) {
 	$langs->load('incoterm');
 }
+
 if (!empty($conf->margin->enabled)) {
 	$langs->load('margins');
 }
 
+// General $Variables
 $projectid = (GETPOST('projectid', 'int') ? GETPOST('projectid', 'int') : 0);
 
-$id = (GETPOST('id', 'int') ? GETPOST('id', 'int') : GETPOST('facid', 'int')); // For backward compatibility
+$id = (GETPOST('id', 'int') ? GETPOST('id', 'int') : GETPOST('facid', 'int'));    // For backward compatibility
 $ref = GETPOST('ref', 'alpha');
 $socid = GETPOST('socid', 'int');
 $action = GETPOST('action', 'aZ09');
@@ -102,7 +108,7 @@ $hidedetails = (GETPOST('hidedetails', 'int') ? GETPOST('hidedetails', 'int') :
 $hidedesc = (GETPOST('hidedesc', 'int') ? GETPOST('hidedesc', 'int') : (!empty($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_DESC) ? 1 : 0));
 $hideref = (GETPOST('hideref', 'int') ? GETPOST('hideref', 'int') : (!empty($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_REF) ? 1 : 0));
 
-// Nombre de ligne pour choix de produit/service predefinis
+// Number of lines for predefined product/service choices
 $NBLINES = 4;
 
 $usehm = (!empty($conf->global->MAIN_USE_HOURMIN_IN_DATE_RANGE) ? $conf->global->MAIN_USE_HOURMIN_IN_DATE_RANGE : 0);
@@ -128,11 +134,14 @@ if ($id > 0 || !empty($ref)) {
 // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $hookmanager->initHooks(array('invoicecard', 'globalcard'));
 
+// Permissions
 $usercanread = $user->hasRight("facture", "lire");
 $usercancreate = $user->hasRight("facture", "creer");
 $usercanissuepayment = $user->hasRight("facture", "paiement");
 $usercandelete = $user->hasRight("facture", "supprimer");
 $usercancreatecontract = $user->hasRight("contrat", "creer");
+
+// Advanced Permissions
 $usercanvalidate = ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && $usercancreate) || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->facture->invoice_advance->validate)));
 $usercansend = (empty($conf->global->MAIN_USE_ADVANCED_PERMS) || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->facture->invoice_advance->send)));
 $usercanreopen = ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && $usercancreate) || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->facture->invoice_advance->reopen)));

From 2134201b4b4ab767ad594778e35ffd6383e3da6a Mon Sep 17 00:00:00 2001
From: UT from dolibit <45215329+dolibit-ut@users.noreply.github.com>
Date: Sat, 27 Aug 2022 12:41:36 +0200
Subject: [PATCH 067/974] Update card.php

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

diff --git a/htdocs/compta/facture/card.php b/htdocs/compta/facture/card.php
index 2db9644b115..f9075a76211 100644
--- a/htdocs/compta/facture/card.php
+++ b/htdocs/compta/facture/card.php
@@ -37,7 +37,7 @@
  * \brief 	Page to create/see an invoice
  */
 
-// require & require_once
+// Libraries
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture-rec.class.php';

From 452c77e48e8701e7666392adb2d9568930d5eb3c Mon Sep 17 00:00:00 2001
From: UT from dolibit <45215329+dolibit-ut@users.noreply.github.com>
Date: Sat, 27 Aug 2022 12:48:31 +0200
Subject: [PATCH 068/974] Update conferenceorbooth_contact.php

---
 htdocs/eventorganization/conferenceorbooth_contact.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/htdocs/eventorganization/conferenceorbooth_contact.php b/htdocs/eventorganization/conferenceorbooth_contact.php
index 57f2a76c042..33b8f633b3a 100644
--- a/htdocs/eventorganization/conferenceorbooth_contact.php
+++ b/htdocs/eventorganization/conferenceorbooth_contact.php
@@ -35,8 +35,9 @@ require_once DOL_DOCUMENT_ROOT.'/eventorganization/lib/eventorganization_confere
 require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 
 // Load translation files required by the page
-$langs->loadLangs(array("eventorganization", "projects", "companies", "other", "mails"));
+$langs->loadLangs(array('companies', 'eventorganization', 'mails', 'others', 'projects'));
 
+// Variables GET
 $id = GETPOST('id', 'int');
 $ref    = GETPOST('ref', 'alpha');
 $lineid = GETPOST('lineid', 'int');
@@ -51,12 +52,14 @@ $backtopageforcancel = GETPOST('backtopageforcancel', 'alpha');
 
 $withproject = GETPOST('withproject', 'int');
 
+
 // Initialize technical objects
 $object = new ConferenceOrBooth($db);
 $extrafields = new ExtraFields($db);
 $projectstatic = new Project($db);
 $diroutputmassaction = $conf->eventorganization->dir_output.'/temp/massgeneration/'.$user->id;
 $hookmanager->initHooks(array('conferenceorboothcontact', 'globalcard')); // Note that conf->hooks_modules contains array
+
 // Fetch optionals attributes and labels
 $extrafields->fetch_name_optionals_label($object->table_element);
 
@@ -69,6 +72,7 @@ include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be includ
 if ($user->socid > 0) {
 	accessforbidden();
 }
+
 $isdraft = (($object->status== $object::STATUS_DRAFT) ? 1 : 0);
 $result = restrictedArea($user, 'eventorganization', $object->id, '', '', 'fk_soc', 'rowid', $isdraft);
 

From 0a4778bb2da7f21903e43f5c012916480c872d3f Mon Sep 17 00:00:00 2001
From: UT from dolibit <45215329+dolibit-ut@users.noreply.github.com>
Date: Sat, 27 Aug 2022 13:08:11 +0200
Subject: [PATCH 069/974] Update workstation_card.php

---
 htdocs/workstation/workstation_card.php | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/htdocs/workstation/workstation_card.php b/htdocs/workstation/workstation_card.php
index 31530a50f9b..280478c2977 100644
--- a/htdocs/workstation/workstation_card.php
+++ b/htdocs/workstation/workstation_card.php
@@ -77,11 +77,13 @@ if (empty($action) && empty($id) && empty($ref)) {
 // Load object
 include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be include, not include_once.
 
-$permissiontoread = $user->rights->workstation->workstation->read;
-$permissiontoadd = $user->rights->workstation->workstation->write; // Used by the include of actions_addupdatedelete.inc.php and actions_lineupdown.inc.php
-$permissiontodelete = $user->rights->workstation->workstation->delete || ($permissiontoadd && isset($object->status) && $object->status == $object::STATUS_DRAFT);
-$permissionnote = $user->rights->workstation->workstation->write; // Used by the include of actions_setnotes.inc.php
-$permissiondellink = $user->rights->workstation->workstation->write; // Used by the include of actions_dellink.inc.php
+// Permissions
+$permissiontoread   =  $user->rights->workstation->workstation->read;
+$permissiontoadd    =  $user->rights->workstation->workstation->write;      // Used by the include of actions_addupdatedelete.inc.php and actions_lineupdown.inc.php
+$permissiontodelete =  $user->rights->workstation->workstation->delete || ($permissiontoadd && isset($object->status) && $object->status == $object::STATUS_DRAFT);
+$permissionnote     =  $user->rights->workstation->workstation->write;      // Used by the include of actions_setnotes.inc.php
+$permissiondellink  =  $user->rights->workstation->workstation->write;      // Used by the include of actions_dellink.inc.php
+
 $upload_dir = $conf->workstation->multidir_output[isset($object->entity) ? $object->entity : 1];
 
 // Security check
@@ -94,7 +96,7 @@ restrictedArea($user, $object->element, $object->id, $object->table_element, 'wo
  */
 
 $parameters = array();
-$reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
+$reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action);   // Note that $action and $object may have been modified by some hooks
 if ($reshook < 0) {
 	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 }
@@ -114,7 +116,7 @@ if (empty($reshook)) {
 		}
 	}
 
-	$triggermodname = 'WORKSTATION_WORKSTATION_MODIFY'; // Name of trigger action code to execute when we modify record
+	$triggermodname = 'WORKSTATION_WORKSTATION_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';

From e44cbffd68c3c0a2eeadb1954cf527b3450dbef3 Mon Sep 17 00:00:00 2001
From: UT from dolibit <45215329+dolibit-ut@users.noreply.github.com>
Date: Sat, 27 Aug 2022 13:27:37 +0200
Subject: [PATCH 070/974] Update partnership.modules.php

public $name = 'PartnershipThirdpartiesOrMembers';

($sourcetype == 'thirdparty')
---
 .../modules/mailings/partnership.modules.php     | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/htdocs/core/modules/mailings/partnership.modules.php b/htdocs/core/modules/mailings/partnership.modules.php
index 7813d93f54d..7a1f8759e32 100644
--- a/htdocs/core/modules/mailings/partnership.modules.php
+++ b/htdocs/core/modules/mailings/partnership.modules.php
@@ -1,4 +1,5 @@
 <?php
+
 /* Copyright (C) 2018-2018 Andre Schild        <a.schild@aarboard.ch>
  * Copyright (C) 2005-2010 Laurent Destailleur <eldy@users.sourceforge.net>
  * Copyright (C) 2005-2009 Regis Houssin       <regis.houssin@inodbox.com>
@@ -16,6 +17,8 @@
  *	\brief      Example file to provide a list of recipients for mailing module
  */
 
+
+// Load Dolibarr Environment
 include_once DOL_DOCUMENT_ROOT.'/core/modules/mailings/modules_mailings.php';
 
 
@@ -24,9 +27,10 @@ include_once DOL_DOCUMENT_ROOT.'/core/modules/mailings/modules_mailings.php';
  */
 class mailing_partnership extends MailingTargets
 {
-	public $name = 'PartnershipThirdartiesOrMembers';
 	// This label is used if no translation is found for key XXX neither MailingModuleDescXXX where XXX=name is found
+	public $name = 'PartnershipThirdpartiesOrMembers';
 	public $desc = "Thirdparties or members included into a partnership program";
+	
 	public $require_admin = 0;
 
 	public $require_module = array(); // This module allows to select by categories must be also enabled if category module is not activated
@@ -49,10 +53,11 @@ class mailing_partnership extends MailingTargets
 	 *
 	 *  @param		DoliDB		$db      Database handler
 	 */
+	
 	public function __construct($db)
 	{
 		global $conf, $langs;
-		$langs->load("companies");
+		$langs->load('companies');
 
 		$this->db = $db;
 	}
@@ -65,6 +70,7 @@ class mailing_partnership extends MailingTargets
 	 *    @param	int		$mailing_id    	Id of mailing. No need to use it.
 	 *    @return   int 					<0 if error, number of emails added if ok
 	 */
+	
 	public function add_to_target($mailing_id)
 	{
 		// phpcs:enable
@@ -151,6 +157,7 @@ class mailing_partnership extends MailingTargets
 	 *
 	 *	@return		array		Array with SQL requests
 	 */
+	
 	public function getSqlArrayForStats()
 	{
 		// CHANGE THIS: Optionnal
@@ -169,6 +176,7 @@ class mailing_partnership extends MailingTargets
 	 *  @param      string			$sql        Requete sql de comptage
 	 *  @return     int|string      			Nb of recipient, or <0 if error, or '' if NA
 	 */
+	
 	public function getNbOfRecipients($sql = '')
 	{
 		global $conf;
@@ -218,7 +226,7 @@ class mailing_partnership extends MailingTargets
 			$num = $this->db->num_rows($resql);
 
 			if (empty($conf->partnership->enabled)) {
-				$num = 0; // Force empty list if category module is not enabled
+				$num = 0;   // Force empty list if category module is not enabled
 			}
 
 			if ($num) {
@@ -253,7 +261,7 @@ class mailing_partnership extends MailingTargets
 	 */
 	public function url($id, $sourcetype = 'thirdparty')
 	{
-		if ($sourcetype == 'thirparty') {
+		if ($sourcetype == 'thirdparty') {
 			return '<a href="'.DOL_URL_ROOT.'/societe/card.php?socid='.((int) $id).'">'.img_object('', "societe").'</a>';
 		}
 		if ($sourcetype == 'member') {

From c0db4e6289f32734f285489583b4b6c049a072d0 Mon Sep 17 00:00:00 2001
From: stickler-ci <support@stickler-ci.com>
Date: Sat, 27 Aug 2022 11:31:55 +0000
Subject: [PATCH 071/974] Fixing style errors.

---
 htdocs/core/modules/mailings/partnership.modules.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/htdocs/core/modules/mailings/partnership.modules.php b/htdocs/core/modules/mailings/partnership.modules.php
index 7a1f8759e32..5f8469f339e 100644
--- a/htdocs/core/modules/mailings/partnership.modules.php
+++ b/htdocs/core/modules/mailings/partnership.modules.php
@@ -30,7 +30,7 @@ class mailing_partnership extends MailingTargets
 	// This label is used if no translation is found for key XXX neither MailingModuleDescXXX where XXX=name is found
 	public $name = 'PartnershipThirdpartiesOrMembers';
 	public $desc = "Thirdparties or members included into a partnership program";
-	
+
 	public $require_admin = 0;
 
 	public $require_module = array(); // This module allows to select by categories must be also enabled if category module is not activated
@@ -53,7 +53,7 @@ class mailing_partnership extends MailingTargets
 	 *
 	 *  @param		DoliDB		$db      Database handler
 	 */
-	
+
 	public function __construct($db)
 	{
 		global $conf, $langs;
@@ -70,7 +70,7 @@ class mailing_partnership extends MailingTargets
 	 *    @param	int		$mailing_id    	Id of mailing. No need to use it.
 	 *    @return   int 					<0 if error, number of emails added if ok
 	 */
-	
+
 	public function add_to_target($mailing_id)
 	{
 		// phpcs:enable
@@ -157,7 +157,7 @@ class mailing_partnership extends MailingTargets
 	 *
 	 *	@return		array		Array with SQL requests
 	 */
-	
+
 	public function getSqlArrayForStats()
 	{
 		// CHANGE THIS: Optionnal
@@ -176,7 +176,7 @@ class mailing_partnership extends MailingTargets
 	 *  @param      string			$sql        Requete sql de comptage
 	 *  @return     int|string      			Nb of recipient, or <0 if error, or '' if NA
 	 */
-	
+
 	public function getNbOfRecipients($sql = '')
 	{
 		global $conf;

From d6f7115b42fb8ab39b916e40a6e67b5f9a897b9b Mon Sep 17 00:00:00 2001
From: UT from dolibit <45215329+dolibit-ut@users.noreply.github.com>
Date: Sat, 27 Aug 2022 13:37:06 +0200
Subject: [PATCH 072/974] Update index.php

line 937  ->  'help'=>'LinkToThirdparty'),
---
 htdocs/modulebuilder/index.php | 44 ++++++++++++++++++----------------
 1 file changed, 23 insertions(+), 21 deletions(-)

diff --git a/htdocs/modulebuilder/index.php b/htdocs/modulebuilder/index.php
index dd922e6cba4..5d633589d29 100644
--- a/htdocs/modulebuilder/index.php
+++ b/htdocs/modulebuilder/index.php
@@ -42,12 +42,13 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/utils.class.php';
 // Load translation files required by the page
 $langs->loadLangs(array("admin", "modulebuilder", "other", "cron", "errors"));
 
-$action = GETPOST('action', 'aZ09');
+// GET Parameters
+$action  = GETPOST('action', 'aZ09');
 $confirm = GETPOST('confirm', 'alpha');
-$cancel = GETPOST('cancel', 'alpha');
+$cancel  = GETPOST('cancel', 'alpha');
 
-$sortfield=GETPOST('sortfield', 'alpha');
-$sortorder=GETPOST('sortorder', 'alpha');
+$sortfield = GETPOST('sortfield', 'alpha');
+$sortorder = GETPOST('sortorder', 'alpha');
 
 $module = GETPOST('module', 'alpha');
 $tab = GETPOST('tab', 'aZ09');
@@ -123,6 +124,7 @@ $form = new Form($db);
 
 // Define $listofmodules
 $dirsrootforscan = array($dirread);
+
 // Add also the core modules into the list of modules to show/edit
 if ($dirread != DOL_DOCUMENT_ROOT && ($conf->global->MAIN_FEATURES_LEVEL >= 2 || !empty($conf->global->MODULEBUILDER_ADD_DOCUMENT_ROOT))) {
 	$dirsrootforscan[] = DOL_DOCUMENT_ROOT;
@@ -927,23 +929,23 @@ if ($dirins && $action == 'initobject' && $module && GETPOST('createtablearray',
 		 */
 
 		/*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'=>20),
-		 'label'         =>array('type'=>'varchar(255)', 'label'=>'Label',            'enabled'=>1, 'visible'=>1,  'position'=>30,  'searchall'=>1, 'css'=>'minwidth200', 'help'=>'Help text'),
-		 'amount'        =>array('type'=>'double(24,8)', 'label'=>'Amount',           'enabled'=>1, 'visible'=>1,  'default'=>'null', 'position'=>40,  'searchall'=>0, 'isameasure'=>1, 'help'=>'Help text'),
-		 'fk_soc' 		 =>array('type'=>'integer:Societe:societe/class/societe.class.php', 'label'=>'ThirdParty', 'visible'=>1, 'enabled'=>1, 'position'=>50, 'notnull'=>-1, 'index'=>1, 'searchall'=>1, 'help'=>'LinkToThirparty'),
-		 'description'   =>array('type'=>'text',			'label'=>'Descrption',		 'enabled'=>1, 'visible'=>0,  'position'=>60),
-		 'note_public'   =>array('type'=>'html',			'label'=>'NotePublic',		 'enabled'=>1, 'visible'=>0,  'position'=>61),
-		 'note_private'  =>array('type'=>'html',			'label'=>'NotePrivate',		 'enabled'=>1, 'visible'=>0,  'position'=>62),
-		 'date_creation' =>array('type'=>'datetime',     'label'=>'DateCreation',     'enabled'=>1, 'visible'=>-2, 'notnull'=>1,  'position'=>500),
-		 'tms'           =>array('type'=>'timestamp',    'label'=>'DateModification', 'enabled'=>1, 'visible'=>-2, 'notnull'=>1,  'position'=>501),
-		 //'date_valid'    =>array('type'=>'datetime',     'label'=>'DateCreation',     'enabled'=>1, 'visible'=>-2, 'position'=>502),
-		 'fk_user_creat' =>array('type'=>'integer',      'label'=>'UserAuthor',       'enabled'=>1, 'visible'=>-2, 'notnull'=>1,  'position'=>510),
-		 '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),
-		 'import_key'    =>array('type'=>'varchar(14)',  'label'=>'ImportId',         'enabled'=>1, 'visible'=>-2, 'notnull'=>-1, 'index'=>0,  'position'=>1000),
-		 'status'        =>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')),
+		 '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'=>20),
+		 'label'          =>array('type'=>'varchar(255)',   'label'=>'Label',            'enabled'=>1, 'visible'=>1,  'position'=>30,  'searchall'=>1, 'css'=>'minwidth200', 'help'=>'Help text'),
+		 'amount'         =>array('type'=>'double(24,8)',   'label'=>'Amount',           'enabled'=>1, 'visible'=>1,  'default'=>'null', 'position'=>40,  'searchall'=>0, 'isameasure'=>1, 'help'=>'Help text'),
+		 'fk_soc'         =>array('type'=>'integer:Societe:societe/class/societe.class.php', 'label'=>'ThirdParty', 'visible'=>1, 'enabled'=>1, 'position'=>50, 'notnull'=>-1, 'index'=>1, 'searchall'=>1, 'help'=>'LinkToThirdparty'),
+		 'description'    =>array('type'=>'text',			'label'=>'Descrption',		 'enabled'=>1, 'visible'=>0,  'position'=>60),
+		 'note_public'    =>array('type'=>'html',			'label'=>'NotePublic',		 'enabled'=>1, 'visible'=>0,  'position'=>61),
+		 'note_private'   =>array('type'=>'html',			'label'=>'NotePrivate',		 'enabled'=>1, 'visible'=>0,  'position'=>62),
+		 'date_creation'  =>array('type'=>'datetime',       'label'=>'DateCreation',     'enabled'=>1, 'visible'=>-2, 'notnull'=>1,  'position'=>500),
+		 'tms'            =>array('type'=>'timestamp',      'label'=>'DateModification', 'enabled'=>1, 'visible'=>-2, 'notnull'=>1,  'position'=>501),
+	   //'date_valid'     =>array('type'=>'datetime',       'label'=>'DateCreation',     'enabled'=>1, 'visible'=>-2, 'position'=>502),
+		 'fk_user_creat'  =>array('type'=>'integer',        'label'=>'UserAuthor',       'enabled'=>1, 'visible'=>-2, 'notnull'=>1,  'position'=>510),
+		 '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),
+		 'import_key'     =>array('type'=>'varchar(14)',    'label'=>'ImportId',         'enabled'=>1, 'visible'=>-2, 'notnull'=>-1, 'index'=>0,  'position'=>1000),
+		 'status'         =>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')),
 		 );*/
 
 		$string = 'public $fields=array('."\n";

From b8f4433ec826fc086c7b86f437cb7e63251cfe18 Mon Sep 17 00:00:00 2001
From: stickler-ci <support@stickler-ci.com>
Date: Sat, 27 Aug 2022 11:41:55 +0000
Subject: [PATCH 073/974] Fixing style errors.

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

diff --git a/htdocs/modulebuilder/index.php b/htdocs/modulebuilder/index.php
index 5d633589d29..0762d95d154 100644
--- a/htdocs/modulebuilder/index.php
+++ b/htdocs/modulebuilder/index.php
@@ -940,10 +940,10 @@ if ($dirins && $action == 'initobject' && $module && GETPOST('createtablearray',
 		 'note_private'   =>array('type'=>'html',			'label'=>'NotePrivate',		 'enabled'=>1, 'visible'=>0,  'position'=>62),
 		 'date_creation'  =>array('type'=>'datetime',       'label'=>'DateCreation',     'enabled'=>1, 'visible'=>-2, 'notnull'=>1,  'position'=>500),
 		 'tms'            =>array('type'=>'timestamp',      'label'=>'DateModification', 'enabled'=>1, 'visible'=>-2, 'notnull'=>1,  'position'=>501),
-	   //'date_valid'     =>array('type'=>'datetime',       'label'=>'DateCreation',     'enabled'=>1, 'visible'=>-2, 'position'=>502),
+		//'date_valid'     =>array('type'=>'datetime',       'label'=>'DateCreation',     'enabled'=>1, 'visible'=>-2, 'position'=>502),
 		 'fk_user_creat'  =>array('type'=>'integer',        'label'=>'UserAuthor',       'enabled'=>1, 'visible'=>-2, 'notnull'=>1,  'position'=>510),
 		 '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),
+		//'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'=>-2, 'notnull'=>-1, 'index'=>0,  'position'=>1000),
 		 'status'         =>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')),
 		 );*/

From 98d3c246e55fb84e26ae71b2394ff9aafc8a678f Mon Sep 17 00:00:00 2001
From: UT from dolibit <45215329+dolibit-ut@users.noreply.github.com>
Date: Sat, 27 Aug 2022 13:43:58 +0200
Subject: [PATCH 074/974] Update inventory.class.php

line 766 -> 'help'=>'LinkToThirdparty'),
---
 .../inventory/class/inventory.class.php       | 49 +++++++++----------
 1 file changed, 23 insertions(+), 26 deletions(-)

diff --git a/htdocs/product/inventory/class/inventory.class.php b/htdocs/product/inventory/class/inventory.class.php
index d7d167035a7..4bbbecf4dfb 100644
--- a/htdocs/product/inventory/class/inventory.class.php
+++ b/htdocs/product/inventory/class/inventory.class.php
@@ -33,6 +33,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/commonobjectline.class.php';
 /**
  * Class for Inventory
  */
+
 class Inventory extends CommonObject
 {
 	/**
@@ -60,10 +61,10 @@ class Inventory extends CommonObject
 	 */
 	public $picto = 'inventory';
 
-	const STATUS_DRAFT = 0;			// Draft
+	const STATUS_DRAFT     = 0;		// Draft
 	const STATUS_VALIDATED = 1;		// Inventory is in process
-	const STATUS_RECORDED = 2;		// Inventory is finisged. Stock movement has been recorded.
-	const STATUS_CANCELED = 9;		// Canceled
+	const STATUS_RECORDED  = 2;		// Inventory is finisged. Stock movement has been recorded.
+	const STATUS_CANCELED  = 9;		// Canceled
 
 	/**
 	 *  'type' field format ('integer', 'integer:ObjectClass:PathToClass[:AddCreateButtonOrNot[:Filter]]', 'sellist:TableName:LabelFieldName[:KeyFieldName[:KeyFieldParent[:Filter]]]', 'varchar(x)', 'double(24,8)', 'real', 'price', 'text', 'text:none', 'html', 'date', 'datetime', 'timestamp', 'duration', 'mail', 'phone', 'url', 'password')
@@ -96,23 +97,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'=>'maxwidth200'),
-		'entity'         => array('type'=>'integer', 'label'=>'Entity', 'visible'=>0, 'enabled'=>1, 'position'=>20, 'notnull'=>1, 'index'=>1,),
-		'title'          => array('type'=>'varchar(255)', 'label'=>'Label', 'visible'=>1, 'enabled'=>1, 'position'=>25, 'css'=>'minwidth300', 'csslist'=>'tdoverflowmax200'),
-		'fk_warehouse'   => array('type'=>'integer:Entrepot:product/stock/class/entrepot.class.php', 'label'=>'Warehouse', 'visible'=>1, 'enabled'=>1, 'position'=>30, 'index'=>1, 'help'=>'InventoryForASpecificWarehouse', 'picto'=>'stock', 'css'=>'minwidth300 maxwidth500 widthcentpercentminusx', 'csslist'=>'tdoverflowmax200'),
-		'fk_product'     => array('type'=>'integer:Product:product/class/product.class.php', 'label'=>'Product', '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'=>'tdoverflowmax200'),
+		'rowid'              => array('type'=>'integer', 'label'=>'TechnicalID', 'visible'=>-1, 'enabled'=>1, 'position'=>1, 'notnull'=>1, 'index'=>1, 'comment'=>'Id',),
+		'ref'                => array('type'=>'varchar(64)', 'label'=>'Ref', 'visible'=>1, 'enabled'=>1, 'position'=>10, 'notnull'=>1, 'index'=>1, 'searchall'=>1, 'comment'=>'Reference of object', 'css'=>'maxwidth200'),
+		'entity'             => array('type'=>'integer', 'label'=>'Entity', 'visible'=>0, 'enabled'=>1, 'position'=>20, 'notnull'=>1, 'index'=>1,),
+		'title'              => array('type'=>'varchar(255)', 'label'=>'Label', 'visible'=>1, 'enabled'=>1, 'position'=>25, 'css'=>'minwidth300', 'csslist'=>'tdoverflowmax200'),
+		'fk_warehouse'       => array('type'=>'integer:Entrepot:product/stock/class/entrepot.class.php', 'label'=>'Warehouse', 'visible'=>1, 'enabled'=>1, 'position'=>30, 'index'=>1, 'help'=>'InventoryForASpecificWarehouse', 'picto'=>'stock', 'css'=>'minwidth300 maxwidth500 widthcentpercentminusx', 'csslist'=>'tdoverflowmax200'),
+		'fk_product'         => array('type'=>'integer:Product:product/class/product.class.php', 'label'=>'Product', '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'=>'tdoverflowmax200'),
 		'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),	// This date is not used so disabled by default.
-		'date_creation' => array('type'=>'datetime', 'label'=>'DateCreation', 'enabled'=>1, 'visible'=>-2, 'notnull'=>1, 'position'=>500),
-		'tms'           => array('type'=>'timestamp', 'label'=>'DateModification', 'enabled'=>1, 'visible'=>-2, 'notnull'=>1, 'position'=>501),
-		'date_validation' => array('type'=>'datetime', 'label'=>'DateValidation', 'visible'=>-2, 'enabled'=>1, 'position'=>502),
-		'fk_user_creat' => array('type'=>'integer:User:user/class/user.class.php', 'label'=>'UserAuthor', 'enabled'=>1, 'visible'=>-2, 'notnull'=>1, 'position'=>510, 'foreignkey'=>'user.rowid', 'csslist'=>'tdoverflowmax200'),
-		'fk_user_modif' => array('type'=>'integer:User:user/class/user.class.php', 'label'=>'UserModif', 'enabled'=>1, 'visible'=>-2, 'notnull'=>-1, 'position'=>511, 'csslist'=>'tdoverflowmax200'),
-		'fk_user_valid' => array('type'=>'integer:User:user/class/user.class.php', 'label'=>'UserValidation', 'visible'=>-2, 'enabled'=>1, 'position'=>512, 'csslist'=>'tdoverflowmax200'),
-		'import_key'    => array('type'=>'varchar(14)', 'label'=>'ImportId', 'enabled'=>1, 'visible'=>-2, 'notnull'=>-1, 'index'=>0, 'position'=>1000),
-
-		'status' => array('type'=>'integer', 'label'=>'Status', 'visible'=>4, 'enabled'=>1, 'position'=>1000, 'notnull'=>1, 'default'=>0, 'index'=>1, 'arrayofkeyval'=>array(0=>'Draft', 1=>'Validated', 2=>'Closed', 9=>'Canceled'))
+		'date_inventory'     => array('type'=>'date', 'label'=>'DateValue', 'visible'=>1, 'enabled'=>'$conf->global->STOCK_INVENTORY_ADD_A_VALUE_DATE', 'position'=>35),	// This date is not used so disabled by default.
+		'date_creation'      => array('type'=>'datetime', 'label'=>'DateCreation', 'enabled'=>1, 'visible'=>-2, 'notnull'=>1, 'position'=>500),
+		'tms'                => array('type'=>'timestamp', 'label'=>'DateModification', 'enabled'=>1, 'visible'=>-2, 'notnull'=>1, 'position'=>501),
+		'date_validation'    => array('type'=>'datetime', 'label'=>'DateValidation', 'visible'=>-2, 'enabled'=>1, 'position'=>502),
+		'fk_user_creat'      => array('type'=>'integer:User:user/class/user.class.php', 'label'=>'UserAuthor', 'enabled'=>1, 'visible'=>-2, 'notnull'=>1, 'position'=>510, 'foreignkey'=>'user.rowid', 'csslist'=>'tdoverflowmax200'),
+		'fk_user_modif'      => array('type'=>'integer:User:user/class/user.class.php', 'label'=>'UserModif', 'enabled'=>1, 'visible'=>-2, 'notnull'=>-1, 'position'=>511, 'csslist'=>'tdoverflowmax200'),
+		'fk_user_valid'      => array('type'=>'integer:User:user/class/user.class.php', 'label'=>'UserValidation', 'visible'=>-2, 'enabled'=>1, 'position'=>512, 'csslist'=>'tdoverflowmax200'),
+		'import_key'         => array('type'=>'varchar(14)', 'label'=>'ImportId', 'enabled'=>1, 'visible'=>-2, 'notnull'=>-1, 'index'=>0, 'position'=>1000),
+		'status'             => array('type'=>'integer', 'label'=>'Status', 'visible'=>4, 'enabled'=>1, 'position'=>1000, 'notnull'=>1, 'default'=>0, 'index'=>1, 'arrayofkeyval'=>array(0=>'Draft', 1=>'Validated', 2=>'Closed', 9=>'Canceled'))
 	);
 
 	/**
@@ -144,7 +144,6 @@ class Inventory extends CommonObject
 	 * @var string Categories id separated by comma
 	 */
 	public $categories_product;
-
 	public $date_inventory;
 	public $title;
 
@@ -162,8 +161,6 @@ class Inventory extends CommonObject
 	 * @var integer|string date_validation
 	 */
 	public $date_validation;
-
-
 	public $tms;
 
 	/**
@@ -764,9 +761,9 @@ 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',),
+		'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'=>'LinkToThirparty'),
+		'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),
@@ -774,8 +771,8 @@ class InventoryLine extends CommonObjectLine
 		'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 aadded 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),
+		'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),
 	);
 
 	/**

From 48bef039a2c665f5d4aaed44f0ab29401ddc832d Mon Sep 17 00:00:00 2001
From: UT from dolibit <45215329+dolibit-ut@users.noreply.github.com>
Date: Sat, 27 Aug 2022 13:49:13 +0200
Subject: [PATCH 075/974] Update stocktransfer.class.php

line 113 ->  'help'=>"LinkToThirdparty"
---
 .../class/stocktransfer.class.php             | 56 +++++++++----------
 1 file changed, 28 insertions(+), 28 deletions(-)

diff --git a/htdocs/product/stock/stocktransfer/class/stocktransfer.class.php b/htdocs/product/stock/stocktransfer/class/stocktransfer.class.php
index 80e3f73b646..b642642b1a3 100644
--- a/htdocs/product/stock/stocktransfer/class/stocktransfer.class.php
+++ b/htdocs/product/stock/stocktransfer/class/stocktransfer.class.php
@@ -18,7 +18,7 @@
  */
 
 /**
- * \file        class/stocktransfer.class.php
+ * \file        htdocs/product/stock/stocktransfer/class/stocktransfer.class.php
  * \ingroup     stocktransfer
  * \brief       This file is a CRUD class file for StockTransfer (Create/Read/Update/Delete)
  */
@@ -68,10 +68,10 @@ class StockTransfer extends CommonObject
 	public $date_reelle_arrivee;
 
 
-	const STATUS_DRAFT = 0;
-	const STATUS_VALIDATED = 1;
+	const STATUS_DRAFT      = 0;
+	const STATUS_VALIDATED  = 1;
 	const STATUS_TRANSFERED = 2;
-	const STATUS_CLOSED = 3;
+	const STATUS_CLOSED     = 3;
 
 
 	/**
@@ -104,31 +104,31 @@ 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, 'css'=>'minwidth200'/*, 'help'=>"Help text"*/, 'showoncombobox'=>'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,),
-		'fk_soc' => array('type'=>'integer:Societe:societe/class/societe.class.php:1:status=1 AND entity IN (__SHARED_ENTITIES__)', 'label'=>'ThirdParty', 'enabled'=>'1', 'position'=>50, 'notnull'=>-1, 'visible'=>1, 'index'=>1/*, 'help'=>"LinkToThirparty"*/,),
-		'fk_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',),
+		'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, 'css'=>'minwidth200'/*, 'help'=>"Help text"*/, 'showoncombobox'=>'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,),
+		'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"*/,),
+		'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',),
 		'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'),
-		'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'),),
+		'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;

From b0539d0d1a5bb9698d5f75efbc78e324ad61727a Mon Sep 17 00:00:00 2001
From: UT from dolibit <45215329+dolibit-ut@users.noreply.github.com>
Date: Sat, 27 Aug 2022 13:51:33 +0200
Subject: [PATCH 076/974] Update api_thirdparties.class.php

---
 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 5021712c010..8038ed318b9 100644
--- a/htdocs/societe/class/api_thirdparties.class.php
+++ b/htdocs/societe/class/api_thirdparties.class.php
@@ -512,9 +512,10 @@ class Thirdparties extends DolibarrApi
 	/**
 	 * Delete thirdparty
 	 *
-	 * @param int $id   Thirparty ID
+	 * @param int $id   Thirdparty ID
 	 * @return integer
 	 */
+	
 	public function delete($id)
 	{
 		if (!DolibarrApiAccess::$user->rights->societe->supprimer) {

From c6c5ddd485a08b177f27c727771954d4763830a9 Mon Sep 17 00:00:00 2001
From: UT from dolibit <45215329+dolibit-ut@users.noreply.github.com>
Date: Sat, 27 Aug 2022 13:55:27 +0200
Subject: [PATCH 077/974] Update commande.class.php

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

diff --git a/htdocs/commande/class/commande.class.php b/htdocs/commande/class/commande.class.php
index 9a9f1d78df0..bf97deb3fd8 100644
--- a/htdocs/commande/class/commande.class.php
+++ b/htdocs/commande/class/commande.class.php
@@ -31,7 +31,7 @@
 /**
  *  \file       htdocs/commande/class/commande.class.php
  *  \ingroup    commande
- *  \brief      Fichier des classes de commandes
+ *  \brief      class for orders
  */
 include_once DOL_DOCUMENT_ROOT.'/core/class/commonorder.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/commonobjectline.class.php';
@@ -93,12 +93,12 @@ class Commande extends CommonOrder
 	protected $table_ref_field = 'ref';
 
 	/**
-	 * @var int Thirparty ID
+	 * @var int Thirdparty ID
 	 */
 	public $socid;
 
 	/**
-	 * @var string Thirparty ref of order
+	 * @var string Thirdparty ref of order
 	 */
 	public $ref_client;
 

From 3feb8db277e739c2a74ee3102e22fd3eab33388c Mon Sep 17 00:00:00 2001
From: stickler-ci <support@stickler-ci.com>
Date: Sat, 27 Aug 2022 11:56:26 +0000
Subject: [PATCH 078/974] Fixing style errors.

---
 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 8038ed318b9..e764de1ccc6 100644
--- a/htdocs/societe/class/api_thirdparties.class.php
+++ b/htdocs/societe/class/api_thirdparties.class.php
@@ -515,7 +515,7 @@ class Thirdparties extends DolibarrApi
 	 * @param int $id   Thirdparty ID
 	 * @return integer
 	 */
-	
+
 	public function delete($id)
 	{
 		if (!DolibarrApiAccess::$user->rights->societe->supprimer) {

From 98665b528dd8845c5c96c4d6303c2f1a4035be3a Mon Sep 17 00:00:00 2001
From: UT from dolibit <45215329+dolibit-ut@users.noreply.github.com>
Date: Sat, 27 Aug 2022 14:11:01 +0200
Subject: [PATCH 079/974] Update import_csv.modules.php

line 118 ->  $this->thirdpartyobject
and all following
---
 .../core/modules/import/import_csv.modules.php | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/htdocs/core/modules/import/import_csv.modules.php b/htdocs/core/modules/import/import_csv.modules.php
index 32284a2cbd1..426a582c3f4 100644
--- a/htdocs/core/modules/import/import_csv.modules.php
+++ b/htdocs/core/modules/import/import_csv.modules.php
@@ -115,7 +115,7 @@ class ImportCsv extends ModeleImports
 
 		$this->datatoimport = $datatoimport;
 		if (preg_match('/^societe_/', $datatoimport)) {
-			$this->thirpartyobject = new Societe($this->db);
+			$this->thirdpartyobject = new Societe($this->db);
 		}
 	}
 
@@ -560,8 +560,8 @@ class ImportCsv extends ModeleImports
 									}
 								} elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'getcustomercodeifauto') {
 									if (strtolower($newval) == 'auto') {
-										$this->thirpartyobject->get_codeclient(0, 0);
-										$newval = $this->thirpartyobject->code_client;
+										$this->thirdpartyobject->get_codeclient(0, 0);
+										$newval = $this->thirdpartyobject->code_client;
 										//print 'code_client='.$newval;
 									}
 									if (empty($newval)) {
@@ -569,8 +569,8 @@ class ImportCsv extends ModeleImports
 									}
 								} elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'getsuppliercodeifauto') {
 									if (strtolower($newval) == 'auto') {
-										$newval = $this->thirpartyobject->get_codefournisseur(0, 1);
-										$newval = $this->thirpartyobject->code_fournisseur;
+										$newval = $this->thirdpartyobject->get_codefournisseur(0, 1);
+										$newval = $this->thirdpartyobject->code_fournisseur;
 										//print 'code_fournisseur='.$newval;
 									}
 									if (empty($newval)) {
@@ -578,8 +578,8 @@ class ImportCsv extends ModeleImports
 									}
 								} elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'getcustomeraccountancycodeifauto') {
 									if (strtolower($newval) == 'auto') {
-										$this->thirpartyobject->get_codecompta('customer');
-										$newval = $this->thirpartyobject->code_compta;
+										$this->thirdpartyobject->get_codecompta('customer');
+										$newval = $this->thirdpartyobject->code_compta;
 										//print 'code_compta='.$newval;
 									}
 									if (empty($newval)) {
@@ -587,8 +587,8 @@ class ImportCsv extends ModeleImports
 									}
 								} elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'getsupplieraccountancycodeifauto') {
 									if (strtolower($newval) == 'auto') {
-										$this->thirpartyobject->get_codecompta('supplier');
-										$newval = $this->thirpartyobject->code_compta_fournisseur;
+										$this->thirdpartyobject->get_codecompta('supplier');
+										$newval = $this->thirdpartyobject->code_compta_fournisseur;
 										if (empty($newval)) {
 											$arrayrecord[($key - 1)]['type'] = -1; // If we get empty value, we will use "null"
 										}

From 527f8abe44cadd66fd0b1cdf91cabf55b5666778 Mon Sep 17 00:00:00 2001
From: UT from dolibit <45215329+dolibit-ut@users.noreply.github.com>
Date: Sat, 27 Aug 2022 14:13:46 +0200
Subject: [PATCH 080/974] Update import_xlsx.modules.php

line 136  ->  $this->thirdpartyobject
and all following
---
 .../modules/import/import_xlsx.modules.php     | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/htdocs/core/modules/import/import_xlsx.modules.php b/htdocs/core/modules/import/import_xlsx.modules.php
index d8a9d77a98e..6d7c5bf82fd 100644
--- a/htdocs/core/modules/import/import_xlsx.modules.php
+++ b/htdocs/core/modules/import/import_xlsx.modules.php
@@ -133,7 +133,7 @@ class ImportXlsx extends ModeleImports
 
 		$this->datatoimport = $datatoimport;
 		if (preg_match('/^societe_/', $datatoimport)) {
-			$this->thirpartyobject = new Societe($this->db);
+			$this->thirdpartyobject = new Societe($this->db);
 		}
 	}
 
@@ -604,8 +604,8 @@ class ImportXlsx extends ModeleImports
 									}
 								} elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'getcustomercodeifauto') {
 									if (strtolower($newval) == 'auto') {
-										$this->thirpartyobject->get_codeclient(0, 0);
-										$newval = $this->thirpartyobject->code_client;
+										$this->thirdpartyobject->get_codeclient(0, 0);
+										$newval = $this->thirdpartyobject->code_client;
 										//print 'code_client='.$newval;
 									}
 									if (empty($newval)) {
@@ -613,8 +613,8 @@ class ImportXlsx extends ModeleImports
 									}
 								} elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'getsuppliercodeifauto') {
 									if (strtolower($newval) == 'auto') {
-										$newval = $this->thirpartyobject->get_codefournisseur(0, 1);
-										$newval = $this->thirpartyobject->code_fournisseur;
+										$newval = $this->thirdpartyobject->get_codefournisseur(0, 1);
+										$newval = $this->thirdpartyobject->code_fournisseur;
 										//print 'code_fournisseur='.$newval;
 									}
 									if (empty($newval)) {
@@ -622,8 +622,8 @@ class ImportXlsx extends ModeleImports
 									}
 								} elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'getcustomeraccountancycodeifauto') {
 									if (strtolower($newval) == 'auto') {
-										$this->thirpartyobject->get_codecompta('customer');
-										$newval = $this->thirpartyobject->code_compta;
+										$this->thirdpartyobject->get_codecompta('customer');
+										$newval = $this->thirdpartyobject->code_compta;
 										//print 'code_compta='.$newval;
 									}
 									if (empty($newval)) {
@@ -631,8 +631,8 @@ class ImportXlsx extends ModeleImports
 									}
 								} elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'getsupplieraccountancycodeifauto') {
 									if (strtolower($newval) == 'auto') {
-										$this->thirpartyobject->get_codecompta('supplier');
-										$newval = $this->thirpartyobject->code_compta_fournisseur;
+										$this->thirdpartyobject->get_codecompta('supplier');
+										$newval = $this->thirdpartyobject->code_compta_fournisseur;
 										if (empty($newval)) {
 											$arrayrecord[($key)]['type'] = -1; // If we get empty value, we will use "null"
 										}

From dfbb41167beb4f8e73e0399e0c446a5c1e3af0a0 Mon Sep 17 00:00:00 2001
From: UT from dolibit <45215329+dolibit-ut@users.noreply.github.com>
Date: Sat, 27 Aug 2022 14:17:09 +0200
Subject: [PATCH 081/974] Update modSociete.class.php

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

diff --git a/htdocs/core/modules/modSociete.class.php b/htdocs/core/modules/modSociete.class.php
index ff5edd3eeb4..bdbc1a2fbee 100644
--- a/htdocs/core/modules/modSociete.class.php
+++ b/htdocs/core/modules/modSociete.class.php
@@ -148,7 +148,7 @@ class modSociete extends DolibarrModules
 		$this->rights[$r][1] = 'Read thirdparties customers';
 		$this->rights[$r][2] = 'r';
 		$this->rights[$r][3] = 0;
-		$this->rights[$r][4] = 'thirparty_customer_advance';      // Visible if option MAIN_USE_ADVANCED_PERMS is on
+		$this->rights[$r][4] = 'thirdparty_customer_advance';      // Visible if option MAIN_USE_ADVANCED_PERMS is on
 		$this->rights[$r][5] = 'read';
 
 		$r++;
@@ -172,7 +172,7 @@ class modSociete extends DolibarrModules
 		$this->rights[$r][1] = 'Create thirdparties customers';
 		$this->rights[$r][2] = 'r';
 		$this->rights[$r][3] = 0;
-		$this->rights[$r][4] = 'thirparty_customer_advance';      // Visible if option MAIN_USE_ADVANCED_PERMS is on
+		$this->rights[$r][4] = 'thirdparty_customer_advance';      // Visible if option MAIN_USE_ADVANCED_PERMS is on
 		$this->rights[$r][5] = 'read';
 
 		$r++;

From e43fcc4d920c7a813ab421cd313800ea399a3f78 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 27 Aug 2022 15:47:49 +0200
Subject: [PATCH 082/974] Fix tackid for action USER_

---
 .../core/triggers/interface_50_modAgenda_ActionsAuto.class.php  | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php b/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php
index 0e018514353..75c3d545c3b 100644
--- a/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php
+++ b/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php
@@ -962,6 +962,8 @@ class InterfaceActionsAuto extends DolibarrTriggers
 				$object->trackid = 'tas'.$object->id;
 			} elseif (preg_match('/^TICKET_/', $action)) {
 				$object->trackid = 'tic'.$object->id;
+			} elseif (preg_match('/^USER_/', $action)) {
+				$object->trackid = 'use'.$object->id;
 			} else {
 				$object->trackid = '';
 			}

From 72a2e67d7e980449d923c2defc79a1f7b03bf584 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 27 Aug 2022 17:46:15 +0200
Subject: [PATCH 083/974] Default pass rules

---
 .../modules/security/generate/modGeneratePassPerso.class.php  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/core/modules/security/generate/modGeneratePassPerso.class.php b/htdocs/core/modules/security/generate/modGeneratePassPerso.class.php
index baa818aa63b..02b970ee2aa 100644
--- a/htdocs/core/modules/security/generate/modGeneratePassPerso.class.php
+++ b/htdocs/core/modules/security/generate/modGeneratePassPerso.class.php
@@ -98,8 +98,8 @@ class modGeneratePassPerso extends ModeleGenPassword
 		$this->user = $user;
 
 		if (empty($conf->global->USER_PASSWORD_PATTERN)) {
-			// default value at auto generation (12 chars, 1 upercase, 1 digit, 1 special char,  3 repeat, exclude ambiguous characters).
-			dolibarr_set_const($db, "USER_PASSWORD_PATTERN", '12;1;1;1;3;1', 'chaine', 0, '', $conf->entity);
+			// default value at auto generation (12 chars, 1 uppercase, 1 digit, 0 special char, 3 repeat max, exclude ambiguous characters).
+			dolibarr_set_const($db, "USER_PASSWORD_PATTERN", '12;1;1;0;3;1', 'chaine', 0, '', $conf->entity);
 		}
 
 		$this->Maj = "ABCDEFGHIJKLMNOPQRSTUVWXYZ";

From 96889609e8e167ca9e6be37dd57b49fcef239f26 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 27 Aug 2022 19:02:05 +0200
Subject: [PATCH 084/974] Fix restore use of API get when ID = 0

---
 htdocs/api/class/api.class.php                 |  3 +++
 htdocs/core/lib/security.lib.php               | 18 +++++++++---------
 .../societe/class/api_thirdparties.class.php   |  8 ++++++--
 3 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/htdocs/api/class/api.class.php b/htdocs/api/class/api.class.php
index a1aa77f2e6e..0ef143d36ad 100644
--- a/htdocs/api/class/api.class.php
+++ b/htdocs/api/class/api.class.php
@@ -115,6 +115,8 @@ class DolibarrApi
 
 		// Remove linkedObjects. We should already have linkedObjectsIds that avoid huge responses
 		unset($object->linkedObjects);
+		unset($object->linkedObjectsFullLoaded);
+		//unset($object->lines[$i]->linked_objects);		// This is the array to create linked object during create
 
 		unset($object->fields);
 		unset($object->oldline);
@@ -139,6 +141,7 @@ class DolibarrApi
 
 		unset($object->projet); // Should be fk_project
 		unset($object->project); // Should be fk_project
+		unset($object->fk_projet); // Should be fk_project
 		unset($object->author); // Should be fk_user_author
 		unset($object->timespent_old_duration);
 		unset($object->timespent_id);
diff --git a/htdocs/core/lib/security.lib.php b/htdocs/core/lib/security.lib.php
index bc0dd522d1b..cffed35070d 100644
--- a/htdocs/core/lib/security.lib.php
+++ b/htdocs/core/lib/security.lib.php
@@ -792,8 +792,8 @@ function checkUserAccessToObject($user, array $featuresarray, $object = 0, $tabl
 			$sharedelement = (!empty($params[1]) ? $params[1] : $dbtablename); // We change dbtablename, so we set sharedelement too.
 		}
 
-		// Check permission for object on entity only
-		if (in_array($feature, $check)) {
+		// Check permission for objectid on entity only
+		if (in_array($feature, $check) && $objectid > 0) {		// For $objectid = 0, no check
 			$sql = "SELECT COUNT(dbt.".$dbt_select.") as nb";
 			$sql .= " FROM ".MAIN_DB_PREFIX.$dbtablename." as dbt";
 			if (($feature == 'user' || $feature == 'usergroup') && !empty($conf->multicompany->enabled)) {	// Special for multicompany
@@ -825,7 +825,7 @@ function checkUserAccessToObject($user, array $featuresarray, $object = 0, $tabl
 			}
 			$checkonentitydone = 1;
 		}
-		if (in_array($feature, $checksoc)) {	// We check feature = checksoc
+		if (in_array($feature, $checksoc) && $objectid > 0) {	// We check feature = checksoc. For $objectid = 0, no check
 			// If external user: Check permission for external users
 			if ($user->socid > 0) {
 				if ($user->socid != $objectid) {
@@ -850,7 +850,7 @@ function checkUserAccessToObject($user, array $featuresarray, $object = 0, $tabl
 
 			$checkonentitydone = 1;
 		}
-		if (in_array($feature, $checkother)) {	// Test on entity + link to thirdparty. Allowed if link is empty (Ex: contacts...).
+		if (in_array($feature, $checkother) && $objectid > 0) {	// Test on entity + link to thirdparty. Allowed if link is empty (Ex: contacts...).
 			// If external user: Check permission for external users
 			if ($user->socid > 0) {
 				$sql = "SELECT COUNT(dbt.".$dbt_select.") as nb";
@@ -875,7 +875,7 @@ function checkUserAccessToObject($user, array $featuresarray, $object = 0, $tabl
 
 			$checkonentitydone = 1;
 		}
-		if (in_array($feature, $checkproject)) {
+		if (in_array($feature, $checkproject) && $objectid > 0) {
 			if (!empty($conf->project->enabled) && empty($user->rights->projet->all->lire)) {
 				$projectid = $objectid;
 
@@ -896,7 +896,7 @@ function checkUserAccessToObject($user, array $featuresarray, $object = 0, $tabl
 
 			$checkonentitydone = 1;
 		}
-		if (in_array($feature, $checktask)) {
+		if (in_array($feature, $checktask) && $objectid > 0) {
 			if (!empty($conf->project->enabled) && empty($user->rights->projet->all->lire)) {
 				$task = new Task($db);
 				$task->fetch($objectid);
@@ -919,7 +919,7 @@ function checkUserAccessToObject($user, array $featuresarray, $object = 0, $tabl
 
 			$checkonentitydone = 1;
 		}
-		if (!$checkonentitydone && !in_array($feature, $nocheck)) {		// By default (case of $checkdefault), we check on object entity + link to third party on field $dbt_keyfield
+		if (!$checkonentitydone && !in_array($feature, $nocheck) && $objectid > 0) {		// By default (case of $checkdefault), we check on object entity + link to third party on field $dbt_keyfield
 			// If external user: Check permission for external users
 			if ($user->socid > 0) {
 				if (empty($dbt_keyfield)) {
@@ -962,7 +962,7 @@ function checkUserAccessToObject($user, array $featuresarray, $object = 0, $tabl
 		//print $sql;
 
 		// For events, check on users assigned to event
-		if ($feature === 'agenda') {
+		if ($feature === 'agenda' && $objectid > 0) {
 			// Also check owner or attendee for users without allactions->read
 			if ($objectid > 0 && empty($user->rights->agenda->allactions->read)) {
 				require_once DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php';
@@ -976,7 +976,7 @@ function checkUserAccessToObject($user, array $featuresarray, $object = 0, $tabl
 
 		// For some object, we also have to check it is in the user hierarchy
 		// Param $object must be the full object and not a simple id to have this test possible.
-		if (in_array($feature, $checkhierarchy) && is_object($object)) {
+		if (in_array($feature, $checkhierarchy) && is_object($object) && $objectid > 0) {
 			$childids = $user->getAllChildIds(1);
 			$useridtocheck = 0;
 			if ($feature == 'holiday') {
diff --git a/htdocs/societe/class/api_thirdparties.class.php b/htdocs/societe/class/api_thirdparties.class.php
index 5021712c010..1f00b6e144b 100644
--- a/htdocs/societe/class/api_thirdparties.class.php
+++ b/htdocs/societe/class/api_thirdparties.class.php
@@ -1785,6 +1785,10 @@ class Thirdparties extends DolibarrApi
 		unset($object->particulier);
 		unset($object->prefix_comm);
 
+		unset($object->siren);
+		unset($object->siret);
+		unset($object->ape);
+
 		unset($object->commercial_id); // This property is used in create/update only. It does not exists in read mode because there is several sales representatives.
 
 		unset($object->total_ht);
@@ -1857,7 +1861,7 @@ class Thirdparties extends DolibarrApi
 		global $conf;
 
 		if (!DolibarrApiAccess::$user->rights->societe->lire) {
-			throw new RestException(401);
+			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login.'. No read permission on thirdparties.');
 		}
 
 		if ($rowid === 0) {
@@ -1870,7 +1874,7 @@ class Thirdparties extends DolibarrApi
 		}
 
 		if (!DolibarrApi::_checkAccessToResource('societe', $this->company->id)) {
-			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login.' on this thirdparty');
 		}
 
 		if (!empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) {

From a21f117e78edd8487866346083a9187366d2e715 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 27 Aug 2022 19:23:05 +0200
Subject: [PATCH 085/974] Log message

---
 .../core/triggers/interface_50_modAgenda_ActionsAuto.class.php  | 2 +-
 .../interface_50_modBlockedlog_ActionsBlockedLog.class.php      | 2 +-
 .../interface_50_modNotification_Notification.class.php         | 2 +-
 .../triggers/interface_90_modSociete_ContactRoles.class.php     | 2 +-
 .../triggers/interface_99_modZapier_ZapierTriggers.class.php    | 2 +-
 .../interface_99_modMyModule_MyModuleTriggers.class.php         | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php b/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php
index 4e926050f24..49e2965787b 100644
--- a/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php
+++ b/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php
@@ -987,7 +987,7 @@ class InterfaceActionsAuto extends DolibarrTriggers
 		}
 		*/
 
-		dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
+		dol_syslog("Trigger '".$this->name."' for action '".$action."' launched by ".__FILE__.". id=".$object->id);
 
 		// Add entry in event table
 		$now = dol_now();
diff --git a/htdocs/core/triggers/interface_50_modBlockedlog_ActionsBlockedLog.class.php b/htdocs/core/triggers/interface_50_modBlockedlog_ActionsBlockedLog.class.php
index 741cc4d09bc..275fc954ece 100644
--- a/htdocs/core/triggers/interface_50_modBlockedlog_ActionsBlockedLog.class.php
+++ b/htdocs/core/triggers/interface_50_modBlockedlog_ActionsBlockedLog.class.php
@@ -69,7 +69,7 @@ class InterfaceActionsBlockedLog extends DolibarrTriggers
 			return 1;
 		}
 
-		dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
+		dol_syslog("Trigger '".$this->name."' for action '".$action."' launched by ".__FILE__.". id=".$object->id);
 
 		require_once DOL_DOCUMENT_ROOT.'/blockedlog/class/blockedlog.class.php';
 		$b = new BlockedLog($this->db);
diff --git a/htdocs/core/triggers/interface_50_modNotification_Notification.class.php b/htdocs/core/triggers/interface_50_modNotification_Notification.class.php
index b4d32860c82..dc02117da13 100644
--- a/htdocs/core/triggers/interface_50_modNotification_Notification.class.php
+++ b/htdocs/core/triggers/interface_50_modNotification_Notification.class.php
@@ -74,7 +74,7 @@ class InterfaceNotification extends DolibarrTriggers
 			return 0;
 		}
 
-		dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
+		dol_syslog("Trigger '".$this->name."' for action '".$action."' launched by ".__FILE__.". id=".$object->id);
 
 		$notify = new Notify($this->db);
 		$notify->send($action, $object);
diff --git a/htdocs/core/triggers/interface_90_modSociete_ContactRoles.class.php b/htdocs/core/triggers/interface_90_modSociete_ContactRoles.class.php
index b1eb321f7f5..2f291f5698b 100644
--- a/htdocs/core/triggers/interface_90_modSociete_ContactRoles.class.php
+++ b/htdocs/core/triggers/interface_90_modSociete_ContactRoles.class.php
@@ -70,7 +70,7 @@ class InterfaceContactRoles extends DolibarrTriggers
 		if ($action === 'PROPAL_CREATE' || $action === 'ORDER_CREATE' || $action === 'BILL_CREATE'
 			|| $action === 'ORDER_SUPPLIER_CREATE' || $action === 'BILL_SUPPLIER_CREATE' || $action === 'PROPOSAL_SUPPLIER_CREATE'
 			|| $action === 'CONTRACT_CREATE' || $action === 'FICHINTER_CREATE' || $action === 'PROJECT_CREATE' || $action === 'TICKET_CREATE') {
-			dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
+			dol_syslog("Trigger '".$this->name."' for action '".$action."' launched by ".__FILE__.". id=".$object->id);
 
 			$socid = (property_exists($object, 'socid') ? $object->socid : $object->fk_soc);
 
diff --git a/htdocs/core/triggers/interface_99_modZapier_ZapierTriggers.class.php b/htdocs/core/triggers/interface_99_modZapier_ZapierTriggers.class.php
index 8a2cffe05f3..f9cfd8675e0 100644
--- a/htdocs/core/triggers/interface_99_modZapier_ZapierTriggers.class.php
+++ b/htdocs/core/triggers/interface_99_modZapier_ZapierTriggers.class.php
@@ -396,7 +396,7 @@ class InterfaceZapierTriggers extends DolibarrTriggers
 			// case 'SHIPPING_DELETE':
 		}
 		if ($logtriggeraction) {
-			dol_syslog("Trigger '".$this->name."' for action '.$action.' launched by ".__FILE__." id=".$object->id);
+			dol_syslog("Trigger '".$this->name."' for action '".$action."' launched by ".__FILE__." id=".$object->id);
 		}
 		return 0;
 	}
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 37ece327185..3c6196cee2f 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
@@ -314,7 +314,7 @@ class InterfaceMyModuleTriggers extends DolibarrTriggers
 			// and more...
 
 			default:
-				dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
+				dol_syslog("Trigger '".$this->name."' for action '".$action."' launched by ".__FILE__.". id=".$object->id);
 				break;
 		}
 

From 69ccd4f7d14a22a30c5c63b4283dc06d6b86ef3a Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Sat, 27 Aug 2022 19:35:30 +0200
Subject: [PATCH 086/974] FIX php8 compatibility

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

diff --git a/htdocs/adherents/admin/website.php b/htdocs/adherents/admin/website.php
index 884c6e67be2..3c7775dc6b8 100644
--- a/htdocs/adherents/admin/website.php
+++ b/htdocs/adherents/admin/website.php
@@ -223,13 +223,13 @@ if (!empty($conf->global->MEMBER_ENABLE_PUBLIC)) {
 	$listofval = array();
 	$listofval['-1'] = $langs->trans('No');
 	$listofval['all'] = $langs->trans('Yes').' ('.$langs->trans("VisitorCanChooseItsPaymentMode").')';
-	if (!empty($conf->paybox->enabled)) {
+	if (isModEnabled('paybox')) {
 		$listofval['paybox'] = 'Paybox';
 	}
-	if (!empty($conf->paypal->enabled)) {
+	if (isModEnabled('paypal')) {
 		$listofval['paypal'] = 'PayPal';
 	}
-	if (!empty($conf->stripe->enabled)) {
+	if (isModEnabled('stripe')) {
 		$listofval['stripe'] = 'Stripe';
 	}
 	print $form->selectarray("MEMBER_NEWFORM_PAYONLINE", $listofval, (!empty($conf->global->MEMBER_NEWFORM_PAYONLINE) ? $conf->global->MEMBER_NEWFORM_PAYONLINE : ''), 0);
@@ -253,7 +253,7 @@ if (!empty($conf->global->MEMBER_ENABLE_PUBLIC)) {
 	print '<br>';
 	//print $langs->trans('FollowingLinksArePublic').'<br>';
 	print img_picto('', 'globe').' <span class="opacitymedium">'.$langs->trans('BlankSubscriptionForm').'</span><br>';
-	if (!empty($conf->multicompany->enabled)) {
+	if (isModEnabled('multicompany')) {
 		$entity_qr = '?entity='.$conf->entity;
 	} else {
 		$entity_qr = '';

From 5aef3a48fb079fddd904f7d45d600566200ffed0 Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Sat, 27 Aug 2022 19:38:11 +0200
Subject: [PATCH 087/974] FIX php8 compatibility

---
 htdocs/admin/mails_ticket.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/htdocs/admin/mails_ticket.php b/htdocs/admin/mails_ticket.php
index a439bdabcf0..b4f9ee23179 100644
--- a/htdocs/admin/mails_ticket.php
+++ b/htdocs/admin/mails_ticket.php
@@ -275,7 +275,7 @@ if ($action == 'edit') {
 		}
 		print '</td><td>';
 		// SuperAdministrator access only
-		if (empty($conf->multicompany->enabled) || ($user->admin && !$user->entity)) {
+		if (!isModEnabled('multicompany') || ($user->admin && !$user->entity)) {
 			print '<input class="flat" id="MAIN_MAIL_SMTP_SERVER_TICKET" name="MAIN_MAIL_SMTP_SERVER_TICKET" size="18" value="'.$mainserver.'">';
 			print '<input type="hidden" id="MAIN_MAIL_SMTP_SERVER_TICKET_sav" name="MAIN_MAIL_SMTP_SERVER_TICKET_sav" value="'.$mainserver.'">';
 			print '<span id="smtp_server_mess">'.$langs->trans("SeeLocalSendMailSetup").'</span>';
@@ -305,7 +305,7 @@ if ($action == 'edit') {
 		}
 		print '</td><td>';
 		// SuperAdministrator access only
-		if (empty($conf->multicompany->enabled) || ($user->admin && !$user->entity)) {
+		if (!isModEnabled('multicompany') || ($user->admin && !$user->entity)) {
 			print '<input class="flat" id="MAIN_MAIL_SMTP_PORT_TICKET" name="MAIN_MAIL_SMTP_PORT_TICKET" size="3" value="'.$mainport.'">';
 			print '<input type="hidden" id="MAIN_MAIL_SMTP_PORT_TICKET_sav" name="MAIN_MAIL_SMTP_PORT_TICKET_sav" value="'.$mainport.'">';
 			print '<span id="smtp_port_mess">'.$langs->trans("SeeLocalSendMailSetup").'</span>';
@@ -323,7 +323,7 @@ if ($action == 'edit') {
 		$mainstmpid = (!empty($conf->global->MAIN_MAIL_SMTPS_ID_TICKET) ? $conf->global->MAIN_MAIL_SMTPS_ID_TICKET : '');
 		print '<tr class="drag drop oddeven hideifdefault"><td>'.$langs->trans("MAIN_MAIL_SMTPS_ID").'</td><td>';
 		// SuperAdministrator access only
-		if (empty($conf->multicompany->enabled) || ($user->admin && !$user->entity)) {
+		if (!isModEnabled('multicompany') || ($user->admin && !$user->entity)) {
 			print '<input class="flat" name="MAIN_MAIL_SMTPS_ID_TICKET" size="32" value="'.$mainstmpid.'">';
 		} else {
 			$htmltext = $langs->trans("ContactSuperAdminForChange");
@@ -338,7 +338,7 @@ if ($action == 'edit') {
 		$mainsmtppw = (!empty($conf->global->MAIN_MAIL_SMTPS_PW_TICKET) ? $conf->global->MAIN_MAIL_SMTPS_PW_TICKET : '');
 		print '<tr class="drag drop oddeven hideifdefault"><td>'.$langs->trans("MAIN_MAIL_SMTPS_PW").'</td><td>';
 		// SuperAdministrator access only
-		if (empty($conf->multicompany->enabled) || ($user->admin && !$user->entity)) {
+		if (!isModEnabled('multicompany') || ($user->admin && !$user->entity)) {
 			print '<input class="flat" type="password" name="MAIN_MAIL_SMTPS_PW_TICKET" size="32" value="'.$mainsmtppw.'">';
 		} else {
 			$htmltext = $langs->trans("ContactSuperAdminForChange");
@@ -496,7 +496,7 @@ if ($action == 'edit') {
 
 		print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=test&amp;mode=init">'.$langs->trans("DoTestSend").'</a>';
 
-		if (!empty($conf->fckeditor->enabled)) {
+		if (isModEnabled('fckeditor')) {
 			print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=testhtml&amp;mode=init">'.$langs->trans("DoTestSendHTML").'</a>';
 		}
 	}

From 1a73974de6057858c5eef6d5c4f9352f59383ad2 Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Sat, 27 Aug 2022 19:39:58 +0200
Subject: [PATCH 088/974] FIX php8 compatibility

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

diff --git a/htdocs/admin/mails.php b/htdocs/admin/mails.php
index 0504315075d..94c396f049d 100644
--- a/htdocs/admin/mails.php
+++ b/htdocs/admin/mails.php
@@ -404,7 +404,7 @@ if ($action == 'edit') {
 		}
 		print '</td><td>';
 		// SuperAdministrator access only
-		if (empty($conf->multicompany->enabled) || ($user->admin && !$user->entity)) {
+		if (!isModEnabled('multicompany') || ($user->admin && !$user->entity)) {
 			print '<input class="flat minwidth300" id="MAIN_MAIL_SMTP_SERVER" name="MAIN_MAIL_SMTP_SERVER" value="'.$mainserver.'" autocomplete="off">';
 			print '<input type="hidden" id="MAIN_MAIL_SMTP_SERVER_sav" name="MAIN_MAIL_SMTP_SERVER_sav" value="'.$mainserver.'">';
 			print '<span id="smtp_server_mess" class="opacitymedium">'.$langs->trans("SeeLocalSendMailSetup").'</span>';
@@ -435,7 +435,7 @@ if ($action == 'edit') {
 		}
 		print '</td><td>';
 		// SuperAdministrator access only
-		if (empty($conf->multicompany->enabled) || ($user->admin && !$user->entity)) {
+		if (!isModEnabled('multicompany') || ($user->admin && !$user->entity)) {
 			print '<input class="flat" id="MAIN_MAIL_SMTP_PORT" name="MAIN_MAIL_SMTP_PORT" size="3" value="'.$mainport.'">';
 			print '<input type="hidden" id="MAIN_MAIL_SMTP_PORT_sav" name="MAIN_MAIL_SMTP_PORT_sav" value="'.$mainport.'">';
 			print '<span id="smtp_port_mess" class="opacitymedium">'.$langs->trans("SeeLocalSendMailSetup").'</span>';
@@ -453,7 +453,7 @@ if ($action == 'edit') {
 		$mainstmpid = (!empty($conf->global->MAIN_MAIL_SMTPS_ID) ? $conf->global->MAIN_MAIL_SMTPS_ID : '');
 		print '<tr class="drag drop oddeven"><td>'.$langs->trans("MAIN_MAIL_SMTPS_ID").'</td><td>';
 		// SuperAdministrator access only
-		if (empty($conf->multicompany->enabled) || ($user->admin && !$user->entity)) {
+		if (!isModEnabled('multicompany') || ($user->admin && !$user->entity)) {
 			print '<input class="flat" name="MAIN_MAIL_SMTPS_ID" size="32" value="'.$mainstmpid.'">';
 		} else {
 			$htmltext = $langs->trans("ContactSuperAdminForChange");
@@ -467,7 +467,7 @@ if ($action == 'edit') {
 	// OAUTH
 	if (!empty($conf->use_javascript_ajax) || (isset($conf->global->MAIN_MAIL_SENDMODE) && in_array($conf->global->MAIN_MAIL_SENDMODE, array('smtps', 'swiftmailer')))) {
 		print '<tr class="oddeven smtp_auth_method"><td>'.$langs->trans("MAIN_MAIL_SMTPS_AUTH_TYPE").'</td><td>';
-		if (empty($conf->multicompany->enabled) || ($user->admin && !$user->entity)) {
+		if (!isModEnabled('multicompany') || ($user->admin && !$user->entity)) {
 			print '<input type="radio" id="radio_pw" name="MAIN_MAIL_SMTPS_AUTH_TYPE" value="LOGIN"'.(getDolGlobalString('MAIN_MAIL_SMTPS_AUTH_TYPE') == 'LOGIN' ? ' checked' : '').'> ';
 			print '<label for="radio_pw" >'.$langs->trans("UsePassword").'</label>';
 			print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
@@ -489,7 +489,7 @@ if ($action == 'edit') {
 		print $form->textwithpicto($langs->trans("MAIN_MAIL_SMTPS_PW"), $langs->trans("WithGMailYouCanCreateADedicatedPassword"));
 		print '</td><td>';
 		// SuperAdministrator access only
-		if (empty($conf->multicompany->enabled) || ($user->admin && !$user->entity)) {
+		if (!isModEnabled('multicompany') || ($user->admin && !$user->entity)) {
 			print '<input class="flat" type="password" name="MAIN_MAIL_SMTPS_PW" size="32" value="'.$mainsmtppw.'" autocomplete="off">';
 		} else {
 			$htmltext = $langs->trans("ContactSuperAdminForChange");
@@ -911,7 +911,7 @@ if ($action == 'edit') {
 
 		print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=test&mode=init#formmailbeforetitle">'.$langs->trans("DoTestSend").'</a>';
 
-		if (!empty($conf->fckeditor->enabled)) {
+		if (isModEnabled('fckeditor')) {
 			print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=testhtml&mode=init#formmailbeforetitle">'.$langs->trans("DoTestSendHTML").'</a>';
 		}
 	}

From baa65a7af435976506eb2a9a719a995490feea89 Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Sat, 27 Aug 2022 19:41:47 +0200
Subject: [PATCH 089/974] FIX php8 compatibility

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

diff --git a/htdocs/admin/modules.php b/htdocs/admin/modules.php
index d04039aefdf..05f7ed441f7 100644
--- a/htdocs/admin/modules.php
+++ b/htdocs/admin/modules.php
@@ -786,14 +786,14 @@ if ($mode == 'common' || $mode == 'commonkanban') {
 
 			if (!empty($objMod->disabled)) {
 				$codeenabledisable .= $langs->trans("Disabled");
-			} elseif (!empty($objMod->always_enabled) || ((!empty($conf->multicompany->enabled) && $objMod->core_enabled) && ($user->entity || $conf->entity != 1))) {
+			} elseif (!empty($objMod->always_enabled) || ((isModEnabled('multicompany') && $objMod->core_enabled) && ($user->entity || $conf->entity != 1))) {
 				if (method_exists($objMod, 'alreadyUsed') && $objMod->alreadyUsed()) {
 					$codeenabledisable .= $langs->trans("Used");
 				} else {
 					$codeenabledisable .= img_picto($langs->trans("Required"), 'switch_on', '', false, 0, 0, '', 'opacitymedium valignmiddle');
 					//print $langs->trans("Required");
 				}
-				if (!empty($conf->multicompany->enabled) && $user->entity) {
+				if (isModEnabled('multicompany') && $user->entity) {
 					$disableSetup++;
 				}
 			} else {
@@ -1279,7 +1279,7 @@ if ($mode == 'develop') {
 	print '</td>';
 	print '<td>'.$langs->trans("TryToUseTheModuleBuilder", $langs->transnoentitiesnoconv("ModuleBuilder")).'</td>';
 	print '<td class="maxwidth300">';
-	if (!empty($conf->modulebuilder->enabled)) {
+	if (isModEnabled('modulebuilder')) {
 		print $langs->trans("SeeTopRightMenu");
 	} else {
 		print '<span class="opacitymedium">'.$langs->trans("ModuleMustBeEnabledFirst", $langs->transnoentitiesnoconv("ModuleBuilder")).'</span>';

From c1f35695f47b692bdb0787797c6fa6b4e06e9e7a Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Sat, 27 Aug 2022 19:43:19 +0200
Subject: [PATCH 090/974] FIX php8 compatibility

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

diff --git a/htdocs/admin/pdf.php b/htdocs/admin/pdf.php
index 41215f98402..f534ff881da 100644
--- a/htdocs/admin/pdf.php
+++ b/htdocs/admin/pdf.php
@@ -108,7 +108,7 @@ if ($action == 'update') {
 		dolibarr_set_const($db, "MAIN_TVAINTRA_NOT_IN_ADDRESS", GETPOST("MAIN_TVAINTRA_NOT_IN_ADDRESS"), 'chaine', 0, '', $conf->entity);
 	}
 
-	if (!empty($conf->project->enabled)) {
+	if (isModEnabled('project')) {
 		if (GETPOST('PDF_SHOW_PROJECT_REF_OR_LABEL') == 'no') {
 			dolibarr_del_const($db, "PDF_SHOW_PROJECT", $conf->entity);
 			dolibarr_del_const($db, "PDF_SHOW_PROJECT_TITLE", $conf->entity);
@@ -486,7 +486,7 @@ print '<input type="text" class="maxwidth50" name="MAIN_DOCUMENTS_LOGO_HEIGHT" v
 print '</td></tr>';
 
 // Show project
-if (!empty($conf->project->enabled)) {
+if (isModEnabled('project')) {
 	print '<tr class="oddeven"><td>'.$langs->trans("PDF_SHOW_PROJECT").'</td><td>';
 	$tmparray = array('no' => 'No', 'showprojectref' => 'RefProject', 'showprojectlabel' => 'ShowProjectLabel');
 	$showprojectref = empty($conf->global->PDF_SHOW_PROJECT) ? (empty($conf->global->PDF_SHOW_PROJECT_TITLE) ? 'no' : 'showprojectlabel') : 'showprojectref';

From 64c92eda24add68b4eedf77605a800faa8009f9a Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Sat, 27 Aug 2022 19:44:59 +0200
Subject: [PATCH 091/974] FIX php8 compatibility

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

diff --git a/htdocs/admin/propal.php b/htdocs/admin/propal.php
index a83e08ba4cf..eea567ea27c 100644
--- a/htdocs/admin/propal.php
+++ b/htdocs/admin/propal.php
@@ -515,7 +515,7 @@ print '<td>';
 print '<input type="hidden" name="action" value="setribchq">';
 print $langs->trans("PaymentMode").'</td>';
 print '<td align="right">';
-if (empty($conf->facture->enabled)) {
+if (!isModEnabled('facture')) {
 	print '<input type="submit" class="button button-edit" value="'.$langs->trans("Modify").'">';
 }
 print '</td>';
@@ -524,7 +524,7 @@ print "</tr>\n";
 print '<tr class="oddeven">';
 print "<td>".$langs->trans("SuggestPaymentByRIBOnAccount")."</td>";
 print "<td>";
-if (empty($conf->facture->enabled)) {
+if (!isModEnabled('facture')) {
 	if (isModEnabled("banque")) {
 		$sql = "SELECT rowid, label";
 		$sql .= " FROM ".MAIN_DB_PREFIX."bank_account";
@@ -563,7 +563,7 @@ print "</td></tr>";
 print '<tr class="oddeven">';
 print "<td>".$langs->trans("SuggestPaymentByChequeToAddress")."</td>";
 print "<td>";
-if (empty($conf->facture->enabled)) {
+if (!isModEnabled('facture')) {
 	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>';
@@ -700,7 +700,7 @@ print "</td></tr>\n";
 print '</form>';
 
 /* Seems to be not so used. So kept hidden for the moment to avoid dangerous options inflation.
-if ($conf->banque->enabled)
+if (isModEnabled('facture'))
 {
 
 	print '<tr class="oddeven"><td>';

From aba2f7b986d985ab2eb778c16506fc68d88d7bc9 Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Sat, 27 Aug 2022 19:46:26 +0200
Subject: [PATCH 092/974] FIX php8 compatibility

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

diff --git a/htdocs/admin/taxes.php b/htdocs/admin/taxes.php
index 646f4a7be74..fb4b2ec6d72 100644
--- a/htdocs/admin/taxes.php
+++ b/htdocs/admin/taxes.php
@@ -27,7 +27,7 @@
 
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
-if (!empty($conf->accounting->enabled)) {
+if (isModEnabled('accounting')) {
 	require_once DOL_DOCUMENT_ROOT.'/core/class/html.formaccounting.class.php';
 }
 
@@ -137,7 +137,7 @@ if ($action == 'update') {
 llxHeader('', $langs->trans("TaxSetup"));
 
 $form = new Form($db);
-if (!empty($conf->accounting->enabled)) {
+if (isModEnabled('accounting')) {
 	$formaccounting = new FormAccounting($db);
 }
 
@@ -282,7 +282,7 @@ echo '</table>';
 echo '</div>';
 
 
-if (!empty($conf->accounting->enabled)) {
+if (isModEnabled('accounting')) {
 	$langs->load("accountancy");
 	print '<br><br><span class="opacitymedium">'.$langs->trans("AccountingAccountForSalesTaxAreDefinedInto", $langs->transnoentitiesnoconv("MenuAccountancy"), $langs->transnoentitiesnoconv("Setup")).'</span>';
 }

From 1ba289f66d2158d741cb607292e875b12c8729ad Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Sat, 27 Aug 2022 19:48:11 +0200
Subject: [PATCH 093/974] FIX php8 compatibility

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

diff --git a/htdocs/admin/translation.php b/htdocs/admin/translation.php
index 1e667e7abb4..154ac3f5665 100644
--- a/htdocs/admin/translation.php
+++ b/htdocs/admin/translation.php
@@ -346,7 +346,7 @@ if ($mode == 'overwrite') {
 	print_liste_field_titre("Language_en_US_es_MX_etc", $_SERVER["PHP_SELF"], 'lang,transkey', '', $param, '', $sortfield, $sortorder);
 	print_liste_field_titre("Key", $_SERVER["PHP_SELF"], 'transkey', '', $param, '', $sortfield, $sortorder);
 	print_liste_field_titre("NewTranslationStringToShow", $_SERVER["PHP_SELF"], 'transvalue', '', $param, '', $sortfield, $sortorder);
-	//if (! empty($conf->multicompany->enabled) && !$user->entity) print_liste_field_titre("Entity", $_SERVER["PHP_SELF"], 'entity,transkey', '', $param, '', $sortfield, $sortorder);
+	//if (isModEnabled('multicompany') && !$user->entity) print_liste_field_titre("Entity", $_SERVER["PHP_SELF"], 'entity,transkey', '', $param, '', $sortfield, $sortorder);
 	print '<td align="center"></td>';
 	print "</tr>\n";
 
@@ -504,7 +504,7 @@ if ($mode == 'searchkey') {
 	print '</td><td>';
 	print '<input type="text" class="quatrevingtpercent" name="transvalue" value="'.dol_escape_htmltag($transvalue).'">';
 	// Limit to superadmin
-	/*if (! empty($conf->multicompany->enabled) && !$user->entity)
+	/*if (isModEnabled('multicompany') && !$user->entity)
 	{
 		print '</td><td>';
 		print '<input type="text" class="flat" size="1" name="entitysearch" value="'.$conf->entity.'">';
@@ -525,7 +525,7 @@ if ($mode == 'searchkey') {
 	print_liste_field_titre("Language_en_US_es_MX_etc", $_SERVER["PHP_SELF"], 'lang,transkey', '', $param, '', $sortfield, $sortorder);
 	print_liste_field_titre("Key", $_SERVER["PHP_SELF"], 'transkey', '', $param, '', $sortfield, $sortorder);
 	print_liste_field_titre("CurrentTranslationString", $_SERVER["PHP_SELF"], 'transvalue', '', $param, '', $sortfield, $sortorder);
-	//if (! empty($conf->multicompany->enabled) && !$user->entity) print_liste_field_titre("Entity", $_SERVER["PHP_SELF"], 'entity,transkey', '', $param, '', $sortfield, $sortorder);
+	//if (isModEnabled('multicompany') && !$user->entity) print_liste_field_titre("Entity", $_SERVER["PHP_SELF"], 'entity,transkey', '', $param, '', $sortfield, $sortorder);
 	print '<td align="center"></td>';
 	print "</tr>\n";
 
@@ -609,7 +609,7 @@ if ($mode == 'searchkey') {
 			$htmltext = $langs->trans("TransKeyWithoutOriginalValue", $key);
 			print $form->textwithpicto('', $htmltext, 1, 'warning');
 		}
-		/*if (! empty($conf->multicompany->enabled) && !$user->entity)
+		/*if (isModEnabled('multicompany') && !$user->entity)
 		{
 			print '<td>'.$val.'</td>';
 		}*/

From 1fa7c6647f38ee8752283b86ab49c925ac8c30ae Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 27 Aug 2022 21:20:04 +0200
Subject: [PATCH 094/974] Try to use official method for curl exec.

---
 ...interface_99_modZapier_ZapierTriggers.class.php | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/htdocs/core/triggers/interface_99_modZapier_ZapierTriggers.class.php b/htdocs/core/triggers/interface_99_modZapier_ZapierTriggers.class.php
index f9cfd8675e0..d706488129e 100644
--- a/htdocs/core/triggers/interface_99_modZapier_ZapierTriggers.class.php
+++ b/htdocs/core/triggers/interface_99_modZapier_ZapierTriggers.class.php
@@ -404,14 +404,20 @@ class InterfaceZapierTriggers extends DolibarrTriggers
 /**
  * Post webhook in zapier with object data
  *
- * @param string $url url provided by zapier
- * @param string $json data to send
+ * @param string 	$url 		Url provided by zapier
+ * @param string 	$json 		Data to send
  * @return void
  */
 function zapierPostWebhook($url, $json)
 {
 	$headers = array('Accept: application/json', 'Content-Type: application/json');
-	// TODO supprimer le webhook en cas de mauvaise réponse
+
+	// TODO disable wekhook if error ?
+
+	dol_syslog("Send message to Zapier with json size=".dol_strlen($json), LOG_DEBUG);
+	getURLContent($url, 'POSTALREADYFORMATED', $json, 1, $headers, array('http', 'https'), 0);
+
+	/*
 	$ch = curl_init();
 	curl_setopt($ch, CURLOPT_URL, $url);
 	curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
@@ -420,8 +426,10 @@ function zapierPostWebhook($url, $json)
 	curl_setopt($ch, CURLOPT_POST, 1);
 	curl_setopt($ch, CURLOPT_POSTFIELDS, $json);
 	curl_setopt($ch, CURLOPT_HTTPHEADER, $headers);
+
 	$output = curl_exec($ch);
 	curl_close($ch);
+	*/
 }
 
 /**

From 09ad9e6e9246847e23288651b3b40f3b2ae52ece Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 27 Aug 2022 22:14:56 +0200
Subject: [PATCH 095/974] css

---
 htdocs/comm/index.php | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/htdocs/comm/index.php b/htdocs/comm/index.php
index 7127fd2dd5b..a57c7232885 100644
--- a/htdocs/comm/index.php
+++ b/htdocs/comm/index.php
@@ -194,7 +194,7 @@ if (!empty($conf->propal->enabled) && $user->rights->propal->lire) {
 				$companystatic->canvas = $obj->canvas;
 
 				print '<tr class="oddeven">';
-				print '<td class="nowrap tdoverflowmax100">'.$propalstatic->getNomUrl(1).'</td>';
+				print '<td class="nowraponall tdoverflowmax100">'.$propalstatic->getNomUrl(1).'</td>';
 				print '<td class="nowrap tdoverflowmax100">'.$companystatic->getNomUrl(1, 'customer').'</td>';
 				print '<td class="nowrap right tdamount amount">'.price((!empty($conf->global->MAIN_DASHBOARD_USE_TOTAL_HT) ? $obj->total_ht : $obj->total_ttc)).'</td>';
 				print '</tr>';
@@ -291,7 +291,7 @@ if (!empty($conf->supplier_proposal->enabled) && $user->rights->supplier_proposa
 				$companystatic->canvas = $obj->canvas;
 
 				print '<tr class="oddeven">';
-				print '<td class="nowrap tdoverflowmax100">'.$supplierproposalstatic->getNomUrl(1).'</td>';
+				print '<td class="nowraponall tdoverflowmax100">'.$supplierproposalstatic->getNomUrl(1).'</td>';
 				print '<td class="nowrap tdoverflowmax100">'.$companystatic->getNomUrl(1, 'supplier').'</td>';
 				print '<td class="nowrap right tdamount amount">'.price(!empty($conf->global->MAIN_DASHBOARD_USE_TOTAL_HT) ? $obj->total_ht : $obj->total_ttc).'</td>';
 				print '</tr>';
@@ -389,7 +389,7 @@ if (!empty($conf->commande->enabled) && $user->rights->commande->lire) {
 				$companystatic->canvas = $obj->canvas;
 
 				print '<tr class="oddeven">';
-				print '<td class="nowrap tdoverflowmax100">'.$orderstatic->getNomUrl(1).'</td>';
+				print '<td class="nowraponall tdoverflowmax100">'.$orderstatic->getNomUrl(1).'</td>';
 				print '<td class="nowrap tdoverflowmax100">'.$companystatic->getNomUrl(1, 'customer').'</td>';
 				print '<td class="nowrap right tdamount amount">'.price(!empty($conf->global->MAIN_DASHBOARD_USE_TOTAL_HT) ? $obj->total_ht : $obj->total_ttc).'</td>';
 				print '</tr>';
@@ -487,7 +487,7 @@ if ((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SU
 				$companystatic->canvas = $obj->canvas;
 
 				print '<tr class="oddeven">';
-				print '<td class="nowrap tdoverflowmax100">'.$supplierorderstatic->getNomUrl(1).'</td>';
+				print '<td class="nowraponall tdoverflowmax100">'.$supplierorderstatic->getNomUrl(1).'</td>';
 				print '<td class="nowrap tdoverflowmax100">'.$companystatic->getNomUrl(1, 'supplier').'</td>';
 				print '<td class="nowrap right tdamount amount">'.price(!empty($conf->global->MAIN_DASHBOARD_USE_TOTAL_HT) ? $obj->total_ht : $obj->total_ttc).'</td>';
 				print '</tr>';
@@ -573,8 +573,9 @@ if (!empty($conf->ficheinter->enabled)) {
 				$companystatic->email = $obj->email;
 				$companystatic->entity = $obj->entity;
 				$companystatic->canvas = $obj->canvas;
+
 				print '<tr class="oddeven">';
-				print '<td class="nowrap tdoverflowmax100">';
+				print '<td class="nowraponall tdoverflowmax100">';
 				print $fichinterstatic->getNomUrl(1);
 				print "</td>";
 				print '<td class="nowrap tdoverflowmax100">';
@@ -654,7 +655,7 @@ if (!empty($conf->societe->enabled) && $user->rights->societe->lire) {
 				$companystatic->canvas = $objp->canvas;
 
 				print '<tr class="oddeven">';
-				print '<td class="nowrap tdoverflowmax100">'.$companystatic->getNomUrl(1, 'customer').'</td>';
+				print '<td class="nowraponall tdoverflowmax100">'.$companystatic->getNomUrl(1, 'customer').'</td>';
 				print '<td class="nowrap">';
 				//print $companystatic->getLibCustProspStatut();
 
@@ -751,7 +752,7 @@ if (((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_S
 				$companystatic->canvas = $objp->canvas;
 
 				print '<tr class="oddeven">';
-				print '<td class="nowrap tdoverflowmax100">'.$companystatic->getNomUrl(1, 'supplier').'</td>';
+				print '<td class="nowraponall tdoverflowmax100">'.$companystatic->getNomUrl(1, 'supplier').'</td>';
 				print '<td>';
 
 				$obj = $companystatic;
@@ -865,8 +866,8 @@ if (!empty($conf->contrat->enabled) && $user->rights->contrat->lire && 0) { // T
 				$staticcontrat->ref = $obj->ref;
 
 				print '<tr class="oddeven">';
-				print '<td>'.$staticcontrat->getNomUrl(1).'</td>';
-				print '<td>'.$companystatic->getNomUrl(1, 'customer', 44).'</td>';
+				print '<td class="nowraponall">'.$staticcontrat->getNomUrl(1).'</td>';
+				print '<td class="tdoverflowmax150">'.$companystatic->getNomUrl(1, 'customer', 44).'</td>';
 				print '<td class="right">'.$staticcontrat->LibStatut($obj->statut, 3).'</td>';
 				print '</tr>';
 
@@ -962,7 +963,7 @@ if (!empty($conf->propal->enabled) && $user->rights->propal->lire) {
 
 				print '<td class="nowrap" width="140">';
 				print '<table class="nobordernopadding"><tr class="nocellnopadd">';
-				print '<td class="nobordernopadding nowrap">'.$propalstatic->getNomUrl(1).'</td>';
+				print '<td class="nobordernopadding nowraponall">'.$propalstatic->getNomUrl(1).'</td>';
 				print '<td width="18" class="nobordernopadding nowrap">'.$warning.'</td>';
 				print '<td width="16" align="center" class="nobordernopadding">'.$formfile->getDocumentsLink($propalstatic->element, $filename, $filedir).'</td>';
 				print '</tr>';
@@ -1082,7 +1083,7 @@ if (!empty($conf->commande->enabled) && $user->rights->commande->lire) {
 
 				print '<td class="nowrap" width="140">';
 				print '<table class="nobordernopadding"><tr class="nocellnopadd">';
-				print '<td class="nobordernopadding nowrap">'.$orderstatic->getNomUrl(1).'</td>';
+				print '<td class="nobordernopadding nowraponall">'.$orderstatic->getNomUrl(1).'</td>';
 				print '<td width="18" class="nobordernopadding nowrap"></td>';
 				print '<td width="16" align="center" class="nobordernopadding">'.$formfile->getDocumentsLink($orderstatic->element, $filename, $filedir).'</td>';
 				print '</tr>';

From 4ba1a467fad4b2a86b4ca3559882bceae74bdc58 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 27 Aug 2022 22:42:40 +0200
Subject: [PATCH 096/974] Fix php8

---
 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 0f0a17fe365..b43db1c75fb 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -6470,8 +6470,8 @@ class Form
 				} elseif ($usecalendar == 'jquery') {
 					if (!$disabled) {
 						// Output javascript for datepicker
-						$minYear = $conf->global->MIN_YEAR_SELECT_DATE ? $conf->global->MIN_YEAR_SELECT_DATE : (date('Y') - 100);
-						$maxYear = $conf->global->MAX_YEAR_SELECT_DATE ? $conf->global->MAX_YEAR_SELECT_DATE : (date('Y') + 100);
+						$minYear = getDolGlobalInt('MIN_YEAR_SELECT_DATE', (date('Y') - 100));
+						$maxYear = getDolGlobalInt('MAX_YEAR_SELECT_DATE', (date('Y') + 100));
 
 						$retstring .= "<script type='text/javascript'>";
 						$retstring .= "$(function(){ $('#".$prefix."').datepicker({

From 4470a78c6eea6490ac9bc8ffe536ca1c089d8802 Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Sun, 28 Aug 2022 05:17:43 +0200
Subject: [PATCH 097/974] PHP8 Warnings

---
 .../modules/takepos/mod_takepos_ref_universal.php | 15 ++++++++-------
 htdocs/takepos/admin/setup.php                    |  6 +++---
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/htdocs/core/modules/takepos/mod_takepos_ref_universal.php b/htdocs/core/modules/takepos/mod_takepos_ref_universal.php
index 7e46c10a341..5d35bfd1214 100644
--- a/htdocs/core/modules/takepos/mod_takepos_ref_universal.php
+++ b/htdocs/core/modules/takepos/mod_takepos_ref_universal.php
@@ -57,11 +57,11 @@ class mod_takepos_ref_universal extends ModeleNumRefTakepos
 	 */
 	public function info()
 	{
-		global $conf, $langs;
+		global $db, $langs;
 
 		$langs->load('cashdesk@cashdesk');
 
-		$form = new Form($this->db);
+		$form = new Form($db);
 
 		$texte = $langs->trans('GenericNumRefModelDesc')."<br>\n";
 		$texte .= '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
@@ -79,9 +79,9 @@ class mod_takepos_ref_universal extends ModeleNumRefTakepos
 
 		// Parametrage du prefix
 		$texte .= '<tr><td>'.$langs->trans("Mask").':</td>';
-		$texte .= '<td align="right">'.$form->textwithpicto('<input type="text" class="flat minwidth175" name="maskvalue" value="'.$conf->global->TAKEPOS_REF_UNIVERSAL_MASK.'">', $tooltip, 1, 1).'</td>';
+		$texte .= '<td class="right">'.$form->textwithpicto('<input type="text" class="flat minwidth175" name="maskvalue" value="'.getDolGlobalString('TAKEPOS_REF_UNIVERSAL_MASK').'">', $tooltip, 1, 1).'</td>';
 
-		$texte .= '<td align="left" rowspan="2">&nbsp; <input type="submit" class="button button-edit" name="Button"value="'.$langs->trans("Modify").'"></td>';
+		$texte .= '<td class="left" rowspan="2">&nbsp; <input type="submit" class="button button-edit" name="Button"value="'.$langs->trans("Modify").'"></td>';
 
 		$texte .= '</tr>';
 
@@ -121,12 +121,12 @@ class mod_takepos_ref_universal extends ModeleNumRefTakepos
 	 */
 	public function getNextValue($objsoc = null, $invoice = null, $mode = 'next')
 	{
-		global $db, $conf;
+		global $db;
 
 		require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 
 		// On defini critere recherche compteur
-		$mask = $conf->global->TAKEPOS_REF_UNIVERSAL_MASK;
+		$mask = getDolGlobalString('TAKEPOS_REF_UNIVERSAL_MASK');
 
 		if (!$mask) {
 			$this->error = 'NotConfigured';
@@ -136,9 +136,10 @@ class mod_takepos_ref_universal extends ModeleNumRefTakepos
 		// Get entities
 		$entity = getEntity('invoicenumber', 1, $invoice);
 
+		$date = (empty($invoice->date) ? dol_now() : $invoice->date);
 		$pos_source = is_object($invoice) && $invoice->pos_source > 0 ? $invoice->pos_source : 0;
 		$mask = str_replace('{TN}', $pos_source, $mask);
-		$numFinal = get_next_value($db, $mask, 'facture', 'ref', '', $objsoc, $invoice->date, $mode, false, null, $entity);
+		$numFinal = get_next_value($db, $mask, 'facture', 'ref', '', $objsoc, $date, $mode, false, null, $entity);
 
 		return $numFinal;
 	}
diff --git a/htdocs/takepos/admin/setup.php b/htdocs/takepos/admin/setup.php
index a7a3183fa33..cfa4e281e06 100644
--- a/htdocs/takepos/admin/setup.php
+++ b/htdocs/takepos/admin/setup.php
@@ -196,8 +196,8 @@ foreach ($dirmodels as $reldir) {
 						}
 						print '</td>'."\n";
 
-						print '<td align="center">';
-						if ($conf->global->TAKEPOS_REF_ADDON == "$file") {
+						print '<td class="center">';
+						if (getDolGlobalString('TAKEPOS_REF_ADDON') == "$file") {
 							print img_picto($langs->trans("Activated"), 'switch_on');
 						} else {
 							print '<a href="'.$_SERVER["PHP_SELF"].'?action=setrefmod&token='.newToken().'&value='.urlencode($file).'">';
@@ -277,7 +277,7 @@ if (!empty($conf->service->enabled)) {
 print '<tr class="oddeven"><td>';
 print $form->textwithpicto($langs->trans("RootCategoryForProductsToSell"), $langs->trans("RootCategoryForProductsToSellDesc"));
 print '<td colspan="2">';
-print img_object('', 'category', 'class="paddingright"').$form->select_all_categories(Categorie::TYPE_PRODUCT, $conf->global->TAKEPOS_ROOT_CATEGORY_ID, 'TAKEPOS_ROOT_CATEGORY_ID', 64, 0, 0);
+print img_object('', 'category', 'class="paddingright"').$form->select_all_categories(Categorie::TYPE_PRODUCT, getDolGlobalInt('TAKEPOS_ROOT_CATEGORY_ID'), 'TAKEPOS_ROOT_CATEGORY_ID', 64, 0, 0);
 print ajax_combobox('TAKEPOS_ROOT_CATEGORY_ID');
 print "</td></tr>\n";
 

From c74bd4f204a7e26ab94c399636119d558f410714 Mon Sep 17 00:00:00 2001
From: Alex <93376818+sashashura@users.noreply.github.com>
Date: Sun, 28 Aug 2022 11:35:52 +0100
Subject: [PATCH 098/974] Update stale-issues-safe.yml

---
 .github/workflows/stale-issues-safe.yml | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/stale-issues-safe.yml b/.github/workflows/stale-issues-safe.yml
index 1682b92a7a7..4ac9fa8f5b9 100644
--- a/.github/workflows/stale-issues-safe.yml
+++ b/.github/workflows/stale-issues-safe.yml
@@ -6,9 +6,13 @@ on:
   - cron: "0 21 * * *"
   issue_comment:
     types: [created]
+    
+permissions: {} # none
 
 jobs:
   stale:
+    permissions:
+      issues: write
     runs-on: ubuntu-latest
     steps:
     - uses: Dolibarr/stale@staleunstale
@@ -21,4 +25,4 @@ jobs:
         days-before-close: 10
         operations-per-run: 100
         dry-run: false
-        
\ No newline at end of file
+        

From 41ed2967c54d5ad0ad9dfb80b93f0cc4126a5da0 Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Sun, 28 Aug 2022 13:36:26 +0200
Subject: [PATCH 099/974] FIX php8 compatibility

---
 htdocs/admin/system/constall.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/htdocs/admin/system/constall.php b/htdocs/admin/system/constall.php
index 9a27feb3d7a..fee82d89958 100644
--- a/htdocs/admin/system/constall.php
+++ b/htdocs/admin/system/constall.php
@@ -205,7 +205,7 @@ print '<table class="noborder">';
 print '<tr class="liste_titre">';
 print '<td>'.$langs->trans("Parameter").'</td>';
 print '<td>'.$langs->trans("Value").'</td>';
-if (empty($conf->multicompany->enabled) || !$user->entity) {
+if (!isModEnabled('multicompany') || !$user->entity) {
 	print '<td>'.$langs->trans("Entity").'</td>'; // If superadmin or multicompany disabled
 }
 print "</tr>\n";
@@ -218,7 +218,7 @@ $sql .= ", type";
 $sql .= ", note";
 $sql .= ", entity";
 $sql .= " FROM ".MAIN_DB_PREFIX."const";
-if (empty($conf->multicompany->enabled)) {
+if (!isModEnabled('multicompany')) {
 	// If no multicompany mode, admins can see global and their constantes
 	$sql .= " WHERE entity IN (0,".$conf->entity.")";
 } else {
@@ -239,7 +239,7 @@ if ($resql) {
 		print '<tr class="oddeven">';
 		print '<td>'.$obj->name.'</td>'."\n";
 		print '<td>'.$obj->value.'</td>'."\n";
-		if (empty($conf->multicompany->enabled) || !$user->entity) {
+		if (!isModEnabled('multicompany') || !$user->entity) {
 			print '<td>'.$obj->entity.'</td>'."\n"; // If superadmin or multicompany disabled
 		}
 		print "</tr>\n";

From 2900c7aaf71f7fb926f5bc8d4a415ab759fd96a0 Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Sun, 28 Aug 2022 13:38:02 +0200
Subject: [PATCH 100/974] FIX php8 compatibility

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

diff --git a/htdocs/admin/system/dolibarr.php b/htdocs/admin/system/dolibarr.php
index 8a982f6e0bd..31fa647f403 100644
--- a/htdocs/admin/system/dolibarr.php
+++ b/htdocs/admin/system/dolibarr.php
@@ -382,7 +382,7 @@ foreach ($configfileparameters as $key => $value) {
 		$newkey = preg_replace('/^\?/', '', $key);
 
 		if (preg_match('/^\?/', $key) && empty(${$newkey})) {
-			if ($newkey != 'multicompany_transverse_mode' || empty($conf->multicompany->enabled)) {
+			if ($newkey != 'multicompany_transverse_mode' || !isModEnabled('multicompany')) {
 				continue; // We discard parameters starting with ?
 			}
 		}
@@ -483,7 +483,7 @@ print '<table class="noborder">';
 print '<tr class="liste_titre">';
 print '<td class="titlefield">'.$langs->trans("Parameters").' '.$langs->trans("Database").'</td>';
 print '<td>'.$langs->trans("Value").'</td>';
-if (empty($conf->multicompany->enabled) || !$user->entity) {
+if (!isModEnabled('multicompany') || !$user->entity) {
 	print '<td class="center width="80px"">'.$langs->trans("Entity").'</td>'; // If superadmin or multicompany disabled
 }
 print "</tr>\n";
@@ -496,7 +496,7 @@ $sql .= ", type";
 $sql .= ", note";
 $sql .= ", entity";
 $sql .= " FROM ".MAIN_DB_PREFIX."const";
-if (empty($conf->multicompany->enabled)) {
+if (!isModEnabled('multicompany')) {
 	// If no multicompany mode, admins can see global and their constantes
 	$sql .= " WHERE entity IN (0,".$conf->entity.")";
 } else {
@@ -526,7 +526,7 @@ if ($resql) {
 			print dol_escape_htmltag($obj->value);
 		}
 		print '</td>'."\n";
-		if (empty($conf->multicompany->enabled) || !$user->entity) {
+		if (!isModEnabled('multicompany') || !$user->entity) {
 			print '<td class="center" width="80px">'.$obj->entity.'</td>'."\n"; // If superadmin or multicompany disabled
 		}
 		print "</tr>\n";

From f2069d0c5f378e6a8aa6d91268734f26742d5cf3 Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Sun, 28 Aug 2022 13:39:12 +0200
Subject: [PATCH 101/974] FIX php8 compatibility

---
 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 6d6a8edb10f..da7ae901766 100644
--- a/htdocs/admin/tools/listevents.php
+++ b/htdocs/admin/tools/listevents.php
@@ -418,7 +418,7 @@ if ($result) {
 			$userstatic->status = $obj->status;
 
 			print $userstatic->getLoginUrl(1);
-			if (!empty($conf->multicompany->enabled) && $userstatic->admin && !$userstatic->entity) {
+			if (isModEnabled('multicompany') && $userstatic->admin && !$userstatic->entity) {
 				print img_picto($langs->trans("SuperAdministrator"), 'redstar', 'class="valignmiddle paddingleft"');
 			} elseif ($userstatic->admin) {
 				print img_picto($langs->trans("Administrator"), 'star', 'class="valignmiddle paddingleft"');

From 1ec7f640a71be26c4caede435a9a5d137494b627 Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Sun, 28 Aug 2022 13:40:32 +0200
Subject: [PATCH 102/974] FIX php8 compatibility

---
 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 50d97150d6a..576d8f5fb09 100644
--- a/htdocs/bom/class/bom.class.php
+++ b/htdocs/bom/class/bom.class.php
@@ -239,7 +239,7 @@ class BOM extends CommonObject
 		if (empty($conf->global->MAIN_SHOW_TECHNICAL_ID) && isset($this->fields['rowid'])) {
 			$this->fields['rowid']['visible'] = 0;
 		}
-		if (empty($conf->multicompany->enabled) && isset($this->fields['entity'])) {
+		if (!isModEnabled('multicompany') && isset($this->fields['entity'])) {
 			$this->fields['entity']['enabled'] = 0;
 		}
 
@@ -1525,7 +1525,7 @@ class BOMLine extends CommonObjectLine
 		if (empty($conf->global->MAIN_SHOW_TECHNICAL_ID) && isset($this->fields['rowid'])) {
 			$this->fields['rowid']['visible'] = 0;
 		}
-		if (empty($conf->multicompany->enabled) && isset($this->fields['entity'])) {
+		if (!isModEnabled('multicompany') && isset($this->fields['entity'])) {
 			$this->fields['entity']['enabled'] = 0;
 		}
 

From 3bb1a2387b829d6dd2e4f1cc1db9c9ca2e9b0956 Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Sun, 28 Aug 2022 13:42:27 +0200
Subject: [PATCH 103/974] FIX php8 compatibility

---
 htdocs/comm/remx.php | 40 ++++++++++++++++++++--------------------
 1 file changed, 20 insertions(+), 20 deletions(-)

diff --git a/htdocs/comm/remx.php b/htdocs/comm/remx.php
index db1cc06c504..a47a865fc45 100644
--- a/htdocs/comm/remx.php
+++ b/htdocs/comm/remx.php
@@ -424,12 +424,12 @@ if ($socid > 0) {
 			print '<td>'.$langs->trans("ReasonDiscount").'</td>';
 			print '<td class="nowrap">'.$langs->trans("ConsumedBy").'</td>';
 			print '<td class="right">'.$langs->trans("AmountHT").'</td>';
-			if (!empty($conf->multicurrency->enabled)) {
+			if (isModEnabled('multicompany')) {
 				print '<td class="right tdoverflowmax125" title="'.dol_escape_htmltag($langs->trans("MulticurrencyAmountHT")).'">'.$langs->trans("MulticurrencyAmountHT").'</td>';
 			}
 			print '<td class="right">'.$langs->trans("VATRate").'</td>';
 			print '<td class="right">'.$langs->trans("AmountTTC").'</td>';
-			if (!empty($conf->multicurrency->enabled)) {
+			if (isModEnabled('multicompany')) {
 				print '<td class="right tdoverflowmax125" title="'.dol_escape_htmltag($langs->trans("MulticurrencyAmountTTC")).'">'.$langs->trans("MulticurrencyAmountTTC").'</td>';
 			}
 			print '<td width="100" class="center">'.$langs->trans("DiscountOfferedBy").'</td>';
@@ -474,12 +474,12 @@ if ($socid > 0) {
 					}
 					print '<td class="nowrap"><span class="opacitymedium">'.$langs->trans("NotConsumed").'</span></td>';
 					print '<td class="right amount">'.price($obj->amount_ht).'</td>';
-					if (!empty($conf->multicurrency->enabled)) {
+					if (isModEnabled('multicompany')) {
 						print '<td class="right amount">'.price($obj->multicurrency_amount_ht).'</td>';
 					}
 					print '<td class="right">'.vatrate($obj->tva_tx.($obj->vat_src_code ? ' ('.$obj->vat_src_code.')' : ''), true).'</td>';
 					print '<td class="right amount">'.price($obj->amount_ttc).'</td>';
-					if (!empty($conf->multicurrency->enabled)) {
+					if (isModEnabled('multicompany')) {
 						print '<td class="right amount">'.price($obj->multicurrency_amount_ttc).'</td>';
 					}
 					print '<td class="center">';
@@ -503,7 +503,7 @@ if ($socid > 0) {
 				}
 			} else {
 				$colspan = 8;
-				if (!empty($conf->multicurrency->enabled)) {
+				if (isModEnabled('multicompany')) {
 					$colspan += 2;
 				}
 				print '<tr><td colspan="'.$colspan.'" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
@@ -562,12 +562,12 @@ if ($socid > 0) {
 			print '<td>'.$langs->trans("ReasonDiscount").'</td>';
 			print '<td class="nowrap">'.$langs->trans("ConsumedBy").'</td>';
 			print '<td class="right">'.$langs->trans("AmountHT").'</td>';
-			if (!empty($conf->multicurrency->enabled)) {
+			if (isModEnabled('multicompany')) {
 				print '<td class="right tdoverflowmax125" title="'.dol_escape_htmltag($langs->trans("MulticurrencyAmountHT")).'">'.$langs->trans("MulticurrencyAmountHT").'</td>';
 			}
 			print '<td class="right">'.$langs->trans("VATRate").'</td>';
 			print '<td class="right">'.$langs->trans("AmountTTC").'</td>';
-			if (!empty($conf->multicurrency->enabled)) {
+			if (isModEnabled('multicompany')) {
 				print '<td class="right tdoverflowmax125" title="'.dol_escape_htmltag($langs->trans("MulticurrencyAmountTTC")).'">'.$langs->trans("MulticurrencyAmountTTC").'</td>';
 			}
 			print '<td width="100" class="center">'.$langs->trans("DiscountOfferedBy").'</td>';
@@ -612,12 +612,12 @@ if ($socid > 0) {
 					}
 					print '<td class="nowrap"><span class="opacitymedium">'.$langs->trans("NotConsumed").'</span></td>';
 					print '<td class="right amount">'.price($obj->amount_ht).'</td>';
-					if (!empty($conf->multicurrency->enabled)) {
+					if (isModEnabled('multicompany')) {
 						print '<td class="right amount">'.price($obj->multicurrency_amount_ht).'</td>';
 					}
 					print '<td class="right">'.vatrate($obj->tva_tx.($obj->vat_src_code ? ' ('.$obj->vat_src_code.')' : ''), true).'</td>';
 					print '<td class="right amount">'.price($obj->amount_ttc).'</td>';
-					if (!empty($conf->multicurrency->enabled)) {
+					if (isModEnabled('multicompany')) {
 						print '<td class="right amount">'.price($obj->multicurrency_amount_ttc).'</td>';
 					}
 					print '<td class="center">';
@@ -641,7 +641,7 @@ if ($socid > 0) {
 				}
 			} else {
 				$colspan = 8;
-				if (!empty($conf->multicurrency->enabled)) {
+				if (isModEnabled('multicompany')) {
 					$colspan += 2;
 				}
 				print '<tr><td colspan="'.$colspan.'" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
@@ -735,12 +735,12 @@ if ($socid > 0) {
 			print '<td>'.$langs->trans("ReasonDiscount").'</td>';
 			print '<td class="nowrap">'.$langs->trans("ConsumedBy").'</td>';
 			print '<td class="right">'.$langs->trans("AmountHT").'</td>';
-			if (!empty($conf->multicurrency->enabled)) {
+			if (isModEnabled('multicompany')) {
 				print '<td class="right tdoverflowmax125" title="'.dol_escape_htmltag($langs->trans("MulticurrencyAmountHT")).'">'.$langs->trans("MulticurrencyAmountHT").'</td>';
 			}
 			print '<td class="right">'.$langs->trans("VATRate").'</td>';
 			print '<td class="right">'.$langs->trans("AmountTTC").'</td>';
-			if (!empty($conf->multicurrency->enabled)) {
+			if (isModEnabled('multicompany')) {
 				print '<td class="right tdoverflowmax125" title="'.dol_escape_htmltag($langs->trans("MulticurrencyAmountTTC")).'">'.$langs->trans("MulticurrencyAmountTTC").'</td>';
 			}
 			print '<td width="100" class="center">'.$langs->trans("Author").'</td>';
@@ -808,12 +808,12 @@ if ($socid > 0) {
 					}
 					print '</td>';
 					print '<td class="right">'.price($obj->amount_ht).'</td>';
-					if (!empty($conf->multicurrency->enabled)) {
+					if (isModEnabled('multicompany')) {
 						print '<td class="right">'.price($obj->multicurrency_amount_ht).'</td>';
 					}
 					print '<td class="right">'.vatrate($obj->tva_tx.($obj->vat_src_code ? ' ('.$obj->vat_src_code.')' : ''), true).'</td>';
 					print '<td class="right">'.price($obj->amount_ttc).'</td>';
-					if (!empty($conf->multicurrency->enabled)) {
+					if (isModEnabled('multicompany')) {
 						print '<td class="right">'.price($obj->multicurrency_amount_ttc).'</td>';
 					}
 					print '<td class="center">';
@@ -825,7 +825,7 @@ if ($socid > 0) {
 				}
 			} else {
 				$colspan = 8;
-				if (!empty($conf->multicurrency->enabled)) {
+				if (isModEnabled('multicompany')) {
 					$colspan += 2;
 				}
 				print '<tr><td colspan="'.$colspan.'" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
@@ -896,12 +896,12 @@ if ($socid > 0) {
 			print '<td>'.$langs->trans("ReasonDiscount").'</td>';
 			print '<td class="nowrap">'.$langs->trans("ConsumedBy").'</td>';
 			print '<td class="right">'.$langs->trans("AmountHT").'</td>';
-			if (!empty($conf->multicurrency->enabled)) {
+			if (isModEnabled('multicompany')) {
 				print '<td class="right toverflowmax125" title="'.dol_escape_htmltag($langs->trans("MulticurrencyAmountHT")).'">'.$langs->trans("MulticurrencyAmountHT").'</td>';
 			}
 			print '<td class="right">'.$langs->trans("VATRate").'</td>';
 			print '<td class="right">'.$langs->trans("AmountTTC").'</td>';
-			if (!empty($conf->multicurrency->enabled)) {
+			if (isModEnabled('multicompany')) {
 				print '<td class="right tdoverflowmax125" title="'.dol_escape_htmltag($langs->trans("MulticurrencyAmountTTC")).'">'.$langs->trans("MulticurrencyAmountTTC").'</td>';
 			}
 			print '<td width="100" class="center">'.$langs->trans("Author").'</td>';
@@ -969,12 +969,12 @@ if ($socid > 0) {
 					}
 					print '</td>';
 					print '<td class="right">'.price($obj->amount_ht).'</td>';
-					if (!empty($conf->multicurrency->enabled)) {
+					if (isModEnabled('multicompany')) {
 						print '<td class="right">'.price($obj->multicurrency_amount_ht).'</td>';
 					}
 					print '<td class="right">'.vatrate($obj->tva_tx.($obj->vat_src_code ? ' ('.$obj->vat_src_code.')' : ''), true).'</td>';
 					print '<td class="right">'.price($obj->amount_ttc).'</td>';
-					if (!empty($conf->multicurrency->enabled)) {
+					if (isModEnabled('multicompany')) {
 						print '<td class="right">'.price($obj->multicurrency_amount_ttc).'</td>';
 					}
 					print '<td class="center">';
@@ -986,7 +986,7 @@ if ($socid > 0) {
 				}
 			} else {
 				$colspan = 8;
-				if (!empty($conf->multicurrency->enabled)) {
+				if (isModEnabled('multicompany')) {
 					$colspan += 2;
 				}
 				print '<tr><td colspan="'.$colspan.'" class="opacitymedium">'.$langs->trans("None").'</td></tr>';

From 5c6f9281c9b80ade432f8a22bb66b3d9d595ce58 Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Sun, 28 Aug 2022 13:43:12 +0200
Subject: [PATCH 104/974] FIX php8 compatibility

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

diff --git a/htdocs/comm/action/peruser.php b/htdocs/comm/action/peruser.php
index b30ef8f7ba9..f28a3b2f719 100644
--- a/htdocs/comm/action/peruser.php
+++ b/htdocs/comm/action/peruser.php
@@ -901,7 +901,7 @@ while ($currentdaytoshow < $lastdaytoshow) {
 		/* Use this list to have for all users */
 		$sql = "SELECT DISTINCT u.rowid, u.lastname as lastname, u.firstname, u.statut, u.login, u.admin, u.entity";
 		$sql .= " FROM ".MAIN_DB_PREFIX."user as u";
-		if (!empty($conf->multicompany->enabled) && !empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE)) {
+		if (isModEnabled('multicompany') && !empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE)) {
 			$sql .= ", ".MAIN_DB_PREFIX."usergroup_user as ug";
 			$sql .= " WHERE ug.entity IN (".getEntity('usergroup').")";
 			$sql .= " AND ug.fk_user = u.rowid ";

From 3d64296992373ad827aeebd330a745a1fee8339e Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Sun, 28 Aug 2022 13:43:50 +0200
Subject: [PATCH 105/974] FIX php8 compatibility

---
 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 ff242430b0a..eb0d464777a 100644
--- a/htdocs/comm/action/class/actioncommreminder.class.php
+++ b/htdocs/comm/action/class/actioncommreminder.class.php
@@ -149,7 +149,7 @@ class ActionCommReminder extends CommonObject
 		if (empty($conf->global->MAIN_SHOW_TECHNICAL_ID)) {
 			$this->fields['rowid']['visible'] = 0;
 		}
-		if (empty($conf->multicompany->enabled)) {
+		if (!isModEnabled('multicompany')) {
 			$this->fields['entity']['enabled'] = 0;
 		}
 	}

From 42073e394abe9c123e9e686260c07fc8731f2360 Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Sun, 28 Aug 2022 13:45:14 +0200
Subject: [PATCH 106/974] FIX php8 compatibility

---
 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 d48be5e2a21..f063db604e0 100644
--- a/htdocs/knowledgemanagement/class/knowledgerecord.class.php
+++ b/htdocs/knowledgemanagement/class/knowledgerecord.class.php
@@ -187,7 +187,7 @@ class KnowledgeRecord extends CommonObject
 		if (empty($conf->global->MAIN_SHOW_TECHNICAL_ID) && isset($this->fields['rowid'])) {
 			$this->fields['rowid']['visible'] = 0;
 		}
-		if (empty($conf->multicompany->enabled) && isset($this->fields['entity'])) {
+		if (!isModEnabled('multicompany') && isset($this->fields['entity'])) {
 			$this->fields['entity']['enabled'] = 0;
 		}
 

From 3b0b7ec1ee8bead9a9bfc5913d0691c3997457b4 Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Sun, 28 Aug 2022 13:45:54 +0200
Subject: [PATCH 107/974] FIX php8 compatibility

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

diff --git a/htdocs/asset/class/asset.class.php b/htdocs/asset/class/asset.class.php
index 16306e73441..55d2bc07593 100644
--- a/htdocs/asset/class/asset.class.php
+++ b/htdocs/asset/class/asset.class.php
@@ -195,7 +195,7 @@ class Asset extends CommonObject
 		if (empty($conf->global->MAIN_SHOW_TECHNICAL_ID) && isset($this->fields['rowid'])) {
 			$this->fields['rowid']['visible'] = 0;
 		}
-		if (empty($conf->multicompany->enabled) && isset($this->fields['entity'])) {
+		if (!isModEnabled('multicompany') && isset($this->fields['entity'])) {
 			$this->fields['entity']['enabled'] = 0;
 		}
 

From 480e99b19271ae4ac76cc25de354464bea73ba59 Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Sun, 28 Aug 2022 13:46:30 +0200
Subject: [PATCH 108/974] FIX php8 compatibility

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

diff --git a/htdocs/asset/class/assetmodel.class.php b/htdocs/asset/class/assetmodel.class.php
index 6b75702278d..fb574e6ea18 100644
--- a/htdocs/asset/class/assetmodel.class.php
+++ b/htdocs/asset/class/assetmodel.class.php
@@ -160,7 +160,7 @@ class AssetModel extends CommonObject
 		if (empty($conf->global->MAIN_SHOW_TECHNICAL_ID) && isset($this->fields['rowid'])) {
 			$this->fields['rowid']['visible'] = 0;
 		}
-		if (empty($conf->multicompany->enabled) && isset($this->fields['entity'])) {
+		if (!isModEnabled('multicompany') && isset($this->fields['entity'])) {
 			$this->fields['entity']['enabled'] = 0;
 		}
 

From 5f1d6b406fc2c9fb752f41ab9602519dc032dfc1 Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Sun, 28 Aug 2022 13:47:36 +0200
Subject: [PATCH 109/974] FIX php8 compatibility

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

diff --git a/htdocs/comm/mailing/card.php b/htdocs/comm/mailing/card.php
index 748c5fabf10..eb1b50cee1b 100644
--- a/htdocs/comm/mailing/card.php
+++ b/htdocs/comm/mailing/card.php
@@ -258,7 +258,7 @@ if (empty($reshook)) {
 							}
 						}
 						if (!empty($conf->global->MEMBER_ENABLE_PUBLIC)) {
-							$substitutionarray['__PUBLICLINK_NEWMEMBERFORM__'] = '<a target="_blank" rel="noopener noreferrer" href="'.DOL_MAIN_URL_ROOT.'/public/members/new.php'.((!empty($conf->multicompany->enabled)) ? '?entity='.$conf->entity : '').'">'.$langs->trans('BlankSubscriptionForm'). '</a>';
+							$substitutionarray['__PUBLICLINK_NEWMEMBERFORM__'] = '<a target="_blank" rel="noopener noreferrer" href="'.DOL_MAIN_URL_ROOT.'/public/members/new.php'.((isModEnabled('multicompany')) ? '?entity='.$conf->entity : '').'">'.$langs->trans('BlankSubscriptionForm'). '</a>';
 						}
 						/* For backward compatibility, deprecated */
 						if (!empty($conf->paypal->enabled) && !empty($conf->global->PAYPAL_SECURITY_TOKEN)) {

From 87c7ffc4edd6927adc20350346bf9334848c0cbd Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Sun, 28 Aug 2022 13:48:32 +0200
Subject: [PATCH 110/974] FIX php8 compatibility

---
 htdocs/compta/accounting-files.php | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/htdocs/compta/accounting-files.php b/htdocs/compta/accounting-files.php
index 5e6ef3bbedf..f2f9d6e3f56 100644
--- a/htdocs/compta/accounting-files.php
+++ b/htdocs/compta/accounting-files.php
@@ -117,7 +117,7 @@ if ($user->socid > 0) {
 
 // Define $arrayofentities if multientity is set.
 $arrayofentities = array();
-if (!empty($conf->multicompany->enabled) && is_object($mc)) {
+if (isModEnabled('multicompany') && is_object($mc)) {
 	$arrayofentities = $mc->getEntitiesList();
 }
 
@@ -696,14 +696,14 @@ if (!empty($date_start) && !empty($date_stop)) {
 	print '<td class="center">'.$langs->trans("Code").'</td>';
 	print '<td class="center">'.$langs->trans("Country").'</td>';
 	print '<td class="center">'.$langs->trans("VATIntra").'</td>';
-	if (!empty($conf->multicurrency->enabled)) {
+	if (isModEnabled('multicompany')) {
 		print '<td class="center">'.$langs->trans("Currency").'</td>';
 	}
 	print '</tr>';
 
 	if (empty($TData)) {
 		print '<tr class="oddeven"><td colspan="13"><span class="opacitymedium">'.$langs->trans("NoRecordFound").'</span></td>';
-		if (!empty($conf->multicurrency->enabled)) {
+		if (isModEnabled('multicompany')) {
 			print '<td></td>';
 		}
 		print '</tr>';
@@ -833,7 +833,7 @@ if (!empty($date_start) && !empty($date_stop)) {
 				$totalVAT_debit -= $data['amount_vat'];
 			}
 
-			if (!empty($conf->multicurrency->enabled)) {
+			if (isModEnabled('multicompany')) {
 				print '<td class="center">'.$data['currency']."</td>\n";
 			}
 
@@ -847,7 +847,7 @@ if (!empty($date_start) && !empty($date_stop)) {
 		print '<td align="right">'.price(price2num($totalIT_credit, 'MT')).'</td>';
 		print '<td align="right">'.price(price2num($totalVAT_credit, 'MT')).'</td>';
 		print '<td colspan="4"></td>';
-		if (!empty($conf->multicurrency->enabled)) {
+		if (isModEnabled('multicompany')) {
 			print '<td></td>';
 		}
 		print "</tr>\n";
@@ -858,7 +858,7 @@ if (!empty($date_start) && !empty($date_stop)) {
 		print '<td align="right">'.price(price2num($totalIT_debit, 'MT')).'</td>';
 		print '<td align="right">'.price(price2num($totalVAT_debit, 'MT')).'</td>';
 		print '<td colspan="4"></td>';
-		if (!empty($conf->multicurrency->enabled)) {
+		if (isModEnabled('multicompany')) {
 			print '<td></td>';
 		}
 		print "</tr>\n";
@@ -869,7 +869,7 @@ if (!empty($date_start) && !empty($date_stop)) {
 		print '<td align="right">'.price(price2num($totalIT_credit + $totalIT_debit, 'MT')).'</td>';
 		print '<td align="right">'.price(price2num($totalVAT_credit + $totalVAT_debit, 'MT')).'</td>';
 		print '<td colspan="4"></td>';
-		if (!empty($conf->multicurrency->enabled)) {
+		if (isModEnabled('multicompany')) {
 			print '<td></td>';
 		}
 		print "</tr>\n";

From c0154f4ac8fe6b292197c3b9cdc916dd8d9c92ea Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Sun, 28 Aug 2022 13:49:41 +0200
Subject: [PATCH 111/974] FIX php8 compatibility

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

diff --git a/htdocs/compta/accounting-files.php b/htdocs/compta/accounting-files.php
index f2f9d6e3f56..30d2bedcf14 100644
--- a/htdocs/compta/accounting-files.php
+++ b/htdocs/compta/accounting-files.php
@@ -122,7 +122,7 @@ if (isModEnabled('multicompany') && is_object($mc)) {
 }
 
 $entity = (GETPOSTISSET('entity') ? GETPOST('entity', 'int') : (GETPOSTISSET('search_entity') ? GETPOST('search_entity', 'int') : $conf->entity));
-if (!empty($conf->multicompany->enabled) && is_object($mc)) {
+if (isModEnabled('multicompany') && is_object($mc)) {
 	if (empty($entity) && !empty($conf->global->MULTICOMPANY_ALLOW_EXPORT_ACCOUNTING_DOC_FOR_ALL_ENTITIES)) {
 		$entity = '0,'.join(',', array_keys($arrayofentities));
 	}
@@ -456,7 +456,7 @@ if ($result && $action == "dl" && !$error) {
 	dol_mkdir($dirfortmpfile);
 
 	$log = $langs->transnoentitiesnoconv("Type");
-	if (!empty($conf->multicompany->enabled) && is_object($mc)) {
+	if (isModEnabled('multicompany') && is_object($mc)) {
 		$log .= ','.$langs->transnoentitiesnoconv("Entity");
 	}
 	$log .= ','.$langs->transnoentitiesnoconv("Date");
@@ -498,7 +498,7 @@ if ($result && $action == "dl" && !$error) {
 			}
 
 			$log .= '"'.$langs->trans($file['item']).'"';
-			if (!empty($conf->multicompany->enabled) && is_object($mc)) {
+			if (isModEnabled('multicompany') && is_object($mc)) {
 				$log .= ',"'.(empty($arrayofentities[$file['entity']]) ? $file['entity'] : $arrayofentities[$file['entity']]).'"';
 			}
 			$log .= ','.dol_print_date($file['date'], 'dayrfc');
@@ -583,7 +583,7 @@ print "\n";
 
 // Export is for current company only
 $socid = 0;
-if (!empty($conf->multicompany->enabled) && is_object($mc)) {
+if (isModEnabled('multicompany') && is_object($mc)) {
 	$mc->getInfo($conf->entity);
 	print '<span class="marginleftonly marginrightonly'.(empty($conf->global->MULTICOMPANY_ALLOW_EXPORT_ACCOUNTING_DOC_FOR_ALL_ENTITIES) ? ' opacitymedium' : '').'">('.$langs->trans("Entity").' : ';
 	print "<td>";

From ee1392b3470511712464d5878da390a18003d4e1 Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Sun, 28 Aug 2022 13:50:25 +0200
Subject: [PATCH 112/974] FIX php8 compatibility

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

diff --git a/htdocs/core/multicompany_page.php b/htdocs/core/multicompany_page.php
index 4a3bcba51fb..690c971fd23 100644
--- a/htdocs/core/multicompany_page.php
+++ b/htdocs/core/multicompany_page.php
@@ -92,7 +92,7 @@ print '<div>';
 //print '<br>';
 
 
-if (empty($conf->multicompany->enabled)) {
+if (!isModEnabled('multicompany')) {
 	$langs->load("admin");
 	$bookmarkList .= '<br><span class="opacitymedium">'.$langs->trans("WarningModuleNotActive", $langs->transnoentitiesnoconv("MultiCompany")).'</span>';
 	$bookmarkList .= '<br><br>';

From 51fb06ed6752161b6e425e44a659ef593ed33a9d Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Sun, 28 Aug 2022 13:50:58 +0200
Subject: [PATCH 113/974] FIX php8 compatibility

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

diff --git a/htdocs/compta/paiement/card.php b/htdocs/compta/paiement/card.php
index 54b1e0e7bcd..235b0a0af4f 100644
--- a/htdocs/compta/paiement/card.php
+++ b/htdocs/compta/paiement/card.php
@@ -425,7 +425,7 @@ if ($resql) {
 	print '<tr class="liste_titre">';
 	print '<td>'.$langs->trans('Bill').'</td>';
 	print '<td>'.$langs->trans('Company').'</td>';
-	if (!empty($conf->multicompany->enabled) && !empty($conf->global->MULTICOMPANY_INVOICE_SHARING_ENABLED)) {
+	if (isModEnabled('multicompany') && !empty($conf->global->MULTICOMPANY_INVOICE_SHARING_ENABLED)) {
 		print '<td>'.$langs->trans('Entity').'</td>';
 	}
 	print '<td class="right">'.$langs->trans('ExpectedToPay').'</td>';

From b886210df3b365d358be1755989b9f9260627461 Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Sun, 28 Aug 2022 13:51:29 +0200
Subject: [PATCH 114/974] FIX php8 compatibility

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

diff --git a/htdocs/compta/paiement/card.php b/htdocs/compta/paiement/card.php
index 235b0a0af4f..f163041a43a 100644
--- a/htdocs/compta/paiement/card.php
+++ b/htdocs/compta/paiement/card.php
@@ -462,7 +462,7 @@ if ($resql) {
 			print '</td>';
 
 			// Expected to pay
-			if (!empty($conf->multicompany->enabled) && !empty($conf->global->MULTICOMPANY_INVOICE_SHARING_ENABLED)) {
+			if (isModEnabled('multicompany') && !empty($conf->global->MULTICOMPANY_INVOICE_SHARING_ENABLED)) {
 				print '<td>';
 				$mc->getInfo($objp->entity);
 				print $mc->label;

From 9d188a5c96834ed9f51211f4722ed7c6cc63a725 Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Sun, 28 Aug 2022 13:52:03 +0200
Subject: [PATCH 115/974] FIX php8 compatibility

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

diff --git a/htdocs/core/ajax/onlineSign.php b/htdocs/core/ajax/onlineSign.php
index 0f4d274cc0d..5f59abea0b5 100644
--- a/htdocs/core/ajax/onlineSign.php
+++ b/htdocs/core/ajax/onlineSign.php
@@ -73,7 +73,7 @@ if ($type == 'proposal') {
 	$securekeyseed = getDolGlobalString('PROPOSAL_ONLINE_SIGNATURE_SECURITY_TOKEN');
 }
 
-if (empty($SECUREKEY) || !dol_verifyHash($securekeyseed.$type.$ref.(empty($conf->multicompany->enabled) ? '' : $entity), $SECUREKEY, '0')) {
+if (empty($SECUREKEY) || !dol_verifyHash($securekeyseed.$type.$ref.(!isModEnabled('multicompany') ? '' : $entity), $SECUREKEY, '0')) {
 	http_response_code(403);
 	print 'Bad value for securitykey. Value provided '.dol_escape_htmltag($SECUREKEY).' does not match expected value for ref='.dol_escape_htmltag($ref);
 	exit(-1);

From b43527de8fa4cb8e327f9f651090cf5751dce6ed Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Sun, 28 Aug 2022 13:52:48 +0200
Subject: [PATCH 116/974] FIX php8 compatibility

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

diff --git a/htdocs/core/class/conf.class.php b/htdocs/core/class/conf.class.php
index 626052551d5..234f8d80e0c 100644
--- a/htdocs/core/class/conf.class.php
+++ b/htdocs/core/class/conf.class.php
@@ -371,7 +371,7 @@ class Conf
 			}
 
 			// Object $mc
-			if (!defined('NOREQUIREMC') && !empty($this->multicompany->enabled)) {
+			if (!defined('NOREQUIREMC') && isModEnabled('multicompany')) {
 				global $mc;
 				$ret = @dol_include_once('/multicompany/class/actions_multicompany.class.php');
 				if ($ret) {
@@ -425,7 +425,7 @@ class Conf
 			$rootfordata = DOL_DATA_ROOT;
 			$rootforuser = DOL_DATA_ROOT;
 			// If multicompany module is enabled, we redefine the root of data
-			if (!empty($this->multicompany->enabled) && !empty($this->entity) && $this->entity > 1) {
+			if (isModEnabled('multicompany') && !empty($this->entity) && $this->entity > 1) {
 				$rootfordata .= '/'.$this->entity;
 			}
 			// Set standard temporary folder name or global override
@@ -987,7 +987,7 @@ class Conf
 			}
 
 			// Object $mc
-			if (!defined('NOREQUIREMC') && !empty($this->multicompany->enabled)) {
+			if (!defined('NOREQUIREMC') && isModEnabled('multicompany')) {
 				if (is_object($mc)) {
 					$mc->setValues($this);
 				}

From aca217a58572772151ccf2d1267962419fd989c1 Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Sun, 28 Aug 2022 13:53:31 +0200
Subject: [PATCH 117/974] FIX php8 compatibility

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

diff --git a/htdocs/core/class/emailsenderprofile.class.php b/htdocs/core/class/emailsenderprofile.class.php
index b5b1619443b..583dd7faca0 100644
--- a/htdocs/core/class/emailsenderprofile.class.php
+++ b/htdocs/core/class/emailsenderprofile.class.php
@@ -149,7 +149,7 @@ class EmailSenderProfile extends CommonObject
 		if (empty($conf->global->MAIN_SHOW_TECHNICAL_ID)) {
 			$this->fields['rowid']['visible'] = 0;
 		}
-		if (empty($conf->multicompany->enabled)) {
+		if (!isModEnabled('multicompany')) {
 			$this->fields['entity']['enabled'] = 0;
 		}
 	}

From 1c64cbec6c08ced9509fe5d9c2e62ba25f68f5f0 Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Sun, 28 Aug 2022 13:54:52 +0200
Subject: [PATCH 118/974] FIX php8 compatibility

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

diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 0f0a17fe365..7b46531e2a9 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -1961,11 +1961,11 @@ class Form
 
 		// Forge request to select users
 		$sql = "SELECT DISTINCT u.rowid, u.lastname as lastname, u.firstname, u.statut as status, u.login, u.admin, u.entity, u.photo";
-		if (!empty($conf->multicompany->enabled) && $conf->entity == 1 && $user->admin && !$user->entity) {
+		if (isModEnabled('multicompany') && $conf->entity == 1 && $user->admin && !$user->entity) {
 			$sql .= ", e.label";
 		}
 		$sql .= " FROM ".$this->db->prefix()."user as u";
-		if (!empty($conf->multicompany->enabled) && $conf->entity == 1 && $user->admin && !$user->entity) {
+		if (isModEnabled('multicompany') && $conf->entity == 1 && $user->admin && !$user->entity) {
 			$sql .= " LEFT JOIN ".$this->db->prefix()."entity as e ON e.rowid = u.entity";
 			if ($force_entity) {
 				$sql .= " WHERE u.entity IN (0, ".$this->db->sanitize($force_entity).")";
@@ -1973,7 +1973,7 @@ class Form
 				$sql .= " WHERE u.entity IS NOT NULL";
 			}
 		} else {
-			if (!empty($conf->multicompany->enabled) && !empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE)) {
+			if (isModEnabled('multicompany') && !empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE)) {
 				$sql .= " LEFT JOIN ".$this->db->prefix()."usergroup_user as ug";
 				$sql .= " ON ug.fk_user = u.rowid";
 				$sql .= " WHERE ug.entity = ".$conf->entity;
@@ -2075,7 +2075,7 @@ class Form
 							$moreinfo .= ($moreinfo ? ' - ' : ' (').$langs->trans('Disabled');
 						}
 					}
-					if (!empty($conf->multicompany->enabled) && empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE) && $conf->entity == 1 && $user->admin && !$user->entity) {
+					if (isModEnabled('multicompany') && empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE) && $conf->entity == 1 && $user->admin && !$user->entity) {
 						if (!$obj->entity) {
 							$moreinfo .= ($moreinfo ? ' - ' : ' (').$langs->trans("AllEntities");
 						} else {
@@ -9030,7 +9030,7 @@ class Form
 		/*
 		$addadmin = '';
 		if (property_exists($object, 'admin')) {
-			if (!empty($conf->multicompany->enabled) && !empty($object->admin) && empty($object->entity)) {
+			if (isModEnabled('multicompany') && !empty($object->admin) && empty($object->entity)) {
 				$addadmin .= img_picto($langs->trans("SuperAdministratorDesc"), "redstar", 'class="paddingleft"');
 			} elseif (!empty($object->admin)) {
 				$addadmin .= img_picto($langs->trans("AdministratorDesc"), "star", 'class="paddingleft"');
@@ -9477,11 +9477,11 @@ class Form
 
 		// On recherche les groupes
 		$sql = "SELECT ug.rowid, ug.nom as name";
-		if (!empty($conf->multicompany->enabled) && $conf->entity == 1 && $user->admin && !$user->entity) {
+		if (isModEnabled('multicompany') && $conf->entity == 1 && $user->admin && !$user->entity) {
 			$sql .= ", e.label";
 		}
 		$sql .= " FROM ".$this->db->prefix()."usergroup as ug ";
-		if (!empty($conf->multicompany->enabled) && $conf->entity == 1 && $user->admin && !$user->entity) {
+		if (isModEnabled('multicompany') && $conf->entity == 1 && $user->admin && !$user->entity) {
 			$sql .= " LEFT JOIN ".$this->db->prefix()."entity as e ON e.rowid=ug.entity";
 			if ($force_entity) {
 				$sql .= " WHERE ug.entity IN (0, ".$force_entity.")";
@@ -9531,7 +9531,7 @@ class Form
 					$out .= '>';
 
 					$out .= $obj->name;
-					if (!empty($conf->multicompany->enabled) && empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE) && $conf->entity == 1) {
+					if (isModEnabled('multicompany') && empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE) && $conf->entity == 1) {
 						$out .= " (".$obj->label.")";
 					}
 

From 388299827bffcdc3acb4ffeb3f4445b457a75de2 Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Sun, 28 Aug 2022 13:55:20 +0200
Subject: [PATCH 119/974] FIX php8 compatibility

---
 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 278b5d5e0e6..57939f307a7 100644
--- a/htdocs/core/class/defaultvalues.class.php
+++ b/htdocs/core/class/defaultvalues.class.php
@@ -148,7 +148,7 @@ class DefaultValues extends CommonObject
 		if (empty($conf->global->MAIN_SHOW_TECHNICAL_ID) && isset($this->fields['rowid'])) {
 			$this->fields['rowid']['visible'] = 0;
 		}
-		if (empty($conf->multicompany->enabled) && isset($this->fields['entity'])) {
+		if (!isModEnabled('multicompany') && isset($this->fields['entity'])) {
 			$this->fields['entity']['enabled'] = 0;
 		}
 

From c278fdd7a6c21f8e37ac5ed00eff86b9ce4adb7d Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Sun, 28 Aug 2022 13:55:48 +0200
Subject: [PATCH 120/974] FIX php8 compatibility

---
 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 d5a887fd40b..98b1fbd6593 100644
--- a/htdocs/core/class/html.formfile.class.php
+++ b/htdocs/core/class/html.formfile.class.php
@@ -992,7 +992,7 @@ class FormFile
 		$entity = 1; // Without multicompany
 
 		// Get object entity
-		if (!empty($conf->multicompany->enabled)) {
+		if (isModEnabled('multicompany')) {
 			$regs = array();
 			preg_match('/\/([0-9]+)\/[^\/]+\/'.preg_quote($modulesubdir, '/').'$/', $filedir, $regs);
 			$entity = ((!empty($regs[1]) && $regs[1] > 1) ? $regs[1] : 1); // If entity id not found in $filedir this is entity 1 by default

From 8c59c7f4be62f6e859796392e6c4aa57555ff608 Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Sun, 28 Aug 2022 13:56:41 +0200
Subject: [PATCH 121/974] FIX php8 compatibility

---
 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 d306990daaa..147938fb53a 100644
--- a/htdocs/core/lib/files.lib.php
+++ b/htdocs/core/lib/files.lib.php
@@ -2421,7 +2421,7 @@ function dol_check_secure_access_document($modulepart, $original_file, $entity,
 		return 'ErrorBadParameter';
 	}
 	if (empty($entity)) {
-		if (empty($conf->multicompany->enabled)) {
+		if (!isModEnabled('multicompany')) {
 			$entity = 1;
 		} else {
 			$entity = 0;

From f98f0bbf6a6eb0a134e35b898b8745ece0934bfb Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Sun, 28 Aug 2022 13:57:09 +0200
Subject: [PATCH 122/974] FIX php8 compatibility

---
 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 71161d77c64..3174fb132cd 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -7812,7 +7812,7 @@ function getCommonSubstitutionArray($outputlangs, $onlykey = 0, $exclude = null,
 		));
 	}
 
-	if (!empty($conf->multicompany->enabled)) {
+	if (isModEnabled('multicompany')) {
 		$substitutionarray = array_merge($substitutionarray, array('__ENTITY_ID__' => $conf->entity));
 	}
 	if (empty($exclude) || !in_array('system', $exclude)) {

From 4e51fca845bfc81c1d93a6989d337bb01b85d316 Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Sun, 28 Aug 2022 13:57:34 +0200
Subject: [PATCH 123/974] FIX php8 compatibility

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

diff --git a/htdocs/core/lib/payments.lib.php b/htdocs/core/lib/payments.lib.php
index 809b5f8dc73..5c9d9342b01 100644
--- a/htdocs/core/lib/payments.lib.php
+++ b/htdocs/core/lib/payments.lib.php
@@ -393,7 +393,7 @@ function getOnlinePaymentUrl($mode, $type, $ref = '', $amount = '9.99', $freetag
 	}
 
 	// For multicompany
-	if (!empty($out) && !empty($conf->multicompany->enabled)) {
+	if (!empty($out) && isModEnabled('multicompany')) {
 		$out .= "&entity=".$conf->entity; // Check the entity because we may have the same reference in several entities
 	}
 

From f238597c2d478cf8e551d482c003a6a69ebee477 Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Sun, 28 Aug 2022 13:58:13 +0200
Subject: [PATCH 124/974] FIX php8 compatibility

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

diff --git a/htdocs/core/lib/security.lib.php b/htdocs/core/lib/security.lib.php
index cffed35070d..79b020b4883 100644
--- a/htdocs/core/lib/security.lib.php
+++ b/htdocs/core/lib/security.lib.php
@@ -796,7 +796,7 @@ function checkUserAccessToObject($user, array $featuresarray, $object = 0, $tabl
 		if (in_array($feature, $check) && $objectid > 0) {		// For $objectid = 0, no check
 			$sql = "SELECT COUNT(dbt.".$dbt_select.") as nb";
 			$sql .= " FROM ".MAIN_DB_PREFIX.$dbtablename." as dbt";
-			if (($feature == 'user' || $feature == 'usergroup') && !empty($conf->multicompany->enabled)) {	// Special for multicompany
+			if (($feature == 'user' || $feature == 'usergroup') && isModEnabled('multicompany')) {	// Special for multicompany
 				if (!empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE)) {
 					if ($conf->entity == 1 && $user->admin && !$user->entity) {
 						$sql .= " WHERE dbt.".$dbt_select." IN (".$db->sanitize($objectid, 1).")";
@@ -840,7 +840,7 @@ function checkUserAccessToObject($user, array $featuresarray, $object = 0, $tabl
 				$sql .= " AND sc.fk_user = ".((int) $user->id);
 				$sql .= " AND sc.fk_soc = s.rowid";
 				$sql .= " AND s.entity IN (".getEntity($sharedelement, 1).")";
-			} elseif (!empty($conf->multicompany->enabled)) {
+			} elseif (isModEnabled('multicompany')) {
 				// If multicompany and internal users with all permissions, check user is in correct entity
 				$sql = "SELECT COUNT(s.rowid) as nb";
 				$sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
@@ -865,7 +865,7 @@ function checkUserAccessToObject($user, array $featuresarray, $object = 0, $tabl
 				$sql .= " WHERE dbt.".$dbt_select." IN (".$db->sanitize($objectid, 1).")";
 				$sql .= " AND (dbt.fk_soc IS NULL OR sc.fk_soc IS NOT NULL)"; // Contact not linked to a company or to a company of user
 				$sql .= " AND dbt.entity IN (".getEntity($sharedelement, 1).")";
-			} elseif (!empty($conf->multicompany->enabled)) {
+			} elseif (isModEnabled('multicompany')) {
 				// If multicompany and internal users with all permissions, check user is in correct entity
 				$sql = "SELECT COUNT(dbt.".$dbt_select.") as nb";
 				$sql .= " FROM ".MAIN_DB_PREFIX.$dbtablename." as dbt";
@@ -951,7 +951,7 @@ function checkUserAccessToObject($user, array $featuresarray, $object = 0, $tabl
 					$sql .= " AND dbt.entity IN (".getEntity($sharedelement, 1).")";
 					$sql .= " AND (sc.fk_user = ".((int) $user->id)." OR sc.fk_user IS NULL)";
 				}
-			} elseif (!empty($conf->multicompany->enabled)) {
+			} elseif (isModEnabled('multicompany')) {
 				// If multicompany and internal users with all permissions, check user is in correct entity
 				$sql = "SELECT COUNT(dbt.".$dbt_select.") as nb";
 				$sql .= " FROM ".MAIN_DB_PREFIX.$dbtablename." as dbt";

From 9998b11d576eccef1f1e9f78898eedd8943475a0 Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Sun, 28 Aug 2022 14:00:22 +0200
Subject: [PATCH 125/974] FIX php8 compatibility

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

diff --git a/htdocs/core/lib/signature.lib.php b/htdocs/core/lib/signature.lib.php
index 1dbefb5719a..d2f0c64f463 100644
--- a/htdocs/core/lib/signature.lib.php
+++ b/htdocs/core/lib/signature.lib.php
@@ -90,7 +90,7 @@ function getOnlineSignatureUrl($mode, $type, $ref = '', $localorexternal = 1)
 		if ($mode == 1) {
 			$out .= "hash('".$securekeyseed."' + '".$type."' + proposal_ref)";
 		} else {
-			$out .= '&securekey='.dol_hash($securekeyseed.$type.$ref.(empty($conf->multicompany->enabled) ? '' : $object->entity), '0');
+			$out .= '&securekey='.dol_hash($securekeyseed.$type.$ref.(!isModEnabled('multicompany') ? '' : $object->entity), '0');
 		}
 		/*
 		if ($mode == 1) {
@@ -119,7 +119,7 @@ function getOnlineSignatureUrl($mode, $type, $ref = '', $localorexternal = 1)
 	}
 
 	// For multicompany
-	if (!empty($out) && !empty($conf->multicompany->enabled)) {
+	if (!empty($out) && isModEnabled('multicompany')) {
 		$out .= "&entity=".$conf->entity; // Check the entity because we may have the same reference in several entities
 	}
 

From 352382bced470f9281b38472be683802e510597e Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Sun, 28 Aug 2022 14:02:16 +0200
Subject: [PATCH 126/974] FIX php8 compatibility

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

diff --git a/htdocs/core/login/functions_dolibarr.php b/htdocs/core/login/functions_dolibarr.php
index 610072aa35a..c4825998b3a 100644
--- a/htdocs/core/login/functions_dolibarr.php
+++ b/htdocs/core/login/functions_dolibarr.php
@@ -40,7 +40,7 @@ function check_user_password_dolibarr($usertotest, $passwordtotest, $entitytotes
 
 	// Force master entity in transversal mode
 	$entity = $entitytotest;
-	if (!empty($conf->multicompany->enabled) && !empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE)) {
+	if (isModEnabled('multicompany') && !empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE)) {
 		$entity = 1;
 	}
 
@@ -134,11 +134,11 @@ function check_user_password_dolibarr($usertotest, $passwordtotest, $entitytotes
 				}
 
 				// We must check entity
-				if ($passok && !empty($conf->multicompany->enabled)) {	// We must check entity
+				if ($passok && isModEnabled('multicompany')) {	// We must check entity
 					global $mc;
 
 					if (!isset($mc)) {
-						$conf->multicompany->enabled = false; // Global not available, disable $conf->multicompany->enabled for safety
+						!isModEnabled('multicompany'); // Global not available, disable $conf->multicompany->enabled for safety
 					} else {
 						$ret = $mc->checkRight($obj->rowid, $entitytotest);
 						if ($ret < 0) {

From 5877a85284f27d4d771a6480568aac21c267bb2a Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Sun, 28 Aug 2022 14:03:41 +0200
Subject: [PATCH 127/974] FIX php8 compatibility

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

diff --git a/htdocs/core/login/functions_ldap.php b/htdocs/core/login/functions_ldap.php
index 022186b8de1..18800c3a19e 100644
--- a/htdocs/core/login/functions_ldap.php
+++ b/htdocs/core/login/functions_ldap.php
@@ -46,7 +46,7 @@ function check_user_password_ldap($usertotest, $passwordtotest, $entitytotest)
 
 	// Force master entity in transversal mode
 	$entity = $entitytotest;
-	if (!empty($conf->multicompany->enabled) && !empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE)) {
+	if (isModEnabled('multicompany') && !empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE)) {
 		$entity = 1;
 	}
 
@@ -228,7 +228,7 @@ function check_user_password_ldap($usertotest, $passwordtotest, $entitytotest)
 					unset($usertmp);
 				}
 
-				if (!empty($conf->multicompany->enabled)) {	// We must check entity (even if sync is not active)
+				if (isModEnabled('multicompany')) {	// We must check entity (even if sync is not active)
 					global $mc;
 
 					$usertmp = new User($db);

From c71ca44ff7542331cb490b253571f22fdbf79323 Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Sun, 28 Aug 2022 14:04:21 +0200
Subject: [PATCH 128/974] FIX php8 compatibility

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

diff --git a/htdocs/core/modules/modCommande.class.php b/htdocs/core/modules/modCommande.class.php
index 70f06169394..4f2b58ff00d 100644
--- a/htdocs/core/modules/modCommande.class.php
+++ b/htdocs/core/modules/modCommande.class.php
@@ -221,7 +221,7 @@ class modCommande extends DolibarrModules
 		// Add multicompany field
 		if (!empty($conf->global->MULTICOMPANY_ENTITY_IN_EXPORT_IF_SHARED)) {
 			$nbofallowedentities = count(explode(',', getEntity('commande')));
-			if (!empty($conf->multicompany->enabled) && $nbofallowedentities > 1) {
+			if (isModEnabled('multicompany') && $nbofallowedentities > 1) {
 				$this->export_fields_array[$r]['c.entity'] = 'Entity';
 			}
 		}

From 5333f9b656e70a352fd54f88a02386078d8ca562 Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Sun, 28 Aug 2022 14:04:45 +0200
Subject: [PATCH 129/974] FIX php8 compatibility

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

diff --git a/htdocs/core/modules/modFacture.class.php b/htdocs/core/modules/modFacture.class.php
index 3cea4f0ff92..a819dae666c 100644
--- a/htdocs/core/modules/modFacture.class.php
+++ b/htdocs/core/modules/modFacture.class.php
@@ -538,7 +538,7 @@ class modFacture extends DolibarrModules
 		// Add multicompany field
 		if (!empty($conf->global->MULTICOMPANY_ENTITY_IN_EXPORT_IF_SHARED)) {
 			$nbofallowedentities = count(explode(',', getEntity('invoice')));
-			if (!empty($conf->multicompany->enabled) && $nbofallowedentities > 1) {
+			if (isModEnabled('multicompany') && $nbofallowedentities > 1) {
 				$this->export_fields_array[$r]['f.entity'] = 'Entity';
 			}
 		}

From de97379f3fbc0bbbd0fe20a1404aeeb5f56cd18d Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Sun, 28 Aug 2022 14:05:07 +0200
Subject: [PATCH 130/974] FIX php8 compatibility

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

diff --git a/htdocs/core/modules/modProjet.class.php b/htdocs/core/modules/modProjet.class.php
index ebfba5d95b9..5f1ad7d2099 100644
--- a/htdocs/core/modules/modProjet.class.php
+++ b/htdocs/core/modules/modProjet.class.php
@@ -246,7 +246,7 @@ class modProjet extends DolibarrModules
 		// Add multicompany field
 		if (!empty($conf->global->MULTICOMPANY_ENTITY_IN_EXPORT_IF_SHARED)) {
 			$nbofallowedentities = count(explode(',', getEntity('project'))); // If project are shared, nb will be > 1
-			if (!empty($conf->multicompany->enabled) && $nbofallowedentities > 1) {
+			if (isModEnabled('multicompany') && $nbofallowedentities > 1) {
 				$this->export_fields_array[$r] += array('p.entity'=>'Entity');
 			}
 		}

From 9c53fe07a073a29e6889d5ae215a002000d5c70c Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Sun, 28 Aug 2022 14:05:37 +0200
Subject: [PATCH 131/974] FIX php8 compatibility

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

diff --git a/htdocs/core/modules/modPropale.class.php b/htdocs/core/modules/modPropale.class.php
index f6443e6c992..13991cdcafa 100644
--- a/htdocs/core/modules/modPropale.class.php
+++ b/htdocs/core/modules/modPropale.class.php
@@ -207,7 +207,7 @@ class modPropale extends DolibarrModules
 		// Add multicompany field
 		if (!empty($conf->global->MULTICOMPANY_ENTITY_IN_EXPORT_IF_SHARED)) {
 			$nbofallowedentities = count(explode(',', getEntity('propal')));
-			if (!empty($conf->multicompany->enabled) && $nbofallowedentities > 1) {
+			if (isModEnabled('multicompany') && $nbofallowedentities > 1) {
 				$this->export_fields_array[$r]['c.entity'] = 'Entity';
 			}
 		}

From 03298876434a0d2e6d064741e015918f98d59d26 Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Sun, 28 Aug 2022 14:06:04 +0200
Subject: [PATCH 132/974] FIX php8 compatibility

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

diff --git a/htdocs/core/modules/modSociete.class.php b/htdocs/core/modules/modSociete.class.php
index ff5edd3eeb4..c98dd06b488 100644
--- a/htdocs/core/modules/modSociete.class.php
+++ b/htdocs/core/modules/modSociete.class.php
@@ -295,7 +295,7 @@ class modSociete extends DolibarrModules
 		// Add multicompany field
 		if (!empty($conf->global->MULTICOMPANY_ENTITY_IN_EXPORT_IF_SHARED)) {
 			$nbofallowedentities = count(explode(',', getEntity('societe'))); // If project are shared, nb will be > 1
-			if (!empty($conf->multicompany->enabled) && $nbofallowedentities > 1) {
+			if (isModEnabled('multicompany') && $nbofallowedentities > 1) {
 				$this->export_fields_array[$r] += array('s.entity'=>'Entity');
 			}
 		}
@@ -379,7 +379,7 @@ class modSociete extends DolibarrModules
 		);
 		// Add multicompany field
 		if (! empty($conf->global->MULTICOMPANY_ENTITY_IN_EXPORT_IF_SHARED)) {
-			if (!empty($conf->multicompany->enabled)) {
+			if (isModEnabled('multicompany')) {
 				$nbofallowedentities = count(explode(',', getEntity('contact')));
 				if ($nbofallowedentities > 1) {
 					$this->export_fields_array[$r]['c.entity'] = 'Entity';

From dce4773607af5b913ed89dea20c985b9551ea769 Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Sun, 28 Aug 2022 14:06:29 +0200
Subject: [PATCH 133/974] FIX php8 compatibility

---
 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 1dbc0861adb..97748290bd7 100644
--- a/htdocs/core/tpl/admin_extrafields_add.tpl.php
+++ b/htdocs/core/tpl/admin_extrafields_add.tpl.php
@@ -205,7 +205,7 @@ $listofexamplesforlink = 'Societe:societe/class/societe.class.php<br>Contact:con
 <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') || GETPOST('button', 'alpha')) ? ' checked' : ''); ?>></td></tr>
 <!-- Help tooltip -->
 <tr class="help"><td><?php echo $form->textwithpicto($langs->trans("HelpOnTooltip"), $langs->trans("HelpOnTooltipDesc")); ?></td><td class="valeur"><input id="help" class="quatrevingtpercent" type="text" name="help" value="<?php echo dol_escape_htmltag((empty($help) ? '' : $help)); ?>"></td></tr>
-<?php if (!empty($conf->multicompany->enabled)) { ?>
+<?php if (isModEnabled('multicompany')) { ?>
 	<!-- Multicompany entity -->
 	<tr><td><?php echo $langs->trans("AllEntities"); ?></td><td class="valeur"><input id="entitycurrentorall" type="checkbox" name="entitycurrentorall"<?php echo (GETPOST('entitycurrentorall', 'alpha') ? '' : ' checked'); ?>></td></tr>
 <?php } ?>

From f43ebf040cc8a0f434fb7fa1cddd129f44bba19f Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Sun, 28 Aug 2022 14:06:52 +0200
Subject: [PATCH 134/974] FIX php8 compatibility

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

diff --git a/htdocs/core/tpl/admin_extrafields_edit.tpl.php b/htdocs/core/tpl/admin_extrafields_edit.tpl.php
index a512222aca2..8dcc1edf017 100644
--- a/htdocs/core/tpl/admin_extrafields_edit.tpl.php
+++ b/htdocs/core/tpl/admin_extrafields_edit.tpl.php
@@ -296,7 +296,7 @@ if (in_array($type, array_keys($typewecanchangeinto))) {
 <!-- Help tooltip -->
 <tr class="help"><td><?php echo $form->textwithpicto($langs->trans("HelpOnTooltip"), $langs->trans("HelpOnTooltipDesc")); ?></td><td class="valeur"><input id="help" class="quatrevingtpercent" type="text" name="help" value="<?php echo dol_escape_htmltag($help); ?>"></td></tr>
 
-<?php if (!empty($conf->multicompany->enabled)) { ?>
+<?php if (isModEnabled('multicompany')) { ?>
 	<!-- Multicompany entity -->
 	<tr><td><?php echo $langs->trans("AllEntities"); ?></td><td class="valeur"><input id="entitycurrentorall" type="checkbox" name="entitycurrentorall"<?php echo (empty($entitycurrentorall) ? ' checked' : ''); ?>></td></tr>
 <?php } ?>

From accd5a74a2693d59fe6bc4d7c0e6c595b010e901 Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Sun, 28 Aug 2022 14:07:20 +0200
Subject: [PATCH 135/974] FIX php8 compatibility

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

diff --git a/htdocs/core/tpl/admin_extrafields_view.tpl.php b/htdocs/core/tpl/admin_extrafields_view.tpl.php
index da1d2d58558..285b7eb30a4 100644
--- a/htdocs/core/tpl/admin_extrafields_view.tpl.php
+++ b/htdocs/core/tpl/admin_extrafields_view.tpl.php
@@ -65,7 +65,7 @@ print '<td class="center">'.$langs->trans("AlwaysEditable").'</td>';
 print '<td class="center">'.$form->textwithpicto($langs->trans("Visible"), $langs->trans("VisibleDesc")).'</td>';
 print '<td class="center">'.$form->textwithpicto($langs->trans("DisplayOnPdf"), $langs->trans("DisplayOnPdfDesc")).'</td>';
 print '<td class="center">'.$form->textwithpicto($langs->trans("Totalizable"), $langs->trans("TotalizableDesc")).'</td>';
-if (!empty($conf->multicompany->enabled)) {
+if (isModEnabled('multicompany')) {
 	print '<td class="center">'.$langs->trans("Entity").'</td>';
 }
 print '<td width="80">&nbsp;</td>';
@@ -113,7 +113,7 @@ if (isset($extrafields->attributes[$elementtype]['type']) && is_array($extrafiel
 		print '<td class="center tdoverflowmax100" title="'.dol_escape_htmltag($extrafields->attributes[$elementtype]['printable'][$key]).'">'.dol_escape_htmltag($extrafields->attributes[$elementtype]['printable'][$key])."</td>\n";
 		// Summable
 		print '<td class="center">'.yn($extrafields->attributes[$elementtype]['totalizable'][$key])."</td>\n";
-		if (!empty($conf->multicompany->enabled)) {
+		if (isModEnabled('multicompany')) {
 			print '<td class="center">';
 			if (empty($extrafields->attributes[$elementtype]['entityid'][$key])) {
 				print $langs->trans("All");
@@ -139,7 +139,7 @@ if (isset($extrafields->attributes[$elementtype]['type']) && is_array($extrafiel
 	}
 } else {
 	$colspan = 14;
-	if (!empty($conf->multicompany->enabled)) {
+	if (isModEnabled('multicompany')) {
 		$colspan++;
 	}
 

From 2d0537e8233cf02f86da4f06b80f8668e44a9121 Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Sun, 28 Aug 2022 14:07:47 +0200
Subject: [PATCH 136/974] FIX php8 compatibility

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

diff --git a/htdocs/cron/card.php b/htdocs/cron/card.php
index ed95546cd67..319c16c7d0c 100644
--- a/htdocs/cron/card.php
+++ b/htdocs/cron/card.php
@@ -612,7 +612,7 @@ if (($action == "create") || ($action == "edit")) {
 	}
 	print "</td></tr>";
 
-	if (!empty($conf->multicompany->enabled)) {
+	if (isModEnabled('multicompany')) {
 		print '<tr><td>';
 		print $langs->trans('Entity')."</td><td>";
 		if (empty($object->entity)) {

From d9b21380f6db3e9e09500f46332e7a55ab4c1873 Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Sun, 28 Aug 2022 14:08:27 +0200
Subject: [PATCH 137/974] FIX php8 compatibility

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

diff --git a/htdocs/ecm/class/ecmfiles.class.php b/htdocs/ecm/class/ecmfiles.class.php
index d70f5c863d7..3f4df8b847b 100644
--- a/htdocs/ecm/class/ecmfiles.class.php
+++ b/htdocs/ecm/class/ecmfiles.class.php
@@ -407,7 +407,7 @@ class EcmFiles extends CommonObject
 		$sql .= ' FROM '.MAIN_DB_PREFIX.$this->table_element.' as t';
 		$sql .= ' WHERE 1 = 1';
 		/* Fetching this table depends on filepath+filename, it must not depends on entity because filesystem on disk does not know what is Dolibarr entities
-		 if (! empty($conf->multicompany->enabled)) {
+		 if (isModEnabled('multicompany')) {
 		 $sql .= " AND entity IN (" . getEntity('ecmfiles') . ")";
 		 }*/
 		if ($relativepath) {
@@ -546,7 +546,7 @@ class EcmFiles extends CommonObject
 		}
 		$sql .= ' WHERE 1 = 1';
 		/* Fetching this table depends on filepath+filename, it must not depends on entity
-		 if (! empty($conf->multicompany->enabled)) {
+		 if (isModEnabled('multicompany')) {
 		 $sql .= " AND entity IN (" . getEntity('ecmfiles') . ")";
 		 }*/
 		if (count($sqlwhere) > 0) {

From 66b2c63bc3bcf2a64bb3ec360f8db485d840324f Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Sun, 28 Aug 2022 14:08:58 +0200
Subject: [PATCH 138/974] FIX php8 compatibility

---
 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 a87c90a6dd9..50b7047b90d 100644
--- a/htdocs/emailcollector/class/emailcollector.class.php
+++ b/htdocs/emailcollector/class/emailcollector.class.php
@@ -251,7 +251,7 @@ class EmailCollector extends CommonObject
 		if (empty($conf->global->MAIN_SHOW_TECHNICAL_ID) && isset($this->fields['rowid'])) {
 			$this->fields['rowid']['visible'] = 0;
 		}
-		if (empty($conf->multicompany->enabled) && isset($this->fields['entity'])) {
+		if (!isModEnabled('multicompany') && isset($this->fields['entity'])) {
 			$this->fields['entity']['enabled'] = 0;
 		}
 

From b7e027a097edf374eba8b9c9fafad78ee1b08f34 Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Sun, 28 Aug 2022 14:09:25 +0200
Subject: [PATCH 139/974] FIX php8 compatibility

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

diff --git a/htdocs/emailcollector/class/emailcollectoraction.class.php b/htdocs/emailcollector/class/emailcollectoraction.class.php
index 37bd93926cb..46b787fc6fd 100644
--- a/htdocs/emailcollector/class/emailcollectoraction.class.php
+++ b/htdocs/emailcollector/class/emailcollectoraction.class.php
@@ -158,7 +158,7 @@ class EmailCollectorAction extends CommonObject
 		if (empty($conf->global->MAIN_SHOW_TECHNICAL_ID) && isset($this->fields['rowid'])) {
 			$this->fields['rowid']['visible'] = 0;
 		}
-		if (empty($conf->multicompany->enabled) && isset($this->fields['entity'])) {
+		if (!isModEnabled('multicompany') && isset($this->fields['entity'])) {
 			$this->fields['entity']['enabled'] = 0;
 		}
 

From 9d3c1ddea5822af85d05c127f513490a9f0df515 Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Sun, 28 Aug 2022 14:09:52 +0200
Subject: [PATCH 140/974] FIX php8 compatibility

---
 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 6386ee3c27f..c19610f14ad 100644
--- a/htdocs/emailcollector/class/emailcollectorfilter.class.php
+++ b/htdocs/emailcollector/class/emailcollectorfilter.class.php
@@ -127,7 +127,7 @@ class EmailCollectorFilter extends CommonObject
 		if (empty($conf->global->MAIN_SHOW_TECHNICAL_ID) && isset($this->fields['rowid'])) {
 			$this->fields['rowid']['visible'] = 0;
 		}
-		if (empty($conf->multicompany->enabled) && isset($this->fields['entity'])) {
+		if (!isModEnabled('multicompany') && isset($this->fields['entity'])) {
 			$this->fields['entity']['enabled'] = 0;
 		}
 

From 7641ec3fe3cc908c8962ed654ed800edf8150f57 Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Sun, 28 Aug 2022 14:12:05 +0200
Subject: [PATCH 141/974] FIX php8 compatibility

---
 htdocs/eventorganization/class/conferenceorbooth.class.php      | 2 +-
 .../eventorganization/class/conferenceorboothattendee.class.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/eventorganization/class/conferenceorbooth.class.php b/htdocs/eventorganization/class/conferenceorbooth.class.php
index a2eb140c789..2c22bfb77ab 100644
--- a/htdocs/eventorganization/class/conferenceorbooth.class.php
+++ b/htdocs/eventorganization/class/conferenceorbooth.class.php
@@ -152,7 +152,7 @@ class ConferenceOrBooth extends ActionComm
 		if (empty($conf->global->MAIN_SHOW_TECHNICAL_ID) && isset($this->fields['rowid'])) {
 			$this->fields['id']['visible'] = 0;
 		}
-		if (empty($conf->multicompany->enabled) && isset($this->fields['entity'])) {
+		if (!isModEnabled('multicompany') && isset($this->fields['entity'])) {
 			$this->fields['entity']['enabled'] = 0;
 		}
 
diff --git a/htdocs/eventorganization/class/conferenceorboothattendee.class.php b/htdocs/eventorganization/class/conferenceorboothattendee.class.php
index 3dae278d3a1..158b29e4cf6 100644
--- a/htdocs/eventorganization/class/conferenceorboothattendee.class.php
+++ b/htdocs/eventorganization/class/conferenceorboothattendee.class.php
@@ -196,7 +196,7 @@ class ConferenceOrBoothAttendee extends CommonObject
 		if (empty($conf->global->MAIN_SHOW_TECHNICAL_ID) && isset($this->fields['rowid'])) {
 			$this->fields['rowid']['visible'] = 0;
 		}
-		if (empty($conf->multicompany->enabled) && isset($this->fields['entity'])) {
+		if (!isModEnabled('multicompany') && isset($this->fields['entity'])) {
 			$this->fields['entity']['enabled'] = 0;
 		}
 

From a7697f6d9c6c60aad79f3f621a499cbec1c7ad6e Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Sun, 28 Aug 2022 14:12:33 +0200
Subject: [PATCH 142/974] FIX php8 compatibility

---
 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 4110ba98e1b..05831c5dd97 100644
--- a/htdocs/expensereport/card.php
+++ b/htdocs/expensereport/card.php
@@ -83,7 +83,7 @@ if (! empty($conf->global->EXPENSEREPORT_PREFILL_DATES_WITH_CURRENT_MONTH)) {
 $rootfordata = DOL_DATA_ROOT;
 $rootforuser = DOL_DATA_ROOT;
 // If multicompany module is enabled, we redefine the root of data
-if (!empty($conf->multicompany->enabled) && !empty($conf->entity) && $conf->entity > 1) {
+if (isModEnabled('multicompany') && !empty($conf->entity) && $conf->entity > 1) {
 	$rootfordata .= '/'.$conf->entity;
 }
 $conf->expensereport->dir_output = $rootfordata.'/expensereport';

From 2b96fbaee694fda93fc163414a1d31c001f449ac Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Sun, 28 Aug 2022 14:13:03 +0200
Subject: [PATCH 143/974] FIX php8 compatibility

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

diff --git a/htdocs/fourn/commande/index.php b/htdocs/fourn/commande/index.php
index 052876f0616..3d5a111ed03 100644
--- a/htdocs/fourn/commande/index.php
+++ b/htdocs/fourn/commande/index.php
@@ -219,12 +219,12 @@ if ((isModEnabled("fournisseur") && empty($conf->global->MAIN_USE_NEW_SUPPLIERMO
  */
 
 $sql = "SELECT";
-if (!empty($conf->multicompany->enabled) && !empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE)) {
+if (isModEnabled('multicompany') && !empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE)) {
 	$sql .= " DISTINCT";
 }
 $sql .= " u.rowid, u.lastname, u.firstname, u.email, u.statut";
 $sql .= " FROM ".MAIN_DB_PREFIX."user as u";
-if (!empty($conf->multicompany->enabled) && !empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE)) {
+if (isModEnabled('multicompany') && !empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE)) {
 	$sql .= ",".MAIN_DB_PREFIX."usergroup_user as ug";
 	$sql .= " WHERE ((ug.fk_user = u.rowid";
 	$sql .= " AND ug.entity IN (".getEntity('usergroup')."))";

From dd00484a9cdb088f01443343e4a85258dc9ace38 Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Sun, 28 Aug 2022 14:13:33 +0200
Subject: [PATCH 144/974] FIX php8 compatibility

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

diff --git a/htdocs/holiday/class/holiday.class.php b/htdocs/holiday/class/holiday.class.php
index 806f899df36..aa6fa6c8066 100644
--- a/htdocs/holiday/class/holiday.class.php
+++ b/htdocs/holiday/class/holiday.class.php
@@ -1731,13 +1731,13 @@ class Holiday extends CommonObject
 			if ($type) {
 				// If user of Dolibarr
 				$sql = "SELECT";
-				if (!empty($conf->multicompany->enabled) && !empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE)) {
+				if (isModEnabled('multicompany') && !empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE)) {
 					$sql .= " DISTINCT";
 				}
 				$sql .= " u.rowid";
 				$sql .= " FROM ".MAIN_DB_PREFIX."user as u";
 
-				if (!empty($conf->multicompany->enabled) && !empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE)) {
+				if (isModEnabled('multicompany') && !empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE)) {
 					$sql .= ", ".MAIN_DB_PREFIX."usergroup_user as ug";
 					$sql .= " WHERE ((ug.fk_user = u.rowid";
 					$sql .= " AND ug.entity IN (".getEntity('usergroup')."))";
@@ -1821,13 +1821,13 @@ class Holiday extends CommonObject
 			if ($type) {
 				// If we need users of Dolibarr
 				$sql = "SELECT";
-				if (!empty($conf->multicompany->enabled) && !empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE)) {
+				if (isModEnabled('multicompany') && !empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE)) {
 					$sql .= " DISTINCT";
 				}
 				$sql .= " u.rowid, u.lastname, u.firstname, u.gender, u.photo, u.employee, u.statut, u.fk_user";
 				$sql .= " FROM ".MAIN_DB_PREFIX."user as u";
 
-				if (!empty($conf->multicompany->enabled) && !empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE)) {
+				if (isModEnabled('multicompany') && !empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE)) {
 					$sql .= ", ".MAIN_DB_PREFIX."usergroup_user as ug";
 					$sql .= " WHERE ((ug.fk_user = u.rowid";
 					$sql .= " AND ug.entity IN (".getEntity('usergroup')."))";

From 965cf60c7619a3b1bb0d240915758b4e5a85be25 Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Sun, 28 Aug 2022 14:13:57 +0200
Subject: [PATCH 145/974] FIX php8 compatibility

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

diff --git a/htdocs/hrm/skill_tab.php b/htdocs/hrm/skill_tab.php
index 52c45c72848..c48a7c405c6 100644
--- a/htdocs/hrm/skill_tab.php
+++ b/htdocs/hrm/skill_tab.php
@@ -259,7 +259,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 		print '<td>';
 		$addadmin = '';
 		if (property_exists($object, 'admin')) {
-			if (!empty($conf->multicompany->enabled) && !empty($object->admin) && empty($object->entity)) {
+			if (isModEnabled('multicompany') && !empty($object->admin) && empty($object->entity)) {
 				$addadmin .= img_picto($langs->trans("SuperAdministratorDesc"), "redstar", 'class="paddingleft"');
 			} elseif (!empty($object->admin)) {
 				$addadmin .= img_picto($langs->trans("AdministratorDesc"), "star", 'class="paddingleft"');

From 5671c03bd354398a949cf638d4c9eb39cc1df15b Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Sun, 28 Aug 2022 14:14:29 +0200
Subject: [PATCH 146/974] FIX php8 compatibility

---
 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 77403631725..4915d44fb6f 100644
--- a/htdocs/hrm/class/evaluation.class.php
+++ b/htdocs/hrm/class/evaluation.class.php
@@ -189,7 +189,7 @@ class Evaluation extends CommonObject
 		if (empty($conf->global->MAIN_SHOW_TECHNICAL_ID) && isset($this->fields['rowid'])) {
 			$this->fields['rowid']['visible'] = 0;
 		}
-		if (empty($conf->multicompany->enabled) && isset($this->fields['entity'])) {
+		if (!isModEnabled('multicompany') && isset($this->fields['entity'])) {
 			$this->fields['entity']['enabled'] = 0;
 		}
 

From a2a7f45100289a00c93e4cd93f3c6f9ced6a47b3 Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Sun, 28 Aug 2022 14:15:02 +0200
Subject: [PATCH 147/974] FIX php8 compatibility

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

diff --git a/htdocs/hrm/class/evaluationdet.class.php b/htdocs/hrm/class/evaluationdet.class.php
index 8fd7d3b177a..239e66ee48f 100644
--- a/htdocs/hrm/class/evaluationdet.class.php
+++ b/htdocs/hrm/class/evaluationdet.class.php
@@ -178,7 +178,7 @@ class Evaluationline extends CommonObject
 		if (empty($conf->global->MAIN_SHOW_TECHNICAL_ID) && isset($this->fields['rowid'])) {
 			$this->fields['rowid']['visible'] = 0;
 		}
-		if (empty($conf->multicompany->enabled) && isset($this->fields['entity'])) {
+		if (!isModEnabled('multicompany') && isset($this->fields['entity'])) {
 			$this->fields['entity']['enabled'] = 0;
 		}
 

From 45354e62aa039051de1fcd00fb6e982dd7c26809 Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Sun, 28 Aug 2022 14:15:28 +0200
Subject: [PATCH 148/974] FIX php8 compatibility

---
 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 c21335f2df5..bc5af1f661d 100644
--- a/htdocs/hrm/class/job.class.php
+++ b/htdocs/hrm/class/job.class.php
@@ -177,7 +177,7 @@ class Job extends CommonObject
 		if (empty($conf->global->MAIN_SHOW_TECHNICAL_ID) && isset($this->fields['rowid'])) {
 			$this->fields['rowid']['visible'] = 0;
 		}
-		if (empty($conf->multicompany->enabled) && isset($this->fields['entity'])) {
+		if (!isModEnabled('multicompany') && isset($this->fields['entity'])) {
 			$this->fields['entity']['enabled'] = 0;
 		}
 

From c51349256985589b4eac5cd234f33bfffcd0111b Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Sun, 28 Aug 2022 14:15:53 +0200
Subject: [PATCH 149/974] FIX php8 compatibility

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

diff --git a/htdocs/hrm/class/position.class.php b/htdocs/hrm/class/position.class.php
index 9416907b8ed..37a8300a1e2 100644
--- a/htdocs/hrm/class/position.class.php
+++ b/htdocs/hrm/class/position.class.php
@@ -188,7 +188,7 @@ class Position extends CommonObject
 		if (empty($conf->global->MAIN_SHOW_TECHNICAL_ID) && isset($this->fields['rowid'])) {
 			//$this->fields['rowid']['visible'] = 0;
 		}
-		if (empty($conf->multicompany->enabled) && isset($this->fields['entity'])) {
+		if (!isModEnabled('multicompany') && isset($this->fields['entity'])) {
 			$this->fields['entity']['enabled'] = 0;
 		}
 

From f241a1fc67f82d84ca8e6e38f37014035ad416d9 Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Sun, 28 Aug 2022 14:16:24 +0200
Subject: [PATCH 150/974] FIX php8 compatibility

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

diff --git a/htdocs/hrm/class/skill.class.php b/htdocs/hrm/class/skill.class.php
index d9f4073e11e..99dc0902f95 100644
--- a/htdocs/hrm/class/skill.class.php
+++ b/htdocs/hrm/class/skill.class.php
@@ -189,7 +189,7 @@ class Skill extends CommonObject
 		if (empty($conf->global->MAIN_SHOW_TECHNICAL_ID) && isset($this->fields['rowid'])) {
 			$this->fields['rowid']['visible'] = 0;
 		}
-		if (empty($conf->multicompany->enabled) && isset($this->fields['entity'])) {
+		if (!isModEnabled('multicompany') && isset($this->fields['entity'])) {
 			$this->fields['entity']['enabled'] = 0;
 		}
 

From ca822e15f92c04f6f5ed0194c399605d4502031c Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Sun, 28 Aug 2022 14:16:50 +0200
Subject: [PATCH 151/974] FIX php8 compatibility

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

diff --git a/htdocs/hrm/class/skilldet.class.php b/htdocs/hrm/class/skilldet.class.php
index 3c24ca78415..d1ae24b7efe 100644
--- a/htdocs/hrm/class/skilldet.class.php
+++ b/htdocs/hrm/class/skilldet.class.php
@@ -169,7 +169,7 @@ class Skilldet extends CommonObject
 		if (empty($conf->global->MAIN_SHOW_TECHNICAL_ID) && isset($this->fields['rowid'])) {
 			$this->fields['rowid']['visible'] = 0;
 		}
-		if (empty($conf->multicompany->enabled) && isset($this->fields['entity'])) {
+		if (!isModEnabled('multicompany') && isset($this->fields['entity'])) {
 			$this->fields['entity']['enabled'] = 0;
 		}
 

From 66859f8624c58330fa0ba495e53bd89895849bc2 Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Sun, 28 Aug 2022 14:17:17 +0200
Subject: [PATCH 152/974] FIX php8 compatibility

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

diff --git a/htdocs/hrm/class/skillrank.class.php b/htdocs/hrm/class/skillrank.class.php
index 6e2413c4f5f..c5f5ccb8ff7 100644
--- a/htdocs/hrm/class/skillrank.class.php
+++ b/htdocs/hrm/class/skillrank.class.php
@@ -177,7 +177,7 @@ class SkillRank extends CommonObject
 		if (empty($conf->global->MAIN_SHOW_TECHNICAL_ID) && isset($this->fields['rowid'])) {
 			$this->fields['rowid']['visible'] = 0;
 		}
-		if (empty($conf->multicompany->enabled) && isset($this->fields['entity'])) {
+		if (!isModEnabled('multicompany') && isset($this->fields['entity'])) {
 			$this->fields['entity']['enabled'] = 0;
 		}
 

From 772a50fe0cb34a2e858f95ef68289e648bcb36dd Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Sun, 28 Aug 2022 14:17:53 +0200
Subject: [PATCH 153/974] FIX php8 compatibility

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

diff --git a/htdocs/hrm/establishment/card.php b/htdocs/hrm/establishment/card.php
index 1fe67dd0bd1..396c158998c 100644
--- a/htdocs/hrm/establishment/card.php
+++ b/htdocs/hrm/establishment/card.php
@@ -178,7 +178,7 @@ if ($action == 'create') {
 
 	// Entity
 	/*
-	if (! empty($conf->multicompany->enabled)) {
+	if (isModEnabled('multicompany')) {
 		print '<tr>';
 		print '<td>'.$form->editfieldkey('Parent', 'entity', '', $object, 0, 'string', '', 1).'</td>';
 		print '<td class="maxwidthonsmartphone">';
@@ -282,7 +282,7 @@ if (($id || $ref) && $action == 'edit') {
 
 			// Entity
 			/*
-			if (! empty($conf->multicompany->enabled)) {
+			if (isModEnabled('multicompany')) {
 				print '<tr><td>'.$form->editfieldkey('Parent', 'entity', '', $object, 0, 'string', '', 1).'</td>';
 				print '<td class="maxwidthonsmartphone">';
 				print $object->entity > 0 ? $object->entity : $conf->entity;

From 11f92f9d7c34cc2846f15f6a7678da1cacf69a74 Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Sun, 28 Aug 2022 14:18:24 +0200
Subject: [PATCH 154/974] FIX php8 compatibility

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

diff --git a/htdocs/hrm/establishment/card.php b/htdocs/hrm/establishment/card.php
index 396c158998c..1b30eed663a 100644
--- a/htdocs/hrm/establishment/card.php
+++ b/htdocs/hrm/establishment/card.php
@@ -371,7 +371,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 
 	// Entity
 	/*
-	if ($conf->multicompany->enabled) {
+	if (!isModEnabled('multicompany') {
 		print '<tr>';
 		print '<td class="titlefield">'.$langs->trans("Entity").'</td>';
 		print '<td>'.$object->entity.'</td>';

From f943ea4ccc3683416a3dc7b586ae8dd29c59c987 Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Sun, 28 Aug 2022 14:18:51 +0200
Subject: [PATCH 155/974] FIX php8 compatibility

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

diff --git a/htdocs/install/upgrade2.php b/htdocs/install/upgrade2.php
index a9e48c96bf3..a7216b6ad72 100644
--- a/htdocs/install/upgrade2.php
+++ b/htdocs/install/upgrade2.php
@@ -420,7 +420,7 @@ if (!GETPOST('action', 'aZ09') || preg_match('/upgrade/i', GETPOST('action', 'aZ
 			$afterversionarray = explode('.', '5.0.9');
 			$beforeversionarray = explode('.', '6.0.9');
 			if (versioncompare($versiontoarray, $afterversionarray) >= 0 && versioncompare($versiontoarray, $beforeversionarray) <= 0) {
-				if (!empty($conf->multicompany->enabled)) {
+				if (isModEnabled('multicompany')) {
 					global $multicompany_transverse_mode;
 
 					// Only if the transverse mode is not used

From a58fe2e8961bfeb998de9623e30c1d40d45b9ec1 Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Sun, 28 Aug 2022 14:19:25 +0200
Subject: [PATCH 156/974] FIX php8 compatibility

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

diff --git a/htdocs/modulebuilder/template/class/myobject.class.php b/htdocs/modulebuilder/template/class/myobject.class.php
index f3538d65cfa..94f57bdd776 100644
--- a/htdocs/modulebuilder/template/class/myobject.class.php
+++ b/htdocs/modulebuilder/template/class/myobject.class.php
@@ -253,7 +253,7 @@ class MyObject extends CommonObject
 		if (empty($conf->global->MAIN_SHOW_TECHNICAL_ID) && isset($this->fields['rowid']) && !empty($this->fields['ref'])) {
 			$this->fields['rowid']['visible'] = 0;
 		}
-		if (empty($conf->multicompany->enabled) && isset($this->fields['entity'])) {
+		if (!isModEnabled('multicompany') && isset($this->fields['entity'])) {
 			$this->fields['entity']['enabled'] = 0;
 		}
 

From 4250625e3872a163aa44bd89a11360b58e98a6d5 Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Sun, 28 Aug 2022 14:20:24 +0200
Subject: [PATCH 157/974] FIX php8 compatibility

---
 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 d186c6e533b..4a3a6bc8dd8 100644
--- a/htdocs/mrp/class/mo.class.php
+++ b/htdocs/mrp/class/mo.class.php
@@ -224,7 +224,7 @@ class Mo extends CommonObject
 		if (empty($conf->global->MAIN_SHOW_TECHNICAL_ID) && isset($this->fields['rowid'])) {
 			$this->fields['rowid']['visible'] = 0;
 		}
-		if (empty($conf->multicompany->enabled) && isset($this->fields['entity'])) {
+		if (!isModEnabled('multicompany') && isset($this->fields['entity'])) {
 			$this->fields['entity']['enabled'] = 0;
 		}
 
@@ -1637,7 +1637,7 @@ class MoLine extends CommonObjectLine
 		if (empty($conf->global->MAIN_SHOW_TECHNICAL_ID) && isset($this->fields['rowid'])) {
 			$this->fields['rowid']['visible'] = 0;
 		}
-		if (empty($conf->multicompany->enabled) && isset($this->fields['entity'])) {
+		if (!isModEnabled('multicompany') && isset($this->fields['entity'])) {
 			$this->fields['entity']['enabled'] = 0;
 		}
 

From 629c40b0dfb4b62b357e916dcf5d44a798555312 Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Sun, 28 Aug 2022 14:20:47 +0200
Subject: [PATCH 158/974] FIX php8 compatibility

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

diff --git a/htdocs/partnership/admin/website.php b/htdocs/partnership/admin/website.php
index 49fd7ff91df..2b1a6d4d365 100644
--- a/htdocs/partnership/admin/website.php
+++ b/htdocs/partnership/admin/website.php
@@ -220,7 +220,7 @@ if (!empty($conf->global->PARTNERSHIP_ENABLE_PUBLIC)) {
 	print '<br>';
 	//print $langs->trans('FollowingLinksArePublic').'<br>';
 	print img_picto('', 'globe').' <span class="opacitymedium">'.$langs->trans('BlankSubscriptionForm').'</span><br>';
-	if (!empty($conf->multicompany->enabled)) {
+	if (isModEnabled('multicompany')) {
 		$entity_qr = '?entity='.$conf->entity;
 	} else {
 		$entity_qr = '';

From 84ff7e364849d5748dd4e4e302e3fd417a5634ad Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Sun, 28 Aug 2022 14:21:23 +0200
Subject: [PATCH 159/974] FIX php8 compatibility

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

diff --git a/htdocs/partnership/class/partnership_type.class.php b/htdocs/partnership/class/partnership_type.class.php
index e0163ba4dfc..32162ae0b97 100644
--- a/htdocs/partnership/class/partnership_type.class.php
+++ b/htdocs/partnership/class/partnership_type.class.php
@@ -90,7 +90,7 @@ class PartnershipType extends CommonObject
 		if (empty($conf->global->MAIN_SHOW_TECHNICAL_ID) && isset($this->fields['rowid'])) {
 			$this->fields['rowid']['visible'] = 0;
 		}
-		if (empty($conf->multicompany->enabled) && isset($this->fields['entity'])) {
+		if (!isModEnabled('multicompany') && isset($this->fields['entity'])) {
 			$this->fields['entity']['enabled'] = 0;
 		}
 

From c0239b95ea9b3a1990ad1d47d7d87405e848c565 Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Sun, 28 Aug 2022 14:22:17 +0200
Subject: [PATCH 160/974] FIX php8 compatibility

---
 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 38d8c333749..8b1ede66506 100644
--- a/htdocs/partnership/class/partnership.class.php
+++ b/htdocs/partnership/class/partnership.class.php
@@ -204,7 +204,7 @@ class Partnership extends CommonObject
 		if (empty($conf->global->MAIN_SHOW_TECHNICAL_ID) && isset($this->fields['rowid']) && !empty($this->fields['ref'])) {
 			$this->fields['rowid']['visible'] = 0;
 		}
-		// if (empty($conf->multicompany->enabled) && isset($this->fields['entity'])) {
+		// if (!isModEnabled('multicompany') && isset($this->fields['entity'])) {
 		// 	$this->fields['entity']['enabled'] = 0;
 		// }
 

From 30891769d81a21530a1c7b1d30debe1e984a14ed Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Sun, 28 Aug 2022 14:22:57 +0200
Subject: [PATCH 161/974] FIX php8 compatibility

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

diff --git a/htdocs/product/admin/product.php b/htdocs/product/admin/product.php
index 24b34dc5ccc..8696b27e521 100644
--- a/htdocs/product/admin/product.php
+++ b/htdocs/product/admin/product.php
@@ -338,7 +338,7 @@ foreach ($dirproduct as $dirroot) {
 					print "</td>\n";
 				} else {
 					$disabled = false;
-					if (!empty($conf->multicompany->enabled) && (is_object($mc) && !empty($mc->sharings['referent']) && $mc->sharings['referent'] == $conf->entity) ? false : true) {
+					if (isModEnabled('multicompany') && (is_object($mc) && !empty($mc->sharings['referent']) && $mc->sharings['referent'] == $conf->entity) ? false : true) {
 					}
 					print '<td class="center">';
 					if (!$disabled) {
@@ -556,7 +556,7 @@ print '</tr>';
 // Rule for price
 
 print '<tr class="oddeven">';
-if (empty($conf->multicompany->enabled)) {
+if (!isModEnabled('multicompany')) {
 	print '<td>'.$langs->trans("PricingRule").'</td>';
 } else {
 	print '<td>'.$form->textwithpicto($langs->trans("PricingRule"), $langs->trans("SamePriceAlsoForSharedCompanies"), 1).'</td>';

From 9d7e025d455d591b4af7e5422b83c3a9c97250ec Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Sun, 28 Aug 2022 14:23:27 +0200
Subject: [PATCH 162/974] FIX php8 compatibility

---
 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 8f166f702b1..4cbd998a0f6 100644
--- a/htdocs/product/class/productfournisseurprice.class.php
+++ b/htdocs/product/class/productfournisseurprice.class.php
@@ -178,7 +178,7 @@ class ProductFournisseurPrice extends CommonObject
 		$this->db = $db;
 
 		if (empty($conf->global->MAIN_SHOW_TECHNICAL_ID) && isset($this->fields['rowid'])) $this->fields['rowid']['visible'] = 0;
-		if (empty($conf->multicompany->enabled) && isset($this->fields['entity'])) $this->fields['entity']['enabled'] = 0;
+		if (!isModEnabled('multicompany') && isset($this->fields['entity'])) $this->fields['entity']['enabled'] = 0;
 
 		// Unset fields that are disabled
 		foreach ($this->fields as $key => $val) {

From 76dd110bc3cbd1b5d669c7fcb72327a9c552376e Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Sun, 28 Aug 2022 14:23:54 +0200
Subject: [PATCH 163/974] FIX php8 compatibility

---
 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 d7d167035a7..1ce464d31d6 100644
--- a/htdocs/product/inventory/class/inventory.class.php
+++ b/htdocs/product/inventory/class/inventory.class.php
@@ -236,7 +236,7 @@ class Inventory extends CommonObject
 		if (empty($conf->global->MAIN_SHOW_TECHNICAL_ID)) {
 			$this->fields['rowid']['visible'] = 0;
 		}
-		if (empty($conf->multicompany->enabled)) {
+		if (!isModEnabled('multicompany')) {
 			$this->fields['entity']['enabled'] = 0;
 		}
 	}

From 18d6a95a7db7a21b72dd27119112bdcbfa04dbe2 Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Sun, 28 Aug 2022 14:24:26 +0200
Subject: [PATCH 164/974] FIX php8 compatibility

---
 .../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 80e3f73b646..d164ad858b9 100644
--- a/htdocs/product/stock/stocktransfer/class/stocktransfer.class.php
+++ b/htdocs/product/stock/stocktransfer/class/stocktransfer.class.php
@@ -197,7 +197,7 @@ class StockTransfer extends CommonObject
 		$this->origin_type = 'StockTransfer@product/stock/stocktransfer';
 
 		if (empty($conf->global->MAIN_SHOW_TECHNICAL_ID) && isset($this->fields['rowid'])) $this->fields['rowid']['visible'] = 0;
-		if (empty($conf->multicompany->enabled) && isset($this->fields['entity'])) $this->fields['entity']['enabled'] = 0;
+		if (!isModEnabled('multicompany') && isset($this->fields['entity'])) $this->fields['entity']['enabled'] = 0;
 
 		// Example to show how to set values of fields definition dynamically
 		/*if ($user->rights->stocktransfer->stocktransfer->read) {

From 45248e1dbdf722f55203450fb5b5f10c575c6cd9 Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Sun, 28 Aug 2022 14:24:54 +0200
Subject: [PATCH 165/974] FIX php8 compatibility

---
 .../stock/stocktransfer/class/stocktransferline.class.php       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/product/stock/stocktransfer/class/stocktransferline.class.php b/htdocs/product/stock/stocktransfer/class/stocktransferline.class.php
index 427d577b436..0495dada008 100644
--- a/htdocs/product/stock/stocktransfer/class/stocktransferline.class.php
+++ b/htdocs/product/stock/stocktransfer/class/stocktransferline.class.php
@@ -165,7 +165,7 @@ class StockTransferLine extends CommonObjectLine
 		$this->db = $db;
 
 		if (empty($conf->global->MAIN_SHOW_TECHNICAL_ID) && isset($this->fields['rowid'])) $this->fields['rowid']['visible'] = 0;
-		if (empty($conf->multicompany->enabled) && isset($this->fields['entity'])) $this->fields['entity']['enabled'] = 0;
+		if (!isModEnabled('multicompany') && isset($this->fields['entity'])) $this->fields['entity']['enabled'] = 0;
 
 		// Example to show how to set values of fields definition dynamically
 		/*if ($user->rights->stocktransfer->stocktransferline->read) {

From 445d160fda8164aa29f5c90fd5286d0ae306e4f7 Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Sun, 28 Aug 2022 14:25:16 +0200
Subject: [PATCH 166/974] FIX php8 compatibility

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

diff --git a/htdocs/projet/admin/website.php b/htdocs/projet/admin/website.php
index 37b858757ca..eead379c804 100644
--- a/htdocs/projet/admin/website.php
+++ b/htdocs/projet/admin/website.php
@@ -158,7 +158,7 @@ if (!empty($conf->global->PROJECT_ENABLE_PUBLIC)) {
 	print '<br>';
 	//print $langs->trans('FollowingLinksArePublic').'<br>';
 	print img_picto('', 'globe').' <span class="opacitymedium">'.$langs->trans('BlankSubscriptionForm').'</span><br>';
-	if (!empty($conf->multicompany->enabled)) {
+	if (isModEnabled('multicompany')) {
 		$entity_qr = '?entity='.$conf->entity;
 	} else {
 		$entity_qr = '';

From 492229b48c5047073c907bd7e5f2abc7f9b7f893 Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Sun, 28 Aug 2022 14:25:43 +0200
Subject: [PATCH 167/974] FIX php8 compatibility

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

diff --git a/htdocs/public/onlinesign/newonlinesign.php b/htdocs/public/onlinesign/newonlinesign.php
index e698c20c4f0..0988feec5a2 100644
--- a/htdocs/public/onlinesign/newonlinesign.php
+++ b/htdocs/public/onlinesign/newonlinesign.php
@@ -139,7 +139,7 @@ if ($source == 'proposal') {
 	$securekeyseed = getDolGlobalString('PROPOSAL_ONLINE_SIGNATURE_SECURITY_TOKEN');
 }
 
-if (!dol_verifyHash($securekeyseed.$type.$ref.(empty($conf->multicompany->enabled) ? '' : $entity), $SECUREKEY, '0')) {
+if (!dol_verifyHash($securekeyseed.$type.$ref.(!isModEnabled('multicompany') ? '' : $entity), $SECUREKEY, '0')) {
 	http_response_code(403);
 	print 'Bad value for securitykey. Value provided '.dol_escape_htmltag($SECUREKEY).' does not match expected value for ref='.dol_escape_htmltag($ref);
 	exit(-1);

From decf806a068e9d18e4d7b4980aac1546e71a64bc Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Sun, 28 Aug 2022 14:26:42 +0200
Subject: [PATCH 168/974] FIX php8 compatibility

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

diff --git a/htdocs/public/onlinesign/newonlinesign.php b/htdocs/public/onlinesign/newonlinesign.php
index 0988feec5a2..c7264ade568 100644
--- a/htdocs/public/onlinesign/newonlinesign.php
+++ b/htdocs/public/onlinesign/newonlinesign.php
@@ -193,7 +193,7 @@ $replacemainarea = (empty($conf->dol_hide_leftmenu) ? '<div>' : '').'<div>';
 llxHeader($head, $langs->trans("OnlineSignature"), '', '', 0, 0, '', '', '', 'onlinepaymentbody', $replacemainarea, 1);
 
 if ($action == 'refusepropal') {
-	print $form->formconfirm($_SERVER["PHP_SELF"].'?ref='.urlencode($ref).'&securekey='.urlencode($SECUREKEY).($conf->multicompany->enabled?'&entity='.$entity:''), $langs->trans('RefusePropal'), $langs->trans('ConfirmRefusePropal', $object->ref), 'confirm_refusepropal', '', '', 1);
+	print $form->formconfirm($_SERVER["PHP_SELF"].'?ref='.urlencode($ref).'&securekey='.urlencode($SECUREKEY).(isModEnabled('multicompany')?'&entity='.$entity:''), $langs->trans('RefusePropal'), $langs->trans('ConfirmRefusePropal', $object->ref), 'confirm_refusepropal', '', '', 1);
 }
 
 // Check link validity for param 'source' to avoid use of the examples as value
@@ -429,7 +429,7 @@ if ($action == "dosign" && empty($cancel)) {
 					success: function(response) {
 						if(response == "success"){
 							console.log("Success on saving signature");
-							window.location.replace("'.$_SERVER["PHP_SELF"].'?ref='.urlencode($ref).'&message=signed&securekey='.urlencode($SECUREKEY).($conf->multicompany->enabled?'&entity='.$entity:'').'");
+							window.location.replace("'.$_SERVER["PHP_SELF"].'?ref='.urlencode($ref).'&message=signed&securekey='.urlencode($SECUREKEY).(isModEnabled('multicompany')?'&entity='.$entity:'').'");
 						}else{
 							console.error(response);
 						}

From a37fed87b3d3cea20bfb54e3fe6163525aada9bf Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Sun, 28 Aug 2022 14:27:28 +0200
Subject: [PATCH 169/974] FIX php8 compatibility

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

diff --git a/htdocs/public/stripe/ipn.php b/htdocs/public/stripe/ipn.php
index 6674ce9c6de..29e22c72de7 100644
--- a/htdocs/public/stripe/ipn.php
+++ b/htdocs/public/stripe/ipn.php
@@ -126,7 +126,7 @@ try {
 $langs->load("main");
 
 
-if (!empty($conf->multicompany->enabled) && !empty($conf->stripeconnect->enabled) && is_object($mc)) {
+if (isModEnabled('multicompany') && !empty($conf->stripeconnect->enabled) && is_object($mc)) {
 	$sql = "SELECT entity";
 	$sql .= " FROM ".MAIN_DB_PREFIX."oauth_token";
 	$sql .= " WHERE service = '".$db->escape($service)."' and tokenstring LIKE '%".$db->escape($event->account)."%'";

From 65c05a374f46c9c3549c8fdcbd723b42d1637f7d Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Sun, 28 Aug 2022 14:27:54 +0200
Subject: [PATCH 170/974] FIX php8 compatibility

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

diff --git a/htdocs/public/ticket/create_ticket.php b/htdocs/public/ticket/create_ticket.php
index 1c302c33b2e..33b3b8bdccd 100644
--- a/htdocs/public/ticket/create_ticket.php
+++ b/htdocs/public/ticket/create_ticket.php
@@ -425,7 +425,7 @@ if (empty($reshook) && $action == 'create_ticket' && GETPOST('save', 'alpha')) {
 			$messagetoshow = str_replace(array('{s1}', '{s2}'), array('<strong>'.$object->track_id.'</strong>', '<strong>'.$object->ref.'</strong>'), $messagetoshow);
 			setEventMessages($messagetoshow, null, 'warnings');
 			setEventMessages($langs->trans('PleaseRememberThisId'), null, 'warnings');
-			header("Location: index.php".(!empty($entity) && !empty($conf->multicompany->enabled)?'?entity='.$entity:''));
+			header("Location: index.php".(!empty($entity) && isModEnabled('multicompany')?'?entity='.$entity:''));
 			exit;
 		}
 	} else {

From 466284f260833a9f021211216515ab200706b0fe Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Sun, 28 Aug 2022 14:28:22 +0200
Subject: [PATCH 171/974] FIX php8 compatibility

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

diff --git a/htdocs/public/ticket/index.php b/htdocs/public/ticket/index.php
index f7abe746832..4ea314c8149 100644
--- a/htdocs/public/ticket/index.php
+++ b/htdocs/public/ticket/index.php
@@ -84,9 +84,9 @@ llxHeaderTicket($langs->trans("Tickets"), "", 0, 0, $arrayofjs, $arrayofcss);
 print '<div class="ticketpublicarea">';
 print '<p style="text-align: center">'.($conf->global->TICKET_PUBLIC_TEXT_HOME ? $conf->global->TICKET_PUBLIC_TEXT_HOME : $langs->trans("TicketPublicDesc")).'</p>';
 print '<div class="ticketform">';
-print '<a href="create_ticket.php'.(!empty($entity) && !empty($conf->multicompany->enabled)?'?entity='.$entity:'').'" rel="nofollow noopener" class="butAction marginbottomonly"><div class="index_create bigrounded"><span class="fa fa-15x fa-plus-circle valignmiddle btnTitle-icon"></span><br>'.dol_escape_htmltag($langs->trans("CreateTicket")).'</div></a>';
-print '<a href="list.php'.(!empty($entity) && !empty($conf->multicompany->enabled)?'?entity='.$entity:'').'" rel="nofollow noopener" class="butAction marginbottomonly"><div class="index_display bigrounded"><span class="fa fa-15x fa-list-alt valignmiddle btnTitle-icon"></span><br>'.dol_escape_htmltag($langs->trans("ViewMyTicketList")).'</div></a>';
-print '<a href="view.php'.(!empty($entity) && !empty($conf->multicompany->enabled)?'?entity='.$entity:'').'" rel="nofollow noopener" class="butAction marginbottomonly"><div class="index_display bigrounded">'.img_picto('', 'ticket', 'class="fa-15x"').'<br>'.dol_escape_htmltag($langs->trans("ShowTicketWithTrackId")).'</div></a>';
+print '<a href="create_ticket.php'.(!empty($entity) && isModEnabled('multicompany')?'?entity='.$entity:'').'" rel="nofollow noopener" class="butAction marginbottomonly"><div class="index_create bigrounded"><span class="fa fa-15x fa-plus-circle valignmiddle btnTitle-icon"></span><br>'.dol_escape_htmltag($langs->trans("CreateTicket")).'</div></a>';
+print '<a href="list.php'.(!empty($entity) && isModEnabled('multicompany')?'?entity='.$entity:'').'" rel="nofollow noopener" class="butAction marginbottomonly"><div class="index_display bigrounded"><span class="fa fa-15x fa-list-alt valignmiddle btnTitle-icon"></span><br>'.dol_escape_htmltag($langs->trans("ViewMyTicketList")).'</div></a>';
+print '<a href="view.php'.(!empty($entity) && isModEnabled('multicompany')?'?entity='.$entity:'').'" rel="nofollow noopener" class="butAction marginbottomonly"><div class="index_display bigrounded">'.img_picto('', 'ticket', 'class="fa-15x"').'<br>'.dol_escape_htmltag($langs->trans("ShowTicketWithTrackId")).'</div></a>';
 print '<div style="clear:both;"></div>';
 print '</div>';
 print '</div>';

From c2c13d41eff8edc8d21e9f5e82de6a788fbe5bfd Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Sun, 28 Aug 2022 14:28:52 +0200
Subject: [PATCH 172/974] FIX php8 compatibility

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

diff --git a/htdocs/public/ticket/list.php b/htdocs/public/ticket/list.php
index a15beff2856..9e156b341a0 100644
--- a/htdocs/public/ticket/list.php
+++ b/htdocs/public/ticket/list.php
@@ -221,7 +221,7 @@ if ($action == "view_ticketlist") {
 
 		$filter = array();
 		$param = '&action=view_ticketlist';
-		if (!empty($entity) && !empty($conf->multicompany->enabled)) {
+		if (!empty($entity) && isModEnabled('multicompany')) {
 			$param .= '&entity='.$entity;
 		}
 
@@ -401,7 +401,7 @@ if ($action == "view_ticketlist") {
 				print_barre_liste($langs->trans('TicketList'), $page, '/public/ticket/list.php', $param, $sortfield, $sortorder, '', $num, $num_total, 'ticket');
 
 				// Search bar
-				print '<form method="POST" action="'.$_SERVER['PHP_SELF'].(!empty($entity) && !empty($conf->multicompany->enabled)?'?entity='.$entity:'').'" id="searchFormList" >'."\n";
+				print '<form method="POST" action="'.$_SERVER['PHP_SELF'].(!empty($entity) && isModEnabled('multicompany')?'?entity='.$entity:'').'" id="searchFormList" >'."\n";
 				print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">';
 				print '<input type="hidden" name="action" value="view_ticketlist">';
 				print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
@@ -688,7 +688,7 @@ if ($action == "view_ticketlist") {
 				print '</table>';
 				print '</form>';
 
-				print '<form method="post" id="form_view_ticket" name="form_view_ticket" action="'.dol_buildpath('/public/ticket/view.php', 1).(!empty($entity) && !empty($conf->multicompany->enabled)?'?entity='.$entity:'').'" style="display:none;">';
+				print '<form method="post" id="form_view_ticket" name="form_view_ticket" action="'.dol_buildpath('/public/ticket/view.php', 1).(!empty($entity) && isModEnabled('multicompany')?'?entity='.$entity:'').'" style="display:none;">';
 				print '<input type="hidden" name="token" value="'.newToken().'">';
 				print '<input type="hidden" name="action" value="view_ticket">';
 				print '<input type="hidden" name="btn_view_ticket_list" value="1">';
@@ -713,7 +713,7 @@ if ($action == "view_ticketlist") {
 	print '<br>';
 
 	print '<div id="form_view_ticket">';
-	print '<form method="post" name="form_view_ticketlist" action="'.$_SERVER['PHP_SELF'].(!empty($entity) && !empty($conf->multicompany->enabled)?'?entity='.$entity:'').'">';
+	print '<form method="post" name="form_view_ticketlist" action="'.$_SERVER['PHP_SELF'].(!empty($entity) && isModEnabled('multicompany')?'?entity='.$entity:'').'">';
 	print '<input type="hidden" name="token" value="'.newToken().'">';
 	print '<input type="hidden" name="action" value="view_ticketlist">';
 	//print '<input type="hidden" name="search_fk_status" value="non_closed">';

From 6ac416f6e2da9a75f0972cf7fb4ecf8d5443ec33 Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Sun, 28 Aug 2022 14:29:19 +0200
Subject: [PATCH 173/974] FIX php8 compatibility

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

diff --git a/htdocs/public/ticket/list.php b/htdocs/public/ticket/list.php
index 9e156b341a0..ec7698ceb00 100644
--- a/htdocs/public/ticket/list.php
+++ b/htdocs/public/ticket/list.php
@@ -242,7 +242,7 @@ if ($action == "view_ticketlist") {
 			't.fk_user_create' => array('label' => $langs->trans("Author"), 'checked' => 1),
 			't.fk_user_assign' => array('label' => $langs->trans("AssignedTo"), 'checked' => 0),
 
-			//'t.entity'=>array('label'=>$langs->trans("Entity"), 'checked'=>1, 'enabled'=>(! empty($conf->multicompany->enabled) && empty($conf->multicompany->transverse_mode))),
+			//'t.entity'=>array('label'=>$langs->trans("Entity"), 'checked'=>1, 'enabled'=>(isModEnabled('multicompany') && empty($conf->multicompany->transverse_mode))),
 			//'t.datec' => array('label' => $langs->trans("DateCreation"), 'checked' => 0, 'position' => 500),
 			//'t.tms' => array('label' => $langs->trans("DateModificationShort"), 'checked' => 0, 'position' => 2)
 			//'t.statut'=>array('label'=>$langs->trans("Status"), 'checked'=>1, 'position'=>1000),

From 622442bb49b70587786d08fa77e5b75d0f683407 Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Sun, 28 Aug 2022 14:29:59 +0200
Subject: [PATCH 174/974] FIX php8 compatibility

---
 htdocs/public/ticket/view.php | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/htdocs/public/ticket/view.php b/htdocs/public/ticket/view.php
index 29a850128ed..50885cfc822 100644
--- a/htdocs/public/ticket/view.php
+++ b/htdocs/public/ticket/view.php
@@ -170,7 +170,7 @@ if ($action == "view_ticket" || $action == "presend" || $action == "close" || $a
 		if ($object->dao->close($user)) {
 			setEventMessages($langs->trans('TicketMarkedAsClosed'), null, 'mesgs');
 
-			$url = 'view.php?action=view_ticket&track_id='.GETPOST('track_id', 'alpha').(!empty($entity) && !empty($conf->multicompany->enabled)?'&entity='.$entity:'');
+			$url = 'view.php?action=view_ticket&track_id='.GETPOST('track_id', 'alpha').(!empty($entity) && isModEnabled('multicompany')?'&entity='.$entity:'');
 			header("Location: ".$url);
 			exit;
 		} else {
@@ -234,7 +234,7 @@ if ($action == "view_ticket" || $action == "presend" || $action == "close" || $a
 	if ($display_ticket) {
 		// Confirmation close
 		if ($action == 'close') {
-			print $form->formconfirm($_SERVER["PHP_SELF"]."?track_id=".$track_id.(!empty($entity) && !empty($conf->multicompany->enabled)?'&entity='.$entity:''), $langs->trans("CloseATicket"), $langs->trans("ConfirmCloseAticket"), "confirm_public_close", '', '', 1);
+			print $form->formconfirm($_SERVER["PHP_SELF"]."?track_id=".$track_id.(!empty($entity) && isModEnabled('multicompany')?'&entity='.$entity:''), $langs->trans("CloseATicket"), $langs->trans("ConfirmCloseAticket"), "confirm_public_close", '', '', 1);
 		}
 
 		print '<div id="form_view_ticket" class="margintoponly">';
@@ -347,7 +347,7 @@ if ($action == "view_ticket" || $action == "presend" || $action == "close" || $a
 			$formticket->id = $object->dao->id;
 
 			$formticket->param = array('track_id' => $object->dao->track_id, 'fk_user_create' => '-1',
-									   'returnurl' => DOL_URL_ROOT.'/public/ticket/view.php'.(!empty($entity) && !empty($conf->multicompany->enabled)?'?entity='.$entity:''));
+									   'returnurl' => DOL_URL_ROOT.'/public/ticket/view.php'.(!empty($entity) && isModEnabled('multicompany')?'?entity='.$entity:''));
 
 			$formticket->withfile = 2;
 			$formticket->withcancel = 1;
@@ -356,7 +356,7 @@ if ($action == "view_ticket" || $action == "presend" || $action == "close" || $a
 		}
 
 		if ($action != 'presend') {
-			print '<form method="post" id="form_view_ticket_list" name="form_view_ticket_list" action="'.DOL_URL_ROOT.'/public/ticket/list.php'.(!empty($entity) && !empty($conf->multicompany->enabled)?'?entity='.$entity:'').'">';
+			print '<form method="post" id="form_view_ticket_list" name="form_view_ticket_list" action="'.DOL_URL_ROOT.'/public/ticket/list.php'.(!empty($entity) && isModEnabled('multicompany')?'?entity='.$entity:'').'">';
 			print '<input type="hidden" name="token" value="'.newToken().'">';
 			print '<input type="hidden" name="action" value="view_ticketlist">';
 			print '<input type="hidden" name="track_id" value="'.$object->dao->track_id.'">';
@@ -371,11 +371,11 @@ if ($action == "view_ticket" || $action == "presend" || $action == "close" || $a
 
 			if ($object->dao->fk_statut < Ticket::STATUS_CLOSED) {
 				// New message
-				print '<div class="inline-block divButAction"><a  class="butAction" href="'.$_SERVER['PHP_SELF'].'?action=presend&mode=init&track_id='.$object->dao->track_id.(!empty($entity) && !empty($conf->multicompany->enabled)?'&entity='.$entity:'').'">'.$langs->trans('AddMessage').'</a></div>';
+				print '<div class="inline-block divButAction"><a  class="butAction" href="'.$_SERVER['PHP_SELF'].'?action=presend&mode=init&track_id='.$object->dao->track_id.(!empty($entity) && isModEnabled('multicompany')?'&entity='.$entity:'').'">'.$langs->trans('AddMessage').'</a></div>';
 
 				// Close ticket
 				if ($object->dao->fk_statut >= Ticket::STATUS_NOT_READ && $object->dao->fk_statut < Ticket::STATUS_CLOSED) {
-					print '<div class="inline-block divButAction"><a  class="butAction" href="'.$_SERVER['PHP_SELF'].'?action=close&track_id='.$object->dao->track_id.(!empty($entity) && !empty($conf->multicompany->enabled)?'&entity='.$entity:'').'">'.$langs->trans('CloseTicket').'</a></div>';
+					print '<div class="inline-block divButAction"><a  class="butAction" href="'.$_SERVER['PHP_SELF'].'?action=close&track_id='.$object->dao->track_id.(!empty($entity) && isModEnabled('multicompany')?'&entity='.$entity:'').'">'.$langs->trans('CloseTicket').'</a></div>';
 				}
 			}
 
@@ -386,13 +386,13 @@ if ($action == "view_ticket" || $action == "presend" || $action == "close" || $a
 		print load_fiche_titre($langs->trans('TicketMessagesList'), '', 'conversation');
 		$object->viewTicketMessages(false, true, $object->dao);
 	} else {
-		print '<div class="error">Not Allowed<br><a href="'.$_SERVER['PHP_SELF'].'?track_id='.$object->dao->track_id.(!empty($entity) && !empty($conf->multicompany->enabled)?'?entity='.$entity:'').'" rel="nofollow noopener">'.$langs->trans('Back').'</a></div>';
+		print '<div class="error">Not Allowed<br><a href="'.$_SERVER['PHP_SELF'].'?track_id='.$object->dao->track_id.(!empty($entity) && isModEnabled('multicompany')?'?entity='.$entity:'').'" rel="nofollow noopener">'.$langs->trans('Back').'</a></div>';
 	}
 } else {
 	print '<div class="center opacitymedium margintoponly marginbottomonly">'.$langs->trans("TicketPublicMsgViewLogIn").'</div>';
 
 	print '<div id="form_view_ticket">';
-	print '<form method="post" name="form_view_ticket" action="'.$_SERVER['PHP_SELF'].(!empty($entity) && !empty($conf->multicompany->enabled)?'?entity='.$entity:'').'">';
+	print '<form method="post" name="form_view_ticket" action="'.$_SERVER['PHP_SELF'].(!empty($entity) && isModEnabled('multicompany')?'?entity='.$entity:'').'">';
 	print '<input type="hidden" name="token" value="'.newToken().'">';
 	print '<input type="hidden" name="action" value="view_ticket">';
 

From c3670cc62272656730d5cc822e77cebdcb259043 Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Sun, 28 Aug 2022 14:30:24 +0200
Subject: [PATCH 175/974] FIX php8 compatibility

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

diff --git a/htdocs/recruitment/admin/public_interface.php b/htdocs/recruitment/admin/public_interface.php
index 7212a687442..f145b0b39a9 100644
--- a/htdocs/recruitment/admin/public_interface.php
+++ b/htdocs/recruitment/admin/public_interface.php
@@ -144,7 +144,7 @@ if (!empty($conf->global->RECRUITMENT_ENABLE_PUBLIC_INTERFACE)) {
 	print '<br>';
 	//print $langs->trans('FollowingLinksArePublic').'<br>';
 	print img_picto('', 'globe').' <span class="opacitymedium">'.$langs->trans('BlankSubscriptionForm').'</span><br>';
-	if (!empty($conf->multicompany->enabled)) {
+	if (isModEnabled('multicompany')) {
 		$entity_qr = '?entity='.$conf->entity;
 	} else {
 		$entity_qr = '';

From ad09ce3979158907540fe97e23e5945cf172ebcc Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Sun, 28 Aug 2022 14:30:48 +0200
Subject: [PATCH 176/974] FIX php8 compatibility

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

diff --git a/htdocs/recruitment/class/recruitmentcandidature.class.php b/htdocs/recruitment/class/recruitmentcandidature.class.php
index 060f51ebefe..849ac400066 100644
--- a/htdocs/recruitment/class/recruitmentcandidature.class.php
+++ b/htdocs/recruitment/class/recruitmentcandidature.class.php
@@ -174,7 +174,7 @@ class RecruitmentCandidature extends CommonObject
 		if (empty($conf->global->MAIN_SHOW_TECHNICAL_ID) && isset($this->fields['rowid'])) {
 			$this->fields['rowid']['visible'] = 0;
 		}
-		if (empty($conf->multicompany->enabled) && isset($this->fields['entity'])) {
+		if (!isModEnabled('multicompany') && isset($this->fields['entity'])) {
 			$this->fields['entity']['enabled'] = 0;
 		}
 

From 78612221b314fe5ce26e6abf77f056d804c33b2d Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Sun, 28 Aug 2022 14:31:13 +0200
Subject: [PATCH 177/974] FIX php8 compatibility

---
 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 e0a59b0e3a6..9d97ab856e0 100644
--- a/htdocs/recruitment/class/recruitmentjobposition.class.php
+++ b/htdocs/recruitment/class/recruitmentjobposition.class.php
@@ -182,7 +182,7 @@ class RecruitmentJobPosition extends CommonObject
 		if (empty($conf->global->MAIN_SHOW_TECHNICAL_ID) && isset($this->fields['rowid'])) {
 			$this->fields['rowid']['visible'] = 0;
 		}
-		if (empty($conf->multicompany->enabled) && isset($this->fields['entity'])) {
+		if (!isModEnabled('multicompany') && isset($this->fields['entity'])) {
 			$this->fields['entity']['enabled'] = 0;
 		}
 

From 26e8aa4b9228ff7f435dd0fa3820cd53fa15db30 Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Sun, 28 Aug 2022 14:31:37 +0200
Subject: [PATCH 178/974] FIX php8 compatibility

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

diff --git a/htdocs/recruitment/lib/recruitment_recruitmentjobposition.lib.php b/htdocs/recruitment/lib/recruitment_recruitmentjobposition.lib.php
index 4e9b8d33e36..179f26a84c7 100644
--- a/htdocs/recruitment/lib/recruitment_recruitmentjobposition.lib.php
+++ b/htdocs/recruitment/lib/recruitment_recruitmentjobposition.lib.php
@@ -143,7 +143,7 @@ function getPublicJobPositionUrl($mode, $ref = '', $localorexternal = 0)
 	}*/
 
 	// For multicompany
-	if (!empty($out) && !empty($conf->multicompany->enabled)) {
+	if (!empty($out) && isModEnabled('multicompany')) {
 		$out .= "&entity=".$conf->entity; // Check the entity because we may have the same reference in several entities
 	}
 

From afcd1552252649ee3f82a50eec124bd78ca27e50 Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Sun, 28 Aug 2022 14:32:01 +0200
Subject: [PATCH 179/974] FIX php8 compatibility

---
 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 40f92007f38..f9f5f800a04 100644
--- a/htdocs/societe/admin/societe.php
+++ b/htdocs/societe/admin/societe.php
@@ -406,7 +406,7 @@ foreach ($arrayofmodules as $file => $modCodeTiers) {
 		print img_picto($langs->trans("Activated"), 'switch_on');
 		print "</td>\n";
 	} else {
-		$disabled = (!empty($conf->multicompany->enabled) && (is_object($mc) && !empty($mc->sharings['referent']) && $mc->sharings['referent'] != $conf->entity) ? true : false);
+		$disabled = (isModEnabled('multicompany') && (is_object($mc) && !empty($mc->sharings['referent']) && $mc->sharings['referent'] != $conf->entity) ? true : false);
 		print '<td class="center">';
 		if (!$disabled) {
 			print '<a class="reposition" href="'.$_SERVER['PHP_SELF'].'?action=setcodeclient&token='.newToken().'&value='.urlencode($file).'">';

From 79235c28c07c0bbaa0a83633d75b2bdf10556587 Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Sun, 28 Aug 2022 14:32:30 +0200
Subject: [PATCH 180/974] FIX php8 compatibility

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

diff --git a/htdocs/societe/class/companypaymentmode.class.php b/htdocs/societe/class/companypaymentmode.class.php
index 2cce0ccac86..162badd9e12 100644
--- a/htdocs/societe/class/companypaymentmode.class.php
+++ b/htdocs/societe/class/companypaymentmode.class.php
@@ -235,7 +235,7 @@ class CompanyPaymentMode extends CommonObject
 		if (empty($conf->global->MAIN_SHOW_TECHNICAL_ID) && isset($this->fields['rowid'])) {
 			$this->fields['rowid']['visible'] = 0;
 		}
-		if (empty($conf->multicompany->enabled) && isset($this->fields['entity'])) {
+		if (!isModEnabled('multicompany') && isset($this->fields['entity'])) {
 			$this->fields['entity']['enabled'] = 0;
 		}
 	}

From f5f9dbccf7676e4fcc8f7191275402ded763403c Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Sun, 28 Aug 2022 14:33:08 +0200
Subject: [PATCH 181/974] FIX php8 compatibility

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

diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php
index cb20caca7ab..ee2d71f6d12 100644
--- a/htdocs/societe/class/societe.class.php
+++ b/htdocs/societe/class/societe.class.php
@@ -1737,7 +1737,7 @@ class Societe extends CommonObject
 		$sql .= ', st.libelle as stcomm, st.picto as stcomm_picto';
 		$sql .= ', te.code as typent_code';
 		$sql .= ', i.libelle as label_incoterms';
-		if (empty($conf->multicompany->enabled)) {
+		if (!isModEnabled('multicompany')) {
 			$sql .= ', s.remise_client, s.remise_supplier';
 		} else {
 			$sql .= ', sr.remise_client, sr2.remise_supplier';
@@ -1756,7 +1756,7 @@ class Societe extends CommonObject
 		$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_incoterms as i ON s.fk_incoterms = i.rowid';
 		// With default setup, llx_societe_remise is a history table in default setup and current value is in llx_societe.
 		// We use it for real value when multicompany is on. A better place would be into llx_societe_perentity.
-		if (!empty($conf->multicompany->enabled)) {
+		if (isModEnabled('multicompany')) {
 			$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'societe_remise as sr ON sr.rowid = (SELECT MAX(rowid) FROM '.MAIN_DB_PREFIX.'societe_remise WHERE fk_soc = s.rowid AND entity IN ('.getEntity('discount').'))';
 			$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').'))';
 		}
@@ -2378,7 +2378,7 @@ class Societe extends CommonObject
 		$sql = "SELECT DISTINCT u.rowid, u.login, u.lastname, u.firstname, u.office_phone, u.job, u.email, u.statut as status, u.entity, u.photo, u.gender";
 		$sql .= ", u.office_fax, u.user_mobile, u.personal_mobile";
 		$sql .= " FROM ".MAIN_DB_PREFIX."societe_commerciaux as sc, ".MAIN_DB_PREFIX."user as u";
-		if (!empty($conf->multicompany->enabled) && !empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE)) {
+		if (isModEnabled('multicompany') && !empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE)) {
 			$sql .= ", ".MAIN_DB_PREFIX."usergroup_user as ug";
 			$sql .= " WHERE ((ug.fk_user = sc.fk_user";
 			$sql .= " AND ug.entity = ".$conf->entity.")";

From acd18655de84192ce38ee2c30278b00be9336b65 Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Sun, 28 Aug 2022 14:33:32 +0200
Subject: [PATCH 182/974] FIX php8 compatibility

---
 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 aa971d9a5d5..dd8b75292ad 100644
--- a/htdocs/ticket/class/cticketcategory.class.php
+++ b/htdocs/ticket/class/cticketcategory.class.php
@@ -189,7 +189,7 @@ class CTicketCategory extends CommonObject
 		if (empty($conf->global->MAIN_SHOW_TECHNICAL_ID) && isset($this->fields['rowid'])) {
 			$this->fields['rowid']['visible'] = 0;
 		}
-		if (empty($conf->multicompany->enabled) && isset($this->fields['entity'])) {
+		if (!isModEnabled('multicompany') && isset($this->fields['entity'])) {
 			$this->fields['entity']['enabled'] = 0;
 		}
 

From 31c287ec5867965054788ca616eb6213acd68baa Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Sun, 28 Aug 2022 14:33:56 +0200
Subject: [PATCH 183/974] FIX php8 compatibility

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

diff --git a/htdocs/user/bank.php b/htdocs/user/bank.php
index 1b7ca92bbbb..fed40e6a1bd 100644
--- a/htdocs/user/bank.php
+++ b/htdocs/user/bank.php
@@ -331,7 +331,7 @@ if ($action != 'edit' && $action != 'create') {		// If not bank account yet, $ac
 		print '<td>';
 		$addadmin = '';
 		if (property_exists($object, 'admin')) {
-			if (!empty($conf->multicompany->enabled) && !empty($object->admin) && empty($object->entity)) {
+			if (isModEnabled('multicompany') && !empty($object->admin) && empty($object->entity)) {
 				$addadmin .= img_picto($langs->trans("SuperAdministratorDesc"), "redstar", 'class="paddingleft"');
 			} elseif (!empty($object->admin)) {
 				$addadmin .= img_picto($langs->trans("AdministratorDesc"), "star", 'class="paddingleft"');

From 5d7c98ea087e6168941cbdad18c2c4b7882ecf86 Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Sun, 28 Aug 2022 14:34:33 +0200
Subject: [PATCH 184/974] FIX php8 compatibility

---
 htdocs/user/card.php | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/htdocs/user/card.php b/htdocs/user/card.php
index 5b64ad6225f..6b8bf04507d 100644
--- a/htdocs/user/card.php
+++ b/htdocs/user/card.php
@@ -312,7 +312,7 @@ if (empty($reshook)) {
 
 			// Set entity property
 			$entity = GETPOST('entity', 'int');
-			if (!empty($conf->multicompany->enabled)) {
+			if (isModEnabled('multicompany')) {
 				if (GETPOST('superadmin', 'int')) {
 					$object->entity = 0;
 				} else {
@@ -476,7 +476,7 @@ if (empty($reshook)) {
 				$object->lang = GETPOST('default_lang', 'aZ09');
 
 				// Do we update also ->entity ?
-				if (!empty($conf->multicompany->enabled) && empty($user->entity) && !empty($user->admin)) {	// If multicompany is not enabled, we never update the entity of a user.
+				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')) {
 						$object->entity = 0;
 					} else {
@@ -886,7 +886,7 @@ if ($action == 'create' || $action == 'adduserldap') {
 		print '<td>';
 		print $form->selectyesno('admin', GETPOST('admin'), 1);
 
-		if (!empty($conf->multicompany->enabled) && !$user->entity) {
+		if (isModEnabled('multicompany') && !$user->entity) {
 			if (!empty($conf->use_javascript_ajax)) {
 				print '<script type="text/javascript">
                             $(function() {
@@ -1181,7 +1181,7 @@ if ($action == 'create' || $action == 'adduserldap') {
 	}
 
 	// Multicompany
-	if (!empty($conf->multicompany->enabled) && is_object($mc)) {
+	if (isModEnabled('multicompany') && is_object($mc)) {
 		// This is now done with hook formObjectOptions. Keep this code for backward compatibility with old multicompany module
 		if (!method_exists($mc, 'formObjectOptions')) {
 			if (empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE) && $conf->entity == 1 && $user->admin && !$user->entity) {	// condition must be same for create and edit mode
@@ -1435,7 +1435,7 @@ if ($action == 'create' || $action == 'adduserldap') {
 				print '<td>';
 				$addadmin = '';
 				if (property_exists($object, 'admin')) {
-					if (!empty($conf->multicompany->enabled) && !empty($object->admin) && empty($object->entity)) {
+					if (isModEnabled('multicompany') && !empty($object->admin) && empty($object->entity)) {
 						$addadmin .= img_picto($langs->trans("SuperAdministratorDesc"), "redstar", 'class="paddingleft"');
 					} elseif (!empty($object->admin)) {
 						$addadmin .= img_picto($langs->trans("AdministratorDesc"), "star", 'class="paddingleft"');
@@ -1654,10 +1654,10 @@ if ($action == 'create' || $action == 'adduserldap') {
 			}
 
 			// Multicompany
-			if (!empty($conf->multicompany->enabled) && is_object($mc)) {
+			if (isModEnabled('multicompany') && is_object($mc)) {
 				// This is now done with hook formObjectOptions. Keep this code for backward compatibility with old multicompany module
 				if (!method_exists($mc, 'formObjectOptions')) {
-					if (!empty($conf->multicompany->enabled) && empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE) && $conf->entity == 1 && $user->admin && !$user->entity) {
+					if (isModEnabled('multicompany') && empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE) && $conf->entity == 1 && $user->admin && !$user->entity) {
 						print '<tr><td>'.$langs->trans("Entity").'</td><td>';
 						if (empty($object->entity)) {
 							print $langs->trans("AllEntities");
@@ -2135,12 +2135,12 @@ if ($action == 'create' || $action == 'adduserldap') {
 				&& ($user->id != $object->id)                   // Don't downgrade ourself
 				&& (
 					(empty($conf->multicompany->enabled) && $nbAdmin >= 1)
-					|| (!empty($conf->multicompany->enabled) && (($object->entity > 0 || ($user->entity == 0 && $object->entity == 0)) || $nbSuperAdmin > 1))    // Don't downgrade a superadmin if alone
+					|| (isModEnabled('multicompany') && (($object->entity > 0 || ($user->entity == 0 && $object->entity == 0)) || $nbSuperAdmin > 1))    // Don't downgrade a superadmin if alone
 					)
 				) {
 					print $form->selectyesno('admin', $object->admin, 1);
 
-					if (!empty($conf->multicompany->enabled) && !$user->entity) {
+					if (isModEnabled('multicompany') && !$user->entity) {
 						if ($conf->use_javascript_ajax) {
 							print '<script type="text/javascript">
 									$(function() {
@@ -2186,7 +2186,7 @@ if ($action == 'create' || $action == 'adduserldap') {
 					$yn = yn($object->admin);
 					print '<input type="hidden" name="admin" value="'.$object->admin.'">';
 					print '<input type="hidden" name="superadmin" value="'.(empty($object->entity) ? 1 : 0).'">';
-					if (!empty($conf->multicompany->enabled) && empty($object->entity)) {
+					if (isModEnabled('multicompany') && empty($object->entity)) {
 						print $form->textwithpicto($yn, $langs->trans("DontDowngradeSuperAdmin"), 1, 'warning');
 					} else {
 						print $yn;
@@ -2645,7 +2645,7 @@ if ($action == 'create' || $action == 'adduserldap') {
 
 			// Multicompany
 			// TODO check if user not linked with the current entity before change entity (thirdparty, invoice, etc.) !!
-			if (!empty($conf->multicompany->enabled) && is_object($mc)) {
+			if (isModEnabled('multicompany') && is_object($mc)) {
 				// This is now done with hook formObjectOptions. Keep this code for backward compatibility with old multicompany module
 				if (!method_exists($mc, 'formObjectOptions')) {
 					if (empty($conf->multicompany->transverse_mode) && $conf->entity == 1 && $user->admin && !$user->entity) {

From e2ea2a2ae16c176d5342fab6779ea8ffddcb43be Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Sun, 28 Aug 2022 14:36:09 +0200
Subject: [PATCH 185/974] FIX php8 compatibility

---
 htdocs/user/card.php | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/htdocs/user/card.php b/htdocs/user/card.php
index 6b8bf04507d..853c4d91e2f 100644
--- a/htdocs/user/card.php
+++ b/htdocs/user/card.php
@@ -1864,7 +1864,7 @@ if ($action == 'create' || $action == 'adduserldap') {
 					print dolGetButtonAction($langs->trans('SendMail'), '', 'default', $_SERVER['PHP_SELF'] . '?id=' . $object->id . '&action=presend&mode=init#formmailbeforetitle', '', $canSendMail, $params);
 				}
 
-				if ($caneditfield && (empty($conf->multicompany->enabled) || !$user->entity || ($object->entity == $conf->entity) || ($conf->global->MULTICOMPANY_TRANSVERSE_MODE && $object->entity == 1))) {
+				if ($caneditfield && (!isModEnabled('multicompany') || !$user->entity || ($object->entity == $conf->entity) || ($conf->global->MULTICOMPANY_TRANSVERSE_MODE && $object->entity == 1))) {
 					$params = array(
 						'attr' => array(
 							'title' => '',
@@ -1878,7 +1878,7 @@ if ($action == 'create' || $action == 'adduserldap') {
 						print dolGetButtonAction($langs->trans('Modify'), '', 'default', $_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;action=edit&token='.newToken(), '', true, $params);
 					}
 				} elseif ($caneditpassword && !$object->ldap_sid &&
-				(empty($conf->multicompany->enabled) || !$user->entity || ($object->entity == $conf->entity) || ($conf->global->MULTICOMPANY_TRANSVERSE_MODE && $object->entity == 1))) {
+				(!isModEnabled('multicompany') || !$user->entity || ($object->entity == $conf->entity) || ($conf->global->MULTICOMPANY_TRANSVERSE_MODE && $object->entity == 1))) {
 					$params = array(
 						'attr' => array(
 							'title' => '',
@@ -1900,7 +1900,7 @@ if ($action == 'create' || $action == 'adduserldap') {
 						$params['attr']['title'] = $langs->trans('UserDisabled');
 						print dolGetButtonAction($langs->trans('ReinitPassword'), '', 'default', $_SERVER['PHP_SELF'].'#', '', false, $params);
 					} elseif (($user->id != $id && $caneditpassword) && $object->login && !$object->ldap_sid &&
-					((empty($conf->multicompany->enabled) && $object->entity == $user->entity) || !$user->entity || ($object->entity == $conf->entity) || ($conf->global->MULTICOMPANY_TRANSVERSE_MODE && $object->entity == 1))) {
+					((!isModEnabled('multicompany') && $object->entity == $user->entity) || !$user->entity || ($object->entity == $conf->entity) || ($conf->global->MULTICOMPANY_TRANSVERSE_MODE && $object->entity == 1))) {
 						print dolGetButtonAction($langs->trans('ReinitPassword'), '', 'default', $_SERVER['PHP_SELF'].'?id='.$object->id.'&action=password&token='.newToken(), '', true, $params);
 					}
 
@@ -1908,7 +1908,7 @@ if ($action == 'create' || $action == 'adduserldap') {
 						$params['attr']['title'] = $langs->trans('UserDisabled');
 						print dolGetButtonAction($langs->trans('SendNewPassword'), '', 'default', $_SERVER['PHP_SELF'].'#', '', false, $params);
 					} elseif (($user->id != $id && $caneditpassword) && $object->login && !$object->ldap_sid &&
-					((empty($conf->multicompany->enabled) && $object->entity == $user->entity) || !$user->entity || ($object->entity == $conf->entity) || ($conf->global->MULTICOMPANY_TRANSVERSE_MODE && $object->entity == 1))) {
+					((!isModEnabled('multicompany') && $object->entity == $user->entity) || !$user->entity || ($object->entity == $conf->entity) || ($conf->global->MULTICOMPANY_TRANSVERSE_MODE && $object->entity == 1))) {
 						if ($object->email) {
 							print dolGetButtonAction($langs->trans('SendNewPassword'), '', 'default', $_SERVER['PHP_SELF'].'?id='.$object->id.'&action=passwordsend&token='.newToken(), '', true, $params);
 						} else {
@@ -1926,12 +1926,12 @@ if ($action == 'create' || $action == 'adduserldap') {
 					)
 				);
 				if ($user->id <> $id && $candisableuser && $object->statut == 0 &&
-				((empty($conf->multicompany->enabled) && $object->entity == $user->entity) || !$user->entity || ($object->entity == $conf->entity) || ($conf->global->MULTICOMPANY_TRANSVERSE_MODE && $object->entity == 1))) {
+				((!isModEnabled('multicompany') && $object->entity == $user->entity) || !$user->entity || ($object->entity == $conf->entity) || ($conf->global->MULTICOMPANY_TRANSVERSE_MODE && $object->entity == 1))) {
 					print dolGetButtonAction($langs->trans('Reactivate'), '', 'default', $_SERVER['PHP_SELF'] . '?id=' . $object->id . '&action=enable&token='.newToken(), '', true, $params);
 				}
 				// Disable user
 				if ($user->id <> $id && $candisableuser && $object->statut == 1 &&
-				((empty($conf->multicompany->enabled) && $object->entity == $user->entity) || !$user->entity || ($object->entity == $conf->entity) || ($conf->global->MULTICOMPANY_TRANSVERSE_MODE && $object->entity == 1))) {
+				((!isModEnabled('multicompany') && $object->entity == $user->entity) || !$user->entity || ($object->entity == $conf->entity) || ($conf->global->MULTICOMPANY_TRANSVERSE_MODE && $object->entity == 1))) {
 					print dolGetButtonAction($langs->trans('DisableUser'), '', 'default', $_SERVER['PHP_SELF'] . '?id=' . $object->id . '&action=disable&token='.newToken(), '', true, $params);
 				} else {
 					if ($user->id == $id) {
@@ -1941,7 +1941,7 @@ if ($action == 'create' || $action == 'adduserldap') {
 				}
 				// Delete
 				if ($user->id <> $id && $candisableuser &&
-				((empty($conf->multicompany->enabled) && $object->entity == $user->entity) || !$user->entity || ($object->entity == $conf->entity) || ($conf->global->MULTICOMPANY_TRANSVERSE_MODE && $object->entity == 1))) {
+				((!isModEnabled('multicompany') && $object->entity == $user->entity) || !$user->entity || ($object->entity == $conf->entity) || ($conf->global->MULTICOMPANY_TRANSVERSE_MODE && $object->entity == 1))) {
 					if ($user->admin || !$object->admin) { // If user edited is admin, delete is possible on for an admin
 						print dolGetButtonAction($langs->trans('DeleteUser'), '', 'default', $_SERVER['PHP_SELF'].'?action=delete&token='.newToken().'&id='.$object->id, '', true, $params);
 					} else {
@@ -2134,7 +2134,7 @@ if ($action == 'create' || $action == 'adduserldap') {
 				if ($user->admin								// Need to be admin to allow downgrade of an admin
 				&& ($user->id != $object->id)                   // Don't downgrade ourself
 				&& (
-					(empty($conf->multicompany->enabled) && $nbAdmin >= 1)
+					(!isModEnabled('multicompany') && $nbAdmin >= 1)
 					|| (isModEnabled('multicompany') && (($object->entity > 0 || ($user->entity == 0 && $object->entity == 0)) || $nbSuperAdmin > 1))    // Don't downgrade a superadmin if alone
 					)
 				) {

From cd5ae18d699af9b2e5bd0b796013c71c9de29f7e Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Sun, 28 Aug 2022 14:36:36 +0200
Subject: [PATCH 186/974] FIX php8 compatibility

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

diff --git a/htdocs/user/document.php b/htdocs/user/document.php
index 31ec618a795..06a7fb4e9db 100644
--- a/htdocs/user/document.php
+++ b/htdocs/user/document.php
@@ -180,7 +180,7 @@ if ($object->id) {
 		print '<td>';
 		$addadmin = '';
 		if (property_exists($object, 'admin')) {
-			if (!empty($conf->multicompany->enabled) && !empty($object->admin) && empty($object->entity)) {
+			if (isModEnabled('multicompany') && !empty($object->admin) && empty($object->entity)) {
 				$addadmin .= img_picto($langs->trans("SuperAdministratorDesc"), "redstar", 'class="paddingleft"');
 			} elseif (!empty($object->admin)) {
 				$addadmin .= img_picto($langs->trans("AdministratorDesc"), "star", 'class="paddingleft"');

From 24cd63486603c37c1eb22a7a77958b41e711b8dd Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Sun, 28 Aug 2022 14:37:00 +0200
Subject: [PATCH 187/974] FIX php8 compatibility

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

diff --git a/htdocs/user/hierarchy.php b/htdocs/user/hierarchy.php
index 3f8326d3b7b..95918274378 100644
--- a/htdocs/user/hierarchy.php
+++ b/htdocs/user/hierarchy.php
@@ -121,7 +121,7 @@ if (!is_array($user_arbo) && $user_arbo < 0) {
 		$entitystring = '';
 
 		// TODO Set of entitystring should be done with a hook
-		if (!empty($conf->multicompany->enabled) && is_object($mc)) {
+		if (isModEnabled('multicompany') && is_object($mc)) {
 			if (empty($entity)) {
 				$entitystring = $langs->trans("AllEntities");
 			} else {
@@ -131,7 +131,7 @@ if (!is_array($user_arbo) && $user_arbo < 0) {
 		}
 
 		$li = $userstatic->getNomUrl(-1, '', 0, 1);
-		if (!empty($conf->multicompany->enabled) && $userstatic->admin && !$userstatic->entity) {
+		if (isModEnabled('multicompany') && $userstatic->admin && !$userstatic->entity) {
 			$li .= img_picto($langs->trans("SuperAdministrator"), 'redstar');
 		} elseif ($userstatic->admin) {
 			$li .= img_picto($langs->trans("Administrator"), 'star');

From 4ee4edae4cd0d80500c0055f7644323c100816a9 Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Sun, 28 Aug 2022 14:37:36 +0200
Subject: [PATCH 188/974] FIX php8 compatibility

---
 htdocs/user/home.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/htdocs/user/home.php b/htdocs/user/home.php
index 33b0465e5f1..8555af8f467 100644
--- a/htdocs/user/home.php
+++ b/htdocs/user/home.php
@@ -166,7 +166,7 @@ if ($resql) {
 		$lastcreatedbox .= '<tr class="oddeven">';
 		$lastcreatedbox .= '<td class="nowraponall tdoverflowmax150">';
 		$lastcreatedbox .= $fuserstatic->getNomUrl(-1);
-		if (!empty($conf->multicompany->enabled) && $obj->admin && !$obj->entity) {
+		if (isModEnabled('multicompany') && $obj->admin && !$obj->entity) {
 			$lastcreatedbox .= img_picto($langs->trans("SuperAdministrator"), 'redstar');
 		} elseif ($obj->admin) {
 			$lastcreatedbox .= img_picto($langs->trans("Administrator"), 'star');
@@ -185,7 +185,7 @@ if ($resql) {
 		$entity = $obj->entity;
 		$entitystring = '';
 		// TODO Set of entitystring should be done with a hook
-		if (!empty($conf->multicompany->enabled) && is_object($mc)) {
+		if (isModEnabled('multicompany') && is_object($mc)) {
 			if (empty($entity)) {
 				$entitystring = $langs->trans("AllEntities");
 			} else {
@@ -223,7 +223,7 @@ if ($canreadperms) {
 
 	$sql = "SELECT g.rowid, g.nom as name, g.note, g.entity, g.datec";
 	$sql .= " FROM ".MAIN_DB_PREFIX."usergroup as g";
-	if (!empty($conf->multicompany->enabled) && $conf->entity == 1 && ($conf->global->MULTICOMPANY_TRANSVERSE_MODE || ($user->admin && !$user->entity))) {
+	if (isModEnabled('multicompany') && $conf->entity == 1 && ($conf->global->MULTICOMPANY_TRANSVERSE_MODE || ($user->admin && !$user->entity))) {
 		$sql .= " WHERE g.entity IS NOT NULL";
 	} else {
 		$sql .= " WHERE g.entity IN (0,".$conf->entity.")";
@@ -234,7 +234,7 @@ if ($canreadperms) {
 	$resql = $db->query($sql);
 	if ($resql) {
 		$colspan = 1;
-		if (!empty($conf->multicompany->enabled)) {
+		if (isModEnabled('multicompany')) {
 			$colspan++;
 		}
 		$num = $db->num_rows($resql);
@@ -262,7 +262,7 @@ if ($canreadperms) {
 				$lastgroupbox .= img_picto($langs->trans("GlobalGroup"), 'redstar');
 			}
 			$lastgroupbox .= "</td>";
-			if (!empty($conf->multicompany->enabled) && is_object($mc)) {
+			if (isModEnabled('multicompany') && is_object($mc)) {
 				$mc->getInfo($obj->entity);
 				$lastgroupbox .= '<td>';
 				$lastgroupbox .= $mc->label;

From 736432b751243ef9d69d11588b5e71d6d90c2314 Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Sun, 28 Aug 2022 14:38:13 +0200
Subject: [PATCH 189/974] FIX php8 compatibility

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

diff --git a/htdocs/user/list.php b/htdocs/user/list.php
index 443893fa096..e98922f7e01 100644
--- a/htdocs/user/list.php
+++ b/htdocs/user/list.php
@@ -121,7 +121,7 @@ $arrayfields = array(
 	'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'=>(!empty($conf->multicompany->enabled) && empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE))),
+	'u.entity'=>array('label'=>"Entity", 'checked'=>1, 'position'=>50, 'enabled'=>(isModEnabled('multicompany') && empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE))),
 	'u.gender'=>array('label'=>"Gender", 'checked'=>0, 'position'=>22),
 	'u.employee'=>array('label'=>"Employee", 'checked'=>($mode == 'employee' ? 1 : 0), 'position'=>25),
 	'u.fk_user'=>array('label'=>"HierarchicalResponsible", 'checked'=>1, 'position'=>27),
@@ -981,7 +981,7 @@ while ($i < $imaxinloop) {
 		if (!empty($arrayfields['u.login']['checked'])) {
 			print '<td class="nowraponall tdoverflowmax150">';
 			print $li;
-			if (!empty($conf->multicompany->enabled) && $obj->admin && !$obj->entity) {
+			if (isModEnabled('multicompany') && $obj->admin && !$obj->entity) {
 				print img_picto($langs->trans("SuperAdministrator"), 'redstar', 'class="valignmiddle paddingleft"');
 			} elseif ($obj->admin) {
 				print img_picto($langs->trans("Administrator"), 'star', 'class="valignmiddle paddingleft"');
@@ -1054,7 +1054,7 @@ while ($i < $imaxinloop) {
 				$user2->statut = $obj->status2;
 				$user2->status = $obj->status2;
 				print $user2->getNomUrl(-1, '', 0, 0, 24, 0, '', '', 1);
-				if (!empty($conf->multicompany->enabled) && $obj->admin2 && !$obj->entity2) {
+				if (isModEnabled('multicompany') && $obj->admin2 && !$obj->entity2) {
 					print img_picto($langs->trans("SuperAdministrator"), 'redstar', 'class="valignmiddle paddingleft"');
 				} elseif ($obj->admin2) {
 					print img_picto($langs->trans("Administrator"), 'star', 'class="valignmiddle paddingleft"');
@@ -1123,7 +1123,7 @@ while ($i < $imaxinloop) {
 			}
 		}
 		// Multicompany enabled
-		if (!empty($conf->multicompany->enabled) && is_object($mc) && empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE)) {
+		if (isModEnabled('multicompany') && is_object($mc) && empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE)) {
 			if (!empty($arrayfields['u.entity']['checked'])) {
 				print '<td>';
 				if (!$obj->entity) {

From ab5a29198d1f28ba29931c563e15671d51211412 Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Sun, 28 Aug 2022 14:38:43 +0200
Subject: [PATCH 190/974] FIX php8 compatibility

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

diff --git a/htdocs/user/note.php b/htdocs/user/note.php
index 8269dfa93aa..e0ac0bd4dcf 100644
--- a/htdocs/user/note.php
+++ b/htdocs/user/note.php
@@ -127,7 +127,7 @@ if ($id) {
 		print '<td>';
 		$addadmin = '';
 		if (property_exists($object, 'admin')) {
-			if (!empty($conf->multicompany->enabled) && !empty($object->admin) && empty($object->entity)) {
+			if (isModEnabled('multicompany') && !empty($object->admin) && empty($object->entity)) {
 				$addadmin .= img_picto($langs->trans("SuperAdministratorDesc"), "redstar", 'class="paddingleft"');
 			} elseif (!empty($object->admin)) {
 				$addadmin .= img_picto($langs->trans("AdministratorDesc"), "star", 'class="paddingleft"');

From 9b37dfc7e887b377b95381d2edef86ab3485b078 Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Sun, 28 Aug 2022 14:39:07 +0200
Subject: [PATCH 191/974] FIX php8 compatibility

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

diff --git a/htdocs/user/param_ihm.php b/htdocs/user/param_ihm.php
index a00736fda44..49dc7e7f7a3 100644
--- a/htdocs/user/param_ihm.php
+++ b/htdocs/user/param_ihm.php
@@ -363,7 +363,7 @@ if ($action == 'edit') {
 		print '<td>';
 		$addadmin = '';
 		if (property_exists($object, 'admin')) {
-			if (!empty($conf->multicompany->enabled) && !empty($object->admin) && empty($object->entity)) {
+			if (isModEnabled('multicompany') && !empty($object->admin) && empty($object->entity)) {
 				$addadmin .= img_picto($langs->trans("SuperAdministratorDesc"), "redstar", 'class="paddingleft"');
 			} elseif (!empty($object->admin)) {
 				$addadmin .= img_picto($langs->trans("AdministratorDesc"), "star", 'class="paddingleft"');

From 31f45d29e594586d298efe687626f3b08e1088c7 Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Sun, 28 Aug 2022 14:39:29 +0200
Subject: [PATCH 192/974] FIX php8 compatibility

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

diff --git a/htdocs/user/perms.php b/htdocs/user/perms.php
index b9c840c6cb7..571662d80cf 100644
--- a/htdocs/user/perms.php
+++ b/htdocs/user/perms.php
@@ -275,7 +275,7 @@ if (!empty($object->ldap_sid) && $object->statut == 0) {
 	print '<td>';
 	$addadmin = '';
 	if (property_exists($object, 'admin')) {
-		if (!empty($conf->multicompany->enabled) && !empty($object->admin) && empty($object->entity)) {
+		if (isModEnabled('multicompany') && !empty($object->admin) && empty($object->entity)) {
 			$addadmin .= img_picto($langs->trans("SuperAdministratorDesc"), "redstar", 'class="paddingleft"');
 		} elseif (!empty($object->admin)) {
 			$addadmin .= img_picto($langs->trans("AdministratorDesc"), "star", 'class="paddingleft"');

From 0aba1f67534701f75e34f8adfc59158b561e07a0 Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Sun, 28 Aug 2022 14:39:50 +0200
Subject: [PATCH 193/974] FIX php8 compatibility

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

diff --git a/htdocs/user/class/api_users.class.php b/htdocs/user/class/api_users.class.php
index 3ef98da8f5b..e18c78e6ced 100644
--- a/htdocs/user/class/api_users.class.php
+++ b/htdocs/user/class/api_users.class.php
@@ -487,7 +487,7 @@ class Users extends DolibarrApi
 			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
 		}
 
-		if (!empty($conf->multicompany->enabled) && !empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE) && !empty(DolibarrApiAccess::$user->admin) && empty(DolibarrApiAccess::$user->entity)) {
+		if (isModEnabled('multicompany') && !empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE) && !empty(DolibarrApiAccess::$user->admin) && empty(DolibarrApiAccess::$user->entity)) {
 			$entity = (!empty($entity) ? $entity : $conf->entity);
 		} else {
 			// When using API, action is done on entity of logged user because a user of entity X with permission to create user should not be able to

From 5aba964726a803db02ae31533f446d0fc1ed4e8d Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Sun, 28 Aug 2022 14:40:36 +0200
Subject: [PATCH 194/974] FIX php8 compatibility

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

diff --git a/htdocs/user/class/user.class.php b/htdocs/user/class/user.class.php
index 008aaae5007..c7c10fe10cd 100644
--- a/htdocs/user/class/user.class.php
+++ b/htdocs/user/class/user.class.php
@@ -466,14 +466,14 @@ class User extends CommonObject
 		$sql .= " LEFT JOIN ".$this->db->prefix()."c_departements as d ON u.fk_state = d.rowid";
 
 		if ($entity < 0) {
-			if ((empty($conf->multicompany->enabled) || empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE)) && (!empty($user->entity))) {
+			if ((!isModEnabled('multicompany') || empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE)) && (!empty($user->entity))) {
 				$sql .= " WHERE u.entity IN (0, ".((int) $conf->entity).")";
 			} else {
 				$sql .= " WHERE u.entity IS NOT NULL"; // multicompany is on in transverse mode or user making fetch is on entity 0, so user is allowed to fetch anywhere into database
 			}
 		} else {
 			// The fetch was forced on an entity
-			if (!empty($conf->multicompany->enabled) && !empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE)) {
+			if (isModEnabled('multicompany') && !empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE)) {
 				$sql .= " WHERE u.entity IS NOT NULL"; // multicompany is on in transverse mode or user making fetch is on entity 0, so user is allowed to fetch anywhere into database
 			} else {
 				$sql .= " WHERE u.entity IN (0, ".((int) (($entity != '' && $entity >= 0) ? $entity : $conf->entity)).")"; // search in entity provided in parameter
@@ -588,7 +588,7 @@ class User extends CommonObject
 
 				// Protection when module multicompany was set, admin was set to first entity and then, the module was disabled,
 				// in such case, this admin user must be admin for ALL entities.
-				if (empty($conf->multicompany->enabled) && $this->admin && $this->entity == 1) {
+				if (!isModEnabled('multicompany') && $this->admin && $this->entity == 1) {
 					$this->entity = 0;
 				}
 
@@ -1130,7 +1130,7 @@ class User extends CommonObject
 		$sql .= " WHERE r.id = ur.fk_id";
 		if (!empty($conf->global->MULTICOMPANY_BACKWARD_COMPATIBILITY)) {
 			// on old version, we use entity defined into table r only
-			$sql .= " AND r.entity IN (0,".(!empty($conf->multicompany->enabled) && !empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE) ? "1," : "").$conf->entity.")";
+			$sql .= " AND r.entity IN (0,".(isModEnabled('multicompany') && !empty($conf->global->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.
@@ -1188,7 +1188,7 @@ class User extends CommonObject
 		$sql .= " ".$this->db->prefix()."rights_def as r";
 		$sql .= " WHERE r.id = gr.fk_id";
 		if (!empty($conf->global->MULTICOMPANY_BACKWARD_COMPATIBILITY)) {
-			if (!empty($conf->multicompany->enabled) && !empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE)) {
+			if (isModEnabled('multicompany') && !empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE)) {
 				$sql .= " AND gu.entity IN (0,".$conf->entity.")";
 			} else {
 				$sql .= " AND r.entity = ".((int) $conf->entity);
@@ -3661,7 +3661,7 @@ class User extends CommonObject
 
 		$sql = "SELECT COUNT(DISTINCT u.rowid) as nb";
 		$sql .= " FROM ".$this->db->prefix()."user as u";
-		if (!empty($conf->multicompany->enabled) && !empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE)) {
+		if (isModEnabled('multicompany') && !empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE)) {
 			$sql .= ", ".$this->db->prefix()."usergroup_user as ug";
 			$sql .= " WHERE ug.entity IN (".getEntity('usergroup').")";
 			$sql .= " AND ug.fk_user = u.rowid";

From 664a483e547db3475b37a948990e9328778bb475 Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Sun, 28 Aug 2022 14:41:03 +0200
Subject: [PATCH 195/974] FIX php8 compatibility

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

diff --git a/htdocs/user/class/usergroup.class.php b/htdocs/user/class/usergroup.class.php
index 41ac859f558..96fd14ec2be 100644
--- a/htdocs/user/class/usergroup.class.php
+++ b/htdocs/user/class/usergroup.class.php
@@ -195,7 +195,7 @@ class UserGroup extends CommonObject
 		$sql .= " ".$this->db->prefix()."usergroup_user as ug";
 		$sql .= " WHERE ug.fk_usergroup = g.rowid";
 		$sql .= " AND ug.fk_user = ".((int) $userid);
-		if (!empty($conf->multicompany->enabled) && $conf->entity == 1 && $user->admin && !$user->entity) {
+		if (isModEnabled('multicompany') && $conf->entity == 1 && $user->admin && !$user->entity) {
 			$sql .= " AND g.entity IS NOT NULL";
 		} else {
 			$sql .= " AND g.entity IN (0,".$conf->entity.")";
@@ -252,7 +252,7 @@ class UserGroup extends CommonObject
 		if (!empty($this->id)) {
 			$sql .= " AND ug.fk_usergroup = ".((int) $this->id);
 		}
-		if (!empty($conf->multicompany->enabled) && $conf->entity == 1 && $user->admin && !$user->entity) {
+		if (isModEnabled('multicompany') && $conf->entity == 1 && $user->admin && !$user->entity) {
 			$sql .= " AND u.entity IS NOT NULL";
 		} else {
 			$sql .= " AND u.entity IN (0,".$conf->entity.")";

From 679c258b3dd974ff74811c77946ec9f60fe101c5 Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Sun, 28 Aug 2022 14:41:42 +0200
Subject: [PATCH 196/974] FIX php8 compatibility

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

diff --git a/htdocs/user/group/card.php b/htdocs/user/group/card.php
index 9b6e9e1c317..98fe9c6c8b4 100644
--- a/htdocs/user/group/card.php
+++ b/htdocs/user/group/card.php
@@ -73,7 +73,7 @@ $hookmanager->initHooks(array('groupcard', 'globalcard'));
 $result = restrictedArea($user, 'user', $id, 'usergroup&usergroup', $feature2);
 
 // Users/Groups management only in master entity if transverse mode
-if (!empty($conf->multicompany->enabled) && $conf->entity > 1 && $conf->global->MULTICOMPANY_TRANSVERSE_MODE) {
+if (isModEnabled('multicompany') && $conf->entity > 1 && $conf->global->MULTICOMPANY_TRANSVERSE_MODE) {
 	accessforbidden();
 }
 
@@ -135,7 +135,7 @@ if (empty($reshook)) {
 					$error++;
 				}
 
-				if (!empty($conf->multicompany->enabled) && !empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE)) {
+				if (isModEnabled('multicompany') && !empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE)) {
 					$object->entity = 0;
 				} else {
 					if ($conf->entity == 1 && $user->admin && !$user->entity) {		// Same permissions test than the one used to show the combo of entities into the form
@@ -215,7 +215,7 @@ if (empty($reshook)) {
 				$error++;
 			}
 
-			if (!empty($conf->multicompany->enabled) && !empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE)) {
+			if (isModEnabled('multicompany') && !empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE)) {
 				$object->entity = 0;
 			} elseif (GETPOSTISSET("entity")) {
 				$object->entity = GETPOST("entity", "int");
@@ -274,7 +274,7 @@ if ($action == 'create') {
 	print '<table class="border centpercent tableforfieldcreate">';
 
 	// Multicompany
-	if (!empty($conf->multicompany->enabled) && is_object($mc)) {
+	if (isModEnabled('multicompany') && is_object($mc)) {
 		if (empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE) && $conf->entity == 1 && $user->admin && !$user->entity) {
 			print "<tr>".'<td class="tdtop">'.$langs->trans("Entity").'</td>';
 			print "<td>".$mc->select_entities($conf->entity);
@@ -348,7 +348,7 @@ if ($action == 'create') {
 			}
 
 			// Multicompany
-			if (!empty($conf->multicompany->enabled) && is_object($mc) && empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE) && $conf->entity == 1 && $user->admin && !$user->entity) {
+			if (isModEnabled('multicompany') && is_object($mc) && empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE) && $conf->entity == 1 && $user->admin && !$user->entity) {
 				$mc->getInfo($object->entity);
 				print "<tr>".'<td class="titlefield">'.$langs->trans("Entity").'</td>';
 				print '<td class="valeur">'.dol_escape_htmltag($mc->label);
@@ -520,7 +520,7 @@ if ($action == 'create') {
 			print '<table class="border centpercent tableforfieldedit">'."\n";
 
 			// Multicompany
-			if (!empty($conf->multicompany->enabled) && is_object($mc)) {
+			if (isModEnabled('multicompany') && is_object($mc)) {
 				if (empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE) && $conf->entity == 1 && $user->admin && !$user->entity) {
 					print "<tr>".'<td class="tdtop">'.$langs->trans("Entity").'</td>';
 					print "<td>".$mc->select_entities($object->entity);

From b0c37846207bb449f6030ff37d6d9924b66303d0 Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Sun, 28 Aug 2022 14:42:03 +0200
Subject: [PATCH 197/974] FIX php8 compatibility

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

diff --git a/htdocs/user/group/ldap.php b/htdocs/user/group/ldap.php
index 0c73b07807e..00c0101b708 100644
--- a/htdocs/user/group/ldap.php
+++ b/htdocs/user/group/ldap.php
@@ -46,7 +46,7 @@ $object->fetch($id);
 $object->getrights();
 
 // Users/Groups management only in master entity if transverse mode
-if (!empty($conf->multicompany->enabled) && $conf->entity > 1 && !empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE)) {
+if (isModEnabled('multicompany') && $conf->entity > 1 && !empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE)) {
 	accessforbidden();
 }
 

From 37409b1b018e97506e3cc40f6089af1026efafc8 Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Sun, 28 Aug 2022 14:42:27 +0200
Subject: [PATCH 198/974] FIX php8 compatibility

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

diff --git a/htdocs/user/group/list.php b/htdocs/user/group/list.php
index 8f7f907eb7b..a6a1cf4c752 100644
--- a/htdocs/user/group/list.php
+++ b/htdocs/user/group/list.php
@@ -76,7 +76,7 @@ if (!empty($conf->global->MAIN_USE_ADVANCED_PERMS)) {
 }
 
 // Users/Groups management only in master entity if transverse mode
-if (!empty($conf->multicompany->enabled) && $conf->entity > 1 && $conf->global->MULTICOMPANY_TRANSVERSE_MODE) {
+if (isModEnabled('multicompany') && $conf->entity > 1 && $conf->global->MULTICOMPANY_TRANSVERSE_MODE) {
 	accessforbidden();
 }
 
@@ -128,7 +128,7 @@ $sql = "SELECT g.rowid, g.nom as name, g.note, g.entity, g.datec, g.tms as datem
 $sql .= " FROM ".MAIN_DB_PREFIX."usergroup as g";
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."usergroup_user as ugu ON ugu.fk_usergroup = g.rowid";
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."usergroup_rights as ugr ON ugr.fk_usergroup = g.rowid";
-if (!empty($conf->multicompany->enabled) && $conf->entity == 1 && ($conf->global->MULTICOMPANY_TRANSVERSE_MODE || ($user->admin && !$user->entity))) {
+if (isModEnabled('multicompany') && $conf->entity == 1 && ($conf->global->MULTICOMPANY_TRANSVERSE_MODE || ($user->admin && !$user->entity))) {
 	$sql .= " WHERE g.entity IS NOT NULL";
 } else {
 	$sql .= " WHERE g.entity IN (0,".$conf->entity.")";
@@ -192,7 +192,7 @@ if ($resql) {
 	print '<tr class="liste_titre">';
 	print_liste_field_titre("Group", $_SERVER["PHP_SELF"], "g.nom", $param, "", "", $sortfield, $sortorder);
 	//multicompany
-	if (!empty($conf->multicompany->enabled) && empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE) && $conf->entity == 1) {
+	if (isModEnabled('multicompany') && empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE) && $conf->entity == 1) {
 		print_liste_field_titre("Entity", $_SERVER["PHP_SELF"], "g.entity", $param, "", '', $sortfield, $sortorder, 'center ');
 	}
 	print_liste_field_titre("NbOfUsers", $_SERVER["PHP_SELF"], "nb", $param, "", '', $sortfield, $sortorder, 'center ');
@@ -219,7 +219,7 @@ if ($resql) {
 		}
 		print "</td>";
 		//multicompany
-		if (!empty($conf->multicompany->enabled) && is_object($mc) && empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE) && $conf->entity == 1) {
+		if (isModEnabled('multicompany') && is_object($mc) && empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE) && $conf->entity == 1) {
 			$mc->getInfo($obj->entity);
 			print '<td class="center">'.$mc->label.'</td>';
 		}

From d0ad4ba8c43302f16b82b0d1627fa97f0f3c8fd1 Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Sun, 28 Aug 2022 14:42:46 +0200
Subject: [PATCH 199/974] FIX php8 compatibility

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

diff --git a/htdocs/user/notify/card.php b/htdocs/user/notify/card.php
index e047ab74d51..ce515dc7d16 100644
--- a/htdocs/user/notify/card.php
+++ b/htdocs/user/notify/card.php
@@ -175,7 +175,7 @@ if ($result > 0) {
 		print '<td>';
 		$addadmin = '';
 		if (property_exists($object, 'admin')) {
-			if (!empty($conf->multicompany->enabled) && !empty($object->admin) && empty($object->entity)) {
+			if (isModEnabled('multicompany') && !empty($object->admin) && empty($object->entity)) {
 				$addadmin .= img_picto($langs->trans("SuperAdministratorDesc"), "redstar", 'class="paddingleft"');
 			} elseif (!empty($object->admin)) {
 				$addadmin .= img_picto($langs->trans("AdministratorDesc"), "star", 'class="paddingleft"');

From 0551bfbfa623b99dad5c689ef32a44defd36c659 Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Sun, 28 Aug 2022 14:43:08 +0200
Subject: [PATCH 200/974] FIX php8 compatibility

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

diff --git a/htdocs/variants/class/ProductAttribute.class.php b/htdocs/variants/class/ProductAttribute.class.php
index 3b315101cc8..29ea45a17ec 100644
--- a/htdocs/variants/class/ProductAttribute.class.php
+++ b/htdocs/variants/class/ProductAttribute.class.php
@@ -136,7 +136,7 @@ class ProductAttribute extends CommonObject
 		if (empty($conf->global->MAIN_SHOW_TECHNICAL_ID) && isset($this->fields['rowid'])) {
 			$this->fields['rowid']['visible'] = 0;
 		}
-		if (empty($conf->multicompany->enabled) && isset($this->fields['entity'])) {
+		if (!isModEnabled('multicompany') && isset($this->fields['entity'])) {
 			$this->fields['entity']['enabled'] = 0;
 		}
 

From f172212808e84faca9c439e07d8ef987618c285b Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Sun, 28 Aug 2022 14:43:31 +0200
Subject: [PATCH 201/974] FIX php8 compatibility

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

diff --git a/htdocs/variants/class/ProductAttributeValue.class.php b/htdocs/variants/class/ProductAttributeValue.class.php
index 9d98f9a7f2b..2e8b414f727 100644
--- a/htdocs/variants/class/ProductAttributeValue.class.php
+++ b/htdocs/variants/class/ProductAttributeValue.class.php
@@ -106,7 +106,7 @@ class ProductAttributeValue extends CommonObjectLine
 		if (empty($conf->global->MAIN_SHOW_TECHNICAL_ID) && isset($this->fields['rowid'])) {
 			$this->fields['rowid']['visible'] = 0;
 		}
-		if (empty($conf->multicompany->enabled) && isset($this->fields['entity'])) {
+		if (!isModEnabled('multicompany') && isset($this->fields['entity'])) {
 			$this->fields['entity']['enabled'] = 0;
 		}
 

From 28bd9812add67164004bc606d185b2fe6d01dc42 Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Sun, 28 Aug 2022 14:43:57 +0200
Subject: [PATCH 202/974] FIX php8 compatibility

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

diff --git a/htdocs/webhook/class/target.class.php b/htdocs/webhook/class/target.class.php
index 17df9e672dc..7eabbe397ab 100644
--- a/htdocs/webhook/class/target.class.php
+++ b/htdocs/webhook/class/target.class.php
@@ -184,7 +184,7 @@ class Target extends CommonObject
 		if (empty($conf->global->MAIN_SHOW_TECHNICAL_ID) && isset($this->fields['rowid'])) {
 			$this->fields['rowid']['visible'] = 0;
 		}
-		if (empty($conf->multicompany->enabled) && isset($this->fields['entity'])) {
+		if (!isModEnabled('multicompany') && isset($this->fields['entity'])) {
 			$this->fields['entity']['enabled'] = 0;
 		}
 

From 5df51c5615f85ee73f3d3716c28f84443df0da57 Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Sun, 28 Aug 2022 14:44:53 +0200
Subject: [PATCH 203/974] FIX php8 compatibility

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

diff --git a/htdocs/webservices/server_user.php b/htdocs/webservices/server_user.php
index cdd39ae24d7..9672fa1b4fc 100644
--- a/htdocs/webservices/server_user.php
+++ b/htdocs/webservices/server_user.php
@@ -398,7 +398,7 @@ function getUser($authentication, $id, $ref = '', $ref_ext = '')
  */
 function getListOfGroups($authentication)
 {
-	global $db, $conf;
+	global $db, $conf, $user;
 
 	dol_syslog("Function: getListOfGroups login=".$authentication['login']);
 
@@ -418,7 +418,7 @@ function getListOfGroups($authentication)
 		$sql = "SELECT g.rowid, g.nom as name, g.entity, g.datec, COUNT(DISTINCT ugu.fk_user) as nb";
 		$sql .= " FROM ".MAIN_DB_PREFIX."usergroup as g";
 		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."usergroup_user as ugu ON ugu.fk_usergroup = g.rowid";
-		if (!empty($conf->multicompany->enabled) && $conf->entity == 1 && ($conf->global->MULTICOMPANY_TRANSVERSE_MODE || ($user->admin && !$user->entity))) {
+		if (isModEnabled('multicompany') && $conf->entity == 1 && ($conf->global->MULTICOMPANY_TRANSVERSE_MODE || ($user->admin && !$user->entity))) {
 			$sql .= " WHERE g.entity IS NOT NULL";
 		} else {
 			$sql .= " WHERE g.entity IN (0,".$conf->entity.")";

From 6fbe6e694f228ca30786ca68c00b80c3c57187e2 Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Sun, 28 Aug 2022 14:45:18 +0200
Subject: [PATCH 204/974] FIX php8 compatibility

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

diff --git a/htdocs/zapier/class/hook.class.php b/htdocs/zapier/class/hook.class.php
index 64259f5a592..0da11465fa8 100644
--- a/htdocs/zapier/class/hook.class.php
+++ b/htdocs/zapier/class/hook.class.php
@@ -263,7 +263,7 @@ class Hook extends CommonObject
 		if (empty($conf->global->MAIN_SHOW_TECHNICAL_ID) && isset($this->fields['rowid'])) {
 			$this->fields['rowid']['visible'] = 0;
 		}
-		if (empty($conf->multicompany->enabled) && isset($this->fields['entity'])) {
+		if (!isModEnabled('multicompany') && isset($this->fields['entity'])) {
 			$this->fields['entity']['enabled'] = 0;
 		}
 

From ec5af6cd23dd87c8be68b41867a8b0fe043cffcf Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 28 Aug 2022 23:32:36 +0200
Subject: [PATCH 205/974] Doc

---
 htdocs/holiday/class/holiday.class.php      | 6 +++---
 htdocs/install/mysql/tables/llx_holiday.sql | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/htdocs/holiday/class/holiday.class.php b/htdocs/holiday/class/holiday.class.php
index 9a45a735716..3faf8e78770 100644
--- a/htdocs/holiday/class/holiday.class.php
+++ b/htdocs/holiday/class/holiday.class.php
@@ -85,17 +85,17 @@ class Holiday extends CommonObject
 	public $statut = ''; // 1=draft, 2=validated, 3=approved
 
 	/**
-	 * @var int 	ID of user that must approve. TODO: there is no date for validation (date_valid is used for approval), add one.
+	 * @var int 	ID of user that must approve. Real user for approval is fk_user_valid (old version) or fk_user_approve (new versions)
 	 */
 	public $fk_validator;
 
 	/**
-	 * @var int 	Date of approval. TODO: Add a field for approval date and use date_valid instead for validation.
+	 * @var int 	Date of validation or approval. TODO: Use date_valid instead for validation.
 	 */
 	public $date_valid = '';
 
 	/**
-	 * @var int 	ID of user that has approved (empty if not approved)
+	 * @var int 	ID of user that has validated or approved (empty if not approved)
 	 */
 	public $fk_user_valid;
 
diff --git a/htdocs/install/mysql/tables/llx_holiday.sql b/htdocs/install/mysql/tables/llx_holiday.sql
index 992f9502394..a5a05197aa6 100644
--- a/htdocs/install/mysql/tables/llx_holiday.sql
+++ b/htdocs/install/mysql/tables/llx_holiday.sql
@@ -33,8 +33,8 @@ date_fin       DATE NOT NULL,
 halfday        integer DEFAULT 0,				-- 0=start morning and end afternoon, -1=start afternoon end afternoon, 1=start morning and end morning, 2=start afternoon and end morning
 statut         integer NOT NULL DEFAULT '1',
 fk_validator   integer NOT NULL,				-- who should approve
-date_valid     DATETIME DEFAULT NULL,			-- date approval (both date valid and date_approval)
-fk_user_valid  integer DEFAULT NULL,			-- user approval (both user valid and user that approved)
+date_valid     DATETIME DEFAULT NULL,			-- date validation or approval (both date valid and date_approval)
+fk_user_valid  integer DEFAULT NULL,			-- user validation or approval (both user valid and user that approved)
 date_approve   DATETIME DEFAULT NULL,			-- date approval (not used yet)
 fk_user_approve integer DEFAULT NULL,			-- user approval (not used yet)
 date_refuse    DATETIME DEFAULT NULL,

From 6526cd413e898fb96246726ee708aaa9e3cd6932 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 28 Aug 2022 23:36:17 +0200
Subject: [PATCH 206/974] Clean code

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

diff --git a/htdocs/holiday/class/holiday.class.php b/htdocs/holiday/class/holiday.class.php
index 806f899df36..6e01f6fd767 100644
--- a/htdocs/holiday/class/holiday.class.php
+++ b/htdocs/holiday/class/holiday.class.php
@@ -59,12 +59,6 @@ class Holiday extends CommonObject
 	 */
 	public $picto = 'holiday';
 
-	/**
-	 * @deprecated
-	 * @see $id
-	 */
-	public $rowid;
-
 	/**
 	 * @var int User ID
 	 */
@@ -525,6 +519,7 @@ class Holiday extends CommonObject
 				$obj = $this->db->fetch_object($resql);
 
 				$tab_result[$i]['rowid'] = $obj->rowid;
+				$tab_result[$i]['id'] = $obj->rowid;
 				$tab_result[$i]['ref'] = ($obj->ref ? $obj->ref : $obj->rowid);
 
 				$tab_result[$i]['fk_user'] = $obj->fk_user;
@@ -649,7 +644,9 @@ class Holiday extends CommonObject
 				$obj = $this->db->fetch_object($resql);
 
 				$tab_result[$i]['rowid'] = $obj->rowid;
+				$tab_result[$i]['id'] = $obj->rowid;
 				$tab_result[$i]['ref'] = ($obj->ref ? $obj->ref : $obj->rowid);
+
 				$tab_result[$i]['fk_user'] = $obj->fk_user;
 				$tab_result[$i]['fk_type'] = $obj->fk_type;
 				$tab_result[$i]['date_create'] = $this->db->jdate($obj->date_create);
@@ -1855,6 +1852,7 @@ class Holiday extends CommonObject
 						$obj = $this->db->fetch_object($resql);
 
 						$tab_result[$i]['rowid'] = $obj->rowid; // rowid of user
+						$tab_result[$i]['id'] = $obj->rowid; // id of user
 						$tab_result[$i]['name'] = $obj->lastname; // deprecated
 						$tab_result[$i]['lastname'] = $obj->lastname;
 						$tab_result[$i]['firstname'] = $obj->firstname;
@@ -1897,6 +1895,7 @@ class Holiday extends CommonObject
 						$obj = $this->db->fetch_object($resql);
 
 						$tab_result[$i]['rowid'] = $obj->rowid; // rowid of user
+						$tab_result[$i]['id'] = $obj->rowid; // id of user
 						$tab_result[$i]['name'] = $obj->lastname; // deprecated
 						$tab_result[$i]['lastname'] = $obj->lastname;
 						$tab_result[$i]['firstname'] = $obj->firstname;
@@ -2131,6 +2130,7 @@ class Holiday extends CommonObject
 				$obj = $this->db->fetch_object($resql);
 
 				$tab_result[$i]['rowid'] = $obj->rowid;
+				$tab_result[$i]['id'] = $obj->rowid;
 				$tab_result[$i]['date_action'] = $obj->date_action;
 				$tab_result[$i]['fk_user_action'] = $obj->fk_user_action;
 				$tab_result[$i]['fk_user_update'] = $obj->fk_user_update;
@@ -2179,7 +2179,7 @@ class Holiday extends CommonObject
 			$num = $this->db->num_rows($result);
 			if ($num) {
 				while ($obj = $this->db->fetch_object($result)) {
-					$types[$obj->rowid] = array('rowid'=> $obj->rowid, 'code'=> $obj->code, 'label'=>$obj->label, 'affect'=>$obj->affect, 'delay'=>$obj->delay, 'newbymonth'=>$obj->newbymonth);
+					$types[$obj->rowid] = array('id'=> $obj->rowid, 'rowid'=> $obj->rowid, 'code'=> $obj->code, 'label'=>$obj->label, 'affect'=>$obj->affect, 'delay'=>$obj->delay, 'newbymonth'=>$obj->newbymonth);
 				}
 
 				return $types;

From 0e2ade76ada6a2fa47afa16b40b979500016fb1f Mon Sep 17 00:00:00 2001
From: ptibogxiv <support@ptibogxiv.net>
Date: Sun, 28 Aug 2022 23:36:18 +0200
Subject: [PATCH 207/974] FIx clean code signature proposal

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

diff --git a/htdocs/comm/propal/card.php b/htdocs/comm/propal/card.php
index 25a29270976..e02ff5d8875 100644
--- a/htdocs/comm/propal/card.php
+++ b/htdocs/comm/propal/card.php
@@ -47,7 +47,6 @@ require_once DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/modules/propale/modules_propale.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/propal.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/signature.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
 if (!empty($conf->project->enabled)) {
@@ -2935,7 +2934,7 @@ if ($action == 'create') {
 
 		if ($object->statut != Propal::STATUS_DRAFT && $useonlinesignature) {
 			print '<br><!-- Link to sign -->';
-			require_once DOL_DOCUMENT_ROOT.'/core/lib/payments.lib.php';
+			require_once DOL_DOCUMENT_ROOT.'/core/lib/signature.lib.php';
 			print showOnlineSignatureUrl('proposal', $object->ref).'<br>';
 		}
 

From 11b93140233fe62a1b5d9178691992f9c9b84cde Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 29 Aug 2022 00:04:12 +0200
Subject: [PATCH 208/974] Split fk_user_valid that was used for 2 purpose in
 fk_user_valid/approve

---
 htdocs/holiday/card.php                       | 14 ++--
 htdocs/holiday/class/holiday.class.php        | 70 ++++++++++++++-----
 .../install/mysql/migration/16.0.0-17.0.0.sql |  4 ++
 htdocs/install/mysql/tables/llx_holiday.sql   |  8 +--
 4 files changed, 71 insertions(+), 25 deletions(-)

diff --git a/htdocs/holiday/card.php b/htdocs/holiday/card.php
index f9112f5faad..96a6b40f71b 100644
--- a/htdocs/holiday/card.php
+++ b/htdocs/holiday/card.php
@@ -284,7 +284,7 @@ if (empty($reshook)) {
 		}
 	}
 
-	// If this is an update and we are an approver, we can update to change the approver
+	// If this is an update and we are an approver, we can update to change the expected approver with another one (including himself)
 	if ($action == 'update' && GETPOSTISSET('savevalidator') && !empty($user->rights->holiday->approve)) {
 		$object->fetch($id);
 
@@ -558,9 +558,10 @@ if (empty($reshook)) {
 		if ($object->statut == Holiday::STATUS_VALIDATED && $user->id == $object->fk_validator) {
 			$object->oldcopy = dol_clone($object);
 
-			$object->date_valid = dol_now();
-			$object->fk_user_valid = $user->id;
+			$object->date_approval = dol_now();
+			$object->fk_user_approve = $user->id;
 			$object->statut = Holiday::STATUS_APPROVED;
+			$object->status = Holiday::STATUS_APPROVED;
 
 			$db->begin();
 
@@ -663,6 +664,7 @@ if (empty($reshook)) {
 				$object->date_refuse = dol_print_date('dayhour', dol_now());
 				$object->fk_user_refuse = $user->id;
 				$object->statut = Holiday::STATUS_REFUSED;
+				$object->status = Holiday::STATUS_REFUSED;
 				$object->detail_refuse = GETPOST('detail_refuse', 'alphanohtml');
 
 				$db->begin();
@@ -751,6 +753,7 @@ if (empty($reshook)) {
 
 		$oldstatus = $object->statut;
 		$object->statut = Holiday::STATUS_DRAFT;
+		$object->status = Holiday::STATUS_DRAFT;
 
 		$result = $object->update($user);
 		if ($result < 0) {
@@ -783,6 +786,7 @@ if (empty($reshook)) {
 			$object->date_cancel = dol_now();
 			$object->fk_user_cancel = $user->id;
 			$object->statut = Holiday::STATUS_CANCELED;
+			$object->status = Holiday::STATUS_CANCELED;
 
 			$result = $object->update($user);
 
@@ -1497,8 +1501,8 @@ if ((empty($id) && empty($ref)) || $action == 'create' || $action == 'add') {
 						}
 					}
 					if ($object->statut == Holiday::STATUS_APPROVED) { // If validated and approved
-						if ($user->id == $object->fk_validator || $cancreate || $cancreateall) {
-							if (($object->date_debut > dol_now()) || !empty($user->admin)) {
+						if ($user->id == $object->fk_validator || $user->id == $object->fk_user_approve || $cancreate || $cancreateall) {
+							if (($object->date_debut > 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>';
 							} else {
 								print '<a href="#" class="butActionRefused classfortooltip" title="'.$langs->trans("HolidayStarted").'-'.$langs->trans("NotAllowed").'">'.$langs->trans("ActionCancelCP").'</a>';
diff --git a/htdocs/holiday/class/holiday.class.php b/htdocs/holiday/class/holiday.class.php
index 6e01f6fd767..714e0ddb55e 100644
--- a/htdocs/holiday/class/holiday.class.php
+++ b/htdocs/holiday/class/holiday.class.php
@@ -89,14 +89,19 @@ class Holiday extends CommonObject
 	public $date_valid = '';
 
 	/**
-	 * @var int 	ID of user that has approved (empty if not approved)
+	 * @var int 	ID of user that has validated
 	 */
 	public $fk_user_valid;
 
 	/**
-	 * @var int 	Date approbation
+	 * @var int 	Date approval
 	 */
-	public $date_approbation;
+	public $date_approval;
+
+	/**
+	 * @var int 	ID of user that has approved
+	 */
+	public $fk_user_approve;
 
 	/**
 	 * @var int 	Date for refuse
@@ -377,6 +382,8 @@ class Holiday extends CommonObject
 		$sql .= " cp.fk_validator,";
 		$sql .= " cp.date_valid,";
 		$sql .= " cp.fk_user_valid,";
+		$sql .= " cp.date_approval,";
+		$sql .= " cp.fk_user_approve,";
 		$sql .= " cp.date_refuse,";
 		$sql .= " cp.fk_user_refuse,";
 		$sql .= " cp.date_cancel,";
@@ -414,6 +421,8 @@ class Holiday extends CommonObject
 				$this->fk_validator = $obj->fk_validator;
 				$this->date_valid = $this->db->jdate($obj->date_valid);
 				$this->fk_user_valid = $obj->fk_user_valid;
+				$this->date_approval = $this->db->jdate($obj->date_approval);
+				$this->fk_user_approve = $obj->fk_user_approve;
 				$this->date_refuse = $this->db->jdate($obj->date_refuse);
 				$this->fk_user_refuse = $obj->fk_user_refuse;
 				$this->date_cancel = $this->db->jdate($obj->date_cancel);
@@ -467,6 +476,8 @@ class Holiday extends CommonObject
 		$sql .= " cp.fk_validator,";
 		$sql .= " cp.date_valid,";
 		$sql .= " cp.fk_user_valid,";
+		$sql .= " cp.date_approval,";
+		$sql .= " cp.fk_user_approve,";
 		$sql .= " cp.date_refuse,";
 		$sql .= " cp.fk_user_refuse,";
 		$sql .= " cp.date_cancel,";
@@ -535,6 +546,8 @@ class Holiday extends CommonObject
 				$tab_result[$i]['fk_validator'] = $obj->fk_validator;
 				$tab_result[$i]['date_valid'] = $this->db->jdate($obj->date_valid);
 				$tab_result[$i]['fk_user_valid'] = $obj->fk_user_valid;
+				$tab_result[$i]['date_approval'] = $this->db->jdate($obj->date_approval);
+				$tab_result[$i]['fk_user_approve'] = $obj->fk_user_approve;
 				$tab_result[$i]['date_refuse'] = $this->db->jdate($obj->date_refuse);
 				$tab_result[$i]['fk_user_refuse'] = $obj->fk_user_refuse;
 				$tab_result[$i]['date_cancel'] = $this->db->jdate($obj->date_cancel);
@@ -593,6 +606,8 @@ class Holiday extends CommonObject
 		$sql .= " cp.fk_validator,";
 		$sql .= " cp.date_valid,";
 		$sql .= " cp.fk_user_valid,";
+		$sql .= " cp.date_approval,";
+		$sql .= " cp.fk_user_approve,";
 		$sql .= " cp.date_refuse,";
 		$sql .= " cp.fk_user_refuse,";
 		$sql .= " cp.date_cancel,";
@@ -661,6 +676,8 @@ class Holiday extends CommonObject
 				$tab_result[$i]['fk_validator'] = $obj->fk_validator;
 				$tab_result[$i]['date_valid'] = $this->db->jdate($obj->date_valid);
 				$tab_result[$i]['fk_user_valid'] = $obj->fk_user_valid;
+				$tab_result[$i]['date_approval'] = $this->db->jdate($obj->date_approval);
+				$tab_result[$i]['fk_user_approve'] = $obj->fk_user_approve;
 				$tab_result[$i]['date_refuse'] = $obj->date_refuse;
 				$tab_result[$i]['fk_user_refuse'] = $obj->fk_user_refuse;
 				$tab_result[$i]['date_cancel'] = $obj->date_cancel;
@@ -865,6 +882,16 @@ class Holiday extends CommonObject
 		} else {
 			$sql .= " fk_user_valid = NULL,";
 		}
+		if (!empty($this->date_approval)) {
+			$sql .= " date_approval = '".$this->db->idate($this->date_approval)."',";
+		} else {
+			$sql .= " date_approval = NULL,";
+		}
+		if (!empty($this->fk_user_approve)) {
+			$sql .= " fk_user_approve = '".$this->db->escape($this->fk_user_approve)."',";
+		} else {
+			$sql .= " fk_user_approve = NULL,";
+		}
 		if (!empty($this->date_refuse)) {
 			$sql .= " date_refuse = '".$this->db->idate($this->date_refuse)."',";
 		} else {
@@ -980,17 +1007,27 @@ class Holiday extends CommonObject
 			$sql .= " date_valid = NULL,";
 		}
 		if (!empty($this->fk_user_valid)) {
-			$sql .= " fk_user_valid = '".$this->db->escape($this->fk_user_valid)."',";
+			$sql .= " fk_user_valid = ".((int) $this->fk_user_valid).",";
 		} else {
 			$sql .= " fk_user_valid = NULL,";
 		}
+		if (!empty($this->date_approval)) {
+			$sql .= " date_approval = '".$this->db->idate($this->date_approval)."',";
+		} else {
+			$sql .= " date_approval = NULL,";
+		}
+		if (!empty($this->fk_user_approve)) {
+			$sql .= " fk_user_approve = ".((int) $this->fk_user_approve).",";
+		} else {
+			$sql .= " fk_user_approve = NULL,";
+		}
 		if (!empty($this->date_refuse)) {
 			$sql .= " date_refuse = '".$this->db->idate($this->date_refuse)."',";
 		} else {
 			$sql .= " date_refuse = NULL,";
 		}
 		if (!empty($this->fk_user_refuse)) {
-			$sql .= " fk_user_refuse = '".$this->db->escape($this->fk_user_refuse)."',";
+			$sql .= " fk_user_refuse = ".((int) $this->fk_user_refuse).",";
 		} else {
 			$sql .= " fk_user_refuse = NULL,";
 		}
@@ -1000,7 +1037,7 @@ class Holiday extends CommonObject
 			$sql .= " date_cancel = NULL,";
 		}
 		if (!empty($this->fk_user_cancel)) {
-			$sql .= " fk_user_cancel = '".$this->db->escape($this->fk_user_cancel)."',";
+			$sql .= " fk_user_cancel = ".((int) $this->fk_user_cancel).",";
 		} else {
 			$sql .= " fk_user_cancel = NULL,";
 		}
@@ -2206,12 +2243,13 @@ class Holiday extends CommonObject
 		$sql .= " f.date_create as datec,";
 		$sql .= " f.tms as date_modification,";
 		$sql .= " f.date_valid as datev,";
-		$sql .= " f.date_approve as datea,";
+		$sql .= " f.date_approval as datea,";
 		$sql .= " f.date_refuse as dater,";
 		$sql .= " f.fk_user_create as fk_user_creation,";
 		$sql .= " f.fk_user_modif as fk_user_modification,";
-		$sql .= " f.fk_user_valid as fk_user_approve_done,";
-		$sql .= " f.fk_validator as fk_user_approve_expected,";
+		$sql .= " f.fk_user_valid as fk_user_validation,";
+		$sql .= " f.fk_user_approve as fk_user_approval_done,";
+		$sql .= " f.fk_validator as fk_user_approval_expected,";
 		$sql .= " f.fk_user_refuse as fk_user_refuse";
 		$sql .= " FROM ".MAIN_DB_PREFIX."holiday as f";
 		$sql .= " WHERE f.rowid = ".((int) $id);
@@ -2227,16 +2265,16 @@ class Holiday extends CommonObject
 				$this->date_creation = $this->db->jdate($obj->datec);
 				$this->date_modification = $this->db->jdate($obj->date_modification);
 				$this->date_validation = $this->db->jdate($obj->datev);
-				$this->date_approbation = $this->db->jdate($obj->datea);
+				$this->date_approval = $this->db->jdate($obj->datea);
 
 				if (!empty($obj->fk_user_creation)) {
 					$cuser = new User($this->db);
 					$cuser->fetch($obj->fk_user_creation);
 					$this->user_creation = $cuser;
 				}
-				if (!empty($obj->fk_user_approve_done)) {
+				if (!empty($obj->fk_user_valid)) {
 					$vuser = new User($this->db);
-					$vuser->fetch($obj->fk_user_approve_done);
+					$vuser->fetch($obj->fk_user_valid);
 					$this->user_validation = $vuser;
 				}
 				if (!empty($obj->fk_user_modification)) {
@@ -2246,15 +2284,15 @@ class Holiday extends CommonObject
 				}
 
 				if ($obj->status == Holiday::STATUS_APPROVED || $obj->status == Holiday::STATUS_CANCELED) {
-					if ($obj->fk_user_approve_done) {
+					if ($obj->fk_user_approval_done) {
 						$auser = new User($this->db);
-						$auser->fetch($obj->fk_user_approve_done);
+						$auser->fetch($obj->fk_user_approval_done);
 						$this->user_approve = $auser;
 					}
 				} else {
-					if (!empty($obj->fk_user_approve_expected)) {
+					if (!empty($obj->fk_user_approval_expected)) {
 						$auser = new User($this->db);
-						$auser->fetch($obj->fk_user_approve_expected);
+						$auser->fetch($obj->fk_user_approval_expected);
 						$this->user_approve = $auser;
 					}
 				}
diff --git a/htdocs/install/mysql/migration/16.0.0-17.0.0.sql b/htdocs/install/mysql/migration/16.0.0-17.0.0.sql
index 5f297619c50..1b0d8a33231 100644
--- a/htdocs/install/mysql/migration/16.0.0-17.0.0.sql
+++ b/htdocs/install/mysql/migration/16.0.0-17.0.0.sql
@@ -69,6 +69,10 @@ ALTER TABLE llx_adherent ADD COLUMN default_lang VARCHAR(6) DEFAULT NULL AFTER d
 
 ALTER TABLE llx_adherent_type ADD COLUMN caneditamount integer DEFAULT 0 AFTER amount;
 
+ALTER TABLE llx_holiday CHANGE COLUMN date_approve date_approval datetime;
+
+UPDATE llx_holiday SET date_approval = date_valid WHEN statut = 3 AND date_approval IS NULL;
+UPDATE llx_holiday SET fk_user_approve = fk_user_valid WHEN statut = 3 AND fk_user_approve IS NULL;
 
 ALTER TABLE llx_inventory ADD COLUMN categories_product VARCHAR(255) DEFAULT NULL AFTER fk_product;
 
diff --git a/htdocs/install/mysql/tables/llx_holiday.sql b/htdocs/install/mysql/tables/llx_holiday.sql
index be468bd32a5..c6af12d453c 100644
--- a/htdocs/install/mysql/tables/llx_holiday.sql
+++ b/htdocs/install/mysql/tables/llx_holiday.sql
@@ -34,10 +34,10 @@ halfday        integer DEFAULT 0,				-- 0=start morning and end afternoon, -1=st
 nb_open_day    double(24,8) DEFAULT NULL,       -- denormalized number of open days of holiday. Not always set. More reliable when re-calculated with num_open_days(date_debut, date_fin, halfday).
 statut         integer NOT NULL DEFAULT 1,      -- status of leave request
 fk_validator   integer NOT NULL,				-- who should approve the leave
-date_valid     DATETIME DEFAULT NULL,			-- date approval (currently both date valid and date_approval)
-fk_user_valid  integer DEFAULT NULL,			-- user approval (currently both user valid and user that approved)
-date_approve   DATETIME DEFAULT NULL,			-- date approval (not used yet)
-fk_user_approve integer DEFAULT NULL,			-- user approval (not used yet)
+date_valid     DATETIME DEFAULT NULL,			-- date validation
+fk_user_valid  integer DEFAULT NULL,			-- user validation
+date_approval  DATETIME DEFAULT NULL,			-- date approval
+fk_user_approve integer DEFAULT NULL,			-- user approval
 date_refuse    DATETIME DEFAULT NULL,
 fk_user_refuse integer DEFAULT NULL,
 date_cancel    DATETIME DEFAULT NULL,

From 5d5ea3efd8506aaf236fa867557b99ac3b2f6592 Mon Sep 17 00:00:00 2001
From: ptibogxiv <support@ptibogxiv.net>
Date: Sun, 28 Aug 2022 23:36:18 +0200
Subject: [PATCH 209/974] FIx clean code signature proposal

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

diff --git a/htdocs/comm/propal/card.php b/htdocs/comm/propal/card.php
index c05554d2242..cf9eb2c913f 100644
--- a/htdocs/comm/propal/card.php
+++ b/htdocs/comm/propal/card.php
@@ -47,7 +47,6 @@ require_once DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/modules/propale/modules_propale.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/propal.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/signature.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
 if (!empty($conf->project->enabled)) {
@@ -2875,7 +2874,7 @@ if ($action == 'create') {
 
 		if ($object->statut != Propal::STATUS_DRAFT && $useonlinesignature) {
 			print '<br><!-- Link to sign -->';
-			require_once DOL_DOCUMENT_ROOT.'/core/lib/payments.lib.php';
+			require_once DOL_DOCUMENT_ROOT.'/core/lib/signature.lib.php';
 			print showOnlineSignatureUrl('proposal', $object->ref).'<br>';
 		}
 

From 7c7e90499f554ab8f1f6b5bb4aac0b118794af9c Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 29 Aug 2022 00:48:29 +0200
Subject: [PATCH 210/974] Update api_thirdparties.class.php

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

diff --git a/htdocs/societe/class/api_thirdparties.class.php b/htdocs/societe/class/api_thirdparties.class.php
index e764de1ccc6..11e9d798418 100644
--- a/htdocs/societe/class/api_thirdparties.class.php
+++ b/htdocs/societe/class/api_thirdparties.class.php
@@ -515,7 +515,6 @@ class Thirdparties extends DolibarrApi
 	 * @param int $id   Thirdparty ID
 	 * @return integer
 	 */
-
 	public function delete($id)
 	{
 		if (!DolibarrApiAccess::$user->rights->societe->supprimer) {

From 1c2e21a3edb76ffecf745e771db111e36fa57248 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 29 Aug 2022 01:03:23 +0200
Subject: [PATCH 211/974] Update receipt.php

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

diff --git a/htdocs/takepos/admin/receipt.php b/htdocs/takepos/admin/receipt.php
index bc84c809c0e..8e20ab37756 100644
--- a/htdocs/takepos/admin/receipt.php
+++ b/htdocs/takepos/admin/receipt.php
@@ -69,7 +69,7 @@ if (GETPOST('action', 'alpha') == 'set') {
 } elseif (GETPOST('action', 'alpha') == 'setmethod') {
 	dolibarr_set_const($db, "TAKEPOS_PRINT_METHOD", GETPOST('value', 'alpha'), 'chaine', 0, '', $conf->entity);
 	// TakePOS connector require ReceiptPrinter module
-	if ($conf->global->TAKEPOS_PRINT_METHOD == "takeposconnector" && isModEnabled('receiptprinter')) {
+	if ($conf->global->TAKEPOS_PRINT_METHOD == "takeposconnector" && !isModEnabled('receiptprinter')) {
 		activateModule("modReceiptPrinter");
 	}
 }

From 673113ae332a0dffe7442f2b62da01cb36072770 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 29 Aug 2022 01:12:55 +0200
Subject: [PATCH 212/974] Fix bad var

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

diff --git a/htdocs/webservices/server_user.php b/htdocs/webservices/server_user.php
index cdd39ae24d7..d512b0d27bc 100644
--- a/htdocs/webservices/server_user.php
+++ b/htdocs/webservices/server_user.php
@@ -418,7 +418,7 @@ function getListOfGroups($authentication)
 		$sql = "SELECT g.rowid, g.nom as name, g.entity, g.datec, COUNT(DISTINCT ugu.fk_user) as nb";
 		$sql .= " FROM ".MAIN_DB_PREFIX."usergroup as g";
 		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."usergroup_user as ugu ON ugu.fk_usergroup = g.rowid";
-		if (!empty($conf->multicompany->enabled) && $conf->entity == 1 && ($conf->global->MULTICOMPANY_TRANSVERSE_MODE || ($user->admin && !$user->entity))) {
+		if (!empty($conf->multicompany->enabled) && $conf->entity == 1 && ($conf->global->MULTICOMPANY_TRANSVERSE_MODE || ($fuser->admin && !$fuser->entity))) {
 			$sql .= " WHERE g.entity IS NOT NULL";
 		} else {
 			$sql .= " WHERE g.entity IN (0,".$conf->entity.")";

From ea89d59b7ad868f6a3af05f2c289069b15d969e5 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 29 Aug 2022 01:46:12 +0200
Subject: [PATCH 213/974] Fix removed blank lines

---
 htdocs/core/modules/mailings/partnership.modules.php | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/htdocs/core/modules/mailings/partnership.modules.php b/htdocs/core/modules/mailings/partnership.modules.php
index 5f8469f339e..aa1f861bfe2 100644
--- a/htdocs/core/modules/mailings/partnership.modules.php
+++ b/htdocs/core/modules/mailings/partnership.modules.php
@@ -53,7 +53,6 @@ class mailing_partnership extends MailingTargets
 	 *
 	 *  @param		DoliDB		$db      Database handler
 	 */
-
 	public function __construct($db)
 	{
 		global $conf, $langs;
@@ -70,7 +69,6 @@ class mailing_partnership extends MailingTargets
 	 *    @param	int		$mailing_id    	Id of mailing. No need to use it.
 	 *    @return   int 					<0 if error, number of emails added if ok
 	 */
-
 	public function add_to_target($mailing_id)
 	{
 		// phpcs:enable
@@ -157,7 +155,6 @@ class mailing_partnership extends MailingTargets
 	 *
 	 *	@return		array		Array with SQL requests
 	 */
-
 	public function getSqlArrayForStats()
 	{
 		// CHANGE THIS: Optionnal
@@ -176,7 +173,6 @@ class mailing_partnership extends MailingTargets
 	 *  @param      string			$sql        Requete sql de comptage
 	 *  @return     int|string      			Nb of recipient, or <0 if error, or '' if NA
 	 */
-
 	public function getNbOfRecipients($sql = '')
 	{
 		global $conf;

From f97276b76a6ed443fff8ad9e60467d108d6405a6 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 29 Aug 2022 01:54:35 +0200
Subject: [PATCH 214/974] Fix trans

---
 htdocs/admin/mails_emailing.php | 4 ++--
 htdocs/admin/mails_ticket.php   | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/htdocs/admin/mails_emailing.php b/htdocs/admin/mails_emailing.php
index 99210bffade..dbdf66f8282 100644
--- a/htdocs/admin/mails_emailing.php
+++ b/htdocs/admin/mails_emailing.php
@@ -419,7 +419,7 @@ if ($action == 'edit') {
 		} else {
 			$value = getDolGlobalString('MAIN_MAIL_SMTPS_AUTH_TYPE_EMAILING', 'LOGIN');
 			$htmltext = $langs->trans("ContactSuperAdminForChange");
-			print $form->textwithpicto($langs->trans("MAIN_MAIL_SMTPS_AUTH_TYPE_EMAILING"), $htmltext, 1, 'superadmin');
+			print $form->textwithpicto($langs->trans("MAIN_MAIL_SMTPS_AUTH_TYPE"), $htmltext, 1, 'superadmin');
 			print '<input type="hidden" id="MAIN_MAIL_SMTPS_AUTH_TYPE" name="MAIN_MAIL_SMTPS_AUTH_TYPE_EMAILING" value="'.$value.'">';
 		}
 		print '</td></tr>';
@@ -553,7 +553,7 @@ if ($action == 'edit') {
 		if (in_array(getDolGlobalString('MAIN_MAIL_SENDMODE_EMAILING'), array('smtps', 'swiftmailer'))) {
 			$authtype = getDolGlobalString('MAIN_MAIL_SMTPS_AUTH_TYPE_EMAILING', 'LOGIN');
 			$text = ($authtype === "LOGIN") ? $langs->trans("UsePassword") : ($authtype === "XOAUTH2" ?  $langs->trans("UseOauth") : '') ;
-			print '<tr class="oddeven hideifdefault"><td>'.$langs->trans("MAIN_MAIL_SMTPS_AUTH_TYPE_EMAILING").'</td><td>'.$text.'</td></tr>';
+			print '<tr class="oddeven hideifdefault"><td>'.$langs->trans("MAIN_MAIL_SMTPS_AUTH_TYPE").'</td><td>'.$text.'</td></tr>';
 		}
 
 		// SMTPS PW
diff --git a/htdocs/admin/mails_ticket.php b/htdocs/admin/mails_ticket.php
index c5e70c44fac..8b0d78132a0 100644
--- a/htdocs/admin/mails_ticket.php
+++ b/htdocs/admin/mails_ticket.php
@@ -400,7 +400,7 @@ if ($action == 'edit') {
 		} else {
 			$value = getDolGlobalString('MAIN_MAIL_SMTPS_AUTH_TYPE_TICKET', 'LOGIN');
 			$htmltext = $langs->trans("ContactSuperAdminForChange");
-			print $form->textwithpicto($langs->trans("MAIN_MAIL_SMTPS_AUTH_TYPE_TICKET"), $htmltext, 1, 'superadmin');
+			print $form->textwithpicto($langs->trans("MAIN_MAIL_SMTPS_AUTH_TYPE"), $htmltext, 1, 'superadmin');
 			print '<input type="hidden" id="MAIN_MAIL_SMTPS_AUTH_TYPE" name="MAIN_MAIL_SMTPS_AUTH_TYPE_TICKET" value="'.$value.'">';
 		}
 		print '</td></tr>';
@@ -521,7 +521,7 @@ if ($action == 'edit') {
 		if (in_array(getDolGlobalString('MAIN_MAIL_SENDMODE_TICKET'), array('smtps', 'swiftmailer'))) {
 			$authtype = getDolGlobalString('MAIN_MAIL_SMTPS_AUTH_TYPE_TICKET', 'LOGIN');
 			$text = ($authtype === "LOGIN") ? $langs->trans("UsePassword") : ($authtype === "XOAUTH2" ?  $langs->trans("UseOauth") : '') ;
-			print '<tr class="oddeven hideifdefault"><td>'.$langs->trans("MAIN_MAIL_SMTPS_AUTH_TYPE_TICKET").'</td><td>'.$text.'</td></tr>';
+			print '<tr class="oddeven hideifdefault"><td>'.$langs->trans("MAIN_MAIL_SMTPS_AUTH_TYPE").'</td><td>'.$text.'</td></tr>';
 		}
 
 		// SMTPS PW

From 6f9305cb589185cdf2776d8dee357f7553a05f83 Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Mon, 29 Aug 2022 05:18:15 +0200
Subject: [PATCH 215/974] PHP8 Warning

---
 htdocs/accountancy/admin/categories.php | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/htdocs/accountancy/admin/categories.php b/htdocs/accountancy/admin/categories.php
index 39aa21f2d63..68d4c03e0a6 100644
--- a/htdocs/accountancy/admin/categories.php
+++ b/htdocs/accountancy/admin/categories.php
@@ -1,6 +1,6 @@
 <?php
-/* Copyright (C) 2016		Jamal Elbaz			<jamelbaz@gmail.pro>
- * Copyright (C) 2017		Alexandre Spangaro	<aspangaro@open-dsi.fr>
+/* Copyright (C) 2016       Jamal Elbaz         <jamelbaz@gmail.pro>
+ * Copyright (C) 2017-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
@@ -124,7 +124,8 @@ if (!empty($cat_id)) {
 
 	$arraykeyvalue = array();
 	foreach ($accountingcategory->lines_cptbk as $key => $val) {
-		$arraykeyvalue[length_accountg($val->numero_compte)] = length_accountg($val->numero_compte).' ('.$val->label_compte.($val->doc_ref ? ' '.$val->doc_ref : '').')';
+		$doc_ref = !empty($val->doc_ref) ? $val->doc_ref : '';
+		$arraykeyvalue[length_accountg($val->numero_compte)] = length_accountg($val->numero_compte) . ' - ' . $val->label_compte . $doc_ref;
 	}
 
 	if (is_array($accountingcategory->lines_cptbk) && count($accountingcategory->lines_cptbk) > 0) {

From f59795224fc5152383bed98868dbc7362e4a8156 Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Mon, 29 Aug 2022 05:26:57 +0200
Subject: [PATCH 216/974] PHP8 Warnings

---
 htdocs/accountancy/bookkeeping/card.php       | 31 ++++++++++---------
 .../accountancy/class/bookkeeping.class.php   |  8 +++--
 2 files changed, 23 insertions(+), 16 deletions(-)

diff --git a/htdocs/accountancy/bookkeeping/card.php b/htdocs/accountancy/bookkeeping/card.php
index c2071e76cea..9a91dcf675e 100644
--- a/htdocs/accountancy/bookkeeping/card.php
+++ b/htdocs/accountancy/bookkeeping/card.php
@@ -540,21 +540,24 @@ if ($action == 'create') {
 		print '</td>';
 		print '</tr>';
 
-		// 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>';
+		// 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>';
+			// 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
 		/*
diff --git a/htdocs/accountancy/class/bookkeeping.class.php b/htdocs/accountancy/class/bookkeeping.class.php
index 992b885f272..14a500c3ff3 100644
--- a/htdocs/accountancy/class/bookkeeping.class.php
+++ b/htdocs/accountancy/class/bookkeeping.class.php
@@ -1667,7 +1667,9 @@ class BookKeeping extends CommonObject
 			$this->doc_type = $obj->doc_type;
 			$this->date_creation = $this->db->jdate($obj->date_creation);
 			$this->date_modification = $this->db->jdate($obj->date_modification);
-			$this->date_export = $this->db->jdate($obj->date_export);
+			if ($mode != "_tmp") {
+				$this->date_export = $this->db->jdate($obj->date_export);
+			}
 			$this->date_validation = $this->db->jdate($obj->date_validation);
 		} else {
 			$this->error = "Error ".$this->db->lasterror();
@@ -1764,7 +1766,9 @@ class BookKeeping extends CommonObject
 				$line->piece_num = $obj->piece_num;
 				$line->date_creation = $obj->date_creation;
 				$line->date_modification = $obj->date_modification;
-				$line->date_export = $obj->date_export;
+				if ($mode != "_tmp") {
+					$line->date_export = $obj->date_export;
+				}
 				$line->date_validation = $obj->date_validation;
 
 				$this->linesmvt[] = $line;

From 4159aab038fc69f5c1be48b645171520b3712388 Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Mon, 29 Aug 2022 05:43:25 +0200
Subject: [PATCH 217/974] PHP8 Warnings

---
 htdocs/accountancy/bookkeeping/list.php | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/htdocs/accountancy/bookkeeping/list.php b/htdocs/accountancy/bookkeeping/list.php
index f27a23256b6..23d33acd3b7 100644
--- a/htdocs/accountancy/bookkeeping/list.php
+++ b/htdocs/accountancy/bookkeeping/list.php
@@ -1,7 +1,7 @@
 <?php
 /* Copyright (C) 2013-2016  Olivier Geffroy         <jeff@jeffinfo.com>
  * Copyright (C) 2013-2016  Florian Henry           <florian.henry@open-concept.pro>
- * Copyright (C) 2013-2021  Alexandre Spangaro      <aspangaro@open-dsi.fr>
+ * Copyright (C) 2013-2022  Alexandre Spangaro      <aspangaro@open-dsi.fr>
  * Copyright (C) 2016-2017  Laurent Destailleur     <eldy@users.sourceforge.net>
  * Copyright (C) 2018-2021  Frédéric France         <frederic.france@netlogic.fr>
  *
@@ -1133,6 +1133,13 @@ $line = new BookKeepingLine();
 // --------------------------------------------------------------------
 $i = 0;
 $totalarray = array();
+$totalarray['val'] = array ();
+$totalarray['nbfield'] = 0;
+$total_debit = 0;
+$total_credit = 0;
+$totalarray['val']['totaldebit'] = 0;
+$totalarray['val']['totalcredit'] = 0;
+
 while ($i < min($num, $limit)) {
 	$obj = $db->fetch_object($resql);
 	if (empty($obj)) {

From 3ec7a2796021d8f5990fdf050bb073fa3749b946 Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Mon, 29 Aug 2022 05:43:33 +0200
Subject: [PATCH 218/974] PHP8 Warnings

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

diff --git a/htdocs/accountancy/bookkeeping/listbyaccount.php b/htdocs/accountancy/bookkeeping/listbyaccount.php
index 0bd1c06aab8..4b5f0d9bad6 100644
--- a/htdocs/accountancy/bookkeeping/listbyaccount.php
+++ b/htdocs/accountancy/bookkeeping/listbyaccount.php
@@ -824,17 +824,22 @@ print $hookmanager->resPrint;
 print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ');
 print "</tr>\n";
 
-
-$total_debit = 0;
-$total_credit = 0;
-$sous_total_debit = 0;
-$sous_total_credit = 0;
 $displayed_account_number = null; // Start with undefined to be able to distinguish with empty
 
 // Loop on record
 // --------------------------------------------------------------------
 $i = 0;
+
 $totalarray = array();
+$totalarray['val'] = array ();
+$totalarray['nbfield'] = 0;
+$total_debit = 0;
+$total_credit = 0;
+$sous_total_debit = 0;
+$sous_total_credit = 0;
+$totalarray['val']['totaldebit'] = 0;
+$totalarray['val']['totalcredit'] = 0;
+
 while ($i < min($num, $limit)) {
 	$line = $object->lines[$i];
 

From 32a6f3f7568d1e3e00507061da1b2cefd014b9a0 Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Mon, 29 Aug 2022 05:48:18 +0200
Subject: [PATCH 219/974] PHP8 Warnings

---
 htdocs/accountancy/bookkeeping/card.php        |  2 +-
 htdocs/accountancy/class/bookkeeping.class.php |  2 +-
 htdocs/accountancy/tpl/export_journal.tpl.php  | 14 +++++++-------
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/htdocs/accountancy/bookkeeping/card.php b/htdocs/accountancy/bookkeeping/card.php
index 9a91dcf675e..315b7a49847 100644
--- a/htdocs/accountancy/bookkeeping/card.php
+++ b/htdocs/accountancy/bookkeeping/card.php
@@ -1,7 +1,7 @@
 <?php
 /* Copyright (C) 2013-2017  Olivier Geffroy         <jeff@jeffinfo.com>
  * Copyright (C) 2013-2017  Florian Henry           <florian.henry@open-concept.pro>
- * Copyright (C) 2013-2021  Alexandre Spangaro      <aspangaro@open-dsi.fr>
+ * Copyright (C) 2013-2022  Alexandre Spangaro      <aspangaro@open-dsi.fr>
  * Copyright (C) 2017       Laurent Destailleur     <eldy@users.sourceforge.net>
  * Copyright (C) 2018-2020  Frédéric France         <frederic.france@netlogic.fr>
  *
diff --git a/htdocs/accountancy/class/bookkeeping.class.php b/htdocs/accountancy/class/bookkeeping.class.php
index 14a500c3ff3..0cc8ab4e8d9 100644
--- a/htdocs/accountancy/class/bookkeeping.class.php
+++ b/htdocs/accountancy/class/bookkeeping.class.php
@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2014-2017  Olivier Geffroy     <jeff@jeffinfo.com>
- * Copyright (C) 2015-2017  Alexandre Spangaro  <aspangaro@open-dsi.fr>
+ * 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>
  *
diff --git a/htdocs/accountancy/tpl/export_journal.tpl.php b/htdocs/accountancy/tpl/export_journal.tpl.php
index b595402228e..22537a60a39 100644
--- a/htdocs/accountancy/tpl/export_journal.tpl.php
+++ b/htdocs/accountancy/tpl/export_journal.tpl.php
@@ -1,5 +1,5 @@
 <?php
-/* Copyright (C) 2015-2018  Alexandre Spangaro	<aspangaro@open-dsi.fr>
+/* Copyright (C) 2015-2022  Alexandre Spangaro	<aspangaro@open-dsi.fr>
  * Copyright (C) 2016       Charlie Benke		<charlie@patas-monkey.com>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -16,7 +16,7 @@
  * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
-// $formatexportset ùust be defined
+// $formatexportset must be defined
 
 // Protection to avoid direct call of template
 if (empty($conf) || !is_object($conf)) {
@@ -24,11 +24,11 @@ if (empty($conf) || !is_object($conf)) {
 	exit;
 }
 
-$code = $conf->global->MAIN_INFO_ACCOUNTANT_CODE;
-$prefix = $conf->global->ACCOUNTING_EXPORT_PREFIX_SPEC;
-$format = $conf->global->ACCOUNTING_EXPORT_FORMAT;
-$nodateexport = $conf->global->ACCOUNTING_EXPORT_NO_DATE_IN_FILENAME;
-$siren = $conf->global->MAIN_INFO_SIREN;
+$code = getDolGlobalString('MAIN_INFO_ACCOUNTANT_CODE');
+$prefix = getDolGlobalString('ACCOUNTING_EXPORT_PREFIX_SPEC');
+$format = getDolGlobalString('ACCOUNTING_EXPORT_FORMAT');
+$nodateexport = getDolGlobalInt('ACCOUNTING_EXPORT_NO_DATE_IN_FILENAME');
+$siren = getDolGlobalString('MAIN_INFO_SIREN');
 
 $date_export = "_".dol_print_date(dol_now(), '%Y%m%d%H%M%S');
 $endaccountingperiod = dol_print_date(dol_now(), '%Y%m%d');

From 6844d603ff898d46bed757b6a3a3e4557946ddfa Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Mon, 29 Aug 2022 09:23:15 +0200
Subject: [PATCH 220/974] update code

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

diff --git a/htdocs/comm/action/class/api_agendaevents.class.php b/htdocs/comm/action/class/api_agendaevents.class.php
index e7745f1d5fd..8c13709b250 100644
--- a/htdocs/comm/action/class/api_agendaevents.class.php
+++ b/htdocs/comm/action/class/api_agendaevents.class.php
@@ -124,7 +124,7 @@ class AgendaEvents extends DolibarrApi
 		if (!DolibarrApiAccess::$user->rights->societe->client->voir && !$socid) {
 			$search_sale = DolibarrApiAccess::$user->id;
 		}
-		if (empty($conf->societe->enabled)) {
+		if (!isModEnabled('societe')) {
 			$search_sale = 0; // If module thirdparty not enabled, sale representative is something that does not exists
 		}
 

From bc421ce1608aac9941ccf3e31110a9d085870d6a Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Mon, 29 Aug 2022 09:25:33 +0200
Subject: [PATCH 221/974] update code

---
 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 c867418cfbb..bf9ba2e6388 100644
--- a/htdocs/don/card.php
+++ b/htdocs/don/card.php
@@ -460,7 +460,7 @@ if ($action == 'create') {
 	print $form->selectyesno("public", $public_donation, 1);
 	print "</td></tr>\n";
 
-	if (empty($conf->societe->enabled) || empty($conf->global->DONATION_USE_THIRDPARTIES)) {
+	if (!isModEnabled('societe') || empty($conf->global->DONATION_USE_THIRDPARTIES)) {
 		print "<tr>".'<td>'.$langs->trans("Company").'</td><td><input type="text" name="societe" value="'.dol_escape_htmltag(GETPOST("societe")).'" class="maxwidth200"></td></tr>';
 		print "<tr>".'<td>'.$langs->trans("Lastname").'</td><td><input type="text" name="lastname" value="'.dol_escape_htmltag(GETPOST("lastname")).'" class="maxwidth200"></td></tr>';
 		print "<tr>".'<td>'.$langs->trans("Firstname").'</td><td><input type="text" name="firstname" value="'.dol_escape_htmltag(GETPOST("firstname")).'" class="maxwidth200"></td></tr>';

From 16646006603f3194ae0e1a3e9a0828db5aced354 Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Mon, 29 Aug 2022 09:26:32 +0200
Subject: [PATCH 222/974] update code

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

diff --git a/htdocs/ecm/index_auto.php b/htdocs/ecm/index_auto.php
index 4ffe606c79e..49bd25d0b90 100644
--- a/htdocs/ecm/index_auto.php
+++ b/htdocs/ecm/index_auto.php
@@ -314,7 +314,7 @@ if (!empty($conf->global->ECM_AUTO_TREE_ENABLED)) {
 		$rowspan++; $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'=>$conf->societe->enabled, 'label'=>$langs->trans("ThirdParties"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("ThirdParties")));
+		$rowspan++; $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'=>$conf->propal->enabled, 'label'=>$langs->trans("Proposals"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("Proposals")));

From 455c41cacb388a02dcfa8a3f736de4de68143eae Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Mon, 29 Aug 2022 09:27:24 +0200
Subject: [PATCH 223/974] update code

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

diff --git a/htdocs/ecm/search.php b/htdocs/ecm/search.php
index d04983fff11..6bbca0026e1 100644
--- a/htdocs/ecm/search.php
+++ b/htdocs/ecm/search.php
@@ -117,7 +117,7 @@ if (isModEnabled("product") || isModEnabled("service")) {
 	$langs->load("products"); $rowspan++; $sectionauto[] = array('level'=>1, 'module'=>'product', 'test'=>(isModEnabled("product") || isModEnabled("service")), 'label'=>$langs->trans("ProductsAndServices"), 'desc'=>$langs->trans("ECMDocsByProducts"));
 }
 if (isModEnabled("societe")) {
-	$rowspan++; $sectionauto[] = array('level'=>1, 'module'=>'company', 'test'=>$conf->societe->enabled, 'label'=>$langs->trans("ThirdParties"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("ThirdParties")));
+	$rowspan++; $sectionauto[] = array('level'=>1, 'module'=>'company', 'test'=>isModEnabled('societe'), 'label'=>$langs->trans("ThirdParties"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("ThirdParties")));
 }
 if (isModEnabled("propal")) {
 	$rowspan++; $sectionauto[] = array('level'=>1, 'module'=>'propal', 'test'=>$conf->propal->enabled, 'label'=>$langs->trans("Proposals"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("Proposals")));

From 0632855be6cf3f5518f4c58ffe01c4cc3100c876 Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Mon, 29 Aug 2022 09:29:11 +0200
Subject: [PATCH 224/974] update code

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

diff --git a/htdocs/projet/list.php b/htdocs/projet/list.php
index c1e18d60309..7cfb66288e1 100644
--- a/htdocs/projet/list.php
+++ b/htdocs/projet/list.php
@@ -199,7 +199,7 @@ 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'=>(empty($conf->societe->enabled) ? 0 : 1));
+$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);

From f1e8ee671e464a51c14b09bbff11dceeba1e9ec3 Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Mon, 29 Aug 2022 09:29:56 +0200
Subject: [PATCH 225/974] update code

---
 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 a7b78174cf1..f2357c96a16 100644
--- a/htdocs/societe/class/api_thirdparties.class.php
+++ b/htdocs/societe/class/api_thirdparties.class.php
@@ -550,7 +550,7 @@ class Thirdparties extends DolibarrApi
 	{
 		global $conf;
 
-		if (empty($conf->societe->enabled)) {
+		if (!isModEnabled('societe')) {
 			throw new RestException(501, 'Module "Thirdparties" needed for this request');
 		}
 

From 49f869352cc9bde2a2d3a9ece1945cfcef39a032 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 29 Aug 2022 10:34:29 +0200
Subject: [PATCH 226/974] Fix regression

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

diff --git a/htdocs/core/modules/facture/doc/pdf_crabe.modules.php b/htdocs/core/modules/facture/doc/pdf_crabe.modules.php
index 47d5480268c..14c13ceb57c 100644
--- a/htdocs/core/modules/facture/doc/pdf_crabe.modules.php
+++ b/htdocs/core/modules/facture/doc/pdf_crabe.modules.php
@@ -1169,7 +1169,7 @@ class pdf_crabe extends ModelePDFFactures
 					$bac = new CompanyBankAccount($this->db);
 					$bac->fetch(0, $object->thirdparty->id);
 					$iban= $bac->iban.(($bac->iban && $bac->bic) ? ' / ' : '').$bac->bic;
-					$lib_mode_reg .= $langs->trans("PaymentTypePREdetails", dol_trunc($iban, 6, 'right', 'UTF-8', 1));
+					$lib_mode_reg .= $outputlangs->trans("PaymentTypePREdetails", dol_trunc($iban, 6, 'right', 'UTF-8', 1));
 				}
 				$pdf->MultiCell(80, 5, $lib_mode_reg, 0, 'L');
 
diff --git a/htdocs/core/modules/facture/doc/pdf_sponge.modules.php b/htdocs/core/modules/facture/doc/pdf_sponge.modules.php
index 547aaaadae1..5555589b910 100644
--- a/htdocs/core/modules/facture/doc/pdf_sponge.modules.php
+++ b/htdocs/core/modules/facture/doc/pdf_sponge.modules.php
@@ -1278,7 +1278,7 @@ class pdf_sponge extends ModelePDFFactures
 					$bac = new CompanyBankAccount($this->db);
 					$bac->fetch(0, $object->thirdparty->id);
 					$iban= $bac->iban.(($bac->iban && $bac->bic) ? ' / ' : '').$bac->bic;
-					$lib_mode_reg .= $langs->trans("PaymentTypePREdetails", dol_trunc($iban, 6, 'right', 'UTF-8', 1));
+					$lib_mode_reg .= $outputlangs->trans("PaymentTypePREdetails", dol_trunc($iban, 6, 'right', 'UTF-8', 1));
 				}
 
 				$pdf->MultiCell($posxend - $posxval, 5, $lib_mode_reg, 0, 'L');

From 6a0978580e25410c39662512a6f7399f7dda3b51 Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Mon, 29 Aug 2022 10:47:01 +0200
Subject: [PATCH 227/974] Use IsModEnabled

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

diff --git a/htdocs/ticket/agenda.php b/htdocs/ticket/agenda.php
index 72c19c217b3..e0d06759d77 100644
--- a/htdocs/ticket/agenda.php
+++ b/htdocs/ticket/agenda.php
@@ -170,7 +170,7 @@ if (!empty($object->origin_email)) {
 }
 
 // Thirdparty
-if (!empty($conf->societe->enabled)) {
+if (isModEnabled('societe')) {
 	$morehtmlref .= '<br>'.$langs->trans('ThirdParty');
 	/*if ($action != 'editcustomer' && $object->fk_statut < 8 && !$user->socid && $user->rights->ticket->write) {
 		$morehtmlref.='<a class="editfielda" href="' . $url_page_current . '?action=editcustomer&token='.newToken().'&track_id=' . $object->track_id . '">' . img_edit($langs->transnoentitiesnoconv('Edit'), 1) . '</a>';
@@ -184,7 +184,7 @@ if (!empty($conf->societe->enabled)) {
 }
 
 // Project
-if (!empty($conf->project->enabled)) {
+if (isModEnabled('project')) {
 	$langs->load("projects");
 	$morehtmlref .= '<br>'.$langs->trans('Project');
 	if ($user->rights->ticket->write) {

From 5a2fb2c3f4e258689891c6313b173de6f7abb3ca Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Mon, 29 Aug 2022 10:47:07 +0200
Subject: [PATCH 228/974] Use IsModEnabled

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

diff --git a/htdocs/ticket/card.php b/htdocs/ticket/card.php
index 13dffc545aa..589f7ca0590 100644
--- a/htdocs/ticket/card.php
+++ b/htdocs/ticket/card.php
@@ -34,12 +34,12 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
 require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
 require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
-if (!empty($conf->project->enabled)) {
+if (isModEnabled('project')) {
 	include_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 	include_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php';
 	include_once DOL_DOCUMENT_ROOT.'/core/lib/project.lib.php';
 }
-if (!empty($conf->contrat->enabled)) {
+if (isModEnabled('contrat')) {
 	include_once DOL_DOCUMENT_ROOT.'/core/lib/contract.lib.php';
 	include_once DOL_DOCUMENT_ROOT.'/contrat/class/contrat.class.php';
 	include_once DOL_DOCUMENT_ROOT.'/core/class/html.formcontract.class.php';
@@ -698,7 +698,7 @@ if (empty($reshook)) {
 $userstat = new User($db);
 $form = new Form($db);
 $formticket = new FormTicket($db);
-if (!empty($conf->project->enabled)) {
+if (isModEnabled('project')) {
 	$formproject = new FormProjets($db);
 }
 
@@ -940,7 +940,7 @@ if ($action == 'create' || $action == 'presend') {
 		}
 
 		// Thirdparty
-		if (!empty($conf->societe->enabled)) {
+		if (isModEnabled('societe')) {
 			$morehtmlref .= '<br>'.$langs->trans('ThirdParty').' ';
 			if ($action != 'editcustomer' && $object->status < 8 && !$user->socid && $user->rights->ticket->write) {
 				$morehtmlref .= '<a class="editfielda" href="'.$url_page_current.'?action=editcustomer&token='.newToken().'&track_id='.$object->track_id.'">'.img_edit($langs->transnoentitiesnoconv('Edit'), 0).'</a> : ';
@@ -953,7 +953,7 @@ if ($action == 'create' || $action == 'presend') {
 		}
 
 		// Project
-		if (!empty($conf->project->enabled)) {
+		if (isModEnabled('project')) {
 			$langs->load("projects");
 			$morehtmlref .= '<br>'.$langs->trans('Project').' ';
 			if ($user->rights->ticket->write) {
@@ -1107,7 +1107,7 @@ if ($action == 'create' || $action == 'presend') {
 		print '</tr>';
 
 		// Timing (Duration sum of linked fichinter)
-		if (!empty($conf->ficheinter->enabled)) {
+		if (isModEnabled('ficheinter')) {
 			$object->fetchObjectLinked();
 			$num = count($object->linkedObjects);
 			$timing = 0;

From 2e518940b1793258f55c518a0f5817ce8ac0b278 Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Mon, 29 Aug 2022 10:47:15 +0200
Subject: [PATCH 229/974] Use IsModEnabled

---
 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 aa971d9a5d5..dd8b75292ad 100644
--- a/htdocs/ticket/class/cticketcategory.class.php
+++ b/htdocs/ticket/class/cticketcategory.class.php
@@ -189,7 +189,7 @@ class CTicketCategory extends CommonObject
 		if (empty($conf->global->MAIN_SHOW_TECHNICAL_ID) && isset($this->fields['rowid'])) {
 			$this->fields['rowid']['visible'] = 0;
 		}
-		if (empty($conf->multicompany->enabled) && isset($this->fields['entity'])) {
+		if (!isModEnabled('multicompany') && isset($this->fields['entity'])) {
 			$this->fields['entity']['enabled'] = 0;
 		}
 

From 7edd4e78eb97b4d63dc8ec0808c2c4f9b7a1a8e5 Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Mon, 29 Aug 2022 10:47:19 +0200
Subject: [PATCH 230/974] Use IsModEnabled

---
 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 70c2eb05ea9..3d506c9951d 100644
--- a/htdocs/ticket/class/ticket.class.php
+++ b/htdocs/ticket/class/ticket.class.php
@@ -1816,7 +1816,7 @@ class Ticket extends CommonObject
 				$error = 0;
 
 				// Valid and close fichinter linked
-				if (!empty($conf->ficheinter->enabled) && !empty($conf->global->WORKFLOW_TICKET_CLOSE_INTERVENTION)) {
+				if (isModEnabled('ficheinter') && !empty($conf->global->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) {

From 1f3fd455707428802f025fdc89c9d46112207833 Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Mon, 29 Aug 2022 10:47:23 +0200
Subject: [PATCH 231/974] Use IsModEnabled

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

diff --git a/htdocs/ticket/contact.php b/htdocs/ticket/contact.php
index d32ab88eb1c..f41734e9fac 100644
--- a/htdocs/ticket/contact.php
+++ b/htdocs/ticket/contact.php
@@ -210,7 +210,7 @@ if ($id > 0 || !empty($track_id) || !empty($ref)) {
 		}
 
 		// Thirdparty
-		if (!empty($conf->societe->enabled)) {
+		if (isModEnabled('societe')) {
 			$morehtmlref .= '<br>'.$langs->trans('ThirdParty');
 			/*if ($action != 'editcustomer' && $object->fk_statut < 8 && !$user->socid && $user->rights->ticket->write) {
 				$morehtmlref.='<a class="editfielda" href="' . $url_page_current . '?action=editcustomer&token='.newToken().'&track_id=' . $object->track_id . '">' . img_edit($langs->transnoentitiesnoconv('Edit'), 1) . '</a>';
@@ -224,7 +224,7 @@ if ($id > 0 || !empty($track_id) || !empty($ref)) {
 		}
 
 		// Project
-		if (!empty($conf->project->enabled)) {
+		if (isModEnabled('project')) {
 			$langs->load("projects");
 			$morehtmlref .= '<br>'.$langs->trans('Project').' ';
 			if ($user->rights->ticket->write) {

From 186bd8b73110752b986cc596bac3ae7ec7703c64 Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Mon, 29 Aug 2022 10:47:26 +0200
Subject: [PATCH 232/974] Use IsModEnabled

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

diff --git a/htdocs/ticket/document.php b/htdocs/ticket/document.php
index 234c5e92918..fc7c50d5d70 100644
--- a/htdocs/ticket/document.php
+++ b/htdocs/ticket/document.php
@@ -145,7 +145,7 @@ if ($object->id) {
 	}
 
 	// Thirdparty
-	if (!empty($conf->societe->enabled)) {
+	if (isModEnabled('societe')) {
 		$morehtmlref .= '<br>'.$langs->trans('ThirdParty');
 		/*if ($action != 'editcustomer' && $object->fk_statut < 8 && !$user->socid && $user->rights->ticket->write) {
 			$morehtmlref.='<a class="editfielda" href="' . $url_page_current . '?action=editcustomer&token='.newToken().'&track_id=' . $object->track_id . '">' . img_edit($langs->transnoentitiesnoconv('Edit'), 1) . '</a>';
@@ -159,7 +159,7 @@ if ($object->id) {
 	}
 
 	// Project
-	if (!empty($conf->project->enabled)) {
+	if (isModEnabled('project')) {
 		$langs->load("projects");
 		$morehtmlref .= '<br>'.$langs->trans('Project').' ';
 		if ($user->rights->ticket->write) {

From bf735600bf68d0da71848f005a624888bc97a87c Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Mon, 29 Aug 2022 10:47:38 +0200
Subject: [PATCH 233/974] Use isModEnabled

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

diff --git a/htdocs/ticket/messaging.php b/htdocs/ticket/messaging.php
index df829a010ec..0abbf568c26 100644
--- a/htdocs/ticket/messaging.php
+++ b/htdocs/ticket/messaging.php
@@ -171,7 +171,7 @@ if ($object->fk_user_create > 0) {
 }
 
 // Thirdparty
-if (!empty($conf->societe->enabled)) {
+if (isModEnabled('societe')) {
 	$morehtmlref .= '<br>'.$langs->trans('ThirdParty');
 	/*if ($action != 'editcustomer' && $object->fk_statut < 8 && !$user->socid && $user->rights->ticket->write) {
 		$morehtmlref.='<a class="editfielda" href="' . $url_page_current . '?action=editcustomer&token='.newToken().'&track_id=' . $object->track_id . '">' . img_edit($langs->transnoentitiesnoconv('Edit'), 1) . '</a>';
@@ -185,7 +185,7 @@ if (!empty($conf->societe->enabled)) {
 }
 
 // Project
-if (!empty($conf->project->enabled)) {
+if (isModEnabled('project')) {
 	$langs->load("projects");
 	$morehtmlref .= '<br>'.$langs->trans('Project');
 	if ($user->rights->ticket->write) {

From 78c2d859f4c9724ac1665a8877cd821d6d51342d Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Mon, 29 Aug 2022 10:52:37 +0200
Subject: [PATCH 234/974] Use isModEnabled

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

diff --git a/htdocs/salaries/admin/salaries.php b/htdocs/salaries/admin/salaries.php
index f69e17336c6..5343d4831ba 100644
--- a/htdocs/salaries/admin/salaries.php
+++ b/htdocs/salaries/admin/salaries.php
@@ -27,7 +27,7 @@ require '../../main.inc.php';
 // Class
 require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/salaries.lib.php';
-if (!empty($conf->accounting->enabled)) {
+if (isModEnabled('accounting')) {
 	require_once DOL_DOCUMENT_ROOT.'/core/class/html.formaccounting.class.php';
 }
 
@@ -83,7 +83,7 @@ if (preg_match('/^(set|del)_?([A-Z_]+)$/', $action, $reg)) {
 llxHeader('', $langs->trans('SalariesSetup'));
 
 $form = new Form($db);
-if (!empty($conf->accounting->enabled)) {
+if (isModEnabled('accounting')) {
 	$formaccounting = new FormAccounting($db);
 }
 
@@ -119,7 +119,7 @@ foreach ($list as $key) {
 
 	// Value
 	print '<td>';
-	if (!empty($conf->accounting->enabled)) {
+	if (isModEnabled('accounting')) {
 		print $formaccounting->select_account(getDolGlobalString($key), $key, 1, '', 1, 1);
 	} else {
 		print '<input type="text" size="20" id="'.$key.'" name="'.$key.'" value="'.getDolGlobalString($key).'">';

From be043fb088973af7c4daf2fb866e910ebe14ebcd Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Mon, 29 Aug 2022 10:52:45 +0200
Subject: [PATCH 235/974] Use isModEnabled

---
 htdocs/salaries/card.php | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/htdocs/salaries/card.php b/htdocs/salaries/card.php
index 7d57575dacd..a849b00a282 100644
--- a/htdocs/salaries/card.php
+++ b/htdocs/salaries/card.php
@@ -35,14 +35,14 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/salaries.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
 require_once DOL_DOCUMENT_ROOT.'/accountancy/class/accountingjournal.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
-if (!empty($conf->project->enabled)) {
+if (isModEnabled('projet')) {
 	require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 	require_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php';
 }
 
 // Load translation files required by the page
 $langs->loadLangs(array("compta", "banks", "bills", "users", "salaries", "hrm", "trips"));
-if (!empty($conf->project->enabled)) {
+if (isModEnabled('projet')) {
 	$langs->load("projects");
 }
 
@@ -260,7 +260,7 @@ if ($action == 'add' && empty($cancel)) {
 		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Amount")), null, 'errors');
 		$error++;
 	}
-	if (!empty($conf->banque->enabled) && !empty($auto_create_paiement) && !$object->accountid > 0) {
+	if (isModEnabled('banque') && !empty($auto_create_paiement) && !$object->accountid > 0) {
 		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("BankAccount")), null, 'errors');
 		$error++;
 	}
@@ -441,7 +441,7 @@ if ($action == "update_extras" && !empty($user->rights->salaries->read)) {
 
 $form = new Form($db);
 $formfile = new FormFile($db);
-if (!empty($conf->project->enabled)) $formproject = new FormProjets($db);
+if (isModEnabled('projet')) $formproject = new FormProjets($db);
 
 $title = $langs->trans('Salary')." - ".$langs->trans('Card');
 $help_url = "";
@@ -559,7 +559,7 @@ if ($action == 'create') {
 	print '</tr>';
 
 	// Project
-	if (!empty($conf->project->enabled)) {
+	if (isModEnabled('projet')) {
 		$formproject = new FormProjets($db);
 
 		print '<tr><td>'.$langs->trans("Project").'</td><td>';
@@ -583,7 +583,7 @@ if ($action == 'create') {
 	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 (!empty($conf->banque->enabled)) {
+	if (isModEnabled('banque')) {
 		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"');
@@ -610,7 +610,7 @@ if ($action == 'create') {
 	print '</td></tr>';
 
 	// Number
-	if (!empty($conf->banque->enabled)) {
+	if (isModEnabled('banque')) {
 		// Number
 		print '<tr class="hide_if_no_auto_create_payment"><td><label for="num_payment">'.$langs->trans('Numero');
 		print ' <em>('.$langs->trans("ChequeOrTransferNumber").')</em>';
@@ -794,7 +794,7 @@ if ($id) {
 	}
 
 	// Project
-	if (!empty($conf->project->enabled)) {
+	if (isModEnabled('projet')) {
 		$morehtmlref .= '<br>'.$langs->trans('Project').' ';
 		if ($user->rights->salaries->write) {
 			if ($action != 'classify') {
@@ -893,7 +893,7 @@ if ($id) {
 	print '</td></tr>';
 
 	// Default Bank Account
-	if (!empty($conf->banque->enabled)) {
+	if (isModEnabled('banque')) {
 		print '<tr><td class="nowrap">';
 		print '<table width="100%" class="nobordernopadding"><tr><td class="nowrap">';
 		print $langs->trans('DefaultBankAccount');
@@ -922,7 +922,7 @@ if ($id) {
 	print '<div class="fichehalfright">';
 
 	$nbcols = 3;
-	if (!empty($conf->banque->enabled)) {
+	if (isModEnabled('banque')) {
 		$nbcols++;
 	}
 
@@ -956,7 +956,7 @@ if ($id) {
 		print '<td>'.$langs->trans("RefPayment").'</td>';
 		print '<td>'.$langs->trans("Date").'</td>';
 		print '<td>'.$langs->trans("Type").'</td>';
-		if (!empty($conf->banque->enabled)) {
+		if (isModEnabled('banque')) {
 			print '<td class="liste_titre right">'.$langs->trans('BankAccount').'</td>';
 		}
 		print '<td class="right">'.$langs->trans("Amount").'</td>';
@@ -972,14 +972,14 @@ if ($id) {
 				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 (!empty($conf->banque->enabled)) {
+				if (isModEnabled('banque')) {
 					$bankaccountstatic->id = $objp->baid;
 					$bankaccountstatic->ref = $objp->baref;
 					$bankaccountstatic->label = $objp->baref;
 					$bankaccountstatic->number = $objp->banumber;
 					$bankaccountstatic->currency_code = $objp->bacurrency_code;
 
-					if (!empty($conf->accounting->enabled)) {
+					if (isModEnabled('accounting')) {
 						$bankaccountstatic->account_number = $objp->account_number;
 
 						$accountingjournal = new AccountingJournal($db);

From 6fe80c3031e3202d5501615a46e5865ea9cde08b Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Mon, 29 Aug 2022 10:52:53 +0200
Subject: [PATCH 236/974] Use isModEnabled

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

diff --git a/htdocs/salaries/class/paymentsalary.class.php b/htdocs/salaries/class/paymentsalary.class.php
index 3a6ade39c6a..8b809ffa1f7 100644
--- a/htdocs/salaries/class/paymentsalary.class.php
+++ b/htdocs/salaries/class/paymentsalary.class.php
@@ -493,7 +493,7 @@ class PaymentSalary extends CommonObject
 
 		$error = 0;
 
-		if (!empty($conf->banque->enabled)) {
+		if (isModEnabled('banque')) {
 			include_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
 
 			$acc = new Account($this->db);

From ccea57423af6c603d21e16f4d13e5ffca3c92186 Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Mon, 29 Aug 2022 10:52:57 +0200
Subject: [PATCH 237/974] Use isModEnabled

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

diff --git a/htdocs/salaries/class/salary.class.php b/htdocs/salaries/class/salary.class.php
index 968320ce394..59f23208daa 100644
--- a/htdocs/salaries/class/salary.class.php
+++ b/htdocs/salaries/class/salary.class.php
@@ -372,12 +372,12 @@ class Salary extends CommonObject
 			$this->error = $langs->trans("ErrorFieldRequired", $langs->transnoentities("Amount"));
 			return -5;
 		}
-		/* if (!empty($conf->banque->enabled) && (empty($this->accountid) || $this->accountid <= 0))
+		/* if (isModEnabled('banque') && (empty($this->accountid) || $this->accountid <= 0))
 		{
 			$this->error = $langs->trans("ErrorFieldRequired", $langs->transnoentities("Account"));
 			return -6;
 		}
-		if (!empty($conf->banque->enabled) && (empty($this->type_payment) || $this->type_payment <= 0))
+		if (isModEnabled('banque') && (empty($this->type_payment) || $this->type_payment <= 0))
 		{
 			$this->error = $langs->trans("ErrorFieldRequired", $langs->transnoentities("PaymentMode"));
 			return -7;

From eae6118d40f21ad8ab2be4ea50f706eb24ae1238 Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Mon, 29 Aug 2022 10:53:01 +0200
Subject: [PATCH 238/974] Use isModEnabled

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

diff --git a/htdocs/salaries/document.php b/htdocs/salaries/document.php
index 971291580bf..e35f2bd1f7e 100644
--- a/htdocs/salaries/document.php
+++ b/htdocs/salaries/document.php
@@ -35,7 +35,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/salaries.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/salaries/class/salary.class.php';
-if (!empty($conf->project->enabled)) {
+if (isModEnabled('project')) {
 	require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 	require_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php';
 }
@@ -132,7 +132,7 @@ if ($action == 'setlabel' && $user->rights->salaries->write) {
  */
 
 $form = new Form($db);
-if (!empty($conf->project->enabled)) $formproject = new FormProjets($db);
+if (isModEnabled('projet')) $formproject = new FormProjets($db);
 
 $title = $langs->trans('Salary')." - ".$langs->trans('Documents');
 $help_url = "";
@@ -176,7 +176,7 @@ if ($object->id) {
 	$morehtmlref .= '<br>'.$langs->trans('Employee').' : '.$userstatic->getNomUrl(-1);
 
 	// Project
-	if (!empty($conf->project->enabled)) {
+	if (isModEnabled('projet')) {
 		$morehtmlref .= '<br>'.$langs->trans('Project').' ';
 		if ($user->rights->salaries->write) {
 			if ($action != 'classify') {

From b00ce99bc4533712792ddffe1091bdb6911278a0 Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Mon, 29 Aug 2022 10:53:05 +0200
Subject: [PATCH 239/974] Use isModEnabled

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

diff --git a/htdocs/salaries/info.php b/htdocs/salaries/info.php
index a2f05b791a6..87855178379 100644
--- a/htdocs/salaries/info.php
+++ b/htdocs/salaries/info.php
@@ -28,7 +28,7 @@ require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/salaries/class/salary.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/salaries.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
-if (!empty($conf->project->enabled)) {
+if (isModEnabled('projet')) {
 	require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 	require_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php';
 }
@@ -100,7 +100,7 @@ if ($action == 'setlabel' && $user->rights->salaries->write) {
  * View
  */
 
-if (!empty($conf->project->enabled)) $formproject = new FormProjets($db);
+if (isModEnabled('projet')) $formproject = new FormProjets($db);
 
 $title = $langs->trans('Salary')." - ".$langs->trans('Info');
 $help_url = "";
@@ -139,7 +139,7 @@ if ($action != 'editlabel') {
 $morehtmlref .= '<br>'.$langs->trans('Employee').' : '.$userstatic->getNomUrl(-1);
 
 // Project
-if (!empty($conf->project->enabled)) {
+if (isModEnabled('projet')) {
 	$morehtmlref .= '<br>'.$langs->trans('Project').' ';
 	if ($user->rights->salaries->write) {
 		if ($action != 'classify') {

From 233326ff605d588089bcc12f82bfcb698e34a98a Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Mon, 29 Aug 2022 10:53:11 +0200
Subject: [PATCH 240/974] Use isModEnabled

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

diff --git a/htdocs/salaries/list.php b/htdocs/salaries/list.php
index af58d7b53f7..9af8e61eafe 100644
--- a/htdocs/salaries/list.php
+++ b/htdocs/salaries/list.php
@@ -27,7 +27,7 @@
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/salaries/class/paymentsalary.class.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
-if (!empty($conf->accounting->enabled)) {
+if (isModEnabled('accounting')) {
 	require_once DOL_DOCUMENT_ROOT.'/accountancy/class/accountingjournal.class.php';
 }
 
@@ -438,7 +438,7 @@ $form->select_types_paiements($search_type_id, 'search_type_id', '', 0, 1, 1, 16
 print '</td>';
 
 // Bank account
-if (!empty($conf->banque->enabled)) {
+if (isModEnabled('banque')) {
 	print '<td class="liste_titre">';
 	$form->select_comptes($search_account, 'search_account', 0, '', 1);
 	print '</td>';
@@ -476,7 +476,7 @@ print_liste_field_titre("DateStart", $_SERVER["PHP_SELF"], "s.datesp,s.rowid", "
 print_liste_field_titre("DateEnd", $_SERVER["PHP_SELF"], "s.dateep,s.rowid", "", $param, 'align="center"', $sortfield, $sortorder);
 print_liste_field_titre("Employee", $_SERVER["PHP_SELF"], "u.lastname", "", $param, "", $sortfield, $sortorder);
 print_liste_field_titre("DefaultPaymentMode", $_SERVER["PHP_SELF"], "type", "", $param, 'class="left"', $sortfield, $sortorder);
-if (!empty($conf->banque->enabled)) {
+if (isModEnabled('banque')) {
 	print_liste_field_titre("DefaultBankAccount", $_SERVER["PHP_SELF"], "ba.label", "", $param, "", $sortfield, $sortorder);
 }
 print_liste_field_titre("Amount", $_SERVER["PHP_SELF"], "s.amount", "", $param, 'class="right"', $sortfield, $sortorder);
@@ -577,7 +577,7 @@ while ($i < ($limit ? min($num, $limit) : $num)) {
 	}
 
 	// Account
-	if (!empty($conf->banque->enabled)) {
+	if (isModEnabled('banque')) {
 		print '<td>';
 		if ($obj->fk_account > 0) {
 			//$accountstatic->fetch($obj->fk_bank);
@@ -591,7 +591,7 @@ while ($i < ($limit ? min($num, $limit) : $num)) {
 			$accountstatic->account_number = $obj->account_number;
 			$accountstatic->clos = $obj->clos;
 
-			if (!empty($conf->accounting->enabled)) {
+			if (isModEnabled('accounting')) {
 				$accountstatic->account_number = $obj->account_number;
 
 				$accountingjournal = new AccountingJournal($db);
@@ -663,7 +663,7 @@ if ($num == 0) {
 		}
 	}*/
 	$colspan = 9;
-	if (!empty($conf->banque->enabled)) { $colspan++; }
+	if (isModEnabled('banque')) { $colspan++; }
 	print '<tr><td colspan="'.$colspan.'" class="opacitymedium">'.$langs->trans("NoRecordFound").'</td></tr>';
 }
 

From 114bb31ac9e408366d22e0a10381e57686f0b29d Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Mon, 29 Aug 2022 10:53:15 +0200
Subject: [PATCH 241/974] Use isModEnabled

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

diff --git a/htdocs/salaries/paiement_salary.php b/htdocs/salaries/paiement_salary.php
index cfca26efca4..1a3aad72eac 100644
--- a/htdocs/salaries/paiement_salary.php
+++ b/htdocs/salaries/paiement_salary.php
@@ -77,7 +77,7 @@ if ($action == 'add_payment' || ($action == 'confirm_paiement' && $confirm == 'y
 		$error++;
 		$action = 'create';
 	}
-	if (!empty($conf->banque->enabled) && !(GETPOST("accountid", 'int') > 0)) {
+	if (isModEnabled('banque') && !(GETPOST("accountid", 'int') > 0)) {
 		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("AccountToDebit")), null, 'errors');
 		$error++;
 		$action = 'create';

From 47d96b6dca4701a4cba9e3424db75299bdece961 Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Mon, 29 Aug 2022 10:53:19 +0200
Subject: [PATCH 242/974] Use isModEnabled

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

diff --git a/htdocs/salaries/payment_salary/card.php b/htdocs/salaries/payment_salary/card.php
index b3234e39490..2538be551f8 100644
--- a/htdocs/salaries/payment_salary/card.php
+++ b/htdocs/salaries/payment_salary/card.php
@@ -31,7 +31,7 @@ require_once DOL_DOCUMENT_ROOT.'/salaries/class/salary.class.php';
 require_once DOL_DOCUMENT_ROOT.'/salaries/class/paymentsalary.class.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/modules/facture/modules_facture.php';
-if (!empty($conf->banque->enabled)) require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
+if (isModEnabled('banque')) require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
 
 // Load translation files required by the page
 $langs->loadLangs(array('bills', 'banks', 'companies', 'salaries'));
@@ -152,7 +152,7 @@ print '<tr><td>'.$langs->trans('Amount').'</td><td colspan="3">'.price($object->
 print '<tr><td>'.$langs->trans('Note').'</td><td colspan="3">'.nl2br($object->note).'</td></tr>';
 
 // Bank account
-if (!empty($conf->banque->enabled)) {
+if (isModEnabled('banque')) {
 	if ($object->bank_account) {
 		$bankline = new AccountLine($db);
 		$bankline->fetch($object->bank_line);

From 4184e416aa97a827e47aaca168b6cde816936502 Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Mon, 29 Aug 2022 10:53:24 +0200
Subject: [PATCH 243/974] Use isModEnabled

---
 htdocs/salaries/payments.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/htdocs/salaries/payments.php b/htdocs/salaries/payments.php
index 54a8589677d..64bc60b7a63 100644
--- a/htdocs/salaries/payments.php
+++ b/htdocs/salaries/payments.php
@@ -28,7 +28,7 @@ require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/salaries/class/salary.class.php';
 require_once DOL_DOCUMENT_ROOT.'/salaries/class/paymentsalary.class.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
-if (!empty($conf->accounting->enabled)) {
+if (isModEnabled('accounting')) {
 	require_once DOL_DOCUMENT_ROOT.'/accountancy/class/accountingjournal.class.php';
 }
 
@@ -448,7 +448,7 @@ print '</td>';
 // Chq number
 print '<td class="liste_titre right"><input name="search_chq_number" class="flat" type="text" size="8" value="'.$db->escape($search_chq_number).'"></td>';
 
-if (!empty($conf->banque->enabled)) {
+if (isModEnabled('banque')) {
 	// Bank transaction
 	print '<td class="liste_titre center">';
 	print '<input class="flat" type="text" size="3" name="search_fk_bank" value="'.$db->escape($search_fk_bank).'">';
@@ -489,7 +489,7 @@ print_liste_field_titre("DatePayment", $_SERVER["PHP_SELF"], "s.datep,s.rowid",
 print_liste_field_titre("Employee", $_SERVER["PHP_SELF"], "u.rowid", "", $param, "", $sortfield, $sortorder);
 print_liste_field_titre("PaymentMode", $_SERVER["PHP_SELF"], "pst.code", "", $param, 'class="left"', $sortfield, $sortorder);
 print_liste_field_titre("Numero", $_SERVER["PHP_SELF"], "s.num_payment", "", $param, '', $sortfield, $sortorder, '', 'ChequeOrTransferNumber');
-if (!empty($conf->banque->enabled)) {
+if (isModEnabled('banque')) {
 	print_liste_field_titre("BankTransactionLine", $_SERVER["PHP_SELF"], "s.fk_bank", "", $param, '', $sortfield, $sortorder);
 	print_liste_field_titre("BankAccount", $_SERVER["PHP_SELF"], "ba.label", "", $param, "", $sortfield, $sortorder);
 }
@@ -604,7 +604,7 @@ while ($i < ($limit ? min($num, $limit) : $num)) {
 	}
 
 	// Account
-	if (!empty($conf->banque->enabled)) {
+	if (isModEnabled('banque')) {
 		// Bank transaction
 		print '<td>';
 		$accountlinestatic->id = $obj->fk_bank;
@@ -625,7 +625,7 @@ while ($i < ($limit ? min($num, $limit) : $num)) {
 			$accountstatic->currency_code = $langs->trans("Currency".$obj->currency_code);
 			$accountstatic->clos = $obj->clos;
 
-			if (!empty($conf->accounting->enabled)) {
+			if (isModEnabled('accounting')) {
 				$accountstatic->account_number = $obj->account_number;
 
 				$accountingjournal = new AccountingJournal($db);

From e2fdc646662c8e527021d493e6eaa12e20b493b2 Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Mon, 29 Aug 2022 10:56:06 +0200
Subject: [PATCH 244/974] Typo

---
 htdocs/salaries/card.php     | 10 +++++-----
 htdocs/salaries/document.php |  4 ++--
 htdocs/salaries/info.php     |  6 +++---
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/htdocs/salaries/card.php b/htdocs/salaries/card.php
index a849b00a282..757027253d4 100644
--- a/htdocs/salaries/card.php
+++ b/htdocs/salaries/card.php
@@ -35,14 +35,14 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/salaries.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
 require_once DOL_DOCUMENT_ROOT.'/accountancy/class/accountingjournal.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
-if (isModEnabled('projet')) {
+if (isModEnabled('project')) {
 	require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 	require_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php';
 }
 
 // Load translation files required by the page
 $langs->loadLangs(array("compta", "banks", "bills", "users", "salaries", "hrm", "trips"));
-if (isModEnabled('projet')) {
+if (isModEnabled('project')) {
 	$langs->load("projects");
 }
 
@@ -441,7 +441,7 @@ if ($action == "update_extras" && !empty($user->rights->salaries->read)) {
 
 $form = new Form($db);
 $formfile = new FormFile($db);
-if (isModEnabled('projet')) $formproject = new FormProjets($db);
+if (isModEnabled('project')) $formproject = new FormProjets($db);
 
 $title = $langs->trans('Salary')." - ".$langs->trans('Card');
 $help_url = "";
@@ -559,7 +559,7 @@ if ($action == 'create') {
 	print '</tr>';
 
 	// Project
-	if (isModEnabled('projet')) {
+	if (isModEnabled('project')) {
 		$formproject = new FormProjets($db);
 
 		print '<tr><td>'.$langs->trans("Project").'</td><td>';
@@ -794,7 +794,7 @@ if ($id) {
 	}
 
 	// Project
-	if (isModEnabled('projet')) {
+	if (isModEnabled('project')) {
 		$morehtmlref .= '<br>'.$langs->trans('Project').' ';
 		if ($user->rights->salaries->write) {
 			if ($action != 'classify') {
diff --git a/htdocs/salaries/document.php b/htdocs/salaries/document.php
index e35f2bd1f7e..eb4c63390a8 100644
--- a/htdocs/salaries/document.php
+++ b/htdocs/salaries/document.php
@@ -132,7 +132,7 @@ if ($action == 'setlabel' && $user->rights->salaries->write) {
  */
 
 $form = new Form($db);
-if (isModEnabled('projet')) $formproject = new FormProjets($db);
+if (isModEnabled('project')) $formproject = new FormProjets($db);
 
 $title = $langs->trans('Salary')." - ".$langs->trans('Documents');
 $help_url = "";
@@ -176,7 +176,7 @@ if ($object->id) {
 	$morehtmlref .= '<br>'.$langs->trans('Employee').' : '.$userstatic->getNomUrl(-1);
 
 	// Project
-	if (isModEnabled('projet')) {
+	if (isModEnabled('project')) {
 		$morehtmlref .= '<br>'.$langs->trans('Project').' ';
 		if ($user->rights->salaries->write) {
 			if ($action != 'classify') {
diff --git a/htdocs/salaries/info.php b/htdocs/salaries/info.php
index 87855178379..7c8962499ce 100644
--- a/htdocs/salaries/info.php
+++ b/htdocs/salaries/info.php
@@ -28,7 +28,7 @@ require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/salaries/class/salary.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/salaries.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
-if (isModEnabled('projet')) {
+if (isModEnabled('project')) {
 	require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 	require_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php';
 }
@@ -100,7 +100,7 @@ if ($action == 'setlabel' && $user->rights->salaries->write) {
  * View
  */
 
-if (isModEnabled('projet')) $formproject = new FormProjets($db);
+if (isModEnabled('project')) $formproject = new FormProjets($db);
 
 $title = $langs->trans('Salary')." - ".$langs->trans('Info');
 $help_url = "";
@@ -139,7 +139,7 @@ if ($action != 'editlabel') {
 $morehtmlref .= '<br>'.$langs->trans('Employee').' : '.$userstatic->getNomUrl(-1);
 
 // Project
-if (isModEnabled('projet')) {
+if (isModEnabled('project')) {
 	$morehtmlref .= '<br>'.$langs->trans('Project').' ';
 	if ($user->rights->salaries->write) {
 		if ($action != 'classify') {

From d27277ea05d9b9ca74220a006b8f5a0d1d9fedf7 Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Mon, 29 Aug 2022 11:07:54 +0200
Subject: [PATCH 245/974] Use isModEnabled

---
 htdocs/resource/agenda.php           | 2 +-
 htdocs/resource/element_resource.php | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/htdocs/resource/agenda.php b/htdocs/resource/agenda.php
index cb13ce78e7d..8984c9ced72 100644
--- a/htdocs/resource/agenda.php
+++ b/htdocs/resource/agenda.php
@@ -135,7 +135,7 @@ if ($object->id > 0) {
 	}
 	llxHeader('', $title);
 
-	if (!empty($conf->notification->enabled)) {
+	if (isModEnabled('notification')) {
 		$langs->load("mails");
 	}
 	$type = $langs->trans('ResourceSingular');
diff --git a/htdocs/resource/element_resource.php b/htdocs/resource/element_resource.php
index 09c7befc664..e1a323ffd4a 100644
--- a/htdocs/resource/element_resource.php
+++ b/htdocs/resource/element_resource.php
@@ -29,11 +29,11 @@ require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/resource/class/dolresource.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/fichinter/class/fichinter.class.php';
-if (!empty($conf->project->enabled)) {
+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 (!empty($conf->product->enabled) || !empty($conf->service->enabled)) {
+if (isModEnabled('product') || isModEnabled('service')) {
 	require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
 }
 
@@ -349,7 +349,7 @@ if (!$ret) {
 			// Thirdparty
 			//$morehtmlref.='<br>'.$langs->trans('ThirdParty') . ' : ' . $object->thirdparty->getNomUrl(1);
 			// Project
-			if (!empty($conf->project->enabled)) {
+			if (isModEnabled('project')) {
 				$langs->load("projects");
 				//$morehtmlref.='<br>'.$langs->trans('Project') . ' ';
 				$morehtmlref .= $langs->trans('Project').': ';
@@ -517,7 +517,7 @@ if (!$ret) {
 			// Thirdparty
 			$morehtmlref .= $langs->trans('ThirdParty').' : '.$fichinter->thirdparty->getNomUrl(1);
 			// Project
-			if (!empty($conf->project->enabled)) {
+			if (isModEnabled('project')) {
 				$langs->load("projects");
 				$morehtmlref .= '<br>'.$langs->trans('Project').' ';
 				if ($user->rights->commande->creer) {

From f174b36dcfef6701d882379a2eb5c83b95d4449f Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Mon, 29 Aug 2022 11:20:47 +0200
Subject: [PATCH 246/974] Use isModEnabled

---
 htdocs/compta/accounting-files.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/compta/accounting-files.php b/htdocs/compta/accounting-files.php
index 44a60414846..60ffc2ae69a 100644
--- a/htdocs/compta/accounting-files.php
+++ b/htdocs/compta/accounting-files.php
@@ -134,7 +134,7 @@ $listofchoices = array(
 	'selectdonations'=>array('label'=>'Donations', 'lang'=>'donation', 'enabled' => !empty($conf->don->enabled), 'perms' => !empty($user->rights->don->lire)),
 	'selectsocialcontributions'=>array('label'=>'SocialContributions', 'enabled' => !empty($conf->tax->enabled), 'perms' => !empty($user->rights->tax->charges->lire)),
 	'selectpaymentsofsalaries'=>array('label'=>'SalariesPayments', 'lang'=>'salaries', 'enabled' => !empty($conf->salaries->enabled), 'perms' => !empty($user->rights->salaries->read)),
-	'selectvariouspayment'=>array('label'=>'VariousPayment', 'enabled' => !empty($conf->banque->enabled), 'perms' => !empty($user->rights->banque->lire)),
+	'selectvariouspayment'=>array('label'=>'VariousPayment', 'enabled' => isModEnabled('banque'), 'perms' => !empty($user->rights->banque->lire)),
 	'selectloanspayment'=>array('label'=>'PaymentLoan', 'enabled' => !empty($conf->loan->enabled), 'perms' => !empty($user->rights->loan->read)),
 );
 
@@ -549,7 +549,7 @@ print '<form name="searchfiles" action="?action=searchfiles" method="POST">'."\n
 print '<input type="hidden" name="token" value="'.newToken().'">';
 
 print '<span class="opacitymedium">'.$langs->trans("ExportAccountingSourceDocHelp");
-if (!empty($conf->accounting->enabled)) {
+if (isModEnabled('accounting')) {
 	print ' '.$langs->trans("ExportAccountingSourceDocHelp2", $langs->transnoentitiesnoconv("Accounting"), $langs->transnoentitiesnoconv("Journals"));
 }
 print '</span><br>';

From f091821f71057dd003cb942766614342e3989bf6 Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Mon, 29 Aug 2022 11:21:19 +0200
Subject: [PATCH 247/974] Use isModEnabled

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

diff --git a/htdocs/compta/bank/card.php b/htdocs/compta/bank/card.php
index 29341b0fb99..527d8eaa1b2 100644
--- a/htdocs/compta/bank/card.php
+++ b/htdocs/compta/bank/card.php
@@ -39,13 +39,13 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
 if (!empty($conf->categorie->enabled)) {
 	require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 }
-if (!empty($conf->accounting->enabled)) {
+if (isModEnabled('accounting')) {
 	require_once DOL_DOCUMENT_ROOT.'/core/class/html.formaccounting.class.php';
 }
-if (!empty($conf->accounting->enabled)) {
+if (isModEnabled('accounting')) {
 	require_once DOL_DOCUMENT_ROOT.'/accountancy/class/accountingaccount.class.php';
 }
-if (!empty($conf->accounting->enabled)) {
+if (isModEnabled('accounting')) {
 	require_once DOL_DOCUMENT_ROOT.'/accountancy/class/accountingjournal.class.php';
 }
 
@@ -326,7 +326,7 @@ if (empty($reshook)) {
 $form = new Form($db);
 $formbank = new FormBank($db);
 $formcompany = new FormCompany($db);
-if (!empty($conf->accounting->enabled)) {
+if (isModEnabled('accounting')) {
 	$formaccounting = new FormAccounting($db);
 }
 
@@ -573,7 +573,7 @@ if ($action == 'create') {
 		$fieldrequired = 'fieldrequired ';
 	}
 
-	if (!empty($conf->accounting->enabled)) {
+	if (isModEnabled('accounting')) {
 		print '<tr><td class="'.$fieldrequired.'titlefieldcreate">'.$langs->trans("AccountancyCode").'</td>';
 		print '<td>';
 		print $formaccounting->select_account($object->account_number, 'account_number', 1, '', 1, 1);
@@ -584,7 +584,7 @@ if ($action == 'create') {
 	}
 
 	// Accountancy journal
-	if (!empty($conf->accounting->enabled)) {
+	if (isModEnabled('accounting')) {
 		print '<tr><td>'.$langs->trans("AccountancyJournal").'</td>';
 		print '<td>';
 		print $formaccounting->select_journal($object->fk_accountancy_journal, 'fk_accountancy_journal', 4, 1, 0, 0);
@@ -677,7 +677,7 @@ if ($action == 'create') {
 		// Accountancy code
 		print '<tr class="liste_titre_add"><td class="titlefield">'.$langs->trans("AccountancyCode").'</td>';
 		print '<td>';
-		if (!empty($conf->accounting->enabled)) {
+		if (isModEnabled('accounting')) {
 			$accountingaccount = new AccountingAccount($db);
 			$accountingaccount->fetch('', $object->account_number, 1);
 
@@ -688,7 +688,7 @@ if ($action == 'create') {
 		print '</td></tr>';
 
 		// Accountancy journal
-		if (!empty($conf->accounting->enabled)) {
+		if (isModEnabled('accounting')) {
 			print '<tr><td>'.$langs->trans("AccountancyJournal").'</td>';
 			print '<td>';
 
@@ -1015,7 +1015,7 @@ if ($action == 'create') {
 
 		print '<tr class="liste_titre_add"><td'.$tdextra.'>'.$langs->trans("AccountancyCode").'</td>';
 		print '<td>';
-		if (!empty($conf->accounting->enabled)) {
+		if (isModEnabled('accounting')) {
 			print $formaccounting->select_account($object->account_number, 'account_number', 1, '', 1, 1);
 		} else {
 			print '<input type="text" name="account_number" value="'.(GETPOST("account_number") ? GETPOST("account_number") : $object->account_number).'">';
@@ -1023,7 +1023,7 @@ if ($action == 'create') {
 		print '</td></tr>';
 
 		// Accountancy journal
-		if (!empty($conf->accounting->enabled)) {
+		if (isModEnabled('accounting')) {
 			print '<tr><td class="fieldrequired">'.$langs->trans("AccountancyJournal").'</td>';
 			print '<td>';
 			print $formaccounting->select_journal($object->fk_accountancy_journal, 'fk_accountancy_journal', 4, 1, 0, 0);

From 88a68c12db3597fdc1d14e629165cecef1e8fb00 Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Mon, 29 Aug 2022 11:21:27 +0200
Subject: [PATCH 248/974] Use isModEnabled

---
 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 4c728adbfc8..cac331d07c1 100644
--- a/htdocs/compta/bank/class/account.class.php
+++ b/htdocs/compta/bank/class/account.class.php
@@ -1397,7 +1397,7 @@ class Account extends CommonObject
 			$option = 'nolink';
 		}
 
-		if (!empty($conf->accounting->enabled)) {
+		if (isModEnabled('accounting')) {
 			include_once DOL_DOCUMENT_ROOT.'/core/lib/accounting.lib.php';
 			$langs->load("accountancy");
 			$label .= '<br><b>'.$langs->trans('AccountAccounting').':</b> '.length_accountg($this->account_number);

From 1d875ef0251a96c78b1be81bf984c21a7f5a9f2e Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Mon, 29 Aug 2022 11:21:34 +0200
Subject: [PATCH 249/974] Use isModEnabled

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

diff --git a/htdocs/compta/bank/class/paymentvarious.class.php b/htdocs/compta/bank/class/paymentvarious.class.php
index 48ea553abf0..53505a888eb 100644
--- a/htdocs/compta/bank/class/paymentvarious.class.php
+++ b/htdocs/compta/bank/class/paymentvarious.class.php
@@ -423,11 +423,11 @@ class PaymentVarious extends CommonObject
 			$this->error = $langs->trans("ErrorFieldRequired", $langs->transnoentities("Amount"));
 			return -5;
 		}
-		if (!empty($conf->banque->enabled) && (empty($this->fk_account) || $this->fk_account <= 0)) {
+		if (isModEnabled('banque') && (empty($this->fk_account) || $this->fk_account <= 0)) {
 			$this->error = $langs->trans("ErrorFieldRequired", $langs->transnoentities("BankAccount"));
 			return -6;
 		}
-		if (!empty($conf->banque->enabled) && (empty($this->type_payment) || $this->type_payment <= 0)) {
+		if (isModEnabled('banque') && (empty($this->type_payment) || $this->type_payment <= 0)) {
 			$this->error = $langs->trans("ErrorFieldRequired", $langs->transnoentities("PaymentMode"));
 			return -7;
 		}
@@ -481,7 +481,7 @@ class PaymentVarious extends CommonObject
 			$this->ref = $this->id;
 
 			if ($this->id > 0) {
-				if (!empty($conf->banque->enabled) && !empty($this->amount)) {
+				if (isModEnabled('banque') && !empty($this->amount)) {
 					// Insert into llx_bank
 					require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
 

From dcebffbd015c832e7f8442e7836c596647411692 Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Mon, 29 Aug 2022 11:21:49 +0200
Subject: [PATCH 250/974] Use isModEnabled

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

diff --git a/htdocs/compta/bank/list.php b/htdocs/compta/bank/list.php
index 238b9919ef1..4e55b5b72dd 100644
--- a/htdocs/compta/bank/list.php
+++ b/htdocs/compta/bank/list.php
@@ -32,10 +32,10 @@ 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 (!empty($conf->accounting->enabled)) {
+if (isModEnabled('accounting')) {
 	require_once DOL_DOCUMENT_ROOT.'/accountancy/class/accountingaccount.class.php';
 }
-if (!empty($conf->accounting->enabled)) {
+if (isModEnabled('accounting')) {
 	require_once DOL_DOCUMENT_ROOT.'/accountancy/class/accountingjournal.class.php';
 }
 if (!empty($conf->categorie->enabled)) {
@@ -116,8 +116,8 @@ $arrayfields = array(
 	'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'=>(!empty($conf->accounting->enabled) || !empty($conf->accounting->enabled)), 'position'=>18),
-	'b.fk_accountancy_journal'=>array('label'=>$langs->trans("AccountancyJournal"), 'checked'=>(!empty($conf->accounting->enabled) || !empty($conf->accounting->enabled)), 'position'=>20),
+	'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),
@@ -569,7 +569,7 @@ foreach ($accounts as $key => $type) {
 	// Account number
 	if (!empty($arrayfields['b.account_number']['checked'])) {
 		print '<td class="tdoverflowmax250">';
-		if (!empty($conf->accounting->enabled) && !empty($objecttmp->account_number)) {
+		if (isModEnabled('accounting') && !empty($objecttmp->account_number)) {
 			$accountingaccount = new AccountingAccount($db);
 			$accountingaccount->fetch('', $objecttmp->account_number, 1);
 			print '<span title="'.dol_escape_htmltag($accountingaccount->account_number.' - '.$accountingaccount->label).'">';
@@ -587,7 +587,7 @@ foreach ($accounts as $key => $type) {
 	// Accountancy journal
 	if (!empty($arrayfields['b.fk_accountancy_journal']['checked'])) {
 		print '<td class="tdoverflowmax125">';
-		if (!empty($conf->accounting->enabled)) {
+		if (isModEnabled('accounting')) {
 			if (empty($objecttmp->fk_accountancy_journal)) {
 				print img_warning($langs->trans("Mandatory"));
 			} else {

From 20a4e5219233db25b35a0ec7e35af0a97e704850 Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Mon, 29 Aug 2022 11:22:04 +0200
Subject: [PATCH 251/974] Use isModEnabled

---
 htdocs/compta/bank/various_payment/card.php | 28 ++++++++++-----------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/htdocs/compta/bank/various_payment/card.php b/htdocs/compta/bank/various_payment/card.php
index b135daa8f00..3bb6435be0d 100644
--- a/htdocs/compta/bank/various_payment/card.php
+++ b/htdocs/compta/bank/various_payment/card.php
@@ -30,7 +30,7 @@ require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.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.'/accountancy/class/accountingjournal.class.php';
-if (!empty($conf->project->enabled)) {
+if (isModEnabled('project')) {
 	require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 	require_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php';
 }
@@ -52,7 +52,7 @@ $amount = price2num(GETPOST("amount", "alpha"));
 $paymenttype = GETPOST("paymenttype", "aZ09");
 $accountancy_code = GETPOST("accountancy_code", "alpha");
 $projectid = (GETPOST('projectid', 'int') ? GETPOST('projectid', 'int') : GETPOST('fk_project', 'int'));
-if (!empty($conf->accounting->enabled) && !empty($conf->global->ACCOUNTANCY_COMBO_FOR_AUX)) {
+if (isModEnabled('accounting') && !empty($conf->global->ACCOUNTANCY_COMBO_FOR_AUX)) {
 	$subledger_account = GETPOST("subledger_account", "alpha") > 0 ? GETPOST("subledger_account", "alpha") : '';
 } else {
 	$subledger_account = GETPOST("subledger_account", "alpha");
@@ -139,7 +139,7 @@ if (empty($reshook)) {
 			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Amount")), null, 'errors');
 			$error++;
 		}
-		if (!empty($conf->banque->enabled) && !$object->accountid > 0) {
+		if (isModEnabled('banque') && !$object->accountid > 0) {
 			$langs->load('errors');
 			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("BankAccount")), null, 'errors');
 			$error++;
@@ -149,7 +149,7 @@ if (empty($reshook)) {
 			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("PaymentMode")), null, 'errors');
 			$error++;
 		}
-		if (!empty($conf->accounting->enabled) && !$object->accountancy_code) {
+		if (isModEnabled('accounting') && !$object->accountancy_code) {
 			$langs->load('errors');
 			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("AccountAccounting")), null, 'errors');
 			$error++;
@@ -308,10 +308,10 @@ if ($action == 'confirm_clone' && $confirm == 'yes' && ($user->rights->banque->m
 llxHeader("", $langs->trans("VariousPayment"));
 
 $form = new Form($db);
-if (!empty($conf->accounting->enabled)) {
+if (isModEnabled('accounting')) {
 	$formaccounting = new FormAccounting($db);
 }
-if (!empty($conf->project->enabled)) {
+if (isModEnabled('project')) {
 	$formproject = new FormProjets($db);
 }
 
@@ -409,7 +409,7 @@ if ($action == 'create') {
 	print '</td></tr>';
 
 	// Bank
-	if (!empty($conf->banque->enabled)) {
+	if (isModEnabled('banque')) {
 		print '<tr><td>';
 		print $form->editfieldkey('BankAccount', 'selectaccountid', '', $object, 0, 'string', '', 1).'</td><td>';
 		print img_picto('', 'bank_account', 'class="pictofixedwidth"');
@@ -424,7 +424,7 @@ if ($action == 'create') {
 	print '</tr>';
 
 	// Number
-	if (!empty($conf->banque->enabled)) {
+	if (isModEnabled('banque')) {
 		print '<tr><td><label for="num_payment">'.$langs->trans('Numero');
 		print ' <em>('.$langs->trans("ChequeOrTransferNumber").')</em>';
 		print '</label></td>';
@@ -444,7 +444,7 @@ if ($action == 'create') {
 	}
 
 	// Accountancy account
-	if (!empty($conf->accounting->enabled)) {
+	if (isModEnabled('accounting')) {
 		// TODO Remove the fieldrequired and allow instead to edit a various payment to enter accounting code
 		print '<tr><td class="titlefieldcreate fieldrequired">'.$langs->trans("AccountAccounting").'</td>';
 		print '<td>';
@@ -457,7 +457,7 @@ if ($action == 'create') {
 	}
 
 	// Subledger account
-	if (!empty($conf->accounting->enabled)) {
+	if (isModEnabled('accounting')) {
 		print '<tr><td>'.$langs->trans("SubledgerAccount").'</td>';
 		print '<td>';
 		if (!empty($conf->global->ACCOUNTANCY_COMBO_FOR_AUX)) {
@@ -481,7 +481,7 @@ if ($action == 'create') {
 	print '</td></tr>';
 
 	// Project
-	if (!empty($conf->project->enabled)) {
+	if (isModEnabled('project')) {
 		$formproject = new FormProjets($db);
 
 		// Associated project
@@ -553,7 +553,7 @@ if ($id) {
 
 	$morehtmlref = '<div class="refidno">';
 	// Project
-	if (!empty($conf->project->enabled)) {
+	if (isModEnabled('project')) {
 		$langs->load("projects");
 		$morehtmlref .= $langs->trans('Project').' ';
 		if ($user->rights->banque->modifier) {
@@ -621,7 +621,7 @@ if ($id) {
 	print '<tr><td class="nowrap">';
 	print $langs->trans("AccountAccounting");
 	print '</td><td>';
-	if (!empty($conf->accounting->enabled)) {
+	if (isModEnabled('accounting')) {
 		$accountingaccount = new AccountingAccount($db);
 		$accountingaccount->fetch('', $object->accountancy_code, 1);
 
@@ -638,7 +638,7 @@ if ($id) {
 	print $form->editfieldval('SubledgerAccount', 'subledger_account', $object->subledger_account, $object, (!$alreadyaccounted && $user->rights->banque->modifier), 'string', '', 0);
 	print '</td></tr>';
 
-	if (!empty($conf->banque->enabled)) {
+	if (isModEnabled('banque')) {
 		if ($object->fk_account > 0) {
 			$bankline = new AccountLine($db);
 			$bankline->fetch($object->fk_bank);

From c2b2d66662a09089a5e0fefb5c528477f4ffd10f Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Mon, 29 Aug 2022 11:22:10 +0200
Subject: [PATCH 252/974] Use isModEnabled

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

diff --git a/htdocs/compta/bank/various_payment/document.php b/htdocs/compta/bank/various_payment/document.php
index b7cb8ee6bbf..6cbfd596c44 100644
--- a/htdocs/compta/bank/various_payment/document.php
+++ b/htdocs/compta/bank/various_payment/document.php
@@ -97,7 +97,7 @@ if ($object->id) {
 
 	$morehtmlref = '<div class="refidno">';
 	// Project
-	if (!empty($conf->project->enabled)) {
+	if (isModEnabled('project')) {
 		$langs->load("projects");
 		$morehtmlref .= $langs->trans('Project').' : ';
 		if ($user->rights->banque->modifier && 0) {

From 93c69aaafff44eccfc4cc54e5a8a7a9dbef685b9 Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Mon, 29 Aug 2022 11:22:14 +0200
Subject: [PATCH 253/974] Use isModEnabled

---
 htdocs/compta/bank/various_payment/info.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/compta/bank/various_payment/info.php b/htdocs/compta/bank/various_payment/info.php
index b46ab36ddf6..51442fd20a1 100644
--- a/htdocs/compta/bank/various_payment/info.php
+++ b/htdocs/compta/bank/various_payment/info.php
@@ -57,7 +57,7 @@ print dol_get_fiche_head($head, 'info', $langs->trans("VariousPayment"), -1, $ob
 
 $morehtmlref = '<div class="refidno">';
 // Project
-if (!empty($conf->project->enabled)) {
+if (isModEnabled('project')) {
 	$langs->load("projects");
 	$morehtmlref .= $langs->trans('Project').' : ';
 	if ($user->rights->banque->modifier && 0) {

From dc059eccab5599280ad4e342582de2d485ce8ca1 Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Mon, 29 Aug 2022 11:22:21 +0200
Subject: [PATCH 254/974] Use isModEnabled

---
 htdocs/compta/bank/various_payment/list.php | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/htdocs/compta/bank/various_payment/list.php b/htdocs/compta/bank/various_payment/list.php
index 1118fcab70a..5f8380dd9d8 100644
--- a/htdocs/compta/bank/various_payment/list.php
+++ b/htdocs/compta/bank/various_payment/list.php
@@ -152,10 +152,10 @@ $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"=>!empty($conf->project->enabled)),
-	'bank'			=>array('label'=>"BankAccount", 'checked'=>1, 'position'=>300, "enabled"=>!empty($conf->banque->enabled)),
-	'entry'			=>array('label'=>"BankTransactionLine", 'checked'=>1, 'position'=>310, "enabled"=>!empty($conf->banque->enabled)),
-	'account'		=>array('label'=>"AccountAccountingShort", 'checked'=>1, 'position'=>400, "enabled"=>!empty($conf->accounting->enabled)),
-	'subledger'		=>array('label'=>"SubledgerAccount", 'checked'=>1, 'position'=>410, "enabled"=>!empty($conf->accounting->enabled)),
+	'bank'			=>array('label'=>"BankAccount", 'checked'=>1, 'position'=>300, "enabled"=>isModEnabled('banque')),
+	'entry'			=>array('label'=>"BankTransactionLine", 'checked'=>1, 'position'=>310, "enabled"=>isModEnabled('banque')),
+	'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),
 );
@@ -190,7 +190,7 @@ $form = new Form($db);
 if ($arrayfields['account']['checked'] || $arrayfields['subledger']['checked']) {
 	$formaccounting = new FormAccounting($db);
 }
-if ($arrayfields['bank']['checked'] && !empty($conf->accounting->enabled)) {
+if ($arrayfields['bank']['checked'] && isModEnabled('accounting')) {
 	$accountingjournal = new AccountingJournal($db);
 }
 if ($arrayfields['ref']['checked']) {
@@ -621,7 +621,7 @@ if ($resql) {
 				$accountstatic->ref = $obj->bref;
 				$accountstatic->number = $obj->bnumber;
 
-				if (!empty($conf->accounting->enabled)) {
+				if (isModEnabled('accounting')) {
 					$accountstatic->account_number = $obj->bank_account_number;
 					$accountingjournal->fetch($obj->accountancy_journal);
 					$accountstatic->accountancy_journal = $accountingjournal->getNomUrl(0, 1, 1, '', 1);

From a955f88bb6b89f50620a0aa174850175761fdf01 Mon Sep 17 00:00:00 2001
From: lmarcouiller <lucas.marcouiller@gmail.com>
Date: Mon, 29 Aug 2022 11:22:27 +0200
Subject: [PATCH 255/974] Fix : categhory view permission

---
 htdocs/categories/viewcat.php | 1211 +++++++++++++++++----------------
 1 file changed, 629 insertions(+), 582 deletions(-)

diff --git a/htdocs/categories/viewcat.php b/htdocs/categories/viewcat.php
index 5405b33d994..0e5da0735ce 100644
--- a/htdocs/categories/viewcat.php
+++ b/htdocs/categories/viewcat.php
@@ -487,753 +487,800 @@ $typeid = $type;
 
 // List of products or services (type is type of category)
 if ($type == Categorie::TYPE_PRODUCT) {
-	$permission = ($user->rights->produit->creer || $user->rights->service->creer);
+	if ($user->hasRight("product", "read")) {
+		$permission = ($user->rights->produit->creer || $user->rights->service->creer);
+
+		$prods = $object->getObjectsInCateg($type, 0, $limit, $offset);
+		if ($prods < 0) {
+			dol_print_error($db, $object->error, $object->errors);
+		} else {
+			// Form to add record into a category
+			$showclassifyform = 1;
+			if ($showclassifyform) {
+				print '<br>';
+				print '<form method="post" action="'.$_SERVER["PHP_SELF"].'">';
+				print '<input type="hidden" name="token" value="'.newToken().'">';
+				print '<input type="hidden" name="typeid" value="'.$typeid.'">';
+				print '<input type="hidden" name="type" value="'.$typeid.'">';
+				print '<input type="hidden" name="id" value="'.$object->id.'">';
+				print '<input type="hidden" name="action" value="addintocategory">';
+				print '<table class="noborder centpercent">';
+				print '<tr class="liste_titre"><td>';
+				print $langs->trans("AddProductServiceIntoCategory").' &nbsp;';
+				$form->select_produits('', 'elemid', '', 0, 0, -1, 2, '', 1);
+				print '<input type="submit" class="button buttongen" value="'.$langs->trans("ClassifyInCategory").'"></td>';
+				print '</tr>';
+				print '</table>';
+				print '</form>';
+			}
 
-	$prods = $object->getObjectsInCateg($type, 0, $limit, $offset);
-	if ($prods < 0) {
-		dol_print_error($db, $object->error, $object->errors);
-	} else {
-		// Form to add record into a category
-		$showclassifyform = 1;
-		if ($showclassifyform) {
-			print '<br>';
 			print '<form method="post" action="'.$_SERVER["PHP_SELF"].'">';
 			print '<input type="hidden" name="token" value="'.newToken().'">';
 			print '<input type="hidden" name="typeid" value="'.$typeid.'">';
 			print '<input type="hidden" name="type" value="'.$typeid.'">';
 			print '<input type="hidden" name="id" value="'.$object->id.'">';
-			print '<input type="hidden" name="action" value="addintocategory">';
-			print '<table class="noborder centpercent">';
-			print '<tr class="liste_titre"><td>';
-			print $langs->trans("AddProductServiceIntoCategory").' &nbsp;';
-			$form->select_produits('', 'elemid', '', 0, 0, -1, 2, '', 1);
-			print '<input type="submit" class="button buttongen" value="'.$langs->trans("ClassifyInCategory").'"></td>';
-			print '</tr>';
-			print '</table>';
-			print '</form>';
-		}
+			print '<input type="hidden" name="action" value="list">';
 
-		print '<form method="post" action="'.$_SERVER["PHP_SELF"].'">';
-		print '<input type="hidden" name="token" value="'.newToken().'">';
-		print '<input type="hidden" name="typeid" value="'.$typeid.'">';
-		print '<input type="hidden" name="type" value="'.$typeid.'">';
-		print '<input type="hidden" name="id" value="'.$object->id.'">';
-		print '<input type="hidden" name="action" value="list">';
-
-		print '<br>';
-		$param = '&limit='.$limit.'&id='.$id.'&type='.$type; $num = count($prods); $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);
-		print_barre_liste($langs->trans("ProductsAndServices"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'products', 0, $newcardbutton, '', $limit);
+			print '<br>';
+			$param = '&limit='.$limit.'&id='.$id.'&type='.$type; $num = count($prods); $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);
+			print_barre_liste($langs->trans("ProductsAndServices"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'products', 0, $newcardbutton, '', $limit);
 
 
-		print '<table class="noborder centpercent">'."\n";
-		print '<tr class="liste_titre"><td colspan="3">'.$langs->trans("Ref").'</td></tr>'."\n";
+			print '<table class="noborder centpercent">'."\n";
+			print '<tr class="liste_titre"><td colspan="3">'.$langs->trans("Ref").'</td></tr>'."\n";
 
-		if (count($prods) > 0) {
-			$i = 0;
-			foreach ($prods as $prod) {
-				$i++;
-				if ($i > $limit) {
-					break;
+			if (count($prods) > 0) {
+				$i = 0;
+				foreach ($prods as $prod) {
+					$i++;
+					if ($i > $limit) {
+						break;
+					}
+
+					print "\t".'<tr class="oddeven">'."\n";
+					print '<td class="nowrap" valign="top">';
+					print $prod->getNomUrl(1);
+					print "</td>\n";
+					print '<td class="tdtop">'.$prod->label."</td>\n";
+					// Link to delete from category
+					print '<td class="right">';
+					if ($permission) {
+						print "<a href= '".$_SERVER['PHP_SELF']."?".(empty($socid) ? 'id' : 'socid')."=".$object->id."&type=".$typeid."&action=unlink&token=".newToken()."&removeelem=".$prod->id."'>";
+						print $langs->trans("DeleteFromCat");
+						print img_picto($langs->trans("DeleteFromCat"), 'unlink', '', false, 0, 0, '', 'paddingleft');
+						print "</a>";
+					}
+					print '</td>';
+					print "</tr>\n";
 				}
-
-				print "\t".'<tr class="oddeven">'."\n";
-				print '<td class="nowrap" valign="top">';
-				print $prod->getNomUrl(1);
-				print "</td>\n";
-				print '<td class="tdtop">'.$prod->label."</td>\n";
-				// Link to delete from category
-				print '<td class="right">';
-				if ($permission) {
-					print "<a href= '".$_SERVER['PHP_SELF']."?".(empty($socid) ? 'id' : 'socid')."=".$object->id."&type=".$typeid."&action=unlink&token=".newToken()."&removeelem=".$prod->id."'>";
-					print $langs->trans("DeleteFromCat");
-					print img_picto($langs->trans("DeleteFromCat"), 'unlink', '', false, 0, 0, '', 'paddingleft');
-					print "</a>";
-				}
-				print '</td>';
-				print "</tr>\n";
+			} else {
+				print '<tr class="oddeven"><td colspan="2" class="opacitymedium">'.$langs->trans("ThisCategoryHasNoItems").'</td></tr>';
 			}
-		} else {
-			print '<tr class="oddeven"><td colspan="2" class="opacitymedium">'.$langs->trans("ThisCategoryHasNoItems").'</td></tr>';
-		}
-		print "</table>\n";
+			print "</table>\n";
 
-		print '</form>'."\n";
+			print '</form>'."\n";
+		}
+	} else {
+		print_barre_liste($langs->trans("ProductsAndServices"), null, $_SERVER["PHP_SELF"], '', '', '', '', '', '', 'products');
+		accessforbidden($langs->trans("NotEnoughPermissions"), 0, 0);
 	}
 }
 
 // List of customers
 if ($type == Categorie::TYPE_CUSTOMER) {
-	$permission = $user->rights->societe->creer;
+	if ($user->hasRight("societe", "read")) {
+		$permission = $user->rights->societe->creer;
+
+		$socs = $object->getObjectsInCateg($type, 0, $limit, $offset);
+		if ($socs < 0) {
+			dol_print_error($db, $object->error, $object->errors);
+		} else {
+			// Form to add record into a category
+			$showclassifyform = 1;
+			if ($showclassifyform) {
+				print '<br>';
+				print '<form method="post" action="'.$_SERVER["PHP_SELF"].'">';
+				print '<input type="hidden" name="token" value="'.newToken().'">';
+				print '<input type="hidden" name="typeid" value="'.$typeid.'">';
+				print '<input type="hidden" name="type" value="'.$typeid.'">';
+				print '<input type="hidden" name="id" value="'.$object->id.'">';
+				print '<input type="hidden" name="action" value="addintocategory">';
+				print '<table class="noborder centpercent">';
+				print '<tr class="liste_titre"><td>';
+				print $langs->trans("AddCustomerIntoCategory").' &nbsp;';
+				print $form->select_company('', 'elemid', 's.client IN (1,3)');
+				print '<input type="submit" class="button buttongen" value="'.$langs->trans("ClassifyInCategory").'"></td>';
+				print '</tr>';
+				print '</table>';
+				print '</form>';
+			}
 
-	$socs = $object->getObjectsInCateg($type, 0, $limit, $offset);
-	if ($socs < 0) {
-		dol_print_error($db, $object->error, $object->errors);
-	} else {
-		// Form to add record into a category
-		$showclassifyform = 1;
-		if ($showclassifyform) {
-			print '<br>';
 			print '<form method="post" action="'.$_SERVER["PHP_SELF"].'">';
 			print '<input type="hidden" name="token" value="'.newToken().'">';
 			print '<input type="hidden" name="typeid" value="'.$typeid.'">';
 			print '<input type="hidden" name="type" value="'.$typeid.'">';
 			print '<input type="hidden" name="id" value="'.$object->id.'">';
-			print '<input type="hidden" name="action" value="addintocategory">';
-			print '<table class="noborder centpercent">';
-			print '<tr class="liste_titre"><td>';
-			print $langs->trans("AddCustomerIntoCategory").' &nbsp;';
-			print $form->select_company('', 'elemid', 's.client IN (1,3)');
-			print '<input type="submit" class="button buttongen" value="'.$langs->trans("ClassifyInCategory").'"></td>';
-			print '</tr>';
-			print '</table>';
-			print '</form>';
-		}
+			print '<input type="hidden" name="action" value="list">';
 
-		print '<form method="post" action="'.$_SERVER["PHP_SELF"].'">';
-		print '<input type="hidden" name="token" value="'.newToken().'">';
-		print '<input type="hidden" name="typeid" value="'.$typeid.'">';
-		print '<input type="hidden" name="type" value="'.$typeid.'">';
-		print '<input type="hidden" name="id" value="'.$object->id.'">';
-		print '<input type="hidden" name="action" value="list">';
+			print '<br>';
+			$param = '&limit='.$limit.'&id='.$id.'&type='.$type; $num = count($socs); $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);
+			print_barre_liste($langs->trans("Customers"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'companies', 0, $newcardbutton, '', $limit);
 
-		print '<br>';
-		$param = '&limit='.$limit.'&id='.$id.'&type='.$type; $num = count($socs); $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);
-		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";
+			print '<tr class="liste_titre"><td colspan="2">'.$langs->trans("Name").'</td></tr>'."\n";
 
-		print '<table class="noborder centpercent">'."\n";
-		print '<tr class="liste_titre"><td colspan="2">'.$langs->trans("Name").'</td></tr>'."\n";
+			if (count($socs) > 0) {
+				$i = 0;
+				foreach ($socs as $key => $soc) {
+					$i++;
+					if ($i > $limit) {
+						break;
+					}
 
-		if (count($socs) > 0) {
-			$i = 0;
-			foreach ($socs as $key => $soc) {
-				$i++;
-				if ($i > $limit) {
-					break;
+					print "\t".'<tr class="oddeven">'."\n";
+					print '<td class="nowrap" valign="top">';
+					print $soc->getNomUrl(1);
+					print "</td>\n";
+					// Link to delete from category
+					print '<td class="right">';
+					if ($permission) {
+						print "<a href= '".$_SERVER['PHP_SELF']."?".(empty($socid) ? 'id' : 'socid')."=".$object->id."&type=".$typeid."&action=unlink&token=".newToken()."&removeelem=".$soc->id."'>";
+						print $langs->trans("DeleteFromCat");
+						print img_picto($langs->trans("DeleteFromCat"), 'unlink', '', false, 0, 0, '', 'paddingleft');
+						print "</a>";
+					}
+					print '</td>';
+					print "</tr>\n";
 				}
-
-				print "\t".'<tr class="oddeven">'."\n";
-				print '<td class="nowrap" valign="top">';
-				print $soc->getNomUrl(1);
-				print "</td>\n";
-				// Link to delete from category
-				print '<td class="right">';
-				if ($permission) {
-					print "<a href= '".$_SERVER['PHP_SELF']."?".(empty($socid) ? 'id' : 'socid')."=".$object->id."&type=".$typeid."&action=unlink&token=".newToken()."&removeelem=".$soc->id."'>";
-					print $langs->trans("DeleteFromCat");
-					print img_picto($langs->trans("DeleteFromCat"), 'unlink', '', false, 0, 0, '', 'paddingleft');
-					print "</a>";
-				}
-				print '</td>';
-				print "</tr>\n";
+			} else {
+				print '<tr class="oddeven"><td colspan="2" class="opacitymedium">'.$langs->trans("ThisCategoryHasNoItems").'</td></tr>';
 			}
-		} else {
-			print '<tr class="oddeven"><td colspan="2" class="opacitymedium">'.$langs->trans("ThisCategoryHasNoItems").'</td></tr>';
-		}
-		print "</table>\n";
+			print "</table>\n";
 
-		print '</form>'."\n";
+			print '</form>'."\n";
+		}
+	} else {
+		print_barre_liste($langs->trans("Customers"), null, $_SERVER["PHP_SELF"], '', '', '', '', '', '', 'companies');
+		accessforbidden($langs->trans("NotEnoughPermissions"), 0, 0);
 	}
 }
 
 // List of suppliers
 if ($type == Categorie::TYPE_SUPPLIER) {
-	$permission = $user->rights->societe->creer;
+	if ($user->hasRight("fournisseur", "read")) {
+		$permission = $user->rights->societe->creer;
+
+		$socs = $object->getObjectsInCateg($type, 0, $limit, $offset);
+		if ($socs < 0) {
+			dol_print_error($db, $object->error, $object->errors);
+		} else {
+			// Form to add record into a category
+			$showclassifyform = 1;
+			if ($showclassifyform) {
+				print '<br>';
+				print '<form method="post" action="'.$_SERVER["PHP_SELF"].'">';
+				print '<input type="hidden" name="token" value="'.newToken().'">';
+				print '<input type="hidden" name="typeid" value="'.$typeid.'">';
+				print '<input type="hidden" name="type" value="'.$typeid.'">';
+				print '<input type="hidden" name="id" value="'.$object->id.'">';
+				print '<input type="hidden" name="action" value="addintocategory">';
+				print '<table class="noborder centpercent">';
+				print '<tr class="liste_titre"><td>';
+				print $langs->trans("AddSupplierIntoCategory").' &nbsp;';
+				print $form->select_company('', 'elemid', 's.fournisseur = 1');
+				print '<input type="submit" class="button buttongen" value="'.$langs->trans("ClassifyInCategory").'"></td>';
+				print '</tr>';
+				print '</table>';
+				print '</form>';
+			}
 
-	$socs = $object->getObjectsInCateg($type, 0, $limit, $offset);
-	if ($socs < 0) {
-		dol_print_error($db, $object->error, $object->errors);
-	} else {
-		// Form to add record into a category
-		$showclassifyform = 1;
-		if ($showclassifyform) {
-			print '<br>';
 			print '<form method="post" action="'.$_SERVER["PHP_SELF"].'">';
 			print '<input type="hidden" name="token" value="'.newToken().'">';
 			print '<input type="hidden" name="typeid" value="'.$typeid.'">';
 			print '<input type="hidden" name="type" value="'.$typeid.'">';
 			print '<input type="hidden" name="id" value="'.$object->id.'">';
-			print '<input type="hidden" name="action" value="addintocategory">';
-			print '<table class="noborder centpercent">';
-			print '<tr class="liste_titre"><td>';
-			print $langs->trans("AddSupplierIntoCategory").' &nbsp;';
-			print $form->select_company('', 'elemid', 's.fournisseur = 1');
-			print '<input type="submit" class="button buttongen" value="'.$langs->trans("ClassifyInCategory").'"></td>';
-			print '</tr>';
-			print '</table>';
-			print '</form>';
-		}
+			print '<input type="hidden" name="action" value="list">';
 
-		print '<form method="post" action="'.$_SERVER["PHP_SELF"].'">';
-		print '<input type="hidden" name="token" value="'.newToken().'">';
-		print '<input type="hidden" name="typeid" value="'.$typeid.'">';
-		print '<input type="hidden" name="type" value="'.$typeid.'">';
-		print '<input type="hidden" name="id" value="'.$object->id.'">';
-		print '<input type="hidden" name="action" value="list">';
+			print '<br>';
+			$param = '&limit='.$limit.'&id='.$id.'&type='.$type; $num = count($socs); $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);
+			print_barre_liste($langs->trans("Suppliers"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'companies', 0, $newcardbutton, '', $limit);
 
-		print '<br>';
-		$param = '&limit='.$limit.'&id='.$id.'&type='.$type; $num = count($socs); $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);
-		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";
+			print '<tr class="liste_titre"><td colspan="2">'.$langs->trans("Name")."</td></tr>\n";
 
-		print '<table class="noborder centpercent">'."\n";
-		print '<tr class="liste_titre"><td colspan="2">'.$langs->trans("Name")."</td></tr>\n";
+			if (count($socs) > 0) {
+				$i = 0;
+				foreach ($socs as $soc) {
+					$i++;
+					if ($i > $limit) {
+						break;
+					}
 
-		if (count($socs) > 0) {
-			$i = 0;
-			foreach ($socs as $soc) {
-				$i++;
-				if ($i > $limit) {
-					break;
+					print "\t".'<tr class="oddeven">'."\n";
+					print '<td class="nowrap" valign="top">';
+					print $soc->getNomUrl(1);
+					print "</td>\n";
+					// Link to delete from category
+					print '<td class="right">';
+					if ($permission) {
+						print "<a href= '".$_SERVER['PHP_SELF']."?".(empty($socid) ? 'id' : 'socid')."=".$object->id."&type=".$typeid."&action=unlink&token=".newToken()."&removeelem=".$soc->id."'>";
+						print $langs->trans("DeleteFromCat");
+						print img_picto($langs->trans("DeleteFromCat"), 'unlink', '', false, 0, 0, '', 'paddingleft');
+						print "</a>";
+					}
+					print '</td>';
+
+					print "</tr>\n";
 				}
-
-				print "\t".'<tr class="oddeven">'."\n";
-				print '<td class="nowrap" valign="top">';
-				print $soc->getNomUrl(1);
-				print "</td>\n";
-				// Link to delete from category
-				print '<td class="right">';
-				if ($permission) {
-					print "<a href= '".$_SERVER['PHP_SELF']."?".(empty($socid) ? 'id' : 'socid')."=".$object->id."&type=".$typeid."&action=unlink&token=".newToken()."&removeelem=".$soc->id."'>";
-					print $langs->trans("DeleteFromCat");
-					print img_picto($langs->trans("DeleteFromCat"), 'unlink', '', false, 0, 0, '', 'paddingleft');
-					print "</a>";
-				}
-				print '</td>';
-
-				print "</tr>\n";
+			} else {
+				print '<tr class="oddeven"><td colspan="2" class="opacitymedium">'.$langs->trans("ThisCategoryHasNoItems").'</td></tr>';
 			}
-		} else {
-			print '<tr class="oddeven"><td colspan="2" class="opacitymedium">'.$langs->trans("ThisCategoryHasNoItems").'</td></tr>';
-		}
-		print "</table>\n";
+			print "</table>\n";
 
-		print '</form>'."\n";
+			print '</form>'."\n";
+		}
+	} else {
+		print_barre_liste($langs->trans("Suppliers"), null, $_SERVER["PHP_SELF"], '', '', '', '', '', '', 'companies');
+		accessforbidden($langs->trans("NotEnoughPermissions"), 0, 0);
 	}
 }
 
 // List of members
 if ($type == Categorie::TYPE_MEMBER) {
-	require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
+	if ($user->hasRight("adherent", "read")) {
+		require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
 
-	$permission = $user->rights->adherent->creer;
+		$permission = $user->rights->adherent->creer;
+
+		$prods = $object->getObjectsInCateg($type, 0, $limit, $offset);
+		if ($prods < 0) {
+			dol_print_error($db, $object->error, $object->errors);
+		} else {
+			// Form to add record into a category
+			$showclassifyform = 1;
+			if ($showclassifyform) {
+				print '<br>';
+				print '<form method="post" action="'.$_SERVER["PHP_SELF"].'">';
+				print '<input type="hidden" name="token" value="'.newToken().'">';
+				print '<input type="hidden" name="typeid" value="'.$typeid.'">';
+				print '<input type="hidden" name="type" value="'.$typeid.'">';
+				print '<input type="hidden" name="id" value="'.$object->id.'">';
+				print '<input type="hidden" name="action" value="addintocategory">';
+				print '<table class="noborder centpercent">';
+				print '<tr class="liste_titre"><td>';
+				print $langs->trans("AssignCategoryTo").' &nbsp;';
+				print $form->selectMembers('', 'elemid');
+				print '<input type="submit" class="button buttongen" value="'.$langs->trans("Save").'"></td>';
+				print '</tr>';
+				print '</table>';
+				print '</form>';
+			}
 
-	$prods = $object->getObjectsInCateg($type, 0, $limit, $offset);
-	if ($prods < 0) {
-		dol_print_error($db, $object->error, $object->errors);
-	} else {
-		// Form to add record into a category
-		$showclassifyform = 1;
-		if ($showclassifyform) {
-			print '<br>';
 			print '<form method="post" action="'.$_SERVER["PHP_SELF"].'">';
 			print '<input type="hidden" name="token" value="'.newToken().'">';
 			print '<input type="hidden" name="typeid" value="'.$typeid.'">';
 			print '<input type="hidden" name="type" value="'.$typeid.'">';
 			print '<input type="hidden" name="id" value="'.$object->id.'">';
-			print '<input type="hidden" name="action" value="addintocategory">';
-			print '<table class="noborder centpercent">';
-			print '<tr class="liste_titre"><td>';
-			print $langs->trans("AssignCategoryTo").' &nbsp;';
-			print $form->selectMembers('', 'elemid');
-			print '<input type="submit" class="button buttongen" value="'.$langs->trans("Save").'"></td>';
-			print '</tr>';
-			print '</table>';
-			print '</form>';
-		}
+			print '<input type="hidden" name="action" value="list">';
 
-		print '<form method="post" action="'.$_SERVER["PHP_SELF"].'">';
-		print '<input type="hidden" name="token" value="'.newToken().'">';
-		print '<input type="hidden" name="typeid" value="'.$typeid.'">';
-		print '<input type="hidden" name="type" value="'.$typeid.'">';
-		print '<input type="hidden" name="id" value="'.$object->id.'">';
-		print '<input type="hidden" name="action" value="list">';
+			print '<br>';
+			$param = '&limit='.$limit.'&id='.$id.'&type='.$type; $num = count($prods); $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->rights->adherent->creer);
+			print_barre_liste($langs->trans("Member"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'members', 0, $newcardbutton, '', $limit);
 
-		print '<br>';
-		$param = '&limit='.$limit.'&id='.$id.'&type='.$type; $num = count($prods); $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->rights->adherent->creer);
-		print_barre_liste($langs->trans("Member"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'members', 0, $newcardbutton, '', $limit);
+			print "<table class='noborder' width='100%'>\n";
+			print '<tr class="liste_titre"><td colspan="4">'.$langs->trans("Name").'</td></tr>'."\n";
 
-		print "<table class='noborder' width='100%'>\n";
-		print '<tr class="liste_titre"><td colspan="4">'.$langs->trans("Name").'</td></tr>'."\n";
+			if (count($prods) > 0) {
+				$i = 0;
+				foreach ($prods as $key => $member) {
+					$i++;
+					if ($i > $limit) {
+						break;
+					}
 
-		if (count($prods) > 0) {
-			$i = 0;
-			foreach ($prods as $key => $member) {
-				$i++;
-				if ($i > $limit) {
-					break;
+					print "\t".'<tr class="oddeven">'."\n";
+					print '<td class="nowrap" valign="top">';
+					$member->ref = $member->login;
+					print $member->getNomUrl(1, 0);
+					print "</td>\n";
+					print '<td class="tdtop">'.$member->lastname."</td>\n";
+					print '<td class="tdtop">'.$member->firstname."</td>\n";
+					// Link to delete from category
+					print '<td class="right">';
+					if ($permission) {
+						print "<a href= '".$_SERVER['PHP_SELF']."?".(empty($socid) ? 'id' : 'socid')."=".$object->id."&type=".$typeid."&action=unlink&token=".newToken()."&removeelem=".$member->id."'>";
+						print $langs->trans("DeleteFromCat");
+						print img_picto($langs->trans("DeleteFromCat"), 'unlink', '', false, 0, 0, '', 'paddingleft');
+						print "</a>";
+					}
+					print "</tr>\n";
 				}
-
-				print "\t".'<tr class="oddeven">'."\n";
-				print '<td class="nowrap" valign="top">';
-				$member->ref = $member->login;
-				print $member->getNomUrl(1, 0);
-				print "</td>\n";
-				print '<td class="tdtop">'.$member->lastname."</td>\n";
-				print '<td class="tdtop">'.$member->firstname."</td>\n";
-				// Link to delete from category
-				print '<td class="right">';
-				if ($permission) {
-					print "<a href= '".$_SERVER['PHP_SELF']."?".(empty($socid) ? 'id' : 'socid')."=".$object->id."&type=".$typeid."&action=unlink&token=".newToken()."&removeelem=".$member->id."'>";
-					print $langs->trans("DeleteFromCat");
-					print img_picto($langs->trans("DeleteFromCat"), 'unlink', '', false, 0, 0, '', 'paddingleft');
-					print "</a>";
-				}
-				print "</tr>\n";
+			} else {
+				print '<tr class="oddeven"><td colspan="3" class="opacitymedium">'.$langs->trans("ThisCategoryHasNoItems").'</td></tr>';
 			}
-		} else {
-			print '<tr class="oddeven"><td colspan="3" class="opacitymedium">'.$langs->trans("ThisCategoryHasNoItems").'</td></tr>';
-		}
-		print "</table>\n";
+			print "</table>\n";
 
-		print '</form>'."\n";
+			print '</form>'."\n";
+		}
+	} else {
+		print_barre_liste($langs->trans("Member"), null, $_SERVER["PHP_SELF"], '', '', '', '', '', '', 'members');
+		accessforbidden($langs->trans("NotEnoughPermissions"), 0, 0);
 	}
 }
 
 // List of contacts
 if ($type == Categorie::TYPE_CONTACT) {
-	$permission = $user->rights->societe->creer;
+	if ($user->hasRight("societe", "read")) {
+		$permission = $user->rights->societe->creer;
 
-	$contacts = $object->getObjectsInCateg($type, 0, $limit, $offset);
-	if (is_numeric($contacts) && $contacts < 0) {
-		dol_print_error($db, $object->error, $object->errors);
-	} else {
-		// Form to add record into a category
-		$showclassifyform = 1;
-		if ($showclassifyform) {
-			print '<br>';
+		$contacts = $object->getObjectsInCateg($type, 0, $limit, $offset);
+		if (is_numeric($contacts) && $contacts < 0) {
+			dol_print_error($db, $object->error, $object->errors);
+		} else {
+			// Form to add record into a category
+			$showclassifyform = 1;
+			if ($showclassifyform) {
+				print '<br>';
+				print '<form method="post" action="'.$_SERVER["PHP_SELF"].'">';
+				print '<input type="hidden" name="token" value="'.newToken().'">';
+				print '<input type="hidden" name="typeid" value="'.$typeid.'">';
+				print '<input type="hidden" name="type" value="'.$typeid.'">';
+				print '<input type="hidden" name="id" value="'.$object->id.'">';
+				print '<input type="hidden" name="action" value="addintocategory">';
+				print '<table class="noborder centpercent">';
+				print '<tr class="liste_titre"><td>';
+				print $langs->trans("AssignCategoryTo").' &nbsp;';
+				print $form->selectContacts('', '', 'elemid');
+				print '<input type="submit" class="button buttongen" value="'.$langs->trans("ClassifyInCategory").'"></td>';
+				print '</tr>';
+				print '</table>';
+				print '</form>';
+			}
 			print '<form method="post" action="'.$_SERVER["PHP_SELF"].'">';
 			print '<input type="hidden" name="token" value="'.newToken().'">';
 			print '<input type="hidden" name="typeid" value="'.$typeid.'">';
 			print '<input type="hidden" name="type" value="'.$typeid.'">';
 			print '<input type="hidden" name="id" value="'.$object->id.'">';
-			print '<input type="hidden" name="action" value="addintocategory">';
-			print '<table class="noborder centpercent">';
-			print '<tr class="liste_titre"><td>';
-			print $langs->trans("AssignCategoryTo").' &nbsp;';
-			print $form->selectContacts('', '', 'elemid');
-			print '<input type="submit" class="button buttongen" value="'.$langs->trans("ClassifyInCategory").'"></td>';
-			print '</tr>';
-			print '</table>';
-			print '</form>';
-		}
-		print '<form method="post" action="'.$_SERVER["PHP_SELF"].'">';
-		print '<input type="hidden" name="token" value="'.newToken().'">';
-		print '<input type="hidden" name="typeid" value="'.$typeid.'">';
-		print '<input type="hidden" name="type" value="'.$typeid.'">';
-		print '<input type="hidden" name="id" value="'.$object->id.'">';
-		print '<input type="hidden" name="action" value="list">';
+			print '<input type="hidden" name="action" value="list">';
 
-		print '<br>';
-		$param = '&limit='.$limit.'&id='.$id.'&type='.$type;
-		$num = count($contacts);
-		$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);
-		$objsoc = new Societe($db);
-		print_barre_liste($langs->trans("Contact"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'contact', 0, $newcardbutton, '', $limit);
+			print '<br>';
+			$param = '&limit='.$limit.'&id='.$id.'&type='.$type;
+			$num = count($contacts);
+			$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);
+			$objsoc = new Societe($db);
+			print_barre_liste($langs->trans("Contact"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'contact', 0, $newcardbutton, '', $limit);
 
-		print '<table class="noborder centpercent">'."\n";
-		print '<tr class="liste_titre"><td colspan="2">'.$langs->trans("Ref").'</td></tr>'."\n";
+			print '<table class="noborder centpercent">'."\n";
+			print '<tr class="liste_titre"><td colspan="2">'.$langs->trans("Ref").'</td></tr>'."\n";
 
-		if (is_array($contacts) && count($contacts) > 0) {
-			$i = 0;
-			foreach ($contacts as $key => $contact) {
-				$i++;
-				if ($i > $limit) {
-					break;
+			if (is_array($contacts) && count($contacts) > 0) {
+				$i = 0;
+				foreach ($contacts as $key => $contact) {
+					$i++;
+					if ($i > $limit) {
+						break;
+					}
+
+					print "\t".'<tr class="oddeven">'."\n";
+					print '<td class="nowrap" valign="top">';
+					print $contact->getNomUrl(1, 'category');
+					if ($contact->socid > 0) {
+						$objsoc->fetch($contact->socid);
+						print ' - ';
+						print $objsoc->getNomUrl(1, 'contact');
+					}
+					print "</td>\n";
+					// Link to delete from category
+					print '<td class="right">';
+					if ($permission) {
+						print "<a href= '".$_SERVER['PHP_SELF']."?".(empty($socid) ? 'id' : 'socid')."=".$object->id."&type=".$typeid."&action=unlink&token=".newToken()."&removeelem=".$contact->id."'>";
+						print $langs->trans("DeleteFromCat");
+						print img_picto($langs->trans("DeleteFromCat"), 'unlink', '', false, 0, 0, '', 'paddingleft');
+						print "</a>";
+					}
+					print '</td>';
+					print "</tr>\n";
 				}
-
-				print "\t".'<tr class="oddeven">'."\n";
-				print '<td class="nowrap" valign="top">';
-				print $contact->getNomUrl(1, 'category');
-				if ($contact->socid > 0) {
-					$objsoc->fetch($contact->socid);
-					print ' - ';
-					print $objsoc->getNomUrl(1, 'contact');
-				}
-				print "</td>\n";
-				// Link to delete from category
-				print '<td class="right">';
-				if ($permission) {
-					print "<a href= '".$_SERVER['PHP_SELF']."?".(empty($socid) ? 'id' : 'socid')."=".$object->id."&type=".$typeid."&action=unlink&token=".newToken()."&removeelem=".$contact->id."'>";
-					print $langs->trans("DeleteFromCat");
-					print img_picto($langs->trans("DeleteFromCat"), 'unlink', '', false, 0, 0, '', 'paddingleft');
-					print "</a>";
-				}
-				print '</td>';
-				print "</tr>\n";
+			} else {
+				print '<tr class="oddeven"><td colspan="2" class="opacitymedium">'.$langs->trans("ThisCategoryHasNoItems").'</td></tr>';
 			}
-		} else {
-			print '<tr class="oddeven"><td colspan="2" class="opacitymedium">'.$langs->trans("ThisCategoryHasNoItems").'</td></tr>';
-		}
-		print "</table>\n";
+			print "</table>\n";
 
-		print '</form>'."\n";
+			print '</form>'."\n";
+		}
+	} else {
+		print_barre_liste($langs->trans("Contact"), null, $_SERVER["PHP_SELF"], '', '', '', '', '', '', 'contact');
+		accessforbidden($langs->trans("NotEnoughPermissions"), 0, 0);
 	}
 }
 
 // List of bank accounts
 if ($type == Categorie::TYPE_ACCOUNT) {
-	require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
+	if ($user->hasRight("banque", "read")) {
+		require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
 
-	$permission = $user->rights->banque->creer;
+		$permission = $user->rights->banque->creer;
+
+		$accounts = $object->getObjectsInCateg($type, 0, $limit, $offset);
+		if ($accounts < 0) {
+			dol_print_error($db, $object->error, $object->errors);
+		} else {
+			// Form to add record into a category
+			$showclassifyform = 1;
+			if ($showclassifyform) {
+				print '<br>';
+				print '<form method="post" action="'.$_SERVER["PHP_SELF"].'">';
+				print '<input type="hidden" name="token" value="'.newToken().'">';
+				print '<input type="hidden" name="typeid" value="'.$typeid.'">';
+				print '<input type="hidden" name="type" value="'.$typeid.'">';
+				print '<input type="hidden" name="id" value="'.$object->id.'">';
+				print '<input type="hidden" name="action" value="addintocategory">';
+				print '<table class="noborder centpercent">';
+				print '<tr class="liste_titre"><td>';
+					print $langs->trans("AddAccountIntoCategory").' &nbsp;';
+				$form->select_comptes('', 'elemid');
+				print '<input type="submit" class="button buttongen" value="'.$langs->trans("ClassifyInCategory").'"></td>';
+				print '</tr>';
+				print '</table>';
+				print '</form>';
+			}
 
-	$accounts = $object->getObjectsInCateg($type, 0, $limit, $offset);
-	if ($accounts < 0) {
-		dol_print_error($db, $object->error, $object->errors);
-	} else {
-		// Form to add record into a category
-		$showclassifyform = 1;
-		if ($showclassifyform) {
-			print '<br>';
 			print '<form method="post" action="'.$_SERVER["PHP_SELF"].'">';
 			print '<input type="hidden" name="token" value="'.newToken().'">';
 			print '<input type="hidden" name="typeid" value="'.$typeid.'">';
 			print '<input type="hidden" name="type" value="'.$typeid.'">';
 			print '<input type="hidden" name="id" value="'.$object->id.'">';
-			print '<input type="hidden" name="action" value="addintocategory">';
-			print '<table class="noborder centpercent">';
-			print '<tr class="liste_titre"><td>';
-				print $langs->trans("AddAccountIntoCategory").' &nbsp;';
-			$form->select_comptes('', 'elemid');
-			print '<input type="submit" class="button buttongen" value="'.$langs->trans("ClassifyInCategory").'"></td>';
-			print '</tr>';
-			print '</table>';
-			print '</form>';
-		}
+			print '<input type="hidden" name="action" value="list">';
 
-		print '<form method="post" action="'.$_SERVER["PHP_SELF"].'">';
-		print '<input type="hidden" name="token" value="'.newToken().'">';
-		print '<input type="hidden" name="typeid" value="'.$typeid.'">';
-		print '<input type="hidden" name="type" value="'.$typeid.'">';
-		print '<input type="hidden" name="id" value="'.$object->id.'">';
-		print '<input type="hidden" name="action" value="list">';
+			print '<br>';
+			$param = '&limit='.$limit.'&id='.$id.'&type='.$type; $num = count($accounts); $nbtotalofrecords = ''; $newcardbutton = '';
+			print_barre_liste($langs->trans("Account"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'bank_account', 0, $newcardbutton, '', $limit);
 
-		print '<br>';
-		$param = '&limit='.$limit.'&id='.$id.'&type='.$type; $num = count($accounts); $nbtotalofrecords = ''; $newcardbutton = '';
-		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' width='100%'>\n";
+			print '<tr class="liste_titre"><td colspan="4">'.$langs->trans("Ref").'</td></tr>'."\n";
 
-		print "<table class='noborder' width='100%'>\n";
-		print '<tr class="liste_titre"><td colspan="4">'.$langs->trans("Ref").'</td></tr>'."\n";
+			if (count($accounts) > 0) {
+				$i = 0;
+				foreach ($accounts as $key => $account) {
+					$i++;
+					if ($i > $limit) {
+						break;
+					}
 
-		if (count($accounts) > 0) {
-			$i = 0;
-			foreach ($accounts as $key => $account) {
-				$i++;
-				if ($i > $limit) {
-					break;
+					print "\t".'<tr class="oddeven">'."\n";
+					print '<td class="nowrap" valign="top">';
+					print $account->getNomUrl(1, 0);
+					print "</td>\n";
+					print '<td class="tdtop">'.$account->bank."</td>\n";
+					print '<td class="tdtop">'.$account->number."</td>\n";
+					// Link to delete from category
+					print '<td class="right">';
+					if ($permission) {
+						print "<a href= '".$_SERVER['PHP_SELF']."?".(empty($socid) ? 'id' : 'socid')."=".$object->id."&type=".$typeid."&action=unlink&token=".newToken()."&removeelem=".$account->id."'>";
+						print $langs->trans("DeleteFromCat");
+						print img_picto($langs->trans("DeleteFromCat"), 'unlink', '', false, 0, 0, '', 'paddingleft');
+						print "</a>";
+					}
+					print "</tr>\n";
 				}
-
-				print "\t".'<tr class="oddeven">'."\n";
-				print '<td class="nowrap" valign="top">';
-				print $account->getNomUrl(1, 0);
-				print "</td>\n";
-				print '<td class="tdtop">'.$account->bank."</td>\n";
-				print '<td class="tdtop">'.$account->number."</td>\n";
-				// Link to delete from category
-				print '<td class="right">';
-				if ($permission) {
-					print "<a href= '".$_SERVER['PHP_SELF']."?".(empty($socid) ? 'id' : 'socid')."=".$object->id."&type=".$typeid."&action=unlink&token=".newToken()."&removeelem=".$account->id."'>";
-					print $langs->trans("DeleteFromCat");
-					print img_picto($langs->trans("DeleteFromCat"), 'unlink', '', false, 0, 0, '', 'paddingleft');
-					print "</a>";
-				}
-				print "</tr>\n";
+			} else {
+				print '<tr class="oddeven"><td colspan="3" class="opacitymedium">'.$langs->trans("ThisCategoryHasNoItems").'</td></tr>';
 			}
-		} else {
-			print '<tr class="oddeven"><td colspan="3" class="opacitymedium">'.$langs->trans("ThisCategoryHasNoItems").'</td></tr>';
-		}
-		print "</table>\n";
+			print "</table>\n";
 
-		print '</form>'."\n";
+			print '</form>'."\n";
+		}
+	} else {
+		print_barre_liste($langs->trans("Banque"), null, $_SERVER["PHP_SELF"], '', '', '', '', '', '', 'bank');
+		accessforbidden($langs->trans("NotEnoughPermissions"), 0, 0);
 	}
 }
 
 // List of Project
 if ($type == Categorie::TYPE_PROJECT) {
-	require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
+	if ($user->hasRight("project", "read")) {
+		require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 
-	$permission = $user->rights->projet->creer;
+		$permission = $user->rights->projet->creer;
+
+		$objects = $object->getObjectsInCateg($type, 0, $limit, $offset);
+		if ($objects < 0) {
+			dol_print_error($db, $object->error, $object->errors);
+		} else {
+			// Form to add record into a category
+			$showclassifyform = 1;
+			if ($showclassifyform) {
+				print '<br>';
+				print '<form method="post" action="'.$_SERVER["PHP_SELF"].'">';
+				print '<input type="hidden" name="token" value="'.newToken().'">';
+				print '<input type="hidden" name="typeid" value="'.$typeid.'">';
+				print '<input type="hidden" name="type" value="'.$typeid.'">';
+				print '<input type="hidden" name="id" value="'.$object->id.'">';
+				print '<input type="hidden" name="action" value="addintocategory">';
+				print '<table class="noborder centpercent">';
+				print '<tr class="liste_titre"><td>';
+				print $langs->trans("AddProjectIntoCategory").' &nbsp;';
+				$form->selectProjects('', 'elemid');
+				print '<input type="submit" class="button buttongen" value="'.$langs->trans("ClassifyInCategory").'"></td>';
+				print '</tr>';
+				print '</table>';
+				print '</form>';
+			}
 
-	$objects = $object->getObjectsInCateg($type, 0, $limit, $offset);
-	if ($objects < 0) {
-		dol_print_error($db, $object->error, $object->errors);
-	} else {
-		// Form to add record into a category
-		$showclassifyform = 1;
-		if ($showclassifyform) {
-			print '<br>';
 			print '<form method="post" action="'.$_SERVER["PHP_SELF"].'">';
 			print '<input type="hidden" name="token" value="'.newToken().'">';
 			print '<input type="hidden" name="typeid" value="'.$typeid.'">';
 			print '<input type="hidden" name="type" value="'.$typeid.'">';
 			print '<input type="hidden" name="id" value="'.$object->id.'">';
-			print '<input type="hidden" name="action" value="addintocategory">';
-			print '<table class="noborder centpercent">';
-			print '<tr class="liste_titre"><td>';
-			print $langs->trans("AddProjectIntoCategory").' &nbsp;';
-			$form->selectProjects('', 'elemid');
-			print '<input type="submit" class="button buttongen" value="'.$langs->trans("ClassifyInCategory").'"></td>';
-			print '</tr>';
-			print '</table>';
-			print '</form>';
-		}
+			print '<input type="hidden" name="action" value="list">';
 
-		print '<form method="post" action="'.$_SERVER["PHP_SELF"].'">';
-		print '<input type="hidden" name="token" value="'.newToken().'">';
-		print '<input type="hidden" name="typeid" value="'.$typeid.'">';
-		print '<input type="hidden" name="type" value="'.$typeid.'">';
-		print '<input type="hidden" name="id" value="'.$object->id.'">';
-		print '<input type="hidden" name="action" value="list">';
+			print '<br>';
+			$param = '&limit='.$limit.'&id='.$id.'&type='.$type; $num = count($objects); $nbtotalofrecords = ''; $newcardbutton = '';
 
-		print '<br>';
-		$param = '&limit='.$limit.'&id='.$id.'&type='.$type; $num = count($objects); $nbtotalofrecords = ''; $newcardbutton = '';
+			print_barre_liste($langs->trans("Project"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'project', 0, $newcardbutton, '', $limit);
 
-		print_barre_liste($langs->trans("Project"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'project', 0, $newcardbutton, '', $limit);
+			print "<table class='noborder' width='100%'>\n";
+			print '<tr class="liste_titre"><td colspan="4">'.$langs->trans("Ref").'</td></tr>'."\n";
 
-		print "<table class='noborder' width='100%'>\n";
-		print '<tr class="liste_titre"><td colspan="4">'.$langs->trans("Ref").'</td></tr>'."\n";
+			if (count($objects) > 0) {
+				$i = 0;
+				foreach ($objects as $key => $project) {
+					$i++;
+					if ($i > $limit) {
+						break;
+					}
 
-		if (count($objects) > 0) {
-			$i = 0;
-			foreach ($objects as $key => $project) {
-				$i++;
-				if ($i > $limit) {
-					break;
+					print "\t".'<tr class="oddeven">'."\n";
+					print '<td class="nowrap" valign="top">';
+					print $project->getNomUrl(1);
+					print "</td>\n";
+					print '<td class="tdtop">'.$project->ref."</td>\n";
+					print '<td class="tdtop">'.$project->title."</td>\n";
+					// Link to delete from category
+					print '<td class="right">';
+					if ($permission) {
+						print "<a href= '".$_SERVER['PHP_SELF']."?".(empty($socid) ? 'id' : 'socid')."=".$object->id."&type=".$typeid."&action=unlink&token=".newToken()."&removeelem=".$project->id."'>";
+						print $langs->trans("DeleteFromCat");
+						print img_picto($langs->trans("DeleteFromCat"), 'unlink', '', false, 0, 0, '', 'paddingleft');
+						print "</a>";
+					}
+					print "</tr>\n";
 				}
-
-				print "\t".'<tr class="oddeven">'."\n";
-				print '<td class="nowrap" valign="top">';
-				print $project->getNomUrl(1);
-				print "</td>\n";
-				print '<td class="tdtop">'.$project->ref."</td>\n";
-				print '<td class="tdtop">'.$project->title."</td>\n";
-				// Link to delete from category
-				print '<td class="right">';
-				if ($permission) {
-					print "<a href= '".$_SERVER['PHP_SELF']."?".(empty($socid) ? 'id' : 'socid')."=".$object->id."&type=".$typeid."&action=unlink&token=".newToken()."&removeelem=".$project->id."'>";
-					print $langs->trans("DeleteFromCat");
-					print img_picto($langs->trans("DeleteFromCat"), 'unlink', '', false, 0, 0, '', 'paddingleft');
-					print "</a>";
-				}
-				print "</tr>\n";
+			} else {
+				print '<tr class="oddeven"><td colspan="3" class="opacitymedium">'.$langs->trans("ThisCategoryHasNoItems").'</td></tr>';
 			}
-		} else {
-			print '<tr class="oddeven"><td colspan="3" class="opacitymedium">'.$langs->trans("ThisCategoryHasNoItems").'</td></tr>';
-		}
-		print "</table>\n";
+			print "</table>\n";
 
-		print '</form>'."\n";
+			print '</form>'."\n";
+		}
+	} else {
+		print_barre_liste($langs->trans("Project"), null, $_SERVER["PHP_SELF"], '', '', '', '', '', '', 'project');
+		accessforbidden($langs->trans("NotEnoughPermissions"), 0, 0);
 	}
 }
 
 // List of users
-if ($type == Categorie::TYPE_USER && $user->hasRight("user", "user", "read")) {
-	require_once DOL_DOCUMENT_ROOT.'/user/class/user.class.php';
+if ($type == Categorie::TYPE_USER) {
+	if ($user->hasRight("user", "user", "read")) {
+		require_once DOL_DOCUMENT_ROOT.'/user/class/user.class.php';
 
-	$users = $object->getObjectsInCateg($type);
-	if ($users < 0) {
-		dol_print_error($db, $object->error, $object->errors);
-	} else {
-		// Form to add record into a category
-		$showclassifyform = 1;
-		if ($showclassifyform) {
-			print '<br>';
+		$users = $object->getObjectsInCateg($type);
+		if ($users < 0) {
+			dol_print_error($db, $object->error, $object->errors);
+		} else {
+			// Form to add record into a category
+			$showclassifyform = 1;
+			if ($showclassifyform) {
+				print '<br>';
+				print '<form method="post" action="'.$_SERVER["PHP_SELF"].'">';
+				print '<input type="hidden" name="token" value="'.newToken().'">';
+				print '<input type="hidden" name="typeid" value="'.$typeid.'">';
+				print '<input type="hidden" name="type" value="'.$typeid.'">';
+				print '<input type="hidden" name="id" value="'.$object->id.'">';
+				print '<input type="hidden" name="action" value="addintocategory">';
+				print '<table class="noborder centpercent">';
+				print '<tr class="liste_titre"><td>';
+				print $langs->trans("AddObjectIntoCategory").' &nbsp;';
+				print $form->select_dolusers('', 'elemid');
+				print '<input type="submit" class="button buttongen" value="'.$langs->trans("ClassifyInCategory").'"></td>';
+				print '</tr>';
+				print '</table>';
+				print '</form>';
+			}
 			print '<form method="post" action="'.$_SERVER["PHP_SELF"].'">';
 			print '<input type="hidden" name="token" value="'.newToken().'">';
 			print '<input type="hidden" name="typeid" value="'.$typeid.'">';
 			print '<input type="hidden" name="type" value="'.$typeid.'">';
 			print '<input type="hidden" name="id" value="'.$object->id.'">';
-			print '<input type="hidden" name="action" value="addintocategory">';
-			print '<table class="noborder centpercent">';
-			print '<tr class="liste_titre"><td>';
-			print $langs->trans("AddObjectIntoCategory").' &nbsp;';
-			print $form->select_dolusers('', 'elemid');
-			print '<input type="submit" class="button buttongen" value="'.$langs->trans("ClassifyInCategory").'"></td>';
-			print '</tr>';
-			print '</table>';
-			print '</form>';
-		}
-		print '<form method="post" action="'.$_SERVER["PHP_SELF"].'">';
-		print '<input type="hidden" name="token" value="'.newToken().'">';
-		print '<input type="hidden" name="typeid" value="'.$typeid.'">';
-		print '<input type="hidden" name="type" value="'.$typeid.'">';
-		print '<input type="hidden" name="id" value="'.$object->id.'">';
-		print '<input type="hidden" name="action" value="list">';
+			print '<input type="hidden" name="action" value="list">';
 
-		print '<br>';
+			print '<br>';
 
-		$param = '&limit='.$limit.'&id='.$id.'&type='.$type;
-		$num = count($users);
+			$param = '&limit='.$limit.'&id='.$id.'&type='.$type;
+			$num = count($users);
 
-		print_barre_liste($langs->trans("Users"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, '', 'user', 0, '', '', $limit);
+			print_barre_liste($langs->trans("Users"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, '', 'user', 0, '', '', $limit);
 
-		print "<table class='noborder' width='100%'>\n";
-		print '<tr class="liste_titre"><td colspan="4">'.$langs->trans("Users").' <span class="badge">'.$num.'</span></td></tr>'."\n";
+			print "<table class='noborder' width='100%'>\n";
+			print '<tr class="liste_titre"><td colspan="4">'.$langs->trans("Users").' <span class="badge">'.$num.'</span></td></tr>'."\n";
 
-		if (count($users) > 0) {
-			// Use "$userentry" here, because "$user" is the current user
-			foreach ($users as $key => $userentry) {
-				print "\t".'<tr class="oddeven">'."\n";
-				print '<td class="nowrap" valign="top">';
-				print $userentry->getNomUrl(1);
-				print "</td>\n";
-				print '<td class="tdtop">'.$userentry->job."</td>\n";
+			if (count($users) > 0) {
+				// Use "$userentry" here, because "$user" is the current user
+				foreach ($users as $key => $userentry) {
+					print "\t".'<tr class="oddeven">'."\n";
+					print '<td class="nowrap" valign="top">';
+					print $userentry->getNomUrl(1);
+					print "</td>\n";
+					print '<td class="tdtop">'.$userentry->job."</td>\n";
 
-				// Link to delete from category
-				print '<td class="right">';
-				if ($user->rights->user->user->creer) {
-					print "<a href= '".$_SERVER['PHP_SELF']."?".(empty($socid) ? 'id' : 'socid')."=".$object->id."&type=".$type."&action=unlink&token=".newToken()."&removeelem=".$userentry->id."'>";
-					print $langs->trans("DeleteFromCat");
-					print img_picto($langs->trans("DeleteFromCat"), 'unlink', '', false, 0, 0, '', 'paddingleft');
-					print "</a>";
+					// Link to delete from category
+					print '<td class="right">';
+					if ($user->rights->user->user->creer) {
+						print "<a href= '".$_SERVER['PHP_SELF']."?".(empty($socid) ? 'id' : 'socid')."=".$object->id."&type=".$type."&action=unlink&token=".newToken()."&removeelem=".$userentry->id."'>";
+						print $langs->trans("DeleteFromCat");
+						print img_picto($langs->trans("DeleteFromCat"), 'unlink', '', false, 0, 0, '', 'paddingleft');
+						print "</a>";
+					}
+					print "</tr>\n";
 				}
-				print "</tr>\n";
+			} else {
+				print '<tr class="oddeven"><td colspan="3" class="opacitymedium">'.$langs->trans("ThisCategoryHasNoItems").'</td></tr>';
 			}
-		} else {
-			print '<tr class="oddeven"><td colspan="3" class="opacitymedium">'.$langs->trans("ThisCategoryHasNoItems").'</td></tr>';
-		}
-		print "</table>\n";
+			print "</table>\n";
 
-		print '</form>'."\n";
+			print '</form>'."\n";
+		}
+	} else {
+		print_barre_liste($langs->trans("Users"), null, $_SERVER["PHP_SELF"], '', '', '', '', '', '', 'user');
+		accessforbidden($langs->trans("NotEnoughPermissions"), 0, 0);
 	}
-} else {
-	print_barre_liste($langs->trans("Users"), null, $_SERVER["PHP_SELF"], '', '', '', '', '', '', 'user');
-	accessforbidden($langs->trans("NotEnoughPermissions"), 0, 0);
 }
 
 
 // List of warehouses
 if ($type == Categorie::TYPE_WAREHOUSE) {
-	$permission = $user->rights->stock->creer;
+	if ($user->hasRight("warehouse", "read")) {
+		$permission = $user->rights->stock->creer;
 
-	require_once DOL_DOCUMENT_ROOT.'/product/stock/class/entrepot.class.php';
+		require_once DOL_DOCUMENT_ROOT.'/product/stock/class/entrepot.class.php';
 
-	$objects = $object->getObjectsInCateg($type, 0, $limit, $offset);
-	if ($objects < 0) {
-		dol_print_error($db, $object->error, $object->errors);
-	} else {
-		print '<form method="post" action="'.$_SERVER["PHP_SELF"].'">';
-		print '<input type="hidden" name="token" value="'.newToken().'">';
-		print '<input type="hidden" name="typeid" value="'.$typeid.'">';
-		print '<input type="hidden" name="type" value="'.$typeid.'">';
-		print '<input type="hidden" name="id" value="'.$object->id.'">';
-		print '<input type="hidden" name="action" value="list">';
-
-		print '<br>';
-		$param = '&limit='.$limit.'&id='.$id.'&type='.$type; $num = count($objects); $nbtotalofrecords = ''; $newcardbutton = '';
-
-		print_barre_liste($langs->trans("Warehouses"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'stock', 0, $newcardbutton, '', $limit);
-
-		print "<table class='noborder' width='100%'>\n";
-		print '<tr class="liste_titre"><td colspan="4">'.$langs->trans("Ref").'</td></tr>'."\n";
-
-		if (count($objects) > 0) {
-			$i = 0;
-			foreach ($objects as $key => $project) {
-				$i++;
-				if ($i > $limit) {
-					break;
-				}
-
-				print "\t".'<tr class="oddeven">'."\n";
-				print '<td class="nowrap" valign="top">';
-				print $project->getNomUrl(1);
-				print "</td>\n";
-				print '<td class="tdtop">'.$project->ref."</td>\n";
-				print '<td class="tdtop">'.$project->title."</td>\n";
-				// Link to delete from category
-				print '<td class="right">';
-				if ($permission) {
-					print "<a href= '".$_SERVER['PHP_SELF']."?".(empty($socid) ? 'id' : 'socid')."=".$object->id."&type=".$typeid."&action=unlink&token=".newToken()."&removeelem=".$project->id."'>";
-					print $langs->trans("DeleteFromCat");
-					print img_picto($langs->trans("DeleteFromCat"), 'unlink', '', false, 0, 0, '', 'paddingleft');
-					print "</a>";
-				}
-				print "</tr>\n";
-			}
+		$objects = $object->getObjectsInCateg($type, 0, $limit, $offset);
+		if ($objects < 0) {
+			dol_print_error($db, $object->error, $object->errors);
 		} else {
-			print '<tr class="oddeven"><td colspan="3" class="opacitymedium">'.$langs->trans("ThisCategoryHasNoItems").'</td></tr>';
-		}
-		print "</table>\n";
-
-		print '</form>'."\n";
-	}
-}
-
-// List of tickets
-if ($type == Categorie::TYPE_TICKET) {
-	$permission = ($user->rights->categorie->creer || $user->rights->categorie->creer);
-
-	$tickets = $object->getObjectsInCateg($type, 0, $limit, $offset);
-	if ($tickets < 0) {
-		dol_print_error($db, $object->error, $object->errors);
-	} else {
-		// Form to add record into a category
-		$showclassifyform = 1;
-		if ($showclassifyform) {
-			print '<br>';
 			print '<form method="post" action="'.$_SERVER["PHP_SELF"].'">';
 			print '<input type="hidden" name="token" value="'.newToken().'">';
 			print '<input type="hidden" name="typeid" value="'.$typeid.'">';
 			print '<input type="hidden" name="type" value="'.$typeid.'">';
 			print '<input type="hidden" name="id" value="'.$object->id.'">';
-			print '<input type="hidden" name="action" value="addintocategory">';
-			print '<table class="noborder centpercent">';
-			print '<tr class="liste_titre"><td>';
-			print $langs->trans("AddTicketIntoCategory").' &nbsp;';
-			$form->selectTickets('', 'elemid');
-			print '<input type="submit" class="button buttongen" value="'.$langs->trans("ClassifyInCategory").'"></td>';
-			print '</tr>';
-			print '</table>';
-			print '</form>';
-		}
+			print '<input type="hidden" name="action" value="list">';
 
-		print '<form method="post" action="'.$_SERVER["PHP_SELF"].'">';
-		print '<input type="hidden" name="token" value="'.newToken().'">';
-		print '<input type="hidden" name="typeid" value="'.$typeid.'">';
-		print '<input type="hidden" name="type" value="'.$typeid.'">';
-		print '<input type="hidden" name="id" value="'.$object->id.'">';
-		print '<input type="hidden" name="action" value="list">';
+			print '<br>';
+			$param = '&limit='.$limit.'&id='.$id.'&type='.$type; $num = count($objects); $nbtotalofrecords = ''; $newcardbutton = '';
 
-		print '<br>';
-		$param = '&limit='.$limit.'&id='.$id.'&type='.$type; $num = count($tickets); $nbtotalofrecords = ''; $newcardbutton = '';
-		print_barre_liste($langs->trans("Ticket"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'ticket', 0, $newcardbutton, '', $limit);
+			print_barre_liste($langs->trans("Warehouses"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'stock', 0, $newcardbutton, '', $limit);
 
+			print "<table class='noborder' width='100%'>\n";
+			print '<tr class="liste_titre"><td colspan="4">'.$langs->trans("Ref").'</td></tr>'."\n";
 
-		print '<table class="noborder centpercent">'."\n";
-		print '<tr class="liste_titre"><td colspan="3">'.$langs->trans("Ref").'</td></tr>'."\n";
+			if (count($objects) > 0) {
+				$i = 0;
+				foreach ($objects as $key => $project) {
+					$i++;
+					if ($i > $limit) {
+						break;
+					}
 
-		if (count($tickets) > 0) {
-			$i = 0;
-			foreach ($tickets as $ticket) {
-				$i++;
-				if ($i > $limit) break;
-
-				print "\t".'<tr class="oddeven">'."\n";
-				print '<td class="nowrap" valign="top">';
-				print $ticket->getNomUrl(1);
-				print "</td>\n";
-				print '<td class="tdtop">'.$ticket->label."</td>\n";
-				// Link to delete from category
-				print '<td class="right">';
-				if ($permission) {
-					print "<a href= '".$_SERVER['PHP_SELF']."?".(empty($socid) ? 'id' : 'socid')."=".$object->id."&type=".$typeid."&action=unlink&token=".newToken()."&removeelem=".$ticket->id."'>";
-					print $langs->trans("DeleteFromCat");
-					print img_picto($langs->trans("DeleteFromCat"), 'unlink', '', false, 0, 0, '', 'paddingleft');
-					print "</a>";
+					print "\t".'<tr class="oddeven">'."\n";
+					print '<td class="nowrap" valign="top">';
+					print $project->getNomUrl(1);
+					print "</td>\n";
+					print '<td class="tdtop">'.$project->ref."</td>\n";
+					print '<td class="tdtop">'.$project->title."</td>\n";
+					// Link to delete from category
+					print '<td class="right">';
+					if ($permission) {
+						print "<a href= '".$_SERVER['PHP_SELF']."?".(empty($socid) ? 'id' : 'socid')."=".$object->id."&type=".$typeid."&action=unlink&token=".newToken()."&removeelem=".$project->id."'>";
+						print $langs->trans("DeleteFromCat");
+						print img_picto($langs->trans("DeleteFromCat"), 'unlink', '', false, 0, 0, '', 'paddingleft');
+						print "</a>";
+					}
+					print "</tr>\n";
 				}
-				print '</td>';
-				print "</tr>\n";
+			} else {
+				print '<tr class="oddeven"><td colspan="3" class="opacitymedium">'.$langs->trans("ThisCategoryHasNoItems").'</td></tr>';
 			}
-		} else {
-			print '<tr class="oddeven"><td colspan="2" class="opacitymedium">'.$langs->trans("ThisCategoryHasNoItems").'</td></tr>';
-		}
-		print "</table>\n";
+			print "</table>\n";
 
-		print '</form>'."\n";
+			print '</form>'."\n";
+		}
+	} else {
+		print_barre_liste($langs->trans("Warehouse"), null, $_SERVER["PHP_SELF"], '', '', '', '', '', '', 'stock');
+		accessforbidden($langs->trans("NotEnoughPermissions"), 0, 0);
+	}
+}
+
+// List of tickets
+if ($type == Categorie::TYPE_TICKET) {
+	if ($user->hasRight("ticket", "read")) {
+		$permission = ($user->rights->categorie->creer || $user->rights->categorie->creer);
+
+		$tickets = $object->getObjectsInCateg($type, 0, $limit, $offset);
+		if ($tickets < 0) {
+			dol_print_error($db, $object->error, $object->errors);
+		} else {
+			// Form to add record into a category
+			$showclassifyform = 1;
+			if ($showclassifyform) {
+				print '<br>';
+				print '<form method="post" action="'.$_SERVER["PHP_SELF"].'">';
+				print '<input type="hidden" name="token" value="'.newToken().'">';
+				print '<input type="hidden" name="typeid" value="'.$typeid.'">';
+				print '<input type="hidden" name="type" value="'.$typeid.'">';
+				print '<input type="hidden" name="id" value="'.$object->id.'">';
+				print '<input type="hidden" name="action" value="addintocategory">';
+				print '<table class="noborder centpercent">';
+				print '<tr class="liste_titre"><td>';
+				print $langs->trans("AddTicketIntoCategory").' &nbsp;';
+				$form->selectTickets('', 'elemid');
+				print '<input type="submit" class="button buttongen" value="'.$langs->trans("ClassifyInCategory").'"></td>';
+				print '</tr>';
+				print '</table>';
+				print '</form>';
+			}
+
+			print '<form method="post" action="'.$_SERVER["PHP_SELF"].'">';
+			print '<input type="hidden" name="token" value="'.newToken().'">';
+			print '<input type="hidden" name="typeid" value="'.$typeid.'">';
+			print '<input type="hidden" name="type" value="'.$typeid.'">';
+			print '<input type="hidden" name="id" value="'.$object->id.'">';
+			print '<input type="hidden" name="action" value="list">';
+
+			print '<br>';
+			$param = '&limit='.$limit.'&id='.$id.'&type='.$type; $num = count($tickets); $nbtotalofrecords = ''; $newcardbutton = '';
+			print_barre_liste($langs->trans("Ticket"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'ticket', 0, $newcardbutton, '', $limit);
+
+
+			print '<table class="noborder centpercent">'."\n";
+			print '<tr class="liste_titre"><td colspan="3">'.$langs->trans("Ref").'</td></tr>'."\n";
+
+			if (count($tickets) > 0) {
+				$i = 0;
+				foreach ($tickets as $ticket) {
+					$i++;
+					if ($i > $limit) break;
+
+					print "\t".'<tr class="oddeven">'."\n";
+					print '<td class="nowrap" valign="top">';
+					print $ticket->getNomUrl(1);
+					print "</td>\n";
+					print '<td class="tdtop">'.$ticket->label."</td>\n";
+					// Link to delete from category
+					print '<td class="right">';
+					if ($permission) {
+						print "<a href= '".$_SERVER['PHP_SELF']."?".(empty($socid) ? 'id' : 'socid')."=".$object->id."&type=".$typeid."&action=unlink&token=".newToken()."&removeelem=".$ticket->id."'>";
+						print $langs->trans("DeleteFromCat");
+						print img_picto($langs->trans("DeleteFromCat"), 'unlink', '', false, 0, 0, '', 'paddingleft');
+						print "</a>";
+					}
+					print '</td>';
+					print "</tr>\n";
+				}
+			} else {
+				print '<tr class="oddeven"><td colspan="2" class="opacitymedium">'.$langs->trans("ThisCategoryHasNoItems").'</td></tr>';
+			}
+			print "</table>\n";
+
+			print '</form>'."\n";
+		}
+	} else {
+		print_barre_liste($langs->trans("Ticket"), null, $_SERVER["PHP_SELF"], '', '', '', '', '', '', 'ticket');
+		accessforbidden($langs->trans("NotEnoughPermissions"), 0, 0);
 	}
 }
 

From b2ee6fdc2e2b816dc0cec062a36b12e7027e3ce4 Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Mon, 29 Aug 2022 11:22:31 +0200
Subject: [PATCH 256/974] Use isModEnabled

---
 htdocs/compta/charges/index.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/htdocs/compta/charges/index.php b/htdocs/compta/charges/index.php
index 169666477f4..bd675dd1e19 100644
--- a/htdocs/compta/charges/index.php
+++ b/htdocs/compta/charges/index.php
@@ -146,7 +146,7 @@ if (!empty($conf->tax->enabled) && $user->rights->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 (!empty($conf->banque->enabled)) {
+	if (isModEnabled('banque')) {
 		print_liste_field_titre("Account", $_SERVER["PHP_SELF"], "ba.label", "", $param, "", $sortfield, $sortorder);
 	}
 	print_liste_field_titre("PayedByThisPayment", $_SERVER["PHP_SELF"], "pc.amount", "", $param, 'class="right"', $sortfield, $sortorder);
@@ -220,7 +220,7 @@ if (!empty($conf->tax->enabled) && $user->rights->tax->charges->lire) {
 			}
 			print $obj->num_payment.'</td>';
 			// Account
-			if (!empty($conf->banque->enabled)) {
+			if (isModEnabled('banque')) {
 				print '<td>';
 				if ($obj->fk_bank > 0) {
 					//$accountstatic->fetch($obj->fk_bank);
@@ -254,7 +254,7 @@ if (!empty($conf->tax->enabled) && $user->rights->tax->charges->lire) {
 		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 (!empty($conf->banque->enabled)) {
+		if (isModEnabled('banque')) {
 			print '<td></td>';
 		}
 		print '<td class="liste_total right">'.price($totalpaid)."</td>";
@@ -304,7 +304,7 @@ if (!empty($conf->tax->enabled) && $user->rights->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 (!empty($conf->banque->enabled)) {
+		if (isModEnabled('banque')) {
 			print_liste_field_titre("Account", $_SERVER["PHP_SELF"], "ba.label", "", $param, "", $sortfield, $sortorder);
 		}
 		print_liste_field_titre("PayedByThisPayment", $_SERVER["PHP_SELF"], "ptva.amount", "", $param, 'class="right"', $sortfield, $sortorder);
@@ -341,7 +341,7 @@ if (!empty($conf->tax->enabled) && $user->rights->tax->charges->lire) {
 			print $obj->num_payment.'</td>';
 
 			// Account
-			if (!empty($conf->banque->enabled)) {
+			if (isModEnabled('banque')) {
 				print '<td>';
 				if ($obj->fk_bank > 0) {
 					//$accountstatic->fetch($obj->fk_bank);

From d633576ed9fe587d0f5fdab89096e83a50d3db04 Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Mon, 29 Aug 2022 11:22:38 +0200
Subject: [PATCH 257/974] Use isModEnabled

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

diff --git a/htdocs/compta/deplacement/card.php b/htdocs/compta/deplacement/card.php
index 029c5b5f223..8259d40f694 100644
--- a/htdocs/compta/deplacement/card.php
+++ b/htdocs/compta/deplacement/card.php
@@ -29,7 +29,7 @@ require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/trip.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/deplacement/class/deplacement.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
-if (!empty($conf->project->enabled)) {
+if (isModEnabled('project')) {
 	require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 }
 
@@ -422,7 +422,7 @@ if ($action == 'create') {
 			print '</td></tr>';
 
 			// Project
-			if (!empty($conf->project->enabled)) {
+			if (isModEnabled('project')) {
 				$langs->load('projects');
 				print '<tr>';
 				print '<td>';

From 6fd2bbe46c5bc90c9a6b8f16a7989fb55aab1af1 Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Mon, 29 Aug 2022 11:23:40 +0200
Subject: [PATCH 258/974] Use isModEnabled

---
 htdocs/compta/facture/card-rec.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/htdocs/compta/facture/card-rec.php b/htdocs/compta/facture/card-rec.php
index 18a935cedb4..3e661dd52fe 100644
--- a/htdocs/compta/facture/card-rec.php
+++ b/htdocs/compta/facture/card-rec.php
@@ -34,7 +34,7 @@ require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture-rec.class.php';
 require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
-if (!empty($conf->project->enabled)) {
+if (isModEnabled('project')) {
 	include_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 	//include_once DOL_DOCUMENT_ROOT . '/core/class/html.formprojet.class.php';
 }
@@ -924,7 +924,7 @@ llxHeader('', $langs->trans("RepeatableInvoices"), $help_url);
 
 $form = new Form($db);
 $formother = new FormOther($db);
-if (!empty($conf->project->enabled)) {
+if (isModEnabled('project')) {
 	$formproject = new FormProjets($db);
 }
 $companystatic = new Societe($db);
@@ -954,7 +954,7 @@ if ($action == 'create') {
 		print dol_get_fiche_head(null, '', '', 0);
 
 		$rowspan = 4;
-		if (!empty($conf->project->enabled)) {
+		if (isModEnabled('project')) {
 			$rowspan++;
 		}
 		if ($object->fk_account > 0) {
@@ -1047,7 +1047,7 @@ if ($action == 'create') {
 		}
 
 		// Project
-		if (!empty($conf->project->enabled) && is_object($object->thirdparty) && $object->thirdparty->id > 0) {
+		if (isModEnabled('project') && is_object($object->thirdparty) && $object->thirdparty->id > 0) {
 			$projectid = GETPOST('projectid') ?GETPOST('projectid') : $object->fk_project;
 			$langs->load('projects');
 			print '<tr><td>'.$langs->trans('Project').'</td><td>';
@@ -1203,7 +1203,7 @@ if ($action == 'create') {
 		// Thirdparty
 		$morehtmlref .= $langs->trans('ThirdParty').' : '.$object->thirdparty->getNomUrl(1);
 		// Project
-		if (!empty($conf->project->enabled)) {
+		if (isModEnabled('project')) {
 			$langs->load("projects");
 			$morehtmlref .= '<br>'.$langs->trans('Project').' ';
 			if ($user->rights->facture->creer) {

From 4075397f7a718d00efc84250ace8f631d973c59f Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Mon, 29 Aug 2022 11:23:50 +0200
Subject: [PATCH 259/974] Use isModEnabled

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

diff --git a/htdocs/compta/facture/card.php b/htdocs/compta/facture/card.php
index fd9111a6a6f..1eebb5300d2 100644
--- a/htdocs/compta/facture/card.php
+++ b/htdocs/compta/facture/card.php
@@ -54,7 +54,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
 if (!empty($conf->commande->enabled)) {
 	require_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
 }
-if (!empty($conf->project->enabled)) {
+if (isModEnabled('project')) {
 	require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 	require_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php';
 }
@@ -63,7 +63,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
 if (!empty($conf->variants->enabled)) {
 	require_once DOL_DOCUMENT_ROOT.'/variants/class/ProductCombination.class.php';
 }
-if (!empty($conf->accounting->enabled)) {
+if (isModEnabled('accounting')) {
 	require_once DOL_DOCUMENT_ROOT.'/accountancy/class/accountingjournal.class.php';
 }
 
@@ -2874,7 +2874,7 @@ $formmargin = new FormMargin($db);
 $soc = new Societe($db);
 $paymentstatic = new Paiement($db);
 $bankaccountstatic = new Account($db);
-if (!empty($conf->project->enabled)) {
+if (isModEnabled('project')) {
 	$formproject = new FormProjets($db);
 }
 
@@ -3650,7 +3650,7 @@ if ($action == 'create') {
 	print '</td></tr>';
 
 	// Bank Account
-	if (!empty($conf->banque->enabled)) {
+	if (isModEnabled('banque')) {
 		print '<tr><td>'.$langs->trans('BankAccount').'</td><td colspan="2">';
 		print img_picto('', 'bank_account', 'class="pictofixedwidth"');
 		print $form->select_comptes(($fk_account < 0 ? '' : $fk_account), 'fk_account', 0, '', 1, '', 0, 'maxwidth200 widthcentpercentminusx', 1);
@@ -3658,7 +3658,7 @@ if ($action == 'create') {
 	}
 
 	// Project
-	if (!empty($conf->project->enabled)) {
+	if (isModEnabled('project')) {
 		$langs->load('projects');
 		print '<tr><td>'.$langs->trans('Project').'</td><td colspan="2">';
 		print img_picto('', 'project').$formproject->select_projects(($socid > 0 ? $socid : -1), $projectid, 'projectid', 0, 0, 1, 1, 0, 0, 0, '', 1, 0, 'maxwidth500 widthcentpercentminusxx');
@@ -4284,7 +4284,7 @@ if ($action == 'create') {
 		$morehtmlref .= ' (<a href="'.DOL_URL_ROOT.'/compta/facture/list.php?socid='.$object->thirdparty->id.'&search_societe='.urlencode($object->thirdparty->name).'">'.$langs->trans("OtherBills").'</a>)';
 	}
 	// Project
-	if (!empty($conf->project->enabled)) {
+	if (isModEnabled('project')) {
 		$langs->load("projects");
 		$morehtmlref .= '<br>'.$langs->trans('Project').' ';
 		if ($usercancreate) {
@@ -4550,7 +4550,7 @@ if ($action == 'create') {
 	}
 
 	// Bank Account
-	if (!empty($conf->banque->enabled)) {
+	if (isModEnabled('banque')) {
 		print '<tr><td class="nowrap">';
 		print '<table class="nobordernopadding centpercent"><tr><td class="nowrap">';
 		print $langs->trans('BankAccount');
@@ -4803,10 +4803,10 @@ if ($action == 'create') {
 
 	$nbrows = 8;
 	$nbcols = 3;
-	if (!empty($conf->project->enabled)) {
+	if (isModEnabled('project')) {
 		$nbrows++;
 	}
-	if (!empty($conf->banque->enabled)) {
+	if (isModEnabled('banque')) {
 		$nbrows++;
 		$nbcols++;
 	}
@@ -4835,7 +4835,7 @@ if ($action == 'create') {
 		print '<td>'.$langs->trans('ListOfSituationInvoices').'</td>';
 		print '<td></td>';
 		print '<td class="center">'.$langs->trans('Situation').'</td>';
-		if (!empty($conf->banque->enabled)) {
+		if (isModEnabled('banque')) {
 			print '<td class="right"></td>';
 		}
 		print '<td class="right">'.$langs->trans('AmountHT').'</td>';
@@ -4859,7 +4859,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 (!empty($conf->banque->enabled)) {
+				if (isModEnabled('banque')) {
 					print '<td class="right"></td>';
 				}
 				print '<td class="right"><span class="amount">'.price($prev_invoice->total_ht).'</span></td>';
@@ -4879,7 +4879,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 (!empty($conf->banque->enabled)) {
+		if (isModEnabled('banque')) {
 			print '<td class="right"></td>';
 		}
 		print '<td class="right"><span class="amount">'.price($object->total_ht).'</span></td>';
@@ -4902,7 +4902,7 @@ if ($action == 'create') {
 			$i++;
 		}
 		print '</td>';
-		if (!empty($conf->banque->enabled)) {
+		if (isModEnabled('banque')) {
 			print '<td></td>';
 		}
 		print '<td class="right"><b>'.price($total_global_ht).'</b></td>';
@@ -4934,7 +4934,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 (!empty($conf->banque->enabled)) {
+				if (isModEnabled('banque')) {
 					print '<td class="right"></td>';
 				}
 				print '<td class="right"><span class="amount">'.price($next_invoice->total_ht).'</span></td>';
@@ -4948,7 +4948,7 @@ if ($action == 'create') {
 
 			print '<tr class="oddeven">';
 			print '<td colspan="3" class="right"></td>';
-			if (!empty($conf->banque->enabled)) {
+			if (isModEnabled('banque')) {
 				print '<td class="right"></td>';
 			}
 			print '<td class="right"><b>'.price($total_global_ht).'</b></td>';
@@ -4975,7 +4975,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 (!empty($conf->banque->enabled)) {
+	if (isModEnabled('banque')) {
 		print '<td class="liste_titre"><span class="hideonsmartphone">'.$langs->trans('BankAccount').'</span></td>';
 	}
 	print '<td class="liste_titre right">'.$langs->trans('Amount').'</td>';
@@ -5024,14 +5024,14 @@ if ($action == 'create') {
 				print '</td>';
 				$label = ($langs->trans("PaymentType".$objp->payment_code) != ("PaymentType".$objp->payment_code)) ? $langs->trans("PaymentType".$objp->payment_code) : $objp->payment_label;
 				print '<td>'.$label.' '.$objp->num_payment.'</td>';
-				if (!empty($conf->banque->enabled)) {
+				if (isModEnabled('banque')) {
 					$bankaccountstatic->id = $objp->baid;
 					$bankaccountstatic->ref = $objp->baref;
 					$bankaccountstatic->label = $objp->baref;
 					$bankaccountstatic->number = $objp->banumber;
 					$bankaccountstatic->currency_code = $objp->bacurrency_code;
 
-					if (!empty($conf->accounting->enabled)) {
+					if (isModEnabled('accounting')) {
 						$bankaccountstatic->account_number = $objp->account_number;
 
 						$accountingjournal = new AccountingJournal($db);

From a269b1181ae55abb1e2c9b7e4e3f93cf89d9d4fe Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Mon, 29 Aug 2022 11:23:57 +0200
Subject: [PATCH 260/974] Use isModEnabled

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

diff --git a/htdocs/compta/facture/class/api_invoices.class.php b/htdocs/compta/facture/class/api_invoices.class.php
index a864168d161..e9f9f9e5e65 100644
--- a/htdocs/compta/facture/class/api_invoices.class.php
+++ b/htdocs/compta/facture/class/api_invoices.class.php
@@ -1408,7 +1408,7 @@ class Invoices extends DolibarrApi
 			throw new RestException(403, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
 		}
 
-		if (!empty($conf->banque->enabled)) {
+		if (isModEnabled('banque')) {
 			if (empty($accountid)) {
 				throw new RestException(400, 'Account ID is mandatory');
 			}
@@ -1467,7 +1467,7 @@ class Invoices extends DolibarrApi
 			throw new RestException(400, 'Payment error : '.$paymentobj->error);
 		}
 
-		if (!empty($conf->banque->enabled)) {
+		if (isModEnabled('banque')) {
 			$label = '(CustomerInvoicePayment)';
 
 			if ($paymentobj->paiementcode == 'CHQ' && empty($chqemetteur)) {
@@ -1531,7 +1531,7 @@ class Invoices extends DolibarrApi
 			}
 		}
 
-		if (!empty($conf->banque->enabled)) {
+		if (isModEnabled('banque')) {
 			if (empty($accountid)) {
 				throw new RestException(400, 'Account ID is mandatory');
 			}
@@ -1615,7 +1615,7 @@ class Invoices extends DolibarrApi
 			$this->db->rollback();
 			throw new RestException(400, 'Payment error : '.$paymentobj->error);
 		}
-		if (!empty($conf->banque->enabled)) {
+		if (isModEnabled('banque')) {
 			$label = '(CustomerInvoicePayment)';
 			if ($paymentobj->paiementcode == 'CHQ' && empty($chqemetteur)) {
 				  throw new RestException(400, 'Emetteur is mandatory when payment code is '.$paymentobj->paiementcode);

From bcc87dd47925df24777f5997d44e3226793d87d6 Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Mon, 29 Aug 2022 11:24:07 +0200
Subject: [PATCH 261/974] Use isModEnabled

---
 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 843fa305600..1f4dc08cdcb 100644
--- a/htdocs/compta/facture/class/facture.class.php
+++ b/htdocs/compta/facture/class/facture.class.php
@@ -47,10 +47,10 @@ require_once DOL_DOCUMENT_ROOT.'/societe/class/client.class.php';
 require_once DOL_DOCUMENT_ROOT.'/margin/lib/margins.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/multicurrency/class/multicurrency.class.php';
 
-if (!empty($conf->accounting->enabled)) {
+if (isModEnabled('accounting')) {
 	require_once DOL_DOCUMENT_ROOT.'/core/class/html.formaccounting.class.php';
 }
-if (!empty($conf->accounting->enabled)) {
+if (isModEnabled('accounting')) {
 	require_once DOL_DOCUMENT_ROOT.'/accountancy/class/accountingaccount.class.php';
 }
 

From 93cfa2797d02f712e8f840df5871abacf4ed6b42 Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Mon, 29 Aug 2022 11:24:13 +0200
Subject: [PATCH 262/974] Use isModEnabled

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

diff --git a/htdocs/compta/facture/contact.php b/htdocs/compta/facture/contact.php
index 1b75d43753e..17d601a3988 100644
--- a/htdocs/compta/facture/contact.php
+++ b/htdocs/compta/facture/contact.php
@@ -31,7 +31,7 @@ require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/discount.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/invoice.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php';
-if (!empty($conf->project->enabled)) {
+if (isModEnabled('project')) {
 	require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 }
 
@@ -137,7 +137,7 @@ if ($id > 0 || !empty($ref)) {
 		// Thirdparty
 		$morehtmlref .= '<br>'.$langs->trans('ThirdParty').' : '.$object->thirdparty->getNomUrl(1, 'customer');
 		// Project
-		if (!empty($conf->project->enabled)) {
+		if (isModEnabled('project')) {
 			$langs->load("projects");
 			$morehtmlref .= '<br>'.$langs->trans('Project').' ';
 			if ($user->rights->facture->creer) {

From fb63c066fc05d2c1e483ba2d67fb9c6000fae23b Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Mon, 29 Aug 2022 11:24:17 +0200
Subject: [PATCH 263/974] Use isModEnabled

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

diff --git a/htdocs/compta/facture/document.php b/htdocs/compta/facture/document.php
index 1685da08a2e..6e211c62afd 100644
--- a/htdocs/compta/facture/document.php
+++ b/htdocs/compta/facture/document.php
@@ -34,7 +34,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/invoice.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';
-if (!empty($conf->project->enabled)) {
+if (isModEnabled('project')) {
 	include_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 }
 
@@ -138,7 +138,7 @@ if ($id > 0 || !empty($ref)) {
 		// Thirdparty
 		$morehtmlref .= '<br>'.$langs->trans('ThirdParty').' : '.$object->thirdparty->getNomUrl(1, 'customer');
 		// Project
-		if (!empty($conf->project->enabled)) {
+		if (isModEnabled('project')) {
 			$langs->load("projects");
 			$morehtmlref .= '<br>'.$langs->trans('Project').' ';
 			if ($user->rights->facture->creer) {

From bf3f406788e32fe4f4f239e4cdc7004a26d948e5 Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Mon, 29 Aug 2022 11:24:26 +0200
Subject: [PATCH 264/974] Use isModEnabled

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

diff --git a/htdocs/compta/facture/info.php b/htdocs/compta/facture/info.php
index 4521c7e5096..1815b108a78 100644
--- a/htdocs/compta/facture/info.php
+++ b/htdocs/compta/facture/info.php
@@ -28,7 +28,7 @@ require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/discount.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/invoice.lib.php';
-if (!empty($conf->project->enabled)) {
+if (isModEnabled('project')) {
 	include_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 }
 
@@ -97,7 +97,7 @@ $morehtmlref .= $form->editfieldval("RefCustomer", 'ref_client', $object->ref_cl
 // Thirdparty
 $morehtmlref .= '<br>'.$langs->trans('ThirdParty').' : '.$object->thirdparty->getNomUrl(1, 'customer');
 // Project
-if (!empty($conf->project->enabled)) {
+if (isModEnabled('project')) {
 	$langs->load("projects");
 	$morehtmlref .= '<br>'.$langs->trans('Project').' ';
 	if ($user->rights->facture->creer) {

From 1a4c722a498da61b44d9e7699a493b88b03d6e72 Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Mon, 29 Aug 2022 11:24:30 +0200
Subject: [PATCH 265/974] Use isModEnabled

---
 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 1f516c31795..71573505a7f 100644
--- a/htdocs/compta/facture/invoicetemplate_list.php
+++ b/htdocs/compta/facture/invoicetemplate_list.php
@@ -257,7 +257,7 @@ llxHeader('', $langs->trans("RepeatableInvoices"), 'ch-facture.html#s-fac-factur
 
 $form = new Form($db);
 $formother = new FormOther($db);
-if (!empty($conf->project->enabled)) {
+if (isModEnabled('project')) {
 	$formproject = new FormProjets($db);
 }
 $companystatic = new Societe($db);

From 4f2cd0419ae3aeb90f61a357108867f46b0c6b13 Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Mon, 29 Aug 2022 11:24:36 +0200
Subject: [PATCH 266/974] Use isModEnabled

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

diff --git a/htdocs/compta/facture/note.php b/htdocs/compta/facture/note.php
index 5b30d39da12..1e24133919d 100644
--- a/htdocs/compta/facture/note.php
+++ b/htdocs/compta/facture/note.php
@@ -29,7 +29,7 @@ require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/discount.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/invoice.lib.php';
-if (!empty($conf->project->enabled)) {
+if (isModEnabled('project')) {
 	require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 }
 
@@ -114,7 +114,7 @@ if ($id > 0 || !empty($ref)) {
 	// Thirdparty
 	$morehtmlref .= '<br>'.$langs->trans('ThirdParty').' : '.$object->thirdparty->getNomUrl(1, 'customer');
 	// Project
-	if (!empty($conf->project->enabled)) {
+	if (isModEnabled('project')) {
 		$langs->load("projects");
 		$morehtmlref .= '<br>'.$langs->trans('Project').' ';
 		if ($user->rights->facture->creer) {

From 78431e0d66442e37c6252e63cb20e74adf63ae6d Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Mon, 29 Aug 2022 11:24:40 +0200
Subject: [PATCH 267/974] Use isModEnabled

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

diff --git a/htdocs/compta/facture/prelevement.php b/htdocs/compta/facture/prelevement.php
index 8bd953f98b5..28d4efd6555 100644
--- a/htdocs/compta/facture/prelevement.php
+++ b/htdocs/compta/facture/prelevement.php
@@ -349,7 +349,7 @@ if ($object->id > 0) {
 		}
 	}
 	// Project
-	if (!empty($conf->project->enabled)) {
+	if (isModEnabled('project')) {
 		$langs->load("projects");
 		$morehtmlref .= '<br>'.$langs->trans('Project').' ';
 		if ($usercancreate) {

From acc1c519cc08c9fc2a631deafe9a7f68e6436327 Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Mon, 29 Aug 2022 11:24:44 +0200
Subject: [PATCH 268/974] Use isModEnabled

---
 htdocs/compta/journal/purchasesjournal.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/compta/journal/purchasesjournal.php b/htdocs/compta/journal/purchasesjournal.php
index fda83a75668..ea320007f4d 100644
--- a/htdocs/compta/journal/purchasesjournal.php
+++ b/htdocs/compta/journal/purchasesjournal.php
@@ -48,10 +48,10 @@ $date_endyear = GETPOST('date_endyear');
 if ($user->socid > 0) {
 	$socid = $user->socid;
 }
-if (!empty($conf->comptabilite->enabled)) {
+if (isModEnabled('comptabilite')) {
 	$result = restrictedArea($user, 'compta', '', '', 'resultat');
 }
-if (!empty($conf->accounting->enabled)) {
+if (isModEnabled('accounting')) {
 	$result = restrictedArea($user, 'accounting', '', '', 'comptarapport');
 }
 

From 10e41b6c098b7fd5e39a491526ccb09b5a9c7980 Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Mon, 29 Aug 2022 11:24:48 +0200
Subject: [PATCH 269/974] Use isModEnabled

---
 htdocs/compta/journal/sellsjournal.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/compta/journal/sellsjournal.php b/htdocs/compta/journal/sellsjournal.php
index 367ffffbdea..44cdcde6778 100644
--- a/htdocs/compta/journal/sellsjournal.php
+++ b/htdocs/compta/journal/sellsjournal.php
@@ -50,10 +50,10 @@ $date_endyear = GETPOST('date_endyear');
 if ($user->socid > 0) {
 	$socid = $user->socid;
 }
-if (!empty($conf->comptabilite->enabled)) {
+if (isModEnabled('comptabilite')) {
 	$result = restrictedArea($user, 'compta', '', '', 'resultat');
 }
-if (!empty($conf->accounting->enabled)) {
+if (isModEnabled('accounting')) {
 	$result = restrictedArea($user, 'accounting', '', '', 'comptarapport');
 }
 

From b978371800578f60847ccf616145e3952a802ef1 Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Mon, 29 Aug 2022 11:24:54 +0200
Subject: [PATCH 270/974] Use isModEnabled

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

diff --git a/htdocs/compta/localtax/card.php b/htdocs/compta/localtax/card.php
index 9bd37eafa36..e15f469abca 100644
--- a/htdocs/compta/localtax/card.php
+++ b/htdocs/compta/localtax/card.php
@@ -174,7 +174,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 (!empty($conf->banque->enabled)) {
+	if (isModEnabled('banque')) {
 		// Type payment
 		print '<tr><td class="fieldrequired">'.$langs->trans("PaymentMode").'</td><td>';
 		$form->select_types_paiements(GETPOST("paiementtype"), "paiementtype", '', 0, 1, 0, 0, 1, 'maxwidth500 widthcentpercentminusx');
@@ -243,7 +243,7 @@ if ($id) {
 
 	print '<tr><td>'.$langs->trans("Amount").'</td><td>'.price($object->amount).'</td></tr>';
 
-	if (!empty($conf->banque->enabled)) {
+	if (isModEnabled('banque')) {
 		if ($object->fk_account > 0) {
 			$bankline = new AccountLine($db);
 			$bankline->fetch($object->fk_bank);

From 502078cf376b255cacb869dd5913dcc0e0d3e849 Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Mon, 29 Aug 2022 11:25:00 +0200
Subject: [PATCH 271/974] Use isModEnabled

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

diff --git a/htdocs/compta/localtax/class/localtax.class.php b/htdocs/compta/localtax/class/localtax.class.php
index 63b4f982316..77384881e48 100644
--- a/htdocs/compta/localtax/class/localtax.class.php
+++ b/htdocs/compta/localtax/class/localtax.class.php
@@ -467,11 +467,11 @@ class Localtax extends CommonObject
 			$this->error = $langs->trans("ErrorFieldRequired", $langs->transnoentities("Amount"));
 			return -4;
 		}
-		if (!empty($conf->banque->enabled) && (empty($this->accountid) || $this->accountid <= 0)) {
+		if (isModEnabled('banque') && (empty($this->accountid) || $this->accountid <= 0)) {
 			$this->error = $langs->trans("ErrorFieldRequired", $langs->transnoentities("Account"));
 			return -5;
 		}
-		if (!empty($conf->banque->enabled) && (empty($this->paymenttype) || $this->paymenttype <= 0)) {
+		if (isModEnabled('banque') && (empty($this->paymenttype) || $this->paymenttype <= 0)) {
 			$this->error = $langs->trans("ErrorFieldRequired", $langs->transnoentities("PaymentMode"));
 			return -5;
 		}
@@ -503,7 +503,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 (!empty($conf->banque->enabled)) {
+				if (isModEnabled('banque')) {
 					// Insertion dans llx_bank
 					require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
 

From 7aa371815ad42203f1a22cfdf2e88e15e095dcdc Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Mon, 29 Aug 2022 11:25:07 +0200
Subject: [PATCH 272/974] Use isModEnabled

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

diff --git a/htdocs/compta/paiement.php b/htdocs/compta/paiement.php
index aea9f917dab..e6a9fe713cf 100644
--- a/htdocs/compta/paiement.php
+++ b/htdocs/compta/paiement.php
@@ -170,7 +170,7 @@ if (empty($reshook)) {
 			$error++;
 		}
 
-		if (!empty($conf->banque->enabled)) {
+		if (isModEnabled('banque')) {
 			// 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');
@@ -244,7 +244,7 @@ if (empty($reshook)) {
 			$multicurrency_code[$key] = $tmpinvoice->multicurrency_code;
 		}
 
-		if (!empty($conf->banque->enabled)) {
+		if (isModEnabled('banque')) {
 			// If the bank module is active, an account is required to input a payment
 			if (GETPOST('accountid', 'int') <= 0) {
 				setEventMessages($langs->trans('ErrorFieldRequired', $langs->transnoentities('AccountToCredit')), null, 'errors');
@@ -492,7 +492,7 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
 
 		// Bank account
 		print '<tr>';
-		if (!empty($conf->banque->enabled)) {
+		if (isModEnabled('banque')) {
 			if ($facture->type != 2) {
 				print '<td><span class="fieldrequired">'.$langs->trans('AccountToCredit').'</span></td>';
 			}

From ef3b8b3b31771122cc3a9e355b93967223a0c1ae Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Mon, 29 Aug 2022 11:25:14 +0200
Subject: [PATCH 273/974] Use isModEnabled

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

diff --git a/htdocs/compta/paiement/card.php b/htdocs/compta/paiement/card.php
index bd5c114e983..fa2a8e88028 100644
--- a/htdocs/compta/paiement/card.php
+++ b/htdocs/compta/paiement/card.php
@@ -32,7 +32,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 (!empty($conf->banque->enabled)) {
+if (isModEnabled('banque')) {
 	require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
 }
 
@@ -285,7 +285,7 @@ print '<tr><td>'.$langs->trans('Amount').'</td><td>'.price($object->amount, '',
 
 $disable_delete = 0;
 // Bank account
-if (!empty($conf->banque->enabled)) {
+if (isModEnabled('banque')) {
 	$bankline = new AccountLine($db);
 
 	if ($object->fk_account > 0) {
@@ -327,7 +327,7 @@ print '</td></tr>';
 */
 
 // Bank account
-if (!empty($conf->banque->enabled)) {
+if (isModEnabled('banque')) {
 	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';

From 38882a6324c3105ed3b96f944c0e614eda7e97f4 Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Mon, 29 Aug 2022 11:25:20 +0200
Subject: [PATCH 274/974] Use isModEnabled

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

diff --git a/htdocs/compta/paiement/class/paiement.class.php b/htdocs/compta/paiement/class/paiement.class.php
index 25543ed9d82..8be5aa97062 100644
--- a/htdocs/compta/paiement/class/paiement.class.php
+++ b/htdocs/compta/paiement/class/paiement.class.php
@@ -628,7 +628,7 @@ class Paiement extends CommonObject
 		$error = 0;
 		$bank_line_id = 0;
 
-		if (!empty($conf->banque->enabled)) {
+		if (isModEnabled('banque')) {
 			if ($accountid <= 0) {
 				$this->error = 'Bad value for parameter accountid='.$accountid;
 				dol_syslog(get_class($this).'::addPaymentToBank '.$this->error, LOG_ERR);

From a283ab61c256772fbb098da944da77727aeed367 Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Mon, 29 Aug 2022 11:25:24 +0200
Subject: [PATCH 275/974] Use isModEnabled

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

diff --git a/htdocs/compta/paiement/list.php b/htdocs/compta/paiement/list.php
index 988d6e041be..75ce2203c51 100644
--- a/htdocs/compta/paiement/list.php
+++ b/htdocs/compta/paiement/list.php
@@ -104,8 +104,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'=>(!empty($conf->banque->enabled))),
-	'ba.label'			=> array('label'=>"Account", 'checked'=>1, 'position'=>60, 'enabled'=>(!empty($conf->banque->enabled))),
+	'transaction'		=> array('label'=>"BankTransactionLine", 'checked'=>1, 'position'=>50, 'enabled'=>isModEnabled('banque')),
+	'ba.label'			=> array('label'=>"Account", 'checked'=>1, 'position'=>60, 'enabled'=>(isModEnabled('banque'))),
 	'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'=>(!empty($conf->global->BILL_ADD_PAYMENT_VALIDATION))),

From e9dccee7c218ea1811e2df1902278e164b852e63 Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Mon, 29 Aug 2022 11:25:30 +0200
Subject: [PATCH 276/974] Use isModEnabled

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

diff --git a/htdocs/compta/paiement_charge.php b/htdocs/compta/paiement_charge.php
index ba62c36b0fa..478770da2bd 100644
--- a/htdocs/compta/paiement_charge.php
+++ b/htdocs/compta/paiement_charge.php
@@ -71,7 +71,7 @@ if ($action == 'add_payment' || ($action == 'confirm_paiement' && $confirm == 'y
 		$error++;
 		$action = 'create';
 	}
-	if (!empty($conf->banque->enabled) && !(GETPOST("accountid") > 0)) {
+	if (isModEnabled('banque') && !(GETPOST("accountid") > 0)) {
 		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("AccountToCredit")), null, 'errors');
 		$error++;
 		$action = 'create';

From cb54db77e8e514e0e2c454a49ac532ddeca4b9f9 Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Mon, 29 Aug 2022 11:25:37 +0200
Subject: [PATCH 277/974] Use isModEnabled

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

diff --git a/htdocs/compta/paiement_vat.php b/htdocs/compta/paiement_vat.php
index 645fd36bc2a..0e628df761b 100644
--- a/htdocs/compta/paiement_vat.php
+++ b/htdocs/compta/paiement_vat.php
@@ -69,7 +69,7 @@ if ($action == 'add_payment' || ($action == 'confirm_paiement' && $confirm == 'y
 		$error++;
 		$action = 'create';
 	}
-	if (!empty($conf->banque->enabled) && !(GETPOST("accountid", 'int') > 0)) {
+	if (isModEnabled('banque') && !(GETPOST("accountid", 'int') > 0)) {
 		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("AccountToDebit")), null, 'errors');
 		$error++;
 		$action = 'create';

From 1ea5b984b263a9193dac49d647e390774ccd57ca Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Mon, 29 Aug 2022 11:25:44 +0200
Subject: [PATCH 278/974] Use isModEnabled

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

diff --git a/htdocs/compta/payment_sc/card.php b/htdocs/compta/payment_sc/card.php
index f5ff5a101f2..a029ba12b05 100644
--- a/htdocs/compta/payment_sc/card.php
+++ b/htdocs/compta/payment_sc/card.php
@@ -31,7 +31,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 (!empty($conf->banque->enabled)) {
+if (isModEnabled('banque')) {
 	require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
 }
 
@@ -141,7 +141,7 @@ print '<tr><td>'.$langs->trans('Amount').'</td><td colspan="3">'.price($object->
 print '<tr><td>'.$langs->trans('Note').'</td><td colspan="3">'.nl2br($object->note).'</td></tr>';
 
 // Bank account
-if (!empty($conf->banque->enabled)) {
+if (isModEnabled('banque')) {
 	if ($object->bank_account) {
 		$bankline = new AccountLine($db);
 		$bankline->fetch($object->bank_line);

From 22d754d43c29878b9b8c3265a8133419b7023944 Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Mon, 29 Aug 2022 11:25:50 +0200
Subject: [PATCH 279/974] Use isModEnabled

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

diff --git a/htdocs/compta/payment_vat/card.php b/htdocs/compta/payment_vat/card.php
index 94dd817900e..03c768fa3e9 100644
--- a/htdocs/compta/payment_vat/card.php
+++ b/htdocs/compta/payment_vat/card.php
@@ -31,7 +31,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 (!empty($conf->banque->enabled)) {
+if (isModEnabled('banque')) {
 	require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
 }
 
@@ -194,7 +194,7 @@ print '<tr><td>'.$langs->trans('Amount').'</td><td colspan="3">'.price($object->
 print '<tr><td>'.$langs->trans('Note').'</td><td colspan="3">'.nl2br($object->note).'</td></tr>';
 
 // Bank account
-if (!empty($conf->banque->enabled)) {
+if (isModEnabled('banque')) {
 	if ($object->bank_account) {
 		$bankline = new AccountLine($db);
 		$bankline->fetch($object->bank_line);

From 9019604885f4666810c5de2fe33c8b162e2de265 Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Mon, 29 Aug 2022 11:26:18 +0200
Subject: [PATCH 280/974] Use isModEnabled

---
 htdocs/compta/resultat/clientfourn.php | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/htdocs/compta/resultat/clientfourn.php b/htdocs/compta/resultat/clientfourn.php
index 936adb482d2..9f12b12f7e5 100644
--- a/htdocs/compta/resultat/clientfourn.php
+++ b/htdocs/compta/resultat/clientfourn.php
@@ -132,7 +132,7 @@ $nbofyear = ($year_end - $year_start) + 1;
 
 // Define modecompta ('CREANCES-DETTES' or 'RECETTES-DEPENSES' or 'BOOKKEEPING')
 $modecompta = $conf->global->ACCOUNTING_MODE;
-if (!empty($conf->accounting->enabled)) {
+if (isModEnabled('accounting')) {
 	$modecompta = 'BOOKKEEPING';
 }
 if (GETPOST("modecompta", 'alpha')) {
@@ -146,10 +146,10 @@ $socid = GETPOST('socid', 'int');
 if ($user->socid > 0) {
 	$socid = $user->socid;
 }
-if (!empty($conf->comptabilite->enabled)) {
+if (isModEnabled('comptabilite')) {
 	$result = restrictedArea($user, 'compta', '', '', 'resultat');
 }
-if (!empty($conf->accounting->enabled)) {
+if (isModEnabled('accounting')) {
 	$result = restrictedArea($user, 'accounting', '', '', 'comptarapport');
 }
 
@@ -174,7 +174,7 @@ if ($modecompta == "CREANCES-DETTES") {
 	$calcmode = $langs->trans("CalcModeDebt");
 	$calcmode .= '<br>('.$langs->trans("SeeReportInInputOutputMode", '{s1}', '{s2}').')';
 	$calcmode = str_replace(array('{s1}', '{s2}'), array('<a href="'.$_SERVER["PHP_SELF"].'?date_startyear='.$tmps['year'].'&date_startmonth='.$tmps['mon'].'&date_startday='.$tmps['mday'].'&date_endyear='.$tmpe['year'].'&date_endmonth='.$tmpe['mon'].'&date_endday='.$tmpe['mday'].'&modecompta=RECETTES-DEPENSES">', '</a>'), $calcmode);
-	if (!empty($conf->accounting->enabled)) {
+	if (isModEnabled('accounting')) {
 		$calcmode .= '<br>('.$langs->trans("SeeReportInBookkeepingMode", '{s1}', '{s2}').')';
 		$calcmode = str_replace(array('{s1}', '{s2}'), array('<a href="'.$_SERVER["PHP_SELF"].'?date_startyear='.$tmps['year'].'&date_startmonth='.$tmps['mon'].'&date_startday='.$tmps['mday'].'&date_endyear='.$tmpe['year'].'&date_endmonth='.$tmpe['mon'].'&date_endday='.$tmpe['mday'].'&modecompta=BOOKKEEPING">', '</a>'), $calcmode);
 	}
@@ -193,7 +193,7 @@ if ($modecompta == "CREANCES-DETTES") {
 	$calcmode = $langs->trans("CalcModeEngagement");
 	$calcmode .= '<br>('.$langs->trans("SeeReportInDueDebtMode", '{s1}', '{s2}').')';
 	$calcmode = str_replace(array('{s1}', '{s2}'), array('<a href="'.$_SERVER["PHP_SELF"].'?date_startyear='.$tmps['year'].'&date_startmonth='.$tmps['mon'].'&date_startday='.$tmps['mday'].'&date_endyear='.$tmpe['year'].'&date_endmonth='.$tmpe['mon'].'&date_endday='.$tmpe['mday'].'&modecompta=CREANCES-DETTES">', '</a>'), $calcmode);
-	if (!empty($conf->accounting->enabled)) {
+	if (isModEnabled('accounting')) {
 		$calcmode .= '<br>('.$langs->trans("SeeReportInBookkeepingMode", '{s1}', '{s2}').')';
 		$calcmode = str_replace(array('{s1}', '{s2}'), array('<a href="'.$_SERVER["PHP_SELF"].'?date_startyear='.$tmps['year'].'&date_startmonth='.$tmps['mon'].'&date_startday='.$tmps['mday'].'&date_endyear='.$tmpe['year'].'&date_endmonth='.$tmpe['mon'].'&date_endday='.$tmpe['mday'].'&modecompta=BOOKKEEPING">', '</a>'), $calcmode);
 	}
@@ -223,7 +223,7 @@ $hselected = 'report';
 
 report_header($name, '', $period, $periodlink, $description, $builddate, $exportlink, array('modecompta'=>$modecompta, 'showaccountdetail'=>$showaccountdetail), $calcmode);
 
-if (!empty($conf->accounting->enabled) && $modecompta != 'BOOKKEEPING') {
+if (isModEnabled('accounting') && $modecompta != 'BOOKKEEPING') {
 	print info_admin($langs->trans("WarningReportNotReliable"), 0, 0, 1);
 }
 
@@ -1127,7 +1127,7 @@ if ($modecompta == 'BOOKKEEPING') {
 	 */
 	//$conf->global->ACCOUNTING_REPORTS_INCLUDE_VARPAY = 1;
 
-	if (!empty($conf->global->ACCOUNTING_REPORTS_INCLUDE_VARPAY) && !empty($conf->banque->enabled) && ($modecompta == 'CREANCES-DETTES' || $modecompta == "RECETTES-DEPENSES")) {
+	if (!empty($conf->global->ACCOUNTING_REPORTS_INCLUDE_VARPAY) && isModEnabled('banque') && ($modecompta == 'CREANCES-DETTES' || $modecompta == "RECETTES-DEPENSES")) {
 		$subtotal_ht = 0;
 		$subtotal_ttc = 0;
 

From 768f6416abd24d932dc2649f919de55633744945 Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Mon, 29 Aug 2022 11:26:26 +0200
Subject: [PATCH 281/974] Use isModEnabled

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

diff --git a/htdocs/compta/resultat/index.php b/htdocs/compta/resultat/index.php
index f43e677d773..9e1261788bf 100644
--- a/htdocs/compta/resultat/index.php
+++ b/htdocs/compta/resultat/index.php
@@ -110,7 +110,7 @@ $nbofyear = ($year_end - $year_start) + 1;
 
 // Define modecompta ('CREANCES-DETTES' or 'RECETTES-DEPENSES' or 'BOOKKEEPING')
 $modecompta = $conf->global->ACCOUNTING_MODE;
-if (!empty($conf->accounting->enabled)) {
+if (isModEnabled('accounting')) {
 	$modecompta = 'BOOKKEEPING';
 }
 if (GETPOST("modecompta", 'alpha')) {
@@ -122,10 +122,10 @@ $socid = GETPOST('socid', 'int');
 if ($user->socid > 0) {
 	$socid = $user->socid;
 }
-if (!empty($conf->comptabilite->enabled)) {
+if (isModEnabled('comptabilite')) {
 	$result = restrictedArea($user, 'compta', '', '', 'resultat');
 }
-if (!empty($conf->accounting->enabled)) {
+if (isModEnabled('accounting')) {
 	$result = restrictedArea($user, 'accounting', '', '', 'comptarapport');
 }
 
@@ -151,7 +151,7 @@ if ($modecompta == 'CREANCES-DETTES') {
 	$calcmode = $langs->trans("CalcModeDebt");
 	$calcmode .= '<br>('.$langs->trans("SeeReportInInputOutputMode", '{s1}', '{s2}').')';
 	$calcmode = str_replace(array('{s1}', '{s2}'), array('<a href="'.$_SERVER["PHP_SELF"].'?year_start='.$year_start.'&modecompta=RECETTES-DEPENSES">', '</a>'), $calcmode);
-	if (!empty($conf->accounting->enabled)) {
+	if (isModEnabled('accounting')) {
 		$calcmode .= '<br>('.$langs->trans("SeeReportInBookkeepingMode", '{s1}', '{s2}').')';
 		$calcmode = str_replace(array('{s1}', '{s2}'), array('<a href="'.$_SERVER["PHP_SELF"].'?year_start='.$year_start.'&modecompta=BOOKKEEPING">', '</a>'), $calcmode);
 	}
@@ -171,7 +171,7 @@ if ($modecompta == 'CREANCES-DETTES') {
 	$calcmode = $langs->trans("CalcModeEngagement");
 	$calcmode .= '<br>('.$langs->trans("SeeReportInDueDebtMode", '{s1}', '{s2}').')';
 	$calcmode = str_replace(array('{s1}', '{s2}'), array('<a href="'.$_SERVER["PHP_SELF"].'?year_start='.$year_start.'&modecompta=CREANCES-DETTES">', '</a>'), $calcmode);
-	if (!empty($conf->accounting->enabled)) {
+	if (isModEnabled('accounting')) {
 		$calcmode .= '<br>('.$langs->trans("SeeReportInBookkeepingMode", '{s1}', '{s2}').')';
 		$calcmode = str_replace(array('{s1}', '{s2}'), array('<a href="'.$_SERVER["PHP_SELF"].'?year_start='.$year_start.'&modecompta=BOOKKEEPING">', '</a>'), $calcmode);
 	}
@@ -200,7 +200,7 @@ $hselected = 'report';
 
 report_header($name, '', $period, $periodlink, $description, $builddate, $exportlink, array('modecompta'=>$modecompta), $calcmode);
 
-if (!empty($conf->accounting->enabled) && $modecompta != 'BOOKKEEPING') {
+if (isModEnabled('accounting') && $modecompta != 'BOOKKEEPING') {
 	print info_admin($langs->trans("WarningReportNotReliable"), 0, 0, 1);
 }
 
@@ -796,7 +796,7 @@ if (!empty($conf->don->enabled) && ($modecompta == 'CREANCES-DETTES' || $modecom
  * Various Payments
  */
 
-if (!empty($conf->global->ACCOUNTING_REPORTS_INCLUDE_VARPAY) && !empty($conf->banque->enabled) && ($modecompta == 'CREANCES-DETTES' || $modecompta == "RECETTES-DEPENSES")) {
+if (!empty($conf->global->ACCOUNTING_REPORTS_INCLUDE_VARPAY) && isModEnabled('banque') && ($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";
@@ -907,7 +907,7 @@ if (!empty($conf->global->ACCOUNTING_REPORTS_INCLUDE_LOAN) && !empty($conf->loan
  * Request in mode BOOKKEEPING
  */
 
-if (!empty($conf->accounting->enabled) && ($modecompta == 'BOOKKEEPING')) {
+if (isModEnabled('accounting') && ($modecompta == 'BOOKKEEPING')) {
 	$predefinedgroupwhere = "(";
 	$predefinedgroupwhere .= " (aa.pcg_type = 'EXPENSE')";
 	$predefinedgroupwhere .= " OR ";

From 07e91a061a347c6f0168384c6350fed64a771bd8 Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Mon, 29 Aug 2022 11:26:32 +0200
Subject: [PATCH 282/974] Use isModEnabled

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

diff --git a/htdocs/compta/resultat/result.php b/htdocs/compta/resultat/result.php
index 81e6672a1e4..57157ec0140 100644
--- a/htdocs/compta/resultat/result.php
+++ b/htdocs/compta/resultat/result.php
@@ -137,7 +137,7 @@ if ($cat_id == 0) {
 
 // Define modecompta ('CREANCES-DETTES' or 'RECETTES-DEPENSES' or 'BOOKKEEPING')
 $modecompta = $conf->global->ACCOUNTING_MODE;
-if (!empty($conf->accounting->enabled)) {
+if (isModEnabled('accounting')) {
 	$modecompta = 'BOOKKEEPING';
 }
 if (GETPOST("modecompta")) {
@@ -151,10 +151,10 @@ $socid = GETPOST('socid', 'int');
 if ($user->socid > 0) {
 	$socid = $user->socid;
 }
-if (!empty($conf->comptabilite->enabled)) {
+if (isModEnabled('comptabilite')) {
 	$result = restrictedArea($user, 'compta', '', '', 'resultat');
 }
-if (!empty($conf->accounting->enabled)) {
+if (isModEnabled('accounting')) {
 	$result = restrictedArea($user, 'accounting', '', '', 'comptarapport');
 }
 
@@ -193,7 +193,7 @@ if ($modecompta == "CREANCES-DETTES") {
 	$name = $langs->trans("AnnualByAccountDueDebtMode");
 	$calcmode = $langs->trans("CalcModeDebt");
 	$calcmode .= '<br>('.$langs->trans("SeeReportInInputOutputMode", '<a href="'.$_SERVER["PHP_SELF"].'?year='.$start_year.(GETPOST("month") > 0 ? '&month='.GETPOST("month") : '').'&modecompta=RECETTES-DEPENSES">', '</a>').')';
-	if (!empty($conf->accounting->enabled)) {
+	if (isModEnabled('accounting')) {
 		$calcmode .= '<br>('.$langs->trans("SeeReportInBookkeepingMode", '<a href="'.$_SERVER["PHP_SELF"].'?year='.$start_year.'&modecompta=BOOKKEEPING">', '</a>').')';
 	}
 	$period = $form->selectDate($date_start, 'date_start', 0, 0, 0, '', 1, 0).' - '.$form->selectDate($date_end, 'date_end', 0, 0, 0, '', 1, 0);
@@ -210,7 +210,7 @@ if ($modecompta == "CREANCES-DETTES") {
 	$name = $langs->trans("AnnualByAccountInputOutputMode");
 	$calcmode = $langs->trans("CalcModeEngagement");
 	$calcmode .= '<br>('.$langs->trans("SeeReportInDueDebtMode", '<a href="'.$_SERVER["PHP_SELF"].'?year='.$year.(GETPOST("month") > 0 ? '&month='.GETPOST("month") : '').'&modecompta=CREANCES-DETTES">', '</a>').')';
-	if (!empty($conf->accounting->enabled)) {
+	if (isModEnabled('accounting')) {
 		$calcmode .= '<br>('.$langs->trans("SeeReportInBookkeepingMode", '<a href="'.$_SERVER["PHP_SELF"].'?year='.$year.'&modecompta=BOOKKEEPING">', '</a>').')';
 	}
 	$period = $form->selectDate($date_start, 'date_start', 0, 0, 0, '', 1, 0).' - '.$form->selectDate($date_end, 'date_end', 0, 0, 0, '', 1, 0);
@@ -238,7 +238,7 @@ if ($modecompta == "CREANCES-DETTES") {
 report_header($name, '', $period, $periodlink, $description, $builddate, $exportlink, array('modecompta'=>$modecompta, 'action' => ''), $calcmode);
 
 
-if (!empty($conf->accounting->enabled) && $modecompta != 'BOOKKEEPING') {
+if (isModEnabled('accounting') && $modecompta != 'BOOKKEEPING') {
 	print info_admin($langs->trans("WarningReportNotReliable"), 0, 0, 1);
 }
 

From cb7728936a725d209dd871ee7db4470ba61bc601 Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Mon, 29 Aug 2022 11:26:40 +0200
Subject: [PATCH 283/974] Use isModEnabled

---
 htdocs/compta/sociales/card.php | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/htdocs/compta/sociales/card.php b/htdocs/compta/sociales/card.php
index 0bb69c444ba..0aa0f93540c 100644
--- a/htdocs/compta/sociales/card.php
+++ b/htdocs/compta/sociales/card.php
@@ -34,11 +34,11 @@ require_once DOL_DOCUMENT_ROOT.'/compta/sociales/class/paymentsocialcontribution
 require_once DOL_DOCUMENT_ROOT.'/core/lib/tax.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/user/class/user.class.php';
-if (!empty($conf->project->enabled)) {
+if (isModEnabled('project')) {
 	include_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 	include_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php';
 }
-if (!empty($conf->accounting->enabled)) {
+if (isModEnabled('accounting')) {
 	include_once DOL_DOCUMENT_ROOT.'/accountancy/class/accountingjournal.class.php';
 }
 
@@ -333,7 +333,7 @@ $form = new Form($db);
 $formfile = new FormFile($db);
 $formsocialcontrib = new FormSocialContrib($db);
 $bankaccountstatic = new Account($db);
-if (!empty($conf->project->enabled)) {
+if (isModEnabled('project')) {
 	$formproject = new FormProjets($db);
 }
 
@@ -407,7 +407,7 @@ if ($action == 'create') {
 	print '<td>'.img_picto('', 'user', 'class="pictofixedwidth"').$form->select_dolusers($fk_user, 'userid', 1).'</td></tr>';
 
 	// Project
-	if (!empty($conf->project->enabled)) {
+	if (isModEnabled('project')) {
 		$formproject = new FormProjets($db);
 
 		// Associated project
@@ -426,7 +426,7 @@ if ($action == 'create') {
 	print '</td></tr>';
 
 	// Bank Account
-	if (!empty($conf->banque->enabled)) {
+	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 '</td></tr>';
@@ -540,7 +540,7 @@ if ($id > 0) {
 		}
 
 		// Project
-		if (!empty($conf->project->enabled)) {
+		if (isModEnabled('project')) {
 			$langs->load("projects");
 			$morehtmlref .= '<br>'.$langs->trans('Project').' ';
 			if ($user->rights->tax->charges->creer) {
@@ -638,7 +638,7 @@ if ($id > 0) {
 		print '</td></tr>';
 
 		// Bank account
-		if (!empty($conf->banque->enabled)) {
+		if (isModEnabled('banque')) {
 			print '<tr><td class="nowrap">';
 			print '<table width="100%" class="nobordernopadding"><tr><td class="nowrap">';
 			print $langs->trans('DefaultBankAccount');
@@ -668,7 +668,7 @@ if ($id > 0) {
 		print '<div class="fichehalfright">';
 
 		$nbcols = 3;
-		if (!empty($conf->banque->enabled)) {
+		if (isModEnabled('banque')) {
 			$nbcols++;
 		}
 
@@ -703,7 +703,7 @@ if ($id > 0) {
 			print '<td>'.$langs->trans("RefPayment").'</td>';
 			print '<td>'.$langs->trans("Date").'</td>';
 			print '<td>'.$langs->trans("Type").'</td>';
-			if (!empty($conf->banque->enabled)) {
+			if (isModEnabled('banque')) {
 				print '<td class="liste_titre right">'.$langs->trans('BankAccount').'</td>';
 			}
 			print '<td class="right">'.$langs->trans("Amount").'</td>';
@@ -726,14 +726,14 @@ 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 (!empty($conf->banque->enabled)) {
+					if (isModEnabled('banque')) {
 						$bankaccountstatic->id = $objp->baid;
 						$bankaccountstatic->ref = $objp->baref;
 						$bankaccountstatic->label = $objp->baref;
 						$bankaccountstatic->number = $objp->banumber;
 						$bankaccountstatic->currency_code = $objp->bacurrency_code;
 
-						if (!empty($conf->accounting->enabled)) {
+						if (isModEnabled('accounting')) {
 							$bankaccountstatic->account_number = $objp->account_number;
 
 							$accountingjournal = new AccountingJournal($db);

From dd7dece5e8a1e12d57fa67a09ad5f70467209a6f Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Mon, 29 Aug 2022 11:27:40 +0200
Subject: [PATCH 284/974] Use isModEnabled

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

diff --git a/htdocs/compta/sociales/class/paymentsocialcontribution.class.php b/htdocs/compta/sociales/class/paymentsocialcontribution.class.php
index 318e7fcd96b..9d484e3d25a 100644
--- a/htdocs/compta/sociales/class/paymentsocialcontribution.class.php
+++ b/htdocs/compta/sociales/class/paymentsocialcontribution.class.php
@@ -552,7 +552,7 @@ class PaymentSocialContribution extends CommonObject
 
 		$error = 0;
 
-		if (!empty($conf->banque->enabled)) {
+		if (isModEnabled('banque')) {
 			include_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
 
 			$acc = new Account($this->db);

From 3ccb87e1fb5d7b882134800a8cc6cbfc60313884 Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Mon, 29 Aug 2022 11:27:44 +0200
Subject: [PATCH 285/974] Use isModEnabled

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

diff --git a/htdocs/compta/sociales/document.php b/htdocs/compta/sociales/document.php
index 2b0d17337a5..741100a53a3 100644
--- a/htdocs/compta/sociales/document.php
+++ b/htdocs/compta/sociales/document.php
@@ -33,7 +33,7 @@ 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/lib/tax.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
-if (!empty($conf->project->enabled)) {
+if (isModEnabled('project')) {
 	include_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 	include_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php';
 }
@@ -101,7 +101,7 @@ if ($action == 'setlib' && $user->rights->tax->charges->creer) {
  */
 
 $form = new Form($db);
-if (!empty($conf->project->enabled)) {
+if (isModEnabled('project')) {
 	$formproject = new FormProjets($db);
 }
 
@@ -121,7 +121,7 @@ if ($object->id) {
 	$morehtmlref .= $form->editfieldkey("Label", 'lib', $object->label, $object, $user->rights->tax->charges->creer, 'string', '', 0, 1);
 	$morehtmlref .= $form->editfieldval("Label", 'lib', $object->label, $object, $user->rights->tax->charges->creer, 'string', '', null, null, '', 1);
 	// Project
-	if (!empty($conf->project->enabled)) {
+	if (isModEnabled('project')) {
 		$langs->load("projects");
 		$morehtmlref .= '<br>'.$langs->trans('Project').' : ';
 		if (!empty($object->fk_project)) {

From ebba133880006002ac4dcfd4ca3ba59de3ddb0cf Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Mon, 29 Aug 2022 11:27:48 +0200
Subject: [PATCH 286/974] Use isModEnabled

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

diff --git a/htdocs/compta/sociales/info.php b/htdocs/compta/sociales/info.php
index 0976a76c26d..98440da6486 100644
--- a/htdocs/compta/sociales/info.php
+++ b/htdocs/compta/sociales/info.php
@@ -25,7 +25,7 @@ require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/sociales/class/chargesociales.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/tax.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
-if (!empty($conf->project->enabled)) {
+if (isModEnabled('project')) {
 	include_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 	include_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php';
 }
@@ -68,7 +68,7 @@ if ($action == 'setlib' && $user->rights->tax->charges->creer) {
 
 $form = new Form($db);
 
-if (!empty($conf->project->enabled)) {
+if (isModEnabled('project')) {
 	$formproject = new FormProjets($db);
 }
 
@@ -90,7 +90,7 @@ $morehtmlref = '<div class="refidno">';
 $morehtmlref .= $form->editfieldkey("Label", 'lib', $object->label, $object, $user->rights->tax->charges->creer, 'string', '', 0, 1);
 $morehtmlref .= $form->editfieldval("Label", 'lib', $object->label, $object, $user->rights->tax->charges->creer, 'string', '', null, null, '', 1);
 // Project
-if (!empty($conf->project->enabled)) {
+if (isModEnabled('project')) {
 	$langs->load("projects");
 	$morehtmlref .= '<br>'.$langs->trans('Project').' : ';
 	if (!empty($object->fk_project)) {

From 08bbe333795e7371b55180f9aa08a53970313547 Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Mon, 29 Aug 2022 11:29:17 +0200
Subject: [PATCH 287/974] Use isModEnabled

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

diff --git a/htdocs/compta/sociales/list.php b/htdocs/compta/sociales/list.php
index 14b8bfa043f..365cdf93a2f 100644
--- a/htdocs/compta/sociales/list.php
+++ b/htdocs/compta/sociales/list.php
@@ -34,7 +34,7 @@ require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formsocialcontrib.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
-if (!empty($conf->project->enabled)) {
+if (isModEnabled('project')) {
 	require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 }
 
@@ -107,7 +107,7 @@ $arrayfields = array(
 	'cs.paye'		=>array('label'=>"Status", 'checked'=>1, 'position'=>110),
 );
 
-if (!empty($conf->banque->enabled)) {
+if (isModEnabled('banque')) {
 	$arrayfields['cs.fk_account'] = array('checked'=>-1, 'position'=>90, 'label'=>"DefaultBankAccount");
 }
 
@@ -179,7 +179,7 @@ $formother = new FormOther($db);
 $bankstatic = new Account($db);
 $formsocialcontrib = new FormSocialContrib($db);
 $chargesociale_static = new ChargeSociales($db);
-if (!empty($conf->project->enabled)) {
+if (isModEnabled('project')) {
 	$projectstatic = new Project($db);
 }
 
@@ -187,7 +187,7 @@ llxHeader('', $langs->trans("SocialContributions"));
 
 $sql = "SELECT cs.rowid, cs.fk_type as type, cs.fk_user,";
 $sql .= " cs.amount, cs.date_ech, cs.libelle as label, cs.paye, cs.periode, cs.fk_account,";
-if (!empty($conf->project->enabled)) {
+if (isModEnabled('project')) {
 	$sql .= " p.rowid as project_id, p.ref as project_ref, p.title as project_label,";
 }
 $sql .= " c.libelle as type_label, c.accountancy_code as type_accountancy_code,";
@@ -197,7 +197,7 @@ $sql .= " FROM ".MAIN_DB_PREFIX."c_chargesociales as c,";
 $sql .= " ".MAIN_DB_PREFIX."chargesociales as cs";
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."bank_account as ba ON (cs.fk_account = ba.rowid)";
 $sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_paiement as pay ON (cs.fk_mode_reglement = pay.id)';
-if (!empty($conf->project->enabled)) {
+if (isModEnabled('project')) {
 	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."projet as p ON p.rowid = cs.fk_projet";
 }
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."paiementcharge as pc ON pc.fk_charge = cs.rowid";
@@ -211,7 +211,7 @@ if ($search_ref) {
 if ($search_label) {
 	$sql .= natural_search("cs.libelle", $search_label);
 }
-if (!empty($conf->project->enabled)) {
+if (isModEnabled('project')) {
 	if ($search_project_ref != '') {
 		$sql .= natural_search("p.ref", $search_project_ref);
 	}
@@ -247,7 +247,7 @@ if ($search_typeid > 0) {
 	$sql .= " AND cs.fk_type = ".((int) $search_typeid);
 }
 $sql .= " GROUP BY cs.rowid, cs.fk_type, cs.fk_user, cs.amount, cs.date_ech, cs.libelle, cs.paye, cs.periode, cs.fk_account, c.libelle, c.accountancy_code, ba.label, ba.ref, ba.number, ba.account_number, ba.iban_prefix, ba.bic, ba.currency_code, ba.clos, pay.code, u.lastname";
-if (!empty($conf->project->enabled)) {
+if (isModEnabled('project')) {
 	$sql .= ", p.rowid, p.ref, p.title";
 }
 $sql .= $db->order($sortfield, $sortorder);
@@ -553,7 +553,7 @@ while ($i < min($num, $limit)) {
 	$chargesociale_static->label = $obj->label;
 	$chargesociale_static->type_label = $obj->type_label;
 
-	if (!empty($conf->project->enabled)) {
+	if (isModEnabled('project')) {
 		$projectstatic->id = $obj->project_id;
 		$projectstatic->ref = $obj->project_ref;
 		$projectstatic->title = $obj->project_label;
@@ -589,7 +589,7 @@ while ($i < min($num, $limit)) {
 	if (!empty($arrayfields['cs.fk_type']['checked'])) {
 		$typelabeltoshow = $obj->type_label;
 		$typelabelpopup = $obj->type_label;
-		if (!empty($conf->accounting->enabled)) {
+		if (isModEnabled('accounting')) {
 			$typelabelpopup .= ' - '.$langs->trans("AccountancyCode").': '.$obj->type_accountancy_code;
 		}
 		print '<td class="tdoverflowmax200" title="'.dol_escape_htmltag($typelabelpopup).'">'.dol_escape_htmltag($typelabeltoshow).'</td>';

From 6715d379d5b2b82c217e45414168e597eb4e9fa0 Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Mon, 29 Aug 2022 11:33:47 +0200
Subject: [PATCH 288/974] Use isModEnabled

---
 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 8ede1c3b502..59af7a36870 100644
--- a/htdocs/compta/sociales/note.php
+++ b/htdocs/compta/sociales/note.php
@@ -25,7 +25,7 @@ require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/sociales/class/chargesociales.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/tax.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
-if (!empty($conf->project->enabled)) {
+if (isModEnabled('project')) {
 	include_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 	include_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php';
 }
@@ -93,7 +93,7 @@ if ($id > 0 || !empty($ref)) {
 	$morehtmlref .= $form->editfieldkey("Label", 'lib', $object->label, $object, $user->rights->tax->charges->creer, 'string', '', 0, 1);
 	$morehtmlref .= $form->editfieldval("Label", 'lib', $object->label, $object, $user->rights->tax->charges->creer, 'string', '', null, null, '', 1);
 	// Project
-	if (!empty($conf->project->enabled)) {
+	if (isModEnabled('project')) {
 		$langs->load("projects");
 		$morehtmlref .= '<br>'.$langs->trans('Project').' : ';
 		if (!empty($object->fk_project)) {

From ed0b8d51556b5fdebe4a21bee205f1823dc72f99 Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Mon, 29 Aug 2022 11:33:55 +0200
Subject: [PATCH 289/974] Use isModEnabled

---
 htdocs/compta/sociales/payments.php | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/htdocs/compta/sociales/payments.php b/htdocs/compta/sociales/payments.php
index 843dbd58a50..a823547b7e7 100644
--- a/htdocs/compta/sociales/payments.php
+++ b/htdocs/compta/sociales/payments.php
@@ -37,7 +37,7 @@ require_once DOL_DOCUMENT_ROOT.'/salaries/class/salary.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formsocialcontrib.class.php';
-if (!empty($conf->accounting->enabled)) {
+if (isModEnabled('accounting')) {
 	include_once DOL_DOCUMENT_ROOT.'/accountancy/class/accountingjournal.class.php';
 }
 
@@ -225,7 +225,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 (!empty($conf->banque->enabled)) {
+if (isModEnabled('banque')) {
 	print '<td class="liste_titre"></td>';
 	print '<td class="liste_titre"></td>';
 }
@@ -245,7 +245,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 (!empty($conf->banque->enabled)) {
+if (isModEnabled('banque')) {
 	print_liste_field_titre("BankTransactionLine", $_SERVER["PHP_SELF"], "pc.fk_bank", "", $param, '', $sortfield, $sortorder);
 	print_liste_field_titre("Account", $_SERVER["PHP_SELF"], "ba.label", "", $param, "", $sortfield, $sortorder);
 }
@@ -323,7 +323,7 @@ while ($i < min($num, $limit)) {
 	print '<td>'.$obj->num_payment.'</td>';
 
 	// Account
-	if (!empty($conf->banque->enabled)) {
+	if (isModEnabled('banque')) {
 		// Bank transaction
 		print '<td class="nowraponall">';
 		$accountlinestatic->id = $obj->fk_bank;
@@ -341,7 +341,7 @@ while ($i < min($num, $limit)) {
 			$accountstatic->currency_code = $langs->trans("Currency".$obj->currency_code);
 			$accountstatic->clos = $obj->clos;
 
-			if (!empty($conf->accounting->enabled)) {
+			if (isModEnabled('accounting')) {
 				$accountstatic->account_number = $obj->account_number;
 				$accountstatic->accountancy_journal = $obj->account_journal;
 			}
@@ -379,7 +379,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 (!empty($conf->banque->enabled)) {
+if (isModEnabled('banque')) {
 	print '<td></td>';
 	print '<td></td>';
 }

From 03f3ff91345314174324f7b645e46225de0272cd Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Mon, 29 Aug 2022 11:34:00 +0200
Subject: [PATCH 290/974] Use isModEnabled

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

diff --git a/htdocs/compta/stats/byratecountry.php b/htdocs/compta/stats/byratecountry.php
index e188cdae859..86a547204f7 100644
--- a/htdocs/compta/stats/byratecountry.php
+++ b/htdocs/compta/stats/byratecountry.php
@@ -282,7 +282,7 @@ $description .= '  <input type="hidden" name="modecompta" value="'.$modecompta.'
 
 report_header($name, '', $period, $periodlink, $description, $builddate, $exportlink, array(), $calcmode);
 
-if (!empty($conf->accounting->enabled) && $modecompta != 'BOOKKEEPING') {
+if (isModEnabled('accounting') && $modecompta != 'BOOKKEEPING') {
 	print info_admin($langs->trans("WarningReportNotReliable"), 0, 0, 1);
 }
 

From 8b7627777924c4473df95d1ecc22dd5e9a4b8758 Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Mon, 29 Aug 2022 11:34:07 +0200
Subject: [PATCH 291/974] Use isModEnabled

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

diff --git a/htdocs/compta/stats/cabyprodserv.php b/htdocs/compta/stats/cabyprodserv.php
index 6b4f8f3e9f2..152c6ac0442 100644
--- a/htdocs/compta/stats/cabyprodserv.php
+++ b/htdocs/compta/stats/cabyprodserv.php
@@ -40,10 +40,10 @@ $socid = GETPOST('socid', 'int');
 if ($user->socid > 0) {
 	$socid = $user->socid;
 }
-if (!empty($conf->comptabilite->enabled)) {
+if (isModEnabled('comptabilite')) {
 	$result = restrictedArea($user, 'compta', '', '', 'resultat');
 }
-if (!empty($conf->accounting->enabled)) {
+if (isModEnabled('accounting')) {
 	$result = restrictedArea($user, 'accounting', '', '', 'comptarapport');
 }
 
@@ -272,7 +272,7 @@ if ($date_end == dol_time_plus_duree($date_start, 1, 'y') - 1) {
 
 report_header($name, $namelink, $period, $periodlink, $description, $builddate, $exportlink, $tableparams, $calcmode);
 
-if (!empty($conf->accounting->enabled) && $modecompta != 'BOOKKEEPING') {
+if (isModEnabled('accounting') && $modecompta != 'BOOKKEEPING') {
 	print info_admin($langs->trans("WarningReportNotReliable"), 0, 0, 1);
 }
 

From 0b362424e544577045d35421c8b2f85ab68c2dc9 Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Mon, 29 Aug 2022 11:34:14 +0200
Subject: [PATCH 292/974] Use isModEnabled

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

diff --git a/htdocs/compta/stats/cabyuser.php b/htdocs/compta/stats/cabyuser.php
index 7c0454a9afd..04e46e72e1b 100644
--- a/htdocs/compta/stats/cabyuser.php
+++ b/htdocs/compta/stats/cabyuser.php
@@ -39,10 +39,10 @@ $socid = GETPOST('socid', 'int');
 if ($user->socid > 0) {
 	$socid = $user->socid;
 }
-if (!empty($conf->comptabilite->enabled)) {
+if (isModEnabled('comptabilite')) {
 	$result = restrictedArea($user, 'compta', '', '', 'resultat');
 }
-if (!empty($conf->accounting->enabled)) {
+if (isModEnabled('accounting')) {
 	$result = restrictedArea($user, 'accounting', '', '', 'comptarapport');
 }
 
@@ -231,7 +231,7 @@ if (!empty($modecompta)) {
 
 report_header($name, $namelink, $period, $periodlink, $description, $builddate, $exportlink, $moreparam, $calcmode);
 
-if (!empty($conf->accounting->enabled) && $modecompta != 'BOOKKEEPING') {
+if (isModEnabled('accounting') && $modecompta != 'BOOKKEEPING') {
 	print info_admin($langs->trans("WarningReportNotReliable"), 0, 0, 1);
 }
 

From 2b706c7a6006fcc6d60a1b4d135bbbdfa2ad96cd Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Mon, 29 Aug 2022 11:34:18 +0200
Subject: [PATCH 293/974] Use isModEnabled

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

diff --git a/htdocs/compta/stats/casoc.php b/htdocs/compta/stats/casoc.php
index 50f326dc252..f02fb24dc7b 100644
--- a/htdocs/compta/stats/casoc.php
+++ b/htdocs/compta/stats/casoc.php
@@ -68,10 +68,10 @@ if (GETPOST('subcat', 'alpha') === 'yes') {
 if ($user->socid > 0) {
 	$socid = $user->socid;
 }
-if (!empty($conf->comptabilite->enabled)) {
+if (isModEnabled('comptabilite')) {
 	$result = restrictedArea($user, 'compta', '', '', 'resultat');
 }
-if (!empty($conf->accounting->enabled)) {
+if (isModEnabled('accounting')) {
 	$result = restrictedArea($user, 'accounting', '', '', 'comptarapport');
 }
 
@@ -256,7 +256,7 @@ if ($date_end == dol_time_plus_duree($date_start, 1, 'y') - 1) {
 
 report_header($name, $namelink, $period, $periodlink, $description, $builddate, $exportlink, $tableparams, $calcmode);
 
-if (!empty($conf->accounting->enabled) && $modecompta != 'BOOKKEEPING') {
+if (isModEnabled('accounting') && $modecompta != 'BOOKKEEPING') {
 	print info_admin($langs->trans("WarningReportNotReliable"), 0, 0, 1);
 }
 

From a2fe675ead7ac59565b0c97e344d13a9bcb465b3 Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Mon, 29 Aug 2022 11:34:24 +0200
Subject: [PATCH 294/974] Use isModEnabled

---
 htdocs/compta/stats/index.php | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/htdocs/compta/stats/index.php b/htdocs/compta/stats/index.php
index 4051055af60..a81c732017f 100644
--- a/htdocs/compta/stats/index.php
+++ b/htdocs/compta/stats/index.php
@@ -109,7 +109,7 @@ $nbofyear = ($year_end - $year_start) + 1;
 
 // Define modecompta ('CREANCES-DETTES' or 'RECETTES-DEPENSES' or 'BOOKKEEPING')
 $modecompta = $conf->global->ACCOUNTING_MODE;
-if (!empty($conf->accounting->enabled)) {
+if (isModEnabled('accounting')) {
 	$modecompta = 'BOOKKEEPING';
 }
 if (GETPOST("modecompta")) {
@@ -120,10 +120,10 @@ if (GETPOST("modecompta")) {
 if ($user->socid > 0) {
 	$socid = $user->socid;
 }
-if (!empty($conf->comptabilite->enabled)) {
+if (isModEnabled('comptabilite')) {
 	$result = restrictedArea($user, 'compta', '', '', 'resultat');
 }
-if (!empty($conf->accounting->enabled)) {
+if (isModEnabled('accounting')) {
 	$result = restrictedArea($user, 'accounting', '', '', 'comptarapport');
 }
 
@@ -153,7 +153,7 @@ if ($modecompta == "CREANCES-DETTES") {
 	$name = $langs->trans("Turnover");
 	$calcmode = $langs->trans("CalcModeDebt");
 	//$calcmode.='<br>('.$langs->trans("SeeReportInInputOutputMode",'<a href="'.$_SERVER["PHP_SELF"].'?year_start='.$year_start.'&modecompta=RECETTES-DEPENSES">','</a>').')';
-	if (!empty($conf->accounting->enabled)) {
+	if (isModEnabled('accounting')) {
 		$calcmode .= '<br>('.$langs->trans("SeeReportInBookkeepingMode", '{link1}', '{link2}').')';
 		$calcmode = str_replace('{link1}', '<a class="bold" href="'.$_SERVER["PHP_SELF"].'?'.($param ? $param : 'year_start='.$year_start).'&modecompta=BOOKKEEPING">', $calcmode);
 		$calcmode = str_replace('{link2}', '</a>', $calcmode);
@@ -171,7 +171,7 @@ if ($modecompta == "CREANCES-DETTES") {
 	$name = $langs->trans("TurnoverCollected");
 	$calcmode = $langs->trans("CalcModeEngagement");
 	//$calcmode .= '<br>('.$langs->trans("SeeReportInDueDebtMode",'<a href="'.$_SERVER["PHP_SELF"].'?year_start='.$year_start.'&modecompta=CREANCES-DETTES">','</a>').')';
-	//if (!empty($conf->accounting->enabled)) {
+	//if (isModEnabled('accounting')) {
 	//$calcmode.='<br>('.$langs->trans("SeeReportInBookkeepingMode",'<a href="'.$_SERVER["PHP_SELF"].'?year_start='.$year_start.'&modecompta=BOOKKEEPINGCOLLECTED">','</a>').')';
 	//}
 	$periodlink = ($year_start ? "<a href='".$_SERVER["PHP_SELF"]."?year=".($year_start + $nbofyear - 2)."&modecompta=".$modecompta."'>".img_previous()."</a> <a href='".$_SERVER["PHP_SELF"]."?year=".($year_start + $nbofyear)."&modecompta=".$modecompta."'>".img_next()."</a>" : "");
@@ -201,7 +201,7 @@ if (!empty($modecompta)) {
 }
 report_header($name, $namelink, $period, $periodlink, $description, $builddate, $exportlink, $moreparam, $calcmode);
 
-if (!empty($conf->accounting->enabled) && $modecompta != 'BOOKKEEPING') {
+if (isModEnabled('accounting') && $modecompta != 'BOOKKEEPING') {
 	print info_admin($langs->trans("WarningReportNotReliable"), 0, 0, 1);
 }
 

From ebff14038939e30d468cace6b8428736421edd55 Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Mon, 29 Aug 2022 11:34:29 +0200
Subject: [PATCH 295/974] Use isModEnabled

---
 htdocs/compta/stats/supplier_turnover.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/htdocs/compta/stats/supplier_turnover.php b/htdocs/compta/stats/supplier_turnover.php
index cd70671af61..abbb92223cb 100644
--- a/htdocs/compta/stats/supplier_turnover.php
+++ b/htdocs/compta/stats/supplier_turnover.php
@@ -103,7 +103,7 @@ $nbofyear = ($year_end - $year_start) + 1;
 
 // Define modecompta ('CREANCES-DETTES' or 'RECETTES-DEPENSES' or 'BOOKKEEPING')
 $modecompta = $conf->global->ACCOUNTING_MODE;
-if (!empty($conf->accounting->enabled)) {
+if (isModEnabled('accounting')) {
 	$modecompta = 'BOOKKEEPING';
 }
 if (GETPOST("modecompta")) {
@@ -114,10 +114,10 @@ if (GETPOST("modecompta")) {
 if ($user->socid > 0) {
 	$socid = $user->socid;
 }
-if (!empty($conf->comptabilite->enabled)) {
+if (isModEnabled('comptabilite')) {
 	$result = restrictedArea($user, 'compta', '', '', 'resultat');
 }
-if (!empty($conf->accounting->enabled)) {
+if (isModEnabled('accounting')) {
 	$result = restrictedArea($user, 'accounting', '', '', 'comptarapport');
 }
 
@@ -142,7 +142,7 @@ if ($modecompta == "BOOKKEEPINGCOLLECTED") {
 if ($modecompta == "CREANCES-DETTES") {
 	$name = $langs->trans("PurchaseTurnover");
 	$calcmode = $langs->trans("CalcModeDebt");
-	if (!empty($conf->accounting->enabled)) {
+	if (isModEnabled('accounting')) {
 		$calcmode .= '<br>('.$langs->trans("SeeReportInBookkeepingMode", '{link1}', '{link2}').')';
 		$calcmode = str_replace('{link1}', '<a href="'.$_SERVER["PHP_SELF"].'?year_start='.$year_start.'&modecompta=BOOKKEEPING">', $calcmode);
 		$calcmode = str_replace('{link2}', '</a>', $calcmode);
@@ -187,7 +187,7 @@ if (!empty($modecompta)) {
 }
 report_header($name, $namelink, $period, $periodlink, $description, $builddate, $exportlink, $moreparam, $calcmode);
 
-if (!empty($conf->accounting->enabled) && $modecompta != 'BOOKKEEPING') {
+if (isModEnabled('accounting') && $modecompta != 'BOOKKEEPING') {
 	print info_admin($langs->trans("WarningReportNotReliable"), 0, 0, 1);
 }
 

From e2af7238f4af2db103afc8718451091307c37b5e Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Mon, 29 Aug 2022 11:34:44 +0200
Subject: [PATCH 296/974] Use isModEnabled

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

diff --git a/htdocs/compta/stats/supplier_turnover_by_prodserv.php b/htdocs/compta/stats/supplier_turnover_by_prodserv.php
index f36383ad94b..d2bd20964f8 100644
--- a/htdocs/compta/stats/supplier_turnover_by_prodserv.php
+++ b/htdocs/compta/stats/supplier_turnover_by_prodserv.php
@@ -197,10 +197,10 @@ $socid = GETPOST('socid', 'int');
 if ($user->socid > 0) {
 	$socid = $user->socid;
 }
-if (!empty($conf->comptabilite->enabled)) {
+if (isModEnabled('comptabilite')) {
 	$result = restrictedArea($user, 'compta', '', '', 'resultat');
 }
-if (!empty($conf->accounting->enabled)) {
+if (isModEnabled('accounting')) {
 	$result = restrictedArea($user, 'accounting', '', '', 'comptarapport');
 }
 
@@ -252,7 +252,7 @@ if ($date_end == dol_time_plus_duree($date_start, 1, 'y') - 1) {
 
 report_header($name, $namelink, $period, $periodlink, $description, $builddate, $exportlink, $tableparams, $calcmode);
 
-if (!empty($conf->accounting->enabled) && $modecompta != 'BOOKKEEPING') {
+if (isModEnabled('accounting') && $modecompta != 'BOOKKEEPING') {
 	print info_admin($langs->trans("WarningReportNotReliable"), 0, 0, 1);
 }
 

From 5b810db990c50de3312a24d654c68fe77b2583cf Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Mon, 29 Aug 2022 11:34:49 +0200
Subject: [PATCH 297/974] Use isModEnabled

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

diff --git a/htdocs/compta/stats/supplier_turnover_by_thirdparty.php b/htdocs/compta/stats/supplier_turnover_by_thirdparty.php
index 0be2df11190..7516e45a21f 100644
--- a/htdocs/compta/stats/supplier_turnover_by_thirdparty.php
+++ b/htdocs/compta/stats/supplier_turnover_by_thirdparty.php
@@ -168,10 +168,10 @@ foreach ($allparams as $key => $value) {
 if ($user->socid > 0) {
 	$socid = $user->socid;
 }
-if (!empty($conf->comptabilite->enabled)) {
+if (isModEnabled('comptabilite')) {
 	$result = restrictedArea($user, 'compta', '', '', 'resultat');
 }
-if (!empty($conf->accounting->enabled)) {
+if (isModEnabled('accounting')) {
 	$result = restrictedArea($user, 'accounting', '', '', 'comptarapport');
 }
 
@@ -224,7 +224,7 @@ if ($date_end == dol_time_plus_duree($date_start, 1, 'y') - 1) {
 
 report_header($name, '', $period, $periodlink, $description, $builddate, $exportlink, $tableparams, $calcmode);
 
-if (!empty($conf->accounting->enabled) && $modecompta != 'BOOKKEEPING') {
+if (isModEnabled('accounting') && $modecompta != 'BOOKKEEPING') {
 	print info_admin($langs->trans("WarningReportNotReliable"), 0, 0, 1);
 }
 

From b1514af1982ba612f377a16df630c1dc2a63df00 Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Mon, 29 Aug 2022 11:34:56 +0200
Subject: [PATCH 298/974] Use isModEnabled

---
 htdocs/compta/tva/card.php | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/htdocs/compta/tva/card.php b/htdocs/compta/tva/card.php
index e40b9b9b409..882f466f037 100644
--- a/htdocs/compta/tva/card.php
+++ b/htdocs/compta/tva/card.php
@@ -35,7 +35,7 @@ require_once DOL_DOCUMENT_ROOT.'/compta/tva/class/paymentvat.class.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/vat.lib.php';
 
-if (!empty($conf->accounting->enabled)) {
+if (isModEnabled('accounting')) {
 		include_once DOL_DOCUMENT_ROOT.'/accountancy/class/accountingjournal.class.php';
 }
 
@@ -494,7 +494,7 @@ if ($action == 'create') {
 	print "</td>\n";
 	print "</tr>";
 
-	if (!empty($conf->banque->enabled)) {
+	if (isModEnabled('banque')) {
 		// Bank account
 		print '<tr><td class="fieldrequired" id="label_fk_account">'.$langs->trans("BankAccount").'</td><td>';
 		print img_picto('', 'bank_account', 'pictofixedwidth');
@@ -629,7 +629,7 @@ if ($id > 0) {
 	print '</td></tr>';
 
 	// Bank account
-	if (!empty($conf->banque->enabled)) {
+	if (isModEnabled('banque')) {
 		print '<tr><td class="nowrap">';
 		print '<table width="100%" class="nobordernopadding"><tr><td class="nowrap">';
 		print $langs->trans('BankAccount');
@@ -660,7 +660,7 @@ if ($id > 0) {
 	print '<div class="fichehalfright">';
 
 	$nbcols = 3;
-	if (!empty($conf->banque->enabled)) {
+	if (isModEnabled('banque')) {
 		$nbcols++;
 	}
 
@@ -695,7 +695,7 @@ if ($id > 0) {
 		print '<td>'.$langs->trans("RefPayment").'</td>';
 		print '<td>'.$langs->trans("Date").'</td>';
 		print '<td>'.$langs->trans("Type").'</td>';
-		if (!empty($conf->banque->enabled)) {
+		if (isModEnabled('banque')) {
 			print '<td class="liste_titre right">'.$langs->trans('BankAccount').'</td>';
 		}
 		print '<td class="right">'.$langs->trans("Amount").'</td>';
@@ -712,14 +712,14 @@ 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 (!empty($conf->banque->enabled)) {
+				if (isModEnabled('banque')) {
 					$bankaccountstatic->id = $objp->baid;
 					$bankaccountstatic->ref = $objp->baref;
 					$bankaccountstatic->label = $objp->baref;
 					$bankaccountstatic->number = $objp->banumber;
 					$bankaccountstatic->currency_code = $objp->bacurrency_code;
 
-					if (!empty($conf->accounting->enabled)) {
+					if (isModEnabled('accounting')) {
 						$bankaccountstatic->account_number = $objp->account_number;
 
 						$accountingjournal = new AccountingJournal($db);

From 6ae73e72e50f11bad4b39d0a32e423e0250abd50 Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Mon, 29 Aug 2022 11:35:00 +0200
Subject: [PATCH 299/974] Use isModEnabled

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

diff --git a/htdocs/compta/tva/class/paymentvat.class.php b/htdocs/compta/tva/class/paymentvat.class.php
index b7500fffaa0..7f10570b0aa 100644
--- a/htdocs/compta/tva/class/paymentvat.class.php
+++ b/htdocs/compta/tva/class/paymentvat.class.php
@@ -560,7 +560,7 @@ class PaymentVAT extends CommonObject
 
 		$error = 0;
 
-		if (!empty($conf->banque->enabled)) {
+		if (isModEnabled('banque')) {
 			include_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
 
 			$acc = new Account($this->db);

From b3f3eb1eeb1aebabdfb21a9b5cb0cfe3f9d5a364 Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Mon, 29 Aug 2022 11:35:04 +0200
Subject: [PATCH 300/974] Use isModEnabled

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

diff --git a/htdocs/compta/tva/class/tva.class.php b/htdocs/compta/tva/class/tva.class.php
index f54ed42fb06..014e026de86 100644
--- a/htdocs/compta/tva/class/tva.class.php
+++ b/htdocs/compta/tva/class/tva.class.php
@@ -572,11 +572,11 @@ class Tva extends CommonObject
 			$this->error = $langs->trans("ErrorFieldRequired", $langs->transnoentities("Amount"));
 			return -4;
 		}
-		if (!empty($conf->banque->enabled) && (empty($this->accountid) || $this->accountid <= 0)) {
+		if (isModEnabled('banque') && (empty($this->accountid) || $this->accountid <= 0)) {
 			$this->error = $langs->trans("ErrorFieldRequired", $langs->transnoentities("Account"));
 			return -5;
 		}
-		if (!empty($conf->banque->enabled) && (empty($this->type_payment) || $this->type_payment <= 0)) {
+		if (isModEnabled('banque') && (empty($this->type_payment) || $this->type_payment <= 0)) {
 			$this->error = $langs->trans("ErrorFieldRequired", $langs->transnoentities("PaymentMode"));
 			return -5;
 		}
@@ -633,7 +633,7 @@ class Tva extends CommonObject
 
 			if ($this->id > 0) {
 				$ok = 1;
-				if (!empty($conf->banque->enabled) && !empty($this->amount)) {
+				if (isModEnabled('banque') && !empty($this->amount)) {
 					// Insert into llx_bank
 					require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
 

From 85571fee42b21340b058d3b3aee8726f0340c647 Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Mon, 29 Aug 2022 11:35:08 +0200
Subject: [PATCH 301/974] Use isModEnabled

---
 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 dc362e60051..745742b1c8e 100644
--- a/htdocs/compta/tva/document.php
+++ b/htdocs/compta/tva/document.php
@@ -34,7 +34,7 @@ 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/lib/vat.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
-if (!empty($conf->project->enabled)) {
+if (isModEnabled('project')) {
 	require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 	require_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php';
 }
@@ -102,7 +102,7 @@ if ($action == 'setlib' && $permissiontoadd) {
  */
 
 $form = new Form($db);
-if (!empty($conf->project->enabled)) {
+if (isModEnabled('project')) {
 	$formproject = new FormProjets($db);
 }
 

From f8f9b3fa4d02727302759db620545c1945059b4e Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Mon, 29 Aug 2022 11:35:12 +0200
Subject: [PATCH 302/974] Use isModEnabled

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

diff --git a/htdocs/compta/tva/list.php b/htdocs/compta/tva/list.php
index 5f76b2e9190..3913122cc49 100644
--- a/htdocs/compta/tva/list.php
+++ b/htdocs/compta/tva/list.php
@@ -83,7 +83,7 @@ $arrayfields = array(
 	't.status'			=>array('checked'=>1, 'position'=>90, 'label'=>"Status"),
 );
 
-if (!empty($conf->banque->enabled)) {
+if (isModEnabled('banque')) {
 	$arrayfields['t.fk_account'] = array('checked'=>1, 'position'=>60, 'label'=>"DefaultBankAccount");
 }
 

From ca3f5928752d2b2e46b9bfb3607c44940d2ca2b4 Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Mon, 29 Aug 2022 11:35:17 +0200
Subject: [PATCH 303/974] Use isModEnabled

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

diff --git a/htdocs/compta/tva/payments.php b/htdocs/compta/tva/payments.php
index 0279acdeaa4..a9c08962b5f 100644
--- a/htdocs/compta/tva/payments.php
+++ b/htdocs/compta/tva/payments.php
@@ -129,7 +129,7 @@ if (!empty($conf->tax->enabled) && $user->rights->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 (!empty($conf->banque->enabled)) {
+	if (isModEnabled('banque')) {
 		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);
 	}
@@ -221,7 +221,7 @@ if (!empty($conf->tax->enabled) && $user->rights->tax->charges->lire) {
 			// Chq number
 			print '<td>'.dol_escape_htmltag($obj->num_payment).'</td>';
 
-			if (!empty($conf->banque->enabled)) {
+			if (isModEnabled('banque')) {
 				// Bank transaction
 				print '<td>';
 				$accountlinestatic->id = $obj->fk_bank;
@@ -258,7 +258,7 @@ if (!empty($conf->tax->enabled) && $user->rights->tax->charges->lire) {
 		print '<td class="liste_total right"></td>'; // A total here has no sense
 		print '<td align="center" class="liste_total">&nbsp;</td>';
 		print '<td align="center" class="liste_total">&nbsp;</td>';
-		if (!empty($conf->banque->enabled)) {
+		if (isModEnabled('banque')) {
 			print '<td align="center" class="liste_total">&nbsp;</td>';
 			print '<td align="center" class="liste_total">&nbsp;</td>';
 		}

From aca6609f2111871837da77f865bd31e479cb58c6 Mon Sep 17 00:00:00 2001
From: Francis Appels <francis.appels@yahoo.com>
Date: Mon, 29 Aug 2022 11:36:19 +0200
Subject: [PATCH 304/974] Close Remove trigger ORDER_SUPPLIER_DISPATCH #18486

---
 ChangeLog                                           |  1 +
 .../interface_99_modZapier_ZapierTriggers.class.php |  2 +-
 htdocs/fourn/commande/dispatch.php                  | 13 -------------
 ...erface_99_modMyModule_MyModuleTriggers.class.php |  2 +-
 4 files changed, 3 insertions(+), 15 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index e99731fe548..cfcbac83dac 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -20,6 +20,7 @@ WARNING:
 
 Following changes may create regressions for some external modules, but were necessary to make Dolibarr better:
 * The signature of method getNomUrl() of class ProductFournisseur has been modified to match the signature of method Product
+* Trigger ORDER_SUPPLIER_DISPATCH is removed, use ORDER_SUPPLIER_RECEIVE and/or LINEORDER_SUPPLIER_DISPATCH instead.
 
 
 ***** ChangeLog for 16.0.0 compared to 15.0.0 *****
diff --git a/htdocs/core/triggers/interface_99_modZapier_ZapierTriggers.class.php b/htdocs/core/triggers/interface_99_modZapier_ZapierTriggers.class.php
index d706488129e..b131dd0391f 100644
--- a/htdocs/core/triggers/interface_99_modZapier_ZapierTriggers.class.php
+++ b/htdocs/core/triggers/interface_99_modZapier_ZapierTriggers.class.php
@@ -236,7 +236,7 @@ class InterfaceZapierTriggers extends DolibarrTriggers
 			// case 'ORDER_SUPPLIER_REFUSE':
 			// case 'ORDER_SUPPLIER_CANCEL':
 			// case 'ORDER_SUPPLIER_SENTBYMAIL':
-			// case 'ORDER_SUPPLIER_DISPATCH':
+			// case 'ORDER_SUPPLIER_RECEIVE':
 			// case 'LINEORDER_SUPPLIER_DISPATCH':
 			// case 'LINEORDER_SUPPLIER_CREATE':
 			// case 'LINEORDER_SUPPLIER_UPDATE':
diff --git a/htdocs/fourn/commande/dispatch.php b/htdocs/fourn/commande/dispatch.php
index 5dd20832088..2f0f7966679 100644
--- a/htdocs/fourn/commande/dispatch.php
+++ b/htdocs/fourn/commande/dispatch.php
@@ -373,19 +373,6 @@ if ($action == 'dispatch' && $permissiontoreceive) {
 		}
 	}
 
-	if (!$error) {
-		global $conf, $langs, $user;
-		// Call trigger
-
-		$result = $object->call_trigger('ORDER_SUPPLIER_DISPATCH', $user);
-		// End call triggers
-
-		if ($result < 0) {
-			setEventMessages($object->error, $object->errors, 'errors');
-			$error++;
-		}
-	}
-
 	if ($result >= 0 && !$error) {
 		$db->commit();
 
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 3c6196cee2f..2c76818ab84 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
@@ -177,7 +177,7 @@ class InterfaceMyModuleTriggers extends DolibarrTriggers
 			//case 'ORDER_SUPPLIER_REFUSE':
 			//case 'ORDER_SUPPLIER_CANCEL':
 			//case 'ORDER_SUPPLIER_SENTBYMAIL':
-			//case 'ORDER_SUPPLIER_DISPATCH':
+			//case 'ORDER_SUPPLIER_RECEIVE':
 			//case 'LINEORDER_SUPPLIER_DISPATCH':
 			//case 'LINEORDER_SUPPLIER_CREATE':
 			//case 'LINEORDER_SUPPLIER_UPDATE':

From 94e4144c27f236a3364e3fc80c3963317c52c542 Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Mon, 29 Aug 2022 11:56:02 +0200
Subject: [PATCH 305/974] Use isModEnabled

---
 htdocs/compta/accounting-files.php | 42 +++++++++++++++---------------
 1 file changed, 21 insertions(+), 21 deletions(-)

diff --git a/htdocs/compta/accounting-files.php b/htdocs/compta/accounting-files.php
index 60ffc2ae69a..0db718f28b4 100644
--- a/htdocs/compta/accounting-files.php
+++ b/htdocs/compta/accounting-files.php
@@ -102,7 +102,7 @@ $arrayfields = array(
 );
 
 // Security check
-if (empty($conf->comptabilite->enabled) && empty($conf->accounting->enabled)) {
+if (!isModEnabled('comptabilite') && !isModEnabled('accounting')) {
 	accessforbidden();
 }
 if ($user->socid > 0) {
@@ -111,12 +111,12 @@ if ($user->socid > 0) {
 
 // Define $arrayofentities if multientity is set.
 $arrayofentities = array();
-if (!empty($conf->multicompany->enabled) && is_object($mc)) {
+if (isModEnabled('multicompany') && is_object($mc)) {
 	$arrayofentities = $mc->getEntitiesList();
 }
 
 $entity = (GETPOSTISSET('entity') ? GETPOST('entity', 'int') : (GETPOSTISSET('search_entity') ? GETPOST('search_entity', 'int') : $conf->entity));
-if (!empty($conf->multicompany->enabled) && is_object($mc)) {
+if (isModEnabled('multicompany') && is_object($mc)) {
 	if (empty($entity) && !empty($conf->global->MULTICOMPANY_ALLOW_EXPORT_ACCOUNTING_DOC_FOR_ALL_ENTITIES)) {
 		$entity = '0,'.join(',', array_keys($arrayofentities));
 	}
@@ -129,13 +129,13 @@ $error = 0;
 
 $listofchoices = array(
 	'selectinvoices'=>array('label'=>'Invoices', 'lang'=>'bills', 'enabled' => isModEnabled('facture'), 'perms' => !empty($user->rights->facture->lire)),
-	'selectsupplierinvoices'=>array('label'=>'BillsSuppliers', 'lang'=>'bills', 'enabled' => !empty($conf->supplier_invoice->enabled), 'perms' => !empty($user->rights->fournisseur->facture->lire)),
-	'selectexpensereports'=>array('label'=>'ExpenseReports', 'lang'=>'trips', 'enabled' => !empty($conf->expensereport->enabled), 'perms' => !empty($user->rights->expensereport->lire)),
-	'selectdonations'=>array('label'=>'Donations', 'lang'=>'donation', 'enabled' => !empty($conf->don->enabled), 'perms' => !empty($user->rights->don->lire)),
-	'selectsocialcontributions'=>array('label'=>'SocialContributions', 'enabled' => !empty($conf->tax->enabled), 'perms' => !empty($user->rights->tax->charges->lire)),
-	'selectpaymentsofsalaries'=>array('label'=>'SalariesPayments', 'lang'=>'salaries', 'enabled' => !empty($conf->salaries->enabled), 'perms' => !empty($user->rights->salaries->read)),
+	'selectsupplierinvoices'=>array('label'=>'BillsSuppliers', 'lang'=>'bills', 'enabled' => isModEnabled('supplier_invoice'), 'perms' => !empty($user->rights->fournisseur->facture->lire)),
+	'selectexpensereports'=>array('label'=>'ExpenseReports', 'lang'=>'trips', 'enabled' => !isModEnabled('expensereport'), 'perms' => !empty($user->rights->expensereport->lire)),
+	'selectdonations'=>array('label'=>'Donations', 'lang'=>'donation', 'enabled' => isModEnabled('don'), 'perms' => !empty($user->rights->don->lire)),
+	'selectsocialcontributions'=>array('label'=>'SocialContributions', 'enabled' => isModEnabled('tax'), 'perms' => !empty($user->rights->tax->charges->lire)),
+	'selectpaymentsofsalaries'=>array('label'=>'SalariesPayments', 'lang'=>'salaries', 'enabled' => isModEnabled('salaries'), 'perms' => !empty($user->rights->salaries->read)),
 	'selectvariouspayment'=>array('label'=>'VariousPayment', 'enabled' => isModEnabled('banque'), 'perms' => !empty($user->rights->banque->lire)),
-	'selectloanspayment'=>array('label'=>'PaymentLoan', 'enabled' => !empty($conf->loan->enabled), 'perms' => !empty($user->rights->loan->read)),
+	'selectloanspayment'=>array('label'=>'PaymentLoan', 'enabled' => isModEnabled('don'), 'perms' => !empty($user->rights->loan->read)),
 );
 
 
@@ -444,7 +444,7 @@ if ($result && $action == "dl" && !$error) {
 	dol_mkdir($dirfortmpfile);
 
 	$log = $langs->transnoentitiesnoconv("Type");
-	if (!empty($conf->multicompany->enabled) && is_object($mc)) {
+	if (isModEnabled('multicompany') && is_object($mc)) {
 		$log .= ','.$langs->transnoentitiesnoconv("Entity");
 	}
 	$log .= ','.$langs->transnoentitiesnoconv("Date");
@@ -478,7 +478,7 @@ if ($result && $action == "dl" && !$error) {
 			}
 
 			$log .= '"'.$langs->trans($file['item']).'"';
-			if (!empty($conf->multicompany->enabled) && is_object($mc)) {
+			if (isModEnabled('multicompany') && is_object($mc)) {
 				$log .= ',"'.(empty($arrayofentities[$file['entity']]) ? $file['entity'] : $arrayofentities[$file['entity']]).'"';
 			}
 			$log .= ','.dol_print_date($file['date'], 'dayrfc');
@@ -562,7 +562,7 @@ print $form->selectDate($date_stop, 'date_stop', 0, 0, 0, "", 1, 1, 0, '', '', '
 print "\n";
 
 // Export is for current company only
-if (!empty($conf->multicompany->enabled) && is_object($mc)) {
+if (isModEnabled('multicompany') && is_object($mc)) {
 	$mc->getInfo($conf->entity);
 	print '<span class="marginleftonly marginrightonly'.(empty($conf->global->MULTICOMPANY_ALLOW_EXPORT_ACCOUNTING_DOC_FOR_ALL_ENTITIES) ? ' opacitymedium' : '').'">('.$langs->trans("Entity").' : ';
 	print "<td>";
@@ -657,21 +657,21 @@ if (!empty($date_start) && !empty($date_stop)) {
 	print_liste_field_titre($arrayfields['ref']['label'], $_SERVER["PHP_SELF"], "", "", $param, '', $sortfield, $sortorder, 'nowraponall ');
 	print '<td>'.$langs->trans("Document").'</td>';
 	print '<td>'.$langs->trans("Paid").'</td>';
-	print '<td align="right">'.$langs->trans("TotalHT").($conf->multicurrency->enabled ? ' ('.$conf->currency.')' : '').'</td>';
-	print '<td align="right">'.$langs->trans("TotalTTC").($conf->multicurrency->enabled ? ' ('.$conf->currency.')' : '').'</td>';
-	print '<td align="right">'.$langs->trans("TotalVAT").($conf->multicurrency->enabled ? ' ('.$conf->currency.')' : '').'</td>';
+	print '<td align="right">'.$langs->trans("TotalHT").(isModEnabled('multicurrency') ? ' ('.$conf->currency.')' : '').'</td>';
+	print '<td align="right">'.$langs->trans("TotalTTC").(isModEnabled('multicurrency') ? ' ('.$conf->currency.')' : '').'</td>';
+	print '<td align="right">'.$langs->trans("TotalVAT").(isModEnabled('multicurrency') ? ' ('.$conf->currency.')' : '').'</td>';
 	print '<td>'.$langs->trans("ThirdParty").'</td>';
 	print '<td class="center">'.$langs->trans("Code").'</td>';
 	print '<td class="center">'.$langs->trans("Country").'</td>';
 	print '<td class="center">'.$langs->trans("VATIntra").'</td>';
-	if (!empty($conf->multicurrency->enabled)) {
+	if (isModEnabled('multicurrency')) {
 		print '<td class="center">'.$langs->trans("Currency").'</td>';
 	}
 	print '</tr>';
 
 	if (empty($TData)) {
 		print '<tr class="oddeven"><td colspan="13"><span class="opacitymedium">'.$langs->trans("NoRecordFound").'</span></td>';
-		if (!empty($conf->multicurrency->enabled)) {
+		if (isModEnabled('multicurrency')) {
 			print '<td></td>';
 		}
 		print '</tr>';
@@ -801,7 +801,7 @@ if (!empty($date_start) && !empty($date_stop)) {
 				$totalVAT_debit -= $data['amount_vat'];
 			}
 
-			if (!empty($conf->multicurrency->enabled)) {
+			if (isModEnabled('multicurrency')) {
 				print '<td class="center">'.$data['currency']."</td>\n";
 			}
 
@@ -815,7 +815,7 @@ if (!empty($date_start) && !empty($date_stop)) {
 		print '<td align="right">'.price(price2num($totalIT_credit, 'MT')).'</td>';
 		print '<td align="right">'.price(price2num($totalVAT_credit, 'MT')).'</td>';
 		print '<td colspan="4"></td>';
-		if (!empty($conf->multicurrency->enabled)) {
+		if (isModEnabled('multicurrency')) {
 			print '<td></td>';
 		}
 		print "</tr>\n";
@@ -826,7 +826,7 @@ if (!empty($date_start) && !empty($date_stop)) {
 		print '<td align="right">'.price(price2num($totalIT_debit, 'MT')).'</td>';
 		print '<td align="right">'.price(price2num($totalVAT_debit, 'MT')).'</td>';
 		print '<td colspan="4"></td>';
-		if (!empty($conf->multicurrency->enabled)) {
+		if (isModEnabled('multicurrency')) {
 			print '<td></td>';
 		}
 		print "</tr>\n";
@@ -837,7 +837,7 @@ if (!empty($date_start) && !empty($date_stop)) {
 		print '<td align="right">'.price(price2num($totalIT_credit + $totalIT_debit, 'MT')).'</td>';
 		print '<td align="right">'.price(price2num($totalVAT_credit + $totalVAT_debit, 'MT')).'</td>';
 		print '<td colspan="4"></td>';
-		if (!empty($conf->multicurrency->enabled)) {
+		if (isModEnabled('multicurrency')) {
 			print '<td></td>';
 		}
 		print "</tr>\n";

From ed7f45bdd3a451833fdbc1d842ca78045d67d0fa Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Mon, 29 Aug 2022 11:56:25 +0200
Subject: [PATCH 306/974] Use isModEnabled

---
 htdocs/compta/bank/bankentries_list.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/htdocs/compta/bank/bankentries_list.php b/htdocs/compta/bank/bankentries_list.php
index 70f1959ab54..543750c16a7 100644
--- a/htdocs/compta/bank/bankentries_list.php
+++ b/htdocs/compta/bank/bankentries_list.php
@@ -361,7 +361,7 @@ if (GETPOST('save') && !$cancel && !empty($user->rights->banque->modifier)) {
 		$error++;
 		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("BankAccount")), null, 'errors');
 	}
-	/*if (! empty($conf->accounting->enabled) && (empty($search_accountancy_code) || $search_accountancy_code == '-1'))
+	/*if (isModEnabled('accounting') && (empty($search_accountancy_code) || $search_accountancy_code == '-1'))
 	{
 		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("AccountAccounting")), null, 'errors');
 		$error++;
@@ -875,7 +875,7 @@ if ($resql) {
 		print '<td class=right>'.$langs->trans("BankAccount").'</td>';
 		print '<td class=right>'.$langs->trans("Debit").'</td>';
 		print '<td class=right>'.$langs->trans("Credit").'</td>';
-		/*if (! empty($conf->accounting->enabled))
+		/*if (isModEnabled('accounting'))
 		{
 			print '<td class="center">';
 			print $langs->trans("AccountAccounting");
@@ -910,7 +910,7 @@ if ($resql) {
 		//}
 		print '<td class="right"><input name="adddebit" class="flat" type="text" size="4" value="'.GETPOST("adddebit", "alpha").'"></td>';
 		print '<td class="right"><input name="addcredit" class="flat" type="text" size="4" value="'.GETPOST("addcredit", "alpha").'"></td>';
-		/*if (! empty($conf->accounting->enabled))
+		/*if (isModEnabled('accounting'))
 		{
 			print '<td class="center">';
 			print $formaccounting->select_account($search_accountancy_code, 'search_accountancy_code', 1, null, 1, 1, '');
@@ -1019,9 +1019,9 @@ if ($resql) {
 	$moreforfilter .= '</div>';
 	$moreforfilter .= '</div>';
 
-	if (!empty($conf->categorie->enabled)) {
+	if (isModEnabled('categorie')) {
 		// Categories
-		if (!empty($conf->categorie->enabled) && !empty($user->rights->categorie->lire)) {
+		if (isModEnabled('categorie') && !empty($user->rights->categorie->lire)) {
 			$langs->load('categories');
 
 			// Bank line

From 8c3bd15765dbda2ea2116314bba12414522f8eb8 Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Mon, 29 Aug 2022 11:56:35 +0200
Subject: [PATCH 307/974] Use isModEnabled

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

diff --git a/htdocs/compta/bank/card.php b/htdocs/compta/bank/card.php
index 527d8eaa1b2..c67f6e668c5 100644
--- a/htdocs/compta/bank/card.php
+++ b/htdocs/compta/bank/card.php
@@ -36,7 +36,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 (!empty($conf->categorie->enabled)) {
+if (isModEnabled('categorie')) {
 	require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 }
 if (isModEnabled('accounting')) {
@@ -437,7 +437,7 @@ if ($action == 'create') {
 	print '</td></tr>';
 
 	// Tags-Categories
-	if (!empty($conf->categorie->enabled)) {
+	if (isModEnabled('categorie')) {
 		print '<tr><td>'.$langs->trans("Categories").'</td><td>';
 		$cate_arbo = $form->select_all_categories(Categorie::TYPE_ACCOUNT, '', 'parent', 64, 0, 1);
 
@@ -714,7 +714,7 @@ if ($action == 'create') {
 		print '<table class="border tableforfield centpercent">';
 
 		// Categories
-		if (!empty($conf->categorie->enabled)) {
+		if (isModEnabled('categorie')) {
 			print '<tr><td class="titlefield">'.$langs->trans("Categories").'</td><td>';
 			print $form->showCategories($object->id, Categorie::TYPE_ACCOUNT, 1);
 			print "</td></tr>";
@@ -967,7 +967,7 @@ if ($action == 'create') {
 		print '</td></tr>';
 
 		// Tags-Categories
-		if (!empty($conf->categorie->enabled)) {
+		if (isModEnabled('categorie')) {
 			print '<tr><td>'.$langs->trans("Categories").'</td><td>';
 			$cate_arbo = $form->select_all_categories(Categorie::TYPE_ACCOUNT, '', 'parent', 64, 0, 1);
 			$c = new Categorie($db);

From 3457020ee69a073e766d21450f474c73e16345f4 Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Mon, 29 Aug 2022 11:57:30 +0200
Subject: [PATCH 308/974] Use isModEnabled

---
 htdocs/compta/bank/line.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/htdocs/compta/bank/line.php b/htdocs/compta/bank/line.php
index 3cde5212e2d..a22e32b2595 100644
--- a/htdocs/compta/bank/line.php
+++ b/htdocs/compta/bank/line.php
@@ -37,16 +37,16 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/payments.lib.php';
 
 // Load translation files required by the page
 $langs->loadLangs(array('banks', 'categories', 'compta', 'bills', 'other'));
-if (!empty($conf->adherent->enabled)) {
+if (isModEnabled('adherent')) {
 	$langs->load("members");
 }
-if (!empty($conf->don->enabled)) {
+if (isModEnabled('don')) {
 	$langs->load("donations");
 }
-if (!empty($conf->loan->enabled)) {
+if (isModEnabled('loan')) {
 	$langs->load("loan");
 }
-if (!empty($conf->salaries->enabled)) {
+if (isModEnabled('salaries')) {
 	$langs->load("salaries");
 }
 
@@ -580,7 +580,7 @@ if ($result) {
 		print "</tr>";
 
 		// Categories
-		if (!empty($conf->categorie->enabled) && !empty($user->rights->categorie->lire)) {
+		if (isModEnabled('categorie') && !empty($user->rights->categorie->lire)) {
 			$langs->load('categories');
 
 			// Bank line

From de21556fbc62a1da8f84741e6ceacdc195f79898 Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Mon, 29 Aug 2022 11:57:45 +0200
Subject: [PATCH 309/974] Use isModEnabled

---
 htdocs/compta/bank/list.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/htdocs/compta/bank/list.php b/htdocs/compta/bank/list.php
index 4e55b5b72dd..362ca3d488f 100644
--- a/htdocs/compta/bank/list.php
+++ b/htdocs/compta/bank/list.php
@@ -38,7 +38,7 @@ if (isModEnabled('accounting')) {
 if (isModEnabled('accounting')) {
 	require_once DOL_DOCUMENT_ROOT.'/accountancy/class/accountingjournal.class.php';
 }
-if (!empty($conf->categorie->enabled)) {
+if (isModEnabled('categorie')) {
 	require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 }
 
@@ -58,7 +58,7 @@ $search_number = GETPOST('search_number', 'alpha');
 $search_status = GETPOST('search_status') ?GETPOST('search_status', 'alpha') : 'opened'; // 'all' or ''='opened'
 $optioncss = GETPOST('optioncss', 'alpha');
 
-if (!empty($conf->categorie->enabled)) {
+if (isModEnabled('categorie')) {
 	$search_category_list = GETPOST("search_category_".Categorie::TYPE_ACCOUNT."_list", "array");
 }
 
@@ -197,7 +197,7 @@ if (!empty($extrafields->attributes[$object->table_element]['label']) && is_arra
 	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX.$object->table_element."_extrafields as ef on (b.rowid = ef.fk_object)";
 }
 
-if (!empty($conf->categorie->enabled)) {
+if (isModEnabled('categorie')) {
 	$sql .= Categorie::getFilterJoinQuery(Categorie::TYPE_ACCOUNT, "b.rowid");
 }
 
@@ -209,7 +209,7 @@ if ($search_status == 'closed') {
 	$sql .= " AND clos = 1";
 }
 
-if (!empty($conf->categorie->enabled)) {
+if (isModEnabled('categorie')) {
 	$sql .= Categorie::getFilterSelectQuery(Categorie::TYPE_ACCOUNT, "b.rowid", $search_category_list);
 }
 
@@ -344,7 +344,7 @@ include DOL_DOCUMENT_ROOT.'/core/tpl/massactions_pre.tpl.php';
 
 $moreforfilter = '';
 
-if (!empty($conf->categorie->enabled) && $user->rights->categorie->lire) {
+if (isModEnabled('categorie') && $user->rights->categorie->lire) {
 	$moreforfilter .= $form->getFilterBox(Categorie::TYPE_ACCOUNT, $search_category_list);
 }
 

From 7ea4f11a999c3a063777c601139eb1ddf79ec5fc Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Mon, 29 Aug 2022 11:57:59 +0200
Subject: [PATCH 310/974] Use isModEnabled

---
 htdocs/compta/bank/transfer.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/compta/bank/transfer.php b/htdocs/compta/bank/transfer.php
index f728dc74f4e..ff38abb32d4 100644
--- a/htdocs/compta/bank/transfer.php
+++ b/htdocs/compta/bank/transfer.php
@@ -270,12 +270,12 @@ print '</tr>';
 
 print '<tr class="oddeven"><td>';
 print img_picto('', 'bank_account', 'class="paddingright"');
-$form->select_comptes($account_from, 'account_from', 0, '', 1, '', empty($conf->multicurrency->enabled) ? 0 : 1);
+$form->select_comptes($account_from, 'account_from', 0, '', 1, '', !isModEnabled('multicurrency') ? 0 : 1);
 print "</td>";
 
 print "<td>\n";
 print img_picto('', 'bank_account', 'class="paddingright"');
-$form->select_comptes($account_to, 'account_to', 0, '', 1, '', empty($conf->multicurrency->enabled) ? 0 : 1);
+$form->select_comptes($account_to, 'account_to', 0, '', 1, '', !isModEnabled('multicurrency') ? 0 : 1);
 print "</td>\n";
 
 print "<td>";

From d903d2bfd8ba6ee4ea6e44ab9429da7fe329b353 Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Mon, 29 Aug 2022 11:58:27 +0200
Subject: [PATCH 311/974] Use isModEnabled

---
 htdocs/compta/cashcontrol/cashcontrol_card.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/compta/cashcontrol/cashcontrol_card.php b/htdocs/compta/cashcontrol/cashcontrol_card.php
index 2b6b027d7ce..d4cb958d64d 100644
--- a/htdocs/compta/cashcontrol/cashcontrol_card.php
+++ b/htdocs/compta/cashcontrol/cashcontrol_card.php
@@ -70,10 +70,10 @@ if ($contextpage == 'takepos') {
 $arrayofpaymentmode = array('cash'=>'Cash', 'cheque'=>'Cheque', 'card'=>'CreditCard');
 
 $arrayofposavailable = array();
-if (!empty($conf->cashdesk->enabled)) {
+if (isModEnabled('cashdesk')) {
 	$arrayofposavailable['cashdesk'] = $langs->trans('CashDesk').' (cashdesk)';
 }
-if (!empty($conf->takepos->enabled)) {
+if (isModEnabled('takepos')) {
 	$arrayofposavailable['takepos'] = $langs->trans('TakePOS').' (takepos)';
 }
 // TODO Add hook here to allow other POS to add themself

From 52ab81f7798afed9b6795d5c280a2d17f2175e0a Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Mon, 29 Aug 2022 11:58:34 +0200
Subject: [PATCH 312/974] Use isModEnabled

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

diff --git a/htdocs/compta/charges/index.php b/htdocs/compta/charges/index.php
index bd675dd1e19..3d6923905be 100644
--- a/htdocs/compta/charges/index.php
+++ b/htdocs/compta/charges/index.php
@@ -133,7 +133,7 @@ if ($year) {
 print '<span class="opacitymedium">'.$langs->trans("DescTaxAndDividendsArea").'</span><br>';
 print "<br>";
 
-if (!empty($conf->tax->enabled) && $user->rights->tax->charges->lire) {
+if (isModEnabled('tax') && $user->rights->tax->charges->lire) {
 	// Social contributions only
 	print load_fiche_titre($langs->trans("SocialContributions").($year ? ' ('.$langs->trans("Year").' '.$year.')' : ''), '', '');
 
@@ -266,7 +266,7 @@ if (!empty($conf->tax->enabled) && $user->rights->tax->charges->lire) {
 }
 
 // VAT
-if (!empty($conf->tax->enabled) && $user->rights->tax->charges->lire) {
+if (isModEnabled('tax') && $user->rights->tax->charges->lire) {
 	print "<br>";
 
 	$tva = new Tva($db);

From bdd2d23bf14f312aab0cdabf5336c69968512753 Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Mon, 29 Aug 2022 11:58:55 +0200
Subject: [PATCH 313/974] Use isModEnabled

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

diff --git a/htdocs/compta/facture/card-rec.php b/htdocs/compta/facture/card-rec.php
index 3e661dd52fe..c2701a4e05d 100644
--- a/htdocs/compta/facture/card-rec.php
+++ b/htdocs/compta/facture/card-rec.php
@@ -1117,9 +1117,9 @@ if ($action == 'create') {
 
 
 		$title = $langs->trans("ProductsAndServices");
-		if (empty($conf->service->enabled)) {
+		if (!isModEnabled('service')) {
 			$title = $langs->trans("Products");
-		} elseif (empty($conf->product->enabled)) {
+		} elseif (!isModEnabled('product')) {
 			$title = $langs->trans("Services");
 		}
 
@@ -1310,7 +1310,7 @@ if ($action == 'create') {
 		print '</td></tr>';
 
 		// Multicurrency
-		if (!empty($conf->multicurrency->enabled)) {
+		if (isModEnabled('multicurrency')) {
 			// Multicurrency code
 			print '<tr>';
 			print '<td>';
@@ -1573,7 +1573,7 @@ if ($action == 'create') {
 		if ($object->frequency > 0) {
 			print '<br>';
 
-			if (empty($conf->cron->enabled)) {
+			if (!isModEnabled('cron')) {
 				print info_admin($langs->trans("EnableAndSetupModuleCron", $langs->transnoentitiesnoconv("Module2300Name")));
 			}
 

From ae449dfe0f37bafa6daafbaac16749d41f1fa67b Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Mon, 29 Aug 2022 12:01:36 +0200
Subject: [PATCH 314/974] Use isModEnabled

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

diff --git a/htdocs/compta/facture/card.php b/htdocs/compta/facture/card.php
index 1eebb5300d2..d8db9191c32 100644
--- a/htdocs/compta/facture/card.php
+++ b/htdocs/compta/facture/card.php
@@ -51,7 +51,7 @@ 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';
 require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
-if (!empty($conf->commande->enabled)) {
+if (isModEnabled('commande')) {
 	require_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
 }
 if (isModEnabled('project')) {
@@ -60,7 +60,7 @@ if (isModEnabled('project')) {
 }
 require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
 
-if (!empty($conf->variants->enabled)) {
+if (isModEnabled('variants')) {
 	require_once DOL_DOCUMENT_ROOT.'/variants/class/ProductCombination.class.php';
 }
 if (isModEnabled('accounting')) {
@@ -69,10 +69,10 @@ if (isModEnabled('accounting')) {
 
 // Load translation files required by the page
 $langs->loadLangs(array('bills', 'companies', 'compta', 'products', 'banks', 'main', 'withdrawals'));
-if (!empty($conf->incoterm->enabled)) {
+if (isModEnabled('incoterm')) {
 	$langs->load('incoterm');
 }
-if (!empty($conf->margin->enabled)) {
+if (isModEnabled('margin')) {
 	$langs->load('margins');
 }
 
@@ -540,7 +540,7 @@ if (empty($reshook)) {
 				}
 			}
 		}
-	} elseif ($action == 'set_incoterms' && !empty($conf->incoterm->enabled)) {		// Set incoterm
+	} elseif ($action == 'set_incoterms' && isModEnabled('incoterm')) {		// Set incoterm
 		$result = $object->setIncoterms(GETPOST('incoterm_id', 'int'), GETPOST('location_incoterms', 'alpha'));
 	} elseif ($action == 'setbankaccount' && $usercancreate) {	// bank account
 		$result = $object->setBankAccount(GETPOST('fk_account', 'int'));
@@ -2076,7 +2076,7 @@ if (empty($reshook)) {
 			$error++;
 		}
 
-		if (!$error && !empty($conf->variants->enabled) && $prod_entry_mode != 'free') {
+		if (!$error && isModEnabled('variants') && $prod_entry_mode != 'free') {
 			if ($combinations = GETPOST('combinations', 'array')) {
 				//Check if there is a product with the given combination
 				$prodcomb = new ProductCombination($db);
@@ -2994,7 +2994,7 @@ if ($action == 'create') {
 				$remise_percent 	= (!empty($objectsrc->remise_percent) ? $objectsrc->remise_percent : (!empty($soc->remise_percent) ? $soc->remise_percent : 0));
 				$remise_absolue 	= (!empty($objectsrc->remise_absolue) ? $objectsrc->remise_absolue : (!empty($soc->remise_absolue) ? $soc->remise_absolue : 0));
 
-				if (!empty($conf->multicurrency->enabled)) {
+				if (isModEnabled('multicurrency')) {
 					if (!empty($objectsrc->multicurrency_code)) {
 						$currency_code = $objectsrc->multicurrency_code;
 					}
@@ -3016,7 +3016,7 @@ if ($action == 'create') {
 		$remise_absolue 	= 0;
 		$dateinvoice = (empty($dateinvoice) ? (empty($conf->global->MAIN_AUTOFILL_DATE) ?-1 : '') : $dateinvoice); // Do not set 0 here (0 for a date is 1970)
 
-		if (!empty($conf->multicurrency->enabled) && !empty($soc->multicurrency_code)) {
+		if (isModEnabled('multicurrency') && !empty($soc->multicurrency_code)) {
 			$currency_code = $soc->multicurrency_code;
 		}
 	}
@@ -3667,7 +3667,7 @@ if ($action == 'create') {
 	}
 
 	// Incoterms
-	if (!empty($conf->incoterm->enabled)) {
+	if (isModEnabled('incoterm')) {
 		print '<tr>';
 		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">';
@@ -3715,7 +3715,7 @@ if ($action == 'create') {
 	print "</td></tr>";
 
 	// Multicurrency
-	if (!empty($conf->multicurrency->enabled)) {
+	if (isModEnabled('multicurrency')) {
 		print '<tr>';
 		print '<td>'.$form->editfieldkey('Currency', 'multicurrency_code', '', $object, 0).'</td>';
 		print '<td colspan="2" class="maxwidthonsmartphone">';
@@ -3836,7 +3836,7 @@ if ($action == 'create') {
 		}
 		print '<tr><td>'.$langs->trans('AmountTTC').'</td><td colspan="2">'.price($objectsrc->total_ttc)."</td></tr>";
 
-		if (!empty($conf->multicurrency->enabled)) {
+		if (isModEnabled('multicurrency')) {
 			print '<tr><td>'.$langs->trans('MulticurrencyAmountHT').'</td><td colspan="2">'.price($objectsrc->multicurrency_total_ht).'</td></tr>';
 			print '<tr><td>'.$langs->trans('MulticurrencyAmountVAT').'</td><td colspan="2">'.price($objectsrc->multicurrency_total_tva)."</td></tr>";
 			print '<tr><td>'.$langs->trans('MulticurrencyAmountTTC').'</td><td colspan="2">'.price($objectsrc->multicurrency_total_ttc)."</td></tr>";
@@ -3912,7 +3912,7 @@ if ($action == 'create') {
 	$resteapayer = price2num($object->total_ttc - $totalpaid - $totalcreditnotes - $totaldeposits, 'MT');
 
 	// Multicurrency
-	if (!empty($conf->multicurrency->enabled)) {
+	if (isModEnabled('multicurrency')) {
 		$multicurrency_totalpaid = $object->getSommePaiement(1);
 		$multicurrency_totalcreditnotes = $object->getSumCreditNotesUsed(1);
 		$multicurrency_totaldeposits = $object->getSumDepositsUsed(1);
@@ -4504,7 +4504,7 @@ if ($action == 'create') {
 	print '</td></tr>';
 
 	// Multicurrency
-	if (!empty($conf->multicurrency->enabled)) {
+	if (isModEnabled('multicurrency')) {
 		// Multicurrency code
 		print '<tr>';
 		print '<td>';
@@ -4570,7 +4570,7 @@ if ($action == 'create') {
 	}
 
 	// Incoterms
-	if (!empty($conf->incoterm->enabled)) {
+	if (isModEnabled('incoterm')) {
 		print '<tr><td>';
 		print '<table class="nobordernopadding centpercent"><tr><td>';
 		print $langs->trans('IncotermLabel');
@@ -4708,7 +4708,7 @@ if ($action == 'create') {
 		$sign = -1; // We invert sign for output
 	}
 
-	if (!empty($conf->multicurrency->enabled) && ($object->multicurrency_code != $conf->currency)) {
+	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 right amountcard">'.price($sign * $object->multicurrency_total_ht, '', $langs, 0, -1, -1, (!empty($object->multicurrency_code) ? $object->multicurrency_code : $conf->currency)).'</td>';
@@ -4819,10 +4819,10 @@ if ($action == 'create') {
 	if ($selleruserevenustamp) {
 		$nbrows++;
 	}
-	if (!empty($conf->multicurrency->enabled)) {
+	if (isModEnabled('multicurrency')) {
 		$nbrows += 5;
 	}
-	if (!empty($conf->incoterm->enabled)) {
+	if (isModEnabled('incoterm')) {
 		$nbrows += 1;
 	}
 
@@ -4917,7 +4917,7 @@ if ($action == 'create') {
 			 print '<td>' . $langs->trans('ListOfNextSituationInvoices') . '</td>';
 			 print '<td></td>';
 			 print '<td></td>';
-			 if (! empty($conf->banque->enabled)) print '<td class="right"></td>';
+			 if (isModEnabled('banque')) print '<td class="right"></td>';
 			 print '<td class="right">' . $langs->trans('AmountHT') . '</td>';
 			 print '<td class="right">' . $langs->trans('AmountTTC') . '</td>';
 			 print '<td width="18">&nbsp;</td>';
@@ -5259,7 +5259,7 @@ if ($action == 'create') {
 	print '</div>';
 
 	// Margin Infos
-	if (!empty($conf->margin->enabled)) {
+	if (isModEnabled('margin')) {
 		$formmargin->displayMarginInfos($object);
 	}
 
@@ -5477,7 +5477,7 @@ if ($action == 'create') {
 			}
 
 			// POS Ticket
-			if (!empty($conf->takepos->enabled) && $object->module_source == 'takepos') {
+			if (isModEnabled('takepos') && $object->module_source == 'takepos') {
 				$langs->load("cashdesk");
 				$receipt_url = DOL_URL_ROOT."/takepos/receipt.php";
 				print '<a target="_blank" rel="noopener noreferrer" class="butAction" href="'.$receipt_url.'?facid='.((int) $object->id).'">'.$langs->trans('POSTicket').'</a>';

From 0d3cae8ee8a418b550312590c5f6bfb9e3fee869 Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Mon, 29 Aug 2022 12:02:49 +0200
Subject: [PATCH 315/974] Use isModEnabled

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

diff --git a/htdocs/compta/facture/list.php b/htdocs/compta/facture/list.php
index a6999e968ba..8c6092d68c4 100644
--- a/htdocs/compta/facture/list.php
+++ b/htdocs/compta/facture/list.php
@@ -39,7 +39,7 @@ require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php';
-if (!empty($conf->margin->enabled)) {
+if (isModEnabled('margin')) {
 	require_once DOL_DOCUMENT_ROOT.'/core/class/html.formmargin.class.php';
 }
 require_once DOL_DOCUMENT_ROOT.'/core/modules/facture/modules_facture.php';
@@ -53,7 +53,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 (!empty($conf->commande->enabled)) {
+if (isModEnabled('commande')) {
 	require_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
 }
 
@@ -237,13 +237,13 @@ $arrayfields = array(
 	'rtp'=>array('label'=>"Rest", 'checked'=>0, 'position'=>150), // Not enabled by default because slow
 	'u.login'=>array('label'=>"Author", 'checked'=>1, 'position'=>165),
 	'sale_representative'=>array('label'=>"SaleRepresentativesOfThirdParty", 'checked'=>0, 'position'=>166),
-	'f.multicurrency_code'=>array('label'=>'Currency', 'checked'=>0, 'enabled'=>(empty($conf->multicurrency->enabled) ? 0 : 1), 'position'=>280),
-	'f.multicurrency_tx'=>array('label'=>'CurrencyRate', 'checked'=>0, 'enabled'=>(empty($conf->multicurrency->enabled) ? 0 : 1), 'position'=>285),
-	'f.multicurrency_total_ht'=>array('label'=>'MulticurrencyAmountHT', 'checked'=>0, 'enabled'=>(empty($conf->multicurrency->enabled) ? 0 : 1), 'position'=>290),
-	'f.multicurrency_total_vat'=>array('label'=>'MulticurrencyAmountVAT', 'checked'=>0, 'enabled'=>(empty($conf->multicurrency->enabled) ? 0 : 1), 'position'=>291),
-	'f.multicurrency_total_ttc'=>array('label'=>'MulticurrencyAmountTTC', 'checked'=>0, 'enabled'=>(empty($conf->multicurrency->enabled) ? 0 : 1), 'position'=>292),
-	'multicurrency_dynamount_payed'=>array('label'=>'MulticurrencyAlreadyPaid', 'checked'=>0, 'enabled'=>(empty($conf->multicurrency->enabled) ? 0 : 1), 'position'=>295),
-	'multicurrency_rtp'=>array('label'=>'MulticurrencyRemainderToPay', 'checked'=>0, 'enabled'=>(empty($conf->multicurrency->enabled) ? 0 : 1), 'position'=>296), // 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' => ((isset($conf->global->MARGIN_TYPE) && $conf->global->MARGIN_TYPE == '1') ? 'BuyingPrice' : 'CostPrice'), 'checked' => 0, 'position' => 300, 'enabled' => (empty($conf->margin->enabled) || empty($user->rights->margins->liretous) ? 0 : 1)),
 	'total_margin' => array('label' => 'Margin', 'checked' => 0, 'position' => 301, 'enabled' => (empty($conf->margin->enabled) || empty($user->rights->margins->liretous) ? 0 : 1)),
 	'total_margin_rate' => array('label' => 'MarginRate', 'checked' => 0, 'position' => 302, 'enabled' => (empty($conf->margin->enabled) || empty($user->rights->margins->liretous) || empty($conf->global->DISPLAY_MARGIN_RATES) ? 0 : 1)),
@@ -545,7 +545,7 @@ $form = new Form($db);
 $formother = new FormOther($db);
 $formfile = new FormFile($db);
 $formmargin = null;
-if (!empty($conf->margin->enabled)) {
+if (isModEnabled('margin')) {
 	$formmargin = new FormMargin($db);
 }
 $bankaccountstatic = new Account($db);
@@ -1200,7 +1200,7 @@ if ($resql) {
 		$moreforfilter .= '</div>';
 	}
 	// Filter on product tags
-	if (!empty($conf->categorie->enabled) && $user->rights->categorie->lire && ($user->rights->produit->lire || $user->rights->service->lire)) {
+	if (isModEnabled('categorie') && $user->rights->categorie->lire && ($user->rights->produit->lire || $user->rights->service->lire)) {
 		include_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 		$moreforfilter .= '<div class="divsearchfield">';
 		$tmptitle = $langs->trans('IncludingProductWithTag');
@@ -1208,7 +1208,7 @@ if ($resql) {
 		$moreforfilter .= img_picto($tmptitle, 'category', 'class="pictofixedwidth"').$form->selectarray('search_product_category', $cate_arbo, $search_product_category, $tmptitle, 0, 0, '', 0, 0, 0, 0, 'maxwidth250', 1);
 		$moreforfilter .= '</div>';
 	}
-	if (!empty($conf->categorie->enabled) && $user->rights->categorie->lire) {
+	if (isModEnabled('categorie') && $user->rights->categorie->lire) {
 		require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 		$moreforfilter .= '<div class="divsearchfield">';
 		$tmptitle = $langs->trans('CustomersProspectsCategoriesShort');
@@ -1702,7 +1702,7 @@ if ($resql) {
 		$totalarray['val']['f.total_ttc'] = 0;
 
 		$with_margin_info = false;
-		if (!empty($conf->margin->enabled) && (
+		if (isModEnabled('margin') && (
 				!empty($arrayfields['total_pa']['checked'])
 				|| !empty($arrayfields['total_margin']['checked'])
 				|| !empty($arrayfields['total_margin_rate']['checked'])

From 9dec4c90429abc9f281731d8b20b340e1db741d9 Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Mon, 29 Aug 2022 12:02:55 +0200
Subject: [PATCH 316/974] Use isModEnabled

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

diff --git a/htdocs/compta/facture/prelevement.php b/htdocs/compta/facture/prelevement.php
index 28d4efd6555..5a10c2055c0 100644
--- a/htdocs/compta/facture/prelevement.php
+++ b/htdocs/compta/facture/prelevement.php
@@ -616,7 +616,7 @@ if ($object->id > 0) {
 
 	print '<table class="border centpercent tableforfield">';
 
-	if (!empty($conf->multicurrency->enabled) && ($object->multicurrency_code != $conf->currency)) {
+	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>';

From 2c9047661ef2b4747b98f4c3cb35cf73a0833eb8 Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Mon, 29 Aug 2022 12:03:05 +0200
Subject: [PATCH 317/974] Use isModEnabled

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

diff --git a/htdocs/compta/facture/stats/index.php b/htdocs/compta/facture/stats/index.php
index cb0e38b7a34..73b9d94bdda 100644
--- a/htdocs/compta/facture/stats/index.php
+++ b/htdocs/compta/facture/stats/index.php
@@ -32,7 +32,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 (!empty($conf->category->enabled)) {
+if (isModEnabled('categorie')) {
 	require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 }
 
@@ -72,7 +72,7 @@ $endyear = $year;
 /*
  * View
  */
-if (!empty($conf->category->enabled)) {
+if (isModEnabled('categorie')) {
 	$langs->load('categories');
 }
 $form = new Form($db);
@@ -299,7 +299,7 @@ if ($user->admin) {
 print '</td></tr>';
 
 // Category
-if (!empty($conf->category->enabled)) {
+if (isModEnabled('categorie')) {
 	if ($mode == 'customer') {
 		$cat_type = Categorie::TYPE_CUSTOMER;
 		$cat_label = $langs->trans("Category").' '.lcfirst($langs->trans("Customer"));

From e6fb17c909ceca3c5f754b7fc860b54f802f3a5e Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Mon, 29 Aug 2022 12:03:10 +0200
Subject: [PATCH 318/974] Use isModEnabled

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

diff --git a/htdocs/compta/index.php b/htdocs/compta/index.php
index 55ee99f4cb6..e8ef524152a 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 (!empty($conf->commande->enabled)) {
+if (isModEnabled('commande')) {
 	$langs->load("orders");
 }
 

From 8cf4663c58c9402530cf29ecb378a6fac65e86cb Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Mon, 29 Aug 2022 12:03:19 +0200
Subject: [PATCH 319/974] Use isModEnabled

---
 htdocs/compta/paiement.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/htdocs/compta/paiement.php b/htdocs/compta/paiement.php
index e6a9fe713cf..efdb032081f 100644
--- a/htdocs/compta/paiement.php
+++ b/htdocs/compta/paiement.php
@@ -597,7 +597,7 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
 				print '<td>'.$arraytitle.'</td>';
 				print '<td class="center">'.$langs->trans('Date').'</td>';
 				print '<td class="center">'.$langs->trans('DateMaxPayment').'</td>';
-				if (!empty($conf->multicurrency->enabled)) {
+				if (isModEnabled('multicurrency')) {
 					print '<td>'.$langs->trans('Currency').'</td>';
 					print '<td class="right">'.$langs->trans('MulticurrencyAmountTTC').'</td>';
 					print '<td class="right">'.$multicurrencyalreadypayedlabel.'</td>';
@@ -640,7 +640,7 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
 					$remaintopay = price2num($invoice->total_ttc - $paiement - $creditnotes - $deposits, 'MT');
 
 					// Multicurrency Price
-					if (!empty($conf->multicurrency->enabled)) {
+					if (isModEnabled('multicurrency')) {
 						$multicurrency_payment = $invoice->getSommePaiement(1);
 						$multicurrency_creditnotes = $invoice->getSumCreditNotesUsed(1);
 						$multicurrency_deposits = $invoice->getSumDepositsUsed(1);
@@ -676,12 +676,12 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
 					}
 
 					// Currency
-					if (!empty($conf->multicurrency->enabled)) {
+					if (isModEnabled('multicurrency')) {
 						print '<td class="center">'.$objp->multicurrency_code."</td>\n";
 					}
 
 					// Multicurrency Price
-					if (!empty($conf->multicurrency->enabled)) {
+					if (isModEnabled('multicurrency')) {
 						print '<td class="right">';
 						if ($objp->multicurrency_code && $objp->multicurrency_code != $conf->currency) {
 							print price($sign * $objp->multicurrency_total_ttc);
@@ -814,7 +814,7 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
 					// Print total
 					print '<tr class="liste_total">';
 					print '<td colspan="3" class="left">'.$langs->trans('TotalTTC').'</td>';
-					if (!empty($conf->multicurrency->enabled)) {
+					if (isModEnabled('multicurrency')) {
 						print '<td></td>';
 						print '<td></td>';
 						print '<td></td>';

From 34e036ab1c8a9e8422a43128e88d96c8e1a7df12 Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Mon, 29 Aug 2022 12:03:25 +0200
Subject: [PATCH 320/974] Use isModEnabled

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

diff --git a/htdocs/compta/paiement/card.php b/htdocs/compta/paiement/card.php
index fa2a8e88028..9f88dc3e81d 100644
--- a/htdocs/compta/paiement/card.php
+++ b/htdocs/compta/paiement/card.php
@@ -425,7 +425,7 @@ if ($resql) {
 	print '<tr class="liste_titre">';
 	print '<td>'.$langs->trans('Bill').'</td>';
 	print '<td>'.$langs->trans('Company').'</td>';
-	if (!empty($conf->multicompany->enabled) && !empty($conf->global->MULTICOMPANY_INVOICE_SHARING_ENABLED)) {
+	if (isModEnabled('multicompany') && !empty($conf->global->MULTICOMPANY_INVOICE_SHARING_ENABLED)) {
 		print '<td>'.$langs->trans('Entity').'</td>';
 	}
 	print '<td class="right">'.$langs->trans('ExpectedToPay').'</td>';
@@ -462,7 +462,7 @@ if ($resql) {
 			print '</td>';
 
 			// Expected to pay
-			if (!empty($conf->multicompany->enabled) && !empty($conf->global->MULTICOMPANY_INVOICE_SHARING_ENABLED)) {
+			if (isModEnabled('multicompany') && !empty($conf->global->MULTICOMPANY_INVOICE_SHARING_ENABLED)) {
 				print '<td>';
 				$mc->getInfo($objp->entity);
 				print $mc->label;

From 5dc2230c8851c903df053e20301d6dd6aa1cda22 Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Mon, 29 Aug 2022 12:03:32 +0200
Subject: [PATCH 321/974] Use isModEnabled

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

diff --git a/htdocs/compta/paiement/class/paiement.class.php b/htdocs/compta/paiement/class/paiement.class.php
index 8be5aa97062..e196105b060 100644
--- a/htdocs/compta/paiement/class/paiement.class.php
+++ b/htdocs/compta/paiement/class/paiement.class.php
@@ -656,7 +656,7 @@ class Paiement extends CommonObject
 			}
 
 			// if dolibarr currency != bank currency then we received an amount in customer currency (currently I don't manage the case : my currency is USD, the customer currency is EUR and he paid me in GBP. Seems no sense for me)
-			if (!empty($conf->multicurrency->enabled) && $conf->currency != $acc->currency_code) {
+			if (isModEnabled('multicurrency') && $conf->currency != $acc->currency_code) {
 				$totalamount = $this->multicurrency_amount;		// We will insert into llx_bank.amount in foreign currency
 				$totalamount_main_currency = $this->amount;		// We will also save the amount in main currency into column llx_bank.amount_main_currency
 			}
@@ -1165,7 +1165,7 @@ class Paiement extends CommonObject
 		global $conf;
 
 		$way = 'dolibarr';
-		if (!empty($conf->multicurrency->enabled)) {
+		if (isModEnabled('multicurrency')) {
 			foreach ($this->multicurrency_amounts as $value) {
 				if (!empty($value)) { // one value found then payment is in invoice currency
 					$way = 'customer';

From 0012c75ff3184a0cec0caa6d81abd58372f2c7bb Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Mon, 29 Aug 2022 12:04:03 +0200
Subject: [PATCH 322/974] Use isModEnabled

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

diff --git a/htdocs/compta/resultat/clientfourn.php b/htdocs/compta/resultat/clientfourn.php
index 9f12b12f7e5..ed4dac6c3f3 100644
--- a/htdocs/compta/resultat/clientfourn.php
+++ b/htdocs/compta/resultat/clientfourn.php
@@ -537,7 +537,7 @@ if ($modecompta == 'BOOKKEEPING') {
 	 * Donations
 	 */
 
-	if (!empty($conf->don->enabled)) {
+	if (isModEnabled('don')) {
 		print '<tr class="trforbreak"><td colspan="4">'.$langs->trans("Donations").'</td></tr>';
 
 		if ($modecompta == 'CREANCES-DETTES' || $modecompta == 'RECETTES-DEPENSES') {
@@ -932,7 +932,7 @@ if ($modecompta == 'BOOKKEEPING') {
 	 * Salaries
 	 */
 
-	if (!empty($conf->salaries->enabled)) {
+	if (isModEnabled('salaries')) {
 		print '<tr class="trforbreak"><td colspan="4">'.$langs->trans("Salaries").'</td></tr>';
 
 		if ($modecompta == 'CREANCES-DETTES' || $modecompta == 'RECETTES-DEPENSES') {
@@ -1035,7 +1035,7 @@ if ($modecompta == 'BOOKKEEPING') {
 	 * Expense report
 	 */
 
-	if (!empty($conf->expensereport->enabled)) {
+	if (isModEnabled('expensereport')) {
 		if ($modecompta == 'CREANCES-DETTES' || $modecompta == 'RECETTES-DEPENSES') {
 			$langs->load('trips');
 			if ($modecompta == 'CREANCES-DETTES') {
@@ -1206,7 +1206,7 @@ if ($modecompta == 'BOOKKEEPING') {
 	 * Payment Loan
 	 */
 
-	if (!empty($conf->global->ACCOUNTING_REPORTS_INCLUDE_LOAN) && !empty($conf->loan->enabled) && ($modecompta == 'CREANCES-DETTES' || $modecompta == "RECETTES-DEPENSES")) {
+	if (!empty($conf->global->ACCOUNTING_REPORTS_INCLUDE_LOAN) && isModEnabled('don') && ($modecompta == 'CREANCES-DETTES' || $modecompta == "RECETTES-DEPENSES")) {
 		$subtotal_ht = 0;
 		$subtotal_ttc = 0;
 

From 355286e50aa13e593d6c2c259e2585e2a08b6ead Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Mon, 29 Aug 2022 12:04:39 +0200
Subject: [PATCH 323/974] Use isModEnabled

---
 htdocs/compta/resultat/index.php | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/htdocs/compta/resultat/index.php b/htdocs/compta/resultat/index.php
index 9e1261788bf..9272cb3838a 100644
--- a/htdocs/compta/resultat/index.php
+++ b/htdocs/compta/resultat/index.php
@@ -391,7 +391,7 @@ if (isModEnabled('facture') && ($modecompta == 'CREANCES-DETTES' || $modecompta
 
 $subtotal_ht = 0;
 $subtotal_ttc = 0;
-if (!empty($conf->tax->enabled) && ($modecompta == 'CREANCES-DETTES' || $modecompta == "RECETTES-DEPENSES")) {
+if (isModEnabled('tax') && ($modecompta == 'CREANCES-DETTES' || $modecompta == "RECETTES-DEPENSES")) {
 	if ($modecompta == 'CREANCES-DETTES') {
 		// TVA collected to pay
 		$sql = "SELECT sum(f.total_tva) as amount, date_format(f.datef,'%Y-%m') as dm";
@@ -555,7 +555,7 @@ if (!empty($conf->tax->enabled) && ($modecompta == 'CREANCES-DETTES' || $modecom
 
 $subtotal_ht = 0;
 $subtotal_ttc = 0;
-if (!empty($conf->tax->enabled) && ($modecompta == 'CREANCES-DETTES' || $modecompta == "RECETTES-DEPENSES")) {
+if (isModEnabled('tax') && ($modecompta == 'CREANCES-DETTES' || $modecompta == "RECETTES-DEPENSES")) {
 	if ($modecompta == 'CREANCES-DETTES') {
 		$sql = "SELECT c.libelle as nom, date_format(cs.date_ech,'%Y-%m') as dm, sum(cs.amount) as amount";
 		$sql .= " FROM ".MAIN_DB_PREFIX."c_chargesociales as c";
@@ -613,7 +613,7 @@ if (!empty($conf->tax->enabled) && ($modecompta == 'CREANCES-DETTES' || $modecom
  * Salaries
  */
 
-if (!empty($conf->salaries->enabled) && ($modecompta == 'CREANCES-DETTES' || $modecompta == "RECETTES-DEPENSES")) {
+if (isModEnabled('salaries') && ($modecompta == 'CREANCES-DETTES' || $modecompta == "RECETTES-DEPENSES")) {
 	if ($modecompta == 'CREANCES-DETTES') {
 		$column = 's.dateep';		// we use the date of end of period of salary
 
@@ -675,7 +675,7 @@ if (!empty($conf->salaries->enabled) && ($modecompta == 'CREANCES-DETTES' || $mo
  * Expense reports
  */
 
-if (!empty($conf->expensereport->enabled) && ($modecompta == 'CREANCES-DETTES' || $modecompta == "RECETTES-DEPENSES")) {
+if (!isModEnabled('expensereport') && ($modecompta == 'CREANCES-DETTES' || $modecompta == "RECETTES-DEPENSES")) {
 	$langs->load('trips');
 
 	if ($modecompta == 'CREANCES-DETTES') {
@@ -737,7 +737,7 @@ if (!empty($conf->expensereport->enabled) && ($modecompta == 'CREANCES-DETTES' |
  * Donation get dunning payments
  */
 
-if (!empty($conf->don->enabled) && ($modecompta == 'CREANCES-DETTES' || $modecompta == "RECETTES-DEPENSES")) {
+if (isModEnabled('don') && ($modecompta == 'CREANCES-DETTES' || $modecompta == "RECETTES-DEPENSES")) {
 	$subtotal_ht = 0;
 	$subtotal_ttc = 0;
 
@@ -867,7 +867,7 @@ if (!empty($conf->global->ACCOUNTING_REPORTS_INCLUDE_VARPAY) && isModEnabled('ba
  * Payement Loan
  */
 
-if (!empty($conf->global->ACCOUNTING_REPORTS_INCLUDE_LOAN) && !empty($conf->loan->enabled) && ($modecompta == 'CREANCES-DETTES' || $modecompta == "RECETTES-DEPENSES")) {
+if (!empty($conf->global->ACCOUNTING_REPORTS_INCLUDE_LOAN) && isModEnabled('loan') && ($modecompta == 'CREANCES-DETTES' || $modecompta == "RECETTES-DEPENSES")) {
 	$sql = "SELECT date_format(p.datep, '%Y-%m') AS dm, SUM(p.amount_capital + p.amount_insurance + p.amount_interest) AS amount";
 	$sql .= " FROM ".MAIN_DB_PREFIX."payment_loan AS p, ".MAIN_DB_PREFIX."loan as l";
 	$sql .= " WHERE l.entity IN (".getEntity('variouspayment').")";

From 732d1e4e40bd848b182b2b8dd21893d49c67babc Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Mon, 29 Aug 2022 12:04:47 +0200
Subject: [PATCH 324/974] Use isModEnabled

---
 htdocs/compta/stats/cabyuser.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/compta/stats/cabyuser.php b/htdocs/compta/stats/cabyuser.php
index 04e46e72e1b..abc49677d18 100644
--- a/htdocs/compta/stats/cabyuser.php
+++ b/htdocs/compta/stats/cabyuser.php
@@ -497,10 +497,10 @@ if (count($amount)) {
 
 		// Other stats
 		print '<td class="center">';
-		if (!empty($conf->propal->enabled) && $key > 0) {
+		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 (!empty($conf->commande->enabled) && $key > 0) {
+		if (isModEnabled('commande') && $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) {

From a1bb835074508cb2ef54b7b51815f36a53a52f5a Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Mon, 29 Aug 2022 12:04:54 +0200
Subject: [PATCH 325/974] Use isModEnabled

---
 htdocs/compta/stats/casoc.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/compta/stats/casoc.php b/htdocs/compta/stats/casoc.php
index f02fb24dc7b..72878c5500d 100644
--- a/htdocs/compta/stats/casoc.php
+++ b/htdocs/compta/stats/casoc.php
@@ -673,10 +673,10 @@ if (count($amount)) {
 
 		// Other stats
 		print '<td class="center">';
-		if (!empty($conf->propal->enabled) && $key > 0) {
+		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 (!empty($conf->commande->enabled) && $key > 0) {
+		if (isModEnabled('commande') && $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) {

From 6ef4987766eef60c00fec3a148cfc823301f4085 Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Mon, 29 Aug 2022 12:05:03 +0200
Subject: [PATCH 326/974] Use isModEnabled

---
 htdocs/compta/stats/supplier_turnover_by_thirdparty.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/compta/stats/supplier_turnover_by_thirdparty.php b/htdocs/compta/stats/supplier_turnover_by_thirdparty.php
index 7516e45a21f..19088a6d2fa 100644
--- a/htdocs/compta/stats/supplier_turnover_by_thirdparty.php
+++ b/htdocs/compta/stats/supplier_turnover_by_thirdparty.php
@@ -590,10 +590,10 @@ if (count($amount)) {
 		if (!empty($conf->supplier_proposal->enabled) && $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 (((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD)) || !empty($conf->supplier_order->enabled)) && $key > 0) {
+		if (((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD)) || isModEnabled('supplier_order')) && $key > 0) {
 			print '&nbsp;<a href="'.DOL_URL_ROOT.'/commande/stats/index.php?mode=supplier&socid='.$key.'">'.img_picto($langs->trans("OrderStats"), "stats").'</a>&nbsp;';
 		}
-		if (((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD)) || !empty($conf->supplier_invoice->enabled)) && $key > 0) {
+		if (((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD)) || isModEnabled('supplier_invoice')) && $key > 0) {
 			print '&nbsp;<a href="'.DOL_URL_ROOT.'/compta/facture/stats/index.php?mode=supplier&socid='.$key.'">'.img_picto($langs->trans("InvoiceStats"), "stats").'</a>&nbsp;';
 		}
 		print '</td>';

From 6d5bb21fa9d7822398cd3c0657a0050649e03e4e Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Mon, 29 Aug 2022 12:05:10 +0200
Subject: [PATCH 327/974] Use isModEnabled

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

diff --git a/htdocs/compta/tva/payments.php b/htdocs/compta/tva/payments.php
index a9c08962b5f..9a459f6aeea 100644
--- a/htdocs/compta/tva/payments.php
+++ b/htdocs/compta/tva/payments.php
@@ -118,7 +118,7 @@ if ($year) {
 	$param .= '&year='.$year;
 }
 
-if (!empty($conf->tax->enabled) && $user->rights->tax->charges->lire) {
+if (isModEnabled('tax') && $user->rights->tax->charges->lire) {
 	print '<div class="div-table-responsive">'; // You can use div-table-responsive-no-min if you dont need reserved height for your table
 	print '<table class="noborder centpercent">';
 	print '<tr class="liste_titre">';

From 0fc2f008bdb982188f0e1e41bb42edb3ee93fe95 Mon Sep 17 00:00:00 2001
From: bagtaib <bagtaib@ubuntu>
Date: Mon, 29 Aug 2022 11:24:42 +0100
Subject: [PATCH 328/974] first try

---
 htdocs/public/partnership/new.php | 71 ++++++++++++++++++++-----------
 1 file changed, 46 insertions(+), 25 deletions(-)

diff --git a/htdocs/public/partnership/new.php b/htdocs/public/partnership/new.php
index 9178d37ddc6..4d30f42b0db 100644
--- a/htdocs/public/partnership/new.php
+++ b/htdocs/public/partnership/new.php
@@ -67,7 +67,7 @@ $backtopage = GETPOST('backtopage', 'alpha');
 $action = GETPOST('action', 'aZ09');
 
 // Load translation files
-$langs->loadLangs(array("main", "members", "companies", "install", "other"));
+$langs->loadLangs(array("main", "members", "partnership", "companies", "install", "other"));
 
 // Security check
 if (empty($conf->partnership->enabled)) {
@@ -178,10 +178,10 @@ if (empty($reshook) && $action == 'add') {
 
 	$db->begin();
 
-	/*if (GETPOST('typeid') <= 0) {
+	if (GETPOST('partnershiptype', 'int') <= 0) {
 		$error++;
 		$errmsg .= $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Type"))."<br>\n";
-	}*/
+	}
 	if (!GETPOST('societe')) {
 		$error++;
 		$errmsg .= $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("societe"))."<br>\n";
@@ -208,7 +208,6 @@ if (empty($reshook) && $action == 'add') {
 
 	if (!$error) {
 		$partnership = new Partnership($db);
-		$partnershipt = new PartnershipType($db);
 
 		// We try to find the thirdparty or the member
 		if (getDolGlobalString('PARTNERSHIP_IS_MANAGED_FOR', 'thirdparty') == 'thirdparty') {
@@ -217,29 +216,51 @@ if (empty($reshook) && $action == 'add') {
 			$partnership->fk_soc = 0;
 		}
 
-		$partnership->status      = 0;
-		$partnership->note_private = GETPOST('note_private');
-		$partnership->date_creation = dol_now();
+		$partnership->status                 = 0;
+		$partnership->note_private           = GETPOST('note_private');
+		$partnership->date_creation 		 = dol_now();
 		$partnership->date_partnership_start = dol_now();
-		$partnership->fk_user_creat = 0;
-
-		/*$partnershipt->fetch(0, 'default');
-		if ($partnershipt->id > 0) {
-			$partnership->fk_type = $partnershipt->id;
-		}*/
-		$partnership->fk_type = GETPOST('partnershiptype', 'int');
-
-		//$partnership->firstname   = GETPOST('firstname');
-		//$partnership->lastname    = GETPOST('lastname');
-		//$partnership->address     = GETPOST('address');
-		//$partnership->zip         = GETPOST('zipcode');
-		//$partnership->town        = GETPOST('town');
-		//$partnership->email       = GETPOST('email');
-		//$partnership->country_id  = GETPOST('country_id', 'int');
-		//$partnership->state_id    = GETPOST('state_id', 'int');
-		//$partnership->typeid      = $conf->global->PARTNERSHIP_NEWFORM_FORCETYPE ? $conf->global->PARTNERSHIP_NEWFORM_FORCETYPE : GETPOST('typeid', 'int');
+		$partnership->fk_user_creat          = 0;
+		$partnership->fk_type                = GETPOST('partnershiptype', 'int');
+		//$partnership->typeid               = $conf->global->PARTNERSHIP_NEWFORM_FORCETYPE ? $conf->global->PARTNERSHIP_NEWFORM_FORCETYPE : GETPOST('typeid', 'int');
 
 		// test if societe already exist
+		$company = new Societe($db);
+		$result = $company->fetch(0, GETPOST('societe'));
+		if ($result == 0) { // si il ya pas d'entree sur le nom  on teste l'email
+			$result1 = $company->fetch(0, 0, 0, 0, 0, 0, 0, 0, 0, 0, GETPOST('email'));
+			if ($result1 > 0) {
+				$error++;
+				$errmsg = $langs->trans("already exists please rewrite your company name");
+			} else {
+				//create thirdparty
+				$company = new Societe($db);
+
+				$company->name        = GETPOST('societe');
+				$company->address     = GETPOST('address');
+				$company->zip         = GETPOST('zipcode');
+				$company->town        = GETPOST('town');
+				$company->email       = GETPOST('email');
+				$company->country_id  = GETPOST('country_id', 'int');
+				$company->state_id    = GETPOST('state_id', 'int');
+				$company->name_alias  = dolGetFirstLastname(GETPOST('firstname'), GETPOST('lastname'));
+
+				$resultat=$company->create($user);
+				if ($resultat < 0) {
+					$error++;
+					$errmsg .= join('<br>', $company->errors);
+				}
+
+				$partnership->fk_soc = $company->id;
+			}
+		} elseif ($result == -2) {
+			$error++;
+			$errmsg = $langs->trans('more than one entry exist for this company please contact us to complete your partnership request');
+		} else {
+			$partnership->fk_soc = $company->id;
+		}
+
+		/*
 		$sql =	"SELECT rowid FROM ".MAIN_DB_PREFIX."societe WHERE nom='".$db->escape(GETPOST('societe'))."'";
 		$result = $db->query($sql);
 		if ($result) {
@@ -280,7 +301,7 @@ if (empty($reshook) && $action == 'add') {
 		} else {
 			$company = $db->fetch_object($result);
 			$partnership->fk_soc = $company->rowid;
-		}
+		}*/
 
 		// Fill array 'array_options' with data from add form
 		$extrafields->fetch_name_optionals_label($partnership->table_element);

From 0ee2fce9a245a4654b8ee9c047c0ece3c1ced7c0 Mon Sep 17 00:00:00 2001
From: ptibogxiv <support@ptibogxiv.net>
Date: Mon, 29 Aug 2022 14:43:17 +0200
Subject: [PATCH 329/974] NEW manage no email with thirdparties (better for
 GDPR)

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

diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php
index ee2d71f6d12..a3f19f6c183 100644
--- a/htdocs/societe/class/societe.class.php
+++ b/htdocs/societe/class/societe.class.php
@@ -4008,6 +4008,111 @@ class Societe extends CommonObject
 		return -1;
 	}
 
+	/**
+	 *  Return number of mass Emailing received by this contacts with its email
+	 *
+	 *  @return       int     Number of EMailings
+	 */
+	public function getNbOfEMailings()
+	{
+		$sql = "SELECT count(mc.email) as nb";
+		$sql .= " FROM ".MAIN_DB_PREFIX."mailing_cibles as mc, ".MAIN_DB_PREFIX."mailing as m";
+		$sql .= " WHERE mc.fk_mailing=m.rowid AND mc.email = '".$this->db->escape($this->email)."' ";
+		$sql .= " AND m.entity IN (".getEntity($this->element).") AND mc.statut NOT IN (-1,0)"; // -1 error, 0 not sent, 1 sent with success
+
+		$resql = $this->db->query($sql);
+		if ($resql) {
+			$obj = $this->db->fetch_object($resql);
+			$nb = $obj->nb;
+
+			$this->db->free($resql);
+			return $nb;
+		} else {
+			$this->error = $this->db->error();
+			return -1;
+		}
+	}
+
+	/**
+	 *  Set "blacklist" mailing status
+	 *
+	 *  @param	int		$no_email	1=Do not send mailing, 0=Ok to recieve mailling
+	 *  @return int					<0 if KO, >0 if OK
+	 */
+	public function setNoEmail($no_email)
+	{
+		$error = 0;
+
+		// Update mass emailing flag into table mailing_unsubscribe
+		if ($this->email) {
+			$this->db->begin();
+
+			if ($no_email) {
+				$sql = "SELECT COUNT(rowid) as nb FROM ".MAIN_DB_PREFIX."mailing_unsubscribe WHERE entity IN (".getEntity('mailing', 0).") AND email = '".$this->db->escape($this->email)."'";
+				$resql = $this->db->query($sql);
+				if ($resql) {
+					$obj = $this->db->fetch_object($resql);
+					$noemail = $obj->nb;
+					if (empty($noemail)) {
+						$sql = "INSERT INTO ".MAIN_DB_PREFIX."mailing_unsubscribe(email, entity, date_creat) VALUES ('".$this->db->escape($this->email)."', ".getEntity('mailing', 0).", '".$this->db->idate(dol_now())."')";
+						$resql = $this->db->query($sql);
+						if (!$resql) {
+							$error++;
+							$this->error = $this->db->lasterror();
+							$this->errors[] = $this->error;
+						}
+					}
+				} else {
+					$error++;
+					$this->error = $this->db->lasterror();
+					$this->errors[] = $this->error;
+				}
+			} else {
+				$sql = "DELETE FROM ".MAIN_DB_PREFIX."mailing_unsubscribe WHERE email = '".$this->db->escape($this->email)."' AND entity IN (".getEntity('mailing', 0).")";
+				$resql = $this->db->query($sql);
+				if (!$resql) {
+					$error++;
+					$this->error = $this->db->lasterror();
+					$this->errors[] = $this->error;
+				}
+			}
+
+			if (empty($error)) {
+				$this->no_email = $no_email;
+				$this->db->commit();
+				return 1;
+			} else {
+				$this->db->rollback();
+				return $error * -1;
+			}
+		}
+
+		return 0;
+	}
+
+	/**
+	 *  get "blacklist" mailing status
+	 * 	set no_email attribut to 1 or 0
+	 *
+	 *  @return int					<0 if KO, >0 if OK
+	 */
+	public function getNoEmail()
+	{
+		if ($this->email) {
+			$sql = "SELECT COUNT(rowid) as nb FROM ".MAIN_DB_PREFIX."mailing_unsubscribe WHERE entity IN (".getEntity('mailing').") AND email = '".$this->db->escape($this->email)."'";
+			$resql = $this->db->query($sql);
+			if ($resql) {
+				$obj = $this->db->fetch_object($resql);
+				$this->no_email = $obj->nb;
+				return 1;
+			} else {
+				$this->error = $this->db->lasterror();
+				$this->errors[] = $this->error;
+				return -1;
+			}
+		}
+		return 0;
+	}
 
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**

From 9d74c5c776c7e3066448329246ef88e6e4f7b289 Mon Sep 17 00:00:00 2001
From: ptibogxiv <support@ptibogxiv.net>
Date: Mon, 29 Aug 2022 14:46:26 +0200
Subject: [PATCH 330/974] wip

---
 .../modules/mailings/thirdparties.modules.php |   6 +-
 htdocs/societe/card.php                       | 136 +++++++++++++++++-
 .../societe/class/api_thirdparties.class.php  |  15 +-
 3 files changed, 151 insertions(+), 6 deletions(-)

diff --git a/htdocs/core/modules/mailings/thirdparties.modules.php b/htdocs/core/modules/mailings/thirdparties.modules.php
index 89bc2cf2b5e..0db503b620c 100644
--- a/htdocs/core/modules/mailings/thirdparties.modules.php
+++ b/htdocs/core/modules/mailings/thirdparties.modules.php
@@ -81,7 +81,7 @@ class mailing_thirdparties extends MailingTargets
 			$sql .= " AND s.entity IN (".getEntity('societe').")";
 			$sql .= " AND s.email NOT IN (SELECT email FROM ".MAIN_DB_PREFIX."mailing_cibles WHERE fk_mailing=".((int) $mailing_id).")";
 			if (GETPOST('default_lang', 'alpha')) {
-				$sql .= " AND s.default_lang LIKE '".$this->db->escape(GETPOST('default_lang', 'alpha'))."%'";
+				//$sql .= " AND s.default_lang LIKE '".$this->db->escape(GETPOST('default_lang', 'alpha'))."%'";
 			}
 		} else {
 			$addFilter = "";
@@ -226,7 +226,7 @@ class mailing_thirdparties extends MailingTargets
 		$sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
 		$sql .= " WHERE s.email <> ''";
 		$sql .= " AND s.entity IN (".getEntity('societe').")";
-
+		$sql .= " AND (SELECT count(*) FROM ".MAIN_DB_PREFIX."mailing_unsubscribe WHERE email = s.email) = 0";
 		// La requete doit retourner un champ "nb" pour etre comprise par parent::getNbOfRecipients
 		return parent::getNbOfRecipients($sql);
 	}
@@ -316,11 +316,13 @@ class mailing_thirdparties extends MailingTargets
 		$s .= '</select>';
 		$s .= ajax_combobox("filter_status_thirdparties");
 
+		if (!empty($conf->global->MAIN_MULTILANGS)) {
 		// Choose language
 		require_once DOL_DOCUMENT_ROOT.'/core/class/html.formadmin.class.php';
 		$formadmin = new FormAdmin($this->db);
 		$s .= '<span class="opacitymedium">'.$langs->trans("DefaultLang").':</span> ';
 		$s .= $formadmin->select_language($langs->getDefaultLang(1), 'filter_lang_thirdparties', 0, null, 1, 0, 0, '', 0, 0, 0, null, 1);
+		}
 
 		return $s;
 	}
diff --git a/htdocs/societe/card.php b/htdocs/societe/card.php
index 5d557d30a02..9c049148632 100644
--- a/htdocs/societe/card.php
+++ b/htdocs/societe/card.php
@@ -253,6 +253,7 @@ if (empty($reshook)) {
 
 				// Update
 				$result = $object->update($object->id, $user, 0, 1, 1, 'merge');
+
 				if ($result < 0) {
 					setEventMessages($object->error, $object->errors, 'errors');
 					$error++;
@@ -465,6 +466,7 @@ if (empty($reshook)) {
 			$object->phone					= GETPOST('phone', 'alpha');
 			$object->fax					= GETPOST('fax', 'alpha');
 			$object->email					= trim(GETPOST('email', 'custom', 0, FILTER_SANITIZE_EMAIL));
+			$object->no_email 				= GETPOST("no_email", "int");
 			$object->url					= trim(GETPOST('url', 'custom', 0, FILTER_SANITIZE_URL));
 			$object->idprof1				= trim(GETPOST('idprof1', 'alphanohtml'));
 			$object->idprof2				= trim(GETPOST('idprof2', 'alphanohtml'));
@@ -600,6 +602,16 @@ if (empty($reshook)) {
 
 				$result = $object->create($user);
 
+				if (empty($error) && !empty($conf->mailing->enabled) && !empty($object->email)) {
+					// Add mass emailing flag into table mailing_unsubscribe
+					$result = $object->setNoEmail($object->no_email);
+					if ($result < 0) {
+						$error++;
+						$errors = array_merge($errors, ($object->error ? array($object->error) : $object->errors));
+						$action = 'create';
+					}
+				}
+
 				if ($result >= 0) {
 					if ($object->particulier) {
 						dol_syslog("We ask to create a contact/address too", LOG_DEBUG);
@@ -757,6 +769,24 @@ if (empty($reshook)) {
 
 				$result = $object->update($socid, $user, 1, $object->oldcopy->codeclient_modifiable(), $object->oldcopy->codefournisseur_modifiable(), 'update', 0);
 
+				if ($result > 0) {
+
+					// Update mass emailing flag into table mailing_unsubscribe
+					if (GETPOSTISSET('no_email') && $object->email) {
+						$no_email = GETPOST('no_email', 'int');
+						$result = $object->setNoEmail($no_email);
+						if ($result < 0) {
+							setEventMessages($object->error, $object->errors, 'errors');
+							$action = 'edit';
+						}
+					}
+
+					$action = 'view';
+				} else {
+					setEventMessages($object->error, $object->errors, 'errors');
+					$action = 'edit';
+				}
+
 				if ($result <= 0) {
 					setEventMessages($object->error, $object->errors, 'errors');
 					$error++;
@@ -1590,6 +1620,35 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 		print '<tr><td>'.$form->editfieldkey('Web', 'url', '', $object, 0).'</td>';
 		print '<td colspan="3">'.img_picto('', 'globe', 'class="pictofixedwidth"').' <input type="text" class="maxwidth500 widthcentpercentminusx" name="url" id="url" value="'.$object->url.'"></td></tr>';
 
+			// Unsubscribe
+			if (!empty($conf->mailing->enabled)) {
+				if ($conf->use_javascript_ajax && $conf->global->MAILING_CONTACT_DEFAULT_BULK_STATUS == 2) {
+					print "\n".'<script type="text/javascript">'."\n";
+					print '$(document).ready(function () {
+							$("#email").keyup(function() {
+								if ($(this).val()!="") {
+									$(".noemail").addClass("fieldrequired");
+								} else {
+									$(".noemail").removeClass("fieldrequired");
+								}
+							});
+						})'."\n";
+					print '</script>'."\n";
+				}
+				if (!GETPOSTISSET("no_email") && !empty($object->email)) {
+					$result = $object->getNoEmail();
+					if ($result < 0) {
+						setEventMessages($object->error, $object->errors, 'errors');
+					}
+				}
+				print '<tr>';
+				print '<td class="noemail"><label for="no_email">'.$langs->trans("No_Email").'</label></td>';
+				print '<td>';
+				print $form->selectyesno('no_email', (GETPOSTISSET("no_email") ? GETPOST("no_email", 'int') : $conf->global->MAILING_CONTACT_DEFAULT_BULK_STATUS), 1, false, ($conf->global->MAILING_CONTACT_DEFAULT_BULK_STATUS == 2));
+				print '</td>';
+				print '</tr>';
+			}
+
 		// Social networks
 		if (!empty($conf->socialnetworks->enabled)) {
 			foreach ($socialnetworks as $key => $value) {
@@ -1931,6 +1990,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 				$object->phone					= GETPOST('phone', 'alpha');
 				$object->fax					= GETPOST('fax', 'alpha');
 				$object->email					= GETPOST('email', 'custom', 0, FILTER_SANITIZE_EMAIL);
+				$object->no_email				= GETPOST("no_email", "int");
 				$object->url					= GETPOST('url', 'custom', 0, FILTER_SANITIZE_URL);
 				$object->capital				= GETPOST('capital', 'alphanohtml');
 				$object->idprof1				= GETPOST('idprof1', 'alphanohtml');
@@ -2272,10 +2332,58 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 			print '<td>'.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></tr>';
 
 			// EMail / Web
-			print '<tr><td>'.$form->editfieldkey('EMail', 'email', GETPOST('email', 'custom', 0, FILTER_SANITIZE_EMAIL), $object, 0, 'string', '', (!empty($conf->global->SOCIETE_EMAIL_MANDATORY))).'</td>';
-			print '<td colspan="3">'.img_picto('', 'object_email', 'class="pictofixedwidth"').' <input type="text" name="email" id="email" class="maxwidth200onsmartphone maxwidth500 widthcentpercentminusx" value="'.(GETPOSTISSET('email') ? GETPOST('email', 'custom', 0, FILTER_SANITIZE_EMAIL) : $object->email).'"></td></tr>';
 			print '<tr><td>'.$form->editfieldkey('Web', 'url', GETPOST('url', 'alpha'), $object, 0).'</td>';
-			print '<td colspan="3">'.img_picto('', 'globe', 'class="pictofixedwidth"').' <input type="text" name="url" id="url" class="maxwidth200onsmartphone maxwidth500 widthcentpercentminusx " value="'.(GETPOSTISSET('url') ?GETPOST('url', 'alpha') : $object->url).'"></td></tr>';
+			print '<td colspan="3">'.img_picto('', 'globe', 'class="pictofixedwidth"').' <input type="text" name="url" id="url" class="maxwidth200onsmartphone maxwidth300 widthcentpercentminusx " value="'.(GETPOSTISSET('url') ?GETPOST('url', 'alpha') : $object->url).'"></td>';
+
+			// EMail
+			print '<tr><td>'.$form->editfieldkey('EMail', 'email', GETPOST('email', 'alpha'), $object, 0, 'string', '', (!empty($conf->global->SOCIETE_EMAIL_MANDATORY))).'</td>';
+			print '<td>';
+			print img_picto('', 'object_email');
+			print '<input type="text" name="email" id="email" class="maxwidth100onsmartphone quatrevingtpercent" value="'.(GETPOSTISSET('email') ?GETPOST('email', 'alpha') : $object->email).'"></td>';
+			if (!empty($conf->mailing->enabled)) {
+				$langs->load("mails");
+				print '<td class="nowrap">'.$langs->trans("NbOfEMailingsSend").'</td>';
+				print '<td>'.$object->getNbOfEMailings().'</td>';
+			} else {
+				print '<td colspan="2"></td>';
+			}
+			print '</tr>';
+
+			// Unsubscribe
+			if (!empty($conf->mailing->enabled)) {
+				if ($conf->use_javascript_ajax && isset($conf->global->MAILING_CONTACT_DEFAULT_BULK_STATUS) && $conf->global->MAILING_CONTACT_DEFAULT_BULK_STATUS == 2) {
+					print "\n".'<script type="text/javascript">'."\n";
+
+					print '
+					jQuery(document).ready(function () {
+						function init_check_no_email(input) {
+							if (input.val()!="") {
+								$(".noemail").addClass("fieldrequired");
+							} else {
+								$(".noemail").removeClass("fieldrequired");
+							}
+						}
+						$("#email").keyup(function() {
+							init_check_no_email($(this));
+						});
+						init_check_no_email($("#email"));
+					})'."\n";
+					print '</script>'."\n";
+				}
+				if (!GETPOSTISSET("no_email") && !empty($object->email)) {
+					$result = $object->getNoEmail();
+					if ($result < 0) {
+						setEventMessages($object->error, $object->errors, 'errors');
+					}
+				}
+				print '<tr>';
+				print '<td class="noemail"><label for="no_email">'.$langs->trans("No_Email").'</label></td>';
+				print '<td>';
+				$useempty = (isset($conf->global->MAILING_CONTACT_DEFAULT_BULK_STATUS) && ($conf->global->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 '</td>';
+				print '</tr>';
+			}
 
 			// Social network
 			if (!empty($conf->socialnetworks->enabled)) {
@@ -2931,6 +3039,28 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 		}
 		print '</td></tr>';
 
+		// Email
+		if (!empty($conf->mailing->enabled)) {
+			$langs->load("mails");
+			print '<tr><td>'.$langs->trans("NbOfEMailingsSend").'</td>';
+			print '<td><a href="'.DOL_URL_ROOT.'/comm/mailing/list.php?filteremail='.urlencode($object->email).'">'.$object->getNbOfEMailings().'</a></td></tr>';
+		}
+
+		// Unsubscribe opt-out
+		if (!empty($conf->mailing->enabled)) {
+			$result = $object->getNoEmail();
+			if ($result < 0) {
+				setEventMessages($object->error, $object->errors, 'errors');
+			}
+			print '<tr><td>'.$langs->trans("No_Email").'</td><td>';
+			if ($object->email) {
+				print yn($object->no_email);
+			} else {
+				print '<span class="opacitymedium">'.$langs->trans("EMailNotDefined").'</span>';
+			}
+			print '</td></tr>';
+		}
+
 		// Default language
 		if (!empty($conf->global->MAIN_MULTILANGS)) {
 			require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
diff --git a/htdocs/societe/class/api_thirdparties.class.php b/htdocs/societe/class/api_thirdparties.class.php
index a7b78174cf1..123ad09560a 100644
--- a/htdocs/societe/class/api_thirdparties.class.php
+++ b/htdocs/societe/class/api_thirdparties.class.php
@@ -230,6 +230,9 @@ class Thirdparties extends DolibarrApi
 				$obj = $this->db->fetch_object($result);
 				$soc_static = new Societe($this->db);
 				if ($soc_static->fetch($obj->rowid)) {
+					if (isModEnabled('mailing')) {
+						$soc_static->getNoEmail();
+					}
 					$obj_ret[] = $this->_cleanObjectDatas($soc_static);
 				}
 				$i++;
@@ -263,6 +266,9 @@ class Thirdparties extends DolibarrApi
 		if ($this->company->create(DolibarrApiAccess::$user) < 0) {
 			throw new RestException(500, 'Error creating thirdparty', array_merge(array($this->company->error), $this->company->errors));
 		}
+		if (isModEnabled('mailing') && !empty($this->company->email) && isset($this->company->no_email)) {
+			$this->company->setNoEmail($this->company->no_email);
+		}
 
 		return $this->company->id;
 	}
@@ -296,7 +302,11 @@ class Thirdparties extends DolibarrApi
 			$this->company->$field = $value;
 		}
 
-		if ($this->company->update($id, DolibarrApiAccess::$user, 1, '', '', 'update')) {
+		if (isModEnabled('mailing') && !empty($this->company->email) && isset($this->company->no_email)) {
+			$this->company->setNoEmail($this->company->no_email);
+		}
+
+		if ($this->company->update($id, DolibarrApiAccess::$user, 1, '', '', 'update', 1)) {
 			return $this->get($id);
 		}
 
@@ -1876,6 +1886,9 @@ class Thirdparties extends DolibarrApi
 		if (!DolibarrApi::_checkAccessToResource('societe', $this->company->id)) {
 			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login.' on this thirdparty');
 		}
+		if (isModEnabled('mailing')) {
+			$this->company->getNoEmail();
+		}
 
 		if (!empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) {
 			$filterabsolutediscount = "fk_facture_source IS NULL"; // If we want deposit to be substracted to payments only and not to total of final invoice

From 747db835ae78d7755c82d7b095a29123b4785c26 Mon Sep 17 00:00:00 2001
From: stickler-ci <support@stickler-ci.com>
Date: Mon, 29 Aug 2022 12:47:01 +0000
Subject: [PATCH 331/974] Fixing style errors.

---
 htdocs/societe/card.php | 37 ++++++++++++++++++-------------------
 1 file changed, 18 insertions(+), 19 deletions(-)

diff --git a/htdocs/societe/card.php b/htdocs/societe/card.php
index 9c049148632..d56f9419989 100644
--- a/htdocs/societe/card.php
+++ b/htdocs/societe/card.php
@@ -770,7 +770,6 @@ if (empty($reshook)) {
 				$result = $object->update($socid, $user, 1, $object->oldcopy->codeclient_modifiable(), $object->oldcopy->codefournisseur_modifiable(), 'update', 0);
 
 				if ($result > 0) {
-
 					// Update mass emailing flag into table mailing_unsubscribe
 					if (GETPOSTISSET('no_email') && $object->email) {
 						$no_email = GETPOST('no_email', 'int');
@@ -1621,10 +1620,10 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 		print '<td colspan="3">'.img_picto('', 'globe', 'class="pictofixedwidth"').' <input type="text" class="maxwidth500 widthcentpercentminusx" name="url" id="url" value="'.$object->url.'"></td></tr>';
 
 			// Unsubscribe
-			if (!empty($conf->mailing->enabled)) {
-				if ($conf->use_javascript_ajax && $conf->global->MAILING_CONTACT_DEFAULT_BULK_STATUS == 2) {
-					print "\n".'<script type="text/javascript">'."\n";
-					print '$(document).ready(function () {
+		if (!empty($conf->mailing->enabled)) {
+			if ($conf->use_javascript_ajax && $conf->global->MAILING_CONTACT_DEFAULT_BULK_STATUS == 2) {
+				print "\n".'<script type="text/javascript">'."\n";
+				print '$(document).ready(function () {
 							$("#email").keyup(function() {
 								if ($(this).val()!="") {
 									$(".noemail").addClass("fieldrequired");
@@ -1633,21 +1632,21 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 								}
 							});
 						})'."\n";
-					print '</script>'."\n";
-				}
-				if (!GETPOSTISSET("no_email") && !empty($object->email)) {
-					$result = $object->getNoEmail();
-					if ($result < 0) {
-						setEventMessages($object->error, $object->errors, 'errors');
-					}
-				}
-				print '<tr>';
-				print '<td class="noemail"><label for="no_email">'.$langs->trans("No_Email").'</label></td>';
-				print '<td>';
-				print $form->selectyesno('no_email', (GETPOSTISSET("no_email") ? GETPOST("no_email", 'int') : $conf->global->MAILING_CONTACT_DEFAULT_BULK_STATUS), 1, false, ($conf->global->MAILING_CONTACT_DEFAULT_BULK_STATUS == 2));
-				print '</td>';
-				print '</tr>';
+				print '</script>'."\n";
 			}
+			if (!GETPOSTISSET("no_email") && !empty($object->email)) {
+				$result = $object->getNoEmail();
+				if ($result < 0) {
+					setEventMessages($object->error, $object->errors, 'errors');
+				}
+			}
+			print '<tr>';
+			print '<td class="noemail"><label for="no_email">'.$langs->trans("No_Email").'</label></td>';
+			print '<td>';
+			print $form->selectyesno('no_email', (GETPOSTISSET("no_email") ? GETPOST("no_email", 'int') : $conf->global->MAILING_CONTACT_DEFAULT_BULK_STATUS), 1, false, ($conf->global->MAILING_CONTACT_DEFAULT_BULK_STATUS == 2));
+			print '</td>';
+			print '</tr>';
+		}
 
 		// Social networks
 		if (!empty($conf->socialnetworks->enabled)) {

From 09f2140411b0c55417be6cdba9199da0793b1c3c Mon Sep 17 00:00:00 2001
From: ptibogxiv <support@ptibogxiv.net>
Date: Mon, 29 Aug 2022 14:48:40 +0200
Subject: [PATCH 332/974] Update thirdparties.modules.php

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

diff --git a/htdocs/core/modules/mailings/thirdparties.modules.php b/htdocs/core/modules/mailings/thirdparties.modules.php
index 0db503b620c..6f694cc0b74 100644
--- a/htdocs/core/modules/mailings/thirdparties.modules.php
+++ b/htdocs/core/modules/mailings/thirdparties.modules.php
@@ -81,7 +81,7 @@ class mailing_thirdparties extends MailingTargets
 			$sql .= " AND s.entity IN (".getEntity('societe').")";
 			$sql .= " AND s.email NOT IN (SELECT email FROM ".MAIN_DB_PREFIX."mailing_cibles WHERE fk_mailing=".((int) $mailing_id).")";
 			if (GETPOST('default_lang', 'alpha')) {
-				//$sql .= " AND s.default_lang LIKE '".$this->db->escape(GETPOST('default_lang', 'alpha'))."%'";
+				$sql .= " AND s.default_lang LIKE '".$this->db->escape(GETPOST('default_lang', 'alpha'))."%'";
 			}
 		} else {
 			$addFilter = "";

From d41c6a93d31d93ba6a48edef13743e94eb847dec Mon Sep 17 00:00:00 2001
From: lmarcouiller <lucas.marcouiller@gmail.com>
Date: Mon, 29 Aug 2022 16:23:33 +0200
Subject: [PATCH 333/974] Fix : php 8.1 warn,ings

---
 htdocs/core/class/html.formticket.class.php | 8 ++++----
 htdocs/core/lib/payments.lib.php            | 2 +-
 htdocs/core/lib/ticket.lib.php              | 2 +-
 htdocs/main.inc.php                         | 2 +-
 htdocs/public/members/new.php               | 8 ++++----
 htdocs/public/project/new.php               | 2 +-
 htdocs/public/recruitment/index.php         | 3 +++
 htdocs/public/ticket/create_ticket.php      | 2 ++
 htdocs/public/ticket/index.php              | 3 ++-
 9 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/htdocs/core/class/html.formticket.class.php b/htdocs/core/class/html.formticket.class.php
index 83071830ae7..2e4035e2131 100644
--- a/htdocs/core/class/html.formticket.class.php
+++ b/htdocs/core/class/html.formticket.class.php
@@ -416,7 +416,7 @@ class FormTicket
 		$toolbarname = 'dolibarr_notes';
 		if ($this->ispublic) {
 			$toolbarname = 'dolibarr_details';
-			print '<div class="warning">'.($conf->global->TICKET_PUBLIC_TEXT_HELP_MESSAGE ? $conf->global->TICKET_PUBLIC_TEXT_HELP_MESSAGE : $langs->trans('TicketPublicPleaseBeAccuratelyDescribe')).'</div>';
+			print '<div class="warning">'.(getDolGlobalString("TICKET_PUBLIC_TEXT_HELP_MESSAGE", $langs->trans('TicketPublicPleaseBeAccuratelyDescribe'))).'</div>';
 		}
 		include_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
 		$uselocalbrowser = true;
@@ -752,7 +752,7 @@ class FormTicket
 			}
 		}
 		print '</select>';
-		if ($user->admin && !$noadmininfo) {
+		if (isset($user->admin) && $user->admin && !$noadmininfo) {
 			print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
 		}
 
@@ -864,7 +864,7 @@ class FormTicket
 				}
 			}
 			print '</select>';
-			if ($user->admin && !$noadmininfo) {
+			if (isset($user->admin) && $user->admin && !$noadmininfo) {
 				print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
 			}
 
@@ -1199,7 +1199,7 @@ class FormTicket
 			}
 		}
 		print '</select>';
-		if ($user->admin && !$noadmininfo) {
+		if (isset($user->admin) && $user->admin && !$noadmininfo) {
 			print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
 		}
 
diff --git a/htdocs/core/lib/payments.lib.php b/htdocs/core/lib/payments.lib.php
index 5c9d9342b01..1ebca6ba65a 100644
--- a/htdocs/core/lib/payments.lib.php
+++ b/htdocs/core/lib/payments.lib.php
@@ -482,7 +482,7 @@ function htmlPrintOnlinePaymentFooter($fromcompany, $langs, $addformmessage = 0,
 		}
 
 		// Add other message if VAT exists
-		if ($object->total_vat != 0 || $object->total_tva != 0) {
+		if (!empty($object->total_vat) || $object->total_tva != 0) {
 			$parammessageform = 'ONLINE_PAYMENT_MESSAGE_FORMIFVAT_'.$suffix;
 			if (!empty($conf->global->$parammessageform)) {
 				print $langs->transnoentities($conf->global->$parammessageform);
diff --git a/htdocs/core/lib/ticket.lib.php b/htdocs/core/lib/ticket.lib.php
index 8ef509057c4..28a443f2034 100644
--- a/htdocs/core/lib/ticket.lib.php
+++ b/htdocs/core/lib/ticket.lib.php
@@ -206,7 +206,7 @@ function generate_random_id($car = 16)
 function llxHeaderTicket($title, $head = "", $disablejs = 0, $disablehead = 0, $arrayofjs = '', $arrayofcss = '')
 {
 	global $user, $conf, $langs, $mysoc;
-
+	$urllogo = "";
 	top_htmlhead($head, $title, $disablejs, $disablehead, $arrayofjs, $arrayofcss, 0, 1); // Show html headers
 
 	print '<body id="mainbody" class="publicnewticketform">';
diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index 6a0fda06cb0..a45130010a3 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -1600,7 +1600,7 @@ function top_htmlhead($head, $title = '', $disablejs = 0, $disablehead = 0, $arr
 			dolibarr_set_const($db, "MAIN_IHM_PARAMS_REV", ((int) $conf->global->MAIN_IHM_PARAMS_REV) + 1, 'chaine', 0, '', $conf->entity);
 		}
 
-		$themeparam = '?lang='.$langs->defaultlang.'&amp;theme='.$conf->theme.(GETPOST('optioncss', 'aZ09') ? '&amp;optioncss='.GETPOST('optioncss', 'aZ09', 1) : '').'&amp;userid='.$user->id.'&amp;entity='.$conf->entity;
+		$themeparam = '?lang='.$langs->defaultlang.'&amp;theme='.$conf->theme.(GETPOST('optioncss', 'aZ09') ? '&amp;optioncss='.GETPOST('optioncss', 'aZ09', 1) : '').'&amp;'.(!empty($user->id) ? ('userid='.$user->id.'&amp') : '').';entity='.$conf->entity;
 
 		$themeparam .= ($ext ? '&amp;'.$ext : '').'&amp;revision='.getDolGlobalInt("MAIN_IHM_PARAMS_REV");
 		if (GETPOSTISSET('dol_hide_topmenu')) {
diff --git a/htdocs/public/members/new.php b/htdocs/public/members/new.php
index c409703862c..83941861474 100644
--- a/htdocs/public/members/new.php
+++ b/htdocs/public/members/new.php
@@ -475,7 +475,7 @@ print '<div class="center subscriptionformhelptext justify">';
 if (!empty($conf->global->MEMBER_NEWFORM_TEXT)) {
 	print $langs->trans($conf->global->MEMBER_NEWFORM_TEXT)."<br>\n";
 } else {
-	print $langs->trans("NewSubscriptionDesc", $conf->global->MAIN_INFO_SOCIETE_MAIL)."<br>\n";
+	print $langs->trans("NewSubscriptionDesc", getDolGlobalString("MAIN_INFO_SOCIETE_MAIL"))."<br>\n";
 }
 print '</div>';
 
@@ -568,7 +568,7 @@ if (!empty($conf->global->MEMBER_SKIP_TABLE) || !empty($conf->global->MEMBER_NEW
 	// Firstname
 	print '<tr><td>'.$langs->trans("Firstname").' <span style="color: red">*</span></td><td><input type="text" name="firstname" class="minwidth150" value="'.dol_escape_htmltag(GETPOST('firstname')).'"></td></tr>'."\n";
 	// EMail
-	print '<tr><td>'.$langs->trans("Email").($conf->global->ADHERENT_MAIL_REQUIRED ? ' <span style="color:red;">*</span>' : '').'</td><td>';
+	print '<tr><td>'.$langs->trans("Email").(getDolGlobalString("ADHERENT_MAIL_REQUIRED") ? ' <span style="color:red;">*</span>' : '').'</td><td>';
 	//print img_picto('', 'email', 'class="pictofixedwidth"');
 	print '<input type="text" name="email" maxlength="255" class="minwidth200" value="'.dol_escape_htmltag(GETPOST('email')).'"></td></tr>'."\n";
 	// Login
@@ -623,7 +623,7 @@ if (!empty($conf->global->MEMBER_SKIP_TABLE) || !empty($conf->global->MEMBER_NEW
 	}
 	// Birthday
 	print '<tr id="trbirth" class="trbirth"><td>'.$langs->trans("DateOfBirth").'</td><td>';
-	print $form->selectDate($birthday, 'birth', 0, 0, 1, "newmember", 1, 0);
+	print $form->selectDate(!empty($birthday) ? $birthday : "", 'birth', 0, 0, 1, "newmember", 1, 0);
 	print '</td></tr>'."\n";
 	// Photo
 	print '<tr><td>'.$langs->trans("URLPhoto").'</td><td><input type="text" name="photo" class="minwidth150" value="'.dol_escape_htmltag(GETPOST('photo')).'"></td></tr>'."\n";
@@ -786,7 +786,7 @@ if (!empty($conf->global->MEMBER_SKIP_TABLE) || !empty($conf->global->MEMBER_NEW
 			print max(1, intval($objp->duration)).' '.$units[$unit];
 			print '</td>';
 			print '<td class="center"><span class="amount nowrap">';
-			$displayedamount = max(intval($objp->amount), intval($conf->global->MEMBER_MIN_AMOUNT));
+			$displayedamount = max(intval($objp->amount), intval(getDolGlobalInt("MEMBER_MIN_AMOUNT")));
 			$caneditamount = !empty($conf->global->MEMBER_NEWFORM_EDITAMOUNT) || $objp->caneditamount;
 			if ($objp->subscription) {
 				if ($displayedamount > 0 || !$caneditamount) {
diff --git a/htdocs/public/project/new.php b/htdocs/public/project/new.php
index 5b0c35c10f3..d984b3346d8 100644
--- a/htdocs/public/project/new.php
+++ b/htdocs/public/project/new.php
@@ -423,7 +423,7 @@ print '<div class="center subscriptionformhelptext justify">';
 if (!empty($conf->global->PROJECT_NEWFORM_TEXT)) {
 	print $langs->trans($conf->global->PROJECT_NEWFORM_TEXT)."<br>\n";
 } else {
-	print $langs->trans("FormForNewLeadDesc", $conf->global->MAIN_INFO_SOCIETE_MAIL)."<br>\n";
+	print $langs->trans("FormForNewLeadDesc", getDolGlobalString("MAIN_INFO_SOCIETE_MAIL"))."<br>\n";
 }
 print '</div>';
 
diff --git a/htdocs/public/recruitment/index.php b/htdocs/public/recruitment/index.php
index 632a3f57da2..32585c94bb4 100644
--- a/htdocs/public/recruitment/index.php
+++ b/htdocs/public/recruitment/index.php
@@ -47,7 +47,10 @@ $langs->loadLangs(array("companies", "other", "recruitment"));
 // Get parameters
 $action   = GETPOST('action', 'aZ09');
 $cancel   = GETPOST('cancel', 'alpha');
+$SECUREKEY = GETPOST("securekey");
+$entity = GETPOST('entity', 'int') ? GETPOST('entity', 'int') : $conf->entity;
 $backtopage = '';
+$suffix = "";
 
 // Load variable for pagination
 $limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
diff --git a/htdocs/public/ticket/create_ticket.php b/htdocs/public/ticket/create_ticket.php
index 33b3b8bdccd..4defe2be01f 100644
--- a/htdocs/public/ticket/create_ticket.php
+++ b/htdocs/public/ticket/create_ticket.php
@@ -71,6 +71,8 @@ $langs->loadLangs(array('companies', 'other', 'mails', 'ticket'));
 // Get parameters
 $id = GETPOST('id', 'int');
 $msg_id = GETPOST('msg_id', 'int');
+$socid = GETPOST('socid', 'int');
+$suffix = "";
 
 $action = GETPOST('action', 'aZ09');
 
diff --git a/htdocs/public/ticket/index.php b/htdocs/public/ticket/index.php
index 4ea314c8149..bff53d91edb 100644
--- a/htdocs/public/ticket/index.php
+++ b/htdocs/public/ticket/index.php
@@ -59,6 +59,7 @@ $langs->loadLangs(array('companies', 'other', 'ticket', 'errors'));
 // Get parameters
 $track_id = GETPOST('track_id', 'alpha');
 $action = GETPOST('action', 'aZ09');
+$suffix = "";
 
 if (empty($conf->ticket->enabled)) {
 	accessforbidden('', 0, 0, 1);
@@ -82,7 +83,7 @@ $arrayofcss = array('/ticket/css/styles.css.php');
 llxHeaderTicket($langs->trans("Tickets"), "", 0, 0, $arrayofjs, $arrayofcss);
 
 print '<div class="ticketpublicarea">';
-print '<p style="text-align: center">'.($conf->global->TICKET_PUBLIC_TEXT_HOME ? $conf->global->TICKET_PUBLIC_TEXT_HOME : $langs->trans("TicketPublicDesc")).'</p>';
+print '<p style="text-align: center">'.(getDolGlobalString("TICKET_PUBLIC_TEXT_HOME", $langs->trans("TicketPublicDesc"))).'</p>';
 print '<div class="ticketform">';
 print '<a href="create_ticket.php'.(!empty($entity) && isModEnabled('multicompany')?'?entity='.$entity:'').'" rel="nofollow noopener" class="butAction marginbottomonly"><div class="index_create bigrounded"><span class="fa fa-15x fa-plus-circle valignmiddle btnTitle-icon"></span><br>'.dol_escape_htmltag($langs->trans("CreateTicket")).'</div></a>';
 print '<a href="list.php'.(!empty($entity) && isModEnabled('multicompany')?'?entity='.$entity:'').'" rel="nofollow noopener" class="butAction marginbottomonly"><div class="index_display bigrounded"><span class="fa fa-15x fa-list-alt valignmiddle btnTitle-icon"></span><br>'.dol_escape_htmltag($langs->trans("ViewMyTicketList")).'</div></a>';

From 185f8896c596f624dba5702346262b62ccac5d63 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Mon, 29 Aug 2022 16:52:27 +0200
Subject: [PATCH 334/974] fix display date creation

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

diff --git a/htdocs/reception/card.php b/htdocs/reception/card.php
index 9a679c067f8..3ee755bef37 100644
--- a/htdocs/reception/card.php
+++ b/htdocs/reception/card.php
@@ -1434,7 +1434,7 @@ if ($action == 'create') {
 
 		// Date creation
 		print '<tr><td class="titlefield">'.$langs->trans("DateCreation").'</td>';
-		print '<td colspan="3">'.dol_print_date($object->date_creation, "dayhour")."</td>\n";
+		print '<td colspan="3">'.dol_print_date($object->date_creation, "dayhour", "tzuserrel")."</td>\n";
 		print '</tr>';
 
 		// Delivery date planned

From ec764595f8614e10c891b582297fecb7797bc545 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Mon, 29 Aug 2022 16:59:23 +0200
Subject: [PATCH 335/974] enhance bank display for user

---
 htdocs/langs/en_US/holiday.lang             |  5 +-
 htdocs/langs/fr_FR/holiday.lang             |  1 +
 htdocs/user/bank.php                        | 90 ++++++++++++++++++++-
 htdocs/user/class/userbankaccount.class.php | 30 +++++--
 4 files changed, 115 insertions(+), 11 deletions(-)

diff --git a/htdocs/langs/en_US/holiday.lang b/htdocs/langs/en_US/holiday.lang
index 0ab79985ea7..04f47c8428d 100644
--- a/htdocs/langs/en_US/holiday.lang
+++ b/htdocs/langs/en_US/holiday.lang
@@ -1,6 +1,7 @@
 # Dolibarr language file - Source file is en_US - holiday
 HRM=HRM
-Holidays=Leave
+Holidays=Leaves
+Holiday=Leave
 CPTitreMenu=Leave
 MenuReportMonth=Monthly statement
 MenuAddCP=New leave request
@@ -147,4 +148,4 @@ XIsAUsualNonWorkingDay=%s is usualy 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
-HolidayQtyNotModified=Balance of remaining days for %s has not been changed 
\ No newline at end of file
+HolidayQtyNotModified=Balance of remaining days for %s has not been changed
diff --git a/htdocs/langs/fr_FR/holiday.lang b/htdocs/langs/fr_FR/holiday.lang
index c6671f9f6a3..22720779eaf 100644
--- a/htdocs/langs/fr_FR/holiday.lang
+++ b/htdocs/langs/fr_FR/holiday.lang
@@ -1,6 +1,7 @@
 # Dolibarr language file - Source file is en_US - holiday
 HRM=GRH
 Holidays=Congés
+Holiday=Congé
 CPTitreMenu=Demande de congés
 MenuReportMonth=État mensuel
 MenuAddCP=Créer demande de congés
diff --git a/htdocs/user/bank.php b/htdocs/user/bank.php
index 1b7ca92bbbb..81bf184d391 100644
--- a/htdocs/user/bank.php
+++ b/htdocs/user/bank.php
@@ -33,6 +33,8 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/usergroups.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/bank.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/user/class/userbankaccount.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php';
 if (!empty($conf->holiday->enabled)) {
 	require_once DOL_DOCUMENT_ROOT.'/holiday/class/holiday.class.php';
 }
@@ -122,6 +124,10 @@ if ($action == 'add' && !$cancel && $permissiontoaddbankaccount) {
 	$account->proprio         = GETPOST('proprio', 'alpha');
 	$account->owner_address   = GETPOST('owner_address', 'alpha');
 
+	$account->currency_code = trim(GETPOST("account_currency_code"));
+	$account->state_id = GETPOST("account_state_id", 'int');
+	$account->country_id = GETPOST("account_country_id", 'int');
+
 	$result = $account->create($user);
 
 	if (!$result) {
@@ -192,6 +198,10 @@ if ($action == 'update' && !$cancel && $permissiontoaddbankaccount) {
 	$account->proprio         = GETPOST('proprio', 'alpha');
 	$account->owner_address   = GETPOST('owner_address', 'alpha');
 
+	$account->currency_code = trim(GETPOST("account_currency_code"));
+	$account->state_id = GETPOST("account_state_id", 'int');
+	$account->country_id = GETPOST("account_country_id", 'int');
+
 	$result = $account->update($user);
 
 	if (!$result) {
@@ -274,6 +284,7 @@ if (!empty($conf->global->MAIN_USE_EXPENSE_IK)) {
  */
 
 $form = new Form($db);
+$formcompany = new FormCompany($db);
 
 $childids = $user->getAllChildIds(1);
 
@@ -285,14 +296,42 @@ llxHeader('', $title, $help_url);
 $head = user_prepare_head($object);
 
 if ($id && $bankid && $action == 'edit' && ($user->rights->user->user->creer || $user->rights->hrm->write_personal_information->write)) {
-	print '<form action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'" method="post">';
+	if ($conf->use_javascript_ajax) {
+		print "\n<script>";
+		print 'jQuery(document).ready(function () {
+					jQuery("#type").change(function() {
+						document.formbank.action.value="edit";
+						document.formbank.submit();
+					});
+					jQuery("#selectaccount_country_id").change(function() {
+						document.formbank.action.value="edit";
+						document.formbank.submit();
+					});
+				})';
+		print "</script>\n";
+	}
+	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="bankid" value="'.$bankid.'">';
 }
 if ($id && $action == 'create' && $user->rights->user->user->creer) {
-	print '<form action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'" method="post">';
+	if ($conf->use_javascript_ajax) {
+		print "\n<script>";
+		print 'jQuery(document).ready(function () {
+					jQuery("#type").change(function() {
+						document.formbank.action.value="create";
+						document.formbank.submit();
+					});
+					jQuery("#selectaccount_country_id").change(function() {
+						document.formbank.action.value="create";
+						document.formbank.submit();
+					});
+				})';
+		print "</script>\n";
+	}
+	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="add">';
 	print '<input type="hidden" name="bankid" value="'.$bankid.'">';
@@ -772,6 +811,7 @@ if ($action != 'edit' && $action != 'create') {		// If not bank account yet, $ac
 	print_liste_field_titre("RIB");
 	print_liste_field_titre("IBAN");
 	print_liste_field_titre("BIC");
+	print_liste_field_titre("Currency");
 	print_liste_field_titre('', $_SERVER["PHP_SELF"], "", '', '', '', '', '', 'maxwidthsearch ');
 	print "</tr>\n";
 
@@ -806,7 +846,7 @@ if ($action != 'edit' && $action != 'create') {		// If not bank account yet, $ac
 		print $string;
 		print '</td>';
 		// IBAN
-		print '<td>'.$account->iban;
+		print '<td>'.getIbanHumanReadable($account);
 		if (!empty($account->iban)) {
 			if (!checkIbanForAccount($account)) {
 				print ' '.img_picto($langs->trans("IbanNotValid"), 'warning');
@@ -822,6 +862,9 @@ if ($action != 'edit' && $action != 'create') {		// If not bank account yet, $ac
 		}
 		print '</td>';
 
+		// Currency
+		print '<td>'.$account->currency_code.'</td>';
+
 		// Edit/Delete
 		print '<td class="right nowraponall">';
 		if ($permissiontoaddbankaccount) {
@@ -864,6 +907,47 @@ if ($id && ($action == 'edit' || $action == 'create') && $user->rights->user->us
 	print '<tr><td class="fieldrequired">'.$langs->trans("BankName").'</td>';
 	print '<td><input size="30" type="text" name="bank" value="'.$account->bank.'"></td></tr>';
 
+	// Currency
+	print '<tr><td class="fieldrequired">'.$langs->trans("Currency");
+	print '<input type="hidden" value="'.$account->currency_code.'">';
+	print '</td>';
+	print '<td class="maxwidth200onsmartphone">';
+	$selectedcode = $account->currency_code;
+	if (!$selectedcode) {
+		$selectedcode = $conf->currency;
+	}
+	print img_picto('', 'multicurrency', 'class="pictofixedwidth"');
+	print $form->selectCurrency((GETPOSTISSET("account_currency_code") ? GETPOST("account_currency_code") : $selectedcode), 'account_currency_code');
+	print '</td></tr>';
+
+	// Country
+	$account->country_id = $account->country_id ? $account->country_id : $mysoc->country_id;
+	$selectedcode = $account->country_code;
+	if (GETPOSTISSET("account_country_id")) {
+		$selectedcode = GETPOST("account_country_id");
+	} elseif (empty($selectedcode)) {
+		$selectedcode = $mysoc->country_code;
+	}
+	$account->country_code = getCountry($selectedcode, 2); // Force country code on account to have following field on bank fields matching country rules
+
+	print '<tr><td class="fieldrequired">'.$langs->trans("Country").'</td>';
+	print '<td class="maxwidth200onsmartphone">';
+	print img_picto('', 'country', 'class="pictofixedwidth"').$form->select_country($selectedcode, 'account_country_id');
+	if ($user->admin) {
+		print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
+	}
+	print '</td></tr>';
+
+	// State
+	print '<tr><td>'.$langs->trans('State').'</td><td class="maxwidth200onsmartphone">';
+	if ($selectedcode) {
+		print img_picto('', 'state', 'class="pictofixedwidth"');
+		print $formcompany->select_state(GETPOSTISSET("account_state_id") ? GETPOST("account_state_id") : $account->state_id, $selectedcode, 'account_state_id');
+	} else {
+		print $countrynotdefined;
+	}
+	print '</td></tr>';
+
 	// Show fields of bank account
 	foreach ($account->getFieldsToShow() as $val) {
 		if ($val == 'BankCode') {
diff --git a/htdocs/user/class/userbankaccount.class.php b/htdocs/user/class/userbankaccount.class.php
index 42164ce8b2c..d18f5feae16 100644
--- a/htdocs/user/class/userbankaccount.class.php
+++ b/htdocs/user/class/userbankaccount.class.php
@@ -134,6 +134,9 @@ class UserBankAccount extends Account
 		$sql .= ",domiciliation='".$this->db->escape($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)."'";
+		$sql .= ",state_id = ".($this->state_id > 0 ? ((int) $this->state_id) : "null");
+		$sql .= ",fk_country = ".($this->country_id > 0 ? ((int) $this->country_id) : "null");
 
 		if (trim($this->label) != '') {
 			$sql .= ",label = '".$this->db->escape($this->label)."'";
@@ -165,17 +168,23 @@ class UserBankAccount extends Account
 			return -1;
 		}
 
-		$sql = "SELECT rowid, fk_user, entity, bank, number, code_banque, code_guichet, cle_rib, bic, iban_prefix as iban, domiciliation, proprio,";
-		$sql .= " owner_address, label, datec, tms as datem";
-		$sql .= " FROM ".$this->db->prefix()."user_rib";
+		$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 .= ', 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';
+		$sql .= " FROM ".$this->db->prefix()."user_rib as ur";
+		$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_country as c ON ur.fk_country=c.rowid';
+		$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_departements as d ON ur.state_id=d.rowid';
+
 		if ($id) {
-			$sql .= " WHERE rowid = ".((int) $id);
+			$sql .= " WHERE ur.rowid = ".((int) $id);
 		}
 		if ($ref) {
-			$sql .= " WHERE label = '".$this->db->escape($ref)."'";
+			$sql .= " WHERE ur.label = '".$this->db->escape($ref)."'";
 		}
 		if ($userid) {
-			$sql .= " WHERE fk_user = ".((int) $userid);
+			$sql .= " WHERE ur.fk_user = ".((int) $userid);
 		}
 
 		$resql = $this->db->query($sql);
@@ -198,6 +207,15 @@ class UserBankAccount extends Account
 				$this->label = $obj->label;
 				$this->datec = $this->db->jdate($obj->datec);
 				$this->datem = $this->db->jdate($obj->datem);
+				$this->currency_code = $obj->currency_code;
+
+				$this->state_id = $obj->state_id;
+				$this->state_code = $obj->state_code;
+				$this->state = $obj->state;
+
+				$this->country_id = $obj->country_id;
+				$this->country_code = $obj->country_code;
+				$this->country = $obj->country;
 			}
 			$this->db->free($resql);
 

From 525b662b2411872b7ba1f4a1f7dc693b89958368 Mon Sep 17 00:00:00 2001
From: UT from dolibit <45215329+dolibit-ut@users.noreply.github.com>
Date: Mon, 29 Aug 2022 17:35:23 +0200
Subject: [PATCH 336/974] Update websiteaccount_card.php

---
 htdocs/website/websiteaccount_card.php | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/htdocs/website/websiteaccount_card.php b/htdocs/website/websiteaccount_card.php
index 249398c322e..261839940e5 100644
--- a/htdocs/website/websiteaccount_card.php
+++ b/htdocs/website/websiteaccount_card.php
@@ -32,9 +32,9 @@ require_once DOL_DOCUMENT_ROOT.'/website/lib/websiteaccount.lib.php';
 $langs->loadLangs(array("website", "other"));
 
 // Get parameters
-$id = GETPOST('id', 'int');
+$id         = GETPOST('id', 'int');
 $ref        = GETPOST('ref', 'alpha');
-$action = GETPOST('action', 'aZ09');
+$action     = GETPOST('action', 'aZ09');
 $confirm    = GETPOST('confirm', 'alpha');
 $cancel     = GETPOST('cancel', 'aZ09');
 $backtopage = GETPOST('backtopage', 'alpha');
@@ -43,7 +43,7 @@ $backtopage = GETPOST('backtopage', 'alpha');
 $object = new SocieteAccount($db);
 $extrafields = new ExtraFields($db);
 $diroutputmassaction = $conf->website->dir_output.'/temp/massgeneration/'.$user->id;
-$hookmanager->initHooks(array('websiteaccountcard')); // Note that conf->hooks_modules contains array
+$hookmanager->initHooks(array('websiteaccountcard'));   //  Note that conf->hooks_modules contains array
 
 // Fetch optionals attributes and labels
 $extrafields->fetch_name_optionals_label($object->table_element);
@@ -68,9 +68,10 @@ if (empty($action) && empty($id) && empty($ref)) {
 //if ($user->socid > 0) $socid = $user->socid;
 //$result = restrictedArea($user, 'website', $id);
 
-$permissionnote = $user->rights->websiteaccount->write; // Used by the include of actions_setnotes.inc.php
-$permissiondellink = $user->rights->websiteaccount->write; // Used by the include of actions_dellink.inc.php
-$permissiontoadd = $user->rights->websiteaccount->write; // Used by the include of actions_addupdatedelete.inc.php and actions_lineupdown.inc.php
+// Permissions
+$permissionnote    = $user->rights->websiteaccount->write;   //  Used by the include of actions_setnotes.inc.php
+$permissiondellink = $user->rights->websiteaccount->write;   //  Used by the include of actions_dellink.inc.php
+$permissiontoadd   = $user->rights->websiteaccount->write;   //  Used by the include of actions_addupdatedelete.inc.php and actions_lineupdown.inc.php
 
 // Load object
 include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be include, not include_once.

From b81ae9008804abe786c7c0388070fbdafe771c81 Mon Sep 17 00:00:00 2001
From: UT from dolibit <45215329+dolibit-ut@users.noreply.github.com>
Date: Mon, 29 Aug 2022 17:40:32 +0200
Subject: [PATCH 337/974] Update index.php

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

diff --git a/htdocs/website/index.php b/htdocs/website/index.php
index 0f9595f6206..0b599ba640b 100644
--- a/htdocs/website/index.php
+++ b/htdocs/website/index.php
@@ -30,6 +30,7 @@ if (!defined('DISABLE_JS_GRAHP')) define('DISABLE_JS_GRAPH', 1);
 
 //header('X-XSS-Protection:0');	// Disable XSS filtering protection of some browsers (note: use of Content-Security-Policy is more efficient). Disabled as deprecated.
 
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
@@ -45,8 +46,10 @@ require_once DOL_DOCUMENT_ROOT.'/website/class/website.class.php';
 require_once DOL_DOCUMENT_ROOT.'/website/class/websitepage.class.php';
 require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 
+// Load translation files required by the page
 $langs->loadLangs(array("admin", "other", "website", "errors"));
 
+// Security check
 if (!$user->rights->website->read) {
 	accessforbidden();
 }

From 5de5c5c11ad10e64530d0add2db1440d3745dfd4 Mon Sep 17 00:00:00 2001
From: UT from dolibit <45215329+dolibit-ut@users.noreply.github.com>
Date: Mon, 29 Aug 2022 17:51:52 +0200
Subject: [PATCH 338/974] Update agenda.php

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

diff --git a/htdocs/ticket/agenda.php b/htdocs/ticket/agenda.php
index 2f919aa436d..17cb8ad785e 100644
--- a/htdocs/ticket/agenda.php
+++ b/htdocs/ticket/agenda.php
@@ -21,11 +21,12 @@
  *    	\brief		Page with events on ticket
  */
 
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/ticket/class/actions_ticket.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formticket.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/ticket.lib.php';
-require_once DOL_DOCUMENT_ROOT."/core/lib/company.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/extrafields.class.php';
 require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
@@ -40,12 +41,12 @@ $track_id = GETPOST('track_id', 'alpha', 3);
 $socid    = GETPOST('socid', 'int');
 $action   = GETPOST('action', 'aZ09');
 
-$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
+$limit     = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
-$page = is_numeric($page) ? $page : 0;
-$page = $page == -1 ? 0 : $page;
+$page  = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+$page  = is_numeric($page) ? $page : 0;
+$page  = $page == -1 ? 0 : $page;
 if (!$sortfield) {
 	$sortfield = "a.datep,a.id";
 }
@@ -64,6 +65,7 @@ if (GETPOST('actioncode', 'array')) {
 } else {
 	$actioncode = GETPOST("actioncode", "alpha", 3) ?GETPOST("actioncode", "alpha", 3) : (GETPOST("actioncode") == '0' ? '0' : (empty($conf->global->AGENDA_DEFAULT_FILTER_TYPE_FOR_OBJECT) ? '' : $conf->global->AGENDA_DEFAULT_FILTER_TYPE_FOR_OBJECT));
 }
+
 $search_agenda_label = GETPOST('search_agenda_label');
 
 $object = new Ticket($db);

From 930929ebb6dce7bd8c89463cee6bf64d42b1f050 Mon Sep 17 00:00:00 2001
From: UT from dolibit <45215329+dolibit-ut@users.noreply.github.com>
Date: Mon, 29 Aug 2022 17:57:01 +0200
Subject: [PATCH 339/974] Update agenda.php

---
 htdocs/societe/agenda.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/htdocs/societe/agenda.php b/htdocs/societe/agenda.php
index 89b69bda83c..c0525767527 100644
--- a/htdocs/societe/agenda.php
+++ b/htdocs/societe/agenda.php
@@ -27,12 +27,15 @@
  *  \brief      Page of third party events
  */
 
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 
-$langs->loadLangs(array("companies", "bills", "propal", "orders"));
+// Load translation files required by the page
+$langs->loadLangs(array('bills', 'companies', 'orders', 'propal'));
+
 
 if (GETPOST('actioncode', 'array')) {
 	$actioncode = GETPOST('actioncode', 'array', 3);
@@ -42,6 +45,7 @@ if (GETPOST('actioncode', 'array')) {
 } else {
 	$actioncode = GETPOST("actioncode", "alpha", 3) ?GETPOST("actioncode", "alpha", 3) : (GETPOST("actioncode") == '0' ? '0' : (empty($conf->global->AGENDA_DEFAULT_FILTER_TYPE_FOR_OBJECT) ? '' : $conf->global->AGENDA_DEFAULT_FILTER_TYPE_FOR_OBJECT));
 }
+
 $search_agenda_label = GETPOST('search_agenda_label');
 
 // Security check

From ad42d6b796a2e9043cddd4645221e1c696d809f6 Mon Sep 17 00:00:00 2001
From: UT from dolibit <45215329+dolibit-ut@users.noreply.github.com>
Date: Mon, 29 Aug 2022 18:03:39 +0200
Subject: [PATCH 340/974] Update card.php

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

diff --git a/htdocs/societe/card.php b/htdocs/societe/card.php
index 5d557d30a02..06fdbfba0a5 100644
--- a/htdocs/societe/card.php
+++ b/htdocs/societe/card.php
@@ -34,6 +34,8 @@
  *  \brief      Third party card page
  */
 
+
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/images.lib.php';
@@ -62,7 +64,10 @@ if (! empty($conf->eventorganization->enabled)) {
 }
 
 
+// Load translation files required by the page
+
 $langs->loadLangs(array("companies", "commercial", "bills", "banks", "users"));
+
 if (!empty($conf->adherent->enabled)) {
 	$langs->load("members");
 }
@@ -81,13 +86,15 @@ if (!empty($conf->accounting->enabled)) {
 
 $error = 0; $errors = array();
 
+
+// Get parameters
 $action		= (GETPOST('action', 'aZ09') ? GETPOST('action', 'aZ09') : 'view');
 $cancel		= GETPOST('cancel', 'alpha');
 $backtopage = GETPOST('backtopage', 'alpha');
 $backtopageforcancel = GETPOST('backtopageforcancel', 'alpha');
 $backtopagejsfields = GETPOST('backtopagejsfields', 'alpha');
 $dol_openinpopup = GETPOST('dol_openinpopup', 'aZ09');
-$confirm	= GETPOST('confirm', 'alpha');
+$confirm 	= GETPOST('confirm', 'alpha');
 
 $socid = GETPOST('socid', 'int') ?GETPOST('socid', 'int') : GETPOST('id', 'int');
 if ($user->socid) {
@@ -96,6 +103,7 @@ if ($user->socid) {
 if (empty($socid) && $action == 'view') {
 	$action = 'create';
 }
+
 $id = $socid;
 
 $object = new Societe($db);
@@ -128,12 +136,13 @@ if (!empty($canvas)) {
 	$objcanvas->getCanvas('thirdparty', 'card', $canvas);
 }
 
-$permissiontoread = $user->rights->societe->lire;
-$permissiontoadd = $user->rights->societe->creer; // Used by the include of actions_addupdatedelete.inc.php and actions_lineupdown.inc.php
+// Permissions
+$permissiontoread 	= $user->rights->societe->lire;
+$permissiontoadd 	= $user->rights->societe->creer; // Used by the include of actions_addupdatedelete.inc.php and actions_lineupdown.inc.php
 $permissiontodelete = $user->rights->societe->supprimer || ($permissiontoadd && isset($object->status) && $object->status == 0);
-$permissionnote = $user->rights->societe->creer; // Used by the include of actions_setnotes.inc.php
-$permissiondellink = $user->rights->societe->creer; // Used by the include of actions_dellink.inc.php
-$upload_dir = $conf->societe->multidir_output[isset($object->entity) ? $object->entity : 1];
+$permissionnote 	= $user->rights->societe->creer; // Used by the include of actions_setnotes.inc.php
+$permissiondellink 	= $user->rights->societe->creer; // Used by the include of actions_dellink.inc.php
+$upload_dir 		= $conf->societe->multidir_output[isset($object->entity) ? $object->entity : 1];
 
 // Security check
 $result = restrictedArea($user, 'societe', $socid, '&societe', '', 'fk_soc', 'rowid', 0);

From e586f8f3914eba42ecdf9079e18f6dd344709fd8 Mon Sep 17 00:00:00 2001
From: UT from dolibit <45215329+dolibit-ut@users.noreply.github.com>
Date: Mon, 29 Aug 2022 18:06:28 +0200
Subject: [PATCH 341/974] Update consumption.php

---
 htdocs/societe/consumption.php | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/htdocs/societe/consumption.php b/htdocs/societe/consumption.php
index 03c78a0c07b..53408fd00ff 100644
--- a/htdocs/societe/consumption.php
+++ b/htdocs/societe/consumption.php
@@ -26,12 +26,18 @@
  *	\brief      Add a tab on thirdparty view to list all products/services bought or sells by thirdparty
  */
 
+// Load Dolibarr environment
 require "../main.inc.php";
 require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.class.php';
 
+
+// Load translation files required by the page
+$langs->loadLangs(array("companies", "bills", "orders", "suppliers", "propal", "interventions", "contracts", "products"));
+
+
 $contextpage = GETPOST('contextpage', 'aZ') ?GETPOST('contextpage', 'aZ') : 'thirdpartylist';
 
 // Security check
@@ -46,11 +52,11 @@ if ($socid > 0) {
 }
 
 // Sort & Order fields
-$limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield = GETPOST('sortfield', 'aZ09comma');
-$sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
-$optioncss = GETPOST('optioncss', 'alpha');
+$limit 		= GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
+$sortfield 	= GETPOST('sortfield', 'aZ09comma');
+$sortorder 	= GETPOST('sortorder', 'aZ09comma');
+$page 		= GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+$optioncss 	= GETPOST('optioncss', 'alpha');
 
 if (empty($page) || $page == -1) {
 	$page = 0;
@@ -78,12 +84,11 @@ if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x'
 	$year = '';
 	$month = '';
 }
+
 // Customer or supplier selected in drop box
 $thirdTypeSelect = GETPOST("third_select_id", 'az09');
 $type_element = GETPOST('type_element') ? GETPOST('type_element') : '';
 
-// Load translation files required by the page
-$langs->loadLangs(array("companies", "bills", "orders", "suppliers", "propal", "interventions", "contracts", "products"));
 
 // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $hookmanager->initHooks(array('consumptionthirdparty', 'globalcard'));

From 6ba8ac8475c0159e57d937f86e36e2c3039f612b Mon Sep 17 00:00:00 2001
From: UT from dolibit <45215329+dolibit-ut@users.noreply.github.com>
Date: Mon, 29 Aug 2022 18:09:44 +0200
Subject: [PATCH 342/974] Update contact.php

---
 htdocs/societe/contact.php | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/htdocs/societe/contact.php b/htdocs/societe/contact.php
index 4ecfc2a8cf4..1bc64658735 100644
--- a/htdocs/societe/contact.php
+++ b/htdocs/societe/contact.php
@@ -31,6 +31,7 @@
  *  \brief      Page of contacts of thirdparties
  */
 
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/images.lib.php';
@@ -46,7 +47,9 @@ if (!empty($conf->adherent->enabled)) {
 	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 (!empty($conf->categorie->enabled)) {
 	$langs->load("categories");
 }
@@ -59,18 +62,23 @@ if (!empty($conf->notification->enabled)) {
 
 $mesg = ''; $error = 0; $errors = array();
 
+
+// Get parameters
 $action		= (GETPOST('action', 'aZ09') ? GETPOST('action', 'aZ09') : 'view');
-$cancel     = GETPOST('cancel', 'alpha');
+$cancel 	= GETPOST('cancel', 'alpha');
 $backtopage = GETPOST('backtopage', 'alpha');
-$confirm	= GETPOST('confirm');
-$socid = GETPOST('socid', 'int') ?GETPOST('socid', 'int') : GETPOST('id', 'int');
+$confirm 	= GETPOST('confirm');
+$socid 		= GETPOST('socid', 'int') ?GETPOST('socid', 'int') : GETPOST('id', 'int');
+
 if ($user->socid) {
 	$socid = $user->socid;
 }
+
 if (empty($socid) && $action == 'view') {
 	$action = 'create';
 }
 
+// Initialize objects
 $object = new Societe($db);
 $extrafields = new ExtraFields($db);
 

From ffe1a7f8acd65193a776a8f5612efd3860253e9e Mon Sep 17 00:00:00 2001
From: UT from dolibit <45215329+dolibit-ut@users.noreply.github.com>
Date: Mon, 29 Aug 2022 18:12:47 +0200
Subject: [PATCH 343/974] Update document.php

---
 htdocs/societe/document.php | 29 ++++++++++++++++++-----------
 1 file changed, 18 insertions(+), 11 deletions(-)

diff --git a/htdocs/societe/document.php b/htdocs/societe/document.php
index 707c573f116..92c7efb63d9 100644
--- a/htdocs/societe/document.php
+++ b/htdocs/societe/document.php
@@ -26,30 +26,36 @@
  *  \ingroup    societe
  */
 
+// Load Dolibarr environment
 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';
 
+
+// Load translation files required by the page
 $langs->loadLangs(array("companies", "other"));
 
-$action = GETPOST('action', 'aZ09');
-$confirm = GETPOST('confirm');
-$id = (GETPOST('socid', 'int') ? GETPOST('socid', 'int') : GETPOST('id', 'int'));
-$ref = GETPOST('ref', 'alpha');
 
 // Get parameters
-$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield = GETPOST('sortfield', 'aZ09comma');
-$sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+$action 	= GETPOST('action', 'aZ09');
+$confirm 	= GETPOST('confirm');
+$id 		= (GETPOST('socid', 'int') ? GETPOST('socid', 'int') : GETPOST('id', 'int'));
+$ref 		= GETPOST('ref', 'alpha');
+
+$limit 		= GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
+$sortfield 	= GETPOST('sortfield', 'aZ09comma');
+$sortorder 	= GETPOST('sortorder', 'aZ09comma');
+$page 		= GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
-$offset = $limit * $page;
-$pageprev = $page - 1;
-$pagenext = $page + 1;
+
+$offset 	= $limit * $page;
+$pageprev 	= $page - 1;
+$pagenext 	= $page + 1;
 
 if (!empty($conf->global->MAIN_DOC_SORT_FIELD)) {
 	$sortfield = $conf->global->MAIN_DOC_SORT_FIELD;
@@ -65,6 +71,7 @@ if (!$sortfield) {
 	$sortfield = "position_name";
 }
 
+// Initialize objects
 $object = new Societe($db);
 if ($id > 0 || !empty($ref)) {
 	$result = $object->fetch($id, $ref);

From 98b8d8db6b6c87efe11743767d4b58eecbde756a Mon Sep 17 00:00:00 2001
From: UT from dolibit <45215329+dolibit-ut@users.noreply.github.com>
Date: Mon, 29 Aug 2022 18:15:50 +0200
Subject: [PATCH 344/974] Update index.php

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

diff --git a/htdocs/societe/index.php b/htdocs/societe/index.php
index a13d8a3de99..7ea3f591cb6 100644
--- a/htdocs/societe/index.php
+++ b/htdocs/societe/index.php
@@ -27,16 +27,21 @@
  *  \brief      Home page for third parties area
  */
 
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
 
-$hookmanager = new HookManager($db);
+
+// Load translation files required by the page
+$langs->load("companies");
+
 
 // Initialize technical object to manage hooks. Note that conf->hooks_modules contains array
+$hookmanager = new HookManager($db);
 $hookmanager->initHooks(array('thirdpartiesindex'));
 
-$langs->load("companies");
+
 
 $socid = GETPOST('socid', 'int');
 if ($user->socid) {
@@ -51,6 +56,7 @@ $thirdparty_static = new Societe($db);
 if (!isset($form) || !is_object($form)) {
 	$form = new Form($db);
 }
+
 // Load $resultboxes
 $resultboxes = FormOther::getBoxesArea($user, "3");
 

From 997c9e763a1e587b4cfbfe654f78ffcc256408a2 Mon Sep 17 00:00:00 2001
From: UT from dolibit <45215329+dolibit-ut@users.noreply.github.com>
Date: Mon, 29 Aug 2022 18:18:55 +0200
Subject: [PATCH 345/974] Update list.php

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

diff --git a/htdocs/societe/list.php b/htdocs/societe/list.php
index bf3ec6eb041..c8f0045d619 100644
--- a/htdocs/societe/list.php
+++ b/htdocs/societe/list.php
@@ -34,6 +34,8 @@
  *	\brief      Page to show list of third parties
  */
 
+
+// Load Dolibarr environment
 require_once '../main.inc.php';
 include_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
@@ -42,20 +44,27 @@ 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';
 
+
+// Load translation files required by the page
 $langs->loadLangs(array("companies", "commercial", "customers", "suppliers", "bills", "compta", "categories", "cashdesk"));
 
-$action = GETPOST('action', 'aZ09');
+
+// Get parameters
+$action 	= GETPOST('action', 'aZ09');
 $massaction = GETPOST('massaction', 'alpha');
 $show_files = GETPOST('show_files', 'int');
-$confirm = GETPOST('confirm', 'alpha');
-$toselect = GETPOST('toselect', 'array');
+$confirm 	= GETPOST('confirm', 'alpha');
+$toselect 	= GETPOST('toselect', 'array');
 $contextpage = GETPOST('contextpage', 'aZ') ?GETPOST('contextpage', 'aZ') : 'thirdpartylist';
-$optioncss = GETPOST('optioncss', 'alpha');
+$optioncss 	= GETPOST('optioncss', 'alpha');
+
 if ($contextpage == 'poslist') {
 	$optioncss = 'print';
 }
+
 $mode = GETPOST("mode", 'alpha');
 
+// search fields
 $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
 
@@ -98,6 +107,7 @@ $search_stcomm = GETPOST('search_stcomm', 'int');
 $search_import_key  = trim(GETPOST("search_import_key", "alpha"));
 $search_parent_name = trim(GETPOST('search_parent_name', 'alpha'));
 
+
 $type = GETPOST('type', 'alpha');
 $place = GETPOST('place', 'aZ09') ? GETPOST('place', 'aZ09') : '0'; // $place is string id of table for Bar or Restaurant
 

From 28797930fc2ffaec6a804e8e60b0bf6f2ea317da Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 29 Aug 2022 18:21:35 +0200
Subject: [PATCH 346/974] Clean code

---
 htdocs/core/lib/functions.lib.php              | 18 +++++++++++-------
 .../class/actions_datapolicy.class.php         |  2 +-
 htdocs/societe/partnership.php                 |  2 +-
 3 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 3174fb132cd..c9b6d4a30c6 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -10418,8 +10418,8 @@ function dolGetStatus($statusLabel = '', $statusLabelShort = '', $html = '', $st
 /**
  * Function dolGetButtonAction
  *
- * @param string    $label      label of button without HTML : use in alt attribute for accessibility $html is not empty
- * @param string    $html       optional : content with html
+ * @param string    $label      label or tooltip of button. 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, delete, danger
  * @param string    $url        the url for link
  * @param string    $id         attribute id of button
@@ -10444,7 +10444,7 @@ function dolGetStatus($statusLabel = '', $statusLabelShort = '', $html = '', $st
  * // phpcs:enable
  * @return string               html button
  */
-function dolGetButtonAction($label, $html = '', $actionType = 'default', $url = '', $id = '', $userRight = 1, $params = array())
+function dolGetButtonAction($label, $text = '', $actionType = 'default', $url = '', $id = '', $userRight = 1, $params = array())
 {
 	global $hookmanager, $action, $object, $langs;
 
@@ -10464,8 +10464,8 @@ function dolGetButtonAction($label, $html = '', $actionType = 'default', $url =
 		'title' => $label
 	);
 
-	if (empty($html)) {
-		$html = $label;
+	if (empty($text)) {
+		$text = $label;
 		$attr['title'] = ''; // if html not set, leave label on title is redundant
 	} else {
 		$attr['aria-label'] = $label;
@@ -10544,7 +10544,7 @@ function dolGetButtonAction($label, $html = '', $actionType = 'default', $url =
 		'attr' => $attr,
 		'tag' => $tag,
 		'label' => $label,
-		'html' => $html,
+		'html' => $text,
 		'actionType' => $actionType,
 		'url' => $url,
 		'id' => $id,
@@ -10556,7 +10556,11 @@ function dolGetButtonAction($label, $html = '', $actionType = 'default', $url =
 	if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 
 	if (empty($reshook)) {
-		return '<' . $tag . ' ' . $compiledAttributes . '>' . $html . '</' . $tag . '>';
+		if (dol_textishtml($text)) {	// If content already HTML encoded
+			return '<' . $tag . ' ' . $compiledAttributes . '>' . $text . '</' . $tag . '>';
+		} else {
+			return '<' . $tag . ' ' . $compiledAttributes . '>' . dol_escape_htmltag($text) . '</' . $tag . '>';
+		}
 	} else {
 		return $hookmanager->resPrint;
 	}
diff --git a/htdocs/datapolicy/class/actions_datapolicy.class.php b/htdocs/datapolicy/class/actions_datapolicy.class.php
index 6b7e27c67aa..ffd43bbf8ac 100644
--- a/htdocs/datapolicy/class/actions_datapolicy.class.php
+++ b/htdocs/datapolicy/class/actions_datapolicy.class.php
@@ -94,7 +94,7 @@ class ActionsDatapolicy
 		$langs->load('datapolicy@datapolicy');
 		$error = 0; // Error counter
 
-		if (GETPOST('socid') && $parameters['currentcontext'] == 'thirdpartycard') {
+		if (GETPOST('socid') && $parameters['currentcontext'] == 'thirdpartycard' && !empty($object)) {
 			$object->fetch(GETPOST('socid'));
 		}
 
diff --git a/htdocs/societe/partnership.php b/htdocs/societe/partnership.php
index d9b3d3127f9..4e0552d3c15 100644
--- a/htdocs/societe/partnership.php
+++ b/htdocs/societe/partnership.php
@@ -121,7 +121,7 @@ $result = restrictedArea($user, 'societe', $id, '&societe', '', 'fk_soc', 'rowid
  * Actions
  */
 
-$parameters = array();
+$parameters = array('socid' => $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 1b90446cc5d4c3d1150a754b3c75d37fc04da204 Mon Sep 17 00:00:00 2001
From: UT from dolibit <45215329+dolibit-ut@users.noreply.github.com>
Date: Mon, 29 Aug 2022 18:22:10 +0200
Subject: [PATCH 347/974] Update note.php

---
 htdocs/societe/note.php | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/htdocs/societe/note.php b/htdocs/societe/note.php
index b932fb11595..dabc5d7e39e 100644
--- a/htdocs/societe/note.php
+++ b/htdocs/societe/note.php
@@ -26,20 +26,28 @@
  *   \ingroup    societe
  */
 
+
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
 
-$action = GETPOST('action', 'aZ09');
 
+// Load translation files required by the page
 $langs->load("companies");
 
-$id = GETPOST('id') ?GETPOST('id', 'int') : GETPOST('socid', 'int');
 
+// Get parameters
+$id = GETPOST('id') ?GETPOST('id', 'int') : GETPOST('socid', 'int');
+$action = GETPOST('action', 'aZ09');
+
+
+// Initialize objects
 $object = new Societe($db);
 if ($id > 0) {
 	$object->fetch($id);
 }
 
+// Permissions
 $permissionnote = $user->rights->societe->creer; // Used by the include of actions_setnotes.inc.php
 
 // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
@@ -50,6 +58,7 @@ if ($user->socid > 0) {
 	unset($action);
 	$socid = $user->socid;
 }
+
 $result = restrictedArea($user, 'societe', $object->id, '&societe');
 
 

From 9cba037ea3adb90adc9a5db33fa45788598a863f Mon Sep 17 00:00:00 2001
From: UT from dolibit <45215329+dolibit-ut@users.noreply.github.com>
Date: Mon, 29 Aug 2022 18:24:16 +0200
Subject: [PATCH 348/974] Update paymentmodes.php

---
 htdocs/societe/paymentmodes.php | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/htdocs/societe/paymentmodes.php b/htdocs/societe/paymentmodes.php
index 2c2c125530b..5b9bd1046ef 100644
--- a/htdocs/societe/paymentmodes.php
+++ b/htdocs/societe/paymentmodes.php
@@ -29,6 +29,8 @@
  *		\brief      Tab of payment modes for the customer
  */
 
+
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/bank.lib.php';
@@ -40,8 +42,11 @@ require_once DOL_DOCUMENT_ROOT.'/societe/class/societeaccount.class.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/prelevement/class/bonprelevement.class.php';
 require_once DOL_DOCUMENT_ROOT.'/stripe/class/stripe.class.php';
 
+
+// Load translation files required by the page
 $langs->loadLangs(array("companies", "commercial", "banks", "bills", 'paypal', 'stripe', 'withdrawals'));
 
+
 // Security check
 $socid = GETPOST("socid", "int");
 if ($user->socid) {
@@ -49,12 +54,15 @@ if ($user->socid) {
 }
 $result = restrictedArea($user, 'societe', '', '');
 
+
+// Get parameters
 $id = GETPOST("id", "int");
 $source = GETPOST("source", "alpha"); // source can be a source or a paymentmode
 $ribid = GETPOST("ribid", "int");
 $action = GETPOST("action", 'alpha', 3);
 $cancel = GETPOST('cancel', 'alpha');
 
+// Initialize objects
 $object = new Societe($db);
 $object->fetch($socid);
 
@@ -70,6 +78,7 @@ $extrafields->fetch_name_optionals_label($object->table_element);
 // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $hookmanager->initHooks(array('thirdpartybancard', 'globalcard'));
 
+// Permissions
 $permissiontoread = $user->rights->societe->lire;
 $permissiontoadd = $user->rights->societe->creer; // Used by the include of actions_addupdatedelete.inc.php and actions_builddoc.inc.php
 

From a3918e8d96318ad123336a983bb30dfc549b13ee Mon Sep 17 00:00:00 2001
From: UT from dolibit <45215329+dolibit-ut@users.noreply.github.com>
Date: Mon, 29 Aug 2022 18:26:32 +0200
Subject: [PATCH 349/974] Update price.php

---
 htdocs/societe/price.php | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/htdocs/societe/price.php b/htdocs/societe/price.php
index 314fb663631..a9f17f4b50a 100644
--- a/htdocs/societe/price.php
+++ b/htdocs/societe/price.php
@@ -26,6 +26,8 @@
  * \brief   Page to show product prices by customer
  */
 
+
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/product.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
@@ -38,13 +40,17 @@ if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES)) {
 	$prodcustprice = new Productcustomerprice($db);
 }
 
+
+// Load translation files required by the page
 $langs->loadLangs(array("products", "companies", "bills"));
 
-$action = GETPOST('action', 'aZ09');
-$search_prod = GETPOST('search_prod', 'alpha');
-$cancel = GETPOST('cancel', 'alpha');
-$search_label = GETPOST('search_label', 'alpha');
-$search_price = GETPOST('search_price');
+
+// Get parameters
+$action 		= GETPOST('action', 'aZ09');
+$search_prod 	= GETPOST('search_prod', 'alpha');
+$cancel 		= GETPOST('cancel', 'alpha');
+$search_label 	= GETPOST('search_label', 'alpha');
+$search_price 	= GETPOST('search_price');
 $search_price_ttc = GETPOST('search_price_ttc');
 
 // Security check
@@ -54,6 +60,7 @@ if ($user->socid) {
 }
 $result = restrictedArea($user, 'societe', $socid, '&societe');
 
+// Initialize objects
 $object = new Societe($db);
 
 // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context

From c8aefcb7c509758fa94ab8b7659e58f19097845a Mon Sep 17 00:00:00 2001
From: UT from dolibit <45215329+dolibit-ut@users.noreply.github.com>
Date: Mon, 29 Aug 2022 18:28:08 +0200
Subject: [PATCH 350/974] Update project.php

---
 htdocs/societe/project.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/htdocs/societe/project.php b/htdocs/societe/project.php
index ef68a03ab78..f704273db60 100644
--- a/htdocs/societe/project.php
+++ b/htdocs/societe/project.php
@@ -28,11 +28,14 @@
  *  \brief      Page of third party projects
  */
 
+
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
 require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 
-$langs->loadLangs(array("companies", "projects"));
+// Load translation files required by the page
+$langs->loadLangs(array('companies', 'projects'));
 
 // Security check
 $socid = GETPOST('socid', 'int');

From 7dd0535a5c5c7416df528a1903ca4f059436b7d0 Mon Sep 17 00:00:00 2001
From: UT from dolibit <45215329+dolibit-ut@users.noreply.github.com>
Date: Mon, 29 Aug 2022 18:30:50 +0200
Subject: [PATCH 351/974] Update societecontact.php

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

diff --git a/htdocs/societe/societecontact.php b/htdocs/societe/societecontact.php
index b1e5174820c..a061933ba11 100644
--- a/htdocs/societe/societecontact.php
+++ b/htdocs/societe/societecontact.php
@@ -26,14 +26,18 @@
  *     \brief      Onglet de gestion des contacts additionnel d'une société
  */
 
+
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php';
 
-$langs->loadLangs(array("orders", "companies"));
+// Load translation files required by the page
+$langs->loadLangs(array('companies', 'orders'));
 
+// Get parameters
 $id = GETPOST('id', 'int') ?GETPOST('id', 'int') : GETPOST('socid', 'int');
 $ref = GETPOST('ref', 'alpha');
 $action = GETPOST('action', 'aZ09');
@@ -62,6 +66,8 @@ if ($user->socid) {
 }
 $result = restrictedArea($user, 'societe', $id, '');
 
+
+// Initialize objects
 $object = new Societe($db);
 
 // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context

From 43601b09f325bf5d076423b4a1ee16c426b451c6 Mon Sep 17 00:00:00 2001
From: UT from dolibit <45215329+dolibit-ut@users.noreply.github.com>
Date: Mon, 29 Aug 2022 18:33:03 +0200
Subject: [PATCH 352/974] Update website.php

---
 htdocs/societe/website.php | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/htdocs/societe/website.php b/htdocs/societe/website.php
index 2d346282c4c..424d18c2058 100644
--- a/htdocs/societe/website.php
+++ b/htdocs/societe/website.php
@@ -28,6 +28,8 @@
  *  \brief      Page of web sites accounts
  */
 
+
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
 require_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
@@ -35,13 +37,17 @@ require_once DOL_DOCUMENT_ROOT.'/societe/class/societeaccount.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
 
+
+// Load translation files required by the page
 $langs->loadLangs(array("companies", "website"));
 
-$action     = GETPOST('action', 'aZ09') ?GETPOST('action', 'aZ09') : 'view'; // The action 'add', 'create', 'edit', 'update', 'view', ...
-$show_files = GETPOST('show_files', 'int');
-$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')
+
+// Get parameters
+$action 	 = GETPOST('action', 'aZ09') ?GETPOST('action', 'aZ09') : 'view';               // The action 'add', 'create', 'edit', 'update', 'view', ...
+$show_files  = GETPOST('show_files', 'int');
+$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')
 
 // Security check
 $id = GETPOST('id', 'int') ?GETPOST('id', 'int') : GETPOST('socid', 'int');

From 7657bc35d7a21e262321d00944689f5130c827f8 Mon Sep 17 00:00:00 2001
From: UT from dolibit <45215329+dolibit-ut@users.noreply.github.com>
Date: Mon, 29 Aug 2022 18:43:06 +0200
Subject: [PATCH 353/974] Update list.php

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

diff --git a/htdocs/product/list.php b/htdocs/product/list.php
index ebcfed98c80..38c3c0c80ea 100644
--- a/htdocs/product/list.php
+++ b/htdocs/product/list.php
@@ -33,6 +33,8 @@
  *  \brief      Page to list products and services
  */
 
+
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
 require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.product.class.php';
@@ -51,12 +53,15 @@ if (!empty($conf->productbatch->enabled)) {
 	$langs->load("productbatch");
 }
 
+
+// Get parameters
 $action = GETPOST('action', 'aZ09');
 $massaction = GETPOST('massaction', 'alpha');
 $show_files = GETPOST('show_files', 'int');
 $confirm = GETPOST('confirm', 'alpha');
 $toselect = GETPOST('toselect', 'array');
 
+// Search Criterias
 $sall = trim((GETPOST('search_all', 'alphanohtml') != '') ?GETPOST('search_all', 'alphanohtml') : GETPOST('sall', 'alphanohtml'));
 $search_id = GETPOST("search_id", 'alpha');
 $search_ref = GETPOST("search_ref", 'alpha');

From 5b8f7cf00c8e2d2b2bbe15ac939691680d2ca5c6 Mon Sep 17 00:00:00 2001
From: UT from dolibit <45215329+dolibit-ut@users.noreply.github.com>
Date: Mon, 29 Aug 2022 18:45:11 +0200
Subject: [PATCH 354/974] Update card.php

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

diff --git a/htdocs/product/card.php b/htdocs/product/card.php
index 761fe2a148f..5f0159ce567 100644
--- a/htdocs/product/card.php
+++ b/htdocs/product/card.php
@@ -41,6 +41,8 @@
  *  \brief      Page to show product
  */
 
+
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/canvas.class.php';
@@ -88,6 +90,7 @@ $mesg = ''; $error = 0; $errors = array();
 
 $refalreadyexists = 0;
 
+// Get parameters
 $id = GETPOST('id', 'int');
 $ref = (GETPOSTISSET('ref') ? GETPOST('ref', 'alpha') : null);
 $type = (GETPOSTISSET('type') ? GETPOST('type', 'int') : Product::TYPE_PRODUCT);
@@ -107,6 +110,7 @@ $accountancy_code_buy_intra = GETPOST('accountancy_code_buy_intra', 'alpha');
 $accountancy_code_buy_export = GETPOST('accountancy_code_buy_export', 'alpha');
 
 $checkmandatory = GETPOST('accountancy_code_buy_export', 'alpha');
+
 // by default 'alphanohtml' (better security); hidden conf MAIN_SECURITY_ALLOW_UNSECURED_LABELS_WITH_HTML allows basic html
 $label_security_check = empty($conf->global->MAIN_SECURITY_ALLOW_UNSECURED_LABELS_WITH_HTML) ? 'alphanohtml' : 'restricthtml';
 

From eb83c818acce16e747dfb513a38306fcc24745f1 Mon Sep 17 00:00:00 2001
From: UT from dolibit <45215329+dolibit-ut@users.noreply.github.com>
Date: Mon, 29 Aug 2022 18:47:35 +0200
Subject: [PATCH 355/974] Update index.php

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

diff --git a/htdocs/product/index.php b/htdocs/product/index.php
index f2b29926b21..e976e176224 100644
--- a/htdocs/product/index.php
+++ b/htdocs/product/index.php
@@ -28,6 +28,8 @@
  *  \brief      Homepage products and services
  */
 
+
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
@@ -47,6 +49,7 @@ $langs->loadLangs(array('products', 'stocks'));
 // Initialize technical object to manage hooks. Note that conf->hooks_modules contains array of hooks
 $hookmanager->initHooks(array('productindex'));
 
+// Initialize objects
 $product_static = new Product($db);
 
 // Security check

From c9826f975cf241eff7de98aa06e0b05da0f4e19c Mon Sep 17 00:00:00 2001
From: UT from dolibit <45215329+dolibit-ut@users.noreply.github.com>
Date: Mon, 29 Aug 2022 18:49:48 +0200
Subject: [PATCH 356/974] Update document.php

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

diff --git a/htdocs/product/document.php b/htdocs/product/document.php
index d83a684a308..2aaa2356879 100644
--- a/htdocs/product/document.php
+++ b/htdocs/product/document.php
@@ -28,6 +28,8 @@
  *       \brief      Page des documents joints sur les produits
  */
 
+
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/product.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
@@ -38,9 +40,12 @@ if (!empty($conf->global->PRODUIT_PDF_MERGE_PROPAL)) {
 	require_once DOL_DOCUMENT_ROOT.'/product/class/propalmergepdfproduct.class.php';
 }
 
+
 // Load translation files required by the page
 $langs->loadLangs(array('other', 'products'));
 
+
+// Get parameters
 $id     = GETPOST('id', 'int');
 $ref    = GETPOST('ref', 'alpha');
 $action = GETPOST('action', 'aZ09');
@@ -74,7 +79,7 @@ if (!$sortfield) {
 	$sortfield = "position_name";
 }
 
-
+// Initialize objects
 $object = new Product($db);
 if ($id > 0 || !empty($ref)) {
 	$result = $object->fetch($id, $ref);
@@ -93,6 +98,7 @@ if ($id > 0 || !empty($ref)) {
 		}
 	}
 }
+
 $modulepart = 'produit';
 
 

From a8d480ee2d063524c035e43ccf51cfc709621ebd Mon Sep 17 00:00:00 2001
From: UT from dolibit <45215329+dolibit-ut@users.noreply.github.com>
Date: Mon, 29 Aug 2022 18:55:02 +0200
Subject: [PATCH 357/974] Update index.php

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

diff --git a/htdocs/compta/index.php b/htdocs/compta/index.php
index 55ee99f4cb6..fefdff4aece 100644
--- a/htdocs/compta/index.php
+++ b/htdocs/compta/index.php
@@ -31,6 +31,8 @@
  *	\brief      Main page of accountancy area
  */
 
+
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
@@ -54,6 +56,7 @@ if (!empty($conf->commande->enabled)) {
 	$langs->load("orders");
 }
 
+// Get parameters
 $action = GETPOST('action', 'aZ09');
 $bid = GETPOST('bid', 'int');
 

From 2b59e9261b219036cc96f3237780f7bb6d5d49fa Mon Sep 17 00:00:00 2001
From: UT from dolibit <45215329+dolibit-ut@users.noreply.github.com>
Date: Mon, 29 Aug 2022 18:58:51 +0200
Subject: [PATCH 358/974] Update index.php

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

diff --git a/htdocs/commande/index.php b/htdocs/commande/index.php
index 03644fe5690..57f61f3d9f7 100644
--- a/htdocs/commande/index.php
+++ b/htdocs/commande/index.php
@@ -25,6 +25,8 @@
  *	\brief      Home page of customer order module
  */
 
+
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/notify.class.php';
@@ -32,6 +34,11 @@ require_once DOL_DOCUMENT_ROOT.'/societe/class/client.class.php';
 require_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/order.lib.php';
 
+
+// Load translation files required by the page
+$langs->loadLangs(array('orders', 'bills'));
+
+
 if (!$user->rights->commande->lire) {
 	accessforbidden();
 }
@@ -41,8 +48,6 @@ $hookmanager = new HookManager($db);
 // Initialize technical object to manage hooks. Note that conf->hooks_modules contains array
 $hookmanager->initHooks(array('ordersindex'));
 
-// Load translation files required by the page
-$langs->loadLangs(array('orders', 'bills'));
 
 // Security check
 $socid = GETPOST('socid', 'int');

From 2f9bb23a120c980d1b1bf7da866b868c62d24b9d Mon Sep 17 00:00:00 2001
From: UT from dolibit <45215329+dolibit-ut@users.noreply.github.com>
Date: Mon, 29 Aug 2022 19:00:39 +0200
Subject: [PATCH 359/974] Update index.php

---
 htdocs/accountancy/index.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/htdocs/accountancy/index.php b/htdocs/accountancy/index.php
index 911197994c1..2745ab4784a 100644
--- a/htdocs/accountancy/index.php
+++ b/htdocs/accountancy/index.php
@@ -23,6 +23,8 @@
  * \brief   Home accounting module
  */
 
+
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/accounting.lib.php';

From 7e57ba7658d6282675692dccb4c7bf5cb35612d6 Mon Sep 17 00:00:00 2001
From: UT from dolibit <45215329+dolibit-ut@users.noreply.github.com>
Date: Mon, 29 Aug 2022 19:02:52 +0200
Subject: [PATCH 360/974] Update index.php

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

diff --git a/htdocs/adherents/index.php b/htdocs/adherents/index.php
index 1ef98dddb6d..388d51be376 100644
--- a/htdocs/adherents/index.php
+++ b/htdocs/adherents/index.php
@@ -27,19 +27,24 @@
  *       \brief      Home page of membership module
  */
 
+
+// Load Dolibarr environment
 require '../main.inc.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';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
 
+
+// Load translation files required by the page
+$langs->loadLangs(array("companies", "members"));
+
+
 $hookmanager = new HookManager($db);
 
 // Initialize technical object to manage hooks. Note that conf->hooks_modules contains array
 $hookmanager->initHooks(array('membersindex'));
 
-// Load translation files required by the page
-$langs->loadLangs(array("companies", "members"));
 
 // Security check
 $result = restrictedArea($user, 'adherent');

From 88dbf3aaff9ae0d28fc4855d7e1eb2f003185b9c Mon Sep 17 00:00:00 2001
From: UT from dolibit <45215329+dolibit-ut@users.noreply.github.com>
Date: Mon, 29 Aug 2022 19:05:31 +0200
Subject: [PATCH 361/974] Update card.php

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

diff --git a/htdocs/adherents/card.php b/htdocs/adherents/card.php
index 63527452fe1..6816023f8de 100644
--- a/htdocs/adherents/card.php
+++ b/htdocs/adherents/card.php
@@ -29,6 +29,8 @@
  *  \brief      Page of a member
  */
 
+
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/member.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
@@ -44,9 +46,12 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/html.formadmin.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
 
+
 // Load translation files required by the page
 $langs->loadLangs(array("companies", "bills", "members", "users", "other", "paypal"));
 
+
+// Get parameters
 $action = GETPOST('action', 'aZ09');
 $cancel = GETPOST('cancel', 'alpha');
 $backtopage = GETPOST('backtopage', 'alpha');

From bcce09d7071cfa15cb48f7852f9c655a33cdde9a Mon Sep 17 00:00:00 2001
From: UT from dolibit <45215329+dolibit-ut@users.noreply.github.com>
Date: Mon, 29 Aug 2022 19:07:55 +0200
Subject: [PATCH 362/974] Update list.php

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

diff --git a/htdocs/adherents/list.php b/htdocs/adherents/list.php
index f9208daf70d..2c2efdd00a6 100644
--- a/htdocs/adherents/list.php
+++ b/htdocs/adherents/list.php
@@ -27,14 +27,20 @@
  *  \brief      Page to list all members of foundation
  */
 
+
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
 require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
 require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent_type.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
 
+
+// Load translation files required by the page
 $langs->loadLangs(array("members", "companies"));
 
+
+// Get parameters
 $action = GETPOST('action', 'aZ09');
 $massaction = GETPOST('massaction', 'alpha');
 $show_files = GETPOST('show_files', 'int');
@@ -42,6 +48,8 @@ $confirm = GETPOST('confirm', 'alpha');
 $toselect = GETPOST('toselect', 'array');
 $contextpage = GETPOST('contextpage', 'aZ') ?GETPOST('contextpage', 'aZ') : 'memberslist'; // To manage different context of search
 
+
+// Search fields
 $search = GETPOST("search", 'alpha');
 $search_ref = GETPOST("search_ref", 'alpha');
 $search_lastname = GETPOST("search_lastname", 'alpha');

From 9dc61d32433dc5a5dbff22d50abe6a8cebc9cf7a Mon Sep 17 00:00:00 2001
From: UT from dolibit <45215329+dolibit-ut@users.noreply.github.com>
Date: Mon, 29 Aug 2022 19:10:12 +0200
Subject: [PATCH 363/974] Update note.php

---
 htdocs/adherents/note.php | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/htdocs/adherents/note.php b/htdocs/adherents/note.php
index 2d98dfe5fbc..0d05bb85523 100644
--- a/htdocs/adherents/note.php
+++ b/htdocs/adherents/note.php
@@ -23,25 +23,34 @@
  *      \brief      Tab for note of a member
 */
 
+
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/member.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
 require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent_type.class.php';
 
+
 // Load translation files required by the page
 $langs->loadLangs(array("companies", "members", "bills"));
 
+
+// Get parameters
 $action = GETPOST('action', 'aZ09');
 $id = GETPOST('id', 'int');
 $ref = GETPOST('ref', 'alphanohtml');
 
+
+// Initialize objects
 $object = new Adherent($db);
+
 $result = $object->fetch($id);
 if ($result > 0) {
 	$adht = new AdherentType($db);
 	$result = $adht->fetch($object->typeid);
 }
 
+
 $permissionnote = $user->rights->adherent->creer; // Used by the include of actions_setnotes.inc.php
 
 // Fetch object

From c4b8bac43fa2f5b2d42723533be80cc4bcfa8319 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 29 Aug 2022 19:40:47 +0200
Subject: [PATCH 364/974] FIX email not visible into combo list

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

diff --git a/htdocs/core/class/html.formmail.class.php b/htdocs/core/class/html.formmail.class.php
index 61f62f28a54..f12acbe1901 100644
--- a/htdocs/core/class/html.formmail.class.php
+++ b/htdocs/core/class/html.formmail.class.php
@@ -1072,6 +1072,7 @@ class FormMail extends Form
 				// multiselect array convert html entities into options tags, even if we dont want this, so we encode them a second time
 				$tmparray = $this->withto;
 				foreach ($tmparray as $key => $val) {
+					$tmparray[$key] = str_replace(array('<', '>'), array('(', ')'), $tmparray[$key]);
 					$tmparray[$key] = dol_htmlentities($tmparray[$key], null, 'UTF-8', true);
 				}
 
@@ -1080,6 +1081,7 @@ class FormMail extends Form
 				if (empty($withtoselected) && count($tmparray) == 1 && GETPOST('action', 'aZ09') == 'presend') {
 					$withtoselected = array_keys($tmparray);
 				}
+
 				$out .= $form->multiselectarray("receiver", $tmparray, $withtoselected, null, null, 'inline-block minwidth500', null, "");
 			}
 		}
@@ -1107,6 +1109,7 @@ class FormMail extends Form
 				// multiselect array convert html entities into options tags, even if we dont want this, so we encode them a second time
 				$tmparray = $this->withtocc;
 				foreach ($tmparray as $key => $val) {
+					$tmparray[$key] = str_replace(array('<', '>'), array('(', ')'), $tmparray[$key]);
 					$tmparray[$key] = dol_htmlentities($tmparray[$key], null, 'UTF-8', true);
 				}
 				$withtoccselected = GETPOST("receivercc", 'array'); // Array of selected value
@@ -1510,7 +1513,7 @@ class FormMail extends Form
 
 
 	/**
-	 * Set substit array from object. This is call when suggesting the email template into forms before sending email.
+	 * Set ->substit (and ->substit_line) array from object. This is call when suggesting the email template into forms before sending email.
 	 *
 	 * @param	CommonObject	$object		   Object to use
 	 * @param   Translate  		$outputlangs   Object lang

From 35dbee5bbfaff7c7d5896da70d476eeea1c98818 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 29 Aug 2022 19:56:57 +0200
Subject: [PATCH 365/974] NEW On a form to send an email, we show all emails of
 contacts of object

---
 htdocs/core/tpl/card_presend.tpl.php | 44 ++++++++++++++++++++--------
 1 file changed, 32 insertions(+), 12 deletions(-)

diff --git a/htdocs/core/tpl/card_presend.tpl.php b/htdocs/core/tpl/card_presend.tpl.php
index 5fbb227bc69..596feae69d1 100644
--- a/htdocs/core/tpl/card_presend.tpl.php
+++ b/htdocs/core/tpl/card_presend.tpl.php
@@ -156,7 +156,7 @@ if ($action == 'presend') {
 	$formmail->inreplyto = empty($inreplyto) ? '' : $inreplyto;
 	$formmail->withfrom = 1;
 
-	// Fill list of recipient with email inside <>.
+	// Define $liste, a list of recipients with email inside <>.
 	$liste = array();
 	if ($object->element == 'expensereport') {
 		$fuser = new User($db);
@@ -202,16 +202,6 @@ if ($action == 'presend') {
 		}
 	}
 
-	$formmail->withto = $liste;
-	$formmail->withtofree = (GETPOST('sendto', 'alphawithlgt') ? GETPOST('sendto', 'alphawithlgt') : '1');
-	$formmail->withtocc = $liste;
-	$formmail->withtoccc = getDolGlobalString('MAIN_EMAIL_USECCC');
-	$formmail->withtopic = $topicmail;
-	$formmail->withfile = 2;
-	$formmail->withbody = 1;
-	$formmail->withdeliveryreceipt = 1;
-	$formmail->withcancel = 1;
-
 	//$arrayoffamiliestoexclude=array('system', 'mycompany', 'object', 'objectamount', 'date', 'user', ...);
 	if (!isset($arrayoffamiliestoexclude)) {
 		$arrayoffamiliestoexclude = null;
@@ -219,6 +209,7 @@ if ($action == 'presend') {
 
 	// Make substitution in email content
 	if ($object) {
+		// First we set ->substit (useless, it will be erased later) and ->substit_lines
 		$formmail->setSubstitFromObject($object, $langs);
 	}
 	$substitutionarray = getCommonSubstitutionArray($outputlangs, 0, $arrayoffamiliestoexclude, $object);
@@ -237,7 +228,7 @@ if ($action == 'presend') {
 	);
 	complete_substitutions_array($substitutionarray, $outputlangs, $object, $parameters);
 
-	// Find the good contact address
+	// Find all external contact addresses
 	$tmpobject = $object;
 	if (($object->element == 'shipping' || $object->element == 'reception')) {
 		$origin = $object->origin;
@@ -289,17 +280,46 @@ if ($action == 'presend') {
 
 	if (is_array($contactarr) && count($contactarr) > 0) {
 		require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
+		require_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
 		$contactstatic = new Contact($db);
+		$tmpcompany = new Societe($db);
 
 		foreach ($contactarr as $contact) {
 			$contactstatic->fetch($contact['id']);
+			// Complete substitution array
 			$substitutionarray['__CONTACT_NAME_'.$contact['code'].'__'] = $contactstatic->getFullName($outputlangs, 1);
 			$substitutionarray['__CONTACT_LASTNAME_'.$contact['code'].'__'] = $contactstatic->lastname;
 			$substitutionarray['__CONTACT_FIRSTNAME_'.$contact['code'].'__'] = $contactstatic->firstname;
 			$substitutionarray['__CONTACT_TITLE_'.$contact['code'].'__'] = $contactstatic->getCivilityLabel();
+
+			// Complete $liste with the $contact
+			if (empty($liste[$contact['id']])) {	// If this contact id not already into the $liste
+				$contacttoshow = '';
+				if (isset($object->thirdparty) && is_object($object->thirdparty)) {
+					if ($contactstatic->fk_soc != $object->thirdparty->id) {
+						$tmpcompany->fetch($contactstatic->fk_soc);
+						if ($tmpcompany->id > 0) {
+							$contacttoshow .= $tmpcompany->name.': ';
+						}
+					}
+				}
+				$contacttoshow .= $contactstatic->getFullName($outputlangs, 1);
+				$contacttoshow .= " <".($contactstatic->email ? $contactstatic->email : $langs->transnoentitiesnoconv("NoEMail")) .">";
+				$liste[$contact['id']] = $contacttoshow;
+			}
 		}
 	}
 
+	$formmail->withto = $liste;
+	$formmail->withtofree = (GETPOST('sendto', 'alphawithlgt') ? GETPOST('sendto', 'alphawithlgt') : '1');
+	$formmail->withtocc = $liste;
+	$formmail->withtoccc = getDolGlobalString('MAIN_EMAIL_USECCC');
+	$formmail->withtopic = $topicmail;
+	$formmail->withfile = 2;
+	$formmail->withbody = 1;
+	$formmail->withdeliveryreceipt = 1;
+	$formmail->withcancel = 1;
+
 	// Array of substitutions
 	$formmail->substit = $substitutionarray;
 

From ab184bbfda838d09d1edd0b9e927074ff5b3c5bf Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 30 Aug 2022 01:00:43 +0200
Subject: [PATCH 366/974] Update main.inc.php

---
 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 a45130010a3..56a85f5d03d 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -1600,7 +1600,7 @@ function top_htmlhead($head, $title = '', $disablejs = 0, $disablehead = 0, $arr
 			dolibarr_set_const($db, "MAIN_IHM_PARAMS_REV", ((int) $conf->global->MAIN_IHM_PARAMS_REV) + 1, 'chaine', 0, '', $conf->entity);
 		}
 
-		$themeparam = '?lang='.$langs->defaultlang.'&amp;theme='.$conf->theme.(GETPOST('optioncss', 'aZ09') ? '&amp;optioncss='.GETPOST('optioncss', 'aZ09', 1) : '').'&amp;'.(!empty($user->id) ? ('userid='.$user->id.'&amp') : '').';entity='.$conf->entity;
+		$themeparam = '?lang='.$langs->defaultlang.'&amp;theme='.$conf->theme.(GETPOST('optioncss', 'aZ09') ? '&amp;optioncss='.GETPOST('optioncss', 'aZ09', 1) : '').(empty($user->id) ? '' : ('&amp;userid='.$user->id) : '').'&amp;entity='.$conf->entity;
 
 		$themeparam .= ($ext ? '&amp;'.$ext : '').'&amp;revision='.getDolGlobalInt("MAIN_IHM_PARAMS_REV");
 		if (GETPOSTISSET('dol_hide_topmenu')) {

From 87df13507c7f9a709a83ed7e42c7d6298d6bb9cf Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 30 Aug 2022 01:21:49 +0200
Subject: [PATCH 367/974] Update categories.php

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

diff --git a/htdocs/accountancy/admin/categories.php b/htdocs/accountancy/admin/categories.php
index 68d4c03e0a6..e65572eafd3 100644
--- a/htdocs/accountancy/admin/categories.php
+++ b/htdocs/accountancy/admin/categories.php
@@ -125,7 +125,7 @@ if (!empty($cat_id)) {
 	$arraykeyvalue = array();
 	foreach ($accountingcategory->lines_cptbk as $key => $val) {
 		$doc_ref = !empty($val->doc_ref) ? $val->doc_ref : '';
-		$arraykeyvalue[length_accountg($val->numero_compte)] = length_accountg($val->numero_compte) . ' - ' . $val->label_compte . $doc_ref;
+		$arraykeyvalue[length_accountg($val->numero_compte)] = length_accountg($val->numero_compte) . ' - ' . $val->label_compte . ($doc_ref ? ' '.$doc_ref : '');
 	}
 
 	if (is_array($accountingcategory->lines_cptbk) && count($accountingcategory->lines_cptbk) > 0) {

From d70c70a5fe8bb71d2996fa2319a4745a7fdc3b80 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 29 Aug 2022 19:40:47 +0200
Subject: [PATCH 368/974] FIX email not visible into combo list

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

diff --git a/htdocs/core/class/html.formmail.class.php b/htdocs/core/class/html.formmail.class.php
index df7408200a9..281cfaca58d 100644
--- a/htdocs/core/class/html.formmail.class.php
+++ b/htdocs/core/class/html.formmail.class.php
@@ -1066,6 +1066,7 @@ class FormMail extends Form
 				// multiselect array convert html entities into options tags, even if we dont want this, so we encode them a second time
 				$tmparray = $this->withto;
 				foreach ($tmparray as $key => $val) {
+					$tmparray[$key] = str_replace(array('<', '>'), array('(', ')'), $tmparray[$key]);
 					$tmparray[$key] = dol_htmlentities($tmparray[$key], null, 'UTF-8', true);
 				}
 
@@ -1074,6 +1075,7 @@ class FormMail extends Form
 				if (empty($withtoselected) && count($tmparray) == 1 && GETPOST('action', 'aZ09') == 'presend') {
 					$withtoselected = array_keys($tmparray);
 				}
+
 				$out .= $form->multiselectarray("receiver", $tmparray, $withtoselected, null, null, 'inline-block minwidth500', null, "");
 			}
 		}
@@ -1101,6 +1103,7 @@ class FormMail extends Form
 				// multiselect array convert html entities into options tags, even if we dont want this, so we encode them a second time
 				$tmparray = $this->withtocc;
 				foreach ($tmparray as $key => $val) {
+					$tmparray[$key] = str_replace(array('<', '>'), array('(', ')'), $tmparray[$key]);
 					$tmparray[$key] = dol_htmlentities($tmparray[$key], null, 'UTF-8', true);
 				}
 				$withtoccselected = GETPOST("receivercc", 'array'); // Array of selected value
@@ -1504,7 +1507,7 @@ class FormMail extends Form
 
 
 	/**
-	 * Set substit array from object. This is call when suggesting the email template into forms before sending email.
+	 * Set ->substit (and ->substit_line) array from object. This is call when suggesting the email template into forms before sending email.
 	 *
 	 * @param	CommonObject	$object		   Object to use
 	 * @param   Translate  		$outputlangs   Object lang

From 147207b4e17bfca0b3dcdb1badfd0dd1a619f544 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 29 Aug 2022 19:56:57 +0200
Subject: [PATCH 369/974] NEW On a form to send an email, we show all emails of
 contacts of object

---
 ChangeLog                            |  3 +-
 htdocs/core/tpl/card_presend.tpl.php | 44 ++++++++++++++++++++--------
 2 files changed, 34 insertions(+), 13 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 41f765c8197..891e445ab39 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -9,7 +9,7 @@ English Dolibarr ChangeLog
 For users:
 ---------------
 
-NEW: PHP 8.1 compatibility. 
+NEW: PHP 8.1 compatibility:
      Warning: Application works correctly with PHP8 and 8.1 but you may experience a lot of PHP warning into the PHP server log files (depending 
      on the PHP setup). Removal of all PHP warnings on server side is planned for v17.
 NEW: Support for recurring purchase invoices.
@@ -121,6 +121,7 @@ NEW: Ticket triggers: allow to automatically send messages on new tickets
 NEW: Accountancy - Add hidden feature for accounting reconciliation
 NEW: Can store the session into database (instead of beeing managed by PHP)
 NEW: Added MMK currency (Myanmar Kyat)
+NEW: On a form to send an email, we show all emails of contacts of object
 
  Modules
 NEW: Module Partnership Management
diff --git a/htdocs/core/tpl/card_presend.tpl.php b/htdocs/core/tpl/card_presend.tpl.php
index ca524278398..2f6acb67ece 100644
--- a/htdocs/core/tpl/card_presend.tpl.php
+++ b/htdocs/core/tpl/card_presend.tpl.php
@@ -147,7 +147,7 @@ if ($action == 'presend') {
 	$formmail->trackid = $trackid;
 	$formmail->withfrom = 1;
 
-	// Fill list of recipient with email inside <>.
+	// Define $liste, a list of recipients with email inside <>.
 	$liste = array();
 	if ($object->element == 'expensereport') {
 		$fuser = new User($db);
@@ -193,16 +193,6 @@ if ($action == 'presend') {
 		}
 	}
 
-	$formmail->withto = $liste;
-	$formmail->withtofree = (GETPOST('sendto', 'alphawithlgt') ? GETPOST('sendto', 'alphawithlgt') : '1');
-	$formmail->withtocc = $liste;
-	$formmail->withtoccc = getDolGlobalString('MAIN_EMAIL_USECCC');
-	$formmail->withtopic = $topicmail;
-	$formmail->withfile = 2;
-	$formmail->withbody = 1;
-	$formmail->withdeliveryreceipt = 1;
-	$formmail->withcancel = 1;
-
 	//$arrayoffamiliestoexclude=array('system', 'mycompany', 'object', 'objectamount', 'date', 'user', ...);
 	if (!isset($arrayoffamiliestoexclude)) {
 		$arrayoffamiliestoexclude = null;
@@ -210,6 +200,7 @@ if ($action == 'presend') {
 
 	// Make substitution in email content
 	if ($object) {
+		// First we set ->substit (useless, it will be erased later) and ->substit_lines
 		$formmail->setSubstitFromObject($object, $langs);
 	}
 	$substitutionarray = getCommonSubstitutionArray($outputlangs, 0, $arrayoffamiliestoexclude, $object);
@@ -228,7 +219,7 @@ if ($action == 'presend') {
 	);
 	complete_substitutions_array($substitutionarray, $outputlangs, $object, $parameters);
 
-	// Find the good contact address
+	// Find all external contact addresses
 	$tmpobject = $object;
 	if (($object->element == 'shipping' || $object->element == 'reception')) {
 		$origin = $object->origin;
@@ -280,17 +271,46 @@ if ($action == 'presend') {
 
 	if (is_array($contactarr) && count($contactarr) > 0) {
 		require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
+		require_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
 		$contactstatic = new Contact($db);
+		$tmpcompany = new Societe($db);
 
 		foreach ($contactarr as $contact) {
 			$contactstatic->fetch($contact['id']);
+			// Complete substitution array
 			$substitutionarray['__CONTACT_NAME_'.$contact['code'].'__'] = $contactstatic->getFullName($outputlangs, 1);
 			$substitutionarray['__CONTACT_LASTNAME_'.$contact['code'].'__'] = $contactstatic->lastname;
 			$substitutionarray['__CONTACT_FIRSTNAME_'.$contact['code'].'__'] = $contactstatic->firstname;
 			$substitutionarray['__CONTACT_TITLE_'.$contact['code'].'__'] = $contactstatic->getCivilityLabel();
+
+			// Complete $liste with the $contact
+			if (empty($liste[$contact['id']])) {	// If this contact id not already into the $liste
+				$contacttoshow = '';
+				if (isset($object->thirdparty) && is_object($object->thirdparty)) {
+					if ($contactstatic->fk_soc != $object->thirdparty->id) {
+						$tmpcompany->fetch($contactstatic->fk_soc);
+						if ($tmpcompany->id > 0) {
+							$contacttoshow .= $tmpcompany->name.': ';
+						}
+					}
+				}
+				$contacttoshow .= $contactstatic->getFullName($outputlangs, 1);
+				$contacttoshow .= " <".($contactstatic->email ? $contactstatic->email : $langs->transnoentitiesnoconv("NoEMail")) .">";
+				$liste[$contact['id']] = $contacttoshow;
+			}
 		}
 	}
 
+	$formmail->withto = $liste;
+	$formmail->withtofree = (GETPOST('sendto', 'alphawithlgt') ? GETPOST('sendto', 'alphawithlgt') : '1');
+	$formmail->withtocc = $liste;
+	$formmail->withtoccc = getDolGlobalString('MAIN_EMAIL_USECCC');
+	$formmail->withtopic = $topicmail;
+	$formmail->withfile = 2;
+	$formmail->withbody = 1;
+	$formmail->withdeliveryreceipt = 1;
+	$formmail->withcancel = 1;
+
 	// Array of substitutions
 	$formmail->substit = $substitutionarray;
 

From 825fee4f79998d7dfd6bf4795b7acb5d29684ae1 Mon Sep 17 00:00:00 2001
From: bagtaib <bagtaib@ubuntu>
Date: Tue, 30 Aug 2022 00:36:29 +0100
Subject: [PATCH 370/974] update company fields if already exists

---
 htdocs/langs/en_US/companies.lang   |  2 +
 htdocs/langs/en_US/partnership.lang |  1 +
 htdocs/public/partnership/new.php   | 68 ++++++++++-------------------
 3 files changed, 27 insertions(+), 44 deletions(-)

diff --git a/htdocs/langs/en_US/companies.lang b/htdocs/langs/en_US/companies.lang
index 996c98c203a..2ef90f89600 100644
--- a/htdocs/langs/en_US/companies.lang
+++ b/htdocs/langs/en_US/companies.lang
@@ -498,3 +498,5 @@ 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.
+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"
\ No newline at end of file
diff --git a/htdocs/langs/en_US/partnership.lang b/htdocs/langs/en_US/partnership.lang
index 5c85e4d7830..6490bf23d8b 100644
--- a/htdocs/langs/en_US/partnership.lang
+++ b/htdocs/langs/en_US/partnership.lang
@@ -28,6 +28,7 @@ PartnershipCheckBacklink=Partnership: Check referring backlink
 # Menu
 #
 NewPartnership=New Partnership
+NewPartnershipbyWeb= Your partnership was added successfully.
 ListOfPartnerships=List of partnership
 
 #
diff --git a/htdocs/public/partnership/new.php b/htdocs/public/partnership/new.php
index 4d30f42b0db..a50892c9e08 100644
--- a/htdocs/public/partnership/new.php
+++ b/htdocs/public/partnership/new.php
@@ -231,7 +231,7 @@ if (empty($reshook) && $action == 'add') {
 			$result1 = $company->fetch(0, 0, 0, 0, 0, 0, 0, 0, 0, 0, GETPOST('email'));
 			if ($result1 > 0) {
 				$error++;
-				$errmsg = $langs->trans("already exists please rewrite your company name");
+				$errmsg = $langs->trans("EmailAlreadyExistsPleaseRewriteYourCompanyName");
 			} else {
 				//create thirdparty
 				$company = new Societe($db);
@@ -255,53 +255,33 @@ if (empty($reshook) && $action == 'add') {
 			}
 		} elseif ($result == -2) {
 			$error++;
-			$errmsg = $langs->trans('more than one entry exist for this company please contact us to complete your partnership request');
+			$errmsg = $langs->trans("TwoRecordsOfCompanyName");
 		} else {
 			$partnership->fk_soc = $company->id;
-		}
-
-		/*
-		$sql =	"SELECT rowid FROM ".MAIN_DB_PREFIX."societe WHERE nom='".$db->escape(GETPOST('societe'))."'";
-		$result = $db->query($sql);
-		if ($result) {
-			$num = $db->num_rows($result);
-		}
-		if ($num = 0) { // si il ya pas d'entree sur le nom  on teste l'email
-			$sql1 =	"SELECT rowid FROM ".MAIN_DB_PREFIX."societe WHERE email='".$db->escape(GETPOST('email'))."'";
-			$result1 = $db->query($sql1);
-			if ($result1) {
-				$num1 = $db->num_rows($result1);
+			// update thirdparty fields
+			if (empty($company->address)) {
+				$company->address = GETPOST('address');
 			}
-			if ($num1 != 0) {
-				$error++;
-				$errmsg = "email already exists please rewrite your company name";
-			} else {
-				//create thirdparty
-				$company = new Societe($db);
-
-				$company->address     = GETPOST('address');
-				$company->zip         = GETPOST('zipcode');
-				$company->town        = GETPOST('town');
-				$company->email       = GETPOST('email');
-				$company->country_id  = GETPOST('country_id', 'int');
-				$company->state_id    = GETPOST('state_id', 'int');
-				$company->name_alias  = dolGetFirstLastname(GETPOST('firstname'), GETPOST('lastname'));
-
-				$resultat=$company->create($user);
-				if ($resultat < 0) {
-					$error++;
-					$errmsg .= join('<br>', $company->errors);
-				}
-
-				$partnership->fk_soc = $company->id;
+			if (empty($company->zip)) {
+				$company->zip = GETPOST('zipcode');
 			}
-		} elseif ($num > 1) {
-			$error++;
-			$errmsg = 'more than one entry exist for this company please contact us to complete your partnership request';
-		} else {
-			$company = $db->fetch_object($result);
-			$partnership->fk_soc = $company->rowid;
-		}*/
+			if (empty($company->town)) {
+				$company->town = GETPOST('town');
+			}
+			if (empty($company->country_id)) {
+				$company->country_id = GETPOST('country_id', 'int');
+			}
+			if (empty($company->email)) {
+				$company->email = GETPOST('email');
+			}
+			if (empty($company->state_id)) {
+				$company->state_id = GETPOST('state_id', 'int');
+			}
+			if (empty($company->name_alias)) {
+				$company->name_alias = dolGetFirstLastname(GETPOST('firstname'), GETPOST('lastname'));
+			}
+			$company->update(0);
+		}
 
 		// Fill array 'array_options' with data from add form
 		$extrafields->fetch_name_optionals_label($partnership->table_element);

From 627b894b71c2bc430f5e92736f4a60f02454d10a Mon Sep 17 00:00:00 2001
From: ptibogxiv <support@ptibogxiv.net>
Date: Tue, 30 Aug 2022 08:05:18 +0200
Subject: [PATCH 371/974] Update thirdparties.modules.php

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

diff --git a/htdocs/core/modules/mailings/thirdparties.modules.php b/htdocs/core/modules/mailings/thirdparties.modules.php
index 6f694cc0b74..008888832cd 100644
--- a/htdocs/core/modules/mailings/thirdparties.modules.php
+++ b/htdocs/core/modules/mailings/thirdparties.modules.php
@@ -226,7 +226,7 @@ class mailing_thirdparties extends MailingTargets
 		$sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
 		$sql .= " WHERE s.email <> ''";
 		$sql .= " AND s.entity IN (".getEntity('societe').")";
-		$sql .= " AND (SELECT count(*) FROM ".MAIN_DB_PREFIX."mailing_unsubscribe WHERE email = s.email) = 0";
+		$sql .= " AND EXISTS (SELECT rowid FROM ".MAIN_DB_PREFIX."mailing_unsubscribe as mu WHERE mu.email = s.email and mu.entity = ".((int) $conf->entity).")";
 		// La requete doit retourner un champ "nb" pour etre comprise par parent::getNbOfRecipients
 		return parent::getNbOfRecipients($sql);
 	}

From 7dcf8969b9608a789f6ea4b02365e641e7b0dc14 Mon Sep 17 00:00:00 2001
From: ptibogxiv <support@ptibogxiv.net>
Date: Tue, 30 Aug 2022 08:18:20 +0200
Subject: [PATCH 372/974] Revert "Update thirdparties.modules.php"

This reverts commit 627b894b71c2bc430f5e92736f4a60f02454d10a.
---
 htdocs/core/modules/mailings/thirdparties.modules.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/core/modules/mailings/thirdparties.modules.php b/htdocs/core/modules/mailings/thirdparties.modules.php
index 008888832cd..6f694cc0b74 100644
--- a/htdocs/core/modules/mailings/thirdparties.modules.php
+++ b/htdocs/core/modules/mailings/thirdparties.modules.php
@@ -226,7 +226,7 @@ class mailing_thirdparties extends MailingTargets
 		$sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
 		$sql .= " WHERE s.email <> ''";
 		$sql .= " AND s.entity IN (".getEntity('societe').")";
-		$sql .= " AND EXISTS (SELECT rowid FROM ".MAIN_DB_PREFIX."mailing_unsubscribe as mu WHERE mu.email = s.email and mu.entity = ".((int) $conf->entity).")";
+		$sql .= " AND (SELECT count(*) FROM ".MAIN_DB_PREFIX."mailing_unsubscribe WHERE email = s.email) = 0";
 		// La requete doit retourner un champ "nb" pour etre comprise par parent::getNbOfRecipients
 		return parent::getNbOfRecipients($sql);
 	}

From b476efe55cf4578cc174e4cecaf1bbdd45928048 Mon Sep 17 00:00:00 2001
From: ptibogxiv <support@ptibogxiv.net>
Date: Tue, 30 Aug 2022 08:30:13 +0200
Subject: [PATCH 373/974] Revert "Revert "Update thirdparties.modules.php""

This reverts commit 7dcf8969b9608a789f6ea4b02365e641e7b0dc14.
---
 htdocs/core/modules/mailings/thirdparties.modules.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/core/modules/mailings/thirdparties.modules.php b/htdocs/core/modules/mailings/thirdparties.modules.php
index 6f694cc0b74..008888832cd 100644
--- a/htdocs/core/modules/mailings/thirdparties.modules.php
+++ b/htdocs/core/modules/mailings/thirdparties.modules.php
@@ -226,7 +226,7 @@ class mailing_thirdparties extends MailingTargets
 		$sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
 		$sql .= " WHERE s.email <> ''";
 		$sql .= " AND s.entity IN (".getEntity('societe').")";
-		$sql .= " AND (SELECT count(*) FROM ".MAIN_DB_PREFIX."mailing_unsubscribe WHERE email = s.email) = 0";
+		$sql .= " AND EXISTS (SELECT rowid FROM ".MAIN_DB_PREFIX."mailing_unsubscribe as mu WHERE mu.email = s.email and mu.entity = ".((int) $conf->entity).")";
 		// La requete doit retourner un champ "nb" pour etre comprise par parent::getNbOfRecipients
 		return parent::getNbOfRecipients($sql);
 	}

From a486e2f91f4f11079b320e3634ef6f1d9bfd4490 Mon Sep 17 00:00:00 2001
From: ptibogxiv <support@ptibogxiv.net>
Date: Tue, 30 Aug 2022 08:32:12 +0200
Subject: [PATCH 374/974] Update thirdparties.modules.php

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

diff --git a/htdocs/core/modules/mailings/thirdparties.modules.php b/htdocs/core/modules/mailings/thirdparties.modules.php
index 008888832cd..1d7acf02c09 100644
--- a/htdocs/core/modules/mailings/thirdparties.modules.php
+++ b/htdocs/core/modules/mailings/thirdparties.modules.php
@@ -226,7 +226,7 @@ class mailing_thirdparties extends MailingTargets
 		$sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
 		$sql .= " WHERE s.email <> ''";
 		$sql .= " AND s.entity IN (".getEntity('societe').")";
-		$sql .= " AND EXISTS (SELECT rowid FROM ".MAIN_DB_PREFIX."mailing_unsubscribe as mu WHERE mu.email = s.email and mu.entity = ".((int) $conf->entity).")";
+		$sql .= " AND NOT EXISTS (SELECT rowid FROM ".MAIN_DB_PREFIX."mailing_unsubscribe as mu WHERE mu.email = s.email and mu.entity = ".((int) $conf->entity).")";
 		// La requete doit retourner un champ "nb" pour etre comprise par parent::getNbOfRecipients
 		return parent::getNbOfRecipients($sql);
 	}

From dabb52d26f85ef2c9e0804b8896b312da879af6c Mon Sep 17 00:00:00 2001
From: Christian Foellmann <christian@foellmann.de>
Date: Tue, 30 Aug 2022 09:10:03 +0200
Subject: [PATCH 375/974] require missing signture.lib.php

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

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index e3a1f8f12dd..b63bb68c4a5 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -7631,6 +7631,7 @@ function getCommonSubstitutionArray($outputlangs, $onlykey = 0, $exclude = null,
 				$substitutionarray['__ONLINE_PAYMENT_URL__'] = $paymenturl;
 
 				if (is_object($object) && $object->element == 'propal') {
+					require_once DOL_DOCUMENT_ROOT.'/core/lib/signature.lib.php';
 					$substitutionarray['__ONLINE_SIGN_URL__'] = getOnlineSignatureUrl(0, 'proposal', $object->ref);
 				}
 				if (!empty($conf->global->PROPOSAL_ALLOW_EXTERNAL_DOWNLOAD) && is_object($object) && $object->element == 'propal') {

From 630c81772836c8771fa8b82780860e35436b894a Mon Sep 17 00:00:00 2001
From: UT from dolibit <45215329+dolibit-ut@users.noreply.github.com>
Date: Tue, 30 Aug 2022 09:47:56 +0200
Subject: [PATCH 376/974] Update agenda.php

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

diff --git a/htdocs/contact/agenda.php b/htdocs/contact/agenda.php
index 5f07922b2e4..29706f48b49 100644
--- a/htdocs/contact/agenda.php
+++ b/htdocs/contact/agenda.php
@@ -29,6 +29,8 @@
  *       \brief      Card of a contact
  */
 
+
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php';
 require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
@@ -49,12 +51,14 @@ $langs->loadLangs(array('companies', 'users', 'other', 'commercial'));
 
 $mesg = ''; $error = 0; $errors = array();
 
+// Get parameters
 $action		= (GETPOST('action', 'alpha') ? GETPOST('action', 'alpha') : 'view');
 $confirm	= GETPOST('confirm', 'alpha');
 $backtopage = GETPOST('backtopage', 'alpha');
 $id = GETPOST('id', 'int');
 $socid		= GETPOST('socid', 'int');
 
+// Initialize objects
 $object = new Contact($db);
 $extrafields = new ExtraFields($db);
 

From 39ce121dd2a6b7e2f240e18cb7d94fd0fd328960 Mon Sep 17 00:00:00 2001
From: UT from dolibit <45215329+dolibit-ut@users.noreply.github.com>
Date: Tue, 30 Aug 2022 09:50:12 +0200
Subject: [PATCH 377/974] Update card.php

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

diff --git a/htdocs/contact/card.php b/htdocs/contact/card.php
index d486432f142..d7eb7f53d82 100644
--- a/htdocs/contact/card.php
+++ b/htdocs/contact/card.php
@@ -32,6 +32,8 @@
  *       \brief      Card of a contact
  */
 
+
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php';
 require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
@@ -52,14 +54,15 @@ $langs->loadLangs(array('companies', 'users', 'other', 'commercial'));
 
 $mesg = ''; $error = 0; $errors = array();
 
+// Get parameters
 $action = (GETPOST('action', 'alpha') ? GETPOST('action', 'alpha') : 'view');
 $confirm = GETPOST('confirm', 'alpha');
 $backtopage = GETPOST('backtopage', 'alpha');
 $cancel = GETPOST('cancel', 'alpha');
-
 $id = GETPOST('id', 'int');
 $socid = GETPOST('socid', 'int');
 
+// Initialize technical object
 $object = new Contact($db);
 $extrafields = new ExtraFields($db);
 

From 38dc398bda54bbc713a69c51d1087c333c06144a Mon Sep 17 00:00:00 2001
From: UT from dolibit <45215329+dolibit-ut@users.noreply.github.com>
Date: Tue, 30 Aug 2022 09:51:26 +0200
Subject: [PATCH 378/974] Update consumption.php

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

diff --git a/htdocs/contact/consumption.php b/htdocs/contact/consumption.php
index c3cd54d890e..fff1ba17644 100644
--- a/htdocs/contact/consumption.php
+++ b/htdocs/contact/consumption.php
@@ -22,9 +22,11 @@
 /**
  *	\file       htdocs/contact/consumption.php
  *  \ingroup    societe
- *	\brief      Add a tab on thirpdarty view to list all products/services bought or sells by thirdparty
+ *	\brief      Add a tab on thirdparty view to list all products/services bought or sells by thirdparty
  */
 
+
+// Load Dolibarr environment
 require "../main.inc.php";
 require_once DOL_DOCUMENT_ROOT.'/core/lib/contact.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';

From 0af3a3cf8ebe41f680b6652e651e21317e763f43 Mon Sep 17 00:00:00 2001
From: UT from dolibit <45215329+dolibit-ut@users.noreply.github.com>
Date: Tue, 30 Aug 2022 09:52:29 +0200
Subject: [PATCH 379/974] Update document.php

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

diff --git a/htdocs/contact/document.php b/htdocs/contact/document.php
index 3fac8adea15..f62e82ee5a1 100644
--- a/htdocs/contact/document.php
+++ b/htdocs/contact/document.php
@@ -23,6 +23,8 @@
  *       \brief      Page with attached files on contact
  */
 
+
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
@@ -33,6 +35,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
 // Load translation files required by the page
 $langs->loadLangs(array('other', 'companies', 'contact'));
 
+// Get parameters
 $id = GETPOST('id', 'int');
 $action = GETPOST('action', 'aZ09');
 $confirm = GETPOST('confirm', 'alpha');

From ae3a70a88686ee8fcdb2e32cdd20f604c8dcae0c Mon Sep 17 00:00:00 2001
From: UT from dolibit <45215329+dolibit-ut@users.noreply.github.com>
Date: Tue, 30 Aug 2022 09:54:09 +0200
Subject: [PATCH 380/974] Update info.php

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

diff --git a/htdocs/contact/info.php b/htdocs/contact/info.php
index 4cea1cae85b..64688635179 100644
--- a/htdocs/contact/info.php
+++ b/htdocs/contact/info.php
@@ -23,6 +23,8 @@
  *		\brief      Onglet info d'un contact
  */
 
+
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';

From 4cb4f5d411ed798c81cb2bd9b9b4b28ccc3635ce Mon Sep 17 00:00:00 2001
From: UT from dolibit <45215329+dolibit-ut@users.noreply.github.com>
Date: Tue, 30 Aug 2022 09:56:31 +0200
Subject: [PATCH 381/974] Update list.php

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

diff --git a/htdocs/contact/list.php b/htdocs/contact/list.php
index f5810db2b13..d5c0d333d03 100644
--- a/htdocs/contact/list.php
+++ b/htdocs/contact/list.php
@@ -33,6 +33,8 @@
  *		\brief      Page to list all contacts
  */
 
+
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
@@ -44,6 +46,7 @@ $langs->loadLangs(array("companies", "suppliers", "categories"));
 
 $socialnetworks = getArrayOfSocialNetworks();
 
+// Get parameters
 $action = GETPOST('action', 'aZ09');
 $massaction = GETPOST('massaction', 'alpha');
 $show_files = GETPOST('show_files', 'int');

From f4ad2d9aa5f7abb8eaebe0512824b352053877bd Mon Sep 17 00:00:00 2001
From: lmarcouiller <lucas.marcouiller@gmail.com>
Date: Tue, 30 Aug 2022 11:12:07 +0200
Subject: [PATCH 382/974] Fix : SQL error on 16-17 migration

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

diff --git a/htdocs/install/mysql/migration/16.0.0-17.0.0.sql b/htdocs/install/mysql/migration/16.0.0-17.0.0.sql
index 1b0d8a33231..5db36ee955b 100644
--- a/htdocs/install/mysql/migration/16.0.0-17.0.0.sql
+++ b/htdocs/install/mysql/migration/16.0.0-17.0.0.sql
@@ -71,8 +71,8 @@ ALTER TABLE llx_adherent_type ADD COLUMN caneditamount integer DEFAULT 0 AFTER a
 
 ALTER TABLE llx_holiday CHANGE COLUMN date_approve date_approval datetime;
 
-UPDATE llx_holiday SET date_approval = date_valid WHEN statut = 3 AND date_approval IS NULL;
-UPDATE llx_holiday SET fk_user_approve = fk_user_valid WHEN statut = 3 AND fk_user_approve IS NULL;
+UPDATE llx_holiday SET date_approval = date_valid WHERE statut = 3 AND date_approval IS NULL;
+UPDATE llx_holiday SET fk_user_approve = fk_user_valid WHERE statut = 3 AND fk_user_approve IS NULL;
 
 ALTER TABLE llx_inventory ADD COLUMN categories_product VARCHAR(255) DEFAULT NULL AFTER fk_product;
 

From 6e31609b14ec77cb98757bb3831c469bc3d5276c Mon Sep 17 00:00:00 2001
From: lmarcouiller <lucas.marcouiller@gmail.com>
Date: Tue, 30 Aug 2022 11:31:20 +0200
Subject: [PATCH 383/974] Fix #21810 : Broken statistics in project module

---
 htdocs/projet/class/projectstats.class.php | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/htdocs/projet/class/projectstats.class.php b/htdocs/projet/class/projectstats.class.php
index 9b2314deacc..f1295c10424 100644
--- a/htdocs/projet/class/projectstats.class.php
+++ b/htdocs/projet/class/projectstats.class.php
@@ -528,4 +528,22 @@ class ProjectStats extends Stats
 		// var_dump($res);print '<br>';
 		return $res;
 	}
+
+	/**
+	 * Return average of entity by month
+	 * @param	int     $year           year number
+	 * @return 	int						value
+	 */
+	protected function getAverageByMonth($year)
+	{
+		$sql = "SELECT date_format(datef,'%m') as dm, AVG(f.".$this->field.")";
+		$sql .= " FROM ".$this->from;
+		$sql .= $this->join;
+		$sql .= " WHERE f.datef 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');
+
+		return $this->_getAverageByMonth($year, $sql);
+	}
 }

From 2a8474003d23943da9cabc59816e5e7d0c3178dc Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Tue, 30 Aug 2022 11:34:28 +0200
Subject: [PATCH 384/974] update code

---
 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 05f692be526..e2b8ace4783 100644
--- a/htdocs/admin/dict.php
+++ b/htdocs/admin/dict.php
@@ -526,7 +526,7 @@ $tabcond[40] = (isModEnabled("societe") && !empty($conf->global->THIRDPARTY_ENAB
 $tabcond[41] = !empty($conf->intracommreport->enabled);
 $tabcond[42] = isModEnabled("product");
 $tabcond[43] = isModEnabled("product") && !empty($conf->productbatch->enabled) && $conf->global->MAIN_FEATURES_LEVEL >= 2;
-$tabcond[44] = !empty($conf->asset->enabled);
+$tabcond[44] = isModEnabled('asset');
 
 // List of help for fields (no more used, help is defined into tabcomplete)
 $tabhelp = array();

From c0e27f252c40229ec55321bb574a0cbf7bf6733e Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Tue, 30 Aug 2022 11:35:37 +0200
Subject: [PATCH 385/974] update code

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

diff --git a/htdocs/asset/accountancy_codes.php b/htdocs/asset/accountancy_codes.php
index 431b4ba7c68..824f1a75bbb 100644
--- a/htdocs/asset/accountancy_codes.php
+++ b/htdocs/asset/accountancy_codes.php
@@ -58,7 +58,7 @@ $permissiontoadd = $user->rights->asset->write; // Used by the include of action
 if ($user->socid > 0) accessforbidden();
 $isdraft = (($object->status == $object::STATUS_DRAFT) ? 1 : 0);
 restrictedArea($user, $object->element, $object->id, $object->table_element, '', 'fk_soc', 'rowid', $isdraft);
-if (empty($conf->asset->enabled)) accessforbidden();
+if (!isModEnabled('asset')) accessforbidden();
 
 $result = $assetaccountancycodes->fetchAccountancyCodes($object->id);
 if ($result < 0) {

From 8d08f302615afcc0e85849d30dc6e6843cca35da Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Tue, 30 Aug 2022 11:36:05 +0200
Subject: [PATCH 386/974] update code

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

diff --git a/htdocs/asset/agenda.php b/htdocs/asset/agenda.php
index 3d40cf62328..437e51cf0b1 100644
--- a/htdocs/asset/agenda.php
+++ b/htdocs/asset/agenda.php
@@ -86,7 +86,7 @@ $permissiontoadd = $user->rights->asset->write; // Used by the include of action
 if ($user->socid > 0) accessforbidden();
 $isdraft = (($object->status == $object::STATUS_DRAFT) ? 1 : 0);
 restrictedArea($user, $object->element, $object->id, $object->table_element, '', 'fk_soc', 'rowid', $isdraft);
-if (empty($conf->asset->enabled)) accessforbidden();
+if (!isModEnabled('asset')) accessforbidden();
 
 
 /*

From 7563ba8d6edc534c52f26ac8353fc5f485f3097c Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Tue, 30 Aug 2022 11:36:43 +0200
Subject: [PATCH 387/974] update code

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

diff --git a/htdocs/asset/card.php b/htdocs/asset/card.php
index d94ba613d91..c2d768b5405 100644
--- a/htdocs/asset/card.php
+++ b/htdocs/asset/card.php
@@ -80,7 +80,7 @@ if ($user->socid > 0) accessforbidden();
 if ($user->socid > 0) $socid = $user->socid;
 $isdraft = (($object->status == $object::STATUS_DRAFT) ? 1 : 0);
 restrictedArea($user, $object->element, $object->id, $object->table_element, '', 'fk_soc', 'rowid', $isdraft);
-if (empty($conf->asset->enabled)) accessforbidden();
+if (!isModEnabled('asset')) accessforbidden();
 if (!$permissiontoread) accessforbidden();
 
 

From f201e5994e289f3cb2e284bf425a0914d35ecc65 Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Tue, 30 Aug 2022 11:37:09 +0200
Subject: [PATCH 388/974] update code

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

diff --git a/htdocs/asset/depreciation_options.php b/htdocs/asset/depreciation_options.php
index ba5719705dc..23c66d8961b 100644
--- a/htdocs/asset/depreciation_options.php
+++ b/htdocs/asset/depreciation_options.php
@@ -58,7 +58,7 @@ $permissiontoadd = $user->rights->asset->write; // Used by the include of action
 if ($user->socid > 0) accessforbidden();
 $isdraft = (($object->status == $object::STATUS_DRAFT) ? 1 : 0);
 restrictedArea($user, $object->element, $object->id, $object->table_element, '', 'fk_soc', 'rowid', $isdraft);
-if (empty($conf->asset->enabled)) accessforbidden();
+if (!isModEnabled('asset')) accessforbidden();
 if (!empty($object->not_depreciated)) accessforbidden();
 
 $object->asset_depreciation_options = &$assetdepreciationoptions;

From e6e6a7000b1713cebccb4009c3f848d6ec269353 Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Tue, 30 Aug 2022 11:37:39 +0200
Subject: [PATCH 389/974] update code

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

diff --git a/htdocs/asset/depreciation.php b/htdocs/asset/depreciation.php
index 8f3547d81fb..679d750c668 100644
--- a/htdocs/asset/depreciation.php
+++ b/htdocs/asset/depreciation.php
@@ -56,7 +56,7 @@ if ($id > 0 || !empty($ref)) {
 if ($user->socid > 0) accessforbidden();
 $isdraft = (($object->status == $object::STATUS_DRAFT) ? 1 : 0);
 restrictedArea($user, $object->element, $object->id, $object->table_element, '', 'fk_soc', 'rowid', $isdraft);
-if (empty($conf->asset->enabled)) accessforbidden();
+if (!isModEnabled('asset')) accessforbidden();
 if (!empty($object->not_depreciated)) accessforbidden();
 
 $object->asset_depreciation_options = &$assetdepreciationoptions;

From 9414d5cfd5ba1b5ade4ee1f9664e1ce80fa767fb Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Tue, 30 Aug 2022 11:38:21 +0200
Subject: [PATCH 390/974] update code

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

diff --git a/htdocs/asset/disposal.php b/htdocs/asset/disposal.php
index 7fddb92b05f..e06e86c78ac 100644
--- a/htdocs/asset/disposal.php
+++ b/htdocs/asset/disposal.php
@@ -57,7 +57,7 @@ $permissiontoadd = $user->rights->asset->write; // Used by the include of action
 if ($user->socid > 0) accessforbidden();
 $isdraft = (($object->status == $object::STATUS_DRAFT) ? 1 : 0);
 restrictedArea($user, $object->element, $object->id, $object->table_element, '', 'fk_soc', 'rowid', $isdraft);
-if (empty($conf->asset->enabled)) accessforbidden();
+if (!isModEnabled('asset')) accessforbidden();
 if (!isset($object->disposal_date) || $object->disposal_date === "") accessforbidden();
 
 

From 5811fc0cc52a4c04957b450b3cbe8e5574be198a Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Tue, 30 Aug 2022 11:38:48 +0200
Subject: [PATCH 391/974] update code

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

diff --git a/htdocs/asset/document.php b/htdocs/asset/document.php
index 96b222b26c1..9f4439f94d6 100644
--- a/htdocs/asset/document.php
+++ b/htdocs/asset/document.php
@@ -78,7 +78,7 @@ $permissiontoadd = $user->rights->asset->asset->write; // Used by the include of
 if ($user->socid > 0) accessforbidden();
 $isdraft = (($object->status == $object::STATUS_DRAFT) ? 1 : 0);
 restrictedArea($user, $object->element, $object->id, $object->table_element, '', 'fk_soc', 'rowid', $isdraft);
-if (empty($conf->asset->enabled)) accessforbidden();
+if (!isModEnabled('asset')) accessforbidden();
 
 
 /*

From 34a2ffe33423044575aefa7239b7f02e6d16c232 Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Tue, 30 Aug 2022 11:39:24 +0200
Subject: [PATCH 392/974] update code

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

diff --git a/htdocs/asset/list.php b/htdocs/asset/list.php
index c475e22fc83..45f90101adc 100644
--- a/htdocs/asset/list.php
+++ b/htdocs/asset/list.php
@@ -125,7 +125,7 @@ $permissiontoadd = $user->rights->asset->write;
 $permissiontodelete = $user->rights->asset->delete;
 
 // Security check
-if (empty($conf->asset->enabled)) {
+if (!isModEnabled('asset')) {
 	accessforbidden('Module not enabled');
 }
 
@@ -134,7 +134,7 @@ if ($user->socid > 0) accessforbidden();
 $socid = 0; if ($user->socid > 0) $socid = $user->socid;
 $isdraft = (($object->status == $object::STATUS_DRAFT) ? 1 : 0);
 restrictedArea($user, $object->element, $object->id, $object->table_element, '', 'fk_soc', 'rowid', $isdraft);
-if (empty($conf->asset->enabled)) accessforbidden();
+if (!isModEnabled('asset')) accessforbidden();
 if (!$permissiontoread) accessforbidden();
 
 

From 94a31d6d634262764e0d1371be2550acd70fcc0e Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Tue, 30 Aug 2022 11:39:52 +0200
Subject: [PATCH 393/974] update code

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

diff --git a/htdocs/asset/note.php b/htdocs/asset/note.php
index 8de86d49bb7..810ab7f4462 100644
--- a/htdocs/asset/note.php
+++ b/htdocs/asset/note.php
@@ -57,7 +57,7 @@ $permissiontoadd = $user->rights->asset->write; // Used by the include of action
 if ($user->socid > 0) accessforbidden();
 $isdraft = (($object->status == $object::STATUS_DRAFT) ? 1 : 0);
 restrictedArea($user, $object->element, $object->id, $object->table_element, '', 'fk_soc', 'rowid', $isdraft);
-if (empty($conf->asset->enabled)) accessforbidden();
+if (!isModEnabled('asset')) accessforbidden();
 
 
 /*

From 67929038a9c6a2a6b3fe0e948e7a48773c58034a Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Tue, 30 Aug 2022 11:40:26 +0200
Subject: [PATCH 394/974] update code

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

diff --git a/htdocs/asset/model/accountancy_codes.php b/htdocs/asset/model/accountancy_codes.php
index 7582b61177e..6eb6d70abaf 100644
--- a/htdocs/asset/model/accountancy_codes.php
+++ b/htdocs/asset/model/accountancy_codes.php
@@ -59,7 +59,7 @@ $permissiontoadd = ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && $user->rig
 if ($user->socid > 0) accessforbidden();
 $isdraft = (($object->status == $object::STATUS_DRAFT) ? 1 : 0);
 restrictedArea($user, 'asset', $object->id, $object->table_element, '', 'fk_soc', 'rowid', $isdraft);
-if (empty($conf->asset->enabled)) accessforbidden();
+if (!isModEnabled('asset')) accessforbidden();
 if (!$permissiontoread) accessforbidden();
 
 $result = $assetaccountancycodes->fetchAccountancyCodes(0, $object->id);

From 6fd3a0d4cd5e2c0260cf63bc5db69fd553c7bfee Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Tue, 30 Aug 2022 11:40:53 +0200
Subject: [PATCH 395/974] update code

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

diff --git a/htdocs/asset/model/agenda.php b/htdocs/asset/model/agenda.php
index f1db3030dc2..51a7fb515bf 100644
--- a/htdocs/asset/model/agenda.php
+++ b/htdocs/asset/model/agenda.php
@@ -88,7 +88,7 @@ if ($user->socid > 0) accessforbidden();
 if ($user->socid > 0) $socid = $user->socid;
 $isdraft = (($object->status == $object::STATUS_DRAFT) ? 1 : 0);
 restrictedArea($user, 'asset', $object->id, $object->table_element, '', 'fk_soc', 'rowid', $isdraft);
-if (empty($conf->asset->enabled)) accessforbidden();
+if (!isModEnabled('asset')) accessforbidden();
 if (!$permissiontoread) accessforbidden();
 
 

From 52fad955c4faf5159a914ece8868514d2fc69474 Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Tue, 30 Aug 2022 11:41:23 +0200
Subject: [PATCH 396/974] update code

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

diff --git a/htdocs/asset/model/card.php b/htdocs/asset/model/card.php
index 3d3ec2f67d2..756ac32e31f 100644
--- a/htdocs/asset/model/card.php
+++ b/htdocs/asset/model/card.php
@@ -80,7 +80,7 @@ if ($user->socid > 0) accessforbidden();
 if ($user->socid > 0) $socid = $user->socid;
 $isdraft = (($object->status == $object::STATUS_DRAFT) ? 1 : 0);
 restrictedArea($user, 'asset', $object->id, $object->table_element, '', 'fk_soc', 'rowid', $isdraft);
-if (empty($conf->asset->enabled)) accessforbidden();
+if (!isModEnabled('asset')) accessforbidden();
 if (!$permissiontoread) accessforbidden();
 
 

From e4ff238afa983e952fa0c117083a279a5b90be58 Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Tue, 30 Aug 2022 11:41:54 +0200
Subject: [PATCH 397/974] update code

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

diff --git a/htdocs/asset/model/depreciation_options.php b/htdocs/asset/model/depreciation_options.php
index c34bd38dc46..f3f585f5397 100644
--- a/htdocs/asset/model/depreciation_options.php
+++ b/htdocs/asset/model/depreciation_options.php
@@ -59,7 +59,7 @@ $permissiontoadd = ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && $user->rig
 if ($user->socid > 0) accessforbidden();
 $isdraft = (($object->status == $object::STATUS_DRAFT) ? 1 : 0);
 restrictedArea($user, 'asset', $object->id, $object->table_element, '', 'fk_soc', 'rowid', $isdraft);
-if (empty($conf->asset->enabled)) accessforbidden();
+if (!isModEnabled('asset')) accessforbidden();
 if (!$permissiontoread) accessforbidden();
 
 $object->asset_depreciation_options = &$assetdepreciationoptions;

From b082443ad042c4be0cbfa654c48e66cc0ccd79f1 Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Tue, 30 Aug 2022 11:42:36 +0200
Subject: [PATCH 398/974] update code

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

diff --git a/htdocs/asset/model/list.php b/htdocs/asset/model/list.php
index a55d5f49f9a..1d85a982e5d 100644
--- a/htdocs/asset/model/list.php
+++ b/htdocs/asset/model/list.php
@@ -126,7 +126,7 @@ $permissiontoadd = ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && $user->rig
 $permissiontodelete = ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && $user->rights->asset->delete) || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->asset->model_advance->delete)));
 
 // Security check
-if (empty($conf->asset->enabled)) {
+if (!isModEnabled('asset')) {
 	accessforbidden('Module not enabled');
 }
 
@@ -140,7 +140,7 @@ if ($user->socid > 0) {
 }
 $isdraft = (($object->status == $object::STATUS_DRAFT) ? 1 : 0);
 restrictedArea($user, 'asset', $object->id, $object->table_element, '', 'fk_soc', 'rowid', $isdraft);
-if (empty($conf->asset->enabled)) accessforbidden();
+if (!isModEnabled('asset')) accessforbidden();
 if (!$permissiontoread) accessforbidden();
 
 /*

From 6812d5d890816afd8ab117502f3594bd808c89ac Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Tue, 30 Aug 2022 11:43:58 +0200
Subject: [PATCH 399/974] update code

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

diff --git a/htdocs/core/tpl/objectline_create.tpl.php b/htdocs/core/tpl/objectline_create.tpl.php
index cb38d7a3546..54e64ccc769 100644
--- a/htdocs/core/tpl/objectline_create.tpl.php
+++ b/htdocs/core/tpl/objectline_create.tpl.php
@@ -71,7 +71,7 @@ if (!empty($conf->multicurrency->enabled) && $this->multicurrency_code != $conf-
 if (in_array($object->element, array('propal', 'commande', 'order', 'facture', 'facturerec', 'invoice', 'supplier_proposal', 'order_supplier', 'invoice_supplier', 'invoice_supplier_rec'))) {
 	$colspan++; // With this, there is a column move button
 }
-if (!empty($conf->asset->enabled) && $object->element == 'invoice_supplier') {
+if (isModEnabled('asset') && $object->element == 'invoice_supplier') {
 	$colspan++;
 }
 

From 16788846b93bdadd4b1c81e1d4bfaa9549561e4e Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Tue, 30 Aug 2022 11:44:26 +0200
Subject: [PATCH 400/974] update code

---
 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 761be27b512..b2974ffbbfc 100644
--- a/htdocs/core/tpl/objectline_edit.tpl.php
+++ b/htdocs/core/tpl/objectline_edit.tpl.php
@@ -73,7 +73,7 @@ if (in_array($object->element, array('propal', 'supplier_proposal', 'facture', '
 if (!empty($conf->multicurrency->enabled) && $this->multicurrency_code != $conf->currency) {
 	$colspan += 2;
 }
-if (!empty($conf->asset->enabled) && $object->element == 'invoice_supplier') {
+if (isModEnabled('asset') && $object->element == 'invoice_supplier') {
 	$colspan++;
 }
 

From 151ed11388e376a8b7d6535aef9308eebab8beed Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Tue, 30 Aug 2022 11:44:50 +0200
Subject: [PATCH 401/974] update code

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

diff --git a/htdocs/core/tpl/objectline_title.tpl.php b/htdocs/core/tpl/objectline_title.tpl.php
index 762e9b4eefa..79d4ebeae11 100644
--- a/htdocs/core/tpl/objectline_title.tpl.php
+++ b/htdocs/core/tpl/objectline_title.tpl.php
@@ -160,7 +160,7 @@ if ($outputalsopricetotalwithtax) {
 	print '<td class="right" style="width: 80px">'.$langs->trans('TotalTTCShort').'</td>';
 }
 
-if (!empty($conf->asset->enabled) && $object->element == 'invoice_supplier') {
+if (isModEnabled('asset') && $object->element == 'invoice_supplier') {
 	print '<td class="linecolasset"></td>';
 }
 

From 6116478cca2c9e7316f92b24d4538edc83302edd Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Tue, 30 Aug 2022 11:45:15 +0200
Subject: [PATCH 402/974] update code

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

diff --git a/htdocs/core/tpl/objectline_view.tpl.php b/htdocs/core/tpl/objectline_view.tpl.php
index c93e0d5c4cd..b660bd89d93 100644
--- a/htdocs/core/tpl/objectline_view.tpl.php
+++ b/htdocs/core/tpl/objectline_view.tpl.php
@@ -397,7 +397,7 @@ if ($this->statut == 0 && !empty($object_rights->creer) && $action != 'selectlin
 		}
 	}
 
-	if (!empty($conf->asset->enabled) && $object->element == 'invoice_supplier') {
+	if (isModEnabled('asset') && $object->element == 'invoice_supplier') {
 		print '<td class="linecolasset center">';
 		$coldisplay++;
 		if (!empty($product_static->accountancy_code_buy) ||

From c666c2cb89d3ae77f335e9be999a3510840c99fb Mon Sep 17 00:00:00 2001
From: Julien Nicolas <count.msn@gmail.com>
Date: Tue, 30 Aug 2022 12:02:53 +0200
Subject: [PATCH 403/974] Bugfix project stats when user has no project

In case of no project assigned to user, stats were using all projects
---
 htdocs/projet/class/project.class.php | 42 ++++++++++++++-------------
 1 file changed, 22 insertions(+), 20 deletions(-)

diff --git a/htdocs/projet/class/project.class.php b/htdocs/projet/class/project.class.php
index f395173b327..04e32a80c5d 100644
--- a/htdocs/projet/class/project.class.php
+++ b/htdocs/projet/class/project.class.php
@@ -2040,7 +2040,6 @@ class Project extends CommonObject
 		}
 	}
 
-
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 * Load indicators for dashboard (this->nbtodo and this->nbtodolate)
@@ -2056,10 +2055,14 @@ class Project extends CommonObject
 		// For external user, no check is done on company because readability is managed by public status of project and assignement.
 		//$socid=$user->socid;
 
-		$projectsListId = null;
-		if (empty($user->rights->projet->all->lire)) {
-			$projectsListId = $this->getProjectsAuthorizedForUser($user, 0, 1);
-		}
+		$response = new WorkboardResponse();
+		$response->warning_delay = $conf->project->warning_delay / 60 / 60 / 24;
+		$response->label = $langs->trans("OpenedProjects");
+		$response->labelShort = $langs->trans("Opened");
+		$response->url = DOL_URL_ROOT.'/projet/list.php?search_project_user=-1&search_status=1&mainmenu=project';
+		$response->img = img_object('', "projectpub");
+		$response->nbtodo = 0;
+		$response->nbtodolate = 0;
 
 		$sql = "SELECT p.rowid, p.fk_statut as status, p.fk_opp_status, p.datee as datee";
 		$sql .= " FROM (".MAIN_DB_PREFIX."projet as p";
@@ -2069,9 +2072,19 @@ class Project extends CommonObject
 		//if (! $user->rights->societe->client->voir && ! $socid) $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON sc.fk_soc = s.rowid";
 		$sql .= " WHERE p.fk_statut = 1";
 		$sql .= " AND p.entity IN (".getEntity('project').')';
-		if (!empty($projectsListId)) {
+
+
+		$projectsListId = null;
+		if (!$user->rights->projet->all->lire) {
+			$response->url = DOL_URL_ROOT.'/projet/list.php?search_status=1&mainmenu=project';
+			$projectsListId = $this->getProjectsAuthorizedForUser($user, 0, 1);
+			if (empty($projectsListId)) {
+				return $response;
+			}
+
 			$sql .= " AND p.rowid IN (".$this->db->sanitize($projectsListId).")";
 		}
+
 		// No need to check company, as filtering of projects must be done by getProjectsAuthorizedForUser
 		//if ($socid || ! $user->rights->societe->client->voir)	$sql.= "  AND (p.fk_soc IS NULL OR p.fk_soc = 0 OR p.fk_soc = ".((int) $socid).")";
 		// For external user, no check is done on company permission because readability is managed by public status of project and assignement.
@@ -2082,16 +2095,6 @@ class Project extends CommonObject
 		if ($resql) {
 			$project_static = new Project($this->db);
 
-			$response = new WorkboardResponse();
-			$response->warning_delay = $conf->project->warning_delay / 60 / 60 / 24;
-			$response->label = $langs->trans("OpenedProjects");
-			$response->labelShort = $langs->trans("Opened");
-			if ($user->rights->projet->all->lire) {
-				$response->url = DOL_URL_ROOT.'/projet/list.php?search_status=1&mainmenu=project';
-			} else {
-				$response->url = DOL_URL_ROOT.'/projet/list.php?search_project_user=-1&search_status=1&mainmenu=project';
-			}
-			$response->img = img_object('', "projectpub");
 
 			// This assignment in condition is not a bug. It allows walking the results.
 			while ($obj = $this->db->fetch_object($resql)) {
@@ -2107,12 +2110,11 @@ class Project extends CommonObject
 			}
 
 			return $response;
-		} else {
-			$this->error = $this->db->error();
-			return -1;
 		}
-	}
 
+		$this->error = $this->db->error();
+		return -1;
+	}
 
 	/**
 	 * Function used to replace a thirdparty id with another one.

From 96f16d05645f6533f4a3d4429d0a1c59c7b90c60 Mon Sep 17 00:00:00 2001
From: Faustin <faustin.boitel@bordeaux-inp.fr>
Date: Tue, 30 Aug 2022 13:53:19 +0200
Subject: [PATCH 404/974] Refresh button

---
 htdocs/admin/emailcollector_card.php | 182 +++++++++++++++++++++------
 1 file changed, 143 insertions(+), 39 deletions(-)

diff --git a/htdocs/admin/emailcollector_card.php b/htdocs/admin/emailcollector_card.php
index e41777da9d9..919ae21f2d4 100644
--- a/htdocs/admin/emailcollector_card.php
+++ b/htdocs/admin/emailcollector_card.php
@@ -34,6 +34,16 @@ include_once DOL_DOCUMENT_ROOT.'/emailcollector/class/emailcollectorfilter.class
 include_once DOL_DOCUMENT_ROOT.'/emailcollector/class/emailcollectoraction.class.php';
 include_once DOL_DOCUMENT_ROOT.'/emailcollector/lib/emailcollector.lib.php';
 
+// use Webklex\PHPIMAP;
+require DOL_DOCUMENT_ROOT.'/includes/webklex/php-imap/vendor/autoload.php';
+use Webklex\PHPIMAP\ClientManager;
+use Webklex\PHPIMAP\Exceptions\ConnectionFailedException;
+use Webklex\PHPIMAP\Exceptions\InvalidWhereQueryCriteriaException;
+
+
+use OAuth\Common\Storage\DoliStorage;
+use OAuth\Common\Consumer\Credentials;
+
 if (!$user->admin) {
 	accessforbidden();
 }
@@ -377,50 +387,144 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 		$connectstringserver = $object->getConnectStringIMAP($usessl);
 
 		if ($action == 'scan') {
-			try {
-				if ($sourcedir) {
-					//$connectstringsource = $connectstringserver.imap_utf7_encode($sourcedir);
-					$connectstringsource = $connectstringserver.$object->getEncodedUtf7($sourcedir);
+			if (!empty($conf->global->MAIN_IMAP_USE_PHPIMAP)) {
+				if ($object->acces_type == 1) {
+					// Mode OAUth2 with PHP-IMAP
+					require_once DOL_DOCUMENT_ROOT.'/core/lib/oauth.lib.php'; // define $supportedoauth2array
+					$keyforsupportedoauth2array = $object->oauth_service;
+					if (preg_match('/^.*-/', $keyforsupportedoauth2array)) {
+						$keyforprovider = preg_replace('/^.*-/', '', $keyforsupportedoauth2array);
+					} else {
+						$keyforprovider = '';
+					}
+					$keyforsupportedoauth2array = preg_replace('/-.*$/', '', $keyforsupportedoauth2array);
+					$keyforsupportedoauth2array = 'OAUTH_'.$keyforsupportedoauth2array.'_NAME';
+
+					$OAUTH_SERVICENAME = (empty($supportedoauth2array[$keyforsupportedoauth2array]['name']) ? 'Unknown' : $supportedoauth2array[$keyforsupportedoauth2array]['name'].($keyforprovider ? '-'.$keyforprovider : ''));
+
+					require_once DOL_DOCUMENT_ROOT.'/includes/OAuth/bootstrap.php';
+					//$debugtext = "Host: ".$this->host."<br>Port: ".$this->port."<br>Login: ".$this->login."<br>Password: ".$this->password."<br>access type: ".$this->acces_type."<br>oauth service: ".$this->oauth_service."<br>Max email per collect: ".$this->maxemailpercollect;
+					//dol_syslog($debugtext);
+
+					$storage = new DoliStorage($db, $conf);
+
+					try {
+						$tokenobj = $storage->retrieveAccessToken($OAUTH_SERVICENAME);
+						$expire = true;
+						// Is token expired or will token expire in the next 30 seconds
+						// if (is_object($tokenobj)) {
+						// 	$expire = ($tokenobj->getEndOfLife() !== -9002 && $tokenobj->getEndOfLife() !== -9001 && time() > ($tokenobj->getEndOfLife() - 30));
+						// }
+						// Token expired so we refresh it
+						if (is_object($tokenobj) && $expire) {
+							$credentials = new Credentials(
+								getDolGlobalString('OAUTH_'.$object->oauth_service.'_ID'),
+								getDolGlobalString('OAUTH_'.$object->oauth_service.'_SECRET'),
+								getDolGlobalString('OAUTH_'.$object->oauth_service.'_URLAUTHORIZE')
+							);
+							$serviceFactory = new \OAuth\ServiceFactory();
+							$oauthname = explode('-', $OAUTH_SERVICENAME);
+							// ex service is Google-Emails we need only the first part Google
+							$apiService = $serviceFactory->createService($oauthname[0], $credentials, $storage, array());
+							// We have to save the token because Google give it only once
+							$refreshtoken = $tokenobj->getRefreshToken();
+							$tokenobj = $apiService->refreshAccessToken($tokenobj);
+							$tokenobj->setRefreshToken($refreshtoken);
+							$storage->storeAccessToken($OAUTH_SERVICENAME, $tokenobj);
+						}
+						$tokenobj = $storage->retrieveAccessToken($OAUTH_SERVICENAME);
+						if (is_object($tokenobj)) {
+							$token = $tokenobj->getAccessToken();
+						} else {
+							$object->error = "Token not found";
+							return -1;
+						}
+					} catch (Exception $e) {
+						print $e->getMessage();
+					}
+
+					$cm = new ClientManager();
+					$client = $cm->make([
+						'host'           => $object->host,
+						'port'           => $object->port,
+						'encryption'     => 'ssl',
+						'validate_cert'  => true,
+						'protocol'       => 'imap',
+						'username'       => $object->login,
+						'password'       => $token,
+						'authentication' => "oauth",
+					]);
+				} else {
+					// Mode login/pass with PHP-IMAP
+					$cm = new ClientManager();
+					$client = $cm->make([
+						'host'           => $object->host,
+						'port'           => $object->port,
+						'encryption'     => 'ssl',
+						'validate_cert'  => true,
+						'protocol'       => 'imap',
+						'username'       => $object->login,
+						'password'       => $object->password,
+						'authentication' => "login",
+					]);
 				}
-				if ($targetdir) {
-					//$connectstringtarget = $connectstringserver.imap_utf7_encode($targetdir);
-					$connectstringtarget = $connectstringserver.$object->getEncodedUtf7($targetdir);
+				try {
+					$client->connect();
+				} catch (ConnectionFailedException $e) {
+					print $e->getMessage();
 				}
 
-				$timeoutconnect = empty($conf->global->MAIN_USE_CONNECT_TIMEOUT) ? 5 : $conf->global->MAIN_USE_CONNECT_TIMEOUT;
-				$timeoutread = empty($conf->global->MAIN_USE_RESPONSE_TIMEOUT) ? 20 : $conf->global->MAIN_USE_RESPONSE_TIMEOUT;
-
-				dol_syslog("imap_open connectstring=".$connectstringsource." login=".$object->login." password=".$object->password." timeoutconnect=".$timeoutconnect." timeoutread=".$timeoutread);
-
-				$result1 = imap_timeout(IMAP_OPENTIMEOUT, $timeoutconnect);	// timeout seems ignored with ssl connect
-				$result2 = imap_timeout(IMAP_READTIMEOUT, $timeoutread);
-				$result3 = imap_timeout(IMAP_WRITETIMEOUT, 5);
-				$result4 = imap_timeout(IMAP_CLOSETIMEOUT, 5);
-
-				dol_syslog("result1=".$result1." result2=".$result2." result3=".$result3." result4=".$result4);
-
-				$connection = imap_open($connectstringsource, $object->login, $object->password);
-
-				//dol_syslog("end imap_open connection=".var_export($connection, true));
-			} catch (Exception $e) {
-				print $e->getMessage();
-			}
-
-			if (!$connection) {
-				$morehtml .= 'Failed to open IMAP connection '.$connectstringsource;
-				if (function_exists('imap_last_error')) {
-					$morehtml .= '<br>'.imap_last_error();
-				}
-				dol_syslog("Error ".$morehtml, LOG_WARNING);
-				//var_dump(imap_errors())
+				$f = $client->getFolders(false, $object->source_directory);
+				$nbemail = $f[0]->examine()["exists"];
+				print "mails:".$nbemail;
+				$morehtml .= $nbemail;
+				print "helo";
 			} else {
-				dol_syslog("Imap connected. Now we call imap_num_msg()");
-				$morehtml .= imap_num_msg($connection);
-			}
+				try {
+					if ($sourcedir) {
+						//$connectstringsource = $connectstringserver.imap_utf7_encode($sourcedir);
+						$connectstringsource = $connectstringserver.$object->getEncodedUtf7($sourcedir);
+					}
+					if ($targetdir) {
+						//$connectstringtarget = $connectstringserver.imap_utf7_encode($targetdir);
+						$connectstringtarget = $connectstringserver.$object->getEncodedUtf7($targetdir);
+					}
 
-			if ($connection) {
-				dol_syslog("Imap close");
-				imap_close($connection);
+					$timeoutconnect = empty($conf->global->MAIN_USE_CONNECT_TIMEOUT) ? 5 : $conf->global->MAIN_USE_CONNECT_TIMEOUT;
+					$timeoutread = empty($conf->global->MAIN_USE_RESPONSE_TIMEOUT) ? 20 : $conf->global->MAIN_USE_RESPONSE_TIMEOUT;
+
+					dol_syslog("imap_open connectstring=".$connectstringsource." login=".$object->login." password=".$object->password." timeoutconnect=".$timeoutconnect." timeoutread=".$timeoutread);
+
+					$result1 = imap_timeout(IMAP_OPENTIMEOUT, $timeoutconnect);	// timeout seems ignored with ssl connect
+					$result2 = imap_timeout(IMAP_READTIMEOUT, $timeoutread);
+					$result3 = imap_timeout(IMAP_WRITETIMEOUT, 5);
+					$result4 = imap_timeout(IMAP_CLOSETIMEOUT, 5);
+
+					dol_syslog("result1=".$result1." result2=".$result2." result3=".$result3." result4=".$result4);
+
+					$connection = imap_open($connectstringsource, $object->login, $object->password);
+
+					//dol_syslog("end imap_open connection=".var_export($connection, true));
+				} catch (Exception $e) {
+					print $e->getMessage();
+				}
+
+				if (!$connection) {
+					$morehtml .= 'Failed to open IMAP connection '.$connectstringsource;
+					if (function_exists('imap_last_error')) {
+						$morehtml .= '<br>'.imap_last_error();
+					}
+					dol_syslog("Error ".$morehtml, LOG_WARNING);
+					//var_dump(imap_errors())
+				} else {
+					dol_syslog("Imap connected. Now we call imap_num_msg()");
+					$morehtml .= imap_num_msg($connection);
+				}
+
+				if ($connection) {
+					dol_syslog("Imap close");
+					imap_close($connection);
+				}
 			}
 		} else {
 			$morehtml .= '<a class="flat" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=scan&token='.newToken().'">'.img_picto('', 'refresh', 'class="paddingrightonly"').$langs->trans("Refresh").'</a>';

From b66ac591637780596be0e8cf4572a4fb6f776bc8 Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Tue, 30 Aug 2022 16:29:22 +0200
Subject: [PATCH 405/974] PHP8 Warnings

---
 htdocs/takepos/admin/terminal.php | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/htdocs/takepos/admin/terminal.php b/htdocs/takepos/admin/terminal.php
index 122e8894095..4645f5d9cf2 100644
--- a/htdocs/takepos/admin/terminal.php
+++ b/htdocs/takepos/admin/terminal.php
@@ -239,11 +239,11 @@ if (isModEnabled('stock')) {
 	}
 }
 
-if ($conf->global->TAKEPOS_PRINT_METHOD == "receiptprinter" || $conf->global->TAKEPOS_PRINT_METHOD == "takeposconnector") {
+if (getDolGlobalString('TAKEPOS_PRINT_METHOD') == "receiptprinter" || getDolGlobalString('TAKEPOS_PRINT_METHOD') == "takeposconnector") {
 	// Select printer to use with terminal
 	require_once DOL_DOCUMENT_ROOT.'/core/class/dolreceiptprinter.class.php';
 	$printer = new dolReceiptPrinter($db);
-	if ($conf->global->TAKEPOS_PRINT_METHOD == "receiptprinter") {
+	if (getDolGlobalString('TAKEPOS_PRINT_METHOD') == "receiptprinter") {
 		$printer->listprinters();
 		$printers = array();
 		foreach ($printer->listprinters as $key => $value) {
@@ -251,20 +251,20 @@ if ($conf->global->TAKEPOS_PRINT_METHOD == "receiptprinter" || $conf->global->TA
 		}
 		print '<tr class="oddeven"><td>'.$langs->trans("MainPrinterToUse").'</td>';
 		print '<td>';
-		print $form->selectarray('TAKEPOS_PRINTER_TO_USE'.$terminal, $printers, (empty($conf->global->{'TAKEPOS_PRINTER_TO_USE'.$terminal}) ? '0' : $conf->global->{'TAKEPOS_PRINTER_TO_USE'.$terminal}), 1);
+		print $form->selectarray('TAKEPOS_PRINTER_TO_USE'.$terminal, $printers, getDolGlobalInt('TAKEPOS_PRINTER_TO_USE'.$terminal), 1);
 		print '</td></tr>';
-		if ($conf->global->TAKEPOS_ORDER_PRINTERS) {
+		if (getDolGlobalInt('TAKEPOS_ORDER_PRINTERS')) {
 			print '<tr class="oddeven"><td>'.$langs->trans("OrderPrinterToUse").' - '.$langs->trans("Printer").' 1</td>';
 			print '<td>';
-			print $form->selectarray('TAKEPOS_ORDER_PRINTER1_TO_USE'.$terminal, $printers, (empty($conf->global->{'TAKEPOS_ORDER_PRINTER1_TO_USE'.$terminal}) ? '0' : $conf->global->{'TAKEPOS_ORDER_PRINTER1_TO_USE'.$terminal}), 1);
+			print $form->selectarray('TAKEPOS_ORDER_PRINTER1_TO_USE'.$terminal, $printers, getDolGlobalInt('TAKEPOS_ORDER_PRINTER1_TO_USE'.$terminal), 1);
 			print '</td></tr>';
 			print '<tr class="oddeven"><td>'.$langs->trans("OrderPrinterToUse").' - '.$langs->trans("Printer").' 2</td>';
 			print '<td>';
-			print $form->selectarray('TAKEPOS_ORDER_PRINTER2_TO_USE'.$terminal, $printers, (empty($conf->global->{'TAKEPOS_ORDER_PRINTER2_TO_USE'.$terminal}) ? '0' : $conf->global->{'TAKEPOS_ORDER_PRINTER2_TO_USE'.$terminal}), 1);
+			print $form->selectarray('TAKEPOS_ORDER_PRINTER2_TO_USE'.$terminal, $printers, getDolGlobalInt('TAKEPOS_ORDER_PRINTER2_TO_USE'.$terminal), 1);
 			print '</td></tr>';
 			print '<tr class="oddeven"><td>'.$langs->trans("OrderPrinterToUse").' - '.$langs->trans("Printer").' 3</td>';
 			print '<td>';
-			print $form->selectarray('TAKEPOS_ORDER_PRINTER3_TO_USE'.$terminal, $printers, (empty($conf->global->{'TAKEPOS_ORDER_PRINTER3_TO_USE'.$terminal}) ? '0' : $conf->global->{'TAKEPOS_ORDER_PRINTER3_TO_USE'.$terminal}), 1);
+			print $form->selectarray('TAKEPOS_ORDER_PRINTER3_TO_USE'.$terminal, $printers, getDolGlobalInt('TAKEPOS_ORDER_PRINTER3_TO_USE'.$terminal), 1);
 			print '</td></tr>';
 		}
 	}
@@ -275,12 +275,12 @@ if ($conf->global->TAKEPOS_PRINT_METHOD == "receiptprinter" || $conf->global->TA
 	}
 	print '<tr class="oddeven"><td>'.$langs->trans("MainTemplateToUse").' (<a href="'.DOL_URL_ROOT.'/admin/receiptprinter.php?mode=template">'.$langs->trans("SetupReceiptTemplate").'</a>)</td>';
 	print '<td>';
-	print $form->selectarray('TAKEPOS_TEMPLATE_TO_USE_FOR_INVOICES'.$terminal, $templates, (empty($conf->global->{'TAKEPOS_TEMPLATE_TO_USE_FOR_INVOICES'.$terminal}) ? '0' : $conf->global->{'TAKEPOS_TEMPLATE_TO_USE_FOR_INVOICES'.$terminal}), 1);
+	print $form->selectarray('TAKEPOS_TEMPLATE_TO_USE_FOR_INVOICES'.$terminal, $templates, getDolGlobalInt('TAKEPOS_TEMPLATE_TO_USE_FOR_INVOICES'.$terminal), 1);
 	print '</td></tr>';
-	if ($conf->global->TAKEPOS_ORDER_PRINTERS) {
+	if (getDolGlobalInt('TAKEPOS_ORDER_PRINTERS')) {
 		print '<tr class="oddeven"><td>'.$langs->trans("OrderTemplateToUse").'</td>';
 		print '<td>';
-		print $form->selectarray('TAKEPOS_TEMPLATE_TO_USE_FOR_ORDERS'.$terminal, $templates, (empty($conf->global->{'TAKEPOS_TEMPLATE_TO_USE_FOR_ORDERS'.$terminal}) ? '0' : $conf->global->{'TAKEPOS_TEMPLATE_TO_USE_FOR_ORDERS'.$terminal}), 1);
+		print $form->selectarray('TAKEPOS_TEMPLATE_TO_USE_FOR_ORDERS'.$terminal, $templates, getDolGlobalInt('TAKEPOS_TEMPLATE_TO_USE_FOR_ORDERS'.$terminal), 1);
 		print '</td></tr>';
 	}
 }
@@ -376,7 +376,7 @@ print $form->textwithpicto($langs->trans('Header'), $htmltext, 1, 'help', '', 0,
 print '</td>';
 print '<td>';
 $variablename = 'TAKEPOS_HEADER'.$terminaltouse;
-if (empty($conf->global->PDF_ALLOW_HTML_FOR_FREE_TEXT)) {
+if (!getDolGlobalInt('PDF_ALLOW_HTML_FOR_FREE_TEXT')) {
 	print '<textarea name="'.$variablename.'" class="flat" cols="120">'.$conf->global->{$variablename}.'</textarea>';
 } else {
 	include_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
@@ -392,7 +392,7 @@ print $form->textwithpicto($langs->trans('Footer'), $htmltext, 1, 'help', '', 0,
 print '</td>';
 print '<td>';
 $variablename = 'TAKEPOS_FOOTER'.$terminaltouse;
-if (empty($conf->global->PDF_ALLOW_HTML_FOR_FREE_TEXT)) {
+if (!getDolGlobalInt('PDF_ALLOW_HTML_FOR_FREE_TEXT')) {
 	print '<textarea name="'.$variablename.'" class="flat" cols="120">'.$conf->global->{$variablename}.'</textarea>';
 } else {
 	include_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';

From 149fa48573b06f5fcbc69cba2e8029a8ccf7ac74 Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Tue, 30 Aug 2022 16:29:27 +0200
Subject: [PATCH 406/974] PHP8 Warnings

---
 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 16ac171b2ef..4ee3d1cbe2a 100644
--- a/htdocs/takepos/index.php
+++ b/htdocs/takepos/index.php
@@ -58,7 +58,7 @@ $setterminal = GETPOST('setterminal', 'int');
 $setcurrency = GETPOST('setcurrency', 'aZ09');
 
 if (empty($_SESSION["takeposterminal"])) {
-	if ($conf->global->TAKEPOS_NUM_TERMINALS == "1") {
+	if (getDolGlobalInt('TAKEPOS_NUM_TERMINALS') == "1") {
 		$_SESSION["takeposterminal"] = 1; // Use terminal 1 if there is only 1 terminal
 	} elseif (!empty($_COOKIE["takeposterminal"])) {
 		$_SESSION["takeposterminal"] = preg_replace('/[^a-zA-Z0-9_\-]/', '', $_COOKIE["takeposterminal"]); // Restore takeposterminal from previous session

From ebc9581ddefc8c67ae25209cd9b10a83b38e0069 Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Tue, 30 Aug 2022 16:37:29 +0200
Subject: [PATCH 407/974] CSS

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

diff --git a/htdocs/salaries/card.php b/htdocs/salaries/card.php
index 757027253d4..635ce443683 100644
--- a/htdocs/salaries/card.php
+++ b/htdocs/salaries/card.php
@@ -992,7 +992,7 @@ if ($id) {
 						print $bankaccountstatic->getNomUrl(1, 'transactions');
 					print '</td>';
 				}
-				print '<td class="right">'.price($objp->amount)."</td>\n";
+				print '<td class="right nowrap amountcard">'.price($objp->amount)."</td>\n";
 				print "</tr>";
 				$totalpaid += $objp->amount;
 				$i++;
@@ -1003,14 +1003,14 @@ if ($id) {
 			print '</tr>';
 		}
 
-		print '<tr><td colspan="'.$nbcols.'" class="right">'.$langs->trans("AlreadyPaid")." :</td><td class=\"right\">".price($totalpaid)."</td></tr>\n";
-		print '<tr><td colspan="'.$nbcols.'" class="right">'.$langs->trans("AmountExpected")." :</td><td class=\"right\">".price($object->amount)."</td></tr>\n";
+		print '<tr><td colspan="'.$nbcols.'" class="right">'.$langs->trans("AlreadyPaid")." :</td><td class=\"right nowrap amountcard\">".price($totalpaid)."</td></tr>\n";
+		print '<tr><td colspan="'.$nbcols.'" class="right">'.$langs->trans("AmountExpected")." :</td><td class=\"right nowrap amountcard\">".price($object->amount)."</td></tr>\n";
 
 		$resteapayer = $object->amount - $totalpaid;
 		$cssforamountpaymentcomplete = 'amountpaymentcomplete';
 
 		print '<tr><td colspan="'.$nbcols.'" class="right">'.$langs->trans("RemainderToPay")." :</td>";
-		print '<td class="right'.($resteapayer ? ' amountremaintopay' : (' '.$cssforamountpaymentcomplete)).'">'.price($resteapayer)."</td></tr>\n";
+		print '<td class="right nowrap'.($resteapayer ? ' amountremaintopay' : (' '.$cssforamountpaymentcomplete)).'">'.price($resteapayer)."</td></tr>\n";
 
 		print "</table>";
 		print '</div>';

From 7db656a9ba4cd685debdf3d3b534bb84d93590c4 Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Tue, 30 Aug 2022 17:01:31 +0200
Subject: [PATCH 408/974] PHP8 Warnings

---
 htdocs/product/fournisseurs.php | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/htdocs/product/fournisseurs.php b/htdocs/product/fournisseurs.php
index 28e587b3576..9e872dcfb8a 100644
--- a/htdocs/product/fournisseurs.php
+++ b/htdocs/product/fournisseurs.php
@@ -521,7 +521,7 @@ if ($id > 0 || $ref) {
 				print '</tr>';
 
 				// Availability
-				if (!empty($conf->global->FOURN_PRODUCT_AVAILABILITY)) {
+				if (getDolGlobalInt('FOURN_PRODUCT_AVAILABILITY')) {
 					$langs->load("propal");
 					print '<tr><td>'.$langs->trans("Availability").'</td><td>';
 					$form->selectAvailabilityDelay($object->fk_availability, "oselDispo", 1);
@@ -907,16 +907,16 @@ END;
 				$arrayfields = array(
 					'pfp.datec'=>array('label'=>$langs->trans("AppliedPricesFrom"), 'checked'=>1, 'position'=>1),
 					's.nom'=>array('label'=>$langs->trans("Suppliers"), 'checked'=>1, 'position'=>2),
-					'pfp.fk_availability'=>array('label'=>$langs->trans("Availability"), 'enabled' => !empty($conf->global->FOURN_PRODUCT_AVAILABILITY), 'checked'=>0, 'position'=>4),
+					'pfp.fk_availability'=>array('label'=>$langs->trans("Availability"), 'enabled' => getDolGlobalInt('FOURN_PRODUCT_AVAILABILITY'), 'checked'=>0, 'position'=>4),
 					'pfp.quantity'=>array('label'=>$langs->trans("QtyMin"), 'checked'=>1, 'position'=>5),
 					'pfp.unitprice'=>array('label'=>$langs->trans("UnitPriceHT"), 'checked'=>1, 'position'=>9),
-					'pfp.multicurrency_unitprice'=>array('label'=>$langs->trans("UnitPriceHTCurrency"), 'enabled' => (!empty($conf->multicurrency->enabled)), 'checked'=>0, 'position'=>10),
+					'pfp.multicurrency_unitprice'=>array('label'=>$langs->trans("UnitPriceHTCurrency"), 'enabled' => isModEnabled('multicurrency'), 'checked'=>0, 'position'=>10),
 					'pfp.delivery_time_days'=>array('label'=>$langs->trans("NbDaysToDelivery"), 'checked'=>1, 'position'=>13),
 					'pfp.supplier_reputation'=>array('label'=>$langs->trans("ReputationForThisProduct"), 'checked'=>1, 'position'=>14),
-					'pfp.fk_barcode_type'=>array('label'=>$langs->trans("BarcodeType"), 'enabled' => $conf->barcode->enabled, 'checked'=>0, 'position'=>15),
-					'pfp.barcode'=>array('label'=>$langs->trans("BarcodeValue"), 'enabled' => $conf->barcode->enabled, 'checked'=>0, 'position'=>16),
-					'pfp.packaging'=>array('label'=>$langs->trans("PackagingForThisProduct"), 'enabled' => !empty($conf->global->PRODUCT_USE_SUPPLIER_PACKAGING), 'checked'=>0, 'position'=>17),
-					'pfp.tms'=>array('label'=>$langs->trans("DateModification"), 'enabled' => $conf->barcode->enabled, 'checked'=>1, 'position'=>18),
+					'pfp.fk_barcode_type'=>array('label'=>$langs->trans("BarcodeType"), 'enabled' => isModEnabled('barcode'), 'checked'=>0, 'position'=>15),
+					'pfp.barcode'=>array('label'=>$langs->trans("BarcodeValue"), 'enabled' => isModEnabled('barcode'), 'checked'=>0, 'position'=>16),
+					'pfp.packaging'=>array('label'=>$langs->trans("PackagingForThisProduct"), 'enabled' => getDolGlobalInt('PRODUCT_USE_SUPPLIER_PACKAGING'), 'checked'=>0, 'position'=>17),
+					'pfp.tms'=>array('label'=>$langs->trans("DateModification"), 'enabled' => isModEnabled('barcode'), 'checked'=>1, 'position'=>18),
 				);
 
 				// fetch optionals attributes and labels

From 425405a9b2f49915df7cf2cdb06fabcc23973c3c Mon Sep 17 00:00:00 2001
From: Thomas Negre <tnegre@open-dsi.fr>
Date: Tue, 30 Aug 2022 17:01:20 +0200
Subject: [PATCH 409/974] Product supplier price: autofill default supplier VAT

---
 htdocs/product/fournisseurs.php | 37 +++++++++++++++++++++++++++++++++
 1 file changed, 37 insertions(+)

diff --git a/htdocs/product/fournisseurs.php b/htdocs/product/fournisseurs.php
index c5b8004efa8..237c69ca377 100644
--- a/htdocs/product/fournisseurs.php
+++ b/htdocs/product/fournisseurs.php
@@ -506,6 +506,43 @@ if ($id > 0 || $ref) {
 							print '</a>';
 						}
 					}
+					print '<script type="text/javascript">
+					$(document).ready(function () {
+						$("#search_id_fourn").change(load_vat)
+						console.log("Requesting default VAT rate for the supplier...")
+					});
+					function load_vat() {
+						// get soc id
+						let socid = $("#id_fourn")[0].value
+	
+						// load available VAT rates
+						let vat_url = "'.dol_buildpath('/core/ajax/vatrates.php', 1).'"
+						//Make GET request with params 
+						let options = "";
+						options += "id=" + socid
+						options += "&htmlname=tva_tx"
+						options += "&action=default" // not defined in vatrates.php, default behavior.
+	
+						var get = $.getJSON(
+							vat_url,
+							options,
+							(data) => {
+								rate_options = $.parseHTML(data.value)
+								rate_options.forEach(opt => {
+									if (opt.selected) {
+										replaceVATWithSupplierValue(opt.value)
+										return
+									}
+								})
+							}
+						);
+	
+					}
+					function replaceVATWithSupplierValue(vat_rate) {
+						console.log("Default VAT rate for the supplier: " + vat_rate + "%")
+						$("[name=\'tva_tx\']")[0].value = vat_rate;
+					}
+				</script>';
 				}
 				print '</td></tr>';
 

From 0f4c59689d607d6b3d9b35ff33383b6afb4fbf16 Mon Sep 17 00:00:00 2001
From: ptibogxiv <support@ptibogxiv.net>
Date: Tue, 30 Aug 2022 17:26:18 +0200
Subject: [PATCH 410/974] Fix updating member

need functions2.lib.php for clean_url()
---
 htdocs/adherents/class/adherent.class.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/htdocs/adherents/class/adherent.class.php b/htdocs/adherents/class/adherent.class.php
index 1f01f608fb0..0d7f6365fa4 100644
--- a/htdocs/adherents/class/adherent.class.php
+++ b/htdocs/adherents/class/adherent.class.php
@@ -655,6 +655,8 @@ class Adherent extends CommonObject
 	public function update($user, $notrigger = 0, $nosyncuser = 0, $nosyncuserpass = 0, $nosyncthirdparty = 0, $action = 'update')
 	{
 		global $conf, $langs, $hookmanager;
+		
+		require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 
 		$nbrowsaffected = 0;
 		$error = 0;

From a7529c171dd3083b45188f28cddc5763f8301fd4 Mon Sep 17 00:00:00 2001
From: stickler-ci <support@stickler-ci.com>
Date: Tue, 30 Aug 2022 15:33:18 +0000
Subject: [PATCH 411/974] Fixing style errors.

---
 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 0d7f6365fa4..f5784b43fb2 100644
--- a/htdocs/adherents/class/adherent.class.php
+++ b/htdocs/adherents/class/adherent.class.php
@@ -655,7 +655,7 @@ class Adherent extends CommonObject
 	public function update($user, $notrigger = 0, $nosyncuser = 0, $nosyncuserpass = 0, $nosyncthirdparty = 0, $action = 'update')
 	{
 		global $conf, $langs, $hookmanager;
-		
+
 		require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 
 		$nbrowsaffected = 0;

From 52b912aa51d79270504c8510868c019e9a3a9b36 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 29 Aug 2022 19:56:57 +0200
Subject: [PATCH 412/974] Clean code

---
 htdocs/accountancy/bookkeeping/card.php |  6 ++--
 htdocs/admin/menus/edit.php             | 23 -------------
 htdocs/core/class/utils.class.php       |  2 +-
 htdocs/core/tpl/card_presend.tpl.php    | 44 ++++++++++++++++++-------
 4 files changed, 37 insertions(+), 38 deletions(-)

diff --git a/htdocs/accountancy/bookkeeping/card.php b/htdocs/accountancy/bookkeeping/card.php
index c2071e76cea..47c2746bf4f 100644
--- a/htdocs/accountancy/bookkeeping/card.php
+++ b/htdocs/accountancy/bookkeeping/card.php
@@ -332,7 +332,9 @@ if ($action == 'valid') {
 $html = new Form($db);
 $formaccounting = new FormAccounting($db);
 
-llxHeader('', $langs->trans("CreateMvts"));
+$title = $langs->trans("CreateMvts");
+
+llxHeader('', $title);
 
 // Confirmation to delete the command
 if ($action == 'delete') {
@@ -341,7 +343,7 @@ if ($action == 'delete') {
 }
 
 if ($action == 'create') {
-	print load_fiche_titre($langs->trans("CreateMvts"));
+	print load_fiche_titre($title);
 
 	$object = new BookKeeping($db);
 	$next_num_mvt = $object->getNextNumMvt('_tmp');
diff --git a/htdocs/admin/menus/edit.php b/htdocs/admin/menus/edit.php
index 9378fc28bbe..471b34866a7 100644
--- a/htdocs/admin/menus/edit.php
+++ b/htdocs/admin/menus/edit.php
@@ -219,29 +219,6 @@ if ($action == 'add') {
 	}
 }
 
-// delete
-if ($action == 'confirm_delete' && $confirm == 'yes') {
-	$db->begin();
-
-	$sql = "DELETE FROM ".MAIN_DB_PREFIX."menu WHERE rowid = ".GETPOST('menuId', 'int');
-	$result = $db->query($sql);
-
-	if ($result == 0) {
-		$db->commit();
-
-		llxHeader();
-		setEventMessages($langs->trans("MenuDeleted"), null, 'mesgs');
-		llxFooter();
-		exit;
-	} else {
-		$db->rollback();
-
-		$reload = 0;
-		$_GET["action"] = '';
-		$action = '';
-	}
-}
-
 
 
 /*
diff --git a/htdocs/core/class/utils.class.php b/htdocs/core/class/utils.class.php
index a60c3fdd8f5..8805f7376c2 100644
--- a/htdocs/core/class/utils.class.php
+++ b/htdocs/core/class/utils.class.php
@@ -652,7 +652,7 @@ class Utils
 	 * @param 	string	$outputfile			A path for an output file (used only when method is 2). For example: $conf->admin->dir_temp.'/out.tmp';
 	 * @param	int		$execmethod			0=Use default method (that is 1 by default), 1=Use the PHP 'exec', 2=Use the 'popen' method
 	 * @param	string	$redirectionfile	If defined, a redirection of output to this file is added.
-	 * @param	int		$noescapecommand	1=Do not escape command. Warning: Using this parameter need you alreay sanitized the command. if not, it will lead to security vulnerability.
+	 * @param	int		$noescapecommand	1=Do not escape command. Warning: Using this parameter needs you alreay have sanitized the command. if not, it will lead to security vulnerability.
 	 * 										This parameter is provided for backward compatibility with external modules. Always use 0 in core.
 	 * @param	string	$redirectionfileerr	If defined, a redirection of error is added to this file instead of to channel 1.
 	 * @return	array						array('result'=>...,'output'=>...,'error'=>...). result = 0 means OK.
diff --git a/htdocs/core/tpl/card_presend.tpl.php b/htdocs/core/tpl/card_presend.tpl.php
index 5fbb227bc69..596feae69d1 100644
--- a/htdocs/core/tpl/card_presend.tpl.php
+++ b/htdocs/core/tpl/card_presend.tpl.php
@@ -156,7 +156,7 @@ if ($action == 'presend') {
 	$formmail->inreplyto = empty($inreplyto) ? '' : $inreplyto;
 	$formmail->withfrom = 1;
 
-	// Fill list of recipient with email inside <>.
+	// Define $liste, a list of recipients with email inside <>.
 	$liste = array();
 	if ($object->element == 'expensereport') {
 		$fuser = new User($db);
@@ -202,16 +202,6 @@ if ($action == 'presend') {
 		}
 	}
 
-	$formmail->withto = $liste;
-	$formmail->withtofree = (GETPOST('sendto', 'alphawithlgt') ? GETPOST('sendto', 'alphawithlgt') : '1');
-	$formmail->withtocc = $liste;
-	$formmail->withtoccc = getDolGlobalString('MAIN_EMAIL_USECCC');
-	$formmail->withtopic = $topicmail;
-	$formmail->withfile = 2;
-	$formmail->withbody = 1;
-	$formmail->withdeliveryreceipt = 1;
-	$formmail->withcancel = 1;
-
 	//$arrayoffamiliestoexclude=array('system', 'mycompany', 'object', 'objectamount', 'date', 'user', ...);
 	if (!isset($arrayoffamiliestoexclude)) {
 		$arrayoffamiliestoexclude = null;
@@ -219,6 +209,7 @@ if ($action == 'presend') {
 
 	// Make substitution in email content
 	if ($object) {
+		// First we set ->substit (useless, it will be erased later) and ->substit_lines
 		$formmail->setSubstitFromObject($object, $langs);
 	}
 	$substitutionarray = getCommonSubstitutionArray($outputlangs, 0, $arrayoffamiliestoexclude, $object);
@@ -237,7 +228,7 @@ if ($action == 'presend') {
 	);
 	complete_substitutions_array($substitutionarray, $outputlangs, $object, $parameters);
 
-	// Find the good contact address
+	// Find all external contact addresses
 	$tmpobject = $object;
 	if (($object->element == 'shipping' || $object->element == 'reception')) {
 		$origin = $object->origin;
@@ -289,17 +280,46 @@ if ($action == 'presend') {
 
 	if (is_array($contactarr) && count($contactarr) > 0) {
 		require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
+		require_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
 		$contactstatic = new Contact($db);
+		$tmpcompany = new Societe($db);
 
 		foreach ($contactarr as $contact) {
 			$contactstatic->fetch($contact['id']);
+			// Complete substitution array
 			$substitutionarray['__CONTACT_NAME_'.$contact['code'].'__'] = $contactstatic->getFullName($outputlangs, 1);
 			$substitutionarray['__CONTACT_LASTNAME_'.$contact['code'].'__'] = $contactstatic->lastname;
 			$substitutionarray['__CONTACT_FIRSTNAME_'.$contact['code'].'__'] = $contactstatic->firstname;
 			$substitutionarray['__CONTACT_TITLE_'.$contact['code'].'__'] = $contactstatic->getCivilityLabel();
+
+			// Complete $liste with the $contact
+			if (empty($liste[$contact['id']])) {	// If this contact id not already into the $liste
+				$contacttoshow = '';
+				if (isset($object->thirdparty) && is_object($object->thirdparty)) {
+					if ($contactstatic->fk_soc != $object->thirdparty->id) {
+						$tmpcompany->fetch($contactstatic->fk_soc);
+						if ($tmpcompany->id > 0) {
+							$contacttoshow .= $tmpcompany->name.': ';
+						}
+					}
+				}
+				$contacttoshow .= $contactstatic->getFullName($outputlangs, 1);
+				$contacttoshow .= " <".($contactstatic->email ? $contactstatic->email : $langs->transnoentitiesnoconv("NoEMail")) .">";
+				$liste[$contact['id']] = $contacttoshow;
+			}
 		}
 	}
 
+	$formmail->withto = $liste;
+	$formmail->withtofree = (GETPOST('sendto', 'alphawithlgt') ? GETPOST('sendto', 'alphawithlgt') : '1');
+	$formmail->withtocc = $liste;
+	$formmail->withtoccc = getDolGlobalString('MAIN_EMAIL_USECCC');
+	$formmail->withtopic = $topicmail;
+	$formmail->withfile = 2;
+	$formmail->withbody = 1;
+	$formmail->withdeliveryreceipt = 1;
+	$formmail->withcancel = 1;
+
 	// Array of substitutions
 	$formmail->substit = $substitutionarray;
 

From e0b1ad308b1d991364c1e86b17ffcf1792c8ade7 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 30 Aug 2022 19:38:35 +0200
Subject: [PATCH 413/974] Merge branch 'develop' of
 git@github.com:Dolibarr/dolibarr.git into develop

---
 htdocs/admin/facture_situation.php            |  7 +--
 htdocs/admin/tools/export.php                 | 40 ++++++-------
 htdocs/admin/tools/export_files.php           | 10 +++-
 htdocs/commande/list.php                      |  1 -
 htdocs/compta/bank/bankentries_list.php       | 13 +++--
 htdocs/compta/bank/releve.php                 | 19 +++---
 .../compta/cashcontrol/cashcontrol_card.php   |  8 +--
 htdocs/compta/facture/document.php            | 22 ++++---
 htdocs/compta/facture/note.php                | 17 ++++--
 htdocs/core/lib/files.lib.php                 |  1 -
 htdocs/fourn/commande/list.php                |  1 -
 htdocs/fourn/facture/list.php                 |  2 -
 htdocs/holiday/define_holiday.php             | 29 ++++------
 htdocs/holiday/list.php                       | 58 +++++++++----------
 htdocs/holiday/view_log.php                   | 17 ++----
 htdocs/imports/import.php                     |  4 +-
 htdocs/intracommreport/card.php               |  7 +--
 htdocs/takepos/phone.php                      |  3 +-
 htdocs/ticket/card.php                        |  4 +-
 htdocs/user/card.php                          | 16 ++---
 htdocs/variants/combinations.php              | 10 ++--
 21 files changed, 144 insertions(+), 145 deletions(-)

diff --git a/htdocs/admin/facture_situation.php b/htdocs/admin/facture_situation.php
index 609a6605d1a..350055348f8 100644
--- a/htdocs/admin/facture_situation.php
+++ b/htdocs/admin/facture_situation.php
@@ -130,12 +130,9 @@ include DOL_DOCUMENT_ROOT.'/core/actions_setmoduleoptions.inc.php';
 
 $dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
 
-llxHeader(
-	"",
-	$langs->trans("BillsSetup"),
-	'EN:Invoice_Configuration|FR:Configuration_module_facture|ES:ConfiguracionFactura'
-);
+$help_yrl = 'EN:Invoice_Configuration|FR:Configuration_module_facture|ES:ConfiguracionFactura';
 
+llxHeader("", $langs->trans("BillsSetup"), $help_url);
 
 
 $linkback = '<a href="'.DOL_URL_ROOT.'/admin/modules.php?restore_lastsearch_values=1">'.$langs->trans("BackToModuleList").'</a>';
diff --git a/htdocs/admin/tools/export.php b/htdocs/admin/tools/export.php
index d21622d1f68..8b1e8ebf8c0 100644
--- a/htdocs/admin/tools/export.php
+++ b/htdocs/admin/tools/export.php
@@ -56,21 +56,23 @@ if (!$user->admin) {
 	accessforbidden();
 }
 
-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') : ''));
-	exit;
-}
-
 $errormsg = '';
 
+$utils = new Utils($db);
+
 
 /*
  * Actions
  */
 
+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') : ''));
+	exit;
+}
+
 if ($action == 'delete') {
-	$file = $conf->admin->dir_output.'/'.GETPOST('urlfile');
+	$file = $conf->admin->dir_output.'/'.dol_sanitizeFileName(GETPOST('urlfile'));
 	$ret = dol_delete_file($file, 1);
 	if ($ret) {
 		setEventMessages($langs->trans("FileWasRemoved", GETPOST('urlfile')), null, 'mesgs');
@@ -80,11 +82,6 @@ if ($action == 'delete') {
 	$action = '';
 }
 
-
-/*
- * View
- */
-
 $_SESSION["commandbackuplastdone"] = '';
 $_SESSION["commandbackuptorun"] = '';
 $_SESSION["commandbackupresult"] = '';
@@ -103,13 +100,6 @@ if (!empty($MemoryLimit)) {
 	@ini_set('memory_limit', $MemoryLimit);
 }
 
-
-//$help_url='EN:Backups|FR:Sauvegardes|ES:Copias_de_seguridad';
-//llxHeader('','',$help_url);
-
-//print load_fiche_titre($langs->trans("Backup"),'','title_setup');
-
-
 // Start with empty buffer
 $dump_buffer = '';
 $dump_buffer_len = 0;
@@ -122,9 +112,6 @@ $outputdir  = $conf->admin->dir_output.'/backup';
 $result = dol_mkdir($outputdir);
 
 
-$utils = new Utils($db);
-
-
 // MYSQL
 if ($what == 'mysql') {
 	$cmddump = GETPOST("mysqldump", 'none'); // Do not sanitize here with 'alpha', will be sanitize later by dol_sanitizePathName and escapeshellarg
@@ -216,7 +203,16 @@ if ($errormsg) {
 	}*/
 }
 
+
+
+/*
+ * View
+ */
+
+top_httphead();
+
 $db->close();
 
 // Redirect to backup page
 header("Location: dolibarr_export.php".(GETPOST('page_y', 'int') ? '?page_y='.GETPOST('page_y', 'int') : ''));
+exit();
diff --git a/htdocs/admin/tools/export_files.php b/htdocs/admin/tools/export_files.php
index bc627cc14f0..68cb81ccc24 100644
--- a/htdocs/admin/tools/export_files.php
+++ b/htdocs/admin/tools/export_files.php
@@ -205,7 +205,12 @@ if ($compression == 'zip') {
 	print $errormsg;
 }
 
+
+// Output export
+
 if ($export_type != 'externalmodule' || empty($what)) {
+	top_httphead();
+
 	if ($errormsg) {
 		setEventMessages($langs->trans("Error")." : ".$errormsg, null, 'errors');
 	} else {
@@ -218,12 +223,15 @@ if ($export_type != 'externalmodule' || empty($what)) {
 	$returnto = 'dolibarr_export.php';
 
 	header("Location: ".$returnto);
+
 	exit();
 } else {
+	top_httphead('application/zip');
+
 	$zipname = $outputdir."/".$file;
 
 	// Then download the zipped file.
-	header('Content-Type: application/zip');
+
 	header('Content-disposition: attachment; filename='.basename($zipname));
 	header('Content-Length: '.filesize($zipname));
 	readfile($zipname);
diff --git a/htdocs/commande/list.php b/htdocs/commande/list.php
index b92140efa03..4ba2f410cc9 100644
--- a/htdocs/commande/list.php
+++ b/htdocs/commande/list.php
@@ -779,7 +779,6 @@ $projectstatic = new Project($db);
 
 $title = $langs->trans("Orders");
 $help_url = "EN:Module_Customers_Orders|FR:Module_Commandes_Clients|ES:Módulo_Pedidos_de_clientes";
-// llxHeader('',$title,$help_url);
 
 $sql = 'SELECT';
 if ($sall || $search_product_category > 0 || $search_user > 0) {
diff --git a/htdocs/compta/bank/bankentries_list.php b/htdocs/compta/bank/bankentries_list.php
index af833e7e257..3ec26a3a1ef 100644
--- a/htdocs/compta/bank/bankentries_list.php
+++ b/htdocs/compta/bank/bankentries_list.php
@@ -517,9 +517,15 @@ $morehtmlref = '';
 
 if ($id > 0 || !empty($ref)) {
 	$title = $object->ref.' - '.$langs->trans("Transactions");
-	$helpurl = "";
-	llxHeader('', $title, $helpurl);
+} else {
+	$title = $langs->trans("BankTransactions");
+}
+$help_url = '';
 
+llxHeader('', $title, $help_url, '', 0, 0, array(), array(), $param);
+
+
+if ($id > 0 || !empty($ref)) {
 	// Load bank groups
 	require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/bankcateg.class.php';
 	$bankcateg = new BankCateg($db);
@@ -574,11 +580,8 @@ if ($id > 0 || !empty($ref)) {
 			}
 		}
 	}
-} else {
-	llxHeader('', $langs->trans("BankTransactions"), '', '', 0, 0, array(), array(), $param);
 }
 
-
 $sql = "SELECT b.rowid, b.dateo as do, b.datev as dv, b.amount, b.label, b.rappro as conciliated, b.num_releve, b.num_chq,";
 $sql .= " b.fk_account, b.fk_type, b.fk_bordereau,";
 $sql .= " ba.rowid as bankid, ba.ref as bankref";
diff --git a/htdocs/compta/bank/releve.php b/htdocs/compta/bank/releve.php
index c08336841e2..ea80f1caab3 100644
--- a/htdocs/compta/bank/releve.php
+++ b/htdocs/compta/bank/releve.php
@@ -223,6 +223,17 @@ if ($id > 0) {
 	$param .= '&id='.urlencode($id);
 }
 
+if (empty($numref)) {
+	$title = $object->ref.' - '.$langs->trans("AccountStatements");
+	$helpurl = "";
+} else {
+	$title = $langs->trans("FinancialAccount").' - '.$langs->trans("AccountStatements");
+	$helpurl = "";
+}
+
+
+llxHeader('', $title, $helpurl);
+
 
 if (empty($numref)) {
 	$sortfield = 'numr';
@@ -248,10 +259,6 @@ if (empty($numref)) {
 		$numrows = $db->num_rows($result);
 		$i = 0;
 
-		$title = $object->ref.' - '.$langs->trans("AccountStatements");
-		$helpurl = "";
-		llxHeader('', $title, $helpurl);
-
 		// Onglets
 		$head = bank_prepare_head($object);
 		print dol_get_fiche_head($head, 'statement', $langs->trans("FinancialAccount"), 0, 'account');
@@ -387,10 +394,6 @@ if (empty($numref)) {
 	 *   Show list of record into a bank statement
 	 */
 
-	$title = $langs->trans("FinancialAccount").' - '.$langs->trans("AccountStatements");
-	$helpurl = "";
-	llxHeader('', $title, $helpurl);
-
 	// Onglets
 	$head = account_statement_prepare_head($object, $numref);
 	print dol_get_fiche_head($head, 'statement', $langs->trans("AccountStatement"), -1, 'account');
diff --git a/htdocs/compta/cashcontrol/cashcontrol_card.php b/htdocs/compta/cashcontrol/cashcontrol_card.php
index 0130cfe10f0..a8b5f3d56bd 100644
--- a/htdocs/compta/cashcontrol/cashcontrol_card.php
+++ b/htdocs/compta/cashcontrol/cashcontrol_card.php
@@ -265,6 +265,10 @@ $initialbalanceforterminal = array();
 $theoricalamountforterminal = array();
 $theoricalnbofinvoiceforterminal = array();
 
+
+llxHeader('', $langs->trans("CashControl"));
+
+
 if ($action == "create" || $action == "start" || $action == 'close') {
 	if ($action == 'close') {
 		$posmodule = $object->posmodule;
@@ -376,8 +380,6 @@ if ($action == "create" || $action == "start" || $action == 'close') {
 
 	//var_dump($theoricalamountforterminal); var_dump($theoricalnbofinvoiceforterminal);
 	if ($action != 'close') {
-		llxHeader('', $langs->trans("NewCashFence"));
-
 		print load_fiche_titre($langs->trans("CashControl")." - ".$langs->trans("New"), '', 'cash-register');
 
 		print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">';
@@ -597,8 +599,6 @@ if ($action == "create" || $action == "start" || $action == 'close') {
 if (empty($action) || $action == "view" || $action == "close") {
 	$result = $object->fetch($id);
 
-	llxHeader('', $langs->trans("CashControl"));
-
 	if ($result <= 0) {
 		print $langs->trans("ErrorRecordNotFound");
 	} else {
diff --git a/htdocs/compta/facture/document.php b/htdocs/compta/facture/document.php
index 5c57f89f51b..98885369bef 100644
--- a/htdocs/compta/facture/document.php
+++ b/htdocs/compta/facture/document.php
@@ -92,20 +92,24 @@ include DOL_DOCUMENT_ROOT.'/core/actions_linkedfiles.inc.php';
  * View
  */
 
-if (empty($object->id)) {
-	llxHeader();
-	$langs->load('errors');
-	echo '<div class="error">'.$langs->trans("ErrorRecordNotFound").'</div>';
-	llxFooter();
-	exit;
-}
+$form = new Form($db);
 
-$title = $object->ref." - ".$langs->trans('Documents');
+if (empty($object->id)) {
+	$title = $langs->trans('Documents');
+} else {
+	$title = $object->ref." - ".$langs->trans('Documents');
+}
 $help_url = "EN:Customers_Invoices|FR:Factures_Clients|ES:Facturas_a_clientes";
 
 llxHeader('', $title, $help_url);
 
-$form = new Form($db);
+if (empty($object->id)) {
+	$langs->load('errors');
+	echo '<div class="error">'.$langs->trans("ErrorRecordNotFound").'</div>';
+
+	llxFooter();
+	exit;
+}
 
 if ($id > 0 || !empty($ref)) {
 	if ($object->fetch($id, $ref) > 0) {
diff --git a/htdocs/compta/facture/note.php b/htdocs/compta/facture/note.php
index 711921ee08e..866163c223f 100644
--- a/htdocs/compta/facture/note.php
+++ b/htdocs/compta/facture/note.php
@@ -77,19 +77,24 @@ if (empty($reshook)) {
  * View
  */
 
+$form = new Form($db);
+
+if (empty($object->id)) {
+	$title = $object->ref." - ".$langs->trans('Notes');
+} else {
+	$title = $langs->trans('Notes');
+}
+$helpurl = "EN:Customers_Invoices|FR:Factures_Clients|ES:Facturas_a_clientes";
+
+llxHeader('', $title, $helpurl);
+
 if (empty($object->id)) {
-	llxHeader();
 	$langs->load('errors');
 	echo '<div class="error">'.$langs->trans("ErrorRecordNotFound").'</div>';
 	llxFooter();
 	exit;
 }
 
-$title = $object->ref." - ".$langs->trans('Notes');
-$helpurl = "EN:Customers_Invoices|FR:Factures_Clients|ES:Facturas_a_clientes";
-llxHeader('', $title, $helpurl);
-
-$form = new Form($db);
 
 if ($id > 0 || !empty($ref)) {
 	$object = new Facture($db);
diff --git a/htdocs/core/lib/files.lib.php b/htdocs/core/lib/files.lib.php
index 147938fb53a..32526574294 100644
--- a/htdocs/core/lib/files.lib.php
+++ b/htdocs/core/lib/files.lib.php
@@ -1261,7 +1261,6 @@ function dol_delete_file($file, $disableglob = 0, $nophperrors = 0, $nohook = 0,
 		$hookmanager->initHooks(array('fileslib'));
 
 		$parameters = array(
-			'GET' => $_GET,
 			'file' => $file,
 			'disableglob'=> $disableglob,
 			'nophperrors' => $nophperrors
diff --git a/htdocs/fourn/commande/list.php b/htdocs/fourn/commande/list.php
index 354c92eb534..5676cd4aae3 100644
--- a/htdocs/fourn/commande/list.php
+++ b/htdocs/fourn/commande/list.php
@@ -741,7 +741,6 @@ if ($search_billed > 0) {
 
 //$help_url="EN:Module_Customers_Orders|FR:Module_Commandes_Clients|ES:Módulo_Pedidos_de_clientes";
 $help_url = '';
-// llxHeader('',$title,$help_url);
 
 $sql = 'SELECT';
 if ($sall || $search_product_category > 0) {
diff --git a/htdocs/fourn/facture/list.php b/htdocs/fourn/facture/list.php
index f9419653c2f..47e6786f2f0 100644
--- a/htdocs/fourn/facture/list.php
+++ b/htdocs/fourn/facture/list.php
@@ -404,8 +404,6 @@ $facturestatic = new FactureFournisseur($db);
 $formcompany = new FormCompany($db);
 $thirdparty = new Societe($db);
 
-// llxHeader('',$langs->trans("SuppliersInvoices"),'EN:Suppliers_Invoices|FR:FactureFournisseur|ES:Facturas_de_proveedores');
-
 $sql = "SELECT";
 if ($search_all || $search_product_category > 0) {
 	$sql = 'SELECT DISTINCT';
diff --git a/htdocs/holiday/define_holiday.php b/htdocs/holiday/define_holiday.php
index 85de7b09f61..3ea0d87d3cd 100644
--- a/htdocs/holiday/define_holiday.php
+++ b/htdocs/holiday/define_holiday.php
@@ -60,6 +60,17 @@ if (!$sortorder) {
 }
 
 
+// Initialize technical object to manage hooks. Note that conf->hooks_modules contains array
+$hookmanager->initHooks(array('defineholidaylist'));
+$extrafields = new ExtraFields($db);
+
+$holiday = new Holiday($db);
+
+
+if (empty($conf->holiday->enabled)) {
+	accessforbidden('Module not enabled');
+}
+
 // Protection if external user
 if ($user->socid > 0) {
 	accessforbidden();
@@ -71,23 +82,6 @@ if (empty($user->rights->holiday->read)) {
 }
 
 
-// Initialize technical object to manage hooks. Note that conf->hooks_modules contains array
-$hookmanager->initHooks(array('defineholidaylist'));
-$extrafields = new ExtraFields($db);
-
-$holiday = new Holiday($db);
-
-if (empty($conf->holiday->enabled)) {
-	llxHeader('', $langs->trans('CPTitreMenu'));
-	print '<div class="tabBar">';
-	print '<span style="color: #FF0000;">'.$langs->trans('NotActiveModCP').'</span>';
-	print '</div>';
-	llxFooter();
-	exit();
-}
-
-
-
 /*
  * Actions
  */
@@ -212,7 +206,6 @@ $title = $langs->trans('CPTitreMenu');
 
 llxHeader('', $title);
 
-
 $typeleaves = $holiday->getTypes(1, 1);
 $result = $holiday->updateBalance(); // Create users into table holiday if they don't exists. TODO Remove this whif we use field into table user.
 if ($result < 0) {
diff --git a/htdocs/holiday/list.php b/htdocs/holiday/list.php
index 5978b6a31be..d4d2c3fff36 100644
--- a/htdocs/holiday/list.php
+++ b/htdocs/holiday/list.php
@@ -59,29 +59,6 @@ $id = GETPOST('id', 'int');
 
 $childids = $user->getAllChildIds(1);
 
-// Security check
-$socid = 0;
-if ($user->socid > 0) {	// Protection if external user
-	//$socid = $user->socid;
-	accessforbidden();
-}
-$result = restrictedArea($user, 'holiday', '', '');
-// If we are on the view of a specific user
-if ($id > 0) {
-	$canread = 0;
-	if ($id == $user->id) {
-		$canread = 1;
-	}
-	if (!empty($user->rights->holiday->readall)) {
-		$canread = 1;
-	}
-	if (!empty($user->rights->holiday->read) && in_array($id, $childids)) {
-		$canread = 1;
-	}
-	if (!$canread) {
-		accessforbidden();
-	}
-}
 
 $diroutputmassaction = $conf->holiday->dir_output.'/temp/massgeneration/'.$user->id;
 
@@ -156,15 +133,36 @@ $arrayfields = array(
 // Extra fields
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_array_fields.tpl.php';
 
-if (empty($conf->holiday->enabled)) {
-	llxHeader('', $langs->trans('CPTitreMenu'));
-	print '<div class="tabBar">';
-	print '<span style="color: #FF0000;">'.$langs->trans('NotActiveModCP').'</span>';
-	print '</div>';
-	llxFooter();
-	exit();
+
+// Security check
+$socid = 0;
+if ($user->socid > 0) {	// Protection if external user
+	//$socid = $user->socid;
+	accessforbidden();
 }
 
+if (empty($conf->holiday->enabled)) accessforbidden('Module not enabled');
+
+$result = restrictedArea($user, 'holiday', '', '');
+// If we are on the view of a specific user
+if ($id > 0) {
+	$canread = 0;
+	if ($id == $user->id) {
+		$canread = 1;
+	}
+	if (!empty($user->rights->holiday->readall)) {
+		$canread = 1;
+	}
+	if (!empty($user->rights->holiday->read) && in_array($id, $childids)) {
+		$canread = 1;
+	}
+	if (!$canread) {
+		accessforbidden();
+	}
+}
+
+
+
 
 /*
  * Actions
diff --git a/htdocs/holiday/view_log.php b/htdocs/holiday/view_log.php
index ea71deb4d26..1463b91939e 100644
--- a/htdocs/holiday/view_log.php
+++ b/htdocs/holiday/view_log.php
@@ -74,11 +74,6 @@ if (!$sortorder) {
 	$sortorder = "DESC";
 }
 
-// Si l'utilisateur n'a pas le droit de lire cette page
-if (!$user->rights->holiday->readall) {
-	accessforbidden();
-}
-
 // Load translation files required by the page
 $langs->loadLangs(array('users', 'other', 'holiday'));
 
@@ -92,12 +87,12 @@ $arrayfields = array();
 $arrayofmassactions = array();
 
 if (empty($conf->holiday->enabled)) {
-	llxHeader('', $langs->trans('CPTitreMenu'));
-	print '<div class="tabBar">';
-	print '<span style="color: #FF0000;">'.$langs->trans('NotActiveModCP').'</span>';
-	print '</div>';
-	llxFooter();
-	exit();
+	accessforbidden('Module not enabled');
+}
+
+// Si l'utilisateur n'a pas le droit de lire cette page
+if (!$user->rights->holiday->readall) {
+	accessforbidden();
 }
 
 
diff --git a/htdocs/imports/import.php b/htdocs/imports/import.php
index f573d3c85f4..fe39f39757c 100644
--- a/htdocs/imports/import.php
+++ b/htdocs/imports/import.php
@@ -1585,7 +1585,7 @@ if ($step == 5 && $datatoimport) {
 		$param .= '&updatekeys[]='.implode('&updatekeys[]=', $updatekeys);
 	}
 
-	llxHeader('', $langs->trans("NewImport"), 'EN:Module_Imports_En|FR:Module_Imports|ES:M&oacute;dulo_Importaciones');
+	llxHeader('', $langs->trans("NewImport"), $help_url);
 
 	$head = import_prepare_head($param, 5);
 
@@ -2051,7 +2051,7 @@ if ($step == 6 && $datatoimport) {
 		$param .= '&enclosure='.urlencode($enclosure);
 	}
 
-	llxHeader('', $langs->trans("NewImport"), 'EN:Module_Imports_En|FR:Module_Imports|ES:M&oacute;dulo_Importaciones');
+	llxHeader('', $langs->trans("NewImport"), $help_url);
 
 	$head = import_prepare_head($param, 6);
 
diff --git a/htdocs/intracommreport/card.php b/htdocs/intracommreport/card.php
index 681320e0d75..a5acefca8d6 100644
--- a/htdocs/intracommreport/card.php
+++ b/htdocs/intracommreport/card.php
@@ -155,10 +155,11 @@ if ($action == 'add' && $permissiontoadd) {
  * View
  */
 
+$title = $langs->trans("IntracommReportTitle");
+llxHeader("", $title);
+
 // Creation mode
 if ($action == 'create') {
-	$title = $langs->trans("IntracommReportTitle");
-	llxHeader("", $title);
 	print load_fiche_titre($langs->trans("IntracommReportTitle"));
 
 	print '<form name="charge" method="post" action="'.$_SERVER["PHP_SELF"].'">';
@@ -294,8 +295,6 @@ if ($id > 0 && $action != 'edit') {
 	{
 		global $langs, $formother, $year, $month, $type_declaration;
 
-		$title = $langs->trans("IntracommReportDESTitle");
-		llxHeader("", $title);
 		print load_fiche_titre($langs->trans("IntracommReportDESTitle"));
 
 		print dol_get_fiche_head();
diff --git a/htdocs/takepos/phone.php b/htdocs/takepos/phone.php
index 59ed75fb46e..fa12487763e 100644
--- a/htdocs/takepos/phone.php
+++ b/htdocs/takepos/phone.php
@@ -85,7 +85,8 @@ if (empty($action)) {
 	<meta name="mobile-web-app-capable" content="yes">
 	<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no"/>';
 	$arrayofcss = array('/takepos/css/phone.css');
-	top_htmlhead($head, $title, 0, 0, '', '');
+
+	top_htmlhead($head, $title, 0, 0, '', $arrayofcss);
 } else {
 	top_httphead('text/html', 1);
 }
diff --git a/htdocs/ticket/card.php b/htdocs/ticket/card.php
index 8b76f5968cb..c92ee6d50e8 100755
--- a/htdocs/ticket/card.php
+++ b/htdocs/ticket/card.php
@@ -716,9 +716,9 @@ if (!empty($conf->project->enabled)) {
 
 $help_url = 'EN:Module_Ticket|FR:DocumentationModuleTicket';
 
-$page_title = $actionobject->getTitle($action);
+$title = $actionobject->getTitle($action);
 
-llxHeader('', $page_title, $help_url);
+llxHeader('', $title, $help_url);
 
 if ($action == 'create' || $action == 'presend') {
 	$formticket = new FormTicket($db);
diff --git a/htdocs/user/card.php b/htdocs/user/card.php
index 853c4d91e2f..c4e2715f664 100644
--- a/htdocs/user/card.php
+++ b/htdocs/user/card.php
@@ -730,12 +730,18 @@ if (!empty($conf->stock->enabled)) {
 	$formproduct = new FormProduct($db);
 }
 
+if ($object->id > 0) {
+	$person_name = !empty($object->firstname) ? $object->lastname.", ".$object->firstname : $object->lastname;
+	$title = $person_name." - ".$langs->trans('Card');
+} else {
+	$title = $langs->trans("NewUser");
+}
 $help_url = '';
 
-if ($action == 'create' || $action == 'adduserldap') {
-	$title = $langs->trans("NewUser");
-	llxHeader('', $title, $help_url);
+llxHeader('', $title, $help_url);
 
+
+if ($action == 'create' || $action == 'adduserldap') {
 	print load_fiche_titre($langs->trans("NewUser"), '', 'user');
 
 	print '<span class="opacitymedium">'.$langs->trans("CreateInternalUserDesc")."</span><br>\n";
@@ -1353,10 +1359,6 @@ if ($action == 'create' || $action == 'adduserldap') {
 			}
 		}
 
-		$person_name = !empty($object->firstname) ? $object->lastname.", ".$object->firstname : $object->lastname;
-		$title = $person_name." - ".$langs->trans('Card');
-		llxHeader('', $title, $help_url);
-
 		// Show tabs
 		if ($mode == 'employee') { // For HRM module development
 			$title = $langs->trans("Employee");
diff --git a/htdocs/variants/combinations.php b/htdocs/variants/combinations.php
index fe058849899..7337bf57f94 100644
--- a/htdocs/variants/combinations.php
+++ b/htdocs/variants/combinations.php
@@ -370,9 +370,12 @@ if ($action === 'confirm_deletecombination') {
 
 $form = new Form($db);
 
-if (!empty($id) || !empty($ref)) {
-	llxHeader("", "", $langs->trans("CardProduct".$object->type));
+$title = $langs->trans("Variant");
 
+llxHeader("", $title);
+
+
+if (!empty($id) || !empty($ref)) {
 	$showbarcode = empty($conf->barcode->enabled) ? 0 : 1;
 	if (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && empty($user->rights->barcode->lire_advance)) {
 		$showbarcode = 0;
@@ -932,9 +935,6 @@ if (!empty($id) || !empty($ref)) {
 		print '</div>';
 		print '</form>';
 	}
-} else {
-	llxHeader();
-	// not found
 }
 
 // End of page

From 27ce241074d08986c552436fc369f9df15b04bbc Mon Sep 17 00:00:00 2001
From: UT from dolibit <45215329+dolibit-ut@users.noreply.github.com>
Date: Tue, 30 Aug 2022 22:33:54 +0200
Subject: [PATCH 414/974] Update modules_takepos.php

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

diff --git a/htdocs/core/modules/takepos/modules_takepos.php b/htdocs/core/modules/takepos/modules_takepos.php
index 24fa70b7f28..89b3dbde5bc 100644
--- a/htdocs/core/modules/takepos/modules_takepos.php
+++ b/htdocs/core/modules/takepos/modules_takepos.php
@@ -16,14 +16,14 @@
  * 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/
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ * or see https://www.gnu.org/
  */
 
 /**
  *  \file       htdocs/core/modules/takepos/modules_takepos.php
  *  \ingroup    takepos
- *  \brief      Fichier contenant la classe mere de numerotation des tickets de caisse
+ *  \brief      File containing the parent class for the numbering of cash register receipts
  */
 
 

From ed4ed8705d742053575cd47783db5561a77d1cc5 Mon Sep 17 00:00:00 2001
From: UT from dolibit <45215329+dolibit-ut@users.noreply.github.com>
Date: Tue, 30 Aug 2022 22:43:19 +0200
Subject: [PATCH 415/974] Update mod_takepos_ref_simple.php

---
 .../core/modules/takepos/mod_takepos_ref_simple.php   | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/htdocs/core/modules/takepos/mod_takepos_ref_simple.php b/htdocs/core/modules/takepos/mod_takepos_ref_simple.php
index 41b7bb8c90e..31eb9345110 100644
--- a/htdocs/core/modules/takepos/mod_takepos_ref_simple.php
+++ b/htdocs/core/modules/takepos/mod_takepos_ref_simple.php
@@ -15,8 +15,8 @@
  * 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/
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ * or see https://www.gnu.org/
  */
 
 /**
@@ -24,6 +24,7 @@
  *  \ingroup    takepos
  *  \brief      File with Simple ref numbering module for takepos
  */
+
 dol_include_once('/core/modules/takepos/modules_takepos.php');
 
 /**
@@ -80,10 +81,10 @@ class mod_takepos_ref_simple extends ModeleNumRefTakepos
 	}
 
 	/**
-	 *  Test si les numeros deja en vigueur dans la base ne provoquent pas de
-	 *  de conflits qui empechera cette numerotation de fonctionner.
+	 *  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.
 	 *
-	 * @return     boolean     false si conflit, true si ok
+	 * @return     boolean     false if KO (there is a conflict), true if OK
 	 */
 	public function canBeActivated()
 	{

From a97f606cd9baf1fa25f2dfbada2b3edc24ddd33d Mon Sep 17 00:00:00 2001
From: UT from dolibit <45215329+dolibit-ut@users.noreply.github.com>
Date: Tue, 30 Aug 2022 22:47:44 +0200
Subject: [PATCH 416/974] Update mod_takepos_ref_universal.php

---
 .../modules/takepos/mod_takepos_ref_universal.php   | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/htdocs/core/modules/takepos/mod_takepos_ref_universal.php b/htdocs/core/modules/takepos/mod_takepos_ref_universal.php
index 7e46c10a341..9a6e632b92c 100644
--- a/htdocs/core/modules/takepos/mod_takepos_ref_universal.php
+++ b/htdocs/core/modules/takepos/mod_takepos_ref_universal.php
@@ -17,8 +17,8 @@
  * 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/
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ * or see https://www.gnu.org/
  */
 
 /**
@@ -26,6 +26,7 @@
  *	\ingroup    takepos
  *	\brief      File with Universal ref numbering module for takepos
  */
+
 dol_include_once('/core/modules/takepos/modules_takepos.php');
 
 /**
@@ -51,7 +52,7 @@ class mod_takepos_ref_universal extends ModeleNumRefTakepos
 	public $nom = 'Universal';
 
 	/**
-	 *  Renvoi la description du modele de numerotation
+	 *  return description of the numbering model
 	 *
 	 * @return     string      Texte descripif
 	 */
@@ -77,7 +78,7 @@ class mod_takepos_ref_universal extends ModeleNumRefTakepos
 		$tooltip .= $langs->trans('GenericMaskCodes5');
 		$tooltip .= $langs->trans('CashDeskGenericMaskCodes6');
 
-		// Parametrage du prefix
+		// Setting up the prefix
 		$texte .= '<tr><td>'.$langs->trans("Mask").':</td>';
 		$texte .= '<td align="right">'.$form->textwithpicto('<input type="text" class="flat minwidth175" name="maskvalue" value="'.$conf->global->TAKEPOS_REF_UNIVERSAL_MASK.'">', $tooltip, 1, 1).'</td>';
 
@@ -92,7 +93,7 @@ class mod_takepos_ref_universal extends ModeleNumRefTakepos
 	}
 
 	/**
-	 * Renvoi un exemple de numerotation
+	 * Return an example of numbering
 	 *
 	 * @return     string      Example
 	 */
@@ -125,7 +126,7 @@ class mod_takepos_ref_universal extends ModeleNumRefTakepos
 
 		require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 
-		// On defini critere recherche compteur
+		// We define search criteria counter
 		$mask = $conf->global->TAKEPOS_REF_UNIVERSAL_MASK;
 
 		if (!$mask) {

From 60bfd55db1a4256c5785471902004b7cfc136566 Mon Sep 17 00:00:00 2001
From: UT from dolibit <45215329+dolibit-ut@users.noreply.github.com>
Date: Tue, 30 Aug 2022 22:51:30 +0200
Subject: [PATCH 417/974] Update ecm.php

---
 htdocs/admin/ecm.php | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/htdocs/admin/ecm.php b/htdocs/admin/ecm.php
index 44df7f74189..3e0c2378742 100644
--- a/htdocs/admin/ecm.php
+++ b/htdocs/admin/ecm.php
@@ -22,6 +22,8 @@
  *		\brief      Page to setup ECM (GED) module
  */
 
+
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/ecm.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
@@ -37,6 +39,8 @@ if (!$user->admin) {
 /*
  * Action
  */
+
+// set
 if (preg_match('/set_([a-z0-9_\-]+)/i', $action, $reg)) {
 	$code = $reg[1];
 	if (dolibarr_set_const($db, $code, 1, 'chaine', 0, '', $conf->entity) > 0) {
@@ -47,6 +51,7 @@ if (preg_match('/set_([a-z0-9_\-]+)/i', $action, $reg)) {
 	}
 }
 
+// delete
 if (preg_match('/del_([a-z0-9_\-]+)/i', $action, $reg)) {
 	$code = $reg[1];
 	if (dolibarr_del_const($db, $code, $conf->entity) > 0) {

From 017a2258ce5608102bf003c409d9058f0fb94ce2 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 31 Aug 2022 01:03:30 +0200
Subject: [PATCH 418/974] FIX bad sort order field on DMD in product lot page

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

diff --git a/htdocs/product/reassortlot.php b/htdocs/product/reassortlot.php
index 2bd62b2ce22..f432d97e403 100644
--- a/htdocs/product/reassortlot.php
+++ b/htdocs/product/reassortlot.php
@@ -369,10 +369,10 @@ if ($resql) {
 	//print_liste_field_titre("DesiredStock", $_SERVER["PHP_SELF"], "p.desiredstock",$param,"",'',$sortfield,$sortorder, 'right );
 	print_liste_field_titre("Batch", $_SERVER["PHP_SELF"], "pb.batch", $param, "", '', $sortfield, $sortorder, 'center ');
 	if (empty($conf->global->PRODUCT_DISABLE_SELLBY)) {
-		print_liste_field_titre("SellByDate", $_SERVER["PHP_SELF"], "pb.sellby", $param, "", '', $sortfield, $sortorder, 'center ');
+		print_liste_field_titre("SellByDate", $_SERVER["PHP_SELF"], "pl.sellby", $param, "", '', $sortfield, $sortorder, 'center ');
 	}
 	if (empty($conf->global->PRODUCT_DISABLE_EATBY)) {
-		print_liste_field_titre("EatByDate", $_SERVER["PHP_SELF"], "pb.eatby", $param, "", '', $sortfield, $sortorder, 'center ');
+		print_liste_field_titre("EatByDate", $_SERVER["PHP_SELF"], "pl.eatby", $param, "", '', $sortfield, $sortorder, 'center ');
 	}
 	print_liste_field_titre("PhysicalStock", $_SERVER["PHP_SELF"], "stock_physique", $param, "", '', $sortfield, $sortorder, 'right ');
 	// TODO Add info of running suppliers/customers orders

From 88b5594af31f54bed54d0c89e61930f78c48404e Mon Sep 17 00:00:00 2001
From: kamel <kamel@kam>
Date: Wed, 31 Aug 2022 09:59:24 +0200
Subject: [PATCH 419/974] FIX: Preview button position on documents list (case
 when the file is too long)

---
 htdocs/core/class/html.formfile.class.php | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/htdocs/core/class/html.formfile.class.php b/htdocs/core/class/html.formfile.class.php
index 349b05416aa..6fe10788c54 100644
--- a/htdocs/core/class/html.formfile.class.php
+++ b/htdocs/core/class/html.formfile.class.php
@@ -850,6 +850,7 @@ class FormFile
 
 					// Show file name with link to download
 					$out .= '<td class="minwidth200 tdoverflowmax300">';
+					$out .= $this->showPreview($file, $modulepart, $relativepath, 0, $param, 'paddingright')."\n";
 					$out .= '<a class="documentdownload paddingright" href="'.$documenturl.'?modulepart='.$modulepart.'&amp;file='.urlencode($relativepath).($param ? '&'.$param : '').'"';
 
 					$mime = dol_mimetype($relativepath, '', 0);
@@ -859,8 +860,7 @@ class FormFile
 					$out .= '>';
 					$out .= img_mime($file["name"], $langs->trans("File").': '.$file["name"]);
 					$out .= dol_trunc($file["name"], 150);
-					$out .= '</a>'."\n";
-					$out .= $this->showPreview($file, $modulepart, $relativepath, 0, $param);
+					$out .= '</a>';
 					$out .= '</td>';
 
 					// Show file size
@@ -1307,6 +1307,11 @@ class FormFile
 					// File name
 					print '<td class="minwith200">';
 
+					// Preview link
+					if (!$editline) {
+						print $this->showPreview($file, $modulepart, $filepath, 0, '&entity='.(!empty($object->entity) ? $object->entity : $conf->entity), 'paddingright') . "\n";
+					}
+
 					// Show file name with link to download
 					//print "XX".$file['name'];	//$file['name'] must be utf8
 					print '<a class="paddingright" href="'.DOL_URL_ROOT.'/document.php?modulepart='.$modulepart;
@@ -1338,10 +1343,6 @@ class FormFile
 						print dol_escape_htmltag(dol_trunc($filenametoshow, 200));
 						print '</a>';
 					}
-					// Preview link
-					if (!$editline) {
-						print $this->showPreview($file, $modulepart, $filepath, 0, '&entity='.(!empty($object->entity) ? $object->entity : $conf->entity));
-					}
 
 					print "</td>\n";
 
@@ -2097,9 +2098,10 @@ class FormFile
 	 * @param   string    $relativepath   Relative path of docs
 	 * @param   integer   $ruleforpicto   Rule for picto: 0=Use the generic preview picto, 1=Use the picto of mime type of file)
 	 * @param	string	  $param		  More param on http links
+	 * @param	string	  $moreclass	  Add more class to class style
 	 * @return  string    $out            Output string with HTML
 	 */
-	public function showPreview($file, $modulepart, $relativepath, $ruleforpicto = 0, $param = '')
+	public function showPreview($file, $modulepart, $relativepath, $ruleforpicto = 0, $param = '', $moreclass = '')
 	{
 		global $langs, $conf;
 
@@ -2107,7 +2109,7 @@ class FormFile
 		if ($conf->browser->layout != 'phone' && !empty($conf->use_javascript_ajax)) {
 			$urladvancedpreview = getAdvancedPreviewUrl($modulepart, $relativepath, 1, $param); // Return if a file is qualified for preview.
 			if (count($urladvancedpreview)) {
-				$out .= '<a class="pictopreview '.$urladvancedpreview['css'].'" href="'.$urladvancedpreview['url'].'"'.(empty($urladvancedpreview['mime']) ? '' : ' mime="'.$urladvancedpreview['mime'].'"').' '.(empty($urladvancedpreview['target']) ? '' : ' target="'.$urladvancedpreview['target'].'"').'>';
+				$out .= '<a class="pictopreview '.$urladvancedpreview['css'].(!empty($moreclass)?' '.$moreclass:'').'" href="'.$urladvancedpreview['url'].'"'.(empty($urladvancedpreview['mime']) ? '' : ' mime="'.$urladvancedpreview['mime'].'"').' '.(empty($urladvancedpreview['target']) ? '' : ' target="'.$urladvancedpreview['target'].'"').'>';
 				//$out.= '<a class="pictopreview">';
 				if (empty($ruleforpicto)) {
 					//$out.= img_picto($langs->trans('Preview').' '.$file['name'], 'detail');

From f6c6797dc4d077a3b721089ebf91913b7be978a7 Mon Sep 17 00:00:00 2001
From: UT from dolibit <45215329+dolibit-ut@users.noreply.github.com>
Date: Wed, 31 Aug 2022 10:38:18 +0200
Subject: [PATCH 420/974] Update compare.php

---
 htdocs/hrm/compare.php | 28 +++++++++++++++++-----------
 1 file changed, 17 insertions(+), 11 deletions(-)

diff --git a/htdocs/hrm/compare.php b/htdocs/hrm/compare.php
index c8bb01d85e5..686d5820695 100644
--- a/htdocs/hrm/compare.php
+++ b/htdocs/hrm/compare.php
@@ -1,9 +1,9 @@
 <?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) 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>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -18,7 +18,7 @@
  * 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        class/compare.php
+ * \file        htdocs/hrm/compare.php
  * \ingroup     hrm
  * \brief       This file compares skills of user groups
  *
@@ -33,23 +33,29 @@
  *
  */
 
+
+// Load Dolibarr environment
 require_once '../main.inc.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/functions.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
+require_once DOL_DOCUMENT_ROOT . '/core/lib/functions.lib.php';
+require_once DOL_DOCUMENT_ROOT . '/core/lib/functions2.lib.php';
 require_once DOL_DOCUMENT_ROOT . '/hrm/class/skill.class.php';
 require_once DOL_DOCUMENT_ROOT . '/hrm/class/job.class.php';
 require_once DOL_DOCUMENT_ROOT . '/hrm/class/evaluation.class.php';
 require_once DOL_DOCUMENT_ROOT . '/hrm/class/position.class.php';
 require_once DOL_DOCUMENT_ROOT . '/hrm/lib/hrm.lib.php';
 
-$permissiontoread = $user->rights->hrm->evaluation->read || $user->rights->hrm->compare_advance->read;
-$permissiontoadd = 0;
-if (empty($conf->hrm->enabled)) accessforbidden();
-if (!$permissiontoread || ($action === 'create' && !$permissiontoadd)) accessforbidden();
 
+// Load translation files required by the page
 $langs->load('hrm');
 
 
+// Permissions
+$permissiontoread = $user->rights->hrm->evaluation->read || $user->rights->hrm->compare_advance->read;
+$permissiontoadd = 0;
+
+if (empty($conf->hrm->enabled)) accessforbidden();
+if (!$permissiontoread || ($action === 'create' && !$permissiontoadd)) accessforbidden();
+
 
 /*
  * View

From 66cb51708cd1f2ef7ae08f5f7e1202c3bd6dfe76 Mon Sep 17 00:00:00 2001
From: UT from dolibit <45215329+dolibit-ut@users.noreply.github.com>
Date: Wed, 31 Aug 2022 10:49:27 +0200
Subject: [PATCH 421/974] Update index.php

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

diff --git a/htdocs/hrm/index.php b/htdocs/hrm/index.php
index 1160ee0fc14..861bde0fb51 100644
--- a/htdocs/hrm/index.php
+++ b/htdocs/hrm/index.php
@@ -26,6 +26,8 @@
  *		\brief      Home page for HRM area.
  */
 
+
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.form.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
@@ -34,6 +36,7 @@ require_once DOL_DOCUMENT_ROOT.'/user/class/user.class.php';
 require_once DOL_DOCUMENT_ROOT.'/user/class/usergroup.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/usergroups.lib.php';
+
 if (!empty($conf->deplacement->enabled)) {
 	require_once DOL_DOCUMENT_ROOT.'/compta/deplacement/class/deplacement.class.php';
 }
@@ -48,12 +51,15 @@ if (!empty($conf->holiday->enabled)) {
 	require_once DOL_DOCUMENT_ROOT.'/holiday/class/holiday.class.php';
 }
 
+
+// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $hookmanager = new HookManager($db);
 $hookmanager->initHooks('hrmindex');
 
 // Load translation files required by the page
 $langs->loadLangs(array('users', 'holiday', 'trips', 'boxes'));
 
+// Get Parameters
 $socid = GETPOST("socid", "int");
 
 // Protection if external user

From e390e6273b7e399a3ffb2b52a554bf38dc9a6257 Mon Sep 17 00:00:00 2001
From: UT from dolibit <45215329+dolibit-ut@users.noreply.github.com>
Date: Wed, 31 Aug 2022 10:56:16 +0200
Subject: [PATCH 422/974] Update position.php

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

diff --git a/htdocs/hrm/position.php b/htdocs/hrm/position.php
index 78838136a1e..2659321e5fc 100644
--- a/htdocs/hrm/position.php
+++ b/htdocs/hrm/position.php
@@ -20,9 +20,9 @@
  */
 
 /**
- *    \file       position.php
- *        \ingroup    hrm
- *        \brief      Page to create/edit/view position
+ *    \file       htdocs/hrm/position.php
+ *    \ingroup    hrm
+ *    \brief      Page to create/edit/view position
  */
 
 //if (! defined('NOREQUIREDB'))              define('NOREQUIREDB', '1');				// Do not create database handler $db
@@ -88,10 +88,6 @@ require_once DOL_DOCUMENT_ROOT . '/hrm/class/job.class.php';
 require_once DOL_DOCUMENT_ROOT . '/hrm/lib/hrm_position.lib.php';
 require_once DOL_DOCUMENT_ROOT . '/hrm/lib/hrm_job.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');
-$fk_job 	= GETPOST('fk_job', 'int');
 
 // Get parameters
 $id 	 = GETPOST('fk_job', 'int');
@@ -105,12 +101,18 @@ $confirm = GETPOST('confirm', 'alpha');
 $cancel = GETPOST('cancel', 'aZ09');
 $contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'positioncard'; // To manage different context of search
 
+$action 	= GETPOST('action', 'aZ09') ? GETPOST('action', 'aZ09') : 'view'; // The action 'add', 'create', 'edit', 'update', 'view', ...
+$backtopage = GETPOST('backtopage', 'alpha');
+$backtopageforcancel = GETPOST('backtopageforcancel', 'alpha');
+$fk_job 	= GETPOST('fk_job', 'int');
+
 // Initialize technical objects
 $object = new Job($db);
 
 $extrafields = new ExtraFields($db);
 
 $diroutputmassaction = $conf->hrm->dir_output . '/temp/massgeneration/' . $user->id;
+
 $hookmanager->initHooks(array('positiontab', 'globalcard')); // Note that conf->hooks_modules contains array
 
 // Fetch optionals attributes and labels
@@ -130,6 +132,7 @@ foreach ($object->fields as $key => $val) {
 // Load object
 include DOL_DOCUMENT_ROOT . '/core/actions_fetchobject.inc.php'; // Must be include, not include_once.
 
+// Permissions
 $permissiontoread = $user->rights->hrm->all->read;
 $permissiontoadd = $user->rights->hrm->all->write; // Used by the include of actions_addupdatedelete.inc.php and actions_lineupdown.inc.php
 $permissiontodelete = $user->rights->hrm->all->delete;

From 28c4dd88a26dadce160d1d19952298cd5a0c2a99 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 31 Aug 2022 14:02:09 +0200
Subject: [PATCH 423/974] FIX use correct smtp setup for the
 check_server_port() test

---
 htdocs/core/class/CMailFile.class.php | 38 ++++++++++++++++-----------
 1 file changed, 23 insertions(+), 15 deletions(-)

diff --git a/htdocs/core/class/CMailFile.class.php b/htdocs/core/class/CMailFile.class.php
index 42dcd1d493b..f9157a6a3c2 100644
--- a/htdocs/core/class/CMailFile.class.php
+++ b/htdocs/core/class/CMailFile.class.php
@@ -156,7 +156,7 @@ class CMailFile
 	 *	@param 	string	$errors_to      	 Email for errors-to
 	 *	@param	string	$css                 Css option
 	 *	@param	string	$trackid             Tracking string (contains type and id of related element)
-	 *  @param  string  $moreinheader        More in header. $moreinheader must contains the "\r\n" (TODO not supported for other MAIL_SEND_MODE different than 'phpmail' and 'smtps' for the moment)
+	 *  @param  string  $moreinheader        More in header. $moreinheader must contains the "\r\n" (TODO not supported for other MAIL_SEND_MODE different than 'mail' and 'smtps' for the moment)
 	 *  @param  string  $sendcontext      	 'standard', 'emailing', ... (used to define which sending mode and parameters to use)
 	 *  @param	string	$replyto			 Reply-to email (will be set to same value than From by default if not provided)
 	 */
@@ -173,12 +173,11 @@ class CMailFile
 
 		$this->sendcontext = $sendcontext;
 
-		// Define this->sendmode
+		// Define this->sendmode ('mail', 'smtps', 'siwftmailer', ...) according to $sendcontext ('standard', 'emailing', 'ticket')
 		$this->sendmode = '';
 		if (!empty($this->sendcontext)) {
 			$smtpContextKey = strtoupper($this->sendcontext);
-			$keyForSMTPSendMode = 'MAIN_MAIL_SENDMODE_'.$smtpContextKey;
-			$smtpContextSendMode = empty($conf->global->{$keyForSMTPSendMode}) ? '' : $conf->global->{$keyForSMTPSendMode};
+			$smtpContextSendMode = getDolGlobalString('MAIN_MAIL_SENDMODE_'.$smtpContextKey);
 			if (!empty($smtpContextSendMode) && $smtpContextSendMode != 'default') {
 				$this->sendmode = $smtpContextSendMode;
 			}
@@ -329,8 +328,7 @@ class CMailFile
 		$keyforsslseflsigned = 'MAIN_MAIL_EMAIL_SMTP_ALLOW_SELF_SIGNED';
 		if (!empty($this->sendcontext)) {
 			$smtpContextKey = strtoupper($this->sendcontext);
-			$keyForSMTPSendMode = 'MAIN_MAIL_SENDMODE_'.$smtpContextKey;
-			$smtpContextSendMode = empty($conf->global->{$keyForSMTPSendMode}) ? '' : $conf->global->{$keyForSMTPSendMode};
+			$smtpContextSendMode = getDolGlobalString('MAIN_MAIL_SENDMODE_'.$smtpContextKey);
 			if (!empty($smtpContextSendMode) && $smtpContextSendMode != 'default') {
 				$keyforsslseflsigned = 'MAIN_MAIL_EMAIL_SMTP_ALLOW_SELF_SIGNED_'.$smtpContextKey;
 			}
@@ -701,8 +699,7 @@ class CMailFile
 			$keyforsslseflsigned = 'MAIN_MAIL_EMAIL_SMTP_ALLOW_SELF_SIGNED';
 			if (!empty($this->sendcontext)) {
 				$smtpContextKey = strtoupper($this->sendcontext);
-				$keyForSMTPSendMode = 'MAIN_MAIL_SENDMODE_'.$smtpContextKey;
-				$smtpContextSendMode = empty($conf->global->{$keyForSMTPSendMode}) ? '' : $conf->global->{$keyForSMTPSendMode};
+				$smtpContextSendMode = getDolGlobalString('MAIN_MAIL_SENDMODE_'.$smtpContextKey);
 				if (!empty($smtpContextSendMode) && $smtpContextSendMode != 'default') {
 					$keyforsmtpserver = 'MAIN_MAIL_SMTP_SERVER_'.$smtpContextKey;
 					$keyforsmtpport   = 'MAIN_MAIL_SMTP_PORT_'.$smtpContextKey;
@@ -1537,15 +1534,26 @@ class CMailFile
 			$keyforsmtpport  = 'MAIN_MAIL_SMTP_PORT';
 			$keyforsmtpid    = 'MAIN_MAIL_SMTPS_ID';
 			$keyforsmtppw    = 'MAIN_MAIL_SMTPS_PW';
+			$keyforsmtpauthtype = 'MAIN_MAIL_SMTPS_AUTH_TYPE';
+			$keyforsmtpoauthservice = 'MAIN_MAIL_SMTPS_OAUTH_SERVICE';
 			$keyfortls       = 'MAIN_MAIL_EMAIL_TLS';
 			$keyforstarttls  = 'MAIN_MAIL_EMAIL_STARTTLS';
-			if ($this->sendcontext == 'emailing' && !empty($conf->global->MAIN_MAIL_SENDMODE_EMAILING) && $conf->global->MAIN_MAIL_SENDMODE_EMAILING != 'default') {
-				$keyforsmtpserver = 'MAIN_MAIL_SMTP_SERVER_EMAILING';
-				$keyforsmtpport  = 'MAIN_MAIL_SMTP_PORT_EMAILING';
-				$keyforsmtpid    = 'MAIN_MAIL_SMTPS_ID_EMAILING';
-				$keyforsmtppw    = 'MAIN_MAIL_SMTPS_PW_EMAILING';
-				$keyfortls       = 'MAIN_MAIL_EMAIL_TLS_EMAILING';
-				$keyforstarttls  = 'MAIN_MAIL_EMAIL_STARTTLS_EMAILING';
+			$keyforsslseflsigned = 'MAIN_MAIL_EMAIL_SMTP_ALLOW_SELF_SIGNED';
+
+			if (!empty($this->sendcontext)) {
+				$smtpContextKey = strtoupper($this->sendcontext);
+				$smtpContextSendMode = getDolGlobalString('MAIN_MAIL_SENDMODE_'.$smtpContextKey);
+				if (!empty($smtpContextSendMode) && $smtpContextSendMode != 'default') {
+					$keyforsmtpserver = 'MAIN_MAIL_SMTP_SERVER_'.$smtpContextKey;
+					$keyforsmtpport   = 'MAIN_MAIL_SMTP_PORT_'.$smtpContextKey;
+					$keyforsmtpid     = 'MAIN_MAIL_SMTPS_ID_'.$smtpContextKey;
+					$keyforsmtppw     = 'MAIN_MAIL_SMTPS_PW_'.$smtpContextKey;
+					$keyforsmtpauthtype = 'MAIN_MAIL_SMTPS_AUTH_TYPE_'.$smtpContextKey;
+					$keyforsmtpoauthservice = 'MAIN_MAIL_SMTPS_OAUTH_SERVICE_'.$smtpContextKey;
+					$keyfortls        = 'MAIN_MAIL_EMAIL_TLS_'.$smtpContextKey;
+					$keyforstarttls   = 'MAIN_MAIL_EMAIL_STARTTLS_'.$smtpContextKey;
+					$keyforsslseflsigned = 'MAIN_MAIL_EMAIL_SMTP_ALLOW_SELF_SIGNED_'.$smtpContextKey;
+				}
 			}
 
 			// If we use SSL/TLS

From 6a1b33b5ad91b5188dd79f290b37dbcebe547590 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 31 Aug 2022 14:55:53 +0200
Subject: [PATCH 424/974] Update index.php

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

diff --git a/htdocs/takepos/index.php b/htdocs/takepos/index.php
index 4ee3d1cbe2a..004ce45c459 100644
--- a/htdocs/takepos/index.php
+++ b/htdocs/takepos/index.php
@@ -58,7 +58,7 @@ $setterminal = GETPOST('setterminal', 'int');
 $setcurrency = GETPOST('setcurrency', 'aZ09');
 
 if (empty($_SESSION["takeposterminal"])) {
-	if (getDolGlobalInt('TAKEPOS_NUM_TERMINALS') == "1") {
+	if (getDolGlobalInt('TAKEPOS_NUM_TERMINALS') == 1) {
 		$_SESSION["takeposterminal"] = 1; // Use terminal 1 if there is only 1 terminal
 	} elseif (!empty($_COOKIE["takeposterminal"])) {
 		$_SESSION["takeposterminal"] = preg_replace('/[^a-zA-Z0-9_\-]/', '', $_COOKIE["takeposterminal"]); // Restore takeposterminal from previous session

From 204c223b8bd83df136def30b85f80533b558bee8 Mon Sep 17 00:00:00 2001
From: Adventurousdonut <110562645+Adventurousdonut@users.noreply.github.com>
Date: Wed, 31 Aug 2022 15:16:15 +0200
Subject: [PATCH 425/974] Update llx_accounting_account_at.sql

---
 .../mysql/data/llx_accounting_account_at.sql  | 208 ++++++++++++++++++
 1 file changed, 208 insertions(+)

diff --git a/htdocs/install/mysql/data/llx_accounting_account_at.sql b/htdocs/install/mysql/data/llx_accounting_account_at.sql
index 3e153dc88e7..a006d716432 100644
--- a/htdocs/install/mysql/data/llx_accounting_account_at.sql
+++ b/htdocs/install/mysql/data/llx_accounting_account_at.sql
@@ -344,3 +344,211 @@ INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, acc
 INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 319, 'AT-BASE','GROUP6','60000','0','kalk. Löhne u Gehälter', 1);
 INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 320, 'AT-BASE','GROUP6','64160','0','Veränderung Pensionsrückstellung (Angestellte)', 1);
 INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 321, 'AT-BASE','GROUP6','66300','0','Leistungserfassung', 1);
+
+-- Different Base CoA for Austria
+
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1, 'AT-BASE-2', 'Anlagevermögen', '0010', '0', 'Aufwendungen für das Ingangsetzen und Erweitern eines Betriebes', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 2, 'AT-BASE-2', 'Anlagevermögen', '0090', '0', 'Kumulierte Abschreibungen', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 3, 'AT-BASE-2', 'Anlagevermögen', '0100', '0', 'Konzessionen', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 4, 'AT-BASE-2', 'Anlagevermögen', '0110', '0', 'Patentrechte und Lizenzen', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 5, 'AT-BASE-2', 'Anlagevermögen', '0120', '0', 'Datenverarbeitungsprogramme', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 6, 'AT-BASE-2', 'Anlagevermögen', '0121', '0', 'Geringwertige Datenverarbeitungsprogramme', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7, 'AT-BASE-2', 'Anlagevermögen', '0130', '0', 'Marken, Warenzeichen und Musterschutzrechte, sonstige Urheberrechte', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 8, 'AT-BASE-2', 'Anlagevermögen', '0140', '0', 'Pacht- und Mietrechte', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 9, 'AT-BASE-2', 'Anlagevermögen', '0150', '0', 'Geschäfts(Firmen)wert', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10, 'AT-BASE-2', 'Anlagevermögen', '0180', '0', 'Geleistete Anzahlungen', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11, 'AT-BASE-2', 'Anlagevermögen', '0190', '0', 'Kumulierte Abschreibungen', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 12, 'AT-BASE-2', 'Sachanlagen', '0200', '0', 'Unbebaute Grundstücke', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 13, 'AT-BASE-2', 'Sachanlagen', '0210', '0', 'Bebaute Grundstücke (Grundwert)', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 14, 'AT-BASE-2', 'Sachanlagen', '0220', '0', 'Grundstücksgleiche Rechte', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 15, 'AT-BASE-2', 'Sachanlagen', '0300', '0', 'Betriebs- und Geschäftsgebäude auf eigenem Grund', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 16, 'AT-BASE-2', 'Sachanlagen', '0310', '0', 'Wohn- und Sozialgebäude auf eigenem Grund', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17, 'AT-BASE-2', 'Sachanlagen', '0320', '0', 'Betriebs- und Geschäftsgebäude auf fremdem Grund', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 18, 'AT-BASE-2', 'Sachanlagen', '0330', '0', 'Wohn- und Sozialgebäude auf fremdem Grund', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 19, 'AT-BASE-2', 'Sachanlagen', '0340', '0', 'Grundstückseinrichtungen auf eigenem Grund', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 20, 'AT-BASE-2', 'Sachanlagen', '0350', '0', 'Grundstückseinrichtungen auf fremdem Grund', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 21, 'AT-BASE-2', 'Sachanlagen', '0360', '0', 'Bauliche Investitionen in fremden (gepachteten) Betriebs- und Geschäftsgebäuden', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 22, 'AT-BASE-2', 'Sachanlagen', '0370', '0', 'Bauliche Investitionen in fremden (gepachteten) Wohn- und Sozialgebäuden', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 23, 'AT-BASE-2', 'Sachanlagen', '0390', '0', 'Kumulierte Abschreibungen', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 24, 'AT-BASE-2', 'Sachanlagen', '0400', '0', 'Fertigungsmaschinen', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 25, 'AT-BASE-2', 'Sachanlagen', '0410', '0', 'Antriebsmaschinen', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 26, 'AT-BASE-2', 'Sachanlagen', '0420', '0', 'Energieversorgungsanlagen', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 27, 'AT-BASE-2', 'Sachanlagen', '0430', '0', 'Transportanlagen', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 28, 'AT-BASE-2', 'Sachanlagen', '0500', '0', 'Maschinenwerkzeuge', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 29, 'AT-BASE-2', 'Sachanlagen', '0510', '0', 'Allgemeine Werkzeuge und Handwerkzeuge', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 30, 'AT-BASE-2', 'Sachanlagen', '0520', '0', 'Vorrichtungen, Formen und Modelle', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 31, 'AT-BASE-2', 'Sachanlagen', '0530', '0', 'Andere Erzeugungshilfsmittel', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 32, 'AT-BASE-2', 'Sachanlagen', '0540', '0', 'Hebezeuge und Montageanlagen', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 33, 'AT-BASE-2', 'Sachanlagen', '0550', '0', 'Geringwertige Vermögensgegenstände, soweit im Erzeugungsprozeß verwendet', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 34, 'AT-BASE-2', 'Sachanlagen', '0600', '0', 'Beheizungs- und Beleuchtungsanlagen', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 35, 'AT-BASE-2', 'Sachanlagen', '0610', '0', 'Nachrichten- und Kontrollanlagen', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 36, 'AT-BASE-2', 'Sachanlagen', '0620', '0', 'Büromaschinen, EDV-Anlagen', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 37, 'AT-BASE-2', 'Sachanlagen', '0630', '0', 'PKW', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 38, 'AT-BASE-2', 'Sachanlagen', '0640', '0', 'LKW', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 39, 'AT-BASE-2', 'Sachanlagen', '0650', '0', 'Andere Beförderungsmittel', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 40, 'AT-BASE-2', 'Sachanlagen', '0660', '0', 'Andere Betriebs- und Geschäftsausstattung', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 41, 'AT-BASE-2', 'Sachanlagen', '0670', '0', 'Gebinde', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 42, 'AT-BASE-2', 'Sachanlagen', '0680', '0', 'Geringwertige Büromaschinen, EDV-Anlagen', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 43, 'AT-BASE-2', 'Sachanlagen', '0681', '0', 'Geringwertige Betriebs- und Geschäftsausstattung', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 44, 'AT-BASE-2', 'Sachanlagen', '0692', '0', 'Kumulierte Abschreibungen zu Büromaschinen, EDV-Anlagen', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 45, 'AT-BASE-2', 'Sachanlagen', '0693', '0', 'Kumulierte Abschreibungen zu PKW und Kombis', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 46, 'AT-BASE-2', 'Sachanlagen', '0694', '0', 'Kumulierte Abschreibungen zu LKW', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 47, 'AT-BASE-2', 'Sachanlagen', '0696', '0', 'Kumulierte Abschreibungen zur Betriebs- und Geschäftsausstattung', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 48, 'AT-BASE-2', 'Vorauszahlungen', '0700', '0', 'Geleistete Anzahlungen', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 49, 'AT-BASE-2', 'Sachanlagen', '0710', '0', 'Anlagen in Bau', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 50, 'AT-BASE-2', 'Sachanlagen', '0790', '0', 'Kumulierte Abschreibungen', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 51, 'AT-BASE-2', 'Anlagevermögen', '0800', '0', 'Anteile an verbundenen Unternehmen', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 52, 'AT-BASE-2', 'Anlagevermögen', '0810', '0', 'Beteiligungen an Gemeinschaftsunternehmen', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 53, 'AT-BASE-2', 'Anlagevermögen', '0820', '0', 'Beteiligungen an angeschlossenen (assoziierten) Unternehmen', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 54, 'AT-BASE-2', 'Anlagevermögen', '0830', '0', 'Sonstige Beteiligungen', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 55, 'AT-BASE-2', 'Anlagevermögen', '0840', '0', 'Ausleihungen an verbundene Unternehmen', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 56, 'AT-BASE-2', 'Anlagevermögen', '0850', '0', 'Ausleihungen an Unternehmen, mit denen ein Beteiligungsverhältnis besteht', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 57, 'AT-BASE-2', 'Anlagevermögen', '0860', '0', 'Sonstige Ausleihungen', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 58, 'AT-BASE-2', 'Anlagevermögen', '0870', '0', 'Anteile an Kapitalgesellschaften ohne Beteiligungscharakter', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 59, 'AT-BASE-2', 'Anlagevermögen', '0880', '0', 'Anteile an Personengesellschaften ohne Beteiligungscharakter', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 60, 'AT-BASE-2', 'Anlagevermögen', '0900', '0', 'Genossenschaftsanteile ohne Beteiligungscharakter', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 61, 'AT-BASE-2', 'Anlagevermögen', '0910', '0', 'Anteile an Investmentfonds', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 62, 'AT-BASE-2', 'Vorauszahlungen', '0980', '0', 'Geleistete Anzahlungen', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 63, 'AT-BASE-2', 'Anlagevermögen', '0990', '0', 'Kumulierte Abschreibungen', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 64, 'AT-BASE-2', 'Umlaufvermögen', '1600', '0', 'Handelswaren', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 65, 'AT-BASE-2', 'Vorauszahlungen', '1800', '0', 'Geleistete Anzahlungen', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 66, 'AT-BASE-2', 'Debitoren', '2000', '0', 'Forderungen von Partnern im Inland ohne eigenes Debitorenkonto', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 67, 'AT-BASE-2', 'Umlaufvermögen', '2080', '0', 'Einzelwertberichtigungen zu Forderungen aus Lieferungen und Leistungen Inland', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 68, 'AT-BASE-2', 'Umlaufvermögen', '2090', '0', 'Pauschalwertberichtigungen zu Forderungen aus Lieferungen und Leistungen Inland', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 69, 'AT-BASE-2', 'Debitoren', '2099', '0', 'Forderungen von Partnern (Point Of Sale)', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 70, 'AT-BASE-2', 'Debitoren', '2100', '0', 'Forderungen von Partnern im EU Raum ohne eigenes Debitorenkonto', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 71, 'AT-BASE-2', 'Umlaufvermögen', '2130', '0', 'Einzelwertberichtigungen zu Forderungen aus Lieferungen und Leistungen Währungsunion', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 72, 'AT-BASE-2', 'Umlaufvermögen', '2140', '0', 'Pauschalwertberichtigungen zu Forderungen aus Lieferungen und Leistungen Währungsunion', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 73, 'AT-BASE-2', 'Debitoren', '2150', '0', 'Forderungen von Partnern in Drittstaaten ohne eigenes Debitorenkonto', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 74, 'AT-BASE-2', 'Umlaufvermögen', '2180', '0', 'Einzelwertberichtigungen zu Forderungen aus Lieferungen und Leistungen sonstiges Ausland', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 75, 'AT-BASE-2', 'Umlaufvermögen', '2190', '0', 'Pauschalwertberichtigungen zu Forderungen aus Lieferungen und Leistungen sonstiges Ausland', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 76, 'AT-BASE-2', 'Umlaufvermögen', '2230', '0', 'Einzelwertberichtigungen zu Forderungen gegenüber verbundenen Unternehmen', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 77, 'AT-BASE-2', 'Umlaufvermögen', '2240', '0', 'Pauschalwertberichtigungen zu Forderungen gegenüber verbundenen Unternehmen', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 78, 'AT-BASE-2', 'Umlaufvermögen', '2280', '0', 'Einzelwertberichtigungen zu Forderungen gegenüber Unternehmen, mit denen ein Beteiligungsverhältnis besteht', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 79, 'AT-BASE-2', 'Umlaufvermögen', '2290', '0', 'Pauschalwertberichtigungen zu Forderungen gegenüber Unternehmen, mit denen ein Beteiligungsverhältnis besteht', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 80, 'AT-BASE-2', 'Umlaufvermögen', '2470', '0', 'Eingeforderte, aber noch nicht eingezahlte Einlagen', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 81, 'AT-BASE-2', 'Umlaufvermögen', '2480', '0', 'Einzelwertberichtigungen zu sonstigen Forderungen und Vermögensgegenständen', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 82, 'AT-BASE-2', 'Umlaufvermögen', '2490', '0', 'Pauschalwertberichtigungen zu sonstigen Forderungen und Vermögensgegenständen', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 83, 'AT-BASE-2', 'Umlaufvermögen', '2500', '0', 'Vorsteuern 20%', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 84, 'AT-BASE-2', 'Umlaufvermögen', '2501', '0', 'Vorsteuern 10%', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 85, 'AT-BASE-2', 'Umlaufvermögen', '2502', '0', 'Vorsteuern 13%', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 86, 'AT-BASE-2', 'Umlaufvermögen', '2505', '0', 'Sonstige Vorsteuern', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 87, 'AT-BASE-2', 'Umlaufvermögen', '2506', '0', 'Vorsteuern RC 20%', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 88, 'AT-BASE-2', 'Umlaufvermögen', '2507', '0', 'Vorsteuern RC 10%', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 89, 'AT-BASE-2', 'Umlaufvermögen', '2510', '0', 'Vorsteuern RC EU 20%', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 90, 'AT-BASE-2', 'Umlaufvermögen', '2511', '0', 'Vorsteuern IGE 20%', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 91, 'AT-BASE-2', 'Umlaufvermögen', '2512', '0', 'Vorsteuern IGE 10%', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 92, 'AT-BASE-2', 'Umlaufvermögen', '2513', '0', 'Vorsteuern IGE 13%', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 93, 'AT-BASE-2', 'Umlaufvermögen', '2515', '0', 'Vorsteuern 20% (aus EUSt.)', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 94, 'AT-BASE-2', 'Umlaufvermögen', '2600', '0', 'Eigene Anteile', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 95, 'AT-BASE-2', 'Umlaufvermögen', '2610', '0', 'Anteile an verbundenen Unternehmen', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 96, 'AT-BASE-2', 'Umlaufvermögen', '2620', '0', 'Sonstige Anteile', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 97, 'AT-BASE-2', 'Umlaufvermögen', '2680', '0', 'Besitzwechsel, soweit dem Unternehmen nicht die der Ausstellung zugrundeliegenden Forderungen zustehen', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 98, 'AT-BASE-2', 'Umlaufvermögen', '2690', '0', 'Wertberichtigungen', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 99, 'AT-BASE-2', 'Liquide Mittel', '2701', '0', 'Kasse/Bank', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 100, 'AT-BASE-2', 'Umlaufvermögen', '2730', '0', 'Postwertzeichen', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 101, 'AT-BASE-2', 'Umlaufvermögen', '2740', '0', 'Stempelmarken', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 102, 'AT-BASE-2', 'Umlaufvermögen', '2780', '0', 'Schecks in Inlandswährung', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 103, 'AT-BASE-2', 'Umlaufvermögen', '2801', '0', 'Bankzwischenkonto', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 104, 'AT-BASE-2', 'Umlaufvermögen', '2802', '0', 'Ausstehende Quittungen', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 105, 'AT-BASE-2', 'Umlaufvermögen', '2803', '0', 'Ausstehende Zahlungen', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 106, 'AT-BASE-2', 'Liquide Mittel', '2804', '0', 'Bank', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 107, 'AT-BASE-2', 'Umlaufvermögen', '2880', '0', 'Schwebende Geldbewegungen', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 108, 'AT-BASE-2', 'Umlaufvermögen', '2881', '0', 'Liquiditätstransfer', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 109, 'AT-BASE-2', 'Umlaufvermögen', '2890', '0', 'Wertberichtigungen', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 110, 'AT-BASE-2', 'Umlaufvermögen', '2900', '0', 'Aktive Rechnungsabgrenzungsposten', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 111, 'AT-BASE-2', 'Umlaufvermögen', '2950', '0', 'Disagio', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 112, 'AT-BASE-2', 'Umlaufvermögen', '2960', '0', 'Unterschiedsbetrag zur gebotenen Pensionsrückstellung', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 113, 'AT-BASE-2', 'Umlaufvermögen', '2970', '0', 'Unterschiedsbetrag gem. Abschnitt XII Pensionskassengesetz', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 114, 'AT-BASE-2', 'Umlaufvermögen', '2980', '0', 'Steuerabgrenzung', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 115, 'AT-BASE-2', 'Langfristige Verbindlichkeiten', '3000', '0', 'Rückstellungen für Abfertigungen', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 116, 'AT-BASE-2', 'Langfristige Verbindlichkeiten', '3010', '0', 'Rückstellungen für Pensionen', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 117, 'AT-BASE-2', 'Umlaufvermögen', '3100', '0', 'Anleihen (einschließlich konvertibler)', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 118, 'AT-BASE-2', 'Umlaufvermögen', '3200', '0', 'Erhaltene Anzahlungen auf Bestellungen', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 119, 'AT-BASE-2', 'Kurzfristige Verbindlichkeiten', '3210', '0', 'Umsatzsteuer-Evidenzkonto für erhaltene Anzahlungen auf Bestellungen', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 120, 'AT-BASE-2', 'Kreditoren', '3300', '0', 'Verbindlichkeiten bei Partnern im Inland ohne eigenes Kreditorenkonto', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 121, 'AT-BASE-2', 'Kreditoren', '3360', '0', 'Verbindlichkeiten bei Partnern im EU Raum ohne eigenes Kreditorenkonto', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 122, 'AT-BASE-2', 'Kreditoren', '3370', '0', 'Verbindlichkeiten bei Partnern in Drittstaaten ohne eigenes Kreditorenkonto', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 123, 'AT-BASE-2', 'Kurzfristige Verbindlichkeiten', '3480', '0', 'Verbindlichkeiten gegenüber Gesellschaftern', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 124, 'AT-BASE-2', 'Kurzfristige Verbindlichkeiten', '3500', '0', 'Umsatzsteuer 20%', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 125, 'AT-BASE-2', 'Kurzfristige Verbindlichkeiten', '3501', '0', 'Umsatzsteuer 10%', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 126, 'AT-BASE-2', 'Kurzfristige Verbindlichkeiten', '3502', '0', 'Umsatzsteuer 13%', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 127, 'AT-BASE-2', 'Kurzfristige Verbindlichkeiten', '3505', '0', 'Sonstige Umsatzsteuer', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 128, 'AT-BASE-2', 'Kurzfristige Verbindlichkeiten', '3510', '0', 'Umsatzsteuer RC EU 20%', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 129, 'AT-BASE-2', 'Kurzfristige Verbindlichkeiten', '3511', '0', 'Umsatzsteuer IGE 20%', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 130, 'AT-BASE-2', 'Kurzfristige Verbindlichkeiten', '3512', '0', 'Umsatzsteuer IGE 10%', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 131, 'AT-BASE-2', 'Kurzfristige Verbindlichkeiten', '3513', '0', 'Umsatzsteuer IGE 13%', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 132, 'AT-BASE-2', 'Kurzfristige Verbindlichkeiten', '3515', '0', 'Einfuhrumsatzsteuer 20%', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 133, 'AT-BASE-2', 'Kurzfristige Verbindlichkeiten', '3520', '0', 'Ust. Zahllast', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 134, 'AT-BASE-2', 'Kreditoren', '3530', '0', 'Verrechnungskonto Finanzamt', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 135, 'AT-BASE-2', 'Kurzfristige Verbindlichkeiten', '3540', '0', 'Verrechnung Lohnsteuer', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 136, 'AT-BASE-2', 'Kurzfristige Verbindlichkeiten', '3541', '0', 'Verrechnung Dienstgeberbeitrag', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 137, 'AT-BASE-2', 'Kurzfristige Verbindlichkeiten', '3542', '0', 'Verrechnung Dienstgeberzuschlag', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 138, 'AT-BASE-2', 'Kurzfristige Verbindlichkeiten', '3550', '0', 'Verrechnung Kommunalsteuer', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 139, 'AT-BASE-2', 'Kurzfristige Verbindlichkeiten', '3551', '0', 'Verrechnung Wiener Dienstgeberabgabe', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 140, 'AT-BASE-2', 'Kreditoren', '3600', '0', 'Verrechungskonto Sozialversicherung', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 141, 'AT-BASE-2', 'Kreditoren', '3610', '0', 'Verrechnungskonto Magistrat/Gemeinde (KoSt, U-Bahn, etc.)', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 142, 'AT-BASE-2', 'Kreditoren', '3740', '0', 'WERE Verrechnungskonto', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 143, 'AT-BASE-2', 'Erlöse', '4000', '0', 'Brutto-Umsatzerlöse im Inland (20%)', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 144, 'AT-BASE-2', 'Erlöse', '4001', '0', 'Brutto-Umsatzerlöse im Inland (10%)', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 145, 'AT-BASE-2', 'Erlöse', '4100', '0', 'Brutto-Umsatzerlöse im EU Raum (RC 20%)', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 146, 'AT-BASE-2', 'Erlöse', '4110', '0', 'Brutto-Umsatzerlöse im EU Raum (RC 10%)', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 147, 'AT-BASE-2', 'Erlöse', '4200', '0', 'Brutto-Umsatzerlöse in Drittstaaten (0%)', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 148, 'AT-BASE-2', 'Sonstige betriebliche Erträge', '4860', '0', 'Kursgewinne aus Fremdwährungstransaktionen', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 149, 'AT-BASE-2', 'Aufwand', '5000', '0', 'Wareneinkauf', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 150, 'AT-BASE-2', 'Aufwand', '5050', '0', 'Wareneinkauf EU', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 151, 'AT-BASE-2', 'Aufwand', '5090', '0', 'Wareneinkauf 0%', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 152, 'AT-BASE-2', 'Aufwand', '5800', '0', 'Skontoerträge auf Materialaufwand', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 153, 'AT-BASE-2', 'Aufwand', '5810', '0', 'Skontoerträge auf sonstige bezogene Herstellungsleistungen', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 154, 'AT-BASE-2', 'Aufwand', '5900', '0', 'Aufwandsstellenrechnung', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 155, 'AT-BASE-2', 'Aufwand', '6200', '0', 'Gehälter (Angestellte)', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 156, 'AT-BASE-2', 'Aufwand', '6205', '0', 'Geschäftsführerbezug', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 157, 'AT-BASE-2', 'Aufwand', '6242', '0', 'Urlaubsabfindung (Angestellte)', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 158, 'AT-BASE-2', 'Aufwand', '6260', '0', 'Sonstige Bezüge (Angestellte)', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 159, 'AT-BASE-2', 'Aufwand', '6270', '0', 'Sachbezug (Angestellte)', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 160, 'AT-BASE-2', 'Aufwand', '6271', '0', 'Sachbezug (Geschäftsführer)', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 161, 'AT-BASE-2', 'Aufwand', '6310', '0', 'Grundgehälter (Überstunden)', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 162, 'AT-BASE-2', 'Aufwand', '6330', '0', 'Gehälter (Überstundenzuschläge)', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 163, 'AT-BASE-2', 'Aufwand', '6340', '0', 'Veränderung noch nicht konsumierter Urlaub', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 164, 'AT-BASE-2', 'Aufwand', '6400', '0', 'Beiträge für betriebliche Mitarbeitervorsorgekasse', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 165, 'AT-BASE-2', 'Aufwand', '6560', '0', 'Gesetzlicher Sozialaufwand', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 166, 'AT-BASE-2', 'Aufwand', '6660', '0', 'Kommunalsteuer (KoSt)', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 167, 'AT-BASE-2', 'Aufwand', '6661', '0', 'Dienstgeberbeitrag zum Familienlastenausgleichsfonds (DB)', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 168, 'AT-BASE-2', 'Aufwand', '6662', '0', 'Zuschlag zum Dienstnehmerbeitrag (DZ)', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 169, 'AT-BASE-2', 'Aufwand', '6663', '0', 'Dienstgeberabgabe der Gemeinde Wien (U-Bahn Steuer)', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 170, 'AT-BASE-2', 'Aufwand', '6700', '0', 'Sonstiger freiwilliger Sozialaufwand', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 171, 'AT-BASE-2', 'Aufwand', '6900', '0', 'Aufwandsstellenrechnung', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 172, 'AT-BASE-2', 'Abschreibungen', '7000', '0', 'Abschreibungen auf aktivierte Aufwendungen für das Ingangsetzen und Erweitern eines Betriebes', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 173, 'AT-BASE-2', 'Abschreibungen', '7090', '0', 'Abschreibungen vom Umlaufvermögen, soweit diese die im Unternehmen üblichen Abschreibungen übersteigen', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 174, 'AT-BASE-2', 'Aufwand', '7600', '0', 'Büromaterial und Drucksorten', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 175, 'AT-BASE-2', 'Aufwand', '7630', '0', 'Fachliteratur und Zeitungen', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 176, 'AT-BASE-2', 'Aufwand', '7690', '0', 'Spenden und Trinkgelder', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 177, 'AT-BASE-2', 'Aufwand', '7770', '0', 'Aus- und Fortbildung', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 178, 'AT-BASE-2', 'Aufwand', '7780', '0', 'Mitgliedsbeiträge', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 179, 'AT-BASE-2', 'Aufwand', '7790', '0', 'Spesen des Geldverkehrs', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 180, 'AT-BASE-2', 'Aufwand', '7820', '0', 'Buchwert abgegangener Anlagen, ausgenommen Finanzanlagen', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 181, 'AT-BASE-2', 'Aufwand', '7830', '0', 'Verluste aus dem Abgang vom Anlagevermögen, ausgenommen Finanzanlagen', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 182, 'AT-BASE-2', 'Aufwand', '7860', '0', 'Kursverluste aus Fremdwährungstransaktionen', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 183, 'AT-BASE-2', 'Aufwand', '7890', '0', 'Skontoerträge auf sonstige betriebliche Aufwendungen', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 184, 'AT-BASE-2', 'Aufwand', '7900', '0', 'Aufwandsstellenrechnung', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 185, 'AT-BASE-2', 'Aufwand', '7960', '0', 'Herstellungskosten der zur Erzielung der Umsatzerlöse erbrachten Leistungen', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 186, 'AT-BASE-2', 'Aufwand', '7970', '0', 'Vertriebskosten', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 187, 'AT-BASE-2', 'Aufwand', '7980', '0', 'Verwaltungskosten', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 188, 'AT-BASE-2', 'Aufwand', '7990', '0', 'Sonstige betriebliche Aufwendungen', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 189, 'AT-BASE-2', 'Sonstige betriebliche Erträge', '8140', '0', 'Erlöse aus dem Abgang von Beteiligungen', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 190, 'AT-BASE-2', 'Sonstige betriebliche Erträge', '8150', '0', 'Erlöse aus dem Abgang von sonstigen Finanzanlagen', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 191, 'AT-BASE-2', 'Sonstige betriebliche Erträge', '8160', '0', 'Erlöse aus dem Abgang von Wertpapieren des Umlaufvermögens', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 192, 'AT-BASE-2', 'Sonstige betriebliche Erträge', '8170', '0', 'Buchwert abgegangener Beteiligungen', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 193, 'AT-BASE-2', 'Sonstige betriebliche Erträge', '8180', '0', 'Buchwert abgegangener sonstiger Finanzanlagen', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 194, 'AT-BASE-2', 'Sonstige betriebliche Erträge', '8190', '0', 'Buchwert abgegangener Wertpapiere des Umlaufvermögens', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 195, 'AT-BASE-2', 'Sonstige betriebliche Erträge', '8200', '0', 'Erträge aus dem Abgang von und der Zuschreibung zu Finanzanlagen', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 196, 'AT-BASE-2', 'Sonstige betriebliche Erträge', '8210', '0', 'Erträge aus dem Abgang von und der Zuschreibung zu Wertpapieren des Umlaufvermögens', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 197, 'AT-BASE-2', 'Sonstige betriebliche Erträge', '8350', '0', 'Nicht ausgenützte Lieferantenskonti', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 198, 'AT-BASE-2', 'Sonstige betriebliche Erträge', '8990', '0', 'Gewinnabfuhr bzw. Verlustüberrechnung aus Ergebnisabführungsverträgen', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 199, 'AT-BASE-2', 'Eigenkapital', '9190', '0', 'Nicht eingeforderte ausstehende Einlagen', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 200, 'AT-BASE-2', 'Eigenkapital', '9390', '0', 'Bilanzgewinn (-verlust)', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 201, 'AT-BASE-2', 'Eigenkapital', '9800', '0', 'Eröffnungsbilanz', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 202, 'AT-BASE-2', 'Eigenkapital', '9850', '0', 'Schlussbilanz', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 203, 'AT-BASE-2', 'Eigenkapital', '9890', '0', 'Gewinn- und Verlustrechnung', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 204, 'AT-BASE-2', 'Aufwand', '9991', '0', 'Bargelddifferenz Verlust', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 205, 'AT-BASE-2', 'Erlöse', '9992', '0', 'Bargelddifferenz Gewinn', 1);

From db6d345e54a7727e89fdf9bf6f7b6ad15327429f Mon Sep 17 00:00:00 2001
From: lmarcouiller <lucas.marcouiller@gmail.com>
Date: Tue, 30 Aug 2022 11:31:20 +0200
Subject: [PATCH 426/974] Fix #21810 : Broken statistics in project module

---
 htdocs/projet/class/projectstats.class.php | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/htdocs/projet/class/projectstats.class.php b/htdocs/projet/class/projectstats.class.php
index 9b2314deacc..f1295c10424 100644
--- a/htdocs/projet/class/projectstats.class.php
+++ b/htdocs/projet/class/projectstats.class.php
@@ -528,4 +528,22 @@ class ProjectStats extends Stats
 		// var_dump($res);print '<br>';
 		return $res;
 	}
+
+	/**
+	 * Return average of entity by month
+	 * @param	int     $year           year number
+	 * @return 	int						value
+	 */
+	protected function getAverageByMonth($year)
+	{
+		$sql = "SELECT date_format(datef,'%m') as dm, AVG(f.".$this->field.")";
+		$sql .= " FROM ".$this->from;
+		$sql .= $this->join;
+		$sql .= " WHERE f.datef 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');
+
+		return $this->_getAverageByMonth($year, $sql);
+	}
 }

From 30475a8ce63a64d4f93251fe874706adf9b8ee03 Mon Sep 17 00:00:00 2001
From: ptibogxiv <support@ptibogxiv.net>
Date: Tue, 30 Aug 2022 17:26:18 +0200
Subject: [PATCH 427/974] Fix updating member

need functions2.lib.php for clean_url()
---
 htdocs/adherents/class/adherent.class.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/htdocs/adherents/class/adherent.class.php b/htdocs/adherents/class/adherent.class.php
index f5784b43fb2..b65946af622 100644
--- a/htdocs/adherents/class/adherent.class.php
+++ b/htdocs/adherents/class/adherent.class.php
@@ -655,6 +655,8 @@ class Adherent extends CommonObject
 	public function update($user, $notrigger = 0, $nosyncuser = 0, $nosyncuserpass = 0, $nosyncthirdparty = 0, $action = 'update')
 	{
 		global $conf, $langs, $hookmanager;
+		
+		require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 
 		require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 

From 5c135b59eba913a5351842c721c615a2e3926ab2 Mon Sep 17 00:00:00 2001
From: Christian Foellmann <christian@foellmann.de>
Date: Tue, 30 Aug 2022 09:10:03 +0200
Subject: [PATCH 428/974] require missing signture.lib.php

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

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 89cf3819d7e..f5206c700d0 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -7288,6 +7288,7 @@ function getCommonSubstitutionArray($outputlangs, $onlykey = 0, $exclude = null,
 				$substitutionarray['__ONLINE_PAYMENT_URL__'] = $paymenturl;
 
 				if (is_object($object) && $object->element == 'propal') {
+					require_once DOL_DOCUMENT_ROOT.'/core/lib/signature.lib.php';
 					$substitutionarray['__ONLINE_SIGN_URL__'] = getOnlineSignatureUrl(0, 'proposal', $object->ref);
 				}
 				if (!empty($conf->global->PROPOSAL_ALLOW_EXTERNAL_DOWNLOAD) && is_object($object) && $object->element == 'propal') {

From 596fcd89ae2d80537af1f05d2d9b53a091ea965f Mon Sep 17 00:00:00 2001
From: Adventurousdonut <110562645+Adventurousdonut@users.noreply.github.com>
Date: Wed, 31 Aug 2022 15:52:53 +0200
Subject: [PATCH 429/974] Update llx_accounting_account_at.sql

---
 .../mysql/data/llx_accounting_account_at.sql  | 410 +++++++++---------
 1 file changed, 205 insertions(+), 205 deletions(-)

diff --git a/htdocs/install/mysql/data/llx_accounting_account_at.sql b/htdocs/install/mysql/data/llx_accounting_account_at.sql
index a006d716432..08cf24ec51a 100644
--- a/htdocs/install/mysql/data/llx_accounting_account_at.sql
+++ b/htdocs/install/mysql/data/llx_accounting_account_at.sql
@@ -347,208 +347,208 @@ INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, acc
 
 -- Different Base CoA for Austria
 
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1, 'AT-BASE-2', 'Anlagevermögen', '0010', '0', 'Aufwendungen für das Ingangsetzen und Erweitern eines Betriebes', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 2, 'AT-BASE-2', 'Anlagevermögen', '0090', '0', 'Kumulierte Abschreibungen', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 3, 'AT-BASE-2', 'Anlagevermögen', '0100', '0', 'Konzessionen', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 4, 'AT-BASE-2', 'Anlagevermögen', '0110', '0', 'Patentrechte und Lizenzen', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 5, 'AT-BASE-2', 'Anlagevermögen', '0120', '0', 'Datenverarbeitungsprogramme', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 6, 'AT-BASE-2', 'Anlagevermögen', '0121', '0', 'Geringwertige Datenverarbeitungsprogramme', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7, 'AT-BASE-2', 'Anlagevermögen', '0130', '0', 'Marken, Warenzeichen und Musterschutzrechte, sonstige Urheberrechte', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 8, 'AT-BASE-2', 'Anlagevermögen', '0140', '0', 'Pacht- und Mietrechte', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 9, 'AT-BASE-2', 'Anlagevermögen', '0150', '0', 'Geschäfts(Firmen)wert', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10, 'AT-BASE-2', 'Anlagevermögen', '0180', '0', 'Geleistete Anzahlungen', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11, 'AT-BASE-2', 'Anlagevermögen', '0190', '0', 'Kumulierte Abschreibungen', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 12, 'AT-BASE-2', 'Sachanlagen', '0200', '0', 'Unbebaute Grundstücke', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 13, 'AT-BASE-2', 'Sachanlagen', '0210', '0', 'Bebaute Grundstücke (Grundwert)', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 14, 'AT-BASE-2', 'Sachanlagen', '0220', '0', 'Grundstücksgleiche Rechte', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 15, 'AT-BASE-2', 'Sachanlagen', '0300', '0', 'Betriebs- und Geschäftsgebäude auf eigenem Grund', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 16, 'AT-BASE-2', 'Sachanlagen', '0310', '0', 'Wohn- und Sozialgebäude auf eigenem Grund', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17, 'AT-BASE-2', 'Sachanlagen', '0320', '0', 'Betriebs- und Geschäftsgebäude auf fremdem Grund', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 18, 'AT-BASE-2', 'Sachanlagen', '0330', '0', 'Wohn- und Sozialgebäude auf fremdem Grund', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 19, 'AT-BASE-2', 'Sachanlagen', '0340', '0', 'Grundstückseinrichtungen auf eigenem Grund', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 20, 'AT-BASE-2', 'Sachanlagen', '0350', '0', 'Grundstückseinrichtungen auf fremdem Grund', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 21, 'AT-BASE-2', 'Sachanlagen', '0360', '0', 'Bauliche Investitionen in fremden (gepachteten) Betriebs- und Geschäftsgebäuden', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 22, 'AT-BASE-2', 'Sachanlagen', '0370', '0', 'Bauliche Investitionen in fremden (gepachteten) Wohn- und Sozialgebäuden', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 23, 'AT-BASE-2', 'Sachanlagen', '0390', '0', 'Kumulierte Abschreibungen', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 24, 'AT-BASE-2', 'Sachanlagen', '0400', '0', 'Fertigungsmaschinen', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 25, 'AT-BASE-2', 'Sachanlagen', '0410', '0', 'Antriebsmaschinen', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 26, 'AT-BASE-2', 'Sachanlagen', '0420', '0', 'Energieversorgungsanlagen', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 27, 'AT-BASE-2', 'Sachanlagen', '0430', '0', 'Transportanlagen', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 28, 'AT-BASE-2', 'Sachanlagen', '0500', '0', 'Maschinenwerkzeuge', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 29, 'AT-BASE-2', 'Sachanlagen', '0510', '0', 'Allgemeine Werkzeuge und Handwerkzeuge', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 30, 'AT-BASE-2', 'Sachanlagen', '0520', '0', 'Vorrichtungen, Formen und Modelle', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 31, 'AT-BASE-2', 'Sachanlagen', '0530', '0', 'Andere Erzeugungshilfsmittel', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 32, 'AT-BASE-2', 'Sachanlagen', '0540', '0', 'Hebezeuge und Montageanlagen', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 33, 'AT-BASE-2', 'Sachanlagen', '0550', '0', 'Geringwertige Vermögensgegenstände, soweit im Erzeugungsprozeß verwendet', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 34, 'AT-BASE-2', 'Sachanlagen', '0600', '0', 'Beheizungs- und Beleuchtungsanlagen', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 35, 'AT-BASE-2', 'Sachanlagen', '0610', '0', 'Nachrichten- und Kontrollanlagen', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 36, 'AT-BASE-2', 'Sachanlagen', '0620', '0', 'Büromaschinen, EDV-Anlagen', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 37, 'AT-BASE-2', 'Sachanlagen', '0630', '0', 'PKW', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 38, 'AT-BASE-2', 'Sachanlagen', '0640', '0', 'LKW', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 39, 'AT-BASE-2', 'Sachanlagen', '0650', '0', 'Andere Beförderungsmittel', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 40, 'AT-BASE-2', 'Sachanlagen', '0660', '0', 'Andere Betriebs- und Geschäftsausstattung', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 41, 'AT-BASE-2', 'Sachanlagen', '0670', '0', 'Gebinde', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 42, 'AT-BASE-2', 'Sachanlagen', '0680', '0', 'Geringwertige Büromaschinen, EDV-Anlagen', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 43, 'AT-BASE-2', 'Sachanlagen', '0681', '0', 'Geringwertige Betriebs- und Geschäftsausstattung', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 44, 'AT-BASE-2', 'Sachanlagen', '0692', '0', 'Kumulierte Abschreibungen zu Büromaschinen, EDV-Anlagen', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 45, 'AT-BASE-2', 'Sachanlagen', '0693', '0', 'Kumulierte Abschreibungen zu PKW und Kombis', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 46, 'AT-BASE-2', 'Sachanlagen', '0694', '0', 'Kumulierte Abschreibungen zu LKW', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 47, 'AT-BASE-2', 'Sachanlagen', '0696', '0', 'Kumulierte Abschreibungen zur Betriebs- und Geschäftsausstattung', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 48, 'AT-BASE-2', 'Vorauszahlungen', '0700', '0', 'Geleistete Anzahlungen', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 49, 'AT-BASE-2', 'Sachanlagen', '0710', '0', 'Anlagen in Bau', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 50, 'AT-BASE-2', 'Sachanlagen', '0790', '0', 'Kumulierte Abschreibungen', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 51, 'AT-BASE-2', 'Anlagevermögen', '0800', '0', 'Anteile an verbundenen Unternehmen', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 52, 'AT-BASE-2', 'Anlagevermögen', '0810', '0', 'Beteiligungen an Gemeinschaftsunternehmen', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 53, 'AT-BASE-2', 'Anlagevermögen', '0820', '0', 'Beteiligungen an angeschlossenen (assoziierten) Unternehmen', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 54, 'AT-BASE-2', 'Anlagevermögen', '0830', '0', 'Sonstige Beteiligungen', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 55, 'AT-BASE-2', 'Anlagevermögen', '0840', '0', 'Ausleihungen an verbundene Unternehmen', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 56, 'AT-BASE-2', 'Anlagevermögen', '0850', '0', 'Ausleihungen an Unternehmen, mit denen ein Beteiligungsverhältnis besteht', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 57, 'AT-BASE-2', 'Anlagevermögen', '0860', '0', 'Sonstige Ausleihungen', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 58, 'AT-BASE-2', 'Anlagevermögen', '0870', '0', 'Anteile an Kapitalgesellschaften ohne Beteiligungscharakter', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 59, 'AT-BASE-2', 'Anlagevermögen', '0880', '0', 'Anteile an Personengesellschaften ohne Beteiligungscharakter', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 60, 'AT-BASE-2', 'Anlagevermögen', '0900', '0', 'Genossenschaftsanteile ohne Beteiligungscharakter', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 61, 'AT-BASE-2', 'Anlagevermögen', '0910', '0', 'Anteile an Investmentfonds', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 62, 'AT-BASE-2', 'Vorauszahlungen', '0980', '0', 'Geleistete Anzahlungen', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 63, 'AT-BASE-2', 'Anlagevermögen', '0990', '0', 'Kumulierte Abschreibungen', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 64, 'AT-BASE-2', 'Umlaufvermögen', '1600', '0', 'Handelswaren', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 65, 'AT-BASE-2', 'Vorauszahlungen', '1800', '0', 'Geleistete Anzahlungen', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 66, 'AT-BASE-2', 'Debitoren', '2000', '0', 'Forderungen von Partnern im Inland ohne eigenes Debitorenkonto', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 67, 'AT-BASE-2', 'Umlaufvermögen', '2080', '0', 'Einzelwertberichtigungen zu Forderungen aus Lieferungen und Leistungen Inland', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 68, 'AT-BASE-2', 'Umlaufvermögen', '2090', '0', 'Pauschalwertberichtigungen zu Forderungen aus Lieferungen und Leistungen Inland', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 69, 'AT-BASE-2', 'Debitoren', '2099', '0', 'Forderungen von Partnern (Point Of Sale)', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 70, 'AT-BASE-2', 'Debitoren', '2100', '0', 'Forderungen von Partnern im EU Raum ohne eigenes Debitorenkonto', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 71, 'AT-BASE-2', 'Umlaufvermögen', '2130', '0', 'Einzelwertberichtigungen zu Forderungen aus Lieferungen und Leistungen Währungsunion', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 72, 'AT-BASE-2', 'Umlaufvermögen', '2140', '0', 'Pauschalwertberichtigungen zu Forderungen aus Lieferungen und Leistungen Währungsunion', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 73, 'AT-BASE-2', 'Debitoren', '2150', '0', 'Forderungen von Partnern in Drittstaaten ohne eigenes Debitorenkonto', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 74, 'AT-BASE-2', 'Umlaufvermögen', '2180', '0', 'Einzelwertberichtigungen zu Forderungen aus Lieferungen und Leistungen sonstiges Ausland', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 75, 'AT-BASE-2', 'Umlaufvermögen', '2190', '0', 'Pauschalwertberichtigungen zu Forderungen aus Lieferungen und Leistungen sonstiges Ausland', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 76, 'AT-BASE-2', 'Umlaufvermögen', '2230', '0', 'Einzelwertberichtigungen zu Forderungen gegenüber verbundenen Unternehmen', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 77, 'AT-BASE-2', 'Umlaufvermögen', '2240', '0', 'Pauschalwertberichtigungen zu Forderungen gegenüber verbundenen Unternehmen', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 78, 'AT-BASE-2', 'Umlaufvermögen', '2280', '0', 'Einzelwertberichtigungen zu Forderungen gegenüber Unternehmen, mit denen ein Beteiligungsverhältnis besteht', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 79, 'AT-BASE-2', 'Umlaufvermögen', '2290', '0', 'Pauschalwertberichtigungen zu Forderungen gegenüber Unternehmen, mit denen ein Beteiligungsverhältnis besteht', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 80, 'AT-BASE-2', 'Umlaufvermögen', '2470', '0', 'Eingeforderte, aber noch nicht eingezahlte Einlagen', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 81, 'AT-BASE-2', 'Umlaufvermögen', '2480', '0', 'Einzelwertberichtigungen zu sonstigen Forderungen und Vermögensgegenständen', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 82, 'AT-BASE-2', 'Umlaufvermögen', '2490', '0', 'Pauschalwertberichtigungen zu sonstigen Forderungen und Vermögensgegenständen', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 83, 'AT-BASE-2', 'Umlaufvermögen', '2500', '0', 'Vorsteuern 20%', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 84, 'AT-BASE-2', 'Umlaufvermögen', '2501', '0', 'Vorsteuern 10%', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 85, 'AT-BASE-2', 'Umlaufvermögen', '2502', '0', 'Vorsteuern 13%', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 86, 'AT-BASE-2', 'Umlaufvermögen', '2505', '0', 'Sonstige Vorsteuern', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 87, 'AT-BASE-2', 'Umlaufvermögen', '2506', '0', 'Vorsteuern RC 20%', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 88, 'AT-BASE-2', 'Umlaufvermögen', '2507', '0', 'Vorsteuern RC 10%', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 89, 'AT-BASE-2', 'Umlaufvermögen', '2510', '0', 'Vorsteuern RC EU 20%', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 90, 'AT-BASE-2', 'Umlaufvermögen', '2511', '0', 'Vorsteuern IGE 20%', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 91, 'AT-BASE-2', 'Umlaufvermögen', '2512', '0', 'Vorsteuern IGE 10%', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 92, 'AT-BASE-2', 'Umlaufvermögen', '2513', '0', 'Vorsteuern IGE 13%', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 93, 'AT-BASE-2', 'Umlaufvermögen', '2515', '0', 'Vorsteuern 20% (aus EUSt.)', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 94, 'AT-BASE-2', 'Umlaufvermögen', '2600', '0', 'Eigene Anteile', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 95, 'AT-BASE-2', 'Umlaufvermögen', '2610', '0', 'Anteile an verbundenen Unternehmen', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 96, 'AT-BASE-2', 'Umlaufvermögen', '2620', '0', 'Sonstige Anteile', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 97, 'AT-BASE-2', 'Umlaufvermögen', '2680', '0', 'Besitzwechsel, soweit dem Unternehmen nicht die der Ausstellung zugrundeliegenden Forderungen zustehen', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 98, 'AT-BASE-2', 'Umlaufvermögen', '2690', '0', 'Wertberichtigungen', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 99, 'AT-BASE-2', 'Liquide Mittel', '2701', '0', 'Kasse/Bank', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 100, 'AT-BASE-2', 'Umlaufvermögen', '2730', '0', 'Postwertzeichen', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 101, 'AT-BASE-2', 'Umlaufvermögen', '2740', '0', 'Stempelmarken', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 102, 'AT-BASE-2', 'Umlaufvermögen', '2780', '0', 'Schecks in Inlandswährung', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 103, 'AT-BASE-2', 'Umlaufvermögen', '2801', '0', 'Bankzwischenkonto', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 104, 'AT-BASE-2', 'Umlaufvermögen', '2802', '0', 'Ausstehende Quittungen', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 105, 'AT-BASE-2', 'Umlaufvermögen', '2803', '0', 'Ausstehende Zahlungen', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 106, 'AT-BASE-2', 'Liquide Mittel', '2804', '0', 'Bank', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 107, 'AT-BASE-2', 'Umlaufvermögen', '2880', '0', 'Schwebende Geldbewegungen', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 108, 'AT-BASE-2', 'Umlaufvermögen', '2881', '0', 'Liquiditätstransfer', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 109, 'AT-BASE-2', 'Umlaufvermögen', '2890', '0', 'Wertberichtigungen', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 110, 'AT-BASE-2', 'Umlaufvermögen', '2900', '0', 'Aktive Rechnungsabgrenzungsposten', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 111, 'AT-BASE-2', 'Umlaufvermögen', '2950', '0', 'Disagio', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 112, 'AT-BASE-2', 'Umlaufvermögen', '2960', '0', 'Unterschiedsbetrag zur gebotenen Pensionsrückstellung', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 113, 'AT-BASE-2', 'Umlaufvermögen', '2970', '0', 'Unterschiedsbetrag gem. Abschnitt XII Pensionskassengesetz', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 114, 'AT-BASE-2', 'Umlaufvermögen', '2980', '0', 'Steuerabgrenzung', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 115, 'AT-BASE-2', 'Langfristige Verbindlichkeiten', '3000', '0', 'Rückstellungen für Abfertigungen', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 116, 'AT-BASE-2', 'Langfristige Verbindlichkeiten', '3010', '0', 'Rückstellungen für Pensionen', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 117, 'AT-BASE-2', 'Umlaufvermögen', '3100', '0', 'Anleihen (einschließlich konvertibler)', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 118, 'AT-BASE-2', 'Umlaufvermögen', '3200', '0', 'Erhaltene Anzahlungen auf Bestellungen', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 119, 'AT-BASE-2', 'Kurzfristige Verbindlichkeiten', '3210', '0', 'Umsatzsteuer-Evidenzkonto für erhaltene Anzahlungen auf Bestellungen', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 120, 'AT-BASE-2', 'Kreditoren', '3300', '0', 'Verbindlichkeiten bei Partnern im Inland ohne eigenes Kreditorenkonto', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 121, 'AT-BASE-2', 'Kreditoren', '3360', '0', 'Verbindlichkeiten bei Partnern im EU Raum ohne eigenes Kreditorenkonto', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 122, 'AT-BASE-2', 'Kreditoren', '3370', '0', 'Verbindlichkeiten bei Partnern in Drittstaaten ohne eigenes Kreditorenkonto', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 123, 'AT-BASE-2', 'Kurzfristige Verbindlichkeiten', '3480', '0', 'Verbindlichkeiten gegenüber Gesellschaftern', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 124, 'AT-BASE-2', 'Kurzfristige Verbindlichkeiten', '3500', '0', 'Umsatzsteuer 20%', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 125, 'AT-BASE-2', 'Kurzfristige Verbindlichkeiten', '3501', '0', 'Umsatzsteuer 10%', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 126, 'AT-BASE-2', 'Kurzfristige Verbindlichkeiten', '3502', '0', 'Umsatzsteuer 13%', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 127, 'AT-BASE-2', 'Kurzfristige Verbindlichkeiten', '3505', '0', 'Sonstige Umsatzsteuer', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 128, 'AT-BASE-2', 'Kurzfristige Verbindlichkeiten', '3510', '0', 'Umsatzsteuer RC EU 20%', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 129, 'AT-BASE-2', 'Kurzfristige Verbindlichkeiten', '3511', '0', 'Umsatzsteuer IGE 20%', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 130, 'AT-BASE-2', 'Kurzfristige Verbindlichkeiten', '3512', '0', 'Umsatzsteuer IGE 10%', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 131, 'AT-BASE-2', 'Kurzfristige Verbindlichkeiten', '3513', '0', 'Umsatzsteuer IGE 13%', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 132, 'AT-BASE-2', 'Kurzfristige Verbindlichkeiten', '3515', '0', 'Einfuhrumsatzsteuer 20%', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 133, 'AT-BASE-2', 'Kurzfristige Verbindlichkeiten', '3520', '0', 'Ust. Zahllast', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 134, 'AT-BASE-2', 'Kreditoren', '3530', '0', 'Verrechnungskonto Finanzamt', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 135, 'AT-BASE-2', 'Kurzfristige Verbindlichkeiten', '3540', '0', 'Verrechnung Lohnsteuer', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 136, 'AT-BASE-2', 'Kurzfristige Verbindlichkeiten', '3541', '0', 'Verrechnung Dienstgeberbeitrag', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 137, 'AT-BASE-2', 'Kurzfristige Verbindlichkeiten', '3542', '0', 'Verrechnung Dienstgeberzuschlag', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 138, 'AT-BASE-2', 'Kurzfristige Verbindlichkeiten', '3550', '0', 'Verrechnung Kommunalsteuer', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 139, 'AT-BASE-2', 'Kurzfristige Verbindlichkeiten', '3551', '0', 'Verrechnung Wiener Dienstgeberabgabe', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 140, 'AT-BASE-2', 'Kreditoren', '3600', '0', 'Verrechungskonto Sozialversicherung', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 141, 'AT-BASE-2', 'Kreditoren', '3610', '0', 'Verrechnungskonto Magistrat/Gemeinde (KoSt, U-Bahn, etc.)', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 142, 'AT-BASE-2', 'Kreditoren', '3740', '0', 'WERE Verrechnungskonto', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 143, 'AT-BASE-2', 'Erlöse', '4000', '0', 'Brutto-Umsatzerlöse im Inland (20%)', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 144, 'AT-BASE-2', 'Erlöse', '4001', '0', 'Brutto-Umsatzerlöse im Inland (10%)', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 145, 'AT-BASE-2', 'Erlöse', '4100', '0', 'Brutto-Umsatzerlöse im EU Raum (RC 20%)', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 146, 'AT-BASE-2', 'Erlöse', '4110', '0', 'Brutto-Umsatzerlöse im EU Raum (RC 10%)', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 147, 'AT-BASE-2', 'Erlöse', '4200', '0', 'Brutto-Umsatzerlöse in Drittstaaten (0%)', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 148, 'AT-BASE-2', 'Sonstige betriebliche Erträge', '4860', '0', 'Kursgewinne aus Fremdwährungstransaktionen', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 149, 'AT-BASE-2', 'Aufwand', '5000', '0', 'Wareneinkauf', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 150, 'AT-BASE-2', 'Aufwand', '5050', '0', 'Wareneinkauf EU', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 151, 'AT-BASE-2', 'Aufwand', '5090', '0', 'Wareneinkauf 0%', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 152, 'AT-BASE-2', 'Aufwand', '5800', '0', 'Skontoerträge auf Materialaufwand', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 153, 'AT-BASE-2', 'Aufwand', '5810', '0', 'Skontoerträge auf sonstige bezogene Herstellungsleistungen', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 154, 'AT-BASE-2', 'Aufwand', '5900', '0', 'Aufwandsstellenrechnung', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 155, 'AT-BASE-2', 'Aufwand', '6200', '0', 'Gehälter (Angestellte)', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 156, 'AT-BASE-2', 'Aufwand', '6205', '0', 'Geschäftsführerbezug', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 157, 'AT-BASE-2', 'Aufwand', '6242', '0', 'Urlaubsabfindung (Angestellte)', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 158, 'AT-BASE-2', 'Aufwand', '6260', '0', 'Sonstige Bezüge (Angestellte)', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 159, 'AT-BASE-2', 'Aufwand', '6270', '0', 'Sachbezug (Angestellte)', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 160, 'AT-BASE-2', 'Aufwand', '6271', '0', 'Sachbezug (Geschäftsführer)', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 161, 'AT-BASE-2', 'Aufwand', '6310', '0', 'Grundgehälter (Überstunden)', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 162, 'AT-BASE-2', 'Aufwand', '6330', '0', 'Gehälter (Überstundenzuschläge)', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 163, 'AT-BASE-2', 'Aufwand', '6340', '0', 'Veränderung noch nicht konsumierter Urlaub', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 164, 'AT-BASE-2', 'Aufwand', '6400', '0', 'Beiträge für betriebliche Mitarbeitervorsorgekasse', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 165, 'AT-BASE-2', 'Aufwand', '6560', '0', 'Gesetzlicher Sozialaufwand', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 166, 'AT-BASE-2', 'Aufwand', '6660', '0', 'Kommunalsteuer (KoSt)', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 167, 'AT-BASE-2', 'Aufwand', '6661', '0', 'Dienstgeberbeitrag zum Familienlastenausgleichsfonds (DB)', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 168, 'AT-BASE-2', 'Aufwand', '6662', '0', 'Zuschlag zum Dienstnehmerbeitrag (DZ)', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 169, 'AT-BASE-2', 'Aufwand', '6663', '0', 'Dienstgeberabgabe der Gemeinde Wien (U-Bahn Steuer)', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 170, 'AT-BASE-2', 'Aufwand', '6700', '0', 'Sonstiger freiwilliger Sozialaufwand', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 171, 'AT-BASE-2', 'Aufwand', '6900', '0', 'Aufwandsstellenrechnung', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 172, 'AT-BASE-2', 'Abschreibungen', '7000', '0', 'Abschreibungen auf aktivierte Aufwendungen für das Ingangsetzen und Erweitern eines Betriebes', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 173, 'AT-BASE-2', 'Abschreibungen', '7090', '0', 'Abschreibungen vom Umlaufvermögen, soweit diese die im Unternehmen üblichen Abschreibungen übersteigen', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 174, 'AT-BASE-2', 'Aufwand', '7600', '0', 'Büromaterial und Drucksorten', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 175, 'AT-BASE-2', 'Aufwand', '7630', '0', 'Fachliteratur und Zeitungen', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 176, 'AT-BASE-2', 'Aufwand', '7690', '0', 'Spenden und Trinkgelder', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 177, 'AT-BASE-2', 'Aufwand', '7770', '0', 'Aus- und Fortbildung', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 178, 'AT-BASE-2', 'Aufwand', '7780', '0', 'Mitgliedsbeiträge', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 179, 'AT-BASE-2', 'Aufwand', '7790', '0', 'Spesen des Geldverkehrs', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 180, 'AT-BASE-2', 'Aufwand', '7820', '0', 'Buchwert abgegangener Anlagen, ausgenommen Finanzanlagen', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 181, 'AT-BASE-2', 'Aufwand', '7830', '0', 'Verluste aus dem Abgang vom Anlagevermögen, ausgenommen Finanzanlagen', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 182, 'AT-BASE-2', 'Aufwand', '7860', '0', 'Kursverluste aus Fremdwährungstransaktionen', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 183, 'AT-BASE-2', 'Aufwand', '7890', '0', 'Skontoerträge auf sonstige betriebliche Aufwendungen', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 184, 'AT-BASE-2', 'Aufwand', '7900', '0', 'Aufwandsstellenrechnung', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 185, 'AT-BASE-2', 'Aufwand', '7960', '0', 'Herstellungskosten der zur Erzielung der Umsatzerlöse erbrachten Leistungen', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 186, 'AT-BASE-2', 'Aufwand', '7970', '0', 'Vertriebskosten', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 187, 'AT-BASE-2', 'Aufwand', '7980', '0', 'Verwaltungskosten', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 188, 'AT-BASE-2', 'Aufwand', '7990', '0', 'Sonstige betriebliche Aufwendungen', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 189, 'AT-BASE-2', 'Sonstige betriebliche Erträge', '8140', '0', 'Erlöse aus dem Abgang von Beteiligungen', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 190, 'AT-BASE-2', 'Sonstige betriebliche Erträge', '8150', '0', 'Erlöse aus dem Abgang von sonstigen Finanzanlagen', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 191, 'AT-BASE-2', 'Sonstige betriebliche Erträge', '8160', '0', 'Erlöse aus dem Abgang von Wertpapieren des Umlaufvermögens', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 192, 'AT-BASE-2', 'Sonstige betriebliche Erträge', '8170', '0', 'Buchwert abgegangener Beteiligungen', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 193, 'AT-BASE-2', 'Sonstige betriebliche Erträge', '8180', '0', 'Buchwert abgegangener sonstiger Finanzanlagen', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 194, 'AT-BASE-2', 'Sonstige betriebliche Erträge', '8190', '0', 'Buchwert abgegangener Wertpapiere des Umlaufvermögens', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 195, 'AT-BASE-2', 'Sonstige betriebliche Erträge', '8200', '0', 'Erträge aus dem Abgang von und der Zuschreibung zu Finanzanlagen', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 196, 'AT-BASE-2', 'Sonstige betriebliche Erträge', '8210', '0', 'Erträge aus dem Abgang von und der Zuschreibung zu Wertpapieren des Umlaufvermögens', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 197, 'AT-BASE-2', 'Sonstige betriebliche Erträge', '8350', '0', 'Nicht ausgenützte Lieferantenskonti', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 198, 'AT-BASE-2', 'Sonstige betriebliche Erträge', '8990', '0', 'Gewinnabfuhr bzw. Verlustüberrechnung aus Ergebnisabführungsverträgen', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 199, 'AT-BASE-2', 'Eigenkapital', '9190', '0', 'Nicht eingeforderte ausstehende Einlagen', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 200, 'AT-BASE-2', 'Eigenkapital', '9390', '0', 'Bilanzgewinn (-verlust)', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 201, 'AT-BASE-2', 'Eigenkapital', '9800', '0', 'Eröffnungsbilanz', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 202, 'AT-BASE-2', 'Eigenkapital', '9850', '0', 'Schlussbilanz', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 203, 'AT-BASE-2', 'Eigenkapital', '9890', '0', 'Gewinn- und Verlustrechnung', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 204, 'AT-BASE-2', 'Aufwand', '9991', '0', 'Bargelddifferenz Verlust', 1);
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 205, 'AT-BASE-2', 'Erlöse', '9992', '0', 'Bargelddifferenz Gewinn', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1001, 'AT-BASE-2', 'Anlagevermögen', '0010', '0', 'Aufwendungen für das Ingangsetzen und Erweitern eines Betriebes', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1002, 'AT-BASE-2', 'Anlagevermögen', '0090', '0', 'Kumulierte Abschreibungen', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1003, 'AT-BASE-2', 'Anlagevermögen', '0100', '0', 'Konzessionen', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1004, 'AT-BASE-2', 'Anlagevermögen', '0110', '0', 'Patentrechte und Lizenzen', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1005, 'AT-BASE-2', 'Anlagevermögen', '0120', '0', 'Datenverarbeitungsprogramme', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1006, 'AT-BASE-2', 'Anlagevermögen', '0121', '0', 'Geringwertige Datenverarbeitungsprogramme', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1007, 'AT-BASE-2', 'Anlagevermögen', '0130', '0', 'Marken, Warenzeichen und Musterschutzrechte, sonstige Urheberrechte', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1008, 'AT-BASE-2', 'Anlagevermögen', '0140', '0', 'Pacht- und Mietrechte', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1009, 'AT-BASE-2', 'Anlagevermögen', '0150', '0', 'Geschäfts(Firmen)wert', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1010, 'AT-BASE-2', 'Anlagevermögen', '0180', '0', 'Geleistete Anzahlungen', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1011, 'AT-BASE-2', 'Anlagevermögen', '0190', '0', 'Kumulierte Abschreibungen', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1012, 'AT-BASE-2', 'Sachanlagen', '0200', '0', 'Unbebaute Grundstücke', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1013, 'AT-BASE-2', 'Sachanlagen', '0210', '0', 'Bebaute Grundstücke (Grundwert)', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1014, 'AT-BASE-2', 'Sachanlagen', '0220', '0', 'Grundstücksgleiche Rechte', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1015, 'AT-BASE-2', 'Sachanlagen', '0300', '0', 'Betriebs- und Geschäftsgebäude auf eigenem Grund', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1016, 'AT-BASE-2', 'Sachanlagen', '0310', '0', 'Wohn- und Sozialgebäude auf eigenem Grund', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1017, 'AT-BASE-2', 'Sachanlagen', '0320', '0', 'Betriebs- und Geschäftsgebäude auf fremdem Grund', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1018, 'AT-BASE-2', 'Sachanlagen', '0330', '0', 'Wohn- und Sozialgebäude auf fremdem Grund', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1019, 'AT-BASE-2', 'Sachanlagen', '0340', '0', 'Grundstückseinrichtungen auf eigenem Grund', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1020, 'AT-BASE-2', 'Sachanlagen', '0350', '0', 'Grundstückseinrichtungen auf fremdem Grund', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1021, 'AT-BASE-2', 'Sachanlagen', '0360', '0', 'Bauliche Investitionen in fremden (gepachteten) Betriebs- und Geschäftsgebäuden', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1022, 'AT-BASE-2', 'Sachanlagen', '0370', '0', 'Bauliche Investitionen in fremden (gepachteten) Wohn- und Sozialgebäuden', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1023, 'AT-BASE-2', 'Sachanlagen', '0390', '0', 'Kumulierte Abschreibungen', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1024, 'AT-BASE-2', 'Sachanlagen', '0400', '0', 'Fertigungsmaschinen', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1025, 'AT-BASE-2', 'Sachanlagen', '0410', '0', 'Antriebsmaschinen', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1026, 'AT-BASE-2', 'Sachanlagen', '0420', '0', 'Energieversorgungsanlagen', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1027, 'AT-BASE-2', 'Sachanlagen', '0430', '0', 'Transportanlagen', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1028, 'AT-BASE-2', 'Sachanlagen', '0500', '0', 'Maschinenwerkzeuge', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1029, 'AT-BASE-2', 'Sachanlagen', '0510', '0', 'Allgemeine Werkzeuge und Handwerkzeuge', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1030, 'AT-BASE-2', 'Sachanlagen', '0520', '0', 'Vorrichtungen, Formen und Modelle', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1031, 'AT-BASE-2', 'Sachanlagen', '0530', '0', 'Andere Erzeugungshilfsmittel', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1032, 'AT-BASE-2', 'Sachanlagen', '0540', '0', 'Hebezeuge und Montageanlagen', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1033, 'AT-BASE-2', 'Sachanlagen', '0550', '0', 'Geringwertige Vermögensgegenstände, soweit im Erzeugungsprozeß verwendet', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1034, 'AT-BASE-2', 'Sachanlagen', '0600', '0', 'Beheizungs- und Beleuchtungsanlagen', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1035, 'AT-BASE-2', 'Sachanlagen', '0610', '0', 'Nachrichten- und Kontrollanlagen', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1036, 'AT-BASE-2', 'Sachanlagen', '0620', '0', 'Büromaschinen, EDV-Anlagen', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1037, 'AT-BASE-2', 'Sachanlagen', '0630', '0', 'PKW', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1038, 'AT-BASE-2', 'Sachanlagen', '0640', '0', 'LKW', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1039, 'AT-BASE-2', 'Sachanlagen', '0650', '0', 'Andere Beförderungsmittel', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1040, 'AT-BASE-2', 'Sachanlagen', '0660', '0', 'Andere Betriebs- und Geschäftsausstattung', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1041, 'AT-BASE-2', 'Sachanlagen', '0670', '0', 'Gebinde', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1042, 'AT-BASE-2', 'Sachanlagen', '0680', '0', 'Geringwertige Büromaschinen, EDV-Anlagen', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1043, 'AT-BASE-2', 'Sachanlagen', '0681', '0', 'Geringwertige Betriebs- und Geschäftsausstattung', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1044, 'AT-BASE-2', 'Sachanlagen', '0692', '0', 'Kumulierte Abschreibungen zu Büromaschinen, EDV-Anlagen', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1045, 'AT-BASE-2', 'Sachanlagen', '0693', '0', 'Kumulierte Abschreibungen zu PKW und Kombis', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1046, 'AT-BASE-2', 'Sachanlagen', '0694', '0', 'Kumulierte Abschreibungen zu LKW', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1047, 'AT-BASE-2', 'Sachanlagen', '0696', '0', 'Kumulierte Abschreibungen zur Betriebs- und Geschäftsausstattung', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1048, 'AT-BASE-2', 'Vorauszahlungen', '0700', '0', 'Geleistete Anzahlungen', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1049, 'AT-BASE-2', 'Sachanlagen', '0710', '0', 'Anlagen in Bau', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1050, 'AT-BASE-2', 'Sachanlagen', '0790', '0', 'Kumulierte Abschreibungen', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1051, 'AT-BASE-2', 'Anlagevermögen', '0800', '0', 'Anteile an verbundenen Unternehmen', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1052, 'AT-BASE-2', 'Anlagevermögen', '0810', '0', 'Beteiligungen an Gemeinschaftsunternehmen', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1053, 'AT-BASE-2', 'Anlagevermögen', '0820', '0', 'Beteiligungen an angeschlossenen (assoziierten) Unternehmen', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1054, 'AT-BASE-2', 'Anlagevermögen', '0830', '0', 'Sonstige Beteiligungen', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1055, 'AT-BASE-2', 'Anlagevermögen', '0840', '0', 'Ausleihungen an verbundene Unternehmen', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1056, 'AT-BASE-2', 'Anlagevermögen', '0850', '0', 'Ausleihungen an Unternehmen, mit denen ein Beteiligungsverhältnis besteht', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1057, 'AT-BASE-2', 'Anlagevermögen', '0860', '0', 'Sonstige Ausleihungen', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1058, 'AT-BASE-2', 'Anlagevermögen', '0870', '0', 'Anteile an Kapitalgesellschaften ohne Beteiligungscharakter', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1059, 'AT-BASE-2', 'Anlagevermögen', '0880', '0', 'Anteile an Personengesellschaften ohne Beteiligungscharakter', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1060, 'AT-BASE-2', 'Anlagevermögen', '0900', '0', 'Genossenschaftsanteile ohne Beteiligungscharakter', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1061, 'AT-BASE-2', 'Anlagevermögen', '0910', '0', 'Anteile an Investmentfonds', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1062, 'AT-BASE-2', 'Vorauszahlungen', '0980', '0', 'Geleistete Anzahlungen', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1063, 'AT-BASE-2', 'Anlagevermögen', '0990', '0', 'Kumulierte Abschreibungen', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1064, 'AT-BASE-2', 'Umlaufvermögen', '1600', '0', 'Handelswaren', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1065, 'AT-BASE-2', 'Vorauszahlungen', '1800', '0', 'Geleistete Anzahlungen', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1066, 'AT-BASE-2', 'Debitoren', '2000', '0', 'Forderungen von Partnern im Inland ohne eigenes Debitorenkonto', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1067, 'AT-BASE-2', 'Umlaufvermögen', '2080', '0', 'Einzelwertberichtigungen zu Forderungen aus Lieferungen und Leistungen Inland', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1068, 'AT-BASE-2', 'Umlaufvermögen', '2090', '0', 'Pauschalwertberichtigungen zu Forderungen aus Lieferungen und Leistungen Inland', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1069, 'AT-BASE-2', 'Debitoren', '2099', '0', 'Forderungen von Partnern (Point Of Sale)', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1070, 'AT-BASE-2', 'Debitoren', '2100', '0', 'Forderungen von Partnern im EU Raum ohne eigenes Debitorenkonto', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1071, 'AT-BASE-2', 'Umlaufvermögen', '2130', '0', 'Einzelwertberichtigungen zu Forderungen aus Lieferungen und Leistungen Währungsunion', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1072, 'AT-BASE-2', 'Umlaufvermögen', '2140', '0', 'Pauschalwertberichtigungen zu Forderungen aus Lieferungen und Leistungen Währungsunion', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1073, 'AT-BASE-2', 'Debitoren', '2150', '0', 'Forderungen von Partnern in Drittstaaten ohne eigenes Debitorenkonto', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1074, 'AT-BASE-2', 'Umlaufvermögen', '2180', '0', 'Einzelwertberichtigungen zu Forderungen aus Lieferungen und Leistungen sonstiges Ausland', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1075, 'AT-BASE-2', 'Umlaufvermögen', '2190', '0', 'Pauschalwertberichtigungen zu Forderungen aus Lieferungen und Leistungen sonstiges Ausland', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1076, 'AT-BASE-2', 'Umlaufvermögen', '2230', '0', 'Einzelwertberichtigungen zu Forderungen gegenüber verbundenen Unternehmen', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1077, 'AT-BASE-2', 'Umlaufvermögen', '2240', '0', 'Pauschalwertberichtigungen zu Forderungen gegenüber verbundenen Unternehmen', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1078, 'AT-BASE-2', 'Umlaufvermögen', '2280', '0', 'Einzelwertberichtigungen zu Forderungen gegenüber Unternehmen, mit denen ein Beteiligungsverhältnis besteht', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1079, 'AT-BASE-2', 'Umlaufvermögen', '2290', '0', 'Pauschalwertberichtigungen zu Forderungen gegenüber Unternehmen, mit denen ein Beteiligungsverhältnis besteht', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1080, 'AT-BASE-2', 'Umlaufvermögen', '2470', '0', 'Eingeforderte, aber noch nicht eingezahlte Einlagen', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1081, 'AT-BASE-2', 'Umlaufvermögen', '2480', '0', 'Einzelwertberichtigungen zu sonstigen Forderungen und Vermögensgegenständen', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1082, 'AT-BASE-2', 'Umlaufvermögen', '2490', '0', 'Pauschalwertberichtigungen zu sonstigen Forderungen und Vermögensgegenständen', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1083, 'AT-BASE-2', 'Umlaufvermögen', '2500', '0', 'Vorsteuern 20%', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1084, 'AT-BASE-2', 'Umlaufvermögen', '2501', '0', 'Vorsteuern 10%', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1085, 'AT-BASE-2', 'Umlaufvermögen', '2502', '0', 'Vorsteuern 13%', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1086, 'AT-BASE-2', 'Umlaufvermögen', '2505', '0', 'Sonstige Vorsteuern', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1087, 'AT-BASE-2', 'Umlaufvermögen', '2506', '0', 'Vorsteuern RC 20%', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1088, 'AT-BASE-2', 'Umlaufvermögen', '2507', '0', 'Vorsteuern RC 10%', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1089, 'AT-BASE-2', 'Umlaufvermögen', '2510', '0', 'Vorsteuern RC EU 20%', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1090, 'AT-BASE-2', 'Umlaufvermögen', '2511', '0', 'Vorsteuern IGE 20%', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1091, 'AT-BASE-2', 'Umlaufvermögen', '2512', '0', 'Vorsteuern IGE 10%', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1092, 'AT-BASE-2', 'Umlaufvermögen', '2513', '0', 'Vorsteuern IGE 13%', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1093, 'AT-BASE-2', 'Umlaufvermögen', '2515', '0', 'Vorsteuern 20% (aus EUSt.)', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1094, 'AT-BASE-2', 'Umlaufvermögen', '2600', '0', 'Eigene Anteile', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1095, 'AT-BASE-2', 'Umlaufvermögen', '2610', '0', 'Anteile an verbundenen Unternehmen', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1096, 'AT-BASE-2', 'Umlaufvermögen', '2620', '0', 'Sonstige Anteile', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1097, 'AT-BASE-2', 'Umlaufvermögen', '2680', '0', 'Besitzwechsel, soweit dem Unternehmen nicht die der Ausstellung zugrundeliegenden Forderungen zustehen', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1098, 'AT-BASE-2', 'Umlaufvermögen', '2690', '0', 'Wertberichtigungen', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1099, 'AT-BASE-2', 'Liquide Mittel', '2701', '0', 'Kasse/Bank', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1100, 'AT-BASE-2', 'Umlaufvermögen', '2730', '0', 'Postwertzeichen', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1101, 'AT-BASE-2', 'Umlaufvermögen', '2740', '0', 'Stempelmarken', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1102, 'AT-BASE-2', 'Umlaufvermögen', '2780', '0', 'Schecks in Inlandswährung', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1103, 'AT-BASE-2', 'Umlaufvermögen', '2801', '0', 'Bankzwischenkonto', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1104, 'AT-BASE-2', 'Umlaufvermögen', '2802', '0', 'Ausstehende Quittungen', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1105, 'AT-BASE-2', 'Umlaufvermögen', '2803', '0', 'Ausstehende Zahlungen', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1106, 'AT-BASE-2', 'Liquide Mittel', '2804', '0', 'Bank', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1107, 'AT-BASE-2', 'Umlaufvermögen', '2880', '0', 'Schwebende Geldbewegungen', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1108, 'AT-BASE-2', 'Umlaufvermögen', '2881', '0', 'Liquiditätstransfer', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1109, 'AT-BASE-2', 'Umlaufvermögen', '2890', '0', 'Wertberichtigungen', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1110, 'AT-BASE-2', 'Umlaufvermögen', '2900', '0', 'Aktive Rechnungsabgrenzungsposten', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1111, 'AT-BASE-2', 'Umlaufvermögen', '2950', '0', 'Disagio', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1112, 'AT-BASE-2', 'Umlaufvermögen', '2960', '0', 'Unterschiedsbetrag zur gebotenen Pensionsrückstellung', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1113, 'AT-BASE-2', 'Umlaufvermögen', '2970', '0', 'Unterschiedsbetrag gem. Abschnitt XII Pensionskassengesetz', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1114, 'AT-BASE-2', 'Umlaufvermögen', '2980', '0', 'Steuerabgrenzung', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1115, 'AT-BASE-2', 'Langfristige Verbindlichkeiten', '3000', '0', 'Rückstellungen für Abfertigungen', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1116, 'AT-BASE-2', 'Langfristige Verbindlichkeiten', '3010', '0', 'Rückstellungen für Pensionen', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1117, 'AT-BASE-2', 'Umlaufvermögen', '3100', '0', 'Anleihen (einschließlich konvertibler)', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1118, 'AT-BASE-2', 'Umlaufvermögen', '3200', '0', 'Erhaltene Anzahlungen auf Bestellungen', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1119, 'AT-BASE-2', 'Kurzfristige Verbindlichkeiten', '3210', '0', 'Umsatzsteuer-Evidenzkonto für erhaltene Anzahlungen auf Bestellungen', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1120, 'AT-BASE-2', 'Kreditoren', '3300', '0', 'Verbindlichkeiten bei Partnern im Inland ohne eigenes Kreditorenkonto', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1121, 'AT-BASE-2', 'Kreditoren', '3360', '0', 'Verbindlichkeiten bei Partnern im EU Raum ohne eigenes Kreditorenkonto', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1122, 'AT-BASE-2', 'Kreditoren', '3370', '0', 'Verbindlichkeiten bei Partnern in Drittstaaten ohne eigenes Kreditorenkonto', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1123, 'AT-BASE-2', 'Kurzfristige Verbindlichkeiten', '3480', '0', 'Verbindlichkeiten gegenüber Gesellschaftern', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1124, 'AT-BASE-2', 'Kurzfristige Verbindlichkeiten', '3500', '0', 'Umsatzsteuer 20%', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1125, 'AT-BASE-2', 'Kurzfristige Verbindlichkeiten', '3501', '0', 'Umsatzsteuer 10%', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1126, 'AT-BASE-2', 'Kurzfristige Verbindlichkeiten', '3502', '0', 'Umsatzsteuer 13%', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1127, 'AT-BASE-2', 'Kurzfristige Verbindlichkeiten', '3505', '0', 'Sonstige Umsatzsteuer', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1128, 'AT-BASE-2', 'Kurzfristige Verbindlichkeiten', '3510', '0', 'Umsatzsteuer RC EU 20%', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1129, 'AT-BASE-2', 'Kurzfristige Verbindlichkeiten', '3511', '0', 'Umsatzsteuer IGE 20%', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1130, 'AT-BASE-2', 'Kurzfristige Verbindlichkeiten', '3512', '0', 'Umsatzsteuer IGE 10%', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1131, 'AT-BASE-2', 'Kurzfristige Verbindlichkeiten', '3513', '0', 'Umsatzsteuer IGE 13%', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1132, 'AT-BASE-2', 'Kurzfristige Verbindlichkeiten', '3515', '0', 'Einfuhrumsatzsteuer 20%', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1133, 'AT-BASE-2', 'Kurzfristige Verbindlichkeiten', '3520', '0', 'Ust. Zahllast', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1134, 'AT-BASE-2', 'Kreditoren', '3530', '0', 'Verrechnungskonto Finanzamt', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1135, 'AT-BASE-2', 'Kurzfristige Verbindlichkeiten', '3540', '0', 'Verrechnung Lohnsteuer', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1136, 'AT-BASE-2', 'Kurzfristige Verbindlichkeiten', '3541', '0', 'Verrechnung Dienstgeberbeitrag', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1137, 'AT-BASE-2', 'Kurzfristige Verbindlichkeiten', '3542', '0', 'Verrechnung Dienstgeberzuschlag', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1138, 'AT-BASE-2', 'Kurzfristige Verbindlichkeiten', '3550', '0', 'Verrechnung Kommunalsteuer', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1139, 'AT-BASE-2', 'Kurzfristige Verbindlichkeiten', '3551', '0', 'Verrechnung Wiener Dienstgeberabgabe', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1140, 'AT-BASE-2', 'Kreditoren', '3600', '0', 'Verrechungskonto Sozialversicherung', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1141, 'AT-BASE-2', 'Kreditoren', '3610', '0', 'Verrechnungskonto Magistrat/Gemeinde (KoSt, U-Bahn, etc.)', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1142, 'AT-BASE-2', 'Kreditoren', '3740', '0', 'WERE Verrechnungskonto', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1143, 'AT-BASE-2', 'Erlöse', '4000', '0', 'Brutto-Umsatzerlöse im Inland (20%)', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1144, 'AT-BASE-2', 'Erlöse', '4001', '0', 'Brutto-Umsatzerlöse im Inland (10%)', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1145, 'AT-BASE-2', 'Erlöse', '4100', '0', 'Brutto-Umsatzerlöse im EU Raum (RC 20%)', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1146, 'AT-BASE-2', 'Erlöse', '4110', '0', 'Brutto-Umsatzerlöse im EU Raum (RC 10%)', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1147, 'AT-BASE-2', 'Erlöse', '4200', '0', 'Brutto-Umsatzerlöse in Drittstaaten (0%)', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1148, 'AT-BASE-2', 'Sonstige betriebliche Erträge', '4860', '0', 'Kursgewinne aus Fremdwährungstransaktionen', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1149, 'AT-BASE-2', 'Aufwand', '5000', '0', 'Wareneinkauf', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1150, 'AT-BASE-2', 'Aufwand', '5050', '0', 'Wareneinkauf EU', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1151, 'AT-BASE-2', 'Aufwand', '5090', '0', 'Wareneinkauf 0%', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1152, 'AT-BASE-2', 'Aufwand', '5800', '0', 'Skontoerträge auf Materialaufwand', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1153, 'AT-BASE-2', 'Aufwand', '5810', '0', 'Skontoerträge auf sonstige bezogene Herstellungsleistungen', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1154, 'AT-BASE-2', 'Aufwand', '5900', '0', 'Aufwandsstellenrechnung', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1155, 'AT-BASE-2', 'Aufwand', '6200', '0', 'Gehälter (Angestellte)', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1156, 'AT-BASE-2', 'Aufwand', '6205', '0', 'Geschäftsführerbezug', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1157, 'AT-BASE-2', 'Aufwand', '6242', '0', 'Urlaubsabfindung (Angestellte)', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1158, 'AT-BASE-2', 'Aufwand', '6260', '0', 'Sonstige Bezüge (Angestellte)', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1159, 'AT-BASE-2', 'Aufwand', '6270', '0', 'Sachbezug (Angestellte)', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1160, 'AT-BASE-2', 'Aufwand', '6271', '0', 'Sachbezug (Geschäftsführer)', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1161, 'AT-BASE-2', 'Aufwand', '6310', '0', 'Grundgehälter (Überstunden)', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1162, 'AT-BASE-2', 'Aufwand', '6330', '0', 'Gehälter (Überstundenzuschläge)', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1163, 'AT-BASE-2', 'Aufwand', '6340', '0', 'Veränderung noch nicht konsumierter Urlaub', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1164, 'AT-BASE-2', 'Aufwand', '6400', '0', 'Beiträge für betriebliche Mitarbeitervorsorgekasse', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1165, 'AT-BASE-2', 'Aufwand', '6560', '0', 'Gesetzlicher Sozialaufwand', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1166, 'AT-BASE-2', 'Aufwand', '6660', '0', 'Kommunalsteuer (KoSt)', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1167, 'AT-BASE-2', 'Aufwand', '6661', '0', 'Dienstgeberbeitrag zum Familienlastenausgleichsfonds (DB)', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1168, 'AT-BASE-2', 'Aufwand', '6662', '0', 'Zuschlag zum Dienstnehmerbeitrag (DZ)', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1169, 'AT-BASE-2', 'Aufwand', '6663', '0', 'Dienstgeberabgabe der Gemeinde Wien (U-Bahn Steuer)', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1170, 'AT-BASE-2', 'Aufwand', '6700', '0', 'Sonstiger freiwilliger Sozialaufwand', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1171, 'AT-BASE-2', 'Aufwand', '6900', '0', 'Aufwandsstellenrechnung', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1172, 'AT-BASE-2', 'Abschreibungen', '7000', '0', 'Abschreibungen auf aktivierte Aufwendungen für das Ingangsetzen und Erweitern eines Betriebes', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1173, 'AT-BASE-2', 'Abschreibungen', '7090', '0', 'Abschreibungen vom Umlaufvermögen, soweit diese die im Unternehmen üblichen Abschreibungen übersteigen', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1174, 'AT-BASE-2', 'Aufwand', '7600', '0', 'Büromaterial und Drucksorten', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1175, 'AT-BASE-2', 'Aufwand', '7630', '0', 'Fachliteratur und Zeitungen', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1176, 'AT-BASE-2', 'Aufwand', '7690', '0', 'Spenden und Trinkgelder', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1177, 'AT-BASE-2', 'Aufwand', '7770', '0', 'Aus- und Fortbildung', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1178, 'AT-BASE-2', 'Aufwand', '7780', '0', 'Mitgliedsbeiträge', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1179, 'AT-BASE-2', 'Aufwand', '7790', '0', 'Spesen des Geldverkehrs', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1180, 'AT-BASE-2', 'Aufwand', '7820', '0', 'Buchwert abgegangener Anlagen, ausgenommen Finanzanlagen', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1181, 'AT-BASE-2', 'Aufwand', '7830', '0', 'Verluste aus dem Abgang vom Anlagevermögen, ausgenommen Finanzanlagen', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1182, 'AT-BASE-2', 'Aufwand', '7860', '0', 'Kursverluste aus Fremdwährungstransaktionen', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1183, 'AT-BASE-2', 'Aufwand', '7890', '0', 'Skontoerträge auf sonstige betriebliche Aufwendungen', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1184, 'AT-BASE-2', 'Aufwand', '7900', '0', 'Aufwandsstellenrechnung', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1185, 'AT-BASE-2', 'Aufwand', '7960', '0', 'Herstellungskosten der zur Erzielung der Umsatzerlöse erbrachten Leistungen', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1186, 'AT-BASE-2', 'Aufwand', '7970', '0', 'Vertriebskosten', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1187, 'AT-BASE-2', 'Aufwand', '7980', '0', 'Verwaltungskosten', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1188, 'AT-BASE-2', 'Aufwand', '7990', '0', 'Sonstige betriebliche Aufwendungen', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1189, 'AT-BASE-2', 'Sonstige betriebliche Erträge', '8140', '0', 'Erlöse aus dem Abgang von Beteiligungen', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1190, 'AT-BASE-2', 'Sonstige betriebliche Erträge', '8150', '0', 'Erlöse aus dem Abgang von sonstigen Finanzanlagen', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1191, 'AT-BASE-2', 'Sonstige betriebliche Erträge', '8160', '0', 'Erlöse aus dem Abgang von Wertpapieren des Umlaufvermögens', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1192, 'AT-BASE-2', 'Sonstige betriebliche Erträge', '8170', '0', 'Buchwert abgegangener Beteiligungen', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1193, 'AT-BASE-2', 'Sonstige betriebliche Erträge', '8180', '0', 'Buchwert abgegangener sonstiger Finanzanlagen', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1194, 'AT-BASE-2', 'Sonstige betriebliche Erträge', '8190', '0', 'Buchwert abgegangener Wertpapiere des Umlaufvermögens', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1195, 'AT-BASE-2', 'Sonstige betriebliche Erträge', '8200', '0', 'Erträge aus dem Abgang von und der Zuschreibung zu Finanzanlagen', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1196, 'AT-BASE-2', 'Sonstige betriebliche Erträge', '8210', '0', 'Erträge aus dem Abgang von und der Zuschreibung zu Wertpapieren des Umlaufvermögens', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1197, 'AT-BASE-2', 'Sonstige betriebliche Erträge', '8350', '0', 'Nicht ausgenützte Lieferantenskonti', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1198, 'AT-BASE-2', 'Sonstige betriebliche Erträge', '8990', '0', 'Gewinnabfuhr bzw. Verlustüberrechnung aus Ergebnisabführungsverträgen', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1199, 'AT-BASE-2', 'Eigenkapital', '9190', '0', 'Nicht eingeforderte ausstehende Einlagen', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1200, 'AT-BASE-2', 'Eigenkapital', '9390', '0', 'Bilanzgewinn (-verlust)', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1201, 'AT-BASE-2', 'Eigenkapital', '9800', '0', 'Eröffnungsbilanz', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1202, 'AT-BASE-2', 'Eigenkapital', '9850', '0', 'Schlussbilanz', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1203, 'AT-BASE-2', 'Eigenkapital', '9890', '0', 'Gewinn- und Verlustrechnung', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1204, 'AT-BASE-2', 'Aufwand', '9991', '0', 'Bargelddifferenz Verlust', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1205, 'AT-BASE-2', 'Erlöse', '9992', '0', 'Bargelddifferenz Gewinn', 1);

From dc08b96444bd2c011dd4b4e376fa11b390692393 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 31 Aug 2022 17:17:43 +0200
Subject: [PATCH 430/974] Fix phpcs

---
 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 b65946af622..7d3328cde34 100644
--- a/htdocs/adherents/class/adherent.class.php
+++ b/htdocs/adherents/class/adherent.class.php
@@ -655,7 +655,7 @@ class Adherent extends CommonObject
 	public function update($user, $notrigger = 0, $nosyncuser = 0, $nosyncuserpass = 0, $nosyncthirdparty = 0, $action = 'update')
 	{
 		global $conf, $langs, $hookmanager;
-		
+
 		require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 
 		require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';

From 55dcf19efd1fdc74fea391d76f60604bb696bc36 Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis.houssin@inodbox.com>
Date: Wed, 31 Aug 2022 17:22:06 +0200
Subject: [PATCH 431/974] FIX missing hook context and some parameters

---
 htdocs/accountancy/admin/account.php | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/htdocs/accountancy/admin/account.php b/htdocs/accountancy/admin/account.php
index 48d8ab23d96..84eab31849d 100644
--- a/htdocs/accountancy/admin/account.php
+++ b/htdocs/accountancy/admin/account.php
@@ -97,6 +97,9 @@ if ($conf->global->MAIN_FEATURES_LEVEL < 2) {
 
 $accounting = new AccountingAccount($db);
 
+// Initialize technical object to manage hooks. Note that conf->hooks_modules contains array
+$hookmanager->initHooks(array('accountancyadminaccount'));
+
 
 /*
  * Actions
@@ -109,8 +112,8 @@ if (!GETPOST('confirmmassaction', 'alpha')) {
 	$massaction = '';
 }
 
-$parameters = array();
-$reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been monowraponalldified by some hooks
+$parameters = array('chartofaccounts' => $chartofaccounts, 'permissiontoadd' => $permissiontoadd, 'permissiontodelete' => $permissiontodelete);
+$reshook = $hookmanager->executeHooks('doActions', $parameters, $accounting, $action); // Note that $action and $object may have been monowraponalldified by some hooks
 if ($reshook < 0) {
 	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 }

From 594bbcb1f194460dfa59543ed5a37c8cbb14ccd3 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 31 Aug 2022 17:32:38 +0200
Subject: [PATCH 432/974] Fix regression

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

diff --git a/htdocs/compta/accounting-files.php b/htdocs/compta/accounting-files.php
index 0db718f28b4..40449d5da1f 100644
--- a/htdocs/compta/accounting-files.php
+++ b/htdocs/compta/accounting-files.php
@@ -130,7 +130,7 @@ $error = 0;
 $listofchoices = array(
 	'selectinvoices'=>array('label'=>'Invoices', 'lang'=>'bills', 'enabled' => isModEnabled('facture'), 'perms' => !empty($user->rights->facture->lire)),
 	'selectsupplierinvoices'=>array('label'=>'BillsSuppliers', 'lang'=>'bills', 'enabled' => isModEnabled('supplier_invoice'), 'perms' => !empty($user->rights->fournisseur->facture->lire)),
-	'selectexpensereports'=>array('label'=>'ExpenseReports', 'lang'=>'trips', 'enabled' => !isModEnabled('expensereport'), 'perms' => !empty($user->rights->expensereport->lire)),
+	'selectexpensereports'=>array('label'=>'ExpenseReports', 'lang'=>'trips', 'enabled' => isModEnabled('expensereport'), 'perms' => !empty($user->rights->expensereport->lire)),
 	'selectdonations'=>array('label'=>'Donations', 'lang'=>'donation', 'enabled' => isModEnabled('don'), 'perms' => !empty($user->rights->don->lire)),
 	'selectsocialcontributions'=>array('label'=>'SocialContributions', 'enabled' => isModEnabled('tax'), 'perms' => !empty($user->rights->tax->charges->lire)),
 	'selectpaymentsofsalaries'=>array('label'=>'SalariesPayments', 'lang'=>'salaries', 'enabled' => isModEnabled('salaries'), 'perms' => !empty($user->rights->salaries->read)),

From 0bfa7a2a8f864cd079c63bb56bb39258b9e2e4bf Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 31 Aug 2022 18:09:46 +0200
Subject: [PATCH 433/974] Fix delete dir

---
 build/makepack-dolibarr.pl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build/makepack-dolibarr.pl b/build/makepack-dolibarr.pl
index 3024d3b1e61..abf16cee764 100755
--- a/build/makepack-dolibarr.pl
+++ b/build/makepack-dolibarr.pl
@@ -632,7 +632,7 @@ if ($nboftargetok) {
         $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/tecnickcom/tcpdf/fonts/freefont-*`;
         $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/tecnickcom/tcpdf/fonts/ae_fonts_*`;
         $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/tecnickcom/tcpdf/fonts/utils`;
-        $ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/includes/tecnickcom/tcpdf/tools`;
+        $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/tecnickcom/tcpdf/tools`;
         $ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/includes/vendor`;
         $ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/includes/webmozart`;
         $ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/includes/autoload.php`;

From 92f9f36dd68e7993728a51cabb1727de0e4efd5e Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis.houssin@inodbox.com>
Date: Wed, 31 Aug 2022 18:39:41 +0200
Subject: [PATCH 434/974] FIX add hook formobjectoptions

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

diff --git a/htdocs/accountancy/admin/account.php b/htdocs/accountancy/admin/account.php
index 84eab31849d..15931b19c57 100644
--- a/htdocs/accountancy/admin/account.php
+++ b/htdocs/accountancy/admin/account.php
@@ -399,6 +399,11 @@ if ($resql) {
 	print '<input type="'.(empty($conf->use_javascript_ajax) ? 'submit' : 'button').'" class="button button-edit" name="change_chart" id="change_chart" value="'.dol_escape_htmltag($langs->trans("ChangeAndLoad")).'">';
 
 	print '<br>';
+
+	$parameters = array('chartofaccounts' => $chartofaccounts, 'permissiontoadd' => $permissiontoadd, 'permissiontodelete' => $permissiontodelete);
+	$reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $accounting, $action); // Note that $action and $object may have been modified by hook
+	print $hookmanager->resPrint;
+
 	print '<br>';
 
 	$varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;

From 7374974880038016788d8933da92b168eb6c0efc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Wed, 31 Aug 2022 18:40:28 +0200
Subject: [PATCH 435/974] add tables for bank lines extrafields

---
 .../install/mysql/migration/16.0.0-17.0.0.sql | 10 ++++++++
 .../mysql/tables/llx_bank_extrafields.key.sql | 20 +++++++++++++++
 .../mysql/tables/llx_bank_extrafields.sql     | 25 +++++++++++++++++++
 3 files changed, 55 insertions(+)
 create mode 100644 htdocs/install/mysql/tables/llx_bank_extrafields.key.sql
 create mode 100644 htdocs/install/mysql/tables/llx_bank_extrafields.sql

diff --git a/htdocs/install/mysql/migration/16.0.0-17.0.0.sql b/htdocs/install/mysql/migration/16.0.0-17.0.0.sql
index 5db36ee955b..187106f679c 100644
--- a/htdocs/install/mysql/migration/16.0.0-17.0.0.sql
+++ b/htdocs/install/mysql/migration/16.0.0-17.0.0.sql
@@ -129,3 +129,13 @@ ALTER TABLE llx_societe_rib ADD COLUMN currency_code varchar(3) AFTER fk_country
 ALTER TABLE llx_user_rib ADD COLUMN state_id integer AFTER owner_address;
 ALTER TABLE llx_user_rib ADD COLUMN fk_country integer AFTER state_id;
 ALTER TABLE llx_user_rib ADD COLUMN currency_code varchar(3) AFTER fk_country;
+
+CREATE TABLE llx_bank_extrafields
+(
+  rowid      integer AUTO_INCREMENT PRIMARY KEY,
+  tms        timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+  fk_object  integer NOT NULL,
+  import_key varchar(14)
+)ENGINE=innodb;
+
+ALTER TABLE llx_bank_extrafields ADD INDEX idx_bank_extrafields (fk_object);
diff --git a/htdocs/install/mysql/tables/llx_bank_extrafields.key.sql b/htdocs/install/mysql/tables/llx_bank_extrafields.key.sql
new file mode 100644
index 00000000000..3d308e79684
--- /dev/null
+++ b/htdocs/install/mysql/tables/llx_bank_extrafields.key.sql
@@ -0,0 +1,20 @@
+-- ===================================================================
+-- Copyright (C) 2022      Frédéric France <frederic.france@netlogic.fr>
+--
+-- This program is free software; you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License as published by
+-- the Free Software Foundation; either version 3 of the License, or
+-- (at your option) any later version.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program. If not, see <https://www.gnu.org/licenses/>.
+--
+-- ===================================================================
+
+
+ALTER TABLE llx_bank_extrafields ADD INDEX idx_bank_extrafields (fk_object);
diff --git a/htdocs/install/mysql/tables/llx_bank_extrafields.sql b/htdocs/install/mysql/tables/llx_bank_extrafields.sql
new file mode 100644
index 00000000000..3ca4f7a84d4
--- /dev/null
+++ b/htdocs/install/mysql/tables/llx_bank_extrafields.sql
@@ -0,0 +1,25 @@
+-- ===================================================================
+-- Copyright (C) 2022      Frédéric France <frederic.france@netlogic.fr>
+--
+-- This program is free software; you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License as published by
+-- the Free Software Foundation; either version 3 of the License, or
+-- (at your option) any later version.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program. If not, see <https://www.gnu.org/licenses/>.
+--
+-- ===================================================================
+
+CREATE TABLE llx_bank_extrafields
+(
+  rowid      integer AUTO_INCREMENT PRIMARY KEY,
+  tms        timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+  fk_object  integer NOT NULL,
+  import_key varchar(14)
+)ENGINE=innodb;

From 9d57680d8267f82f28c8ee3803128f93b8b55c60 Mon Sep 17 00:00:00 2001
From: ptibogxiv <support@ptibogxiv.net>
Date: Wed, 31 Aug 2022 20:14:54 +0200
Subject: [PATCH 436/974] FIX double fix

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

diff --git a/htdocs/adherents/class/adherent.class.php b/htdocs/adherents/class/adherent.class.php
index 7d3328cde34..f5784b43fb2 100644
--- a/htdocs/adherents/class/adherent.class.php
+++ b/htdocs/adherents/class/adherent.class.php
@@ -658,8 +658,6 @@ class Adherent extends CommonObject
 
 		require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 
-		require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
-
 		$nbrowsaffected = 0;
 		$error = 0;
 

From 194c76727e31f64a07106da4e2c6f1dd82b1a940 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20France?= <frederic.france@free.fr>
Date: Wed, 31 Aug 2022 21:37:10 +0200
Subject: [PATCH 437/974] fix php8 warnings

---
 htdocs/expedition/class/expedition.class.php | 8 ++++----
 htdocs/expensereport/card.php                | 2 +-
 htdocs/product/inventory/inventory.php       | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/htdocs/expedition/class/expedition.class.php b/htdocs/expedition/class/expedition.class.php
index 5df7108e895..ec7d7ff3cab 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 (!empty($conf->commande->enabled)) {
+if (isModEnabled('commande')) {
 	require_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
 }
 require_once DOL_DOCUMENT_ROOT.'/expedition/class/expeditionlinebatch.class.php';
@@ -625,7 +625,7 @@ class Expedition extends CommonObject
 				$this->fetch_optionals();
 
 				// Fix Get multicurrency param for transmited
-				if (!empty($conf->multicurrency->enabled)) {
+				if (isModEnabled('multicurrency')) {
 					if (!empty($this->multicurrency_code)) {
 						$this->multicurrency_code = $this->thirdparty->multicurrency_code;
 					}
@@ -1291,7 +1291,7 @@ class Expedition extends CommonObject
 		}
 
 		// delete batch expedition line
-		if (!$error && $conf->productbatch->enabled) {
+		if (!$error && isModEnabled('productbatch')) {
 			$shipmentlinebatch = new ExpeditionLineBatch($this->db);
 			if ($shipmentlinebatch->deleteFromShipment($this->id) < 0) {
 				$error++; $this->errors[] = "Error ".$this->db->lasterror();
@@ -2901,7 +2901,7 @@ class ExpeditionLigne extends CommonObjectLine
 
 		// update lot
 
-		if (!empty($batch) && $conf->productbatch->enabled) {
+		if (!empty($batch) && isModEnabled('productbatch')) {
 			dol_syslog(get_class($this)."::update expedition batch id=$expedition_batch_id, batch_id=$batch_id, batch=$batch");
 
 			if (empty($batch_id) || empty($this->fk_product)) {
diff --git a/htdocs/expensereport/card.php b/htdocs/expensereport/card.php
index 05831c5dd97..9daa03a3ec8 100644
--- a/htdocs/expensereport/card.php
+++ b/htdocs/expensereport/card.php
@@ -117,7 +117,7 @@ $permissiontoadd = $user->rights->expensereport->creer; // Used by the include o
 
 $upload_dir = $conf->expensereport->dir_output.'/'.dol_sanitizeFileName($object->ref);
 
-$projectRequired = $conf->project->enabled && ! empty($conf->global->EXPENSEREPORT_PROJECT_IS_REQUIRED);
+$projectRequired = isModEnabled('project') && ! empty($conf->global->EXPENSEREPORT_PROJECT_IS_REQUIRED);
 $fileRequired = !empty($conf->global->EXPENSEREPORT_FILE_IS_REQUIRED);
 
 if ($object->id > 0) {
diff --git a/htdocs/product/inventory/inventory.php b/htdocs/product/inventory/inventory.php
index cdcfe74cb73..f7b3ddd5ac6 100644
--- a/htdocs/product/inventory/inventory.php
+++ b/htdocs/product/inventory/inventory.php
@@ -161,7 +161,7 @@ if (empty($reshook)) {
 
 				// Get the real quantity in stock now, but before the stock move for inventory.
 				$realqtynow = $product_static->stock_warehouse[$line->fk_warehouse]->real;
-				if ($conf->productbatch->enabled && $product_static->hasbatch()) {
+				if (isModEnabled('productbatch') && $product_static->hasbatch()) {
 					$realqtynow = $product_static->stock_warehouse[$line->fk_warehouse]->detail_batch[$line->batch]->qty;
 				}
 

From 9cf33bb932cc1235ea3b3da6e2223a24910447b8 Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Wed, 31 Aug 2022 21:41:12 +0200
Subject: [PATCH 438/974] update code

---
 htdocs/fichinter/card-rec.php | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/htdocs/fichinter/card-rec.php b/htdocs/fichinter/card-rec.php
index 3f644b074bd..8ffcafcccc1 100644
--- a/htdocs/fichinter/card-rec.php
+++ b/htdocs/fichinter/card-rec.php
@@ -37,7 +37,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/fichinter.lib.php';
 
 require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
-if (!empty($conf->project->enabled)) {
+if (isModEnabled('project')) {
 	require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 	require_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php';
 }
@@ -244,7 +244,7 @@ $companystatic = new Societe($db);
 if (!empty($conf->contrat->enabled)) {
 	$contratstatic = new Contrat($db);
 }
-if (!empty($conf->project->enabled)) {
+if (isModEnabled('project')) {
 	$projectstatic = new Project($db);
 }
 
@@ -272,7 +272,7 @@ if ($action == 'create') {
 		print dol_get_fiche_head();
 
 		$rowspan = 4;
-		if (!empty($conf->project->enabled) && $object->fk_project > 0) {
+		if (isModEnabled('project') && $object->fk_project > 0) {
 			$rowspan++;
 		}
 		if (!empty($conf->contrat->enabled) && $object->fk_contrat > 0) {
@@ -314,7 +314,7 @@ if ($action == 'create') {
 		}
 
 		// Project
-		if (!empty($conf->project->enabled)) {
+		if (isModEnabled('project')) {
 			$formproject = new FormProjets($db);
 			print "<tr><td>".$langs->trans("Project")."</td><td>";
 			$projectid = GETPOST('projectid') ?GETPOST('projectid') : $object->fk_project;
@@ -484,7 +484,7 @@ if ($action == 'create') {
 
 			$morehtmlref .= $langs->trans('ThirdParty').' : '.$object->thirdparty->getNomUrl(1);
 			// Project
-			if (!empty($conf->project->enabled)) {
+			if (isModEnabled('project')) {
 				$formproject = new FormProjets($db);
 				$langs->load("projects");
 				$morehtmlref .= '<br>'.$langs->trans('Project').' ';
@@ -803,7 +803,7 @@ if ($action == 'create') {
 			if (!empty($conf->contrat->enabled)) {
 				print_liste_field_titre("Contract", $_SERVER['PHP_SELF'], "f.fk_contrat", "", "", 'width="100px"', $sortfield, $sortorder, 'left ');
 			}
-			if (!empty($conf->project->enabled)) {
+			if (isModEnabled('project')) {
 				print_liste_field_titre("Project", $_SERVER['PHP_SELF'], "f.fk_project", "", "", 'width="100px"', $sortfield, $sortorder, 'left ');
 			}
 			print_liste_field_titre("Duration", $_SERVER['PHP_SELF'], 'f.duree', '', '', 'width="50px"', $sortfield, $sortorder, 'right ');
@@ -842,7 +842,7 @@ if ($action == 'create') {
 						}
 						print '</td>';
 					}
-					if (!empty($conf->project->enabled)) {
+					if (isModEnabled('project')) {
 						print '<td>';
 						if ($objp->fk_project > 0) {
 							$projectstatic->fetch($objp->fk_project);

From e13a276a2e45ea9806ce6d0d021a53a150c3433b Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Wed, 31 Aug 2022 21:42:34 +0200
Subject: [PATCH 439/974] update code

---
 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 e2b8ace4783..efe7a9e7088 100644
--- a/htdocs/admin/dict.php
+++ b/htdocs/admin/dict.php
@@ -511,7 +511,7 @@ $tabcond[25] = !empty($conf->website->enabled);
 //$tabcond[26]= isModEnabled("product");
 $tabcond[27] = isModEnabled("societe");
 $tabcond[28] = !empty($conf->holiday->enabled);
-$tabcond[29] = !empty($conf->project->enabled);
+$tabcond[29] = isModEnabled('project');
 $tabcond[30] = !empty($conf->label->enabled);
 //$tabcond[31]= !empty($conf->accounting->enabled);
 $tabcond[32] = (!empty($conf->holiday->enabled) || !empty($conf->hrm->enabled));

From 93a441197049cb6d1709304bbd0df5b364fd65e8 Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Wed, 31 Aug 2022 21:46:25 +0200
Subject: [PATCH 440/974] update code

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

diff --git a/htdocs/admin/mails_templates.php b/htdocs/admin/mails_templates.php
index 7f60b2260d7..651118d8c6a 100644
--- a/htdocs/admin/mails_templates.php
+++ b/htdocs/admin/mails_templates.php
@@ -188,7 +188,7 @@ if (!empty($conf->recruitment->enabled) && !empty($user->rights->recruitment->re
 if (isModEnabled("societe") && !empty($user->rights->societe->lire)) {
 	$elementList['thirdparty'] = img_picto('', 'company', 'class="pictofixedwidth"').dol_escape_htmltag($langs->trans('MailToThirdparty'));
 }
-if (!empty($conf->project->enabled)) {
+if (isModEnabled('project')) {
 	$elementList['project'] = img_picto('', 'project', 'class="pictofixedwidth"').dol_escape_htmltag($langs->trans('MailToProject'));
 }
 if (isModEnabled("propal") && !empty($user->rights->propal->lire)) {

From 4dbb6cfa6e8aecb3ccd0c8cbc13380ccb4c82ef9 Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Wed, 31 Aug 2022 21:47:03 +0200
Subject: [PATCH 441/974] update code

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

diff --git a/htdocs/bom/bom_agenda.php b/htdocs/bom/bom_agenda.php
index d2c64eea0b6..3c2f3e732ba 100644
--- a/htdocs/bom/bom_agenda.php
+++ b/htdocs/bom/bom_agenda.php
@@ -150,7 +150,7 @@ if ($object->id > 0) {
 	 // Thirdparty
 	 $morehtmlref.='<br>'.$langs->trans('ThirdParty') . ' : ' . $object->thirdparty->getNomUrl(1);
 	 // Project
-	 if (! empty($conf->project->enabled))
+	 if (isModEnabled('project'))
 	 {
 	 $langs->load("projects");
 	 $morehtmlref.='<br>'.$langs->trans('Project') . ' ';

From 04679ac000ae72feffabbae8b919b4fb525e0da7 Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Wed, 31 Aug 2022 21:47:33 +0200
Subject: [PATCH 442/974] update code

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

diff --git a/htdocs/bom/bom_card.php b/htdocs/bom/bom_card.php
index f088ae34050..c39711ce296 100644
--- a/htdocs/bom/bom_card.php
+++ b/htdocs/bom/bom_card.php
@@ -457,7 +457,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 	// Thirdparty
 	$morehtmlref.='<br>'.$langs->trans('ThirdParty') . ' : ' . $soc->getNomUrl(1);
 	// Project
-	if (! empty($conf->project->enabled))
+	if (isModEnabled('project'))
 	{
 		$langs->load("projects");
 		$morehtmlref.='<br>'.$langs->trans('Project') . ' ';

From 6e6b0d16cc04dc88f40434807cce885c95fcc49f Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Wed, 31 Aug 2022 21:48:00 +0200
Subject: [PATCH 443/974] update code

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

diff --git a/htdocs/comm/card.php b/htdocs/comm/card.php
index ec8ebdd67e6..7c1d9da7e29 100644
--- a/htdocs/comm/card.php
+++ b/htdocs/comm/card.php
@@ -78,7 +78,7 @@ if (isModEnabled("expedition")) {
 if (isModEnabled('facture')) {
 	$langs->load("bills");
 }
-if (!empty($conf->project->enabled)) {
+if (isModEnabled('project')) {
 	$langs->load("projects");
 }
 if (!empty($conf->ficheinter->enabled)) {

From 1ab949b3c45b72c34713aef6ece166936092cfab Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Wed, 31 Aug 2022 21:48:32 +0200
Subject: [PATCH 444/974] update code

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

diff --git a/htdocs/comm/action/card.php b/htdocs/comm/action/card.php
index 6f6ddc5383e..380c5813155 100644
--- a/htdocs/comm/action/card.php
+++ b/htdocs/comm/action/card.php
@@ -1411,7 +1411,7 @@ if ($action == 'create') {
 	}
 
 	// Project
-	if (!empty($conf->project->enabled)) {
+	if (isModEnabled('project')) {
 		$langs->load("projects");
 
 		$projectid = GETPOST('projectid', 'int');
@@ -1914,7 +1914,7 @@ if ($id > 0) {
 		}
 
 		// Project
-		if (!empty($conf->project->enabled)) {
+		if (isModEnabled('project')) {
 			$langs->load("projects");
 
 			print '<tr><td class="titlefieldcreate">'.$langs->trans("Project").'</td><td>';
@@ -1939,7 +1939,7 @@ if ($id > 0) {
 			print '<tr>';
 			print '<td>'.$langs->trans("LinkedObject").'</td>';
 
-			if ($object->elementtype == 'task' && !empty($conf->project->enabled)) {
+			if ($object->elementtype == 'task' && isModEnabled('project')) {
 				print '<td id="project-task-input-container" >';
 
 				$urloption = '?action=create&donotclearsession=1'; // we use create not edit for more flexibility
@@ -2132,7 +2132,7 @@ if ($id > 0) {
 		// Thirdparty
 		//$morehtmlref.='<br>'.$langs->trans('ThirdParty') . ' : ' . $object->thirdparty->getNomUrl(1);
 		// Project
-		if (!empty($conf->project->enabled)) {
+		if (isModEnabled('project')) {
 			$langs->load("projects");
 			//$morehtmlref.='<br>'.$langs->trans('Project') . ' ';
 			$morehtmlref .= $langs->trans('Project').' ';

From da5fb7047356c223fde7da9824082c3348b2d281 Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Wed, 31 Aug 2022 21:49:06 +0200
Subject: [PATCH 445/974] update code

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

diff --git a/htdocs/comm/action/document.php b/htdocs/comm/action/document.php
index 90ed4ea1944..ada742f9742 100644
--- a/htdocs/comm/action/document.php
+++ b/htdocs/comm/action/document.php
@@ -34,7 +34,7 @@ require_once DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.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';
-if (!empty($conf->project->enabled)) {
+if (isModEnabled('project')) {
 	require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 }
 
@@ -159,7 +159,7 @@ if ($object->id > 0) {
 	// Thirdparty
 	//$morehtmlref.='<br>'.$langs->trans('ThirdParty') . ' : ' . $object->thirdparty->getNomUrl(1);
 	// Project
-	if (!empty($conf->project->enabled)) {
+	if (isModEnabled('project')) {
 		$langs->load("projects");
 		//$morehtmlref.='<br>'.$langs->trans('Project') . ' ';
 		$morehtmlref .= $langs->trans('Project').': ';

From ece2f5553ae85c9e421a0f7d36d6a64f978eaa2a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20France?= <frederic.france@free.fr>
Date: Wed, 31 Aug 2022 21:49:10 +0200
Subject: [PATCH 446/974] fix php8 warnings

---
 htdocs/admin/dict.php                      | 18 +++++++++---------
 htdocs/comm/card.php                       |  2 +-
 htdocs/contact/card.php                    |  8 ++++----
 htdocs/contact/list.php                    | 14 +++++++-------
 htdocs/core/class/commonobject.class.php   |  2 +-
 htdocs/core/lib/product.lib.php            |  2 +-
 htdocs/core/lib/usergroups.lib.php         |  4 ++--
 htdocs/core/modules/modCategorie.class.php |  2 +-
 htdocs/core/modules/modSociete.class.php   |  8 ++++----
 htdocs/ecm/index_auto.php                  |  2 +-
 htdocs/ecm/search.php                      |  2 +-
 htdocs/fourn/facture/card.php              |  4 ++--
 htdocs/hrm/index.php                       | 10 +++++-----
 htdocs/societe/card.php                    | 10 +++++-----
 htdocs/societe/website.php                 |  2 +-
 htdocs/user/bank.php                       |  8 ++++----
 htdocs/user/card.php                       | 20 ++++++++++----------
 htdocs/user/list.php                       |  2 +-
 htdocs/user/param_ihm.php                  |  2 +-
 19 files changed, 61 insertions(+), 61 deletions(-)

diff --git a/htdocs/admin/dict.php b/htdocs/admin/dict.php
index e2b8ace4783..ca5757dc452 100644
--- a/htdocs/admin/dict.php
+++ b/htdocs/admin/dict.php
@@ -506,24 +506,24 @@ $tabcond[20] = (isModEnabled("fournisseur") && empty($conf->global->MAIN_USE_NEW
 $tabcond[21] = isModEnabled("propal");
 $tabcond[22] = (!empty($conf->commande->enabled) || isModEnabled("propal"));
 $tabcond[23] = true;
-$tabcond[24] = !empty($conf->resource->enabled);
-$tabcond[25] = !empty($conf->website->enabled);
+$tabcond[24] = isModEnabled('resource');
+$tabcond[25] = isModEnabled('website');
 //$tabcond[26]= isModEnabled("product");
 $tabcond[27] = isModEnabled("societe");
-$tabcond[28] = !empty($conf->holiday->enabled);
+$tabcond[28] = isModEnabled('holiday');
 $tabcond[29] = !empty($conf->project->enabled);
-$tabcond[30] = !empty($conf->label->enabled);
+$tabcond[30] = isModEnabled('label');
 //$tabcond[31]= !empty($conf->accounting->enabled);
-$tabcond[32] = (!empty($conf->holiday->enabled) || !empty($conf->hrm->enabled));
-$tabcond[33] = !empty($conf->hrm->enabled);
-$tabcond[34] = !empty($conf->hrm->enabled);
+$tabcond[32] = (isModEnabled('holiday') || isModEnabled('hrm'));
+$tabcond[33] = isModEnabled('hrm');
+$tabcond[34] = isModEnabled('hrm');
 $tabcond[35] = !empty($conf->expensereport->enabled) && !empty($conf->global->MAIN_USE_EXPENSE_IK);
 $tabcond[36] = !empty($conf->expensereport->enabled) && !empty($conf->global->MAIN_USE_EXPENSE_IK);
 $tabcond[37] = isModEnabled("product");
-$tabcond[38] = !empty($conf->socialnetworks->enabled);
+$tabcond[38] = isModEnabled('socialnetworks');
 $tabcond[39] = (isModEnabled("societe") && empty($conf->global->SOCIETE_DISABLE_PROSPECTS) && !empty($conf->global->THIRDPARTY_ENABLE_PROSPECTION_ON_ALTERNATIVE_ADRESSES));
 $tabcond[40] = (isModEnabled("societe") && !empty($conf->global->THIRDPARTY_ENABLE_PROSPECTION_ON_ALTERNATIVE_ADRESSES));
-$tabcond[41] = !empty($conf->intracommreport->enabled);
+$tabcond[41] = isModEnabled('intracommreport');
 $tabcond[42] = isModEnabled("product");
 $tabcond[43] = isModEnabled("product") && !empty($conf->productbatch->enabled) && $conf->global->MAIN_FEATURES_LEVEL >= 2;
 $tabcond[44] = isModEnabled('asset');
diff --git a/htdocs/comm/card.php b/htdocs/comm/card.php
index ec8ebdd67e6..3e388677605 100644
--- a/htdocs/comm/card.php
+++ b/htdocs/comm/card.php
@@ -584,7 +584,7 @@ if ($object->id > 0) {
 		print '</tr>';
 	}
 
-	if (!empty($conf->intracommreport->enabled)) {
+	if (isModEnabled('intracommreport')) {
 		// Transport mode by default
 		print '<tr><td class="nowrap">';
 		print '<table class="centpercent nobordernopadding"><tr><td class="nowrap">';
diff --git a/htdocs/contact/card.php b/htdocs/contact/card.php
index d7eb7f53d82..ff7c0051a29 100644
--- a/htdocs/contact/card.php
+++ b/htdocs/contact/card.php
@@ -215,7 +215,7 @@ if (empty($reshook)) {
 		//$object->facebook		= GETPOST("facebook", 'alpha');
 		//$object->linkedin		= GETPOST("linkedin", 'alpha');
 		$object->socialnetworks = array();
-		if (!empty($conf->socialnetworks->enabled)) {
+		if (isModEnabled('socialnetworks')) {
 			foreach ($socialnetworks as $key => $value) {
 				if (GETPOSTISSET($key) && GETPOST($key, 'alphanohtml') != '') {
 					$object->socialnetworks[$key] = (string) GETPOST($key, 'alphanohtml');
@@ -427,7 +427,7 @@ if (empty($reshook)) {
 			//$object->facebook		= GETPOST("facebook", 'alpha');
 			//$object->linkedin		= GETPOST("linkedin", 'alpha');
 			$object->socialnetworks = array();
-			if (!empty($conf->socialnetworks->enabled)) {
+			if (isModEnabled('socialnetworks')) {
 				foreach ($socialnetworks as $key => $value) {
 					if (GETPOSTISSET($key) && GETPOST($key, 'alphanohtml') != '') {
 						$object->socialnetworks[$key] = (string) GETPOST($key, 'alphanohtml');
@@ -859,7 +859,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 			}
 
 
-			if (!empty($conf->socialnetworks->enabled)) {
+			if (isModEnabled('socialnetworks')) {
 				foreach ($socialnetworks as $key => $value) {
 					if ($value['active']) {
 						print '<tr>';
@@ -1146,7 +1146,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 				print '</tr>';
 			}
 
-			if (!empty($conf->socialnetworks->enabled)) {
+			if (isModEnabled('socialnetworks')) {
 				foreach ($socialnetworks as $key => $value) {
 					if ($value['active']) {
 						print '<tr>';
diff --git a/htdocs/contact/list.php b/htdocs/contact/list.php
index d5c0d333d03..6d66f70ceeb 100644
--- a/htdocs/contact/list.php
+++ b/htdocs/contact/list.php
@@ -83,7 +83,7 @@ if (!empty($conf->mailing->enabled)) {
 } else {
 	$search_no_email = -1;
 }
-if (!empty($conf->socialnetworks->enabled)) {
+if (isModEnabled('socialnetworks')) {
 	foreach ($socialnetworks as $key => $value) {
 		if ($value['active']) {
 			$search_[$key] = GETPOST("search_".$key, 'alpha');
@@ -221,7 +221,7 @@ $arrayfields['unsubscribed'] = array(
 		'enabled'=>(!empty($conf->mailing->enabled)),
 		'position'=>111);
 
-if (!empty($conf->socialnetworks->enabled)) {
+if (isModEnabled('socialnetworks')) {
 	foreach ($socialnetworks as $key => $value) {
 		if ($value['active']) {
 			$arrayfields['p.'.$key] = array(
@@ -289,7 +289,7 @@ if (empty($reshook)) {
 		$search_fax = "";
 		$search_email = "";
 		$search_no_email = -1;
-		if (!empty($conf->socialnetworks->enabled)) {
+		if (isModEnabled('socialnetworks')) {
 			foreach ($socialnetworks as $key => $value) {
 				if ($value['active']) {
 					$search_[$key] = "";
@@ -499,7 +499,7 @@ if (strlen($search_phone_mobile)) {
 if (strlen($search_fax)) {
 	$sql .= natural_search('p.fax', $search_fax);
 }
-if (!empty($conf->socialnetworks->enabled)) {
+if (isModEnabled('socialnetworks')) {
 	foreach ($socialnetworks as $key => $value) {
 		if ($value['active'] && strlen($search_[$key])) {
 			$sql .= " AND p.socialnetworks LIKE '%\"".$key."\":\"".$search_[$key]."%'";
@@ -880,7 +880,7 @@ if (!empty($arrayfields['unsubscribed']['checked'])) {
 	print $form->selectarray('search_no_email', array('-1'=>'', '0'=>$langs->trans('No'), '1'=>$langs->trans('Yes')), $search_no_email);
 	print '</td>';
 }
-if (!empty($conf->socialnetworks->enabled)) {
+if (isModEnabled('socialnetworks')) {
 	foreach ($socialnetworks as $key => $value) {
 		if ($value['active']) {
 			if (!empty($arrayfields['p.'.$key]['checked'])) {
@@ -1004,7 +1004,7 @@ if (!empty($arrayfields['p.email']['checked'])) {
 if (!empty($arrayfields['unsubscribed']['checked'])) {
 	print_liste_field_titre($arrayfields['unsubscribed']['label'], $_SERVER["PHP_SELF"], "unsubscribed", $begin, $param, '', $sortfield, $sortorder, 'center ');
 }
-if (!empty($conf->socialnetworks->enabled)) {
+if (isModEnabled('socialnetworks')) {
 	foreach ($socialnetworks as $key => $value) {
 		if ($value['active'] && !empty($arrayfields['p.'.$key]['checked'])) {
 			print_liste_field_titre($arrayfields['p.'.$key]['label'], $_SERVER["PHP_SELF"], "p.".$key, $begin, $param, '', $sortfield, $sortorder);
@@ -1219,7 +1219,7 @@ while ($i < min($num, $limit)) {
 			$totalarray['nbfield']++;
 		}
 	}
-	if (!empty($conf->socialnetworks->enabled)) {
+	if (isModEnabled('socialnetworks')) {
 		foreach ($socialnetworks as $key => $value) {
 			if ($value['active'] && !empty($arrayfields['p.'.$key]['checked'])) {
 				print '<td>'.dol_print_socialnetworks($arraysocialnetworks[$key], $obj->rowid, $obj->socid, $key, $socialnetworks).'</td>';
diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index 5b5de36406a..2c438fdd98c 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -968,7 +968,7 @@ abstract class CommonObject
 			$outdone++;
 		}
 
-		if (!empty($conf->socialnetworks->enabled)) {
+		if (isModEnabled('socialnetworks')) {
 			$outsocialnetwork = '';
 
 			if (!empty($this->socialnetworks) && is_array($this->socialnetworks) && count($this->socialnetworks) > 0) {
diff --git a/htdocs/core/lib/product.lib.php b/htdocs/core/lib/product.lib.php
index 17235576394..a1446bf6964 100644
--- a/htdocs/core/lib/product.lib.php
+++ b/htdocs/core/lib/product.lib.php
@@ -124,7 +124,7 @@ function product_prepare_head($object)
 	}
 
 	// Tab to link resources
-	if (!empty($conf->resource->enabled)) {
+	if (isModEnabled('resource')) {
 		if ($object->isProduct() && !empty($conf->global->RESOURCE_ON_PRODUCTS)) {
 			$head[$h][0] = DOL_URL_ROOT.'/resource/element_resource.php?element=product&ref='.$object->ref;
 			$head[$h][1] = $langs->trans("Resources");
diff --git a/htdocs/core/lib/usergroups.lib.php b/htdocs/core/lib/usergroups.lib.php
index 65b512ec18e..19578ec9fe3 100644
--- a/htdocs/core/lib/usergroups.lib.php
+++ b/htdocs/core/lib/usergroups.lib.php
@@ -142,9 +142,9 @@ function user_prepare_head(User $object)
 	complete_head_from_modules($conf, $langs, $object, $head, $h, 'user');
 
 	if ((!empty($conf->salaries->enabled) && !empty($user->rights->salaries->read))
-		|| (!empty($conf->hrm->enabled) && !empty($user->rights->hrm->employee->read))
+		|| (isModEnabled('hrm') && !empty($user->rights->hrm->employee->read))
 		|| (!empty($conf->expensereport->enabled) && !empty($user->rights->expensereport->lire) && ($user->id == $object->id || $user->rights->expensereport->readall))
-		|| (!empty($conf->holiday->enabled) && !empty($user->rights->holiday->read) && ($user->id == $object->id || $user->rights->holiday->readall))
+		|| (isModEnabled('holiday') && !empty($user->rights->holiday->read) && ($user->id == $object->id || $user->rights->holiday->readall))
 		) {
 		// Bank
 		$head[$h][0] = DOL_URL_ROOT.'/user/bank.php?id='.$object->id;
diff --git a/htdocs/core/modules/modCategorie.class.php b/htdocs/core/modules/modCategorie.class.php
index e70cdad999e..2e31bdef7db 100644
--- a/htdocs/core/modules/modCategorie.class.php
+++ b/htdocs/core/modules/modCategorie.class.php
@@ -160,7 +160,7 @@ class modCategorie extends DolibarrModules
 		if (isModEnabled('agenda')) {
 			$typeexample .= ($typeexample ? " / " : "")."10=Agenda event";
 		}
-		if (!empty($conf->website->enabled)) {
+		if (isModEnabled('website')) {
 			$typeexample .= ($typeexample ? " / " : "")."11=Website page";
 		}
 
diff --git a/htdocs/core/modules/modSociete.class.php b/htdocs/core/modules/modSociete.class.php
index c11c37d11ef..7e7d010ed5d 100644
--- a/htdocs/core/modules/modSociete.class.php
+++ b/htdocs/core/modules/modSociete.class.php
@@ -520,7 +520,7 @@ class modSociete extends DolibarrModules
 			$this->import_fields_array[$r] += array('s.accountancy_code_sell'=>'ProductAccountancySellCode', 's.accountancy_code_buy'=>'ProductAccountancyBuyCode');
 		}
 		// Add social networks fields
-		if (!empty($conf->socialnetworks->enabled)) {
+		if (isModEnabled('socialnetworks')) {
 			$sql = "SELECT code, label FROM ".MAIN_DB_PREFIX."c_socialnetworks WHERE active = 1";
 			$resql = $this->db->query($sql);
 			while ($obj = $this->db->fetch_object($resql)) {
@@ -693,7 +693,7 @@ class modSociete extends DolibarrModules
 			's.code_compta' => 'CustomerAccountancyCode',
 			's.code_compta_fournisseur' => 'SupplierAccountancyCode'
 		);
-		if (!empty($conf->socialnetworks->enabled)) {
+		if (isModEnabled('socialnetworks')) {
 			$sql = "SELECT code, label FROM ".MAIN_DB_PREFIX."c_socialnetworks WHERE active = 1";
 			$resql = $this->db->query($sql);
 			while ($obj = $this->db->fetch_object($resql)) {
@@ -757,7 +757,7 @@ class modSociete extends DolibarrModules
 			's.note_public' => "NotePublic"
 		);
 		// Add social networks fields
-		if (!empty($conf->socialnetworks->enabled)) {
+		if (isModEnabled('socialnetworks')) {
 			$sql = "SELECT code, label FROM ".MAIN_DB_PREFIX."c_socialnetworks WHERE active = 1";
 			$resql = $this->db->query($sql);
 			while ($obj = $this->db->fetch_object($resql)) {
@@ -835,7 +835,7 @@ class modSociete extends DolibarrModules
 			's.rowid' => 'Id',
 			's.lastname' => "Lastname",
 		);
-		if (!empty($conf->socialnetworks->enabled)) {
+		if (isModEnabled('socialnetworks')) {
 			$sql = "SELECT code, label FROM ".MAIN_DB_PREFIX."c_socialnetworks WHERE active = 1";
 			$resql = $this->db->query($sql);
 			while ($obj = $this->db->fetch_object($resql)) {
diff --git a/htdocs/ecm/index_auto.php b/htdocs/ecm/index_auto.php
index 49bd25d0b90..c37ce4690f4 100644
--- a/htdocs/ecm/index_auto.php
+++ b/htdocs/ecm/index_auto.php
@@ -359,7 +359,7 @@ if (!empty($conf->global->ECM_AUTO_TREE_ENABLED)) {
 		$langs->load("trips");
 		$rowspan++; $sectionauto[] = array('position'=>160, 'level'=>1, 'module'=>'expensereport', 'test'=>$conf->expensereport->enabled, 'label'=>$langs->trans("ExpenseReports"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("ExpenseReports")));
 	}
-	if (!empty($conf->holiday->enabled)) {
+	if (isModEnabled('holiday')) {
 		$langs->load("holiday");
 		$rowspan++; $sectionauto[] = array('position'=>170, 'level'=>1, 'module'=>'holiday', 'test'=>$conf->holiday->enabled, 'label'=>$langs->trans("Holidays"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("Holidays")));
 	}
diff --git a/htdocs/ecm/search.php b/htdocs/ecm/search.php
index 6bbca0026e1..7572dd3f3d8 100644
--- a/htdocs/ecm/search.php
+++ b/htdocs/ecm/search.php
@@ -152,7 +152,7 @@ if (!empty($conf->ficheinter->enabled)) {
 if (!empty($conf->expensereport->enabled)) {
 	$langs->load("trips"); $rowspan++; $sectionauto[] = array('level'=>1, 'module'=>'expensereport', 'test'=>$conf->expensereport->enabled, 'label'=>$langs->trans("ExpenseReports"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("ExpenseReports")));
 }
-if (!empty($conf->holiday->enabled)) {
+if (isModEnabled('holiday')) {
 	$langs->load("holiday"); $rowspan++; $sectionauto[] = array('level'=>1, 'module'=>'holiday', 'test'=>$conf->holiday->enabled, 'label'=>$langs->trans("Holidays"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("Holidays")));
 }
 if (isModEnabled("banque")) {
diff --git a/htdocs/fourn/facture/card.php b/htdocs/fourn/facture/card.php
index ddf54ba0727..f5ed12fd984 100644
--- a/htdocs/fourn/facture/card.php
+++ b/htdocs/fourn/facture/card.php
@@ -2465,7 +2465,7 @@ if ($action == 'create') {
 	}
 
 	// Intracomm report
-	if (!empty($conf->intracommreport->enabled)) {
+	if (isModEnabled('intracommreport')) {
 		$langs->loadLangs(array("intracommreport"));
 		print '<tr><td>'.$langs->trans('IntracommReportTransportMode').'</td><td>';
 		$form->selectTransportMode(GETPOSTISSET('transport_mode_id') ? GETPOST('transport_mode_id') : $transport_mode_id, 'transport_mode_id');
@@ -3137,7 +3137,7 @@ if ($action == 'create') {
 		}
 
 		// Intracomm report
-		if (!empty($conf->intracommreport->enabled)) {
+		if (isModEnabled('intracommreport')) {
 			$langs->loadLangs(array("intracommreport"));
 			print '<tr><td>';
 			print '<table width="100%" class="nobordernopadding"><tr><td>';
diff --git a/htdocs/hrm/index.php b/htdocs/hrm/index.php
index 861bde0fb51..dfa47df91a3 100644
--- a/htdocs/hrm/index.php
+++ b/htdocs/hrm/index.php
@@ -47,7 +47,7 @@ if (!empty($conf->recruitment->enabled)) {
 	require_once DOL_DOCUMENT_ROOT.'/recruitment/class/recruitmentcandidature.class.php';
 	require_once DOL_DOCUMENT_ROOT.'/recruitment/class/recruitmentjobposition.class.php';
 }
-if (!empty($conf->holiday->enabled)) {
+if (isModEnabled('holiday')) {
 	require_once DOL_DOCUMENT_ROOT.'/holiday/class/holiday.class.php';
 }
 
@@ -79,7 +79,7 @@ $max = $conf->global->MAIN_SIZE_SHORTLIST_LIMIT;
  */
 
 // Update sold
-if (!empty($conf->holiday->enabled) && !empty($setupcompanynotcomplete)) {
+if (isModEnabled('holiday') && !empty($setupcompanynotcomplete)) {
 	$holidaystatic = new Holiday($db);
 	$result = $holidaystatic->updateBalance();
 }
@@ -112,7 +112,7 @@ if (!empty($setupcompanynotcomplete)) {
 print '<div class="fichecenter"><div class="fichethirdleft">';
 
 if (!empty($conf->global->MAIN_SEARCH_FORM_ON_HOME_AREAS)) {     // This is useless due to the global search combo
-	if (!empty($conf->holiday->enabled) && $user->rights->holiday->read) {
+	if (isModEnabled('holiday') && $user->rights->holiday->read) {
 		$langs->load("holiday");
 		$listofsearchfields['search_holiday'] = array('text'=>'TitreRequestCP');
 	}
@@ -150,7 +150,7 @@ if (!empty($conf->global->MAIN_SEARCH_FORM_ON_HOME_AREAS)) {     // This is usel
 }
 
 
-if (!empty($conf->holiday->enabled)) {
+if (isModEnabled('holiday')) {
 	if (empty($conf->global->HOLIDAY_HIDE_BALANCE)) {
 		$holidaystatic = new Holiday($db);
 		$user_id = $user->id;
@@ -187,7 +187,7 @@ print '</div><div class="fichetwothirdright">';
 
 
 // Latest leave requests
-if (!empty($conf->holiday->enabled) && $user->rights->holiday->read) {
+if (isModEnabled('holiday') && $user->rights->holiday->read) {
 	$sql = "SELECT u.rowid as uid, u.lastname, u.firstname, u.login, u.email, u.photo, u.statut as user_status,";
 	$sql .= " x.rowid, x.ref, x.fk_type, x.date_debut as date_start, x.date_fin as date_end, x.halfday, x.tms as dm, x.statut as status";
 	$sql .= " FROM ".MAIN_DB_PREFIX."holiday as x, ".MAIN_DB_PREFIX."user as u";
diff --git a/htdocs/societe/card.php b/htdocs/societe/card.php
index 06fdbfba0a5..d5ccb96eaf7 100644
--- a/htdocs/societe/card.php
+++ b/htdocs/societe/card.php
@@ -463,7 +463,7 @@ if (empty($reshook)) {
 			$object->state_id				= GETPOST('state_id', 'int');
 
 			$object->socialnetworks = array();
-			if (!empty($conf->socialnetworks->enabled)) {
+			if (isModEnabled('socialnetworks')) {
 				foreach ($socialnetworks as $key => $value) {
 					if (GETPOSTISSET($key) && GETPOST($key, 'alphanohtml') != '') {
 						$object->socialnetworks[$key] = GETPOST($key, 'alphanohtml');
@@ -1083,7 +1083,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 		$object->state_id = GETPOST('state_id', 'int');
 
 		$object->socialnetworks = array();
-		if (!empty($conf->socialnetworks->enabled)) {
+		if (isModEnabled('socialnetworks')) {
 			foreach ($socialnetworks as $key => $value) {
 				if (GETPOSTISSET($key) && GETPOST($key, 'alphanohtml') != '') {
 					$object->socialnetworks[$key] = GETPOST($key, 'alphanohtml');
@@ -1600,7 +1600,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 		print '<td colspan="3">'.img_picto('', 'globe', 'class="pictofixedwidth"').' <input type="text" class="maxwidth500 widthcentpercentminusx" name="url" id="url" value="'.$object->url.'"></td></tr>';
 
 		// Social networks
-		if (!empty($conf->socialnetworks->enabled)) {
+		if (isModEnabled('socialnetworks')) {
 			foreach ($socialnetworks as $key => $value) {
 				if ($value['active']) {
 					print '<tr>';
@@ -1929,7 +1929,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 				$object->state_id = GETPOST('state_id', 'int');
 
 				$object->socialnetworks = array();
-				if (!empty($conf->socialnetworks->enabled)) {
+				if (isModEnabled('socialnetworks')) {
 					foreach ($socialnetworks as $key => $value) {
 						if (GETPOSTISSET($key) && GETPOST($key, 'alphanohtml') != '') {
 							$object->socialnetworks[$key] = GETPOST($key, 'alphanohtml');
@@ -2287,7 +2287,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 			print '<td colspan="3">'.img_picto('', 'globe', 'class="pictofixedwidth"').' <input type="text" name="url" id="url" class="maxwidth200onsmartphone maxwidth500 widthcentpercentminusx " value="'.(GETPOSTISSET('url') ?GETPOST('url', 'alpha') : $object->url).'"></td></tr>';
 
 			// Social network
-			if (!empty($conf->socialnetworks->enabled)) {
+			if (isModEnabled('socialnetworks')) {
 				foreach ($socialnetworks as $key => $value) {
 					if ($value['active']) {
 						print '<tr>';
diff --git a/htdocs/societe/website.php b/htdocs/societe/website.php
index 424d18c2058..b8111274969 100644
--- a/htdocs/societe/website.php
+++ b/htdocs/societe/website.php
@@ -249,7 +249,7 @@ print '</div>';
 print dol_get_fiche_end();
 
 $newcardbutton = '';
-if (!empty($conf->website->enabled)) {
+if (isModEnabled('website')) {
 	if (!empty($user->rights->societe->lire)) {
 		$newcardbutton .= dolGetButtonTitle($langs->trans("AddWebsiteAccount"), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/website/websiteaccount_card.php?action=create&fk_soc='.$object->id.'&backtopage='.urlencode($_SERVER["PHP_SELF"].'?id='.$object->id));
 	} else {
diff --git a/htdocs/user/bank.php b/htdocs/user/bank.php
index fed40e6a1bd..0dd8a7f9d08 100644
--- a/htdocs/user/bank.php
+++ b/htdocs/user/bank.php
@@ -33,7 +33,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/usergroups.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/bank.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/user/class/userbankaccount.class.php';
-if (!empty($conf->holiday->enabled)) {
+if (isModEnabled('holiday')) {
 	require_once DOL_DOCUMENT_ROOT.'/holiday/class/holiday.class.php';
 }
 if (!empty($conf->expensereport->enabled)) {
@@ -377,7 +377,7 @@ if ($action != 'edit' && $action != 'create') {		// If not bank account yet, $ac
 	}
 
 	// Holiday request validator
-	if (!empty($conf->holiday->enabled)) {
+	if (isModEnabled('holiday')) {
 		print '<tr><td>';
 		$text = $langs->trans("ForceUserHolidayValidator");
 		print $form->textwithpicto($text, $langs->trans("ValidatorIsSupervisorByDefault"), 1, 'help');
@@ -407,7 +407,7 @@ if ($action != 'edit' && $action != 'create') {		// If not bank account yet, $ac
 	// Sensitive salary/value information
 	if ((empty($user->socid) && in_array($id, $childids))	// A user can always see salary/value information for its subordinates
 		|| (!empty($conf->salaries->enabled) && !empty($user->rights->salaries->readall))
-		|| (!empty($conf->hrm->enabled) && !empty($user->rights->hrm->employee->read))) {
+		|| (isModEnabled('hrm') && !empty($user->rights->hrm->employee->read))) {
 		$langs->load("salaries");
 
 		// Salary
@@ -635,7 +635,7 @@ if ($action != 'edit' && $action != 'create') {		// If not bank account yet, $ac
 	}
 
 	// Latest leave requests
-	if (!empty($conf->holiday->enabled) && ($user->rights->holiday->readall || ($user->rights->holiday->read && $object->id == $user->id))) {
+	if (isModEnabled('holiday') && ($user->rights->holiday->readall || ($user->rights->holiday->read && $object->id == $user->id))) {
 		$holiday = new Holiday($db);
 
 		$sql = "SELECT h.rowid, h.statut as status, h.fk_type, h.date_debut, h.date_fin, h.halfday";
diff --git a/htdocs/user/card.php b/htdocs/user/card.php
index c4e2715f664..45d7c91a8bb 100644
--- a/htdocs/user/card.php
+++ b/htdocs/user/card.php
@@ -262,7 +262,7 @@ if (empty($reshook)) {
 			$object->office_fax = GETPOST("office_fax", 'alphanohtml');
 			$object->user_mobile = GETPOST("user_mobile", 'alphanohtml');
 
-			if (!empty($conf->socialnetworks->enabled)) {
+			if (isModEnabled('socialnetworks')) {
 				$object->socialnetworks = array();
 				foreach ($socialnetworks as $key => $value) {
 					if (GETPOST($key, 'alphanohtml')) {
@@ -432,7 +432,7 @@ if (empty($reshook)) {
 				$object->office_fax = GETPOST("office_fax", 'alphanohtml');
 				$object->user_mobile = GETPOST("user_mobile", 'alphanohtml');
 
-				if (!empty($conf->socialnetworks->enabled)) {
+				if (isModEnabled('socialnetworks')) {
 					$object->socialnetworks = array();
 					foreach ($socialnetworks as $key => $value) {
 						if (GETPOST($key, 'alphanohtml')) {
@@ -962,7 +962,7 @@ if ($action == 'create' || $action == 'adduserldap') {
 	}
 
 	// Holiday request validator
-	if (!empty($conf->holiday->enabled)) {
+	if (isModEnabled('holiday')) {
 		print '<tr><td class="titlefieldcreate">';
 		$text = $langs->trans("ForceUserHolidayValidator");
 		print $form->textwithpicto($text, $langs->trans("ValidatorIsSupervisorByDefault"), 1, 'help');
@@ -1128,7 +1128,7 @@ if ($action == 'create' || $action == 'adduserldap') {
 	print '</td></tr>';
 
 	// Social networks
-	if (!empty($conf->socialnetworks->enabled)) {
+	if (isModEnabled('socialnetworks')) {
 		foreach ($socialnetworks as $key => $value) {
 			if ($value['active']) {
 				print '<tr><td>'.$langs->trans($value['label']).'</td>';
@@ -1242,7 +1242,7 @@ if ($action == 'create' || $action == 'adduserldap') {
 
 	if ((!empty($conf->salaries->enabled) && $user->hasRight("salaries", "read") && in_array($id, $childids))
 		|| (!empty($conf->salaries->enabled) && $user->hasRight("salaries", "readall"))
-		|| (!empty($conf->hrm->enabled) && $user->hasRight("hrm", "employee", "read"))) {
+		|| (isModEnabled('hrm') && $user->hasRight("hrm", "employee", "read"))) {
 		$langs->load("salaries");
 
 		// THM
@@ -1514,7 +1514,7 @@ if ($action == 'create' || $action == 'adduserldap') {
 			}
 
 			// Holiday request validator
-			if (!empty($conf->holiday->enabled)) {
+			if (isModEnabled('holiday')) {
 				print '<tr><td>';
 				$text = $langs->trans("ForceUserHolidayValidator");
 				print $form->textwithpicto($text, $langs->trans("ValidatorIsSupervisorByDefault"), 1, 'help');
@@ -1544,7 +1544,7 @@ if ($action == 'create' || $action == 'adduserldap') {
 			// Sensitive salary/value information
 			if ((empty($user->socid) && in_array($id, $childids))	// A user can always see salary/value information for its subordinates
 				|| (!empty($conf->salaries->enabled) && $user->hasRight("salaries", "readall"))
-				|| (!empty($conf->hrm->enabled) && $user->hasRight("hrm", "employee", "read"))) {
+				|| (isModEnabled('hrm') && $user->hasRight("hrm", "employee", "read"))) {
 				$langs->load("salaries");
 
 				// Salary
@@ -2258,7 +2258,7 @@ if ($action == 'create' || $action == 'adduserldap') {
 			}
 
 			// Holiday request validator
-			if (!empty($conf->holiday->enabled)) {
+			if (isModEnabled('holiday')) {
 				print '<tr><td class="titlefield">';
 				$text = $langs->trans("ForceUserHolidayValidator");
 				print $form->textwithpicto($text, $langs->trans("ValidatorIsSupervisorByDefault"), 1, 'help');
@@ -2507,7 +2507,7 @@ if ($action == 'create' || $action == 'adduserldap') {
 			}
 			print '</td></tr>';
 
-			if (!empty($conf->socialnetworks->enabled)) {
+			if (isModEnabled('socialnetworks')) {
 				foreach ($socialnetworks as $key => $value) {
 					if ($value['active']) {
 						print '<tr><td>'.$langs->trans($value['label']).'</td>';
@@ -2721,7 +2721,7 @@ if ($action == 'create' || $action == 'adduserldap') {
 			// Sensitive salary/value information
 			if ((empty($user->socid) && in_array($id, $childids))	// A user can always see salary/value information for its subordinates
 				|| (!empty($conf->salaries->enabled) && $user->hasRight("salaries", "readall"))
-				|| (!empty($conf->hrm->enabled) && $user->hasRight("hrm", "employee", "read"))) {
+				|| (isModEnabled('hrm') && $user->hasRight("hrm", "employee", "read"))) {
 					$langs->load("salaries");
 
 				// Salary
diff --git a/htdocs/user/list.php b/htdocs/user/list.php
index e98922f7e01..e22f95d1055 100644
--- a/htdocs/user/list.php
+++ b/htdocs/user/list.php
@@ -941,7 +941,7 @@ while ($i < $imaxinloop) {
 	$canreadhrmdata = 0;
 	if ((!empty($conf->salaries->enabled) && $user->hasRight("salaries", "read") && in_array($obj->rowid, $childids))
 		|| (!empty($conf->salaries->enabled) && $user->hasRight("salaries", "readall"))
-		|| (!empty($conf->hrm->enabled) && $user->hasRight("hrm", "employee", "read"))) {
+		|| (isModEnabled('hrm') && $user->hasRight("hrm", "employee", "read"))) {
 			$canreadhrmdata = 1;
 	}
 	$canreadsecretapi = 0;
diff --git a/htdocs/user/param_ihm.php b/htdocs/user/param_ihm.php
index 49dc7e7f7a3..6d5a27cd8ba 100644
--- a/htdocs/user/param_ihm.php
+++ b/htdocs/user/param_ihm.php
@@ -192,7 +192,7 @@ if (isModEnabled("societe")) {
 if (!empty($conf->project->enabled)) {
 	$tmparray['projet/index.php?mainmenu=project&leftmenu='] = 'ProjectsArea';
 }
-if (!empty($conf->holiday->enabled) || !empty($conf->expensereport->enabled)) {
+if (isModEnabled('holiday') || !empty($conf->expensereport->enabled)) {
 	$tmparray['hrm/index.php?mainmenu=hrm&leftmenu='] = 'HRMArea'; // TODO Complete list with first level of menus
 }
 if (isModEnabled("product") || isModEnabled("service")) {

From 1f3c39090732e396d852f54ab11d39f3eb23a0b8 Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Wed, 31 Aug 2022 21:49:38 +0200
Subject: [PATCH 447/974] update code

---
 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 7fb2f0f129e..278096b3b75 100644
--- a/htdocs/comm/action/index.php
+++ b/htdocs/comm/action/index.php
@@ -36,7 +36,7 @@ require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
 require_once DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/agenda.lib.php';
-if (!empty($conf->project->enabled)) {
+if (isModEnabled('project')) {
 	require_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php';
 }
 

From 990ff193aa5981058c4cf5354ae7b146b6981b67 Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Wed, 31 Aug 2022 21:50:12 +0200
Subject: [PATCH 448/974] update code

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

diff --git a/htdocs/comm/action/info.php b/htdocs/comm/action/info.php
index 0ea24279df4..73acc0e7c82 100644
--- a/htdocs/comm/action/info.php
+++ b/htdocs/comm/action/info.php
@@ -28,7 +28,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
 require_once DOL_DOCUMENT_ROOT.'/comm/action/class/cactioncomm.class.php';
 require_once DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php';
-if (!empty($conf->project->enabled)) {
+if (isModEnabled('project')) {
 	require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 	require_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php';
 }
@@ -86,7 +86,7 @@ $morehtmlref = '<div class="refidno">';
 // Thirdparty
 //$morehtmlref.='<br>'.$langs->trans('ThirdParty') . ' : ' . $object->thirdparty->getNomUrl(1);
 // Project
-if (!empty($conf->project->enabled)) {
+if (isModEnabled('project')) {
 	$langs->load("projects");
 	//$morehtmlref.='<br>'.$langs->trans('Project') . ' ';
 	$morehtmlref .= $langs->trans('Project').': ';

From 37a2cc3052ea3ae02694774879ae5443eb067b66 Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Wed, 31 Aug 2022 21:50:58 +0200
Subject: [PATCH 449/974] update code

---
 htdocs/comm/propal/card.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/htdocs/comm/propal/card.php b/htdocs/comm/propal/card.php
index e02ff5d8875..3c93332ab29 100644
--- a/htdocs/comm/propal/card.php
+++ b/htdocs/comm/propal/card.php
@@ -6,7 +6,7 @@
  * Copyright (C) 2005-2012 Regis Houssin         <regis.houssin@inodbox.com>
  * Copyright (C) 2006      Andre Cianfarani      <acianfa@free.fr>
  * Copyright (C) 2010-2016 Juanjo Menent         <jmenent@2byte.es>
- * Copyright (C) 2010-2021 Philippe Grand        <philippe.grand@atoo-net.com>
+ * Copyright (C) 2010-2022 Philippe Grand        <philippe.grand@atoo-net.com>
  * Copyright (C) 2012-2013 Christophe Battarel   <christophe.battarel@altairis.fr>
  * Copyright (C) 2012      Cedric Salvador       <csalvador@gpcsolutions.fr>
  * Copyright (C) 2013-2014 Florian Henry         <florian.henry@open-concept.pro>
@@ -49,7 +49,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/propal.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
-if (!empty($conf->project->enabled)) {
+if (isModEnabled('project')) {
 	require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 	require_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php';
 }
@@ -1574,7 +1574,7 @@ $form = new Form($db);
 $formfile = new FormFile($db);
 $formpropal = new FormPropal($db);
 $formmargin = new FormMargin($db);
-if (!empty($conf->project->enabled)) {
+if (isModEnabled('project')) {
 	$formproject = new FormProjets($db);
 }
 
@@ -1835,7 +1835,7 @@ if ($action == 'create') {
 	print '</td></tr>';
 
 	// Project
-	if (!empty($conf->project->enabled)) {
+	if (isModEnabled('project')) {
 		$langs->load("projects");
 		print '<tr class="field_projectid">';
 		print '<td class="titlefieldcreate">'.$langs->trans("Project").'</td><td class="valuefieldcreate">';
@@ -2267,7 +2267,7 @@ if ($action == 'create') {
 		$morehtmlref .= ' (<a href="'.DOL_URL_ROOT.'/comm/propal/list.php?socid='.$object->thirdparty->id.'&search_societe='.urlencode($object->thirdparty->name).'">'.$langs->trans("OtherProposals").'</a>)';
 	}
 	// Project
-	if (!empty($conf->project->enabled)) {
+	if (isModEnabled('project')) {
 		$langs->load("projects");
 		$morehtmlref .= '<br><span class="paddingrightonly">'.$langs->trans('Project').'</span>';
 		if ($usercancreate) {

From 1acc9bb99c0192765153a4052d50b241b46211e4 Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Wed, 31 Aug 2022 21:51:32 +0200
Subject: [PATCH 450/974] update code

---
 htdocs/comm/propal/contact.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/comm/propal/contact.php b/htdocs/comm/propal/contact.php
index 52318684f42..2497ba905a8 100644
--- a/htdocs/comm/propal/contact.php
+++ b/htdocs/comm/propal/contact.php
@@ -2,7 +2,7 @@
 /* Copyright (C) 2005      Patrick Rouillon     <patrick@rouillon.net>
  * Copyright (C) 2005-2016 Destailleur Laurent  <eldy@users.sourceforge.net>
  * Copyright (C) 2005-2012 Regis Houssin		<regis.houssin@inodbox.com>
- * Copyright (C) 2011-2015 Philippe Grand       <philippe.grand@atoo-net.com>
+ * Copyright (C) 2011-2022 Philippe Grand       <philippe.grand@atoo-net.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -138,7 +138,7 @@ if ($object->id > 0) {
 	// Thirdparty
 	$morehtmlref .= '<br>'.$langs->trans('ThirdParty').' : '.$object->thirdparty->getNomUrl(1, 'customer');
 	// Project
-	if (!empty($conf->project->enabled)) {
+	if (isModEnabled('project')) {
 		$langs->load("projects");
 		$morehtmlref .= '<br>'.$langs->trans('Project').' ';
 		if ($user->rights->propal->creer) {

From fa34b7ac204f133dbc55a4ba2ef25a1ee9b7c24b Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Wed, 31 Aug 2022 21:52:00 +0200
Subject: [PATCH 451/974] update code

---
 htdocs/comm/propal/document.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/comm/propal/document.php b/htdocs/comm/propal/document.php
index 35ab2e28b49..6f17c655e82 100644
--- a/htdocs/comm/propal/document.php
+++ b/htdocs/comm/propal/document.php
@@ -32,7 +32,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/propal.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';
-if (!empty($conf->project->enabled)) {
+if (isModEnabled('project')) {
 	require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 }
 
@@ -136,7 +136,7 @@ if ($object->id > 0) {
 	// Thirdparty
 	$morehtmlref .= '<br>'.$langs->trans('ThirdParty').' : '.$object->thirdparty->getNomUrl(1, 'customer');
 	// Project
-	if (!empty($conf->project->enabled)) {
+	if (isModEnabled('project')) {
 		$langs->load("projects");
 		$morehtmlref .= '<br>'.$langs->trans('Project').' ';
 		if ($user->rights->propal->creer) {

From 50728f4b22641bc2e9120fa40ad9a9a7b433f348 Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Wed, 31 Aug 2022 21:52:34 +0200
Subject: [PATCH 452/974] update code

---
 htdocs/comm/propal/info.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/comm/propal/info.php b/htdocs/comm/propal/info.php
index 92285183cf2..c67ec346ecb 100644
--- a/htdocs/comm/propal/info.php
+++ b/htdocs/comm/propal/info.php
@@ -28,7 +28,7 @@ require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/propal.lib.php';
-if (!empty($conf->project->enabled)) {
+if (isModEnabled('project')) {
 	require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 }
 
@@ -83,7 +83,7 @@ $morehtmlref .= $form->editfieldval("RefCustomer", 'ref_client', $object->ref_cl
 // Thirdparty
 $morehtmlref .= '<br>'.$langs->trans('ThirdParty').' : '.$object->thirdparty->getNomUrl(1);
 // Project
-if (!empty($conf->project->enabled)) {
+if (isModEnabled('project')) {
 	$langs->load("projects");
 	$morehtmlref .= '<br>'.$langs->trans('Project').' ';
 	if ($user->rights->propal->creer) {

From 97013cc956465bbd399c6b5935c813e6f1e2e56d Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Wed, 31 Aug 2022 21:53:29 +0200
Subject: [PATCH 453/974] update code

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

diff --git a/htdocs/comm/propal/list.php b/htdocs/comm/propal/list.php
index 6b717d3ea6f..f7e54d18fc1 100644
--- a/htdocs/comm/propal/list.php
+++ b/htdocs/comm/propal/list.php
@@ -204,8 +204,8 @@ $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'=>(empty($conf->project->enabled) ? 0 : 1)),
-	'pr.title'=>array('label'=>"ProjectLabel", 'checked'=>0, 'enabled'=>(empty($conf->project->enabled) ? 0 : 1)),
+	'pr.ref'=>array('label'=>"ProjectRef", 'checked'=>1, 'enabled'=>(!isModEnabled('project') ? 0 : 1)),
+	'pr.title'=>array('label'=>"ProjectLabel", 'checked'=>0, 'enabled'=>(!isModEnabled('project') ? 0 : 1)),
 	's.nom'=>array('label'=>"ThirdParty", 'checked'=>1),
 	's.name_alias'=>array('label'=>"AliasNameShort", 'checked'=>-1),
 	's.town'=>array('label'=>"Town", 'checked'=>-1),

From 8d73d2ecd595dd0c5ee7840e5a997c64e5a79091 Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Wed, 31 Aug 2022 21:54:11 +0200
Subject: [PATCH 454/974] update code

---
 htdocs/comm/propal/note.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/comm/propal/note.php b/htdocs/comm/propal/note.php
index 28819123cb0..2b007ab3fa0 100644
--- a/htdocs/comm/propal/note.php
+++ b/htdocs/comm/propal/note.php
@@ -29,7 +29,7 @@
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/propal.lib.php';
-if (!empty($conf->project->enabled)) {
+if (isModEnabled('project')) {
 	require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 }
 
@@ -108,7 +108,7 @@ if ($object->id > 0) {
 		// Thirdparty
 		$morehtmlref .= '<br>'.$langs->trans('ThirdParty').' : '.$object->thirdparty->getNomUrl(1);
 		// Project
-		if (!empty($conf->project->enabled)) {
+		if (isModEnabled('project')) {
 			$langs->load("projects");
 			$morehtmlref .= '<br>'.$langs->trans('Project').' ';
 			if ($user->rights->propal->creer) {

From 50e96a635687359f4c169e162eb45cc77576f0e3 Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Wed, 31 Aug 2022 21:55:01 +0200
Subject: [PATCH 455/974] update code

---
 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 aa7753946a7..9e4001c3274 100644
--- a/htdocs/comm/propal/class/propal.class.php
+++ b/htdocs/comm/propal/class/propal.class.php
@@ -1364,7 +1364,7 @@ class Propal extends CommonObject
 				$object->mode_reglement_id	= (!empty($objsoc->mode_reglement_id) ? $objsoc->mode_reglement_id : 0);
 				$object->fk_delivery_address = '';
 
-				/*if (!empty($conf->project->enabled))
+				/*if (isModEnabled('project'))
 				{
 					$project = new Project($db);
 					if ($this->fk_project > 0 && $project->fetch($this->fk_project)) {

From f26b1cccdcae025d86bb61c40f048c37780bd317 Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Wed, 31 Aug 2022 21:55:54 +0200
Subject: [PATCH 456/974] update code

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

diff --git a/htdocs/commande/card.php b/htdocs/commande/card.php
index b97bf147dbb..f07f6d0ec43 100644
--- a/htdocs/commande/card.php
+++ b/htdocs/commande/card.php
@@ -5,7 +5,7 @@
  * Copyright (C) 2005-2015	Regis Houssin			<regis.houssin@inodbox.com>
  * Copyright (C) 2006		Andre Cianfarani		<acianfa@free.fr>
  * Copyright (C) 2010-2013	Juanjo Menent			<jmenent@2byte.es>
- * Copyright (C) 2011-2019	Philippe Grand			<philippe.grand@atoo-net.com>
+ * Copyright (C) 2011-2022	Philippe Grand			<philippe.grand@atoo-net.com>
  * Copyright (C) 2012-2013	Christophe Battarel		<christophe.battarel@altairis.fr>
  * Copyright (C) 2012-2016	Marcos García			<marcosgdf@gmail.com>
  * Copyright (C) 2012       Cedric Salvador      	<csalvador@gpcsolutions.fr>
@@ -52,7 +52,7 @@ if (isModEnabled("propal")) {
 	require_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php';
 }
 
-if (!empty($conf->project->enabled)) {
+if (isModEnabled('project')) {
 	require_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php';
 	require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 }
@@ -1569,7 +1569,7 @@ $form = new Form($db);
 $formfile = new FormFile($db);
 $formorder = new FormOrder($db);
 $formmargin = new FormMargin($db);
-if (!empty($conf->project->enabled)) {
+if (isModEnabled('project')) {
 	$formproject = new FormProjets($db);
 }
 
@@ -1854,7 +1854,7 @@ if ($action == 'create' && $usercancreate) {
 	// TODO How record was recorded OrderMode (llx_c_input_method)
 
 	// Project
-	if (!empty($conf->project->enabled)) {
+	if (isModEnabled('project')) {
 		$langs->load("projects");
 		print '<tr>';
 		print '<td>'.$langs->trans("Project").'</td><td>';
@@ -2327,7 +2327,7 @@ if ($action == 'create' && $usercancreate) {
 			$morehtmlref .= ' (<a href="'.DOL_URL_ROOT.'/commande/list.php?socid='.$object->thirdparty->id.'&search_societe='.urlencode($object->thirdparty->name).'">'.$langs->trans("OtherOrders").'</a>)';
 		}
 		// Project
-		if (!empty($conf->project->enabled)) {
+		if (isModEnabled('project')) {
 			$langs->load("projects");
 			$morehtmlref .= '<br>'.$langs->trans('Project').' ';
 			if ($usercancreate) {

From fc01cc66cdb53f895b341f5c1fceb2040eef42c6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20France?= <frederic.france@free.fr>
Date: Wed, 31 Aug 2022 21:55:55 +0200
Subject: [PATCH 457/974] fix php8 warnings

---
 htdocs/admin/dict.php                         | 18 +++++++-------
 htdocs/admin/fckeditor.php                    |  4 ++--
 htdocs/admin/mails_templates.php              |  8 +++----
 htdocs/admin/stock.php                        |  6 ++---
 htdocs/admin/workflow.php                     | 12 +++++-----
 htdocs/blockedlog/class/blockedlog.class.php  |  2 +-
 .../comm/action/class/cactioncomm.class.php   |  2 +-
 htdocs/comm/card.php                          | 20 ++++++++--------
 htdocs/comm/index.php                         |  6 ++---
 htdocs/comm/propal/card.php                   |  6 ++---
 htdocs/commande/card.php                      |  2 +-
 htdocs/commande/index.php                     |  6 ++---
 htdocs/commande/list.php                      |  2 +-
 htdocs/compta/facture/card.php                |  2 +-
 .../actions_contactcard_common.class.php      |  2 +-
 htdocs/contact/card.php                       |  4 ++--
 htdocs/contact/consumption.php                |  2 +-
 htdocs/contrat/card.php                       |  2 +-
 htdocs/core/boxes/box_activity.php            |  2 +-
 .../boxes/box_graph_product_distribution.php  |  4 ++--
 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.formmail.class.php     |  8 +++----
 htdocs/core/lib/contact.lib.php               |  2 +-
 htdocs/core/lib/files.lib.php                 |  2 +-
 htdocs/core/lib/functions.lib.php             |  6 ++---
 htdocs/core/lib/ldap.lib.php                  |  4 ++--
 htdocs/core/lib/order.lib.php                 |  2 +-
 htdocs/core/lib/product.lib.php               |  2 +-
 htdocs/core/lib/project.lib.php               | 12 +++++-----
 htdocs/core/lib/usergroups.lib.php            |  2 +-
 htdocs/core/modules/modCategorie.class.php    |  6 ++---
 htdocs/core/modules/modStock.class.php        |  4 ++--
 .../doc/doc_generic_project_odt.modules.php   |  4 ++--
 .../task/doc/doc_generic_task_odt.modules.php |  4 ++--
 .../stocktransfer/doc/pdf_eagle.modules.php   |  4 ++--
 htdocs/core/tpl/onlinepaymentlinks.tpl.php    |  4 ++--
 ...e_20_modWorkflow_WorkflowManager.class.php |  8 +++----
 htdocs/datapolicy/admin/setup.php             |  2 +-
 htdocs/delivery/card.php                      |  4 ++--
 htdocs/delivery/class/delivery.class.php      |  2 +-
 htdocs/ecm/index_auto.php                     |  6 ++---
 htdocs/ecm/search.php                         |  6 ++---
 htdocs/expedition/card.php                    | 24 +++++++++----------
 htdocs/expedition/class/expedition.class.php  |  4 ++--
 htdocs/expedition/contact.php                 |  4 ++--
 htdocs/expedition/note.php                    |  2 +-
 htdocs/fourn/card.php                         |  4 ++--
 .../class/fournisseur.commande.class.php      |  2 +-
 .../fourn/class/fournisseur.product.class.php |  2 +-
 htdocs/fourn/commande/dispatch.php            | 14 +++++------
 htdocs/hrm/index.php                          | 10 ++++----
 htdocs/install/upgrade2.php                   |  2 +-
 htdocs/main.inc.php                           |  4 ++--
 htdocs/mrp/mo_movements.php                   |  6 ++---
 htdocs/mrp/mo_production.php                  |  2 +-
 htdocs/product/card.php                       | 10 ++++----
 htdocs/product/class/product.class.php        |  6 ++---
 htdocs/product/inventory/inventory.php        | 12 +++++-----
 htdocs/product/list.php                       |  4 ++--
 .../stock/class/mouvementstock.class.php      |  8 +++----
 htdocs/product/stock/index.php                |  4 ++--
 htdocs/product/stock/movement_card.php        | 10 ++++----
 htdocs/product/stock/movement_list.php        | 10 ++++----
 htdocs/product/stock/product.php              | 16 ++++++-------
 htdocs/product/stock/productlot_document.php  |  2 +-
 htdocs/product/stock/replenish.php            |  2 +-
 .../product/stock/tpl/stocktransfer.tpl.php   |  2 +-
 htdocs/projet/card.php                        |  4 ++--
 htdocs/projet/element.php                     | 14 +++++------
 htdocs/projet/info.php                        |  2 +-
 htdocs/reception/card.php                     | 20 ++++++++--------
 htdocs/reception/class/reception.class.php    |  4 ++--
 htdocs/reception/note.php                     |  2 +-
 .../canvas/actions_card_common.class.php      |  2 +-
 .../canvas/company/tpl/card_view.tpl.php      |  2 +-
 .../canvas/individual/tpl/card_view.tpl.php   |  2 +-
 htdocs/societe/card.php                       |  8 +++----
 htdocs/societe/class/societe.class.php        |  6 ++---
 htdocs/societe/consumption.php                |  2 +-
 htdocs/societe/contact.php                    |  2 +-
 htdocs/societe/paymentmodes.php               |  2 +-
 htdocs/societe/societecontact.php             |  2 +-
 htdocs/user/bank.php                          |  6 ++---
 htdocs/user/card.php                          | 12 +++++-----
 htdocs/user/param_ihm.php                     |  6 ++---
 htdocs/webhook/target_agenda.php              |  4 ++--
 htdocs/webservices/admin/index.php            |  4 ++--
 90 files changed, 243 insertions(+), 243 deletions(-)

diff --git a/htdocs/admin/dict.php b/htdocs/admin/dict.php
index ca5757dc452..1db1afd124c 100644
--- a/htdocs/admin/dict.php
+++ b/htdocs/admin/dict.php
@@ -487,24 +487,24 @@ $tabcond[1] = (isModEnabled("societe"));
 $tabcond[2] = true;
 $tabcond[3] = true;
 $tabcond[4] = true;
-$tabcond[5] = (isModEnabled("societe") || !empty($conf->adherent->enabled));
+$tabcond[5] = (isModEnabled("societe") || isModEnabled('adherent'));
 $tabcond[6] = isModEnabled('agenda');
-$tabcond[7] = !empty($conf->tax->enabled);
+$tabcond[7] = isModEnabled('tax');
 $tabcond[8] = isModEnabled("societe");
 $tabcond[9] = true;
 $tabcond[10] = true;
 $tabcond[11] = (isModEnabled("societe"));
-$tabcond[12] = (!empty($conf->commande->enabled) || isModEnabled("propal") || isModEnabled('facture') || (isModEnabled("fournisseur") && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD)) || isModEnabled("supplier_invoice") || isModEnabled("supplier_order"));
-$tabcond[13] = (!empty($conf->commande->enabled) || isModEnabled("propal") || isModEnabled('facture') || (isModEnabled("fournisseur") && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD)) || isModEnabled("supplier_invoice") || isModEnabled("supplier_order"));
+$tabcond[12] = (isModEnabled('commande') || isModEnabled("propal") || isModEnabled('facture') || (isModEnabled("fournisseur") && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD)) || isModEnabled("supplier_invoice") || isModEnabled("supplier_order"));
+$tabcond[13] = (isModEnabled('commande') || isModEnabled("propal") || isModEnabled('facture') || (isModEnabled("fournisseur") && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD)) || isModEnabled("supplier_invoice") || isModEnabled("supplier_order"));
 $tabcond[14] = (isModEnabled("product") && (!empty($conf->ecotax->enabled) || !empty($conf->global->MAIN_SHOW_ECOTAX_DICTIONNARY)));
 $tabcond[15] = true;
 $tabcond[16] = (isModEnabled("societe") && empty($conf->global->SOCIETE_DISABLE_PROSPECTS));
-$tabcond[17] = (!empty($conf->deplacement->enabled) || !empty($conf->expensereport->enabled));
+$tabcond[17] = (isModEnabled('deplacement') || isModEnabled('expensereport'));
 $tabcond[18] = isModEnabled("expedition") || isModEnabled("reception");
 $tabcond[19] = isModEnabled("societe");
 $tabcond[20] = (isModEnabled("fournisseur") && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD)) || isModEnabled("supplier_order");
 $tabcond[21] = isModEnabled("propal");
-$tabcond[22] = (!empty($conf->commande->enabled) || isModEnabled("propal"));
+$tabcond[22] = (isModEnabled('commande') || isModEnabled("propal"));
 $tabcond[23] = true;
 $tabcond[24] = isModEnabled('resource');
 $tabcond[25] = isModEnabled('website');
@@ -517,15 +517,15 @@ $tabcond[30] = isModEnabled('label');
 $tabcond[32] = (isModEnabled('holiday') || isModEnabled('hrm'));
 $tabcond[33] = isModEnabled('hrm');
 $tabcond[34] = isModEnabled('hrm');
-$tabcond[35] = !empty($conf->expensereport->enabled) && !empty($conf->global->MAIN_USE_EXPENSE_IK);
-$tabcond[36] = !empty($conf->expensereport->enabled) && !empty($conf->global->MAIN_USE_EXPENSE_IK);
+$tabcond[35] = isModEnabled('expensereport') && !empty($conf->global->MAIN_USE_EXPENSE_IK);
+$tabcond[36] = isModEnabled('expensereport') && !empty($conf->global->MAIN_USE_EXPENSE_IK);
 $tabcond[37] = isModEnabled("product");
 $tabcond[38] = isModEnabled('socialnetworks');
 $tabcond[39] = (isModEnabled("societe") && empty($conf->global->SOCIETE_DISABLE_PROSPECTS) && !empty($conf->global->THIRDPARTY_ENABLE_PROSPECTION_ON_ALTERNATIVE_ADRESSES));
 $tabcond[40] = (isModEnabled("societe") && !empty($conf->global->THIRDPARTY_ENABLE_PROSPECTION_ON_ALTERNATIVE_ADRESSES));
 $tabcond[41] = isModEnabled('intracommreport');
 $tabcond[42] = isModEnabled("product");
-$tabcond[43] = isModEnabled("product") && !empty($conf->productbatch->enabled) && $conf->global->MAIN_FEATURES_LEVEL >= 2;
+$tabcond[43] = isModEnabled("product") && isModEnabled('productbatch') && $conf->global->MAIN_FEATURES_LEVEL >= 2;
 $tabcond[44] = isModEnabled('asset');
 
 // List of help for fields (no more used, help is defined into tabcomplete)
diff --git a/htdocs/admin/fckeditor.php b/htdocs/admin/fckeditor.php
index 04048ac83db..3c15fc9f48f 100644
--- a/htdocs/admin/fckeditor.php
+++ b/htdocs/admin/fckeditor.php
@@ -63,10 +63,10 @@ $conditions = array(
 	'NOTE_PRIVATE' => 1,
 	'SOCIETE' => 1,
 	'PRODUCTDESC' => (isModEnabled("product") || isModEnabled("service")),
-	'DETAILS' => (isModEnabled('facture') || isModEnabled("propal") || !empty($conf->commande->enabled) || !empty($conf->supplier_proposal->enabled) || (isModEnabled("fournisseur") && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD)) || isModEnabled("supplier_order") || isModEnabled("supplier_invoice")),
+	'DETAILS' => (isModEnabled('facture') || isModEnabled("propal") || isModEnabled('commande') || !empty($conf->supplier_proposal->enabled) || (isModEnabled("fournisseur") && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD)) || isModEnabled("supplier_order") || isModEnabled("supplier_invoice")),
 	'USERSIGN' => 1,
 	'MAILING' => !empty($conf->mailing->enabled),
-	'MAIL' => (isModEnabled('facture') || isModEnabled("propal") || !empty($conf->commande->enabled)),
+	'MAIL' => (isModEnabled('facture') || isModEnabled("propal") || isModEnabled('commande')),
 	'TICKET' => !empty($conf->ticket->enabled),
 );
 // Picto
diff --git a/htdocs/admin/mails_templates.php b/htdocs/admin/mails_templates.php
index 7f60b2260d7..a60f3f407d1 100644
--- a/htdocs/admin/mails_templates.php
+++ b/htdocs/admin/mails_templates.php
@@ -45,7 +45,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 (!empty($conf->adherent->enabled)) {
+if (isModEnabled('adherent')) {
 	$langsArray[]='members';
 }
 if (!empty($conf->eventorganization->enabled)) {
@@ -179,7 +179,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 (!empty($conf->adherent->enabled) && !empty($user->rights->adherent->lire)) {
+if (isModEnabled('adherent') && !empty($user->rights->adherent->lire)) {
 	$elementList['member'] = img_picto('', 'object_member', 'class="pictofixedwidth"').dol_escape_htmltag($langs->trans('MailToMember'));
 }
 if (!empty($conf->recruitment->enabled) && !empty($user->rights->recruitment->recruitmentjobposition->read)) {
@@ -194,7 +194,7 @@ if (!empty($conf->project->enabled)) {
 if (isModEnabled("propal") && !empty($user->rights->propal->lire)) {
 	$elementList['propal_send'] = img_picto('', 'propal', 'class="pictofixedwidth"').dol_escape_htmltag($langs->trans('MailToSendProposal'));
 }
-if (!empty($conf->commande->enabled) && !empty($user->rights->commande->lire)) {
+if (isModEnabled('commande') && !empty($user->rights->commande->lire)) {
 	$elementList['order_send'] = img_picto('', 'order', 'class="pictofixedwidth"').dol_escape_htmltag($langs->trans('MailToSendOrder'));
 }
 if (isModEnabled('facture') && !empty($user->rights->facture->lire)) {
@@ -224,7 +224,7 @@ if (!empty($conf->contrat->enabled) && !empty($user->rights->contrat->lire)) {
 if (!empty($conf->ticket->enabled) && !empty($user->rights->ticket->read)) {
 	$elementList['ticket_send'] = img_picto('', 'ticket', 'class="pictofixedwidth"').dol_escape_htmltag($langs->trans('MailToTicket'));
 }
-if (!empty($conf->expensereport->enabled) && !empty($user->rights->expensereport->lire)) {
+if (isModEnabled('expensereport') && !empty($user->rights->expensereport->lire)) {
 	$elementList['expensereport_send'] = img_picto('', 'trip', 'class="pictofixedwidth"').dol_escape_htmltag($langs->trans('MailToExpenseReport'));
 }
 if (isModEnabled('agenda')) {
diff --git a/htdocs/admin/stock.php b/htdocs/admin/stock.php
index ade62c29081..4103c8cd354 100644
--- a/htdocs/admin/stock.php
+++ b/htdocs/admin/stock.php
@@ -180,7 +180,7 @@ $formproduct = new FormProduct($db);
 
 
 $disabled = '';
-if (!empty($conf->productbatch->enabled)) {
+if (isModEnabled('productbatch')) {
 	$langs->load("productbatch");
 	$disabled = ' disabled';
 	print info_admin($langs->trans("WhenProductBatchModuleOnOptionAreForced"));
@@ -226,7 +226,7 @@ $found++;
 print '<tr class="oddeven">';
 print '<td>'.$langs->trans("DeStockOnValidateOrder").'</td>';
 print '<td class="right">';
-if (!empty($conf->commande->enabled)) {
+if (isModEnabled('commande')) {
 	if ($conf->use_javascript_ajax) {
 		print ajax_constantonoff('STOCK_CALCULATE_ON_VALIDATE_ORDER', array(), null, 0, 0, 0, 2, 1);
 	} else {
@@ -763,7 +763,7 @@ print "</td>\n";
 print "</tr>\n";
 
 /* Disabled. Would be better to be managed with a user cookie
-if (!empty($conf->productbatch->enabled)) {
+if (isModEnabled('productbatch')) {
 	print '<tr class="oddeven">';
 	print '<td>' . $langs->trans("ShowAllBatchByDefault") . '</td>';
 	print '<td class="right">';
diff --git a/htdocs/admin/workflow.php b/htdocs/admin/workflow.php
index e1899b35a56..c4a8790896e 100644
--- a/htdocs/admin/workflow.php
+++ b/htdocs/admin/workflow.php
@@ -62,13 +62,13 @@ $workflowcodes = array(
 	'WORKFLOW_PROPAL_AUTOCREATE_ORDER'=>array(
 		'family'=>'create',
 		'position'=>10,
-		'enabled'=>(isModEnabled("propal") && !empty($conf->commande->enabled)),
+		'enabled'=>(isModEnabled("propal") && isModEnabled('commande')),
 		'picto'=>'order'
 	),
 	'WORKFLOW_ORDER_AUTOCREATE_INVOICE'=>array(
 		'family'=>'create',
 		'position'=>20,
-		'enabled'=>(!empty($conf->commande->enabled) && isModEnabled('facture')),
+		'enabled'=>(isModEnabled('commande') && isModEnabled('facture')),
 		'picto'=>'bill'
 	),
 	'WORKFLOW_TICKET_CREATE_INTERVENTION' => array (
@@ -84,7 +84,7 @@ $workflowcodes = array(
 	'WORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL'=>array(
 		'family'=>'classify_proposal',
 		'position'=>30,
-		'enabled'=>(isModEnabled("propal") && !empty($conf->commande->enabled)),
+		'enabled'=>(isModEnabled("propal") && isModEnabled('commande')),
 		'picto'=>'propal',
 		'warning'=>''
 	),
@@ -100,19 +100,19 @@ $workflowcodes = array(
 	'WORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING'=>array(  // when shipping validated
 		'family'=>'classify_order',
 		'position'=>40,
-		'enabled'=>(isModEnabled("expedition") && !empty($conf->commande->enabled)),
+		'enabled'=>(isModEnabled("expedition") && isModEnabled('commande')),
 		'picto'=>'order'
 	),
 	'WORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING_CLOSED'=>array( // when shipping closed
 		'family'=>'classify_order',
 		'position'=>41,
-		'enabled'=>(isModEnabled("expedition") && !empty($conf->commande->enabled)),
+		'enabled'=>(isModEnabled("expedition") && isModEnabled('commande')),
 		'picto'=>'order'
 	),
 	'WORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER'=>array(
 		'family'=>'classify_order',
 		'position'=>42,
-		'enabled'=>(isModEnabled('facture') && !empty($conf->commande->enabled)),
+		'enabled'=>(isModEnabled('facture') && isModEnabled('commande')),
 		'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.
diff --git a/htdocs/blockedlog/class/blockedlog.class.php b/htdocs/blockedlog/class/blockedlog.class.php
index 3ab2b63ad3f..ea9e5efca76 100644
--- a/htdocs/blockedlog/class/blockedlog.class.php
+++ b/htdocs/blockedlog/class/blockedlog.class.php
@@ -179,7 +179,7 @@ class BlockedLog
 		}
 		 */
 
-		if (!empty($conf->adherent->enabled)) {
+		if (isModEnabled('adherent')) {
 			$this->trackedevents['MEMBER_SUBSCRIPTION_CREATE'] = 'logMEMBER_SUBSCRIPTION_CREATE';
 			$this->trackedevents['MEMBER_SUBSCRIPTION_MODIFY'] = 'logMEMBER_SUBSCRIPTION_MODIFY';
 			$this->trackedevents['MEMBER_SUBSCRIPTION_DELETE'] = 'logMEMBER_SUBSCRIPTION_DELETE';
diff --git a/htdocs/comm/action/class/cactioncomm.class.php b/htdocs/comm/action/class/cactioncomm.class.php
index db9f28c7763..50aaca466e2 100644
--- a/htdocs/comm/action/class/cactioncomm.class.php
+++ b/htdocs/comm/action/class/cactioncomm.class.php
@@ -201,7 +201,7 @@ class CActionComm
 						if ($obj->module == 'invoice' && isModEnabled('facture') && !empty($user->rights->facture->lire)) {
 							$qualified = 1;
 						}
-						if ($obj->module == 'order' && !empty($conf->commande->enabled) && empty($user->rights->commande->lire)) {
+						if ($obj->module == 'order' && isModEnabled('commande') && empty($user->rights->commande->lire)) {
 							$qualified = 1;
 						}
 						if ($obj->module == 'propal' && isModEnabled("propal") && !empty($user->rights->propale->lire)) {
diff --git a/htdocs/comm/card.php b/htdocs/comm/card.php
index 3e388677605..267b84285ee 100644
--- a/htdocs/comm/card.php
+++ b/htdocs/comm/card.php
@@ -47,7 +47,7 @@ if (isModEnabled('facture')) {
 if (isModEnabled("propal")) {
 	require_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php';
 }
-if (!empty($conf->commande->enabled)) {
+if (isModEnabled('commande')) {
 	require_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
 }
 if (isModEnabled("expedition")) {
@@ -56,7 +56,7 @@ if (isModEnabled("expedition")) {
 if (!empty($conf->contrat->enabled)) {
 	require_once DOL_DOCUMENT_ROOT.'/contrat/class/contrat.class.php';
 }
-if (!empty($conf->adherent->enabled)) {
+if (isModEnabled('adherent')) {
 	require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
 }
 if (!empty($conf->ficheinter->enabled)) {
@@ -69,7 +69,7 @@ $langs->loadLangs(array('companies', 'banks'));
 if (!empty($conf->contrat->enabled)) {
 	$langs->load("contracts");
 }
-if (!empty($conf->commande->enabled)) {
+if (isModEnabled('commande')) {
 	$langs->load("orders");
 }
 if (isModEnabled("expedition")) {
@@ -510,7 +510,7 @@ if ($object->id > 0) {
 	}
 
 	if ($object->client) {
-		if (!empty($conf->commande->enabled) && !empty($conf->global->ORDER_MANAGE_MIN_AMOUNT)) {
+		if (isModEnabled('commande') && !empty($conf->global->ORDER_MANAGE_MIN_AMOUNT)) {
 			print '<!-- Minimim amount for orders -->'."\n";
 			print '<tr class="nowrap">';
 			print '<td>';
@@ -621,7 +621,7 @@ if ($object->id > 0) {
 	include DOL_DOCUMENT_ROOT.'/societe/tpl/linesalesrepresentative.tpl.php';
 
 	// Module Adherent
-	if (!empty($conf->adherent->enabled)) {
+	if (isModEnabled('adherent')) {
 		$langs->load("members");
 		$langs->load("users");
 
@@ -718,7 +718,7 @@ if ($object->id > 0) {
 		}
 	}
 
-	if (!empty($conf->commande->enabled) && $user->rights->commande->lire) {
+	if (isModEnabled('commande') && $user->rights->commande->lire) {
 		// Box commandes
 		$tmp = $object->getOutstandingOrders();
 		$outstandingOpened = $tmp['opened'];
@@ -913,7 +913,7 @@ if ($object->id > 0) {
 	/*
 	 * Latest orders
 	 */
-	if (!empty($conf->commande->enabled) && $user->rights->commande->lire) {
+	if (isModEnabled('commande') && $user->rights->commande->lire) {
 		$param ="";
 
 		$sql = "SELECT s.nom, s.rowid";
@@ -1553,7 +1553,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 (!empty($conf->commande->enabled) && $user->rights->commande->creer && $object->status == 1) {
+		if (isModEnabled('commande') && $user->rights->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>';
 		}
@@ -1570,7 +1570,7 @@ if ($object->id > 0) {
 
 		// Add invoice
 		if ($user->socid == 0) {
-			if (!empty($conf->deplacement->enabled) && $object->status == 1) {
+			if (isModEnabled('deplacement') && $object->status == 1) {
 				$langs->load("trips");
 				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>';
 			}
@@ -1581,7 +1581,7 @@ if ($object->id > 0) {
 				} else {
 					$langs->loadLangs(array("orders", "bills"));
 
-					if (!empty($conf->commande->enabled)) {
+					if (isModEnabled('commande')) {
 						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 9eb37d80799..419f85cb28f 100644
--- a/htdocs/comm/index.php
+++ b/htdocs/comm/index.php
@@ -96,7 +96,7 @@ if (isModEnabled("propal")) {
 if (!empty($conf->supplier_proposal->enabled)) {
 	$supplierproposalstatic = new SupplierProposal($db);
 }
-if (!empty($conf->commande->enabled)) {
+if (isModEnabled('commande')) {
 	$orderstatic = new Commande($db);
 }
 if ((isModEnabled("fournisseur") && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD)) || isModEnabled("supplier_order")) {
@@ -323,7 +323,7 @@ if (!empty($conf->supplier_proposal->enabled) && $user->rights->supplier_proposa
  * Draft customer orders
  */
 
-if (!empty($conf->commande->enabled) && $user->rights->commande->lire) {
+if (isModEnabled('commande') && $user->rights->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";
@@ -1007,7 +1007,7 @@ if (isModEnabled("propal") && $user->rights->propal->lire) {
 /*
  * Opened (validated) order
  */
-if (!empty($conf->commande->enabled) && $user->rights->commande->lire) {
+if (isModEnabled('commande') && $user->rights->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/propal/card.php b/htdocs/comm/propal/card.php
index e02ff5d8875..a0b181230fa 100644
--- a/htdocs/comm/propal/card.php
+++ b/htdocs/comm/propal/card.php
@@ -1792,7 +1792,7 @@ if ($action == 'create') {
 
 	// Delivery delay
 	print '<tr class="field_availability_id"><td class="titlefieldcreate">'.$langs->trans('AvailabilityPeriod');
-	if (!empty($conf->commande->enabled)) {
+	if (isModEnabled('commande')) {
 		print ' ('.$langs->trans('AfterOrder').')';
 	}
 	print '</td><td class="valuefieldcreate">';
@@ -2441,7 +2441,7 @@ if ($action == 'create') {
 	// Delivery delay
 	print '<tr class="fielddeliverydelay"><td>';
 	print '<table class="nobordernopadding" width="100%"><tr><td>';
-	if (!empty($conf->commande->enabled)) {
+	if (isModEnabled('commande')) {
 		print $form->textwithpicto($langs->trans('AvailabilityPeriod'), $langs->trans('AvailabilityPeriod').' ('.$langs->trans('AfterOrder').')');
 	} else {
 		print $langs->trans('AvailabilityPeriod');
@@ -2826,7 +2826,7 @@ if ($action == 'create') {
 				}
 
 				// Create a sale order
-				if (!empty($conf->commande->enabled) && $object->statut == Propal::STATUS_SIGNED) {
+				if (isModEnabled('commande') && $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>';
 					}
diff --git a/htdocs/commande/card.php b/htdocs/commande/card.php
index b97bf147dbb..c5b00c3c41e 100644
--- a/htdocs/commande/card.php
+++ b/htdocs/commande/card.php
@@ -71,7 +71,7 @@ if (!empty($conf->incoterm->enabled)) {
 if (!empty($conf->margin->enabled)) {
 	$langs->load('margins');
 }
-if (!empty($conf->productbatch->enabled)) {
+if (isModEnabled('productbatch')) {
 	$langs->load('productbatch');
 }
 
diff --git a/htdocs/commande/index.php b/htdocs/commande/index.php
index 57f61f3d9f7..9ee103911f7 100644
--- a/htdocs/commande/index.php
+++ b/htdocs/commande/index.php
@@ -92,7 +92,7 @@ if ($tmp) {
 /*
  * Draft orders
  */
-if (!empty($conf->commande->enabled)) {
+if (isModEnabled('commande')) {
 	$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 (!empty($conf->commande->enabled)) {
+if (isModEnabled('commande')) {
 	$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 (!empty($conf->commande->enabled)) {
 /*
  * Orders that are in process
  */
-if (!empty($conf->commande->enabled)) {
+if (isModEnabled('commande')) {
 	$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 4ba2f410cc9..84dafaba2e8 100644
--- a/htdocs/commande/list.php
+++ b/htdocs/commande/list.php
@@ -2389,7 +2389,7 @@ if ($resql) {
 								$stock_order = 0;
 								$stock_order_supplier = 0;
 								if (!empty($conf->global->STOCK_CALCULATE_ON_SHIPMENT) || !empty($conf->global->STOCK_CALCULATE_ON_SHIPMENT_CLOSE)) {    // What about other options ?
-									if (!empty($conf->commande->enabled)) {
+									if (isModEnabled('commande')) {
 										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/compta/facture/card.php b/htdocs/compta/facture/card.php
index 839a61b2413..f9c6f4edd3e 100644
--- a/htdocs/compta/facture/card.php
+++ b/htdocs/compta/facture/card.php
@@ -2321,7 +2321,7 @@ if (empty($reshook)) {
 
 			if (!$error) {
 				// Add batchinfo if the detail_batch array is defined
-				if (!empty($conf->productbatch->enabled) && !empty($lines[$i]->detail_batch) && is_array($lines[$i]->detail_batch) && !empty($conf->global->INVOICE_INCUDE_DETAILS_OF_LOTS_SERIALS)) {
+				if (isModEnabled('productbatch') && !empty($lines[$i]->detail_batch) && is_array($lines[$i]->detail_batch) && !empty($conf->global->INVOICE_INCUDE_DETAILS_OF_LOTS_SERIALS)) {
 					$langs->load('productbatch');
 					foreach ($lines[$i]->detail_batch as $batchline) {
 						$desc .= ' '.$langs->trans('Batch').' '.$batchline->batch.' '.$langs->trans('printQty', $batchline->qty).' ';
diff --git a/htdocs/contact/canvas/actions_contactcard_common.class.php b/htdocs/contact/canvas/actions_contactcard_common.class.php
index 2c7ac145b78..a0834139bd2 100644
--- a/htdocs/contact/canvas/actions_contactcard_common.class.php
+++ b/htdocs/contact/canvas/actions_contactcard_common.class.php
@@ -191,7 +191,7 @@ abstract class ActionsContactCardCommon
 
 			$this->object->load_ref_elements();
 
-			if (!empty($conf->commande->enabled)) {
+			if (isModEnabled('commande')) {
 				$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++;
diff --git a/htdocs/contact/card.php b/htdocs/contact/card.php
index ff7c0051a29..d3b050e5e0b 100644
--- a/htdocs/contact/card.php
+++ b/htdocs/contact/card.php
@@ -1225,7 +1225,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 
 			$object->load_ref_elements();
 
-			if (!empty($conf->commande->enabled)) {
+			if (isModEnabled('commande')) {
 				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>';
@@ -1498,7 +1498,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 			print '</td></tr>';
 		}
 
-		if (!empty($conf->commande->enabled) || isModEnabled("expedition")) {
+		if (isModEnabled('commande') || isModEnabled("expedition")) {
 			print '<tr><td>';
 			if (isModEnabled("expedition")) {
 				print $langs->trans("ContactForOrdersOrShipments");
diff --git a/htdocs/contact/consumption.php b/htdocs/contact/consumption.php
index fff1ba17644..569a155cc99 100644
--- a/htdocs/contact/consumption.php
+++ b/htdocs/contact/consumption.php
@@ -159,7 +159,7 @@ if ($object->thirdparty->client) {
 	if (isModEnabled("propal") && $user->rights->propal->lire) {
 		$elementTypeArray['propal'] = $langs->transnoentitiesnoconv('Proposals');
 	}
-	if (!empty($conf->commande->enabled) && $user->rights->commande->lire) {
+	if (isModEnabled('commande') && $user->rights->commande->lire) {
 		$elementTypeArray['order'] = $langs->transnoentitiesnoconv('Orders');
 	}
 	if (isModEnabled('facture') && $user->rights->facture->lire) {
diff --git a/htdocs/contrat/card.php b/htdocs/contrat/card.php
index 439f312bef6..564122f3137 100644
--- a/htdocs/contrat/card.php
+++ b/htdocs/contrat/card.php
@@ -2116,7 +2116,7 @@ if ($action == 'create') {
 					}
 				}
 
-				if (!empty($conf->commande->enabled) && $object->statut > 0 && $object->nbofservicesclosed < $nbofservices) {
+				if (isModEnabled('commande') && $object->statut > 0 && $object->nbofservicesclosed < $nbofservices) {
 					$langs->load("orders");
 					if ($user->rights->commande->creer) {
 						print dolGetButtonAction($langs->trans('CreateOrder'), '', 'default', DOL_URL_ROOT.'/commande/card.php?action=create&token='.newToken().'&origin='.$object->element.'&originid='.$object->id.'&socid='.$object->thirdparty->id, '', true, $params);
diff --git a/htdocs/core/boxes/box_activity.php b/htdocs/core/boxes/box_activity.php
index 12656518efc..20c2e814d82 100644
--- a/htdocs/core/boxes/box_activity.php
+++ b/htdocs/core/boxes/box_activity.php
@@ -189,7 +189,7 @@ class box_activity extends ModeleBoxes
 		}
 
 		// list the summary of the orders
-		if (!empty($conf->commande->enabled) && $user->rights->commande->lire) {
+		if (isModEnabled('commande') && $user->rights->commande->lire) {
 			include_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
 			$commandestatic = new Commande($this->db);
 
diff --git a/htdocs/core/boxes/box_graph_product_distribution.php b/htdocs/core/boxes/box_graph_product_distribution.php
index 42a77f14b9c..92a8b471e5f 100644
--- a/htdocs/core/boxes/box_graph_product_distribution.php
+++ b/htdocs/core/boxes/box_graph_product_distribution.php
@@ -214,7 +214,7 @@ class box_graph_product_distribution extends ModeleBoxes
 			}
 		}
 
-		if (!empty($conf->commande->enabled) && !empty($user->rights->commande->lire)) {
+		if (isModEnabled('commande') && !empty($user->rights->commande->lire)) {
 			// Build graphic number of object. $data = array(array('Lib',val1,val2,val3),...)
 			if ($showordernb) {
 				$langs->load("orders");
@@ -369,7 +369,7 @@ class box_graph_product_distribution extends ModeleBoxes
 				$stringtoshow .= '<input type="checkbox" name="'.$param_showpropalnb.'"'.($showpropalnb ? ' checked' : '').'> '.$langs->trans("ForProposals");
 				$stringtoshow .= '&nbsp;';
 			}
-			if (!empty($conf->commande->enabled) || !empty($user->rights->commande->lire)) {
+			if (isModEnabled('commande') || !empty($user->rights->commande->lire)) {
 				$stringtoshow .= '<input type="checkbox" name="'.$param_showordernb.'"'.($showordernb ? ' checked' : '').'> '.$langs->trans("ForCustomersOrders");
 			}
 			if (isModEnabled('facture') || !empty($user->rights->facture->lire)) {
diff --git a/htdocs/core/boxes/box_members_by_type.php b/htdocs/core/boxes/box_members_by_type.php
index 23542999b47..2e25da59564 100644
--- a/htdocs/core/boxes/box_members_by_type.php
+++ b/htdocs/core/boxes/box_members_by_type.php
@@ -68,7 +68,7 @@ class box_members_by_type extends ModeleBoxes
 			$this->enabled = 0; // disabled for external users
 		}
 
-		$this->hidden = !(!empty($conf->adherent->enabled) && $user->rights->adherent->lire);
+		$this->hidden = !(isModEnabled('adherent') && $user->rights->adherent->lire);
 	}
 
 	/**
diff --git a/htdocs/core/boxes/box_members_last_modified.php b/htdocs/core/boxes/box_members_last_modified.php
index 91ce3c93c36..52bc75e1fd1 100644
--- a/htdocs/core/boxes/box_members_last_modified.php
+++ b/htdocs/core/boxes/box_members_last_modified.php
@@ -67,7 +67,7 @@ class box_members_last_modified extends ModeleBoxes
 			$this->enabled = 0; // disabled for external users
 		}
 
-		$this->hidden = !(!empty($conf->adherent->enabled) && $user->rights->adherent->lire);
+		$this->hidden = !(isModEnabled('adherent') && $user->rights->adherent->lire);
 	}
 
 	/**
diff --git a/htdocs/core/boxes/box_members_last_subscriptions.php b/htdocs/core/boxes/box_members_last_subscriptions.php
index 39ae0140ca4..b5472b979a2 100644
--- a/htdocs/core/boxes/box_members_last_subscriptions.php
+++ b/htdocs/core/boxes/box_members_last_subscriptions.php
@@ -67,7 +67,7 @@ class box_members_last_subscriptions extends ModeleBoxes
 			$this->enabled = 0; // disabled for external users
 		}
 
-		$this->hidden = !(!empty($conf->adherent->enabled) && $user->rights->adherent->lire);
+		$this->hidden = !(isModEnabled('adherent') && $user->rights->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 479d2424f09..716b8ed0482 100644
--- a/htdocs/core/boxes/box_members_subscriptions_by_year.php
+++ b/htdocs/core/boxes/box_members_subscriptions_by_year.php
@@ -67,7 +67,7 @@ class box_members_subscriptions_by_year extends ModeleBoxes
 			$this->enabled = 0; // disabled for external users
 		}
 
-		$this->hidden = !(!empty($conf->adherent->enabled) && $user->rights->adherent->lire);
+		$this->hidden = !(isModEnabled('adherent') && $user->rights->adherent->lire);
 	}
 
 	/**
diff --git a/htdocs/core/class/html.formmail.class.php b/htdocs/core/class/html.formmail.class.php
index f12acbe1901..0c5aa54b5ca 100644
--- a/htdocs/core/class/html.formmail.class.php
+++ b/htdocs/core/class/html.formmail.class.php
@@ -1630,7 +1630,7 @@ class FormMail extends Form
 			if ($onlinepaymentenabled && !empty($conf->global->PAYMENT_SECURITY_TOKEN)) {
 				$tmparray['__SECUREKEYPAYMENT__'] = $conf->global->PAYMENT_SECURITY_TOKEN;
 				if (!empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE)) {
-					if (!empty($conf->adherent->enabled)) {
+					if (isModEnabled('adherent')) {
 						$tmparray['__SECUREKEYPAYMENT_MEMBER__'] = 'SecureKeyPAYMENTUniquePerMember';
 					}
 					if (!empty($conf->don->enabled)) {
@@ -1639,7 +1639,7 @@ class FormMail extends Form
 					if (isModEnabled('facture')) {
 						$tmparray['__SECUREKEYPAYMENT_INVOICE__'] = 'SecureKeyPAYMENTUniquePerInvoice';
 					}
-					if (!empty($conf->commande->enabled)) {
+					if (isModEnabled('commande')) {
 						$tmparray['__SECUREKEYPAYMENT_ORDER__'] = 'SecureKeyPAYMENTUniquePerOrder';
 					}
 					if (!empty($conf->contrat->enabled)) {
@@ -1647,7 +1647,7 @@ class FormMail extends Form
 					}
 
 					//Online payement link
-					if (!empty($conf->adherent->enabled)) {
+					if (isModEnabled('adherent')) {
 						$tmparray['__ONLINEPAYMENTLINK_MEMBER__'] = 'OnlinePaymentLinkUniquePerMember';
 					}
 					if (!empty($conf->don->enabled)) {
@@ -1656,7 +1656,7 @@ class FormMail extends Form
 					if (isModEnabled('facture')) {
 						$tmparray['__ONLINEPAYMENTLINK_INVOICE__'] = 'OnlinePaymentLinkUniquePerInvoice';
 					}
-					if (!empty($conf->commande->enabled)) {
+					if (isModEnabled('commande')) {
 						$tmparray['__ONLINEPAYMENTLINK_ORDER__'] = 'OnlinePaymentLinkUniquePerOrder';
 					}
 					if (!empty($conf->contrat->enabled)) {
diff --git a/htdocs/core/lib/contact.lib.php b/htdocs/core/lib/contact.lib.php
index ad9c47f4c48..ad5c07e9a7e 100644
--- a/htdocs/core/lib/contact.lib.php
+++ b/htdocs/core/lib/contact.lib.php
@@ -92,7 +92,7 @@ function contact_prepare_head(Contact $object)
 	}
 
 	// Related items
-	if (!empty($conf->commande->enabled) || isModEnabled("propal") || isModEnabled('facture') || !empty($conf->ficheinter->enabled) || (isModEnabled("fournisseur") && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD)) || isModEnabled("supplier_order") || isModEnabled("supplier_invoice")) {
+	if (isModEnabled('commande') || isModEnabled("propal") || isModEnabled('facture') || !empty($conf->ficheinter->enabled) || (isModEnabled("fournisseur") && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD)) || 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/files.lib.php b/htdocs/core/lib/files.lib.php
index 32526574294..42d0d96f7a9 100644
--- a/htdocs/core/lib/files.lib.php
+++ b/htdocs/core/lib/files.lib.php
@@ -2933,7 +2933,7 @@ function dol_check_secure_access_document($modulepart, $original_file, $entity,
 		if (($fuser->rights->produit->{$lire} ) || preg_match('/^specimen/i', $original_file)) {
 			$accessallowed = 1;
 		}
-		if (!empty($conf->productbatch->enabled)) {
+		if (isModEnabled('productbatch')) {
 			$original_file = $conf->productbatch->multidir_output[$entity].'/'.$original_file;
 		}
 	} elseif ($modulepart == 'movement' || $modulepart == 'mouvement') {
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 53204c4cc41..a0e57c173c8 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -2976,7 +2976,7 @@ function dol_print_email($email, $cid = 0, $socid = 0, $addlink = 0, $max = 64,
 			$newemail .= img_warning($langs->trans("ErrorBadEMail", $email));
 		}
 
-		if (($cid || $socid) && !empty($conf->agenda->enabled) && $user->rights->agenda->myactions->create) {
+		if (($cid || $socid) && isModEnabled('agenda') && $user->rights->agenda->myactions->create) {
 			$type = 'AC_EMAIL';
 			$link = '';
 			if (!empty($conf->global->AGENDA_ADDACTIONFOREMAIL)) {
@@ -3082,7 +3082,7 @@ function dol_print_socialnetworks($value, $cid, $socid, $type, $dictsocialnetwor
 			$htmllink .= '?chat" alt="'.$langs->trans("Chat").'&nbsp;'.$value.'" title="'.dol_escape_htmltag($langs->trans("Chat").' '.$value).'">';
 			$htmllink .= '<img class="paddingleft" src="'.DOL_URL_ROOT.'/theme/common/skype_chatbutton.png" border="0">';
 			$htmllink .= '</a>';
-			if (($cid || $socid) && !empty($conf->agenda->enabled) && $user->rights->agenda->myactions->create) {
+			if (($cid || $socid) && isModEnabled('agenda') && $user->rights->agenda->myactions->create) {
 				$addlink = 'AC_SKYPE';
 				$link = '';
 				if (!empty($conf->global->AGENDA_ADDACTIONFORSKYPE)) {
@@ -7371,7 +7371,7 @@ function getCommonSubstitutionArray($outputlangs, $onlykey = 0, $exclude = null,
 				$substitutionarray['__THIRDPARTY_NOTE_PUBLIC__'] = '__THIRDPARTY_NOTE_PUBLIC__';
 				$substitutionarray['__THIRDPARTY_NOTE_PRIVATE__'] = '__THIRDPARTY_NOTE_PRIVATE__';
 			}
-			if (!empty($conf->adherent->enabled) && (!is_object($object) || $object->element == 'adherent')) {
+			if (isModEnabled('adherent') && (!is_object($object) || $object->element == 'adherent')) {
 				$substitutionarray['__MEMBER_ID__'] = '__MEMBER_ID__';
 				$substitutionarray['__MEMBER_CIVILITY__'] = '__MEMBER_CIVILITY__';
 				$substitutionarray['__MEMBER_FIRSTNAME__'] = '__MEMBER_FIRSTNAME__';
diff --git a/htdocs/core/lib/ldap.lib.php b/htdocs/core/lib/ldap.lib.php
index 7e173bd269e..94e14a90267 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 (!empty($conf->adherent->enabled) && !empty($conf->global->LDAP_MEMBER_ACTIVE)) {
+	if (isModEnabled('adherent') && !empty($conf->global->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 (!empty($conf->adherent->enabled) && !empty($conf->global->LDAP_MEMBER_TYPE_ACTIVE)) {
+	if (isModEnabled('adherent') && !empty($conf->global->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 9a5e9ae56a5..9128be56ea1 100644
--- a/htdocs/core/lib/order.lib.php
+++ b/htdocs/core/lib/order.lib.php
@@ -42,7 +42,7 @@ function commande_prepare_head(Commande $object)
 	$h = 0;
 	$head = array();
 
-	if (!empty($conf->commande->enabled) && $user->rights->commande->lire) {
+	if (isModEnabled('commande') && $user->rights->commande->lire) {
 		$head[$h][0] = DOL_URL_ROOT.'/commande/card.php?id='.$object->id;
 		$head[$h][1] = $langs->trans("CustomerOrder");
 		$head[$h][2] = 'order';
diff --git a/htdocs/core/lib/product.lib.php b/htdocs/core/lib/product.lib.php
index a1446bf6964..710b2462afa 100644
--- a/htdocs/core/lib/product.lib.php
+++ b/htdocs/core/lib/product.lib.php
@@ -417,7 +417,7 @@ function show_stats_for_company($product, $socid)
 		print '</tr>';
 	}
 	// Customer orders
-	if (!empty($conf->commande->enabled) && $user->rights->commande->lire) {
+	if (isModEnabled('commande') && $user->rights->commande->lire) {
 		$nblines++;
 		$ret = $product->load_stats_commande($socid);
 		if ($ret < 0) {
diff --git a/htdocs/core/lib/project.lib.php b/htdocs/core/lib/project.lib.php
index 8e514a505bf..ba71d22b7f8 100644
--- a/htdocs/core/lib/project.lib.php
+++ b/htdocs/core/lib/project.lib.php
@@ -125,9 +125,9 @@ function project_prepare_head(Project $project, $moreparam = '')
 	}
 
 	if (((isModEnabled("fournisseur") && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD)) || isModEnabled("supplier_order") || isModEnabled("supplier_invoice"))
-		|| isModEnabled("propal") || !empty($conf->commande->enabled)
+		|| isModEnabled("propal") || isModEnabled('commande')
 		|| isModEnabled('facture') || !empty($conf->contrat->enabled)
-		|| !empty($conf->ficheinter->enabled) || !empty($conf->agenda->enabled) || !empty($conf->deplacement->enabled) || !empty($conf->stock->enabled)) {
+		|| !empty($conf->ficheinter->enabled) || isModEnabled('agenda') || isModEnabled('deplacement') || !empty($conf->stock->enabled)) {
 		$nbElements = 0;
 		// Enable caching of thirdrparty count Contacts
 		$cachekey = 'count_elements_project_'.$project->id;
@@ -141,7 +141,7 @@ function project_prepare_head(Project $project, $moreparam = '')
 			if (isModEnabled("propal")) {
 				$nbElements += $project->getElementCount('propal', 'propal');
 			}
-			if (!empty($conf->commande->enabled)) {
+			if (isModEnabled('commande')) {
 				$nbElements += $project->getElementCount('order', 'commande');
 			}
 			if (isModEnabled('facture')) {
@@ -171,10 +171,10 @@ function project_prepare_head(Project $project, $moreparam = '')
 			if (!empty($conf->mrp->enabled)) {
 				$nbElements += $project->getElementCount('mrp', 'mrp_mo', 'fk_project');
 			}
-			if (!empty($conf->deplacement->enabled)) {
+			if (isModEnabled('deplacement')) {
 				$nbElements += $project->getElementCount('trip', 'deplacement');
 			}
-			if (!empty($conf->expensereport->enabled)) {
+			if (isModEnabled('expensereport')) {
 				$nbElements += $project->getElementCount('expensereport', 'expensereport');
 			}
 			if (!empty($conf->don->enabled)) {
@@ -183,7 +183,7 @@ function project_prepare_head(Project $project, $moreparam = '')
 			if (!empty($conf->loan->enabled)) {
 				$nbElements += $project->getElementCount('loan', 'loan');
 			}
-			if (!empty($conf->tax->enabled)) {
+			if (isModEnabled('tax')) {
 				$nbElements += $project->getElementCount('chargesociales', 'chargesociales');
 			}
 			if (!empty($conf->project->enabled)) {
diff --git a/htdocs/core/lib/usergroups.lib.php b/htdocs/core/lib/usergroups.lib.php
index 19578ec9fe3..aef55e09bd6 100644
--- a/htdocs/core/lib/usergroups.lib.php
+++ b/htdocs/core/lib/usergroups.lib.php
@@ -143,7 +143,7 @@ function user_prepare_head(User $object)
 
 	if ((!empty($conf->salaries->enabled) && !empty($user->rights->salaries->read))
 		|| (isModEnabled('hrm') && !empty($user->rights->hrm->employee->read))
-		|| (!empty($conf->expensereport->enabled) && !empty($user->rights->expensereport->lire) && ($user->id == $object->id || $user->rights->expensereport->readall))
+		|| (isModEnabled('expensereport') && !empty($user->rights->expensereport->lire) && ($user->id == $object->id || $user->rights->expensereport->readall))
 		|| (isModEnabled('holiday') && !empty($user->rights->holiday->read) && ($user->id == $object->id || $user->rights->holiday->readall))
 		) {
 		// Bank
diff --git a/htdocs/core/modules/modCategorie.class.php b/htdocs/core/modules/modCategorie.class.php
index 2e31bdef7db..73606987d9d 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 (!empty($conf->adherent->enabled)) {
+		if (isModEnabled('adherent')) {
 			$typeexample .= ($typeexample ? " / " : "")."3=Member";
 		}
 		if (isModEnabled("societe")) {
@@ -297,7 +297,7 @@ 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] = '!empty($conf->adherent->enabled)';
+		$this->export_enabled[$r] = 'isModEnabled('adherent')';
 		$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'=>"ParentCategory", 'p.rowid'=>'MemberId', 'p.lastname'=>'LastName', 'p.firstname'=>'Firstname');
 		$this->export_TypeFields_array[$r] = array('cat.label'=>"Text", 'cat.description'=>"Text", 'cat.fk_parent'=>'List:categorie:label:rowid', 'p.lastname'=>'Text', 'p.firstname'=>'Text');
@@ -527,7 +527,7 @@ class modCategorie extends DolibarrModules
 		}
 
 		// 3 Members
-		if (!empty($conf->adherent->enabled)) {
+		if (isModEnabled('adherent')) {
 			$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/modStock.class.php b/htdocs/core/modules/modStock.class.php
index 7aa9abb3bff..87ea6303742 100644
--- a/htdocs/core/modules/modStock.class.php
+++ b/htdocs/core/modules/modStock.class.php
@@ -266,7 +266,7 @@ class modStock extends DolibarrModules
 		$this->export_sql_end[$r] .= ' AND e.entity IN ('.getEntity('stock').')';
 
 		// Export stock including batch number
-		if (!empty($conf->productbatch->enabled)) {
+		if (isModEnabled('productbatch')) {
 			$langs->load("productbatch");
 
 			// This request is same than previous but without field ps.stock (real stock in warehouse) and with link to subtable productbatch
@@ -340,7 +340,7 @@ class modStock extends DolibarrModules
 			'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 (!empty($conf->productbatch->enabled)) {
+		if (isModEnabled('productbatch')) {
 			$this->export_fields_array[$r]['sm.batch'] = 'Batch';
 			$this->export_TypeFields_array[$r]['sm.batch'] = 'Text';
 			$this->export_entities_array[$r]['sm.batch'] = 'movement';
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 420dfd61909..beec387020a 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
@@ -46,7 +46,7 @@ if (isModEnabled('facture')) {
 if (isModEnabled('facture')) {
 	require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture-rec.class.php';
 }
-if (!empty($conf->commande->enabled)) {
+if (isModEnabled('commande')) {
 	require_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
 }
 if ((isModEnabled("fournisseur") && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD)) || isModEnabled("supplier_invoice")) {
@@ -61,7 +61,7 @@ if (!empty($conf->contrat->enabled)) {
 if (!empty($conf->ficheinter->enabled)) {
 	require_once DOL_DOCUMENT_ROOT.'/fichinter/class/fichinter.class.php';
 }
-if (!empty($conf->deplacement->enabled)) {
+if (isModEnabled('deplacement')) {
 	require_once DOL_DOCUMENT_ROOT.'/compta/deplacement/class/deplacement.class.php';
 }
 if (isModEnabled('agenda')) {
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 8433aaa6331..07bd3ee03ab 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
@@ -47,7 +47,7 @@ if (isModEnabled('facture')) {
 if (isModEnabled('facture')) {
 	require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture-rec.class.php';
 }
-if (!empty($conf->commande->enabled)) {
+if (isModEnabled('commande')) {
 	require_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
 }
 if ((isModEnabled("fournisseur") && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD)) || isModEnabled("supplier_invoice")) {
@@ -62,7 +62,7 @@ if (!empty($conf->contrat->enabled)) {
 if (!empty($conf->ficheinter->enabled)) {
 	require_once DOL_DOCUMENT_ROOT.'/fichinter/class/fichinter.class.php';
 }
-if (!empty($conf->deplacement->enabled)) {
+if (isModEnabled('deplacement')) {
 	require_once DOL_DOCUMENT_ROOT.'/compta/deplacement/class/deplacement.class.php';
 }
 if (isModEnabled('agenda')) {
diff --git a/htdocs/core/modules/stocktransfer/doc/pdf_eagle.modules.php b/htdocs/core/modules/stocktransfer/doc/pdf_eagle.modules.php
index 7722698593c..87a6bcf0e38 100644
--- a/htdocs/core/modules/stocktransfer/doc/pdf_eagle.modules.php
+++ b/htdocs/core/modules/stocktransfer/doc/pdf_eagle.modules.php
@@ -531,7 +531,7 @@ class pdf_eagle extends ModelePdfStockTransfer
 					$pdf->SetFont('', '', $default_font_size - 1); // On repositionne la police par defaut
 
 					// Lot / série
-					if (!empty($conf->productbatch->enabled)) {
+					if (isModEnabled('productbatch')) {
 						$pdf->SetXY($this->posxlot, $curY);
 						$pdf->MultiCell(($this->posxweightvol - $this->posxlot), 3, $object->lines[$i]->batch, '', 'C');
 					}
@@ -813,7 +813,7 @@ class pdf_eagle extends ModelePdfStockTransfer
 			$pdf->MultiCell($this->posxlot - $this->posxdesc, 2, $outputlangs->transnoentities("Description"), '', 'L');
 		}
 
-		if (!empty($conf->productbatch->enabled) && $this->atLeastOneBatch) {
+		if (isModEnabled('productbatch') && $this->atLeastOneBatch) {
 			$pdf->line($this->posxlot - 1, $tab_top, $this->posxlot - 1, $tab_top + $tab_height);
 			if (empty($hidetop)) {
 				$pdf->SetXY($this->posxlot, $tab_top + 1);
diff --git a/htdocs/core/tpl/onlinepaymentlinks.tpl.php b/htdocs/core/tpl/onlinepaymentlinks.tpl.php
index 657d32a0a36..1615dbe87ed 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 (!empty($conf->commande->enabled)) {
+if (isModEnabled('commande')) {
 	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";
@@ -96,7 +96,7 @@ if (!empty($conf->contrat->enabled)) {
 	}
 	print '<br>';
 }
-if (!empty($conf->adherent->enabled)) {
+if (isModEnabled('adherent')) {
 	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 9a8414c7a69..49f2873f472 100644
--- a/htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php
+++ b/htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php
@@ -71,7 +71,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 (!empty($conf->commande->enabled) && !empty($conf->global->WORKFLOW_PROPAL_AUTOCREATE_ORDER)) {
+			if (isModEnabled('commande') && !empty($conf->global->WORKFLOW_PROPAL_AUTOCREATE_ORDER)) {
 				$object->fetchObjectLinked();
 				if (!empty($object->linkedObjectsIds['commande'])) {
 					setEventMessages($langs->trans("OrderExists"), null, 'warnings');
@@ -142,7 +142,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 (!empty($conf->commande->enabled) && !empty($conf->workflow->enabled) && !empty($conf->global->WORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER)) {
+			if (isModEnabled('commande') && !empty($conf->workflow->enabled) && !empty($conf->global->WORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER)) {
 				$object->fetchObjectLinked('', 'commande', $object->id, $object->element);
 				if (!empty($object->linkedObjects)) {
 					$totalonlinkedelements = 0;
@@ -272,7 +272,7 @@ class InterfaceWorkflowManager extends DolibarrTriggers
 		if ($action == 'BILL_PAYED') {
 			dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
 
-			if (!empty($conf->commande->enabled) && !empty($conf->global->WORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER)) {
+			if (isModEnabled('commande') && !empty($conf->global->WORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER)) {
 				$object->fetchObjectLinked('', 'commande', $object->id, $object->element);
 				if (!empty($object->linkedObjects)) {
 					$totalonlinkedelements = 0;
@@ -296,7 +296,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 (!empty($conf->commande->enabled) && isModEnabled("expedition") && !empty($conf->workflow->enabled) &&
+			if (isModEnabled('commande') && isModEnabled("expedition") && !empty($conf->workflow->enabled) &&
 				(
 					(!empty($conf->global->WORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING) && ($action == 'SHIPPING_VALIDATE')) ||
 					(!empty($conf->global->WORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING_CLOSED) && ($action == 'SHIPPING_CLOSED'))
diff --git a/htdocs/datapolicy/admin/setup.php b/htdocs/datapolicy/admin/setup.php
index 8f25461eb64..26b71ce60e1 100644
--- a/htdocs/datapolicy/admin/setup.php
+++ b/htdocs/datapolicy/admin/setup.php
@@ -50,7 +50,7 @@ if (!empty($conf->global->DATAPOLICY_USE_SPECIFIC_DELAY_FOR_CONTACT)) {
 		'DATAPOLICY_CONTACT_FOURNISSEUR'=>array('css'=>'minwidth200', 'picto'=>img_picto('', 'contact', 'class="pictofixedwidth"')),
 	);
 }
-if (!empty($conf->adherent->enabled)) {
+if (isModEnabled('adherent')) {
 	$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 108f81751b3..40d73b0f298 100644
--- a/htdocs/delivery/card.php
+++ b/htdocs/delivery/card.php
@@ -308,7 +308,7 @@ if ($action == 'create') {    // Create. Seems to no be used
 			 *   Delivery
 			 */
 
-			if ($typeobject == 'commande' && $expedition->origin_id > 0 && !empty($conf->commande->enabled)) {
+			if ($typeobject == 'commande' && $expedition->origin_id > 0 && isModEnabled('commande')) {
 				$objectsrc = new Commande($db);
 				$objectsrc->fetch($expedition->origin_id);
 			}
@@ -400,7 +400,7 @@ if ($action == 'create') {    // Create. Seems to no be used
 			*/
 
 			// Document origine
-			if ($typeobject == 'commande' && $expedition->origin_id && !empty($conf->commande->enabled)) {
+			if ($typeobject == 'commande' && $expedition->origin_id && isModEnabled('commande')) {
 				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 9af06f87541..55f6293a9d2 100644
--- a/htdocs/delivery/class/delivery.class.php
+++ b/htdocs/delivery/class/delivery.class.php
@@ -34,7 +34,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 (!empty($conf->commande->enabled)) {
+if (isModEnabled('commande')) {
 	require_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
 }
 
diff --git a/htdocs/ecm/index_auto.php b/htdocs/ecm/index_auto.php
index c37ce4690f4..c7a4a570a5c 100644
--- a/htdocs/ecm/index_auto.php
+++ b/htdocs/ecm/index_auto.php
@@ -322,7 +322,7 @@ if (!empty($conf->global->ECM_AUTO_TREE_ENABLED)) {
 	if (!empty($conf->contrat->enabled)) {
 		$rowspan++; $sectionauto[] = array('position'=>40, 'level'=>1, 'module'=>'contract', 'test'=>$conf->contrat->enabled, 'label'=>$langs->trans("Contracts"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("Contracts")));
 	}
-	if (!empty($conf->commande->enabled)) {
+	if (isModEnabled('commande')) {
 		$rowspan++; $sectionauto[] = array('position'=>50, 'level'=>1, 'module'=>'order', 'test'=>$conf->commande->enabled, 'label'=>$langs->trans("CustomersOrders"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("Orders")));
 	}
 	if (isModEnabled('facture')) {
@@ -338,7 +338,7 @@ if (!empty($conf->global->ECM_AUTO_TREE_ENABLED)) {
 	if (isModEnabled("fournisseur") && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD) || isModEnabled("supplier_invoice")) {
 		$rowspan++; $sectionauto[] = array('position'=>90, 'level'=>1, 'module'=>'invoice_supplier', 'test'=>(isModEnabled("fournisseur") && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD) || isModEnabled("supplier_invoice")), 'label'=>$langs->trans("SuppliersInvoices"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("SupplierInvoices")));
 	}
-	if (!empty($conf->tax->enabled)) {
+	if (isModEnabled('tax')) {
 		$langs->load("compta");
 		$rowspan++; $sectionauto[] = array('position'=>100, 'level'=>1, 'module'=>'tax', 'test'=>$conf->tax->enabled, 'label'=>$langs->trans("SocialContributions"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("SocialContributions")));
 		$rowspan++; $sectionauto[] = array('position'=>110, 'level'=>1, 'module'=>'tax-vat', 'test'=>$conf->tax->enabled, 'label'=>$langs->trans("VAT"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("VAT")));
@@ -355,7 +355,7 @@ if (!empty($conf->global->ECM_AUTO_TREE_ENABLED)) {
 		$langs->load("interventions");
 		$rowspan++; $sectionauto[] = array('position'=>150, 'level'=>1, 'module'=>'fichinter', 'test'=>$conf->ficheinter->enabled, 'label'=>$langs->trans("Interventions"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("Interventions")));
 	}
-	if (!empty($conf->expensereport->enabled)) {
+	if (isModEnabled('expensereport')) {
 		$langs->load("trips");
 		$rowspan++; $sectionauto[] = array('position'=>160, 'level'=>1, 'module'=>'expensereport', 'test'=>$conf->expensereport->enabled, 'label'=>$langs->trans("ExpenseReports"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("ExpenseReports")));
 	}
diff --git a/htdocs/ecm/search.php b/htdocs/ecm/search.php
index 7572dd3f3d8..ac986ad00f4 100644
--- a/htdocs/ecm/search.php
+++ b/htdocs/ecm/search.php
@@ -125,7 +125,7 @@ if (isModEnabled("propal")) {
 if (!empty($conf->contrat->enabled)) {
 	$rowspan++; $sectionauto[] = array('level'=>1, 'module'=>'contract', 'test'=>$conf->contrat->enabled, 'label'=>$langs->trans("Contracts"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("Contracts")));
 }
-if (!empty($conf->commande->enabled)) {
+if (isModEnabled('commande')) {
 	$rowspan++; $sectionauto[] = array('level'=>1, 'module'=>'order', 'test'=>$conf->commande->enabled, 'label'=>$langs->trans("CustomersOrders"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("Orders")));
 }
 if (isModEnabled('facture')) {
@@ -140,7 +140,7 @@ if ((isModEnabled("fournisseur") && empty($conf->global->MAIN_USE_NEW_SUPPLIERMO
 if ((isModEnabled("fournisseur") && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD)) || isModEnabled("supplier_invoice")) {
 	$rowspan++; $sectionauto[] = array('level'=>1, 'module'=>'invoice_supplier', 'test'=>((isModEnabled("fournisseur") && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD)) || isModEnabled("supplier_invoice")), 'label'=>$langs->trans("SuppliersInvoices"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("SupplierInvoices")));
 }
-if (!empty($conf->tax->enabled)) {
+if (isModEnabled('tax')) {
 	$langs->load("compta"); $rowspan++; $sectionauto[] = array('level'=>1, 'module'=>'tax', 'test'=>$conf->tax->enabled, 'label'=>$langs->trans("SocialContributions"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("SocialContributions")));
 }
 if (!empty($conf->project->enabled)) {
@@ -149,7 +149,7 @@ if (!empty($conf->project->enabled)) {
 if (!empty($conf->ficheinter->enabled)) {
 	$langs->load("interventions"); $rowspan++; $sectionauto[] = array('level'=>1, 'module'=>'fichinter', 'test'=>$conf->ficheinter->enabled, 'label'=>$langs->trans("Interventions"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("Interventions")));
 }
-if (!empty($conf->expensereport->enabled)) {
+if (isModEnabled('expensereport')) {
 	$langs->load("trips"); $rowspan++; $sectionauto[] = array('level'=>1, 'module'=>'expensereport', 'test'=>$conf->expensereport->enabled, 'label'=>$langs->trans("ExpenseReports"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("ExpenseReports")));
 }
 if (isModEnabled('holiday')) {
diff --git a/htdocs/expedition/card.php b/htdocs/expedition/card.php
index 3a0a9869571..333c93fdfd7 100644
--- a/htdocs/expedition/card.php
+++ b/htdocs/expedition/card.php
@@ -53,7 +53,7 @@ if (isModEnabled("product") || isModEnabled("service")) {
 if (isModEnabled("propal")) {
 	require_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php';
 }
-if (!empty($conf->productbatch->enabled)) {
+if (isModEnabled('productbatch')) {
 	require_once DOL_DOCUMENT_ROOT.'/product/class/productbatch.class.php';
 }
 if (!empty($conf->project->enabled)) {
@@ -67,7 +67,7 @@ $langs->loadLangs(array("sendings", "companies", "bills", 'deliveries', 'orders'
 if (!empty($conf->incoterm->enabled)) {
 	$langs->load('incoterm');
 }
-if (!empty($conf->productbatch->enabled)) {
+if (isModEnabled('productbatch')) {
 	$langs->load('productbatch');
 }
 
@@ -258,7 +258,7 @@ if (empty($reshook)) {
 			$stockLocation = "ent1".$i."_0";
 			$qty = "qtyl".$i;
 
-			if (!empty($conf->productbatch->enabled) && $objectsrc->lines[$i]->product_tobatch) {      // If product need a batch number
+			if (isModEnabled('productbatch') && $objectsrc->lines[$i]->product_tobatch) {      // If product need a batch number
 				if (GETPOSTISSET($batch)) {
 					//shipment line with batch-enable product
 					$qty .= '_'.$j;
@@ -875,7 +875,7 @@ if ($action == 'create') {
 
 			// Ref
 			print '<tr><td class="titlefieldcreate fieldrequired">';
-			if ($origin == 'commande' && !empty($conf->commande->enabled)) {
+			if ($origin == 'commande' && isModEnabled('commande')) {
 				print $langs->trans("RefOrder");
 			}
 			if ($origin == 'propal' && isModEnabled("propal")) {
@@ -1033,7 +1033,7 @@ if ($action == 'create') {
 			$i = 0;
 			while ($i < $numAsked) {
 				print 'jQuery("#qtyl'.$i.'").val(jQuery("#qtyasked'.$i.'").val() - jQuery("#qtydelivered'.$i.'").val());'."\n";
-				if (!empty($conf->productbatch->enabled)) {
+				if (isModEnabled('productbatch')) {
 					print 'jQuery("#qtyl'.$i.'_'.$i.'").val(jQuery("#qtyasked'.$i.'").val() - jQuery("#qtydelivered'.$i.'").val());'."\n";
 				}
 				$i++;
@@ -1552,7 +1552,7 @@ if ($action == 'create') {
 
 							if ($line->product_type == Product::TYPE_PRODUCT || !empty($conf->global->STOCK_SUPPORTS_SERVICES)) {
 								$disabled = '';
-								if (!empty($conf->productbatch->enabled) && $product->hasbatch()) {
+								if (isModEnabled('productbatch') && $product->hasbatch()) {
 									$disabled = 'disabled="disabled"';
 								}
 								if ($warehouse_selected_id <= 0) {		// We did not force a given warehouse, so we won't have no warehouse to change qty.
@@ -1714,7 +1714,7 @@ if ($action == 'create') {
 		$totalVolume = $tmparray['volume'];
 
 
-		if ($typeobject == 'commande' && $object->$typeobject->id && !empty($conf->commande->enabled)) {
+		if ($typeobject == 'commande' && $object->$typeobject->id && isModEnabled('commande')) {
 			$objectsrc = new Commande($db);
 			$objectsrc->fetch($object->$typeobject->id);
 		}
@@ -1779,7 +1779,7 @@ if ($action == 'create') {
 		print '<table class="border tableforfield" width="100%">';
 
 		// Linked documents
-		if ($typeobject == 'commande' && $object->$typeobject->id && !empty($conf->commande->enabled)) {
+		if ($typeobject == 'commande' && $object->$typeobject->id && isModEnabled('commande')) {
 			print '<tr><td>';
 			print $langs->trans("RefOrder").'</td>';
 			print '<td colspan="3">';
@@ -2048,7 +2048,7 @@ if ($action == 'create') {
 			if (!empty($conf->stock->enabled)) {
 				print $langs->trans("WarehouseSource").' - ';
 			}
-			if (!empty($conf->productbatch->enabled)) {
+			if (isModEnabled('productbatch')) {
 				print $langs->trans("Batch");
 			}
 			print '</td>';
@@ -2062,7 +2062,7 @@ if ($action == 'create') {
 				print '<td class="left linecolwarehousesource">'.$langs->trans("WarehouseSource").'</td>';
 			}
 
-			if (!empty($conf->productbatch->enabled)) {
+			if (isModEnabled('productbatch')) {
 				print '<td class="left linecolbatch">'.$langs->trans("Batch").'</td>';
 			}
 		}
@@ -2358,7 +2358,7 @@ if ($action == 'create') {
 					}
 
 					// Batch number managment
-					if (!empty($conf->productbatch->enabled)) {
+					if (isModEnabled('productbatch')) {
 						if (isset($lines[$i]->detail_batch)) {
 							print '<!-- Detail of lot -->';
 							print '<td class="linecolbatch">';
@@ -2437,7 +2437,7 @@ if ($action == 'create') {
 					if ($origin && $origin_id > 0) {
 						$colspan++;
 					}
-					if (!empty($conf->productbatch->enabled)) {
+					if (isModEnabled('productbatch')) {
 						$colspan++;
 					}
 					if (!empty($conf->stock->enabled)) {
diff --git a/htdocs/expedition/class/expedition.class.php b/htdocs/expedition/class/expedition.class.php
index ec7d7ff3cab..b1a767e197d 100644
--- a/htdocs/expedition/class/expedition.class.php
+++ b/htdocs/expedition/class/expedition.class.php
@@ -965,7 +965,7 @@ class Expedition extends CommonObject
 		}
 
 		// If product need a batch number, we should not have called this function but addline_batch instead.
-		if (!empty($conf->productbatch->enabled) && !empty($orderline->fk_product) && !empty($orderline->product_tobatch)) {
+		if (isModEnabled('productbatch') && !empty($orderline->fk_product) && !empty($orderline->product_tobatch)) {
 			$this->error = 'ADDLINE_WAS_CALLED_INSTEAD_OF_ADDLINEBATCH';
 			return -4;
 		}
@@ -1716,7 +1716,7 @@ class Expedition extends CommonObject
 				}
 
 				// Detail of batch
-				if (!empty($conf->productbatch->enabled) && $obj->line_id > 0 && $obj->product_tobatch > 0) {
+				if (isModEnabled('productbatch') && $obj->line_id > 0 && $obj->product_tobatch > 0) {
 					$newdetailbatch = $shipmentlinebatch->fetchAll($obj->line_id, $obj->fk_product);
 
 					if (is_array($newdetailbatch)) {
diff --git a/htdocs/expedition/contact.php b/htdocs/expedition/contact.php
index 112d35a63aa..cdf6a982054 100644
--- a/htdocs/expedition/contact.php
+++ b/htdocs/expedition/contact.php
@@ -53,7 +53,7 @@ if ($id > 0 || !empty($ref)) {
 	}
 
 	// Linked documents
-	if ($typeobject == 'commande' && $object->$typeobject->id && !empty($conf->commande->enabled)) {
+	if ($typeobject == 'commande' && $object->$typeobject->id && isModEnabled('commande')) {
 		$objectsrc = new Commande($db);
 		$objectsrc->fetch($object->$typeobject->id);
 	}
@@ -196,7 +196,7 @@ if ($id > 0 || !empty($ref)) {
 	print '<table class="border centpercent tableforfield">';
 
 	// Linked documents
-	if ($typeobject == 'commande' && $object->$typeobject->id && !empty($conf->commande->enabled)) {
+	if ($typeobject == 'commande' && $object->$typeobject->id && isModEnabled('commande')) {
 		print '<tr><td class="titlefield">';
 		$objectsrc = new Commande($db);
 		$objectsrc->fetch($object->$typeobject->id);
diff --git a/htdocs/expedition/note.php b/htdocs/expedition/note.php
index c8fc0ff35be..a6a6a1b0e3b 100644
--- a/htdocs/expedition/note.php
+++ b/htdocs/expedition/note.php
@@ -51,7 +51,7 @@ if ($id > 0 || !empty($ref)) {
 	}
 
 	// Linked documents
-	if ($typeobject == 'commande' && $object->$typeobject->id && !empty($conf->commande->enabled)) {
+	if ($typeobject == 'commande' && $object->$typeobject->id && isModEnabled('commande')) {
 		$objectsrc = new Commande($db);
 		$objectsrc->fetch($object->$typeobject->id);
 	}
diff --git a/htdocs/fourn/card.php b/htdocs/fourn/card.php
index 7234e54e8f1..9d5c5b70fe4 100644
--- a/htdocs/fourn/card.php
+++ b/htdocs/fourn/card.php
@@ -36,7 +36,7 @@ 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 (!empty($conf->adherent->enabled)) {
+if (isModEnabled('adherent')) {
 	require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
 }
 if (!empty($conf->categorie->enabled)) {
@@ -353,7 +353,7 @@ if ($object->id > 0) {
 	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_view.tpl.php';
 
 	// Module Adherent
-	if (!empty($conf->adherent->enabled)) {
+	if (isModEnabled('adherent')) {
 		$langs->load("members");
 		$langs->load("users");
 		print '<tr><td>'.$langs->trans("LinkedToDolibarrMember").'</td>';
diff --git a/htdocs/fourn/class/fournisseur.commande.class.php b/htdocs/fourn/class/fournisseur.commande.class.php
index c794a227afa..b90b03a06cb 100644
--- a/htdocs/fourn/class/fournisseur.commande.class.php
+++ b/htdocs/fourn/class/fournisseur.commande.class.php
@@ -36,7 +36,7 @@
 
 require_once DOL_DOCUMENT_ROOT.'/core/class/commonorder.class.php';
 require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
-if (!empty($conf->productbatch->enabled)) {
+if (isModEnabled('productbatch')) {
 	require_once DOL_DOCUMENT_ROOT.'/product/class/productbatch.class.php';
 }
 require_once DOL_DOCUMENT_ROOT.'/multicurrency/class/multicurrency.class.php';
diff --git a/htdocs/fourn/class/fournisseur.product.class.php b/htdocs/fourn/class/fournisseur.product.class.php
index cbf961b8ff9..25b26c75852 100644
--- a/htdocs/fourn/class/fournisseur.product.class.php
+++ b/htdocs/fourn/class/fournisseur.product.class.php
@@ -1173,7 +1173,7 @@ class ProductFournisseur extends Product
 		$label .= '<br><b>'.$langs->trans('RefSupplier').':</b> '.$this->ref_supplier;
 
 		if ($this->type == Product::TYPE_PRODUCT || !empty($conf->global->STOCK_SUPPORTS_SERVICES)) {
-			if (!empty($conf->productbatch->enabled)) {
+			if (isModEnabled('productbatch')) {
 				$langs->load("productbatch");
 				$label .= "<br><b>".$langs->trans("ManageLotSerial").'</b>: '.$this->getLibStatut(0, 2);
 			}
diff --git a/htdocs/fourn/commande/dispatch.php b/htdocs/fourn/commande/dispatch.php
index 2f0f7966679..c7baf022d8e 100644
--- a/htdocs/fourn/commande/dispatch.php
+++ b/htdocs/fourn/commande/dispatch.php
@@ -46,7 +46,7 @@ if (!empty($conf->project->enabled)) {
 // Load translation files required by the page
 $langs->loadLangs(array("bills", "orders", "sendings", "companies", "deliveries", "products", "stocks", "receptions"));
 
-if (!empty($conf->productbatch->enabled)) {
+if (isModEnabled('productbatch')) {
 	$langs->load('productbatch');
 }
 
@@ -721,7 +721,7 @@ if ($id > 0 || !empty($ref)) {
 				print '<tr class="liste_titre">';
 
 				print '<td>'.$langs->trans("Description").'</td>';
-				if (!empty($conf->productbatch->enabled)) {
+				if (isModEnabled('productbatch')) {
 					print '<td class="dispatch_batch_number_title">'.$langs->trans("batch_number").'</td>';
 					if (empty($conf->global->PRODUCT_DISABLE_SELLBY)) {
 						print '<td class="dispatch_dlc_title">'.$langs->trans("SellByDate").'</td>';
@@ -820,7 +820,7 @@ if ($id > 0 || !empty($ref)) {
 						$linktoprod = $tmpproduct->getNomUrl(1);
 						$linktoprod .= ' - '.$objp->label."\n";
 
-						if (!empty($conf->productbatch->enabled)) {
+						if (isModEnabled('productbatch')) {
 							if ($objp->tobatch) {
 								// Product
 								print '<td>';
@@ -869,7 +869,7 @@ if ($id > 0 || !empty($ref)) {
 						// Already dispatched
 						print '<td class="right">'.$products_dispatched[$objp->rowid].'</td>';
 
-						if (!empty($conf->productbatch->enabled) && $objp->tobatch > 0) {
+						if (isModEnabled('productbatch') && $objp->tobatch > 0) {
 							$type = 'batch';
 							print '<td class="right">';
 							print '</td>'; // Qty to dispatch
@@ -981,7 +981,7 @@ if ($id > 0 || !empty($ref)) {
 						print '</td>';
 
 						print '<td>';
-						if (!empty($conf->productbatch->enabled) && $objp->tobatch > 0) {
+						if (isModEnabled('productbatch') && $objp->tobatch > 0) {
 							$type = 'batch';
 							print img_picto($langs->trans('AddStockLocationLine'), 'split.png', 'class="splitbutton" onClick="addDispatchLine('.$i.', \''.$type.'\')"');
 						} else {
@@ -1162,7 +1162,7 @@ if ($id > 0 || !empty($ref)) {
 			print '<td>'.$langs->trans("Product").'</td>';
 			print '<td>'.$langs->trans("DateCreation").'</td>';
 			print '<td>'.$langs->trans("DateDeliveryPlanned").'</td>';
-			if (!empty($conf->productbatch->enabled)) {
+			if (isModEnabled('productbatch')) {
 				print '<td class="dispatch_batch_number_title">'.$langs->trans("batch_number").'</td>';
 				if (empty($conf->global->PRODUCT_DISABLE_SELLBY)) {
 					print '<td class="dispatch_dlc_title">'.$langs->trans("SellByDate").'</td>';
@@ -1227,7 +1227,7 @@ if ($id > 0 || !empty($ref)) {
 				print '<td>'.dol_print_date($db->jdate($objp->datec), 'day').'</td>';
 				print '<td>'.dol_print_date($db->jdate($objp->date_delivery), 'day').'</td>';
 
-				if (!empty($conf->productbatch->enabled)) {
+				if (isModEnabled('productbatch')) {
 					if ($objp->batch) {
 						include_once DOL_DOCUMENT_ROOT.'/product/stock/class/productlot.class.php';
 						$lot = new Productlot($db);
diff --git a/htdocs/hrm/index.php b/htdocs/hrm/index.php
index dfa47df91a3..a86783db2d3 100644
--- a/htdocs/hrm/index.php
+++ b/htdocs/hrm/index.php
@@ -37,10 +37,10 @@ require_once DOL_DOCUMENT_ROOT.'/user/class/usergroup.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/usergroups.lib.php';
 
-if (!empty($conf->deplacement->enabled)) {
+if (isModEnabled('deplacement')) {
 	require_once DOL_DOCUMENT_ROOT.'/compta/deplacement/class/deplacement.class.php';
 }
-if (!empty($conf->expensereport->enabled)) {
+if (isModEnabled('expensereport')) {
 	require_once DOL_DOCUMENT_ROOT.'/expensereport/class/expensereport.class.php';
 }
 if (!empty($conf->recruitment->enabled)) {
@@ -116,11 +116,11 @@ if (!empty($conf->global->MAIN_SEARCH_FORM_ON_HOME_AREAS)) {     // This is usel
 		$langs->load("holiday");
 		$listofsearchfields['search_holiday'] = array('text'=>'TitreRequestCP');
 	}
-	if (!empty($conf->deplacement->enabled) && $user->rights->deplacement->lire) {
+	if (isModEnabled('deplacement') && $user->rights->deplacement->lire) {
 		$langs->load("trips");
 		$listofsearchfields['search_deplacement'] = array('text'=>'ExpenseReport');
 	}
-	if (!empty($conf->expensereport->enabled) && $user->rights->expensereport->lire) {
+	if (isModEnabled('expensereport') && $user->rights->expensereport->lire) {
 		$langs->load("trips");
 		$listofsearchfields['search_expensereport'] = array('text'=>'ExpenseReport');
 	}
@@ -270,7 +270,7 @@ if (isModEnabled('holiday') && $user->rights->holiday->read) {
 
 
 // Latest expense report
-if (!empty($conf->expensereport->enabled) && $user->rights->expensereport->lire) {
+if (isModEnabled('expensereport') && $user->rights->expensereport->lire) {
 	$sql = "SELECT u.rowid as uid, u.lastname, u.firstname, u.login, u.email, u.statut as user_status, u.photo,";
 	$sql .= " x.rowid, x.ref, x.date_debut as date, x.tms as dm, x.total_ttc, x.fk_statut as status";
 	$sql .= " FROM ".MAIN_DB_PREFIX."expensereport as x, ".MAIN_DB_PREFIX."user as u";
diff --git a/htdocs/install/upgrade2.php b/htdocs/install/upgrade2.php
index a7216b6ad72..02b3ce48ca4 100644
--- a/htdocs/install/upgrade2.php
+++ b/htdocs/install/upgrade2.php
@@ -2024,7 +2024,7 @@ function migrate_modeles($db, $langs, $conf)
 		}
 	}
 
-	if (!empty($conf->commande->enabled)) {
+	if (isModEnabled('commande')) {
 		include_once DOL_DOCUMENT_ROOT.'/core/modules/commande/modules_commande.php';
 		$modellist = ModelePDFCommandes::liste_modeles($db);
 		if (count($modellist) == 0) {
diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index 6a0fda06cb0..989e856b690 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -2432,7 +2432,7 @@ function printDropdownQuickadd()
 				"title" => "MenuNewMember@members",
 				"name" => "Adherent@members",
 				"picto" => "object_member",
-				"activation" => !empty($conf->adherent->enabled) && $user->hasRight("adherent", "write"), // vs hooking
+				"activation" => isModEnabled('adherent') && $user->hasRight("adherent", "write"), // vs hooking
 				"position" => 5,
 			),
 			array(
@@ -2465,7 +2465,7 @@ function printDropdownQuickadd()
 				"title" => "NewOrder@orders",
 				"name" => "Order@orders",
 				"picto" => "object_order",
-				"activation" => !empty($conf->commande->enabled) && $user->hasRight("commande", "write"), // vs hooking
+				"activation" => isModEnabled('commande') && $user->hasRight("commande", "write"), // vs hooking
 				"position" => 40,
 			),
 			array(
diff --git a/htdocs/mrp/mo_movements.php b/htdocs/mrp/mo_movements.php
index 1384852ace8..19533e05c06 100644
--- a/htdocs/mrp/mo_movements.php
+++ b/htdocs/mrp/mo_movements.php
@@ -119,9 +119,9 @@ $arrayfields = array(
 	'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'=>(!empty($conf->productbatch->enabled))),
-	'pl.eatby'=>array('label'=>"EatByDate", 'checked'=>0, 'position'=>9, 'enabled'=>(!empty($conf->productbatch->enabled))),
-	'pl.sellby'=>array('label'=>"SellByDate", 'checked'=>0, 'position'=>10, 'enabled'=>(!empty($conf->productbatch->enabled))),
+	'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),
diff --git a/htdocs/mrp/mo_production.php b/htdocs/mrp/mo_production.php
index 0f734df6ae9..88788da8b43 100644
--- a/htdocs/mrp/mo_production.php
+++ b/htdocs/mrp/mo_production.php
@@ -278,7 +278,7 @@ if (empty($reshook)) {
 								setEventMessages($langs->trans("ErrorFieldRequiredForProduct", $langs->transnoentitiesnoconv("Warehouse"), $tmpproduct->ref), null, 'errors');
 								$error++;
 							}
-							if (!empty($conf->productbatch->enabled) && $tmpproduct->status_batch && (!GETPOST('batchtoproduce-'.$line->id.'-'.$i))) {
+							if (isModEnabled('productbatch') && $tmpproduct->status_batch && (!GETPOST('batchtoproduce-'.$line->id.'-'.$i))) {
 								$langs->load("errors");
 								setEventMessages($langs->trans("ErrorFieldRequiredForProduct", $langs->transnoentitiesnoconv("Batch"), $tmpproduct->ref), null, 'errors');
 								$error++;
diff --git a/htdocs/product/card.php b/htdocs/product/card.php
index 5f0159ce567..d9b943fb40f 100644
--- a/htdocs/product/card.php
+++ b/htdocs/product/card.php
@@ -62,7 +62,7 @@ if (isModEnabled("propal")) {
 if (isModEnabled('facture')) {
 	require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
 }
-if (!empty($conf->commande->enabled)) {
+if (isModEnabled('commande')) {
 	require_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
 }
 if (!empty($conf->accounting->enabled)) {
@@ -82,7 +82,7 @@ if (!empty($conf->stock->enabled)) {
 if (isModEnabled('facture')) {
 	$langs->load("bills");
 }
-if (!empty($conf->productbatch->enabled)) {
+if (isModEnabled('productbatch')) {
 	$langs->load("productbatch");
 }
 
@@ -1353,7 +1353,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 		print '</td></tr>';
 
 		// Batch number management
-		if (!empty($conf->productbatch->enabled)) {
+		if (isModEnabled('productbatch')) {
 			print '<tr><td>'.$langs->trans("ManageLotSerial").'</td><td>';
 			$statutarray = array('0' => $langs->trans("ProductStatusNotOnBatch"), '1' => $langs->trans("ProductStatusOnBatch"), '2' => $langs->trans("ProductStatusOnSerial"));
 			print $form->selectarray('status_batch', $statutarray, GETPOST('status_batch'));
@@ -2368,7 +2368,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 			}
 
 			// Batch number management (to batch)
-			if (!empty($conf->productbatch->enabled)) {
+			if (isModEnabled('productbatch')) {
 				if ($object->isProduct() || !empty($conf->global->STOCK_SUPPORTS_SERVICES)) {
 					print '<tr><td>'.$langs->trans("ManageLotSerial").'</td><td>';
 					print $object->getLibStatut(0, 2);
@@ -2823,7 +2823,7 @@ if (!empty($conf->global->PRODUCT_ADD_FORM_ADD_TO) && $object->id && ($action ==
 	}
 
 	// Commande
-	if (!empty($conf->commande->enabled) && $user->rights->commande->creer) {
+	if (isModEnabled('commande') && $user->rights->commande->creer) {
 		$commande = new Commande($db);
 
 		$langs->load("orders");
diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php
index 1a157ed9171..360709dc5a0 100644
--- a/htdocs/product/class/product.class.php
+++ b/htdocs/product/class/product.class.php
@@ -4943,7 +4943,7 @@ class Product extends CommonObject
 			$label .= '<br><b>'.$langs->trans('ProductLabel').':</b> '.$this->label;
 		}
 		if ($this->type == Product::TYPE_PRODUCT || !empty($conf->global->STOCK_SUPPORTS_SERVICES)) {
-			if (!empty($conf->productbatch->enabled)) {
+			if (isModEnabled('productbatch')) {
 				$langs->load("productbatch");
 				$label .= "<br><b>".$langs->trans("ManageLotSerial").'</b>: '.$this->getLibStatut(0, 2);
 			}
@@ -5141,7 +5141,7 @@ class Product extends CommonObject
 		$labelStatus = $labelStatusShort = '';
 
 		$langs->load('products');
-		if (!empty($conf->productbatch->enabled)) {
+		if (isModEnabled('productbatch')) {
 			$langs->load("productbatch");
 		}
 
@@ -5456,7 +5456,7 @@ class Product extends CommonObject
 
 		//dol_syslog("load_virtual_stock");
 
-		if (!empty($conf->commande->enabled)) {
+		if (isModEnabled('commande')) {
 			$result = $this->load_stats_commande(0, '1,2', 1);
 			if ($result < 0) {
 				dol_print_error($this->db, $this->error);
diff --git a/htdocs/product/inventory/inventory.php b/htdocs/product/inventory/inventory.php
index f7b3ddd5ac6..c1ef43c5c02 100644
--- a/htdocs/product/inventory/inventory.php
+++ b/htdocs/product/inventory/inventory.php
@@ -348,7 +348,7 @@ if (empty($reshook)) {
 			$error++;
 			setEventMessages($langs->trans("FieldCannotBeNegative", $langs->transnoentitiesnoconv("RealQty")), null, 'errors');
 		}
-		if (!$error && !empty($conf->productbatch->enabled)) {
+		if (!$error && isModEnabled('productbatch')) {
 			$tmpproduct = new Product($db);
 			$result = $tmpproduct->fetch($fk_product);
 
@@ -608,7 +608,7 @@ if ($object->id > 0) {
 		if (!empty($conf->use_javascript_ajax)) {
 			if ($permissiontoadd) {
 				// Link to launch scan tool
-				if (isModEnabled('barcode') || !empty($conf->productbatch->enabled)) {
+				if (isModEnabled('barcode') || isModEnabled('productbatch')) {
 					print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=updatebyscaning" class="marginrightonly paddingright marginleftonly paddingleft">'.img_picto('', 'barcode', 'class="paddingrightonly"').$langs->trans("UpdateByScaning").'</a>';
 				}
 
@@ -906,7 +906,7 @@ if ($object->id > 0) {
 	print '<tr class="liste_titre">';
 	print '<td>'.$langs->trans("Warehouse").'</td>';
 	print '<td>'.$langs->trans("Product").'</td>';
-	if (!empty($conf->productbatch->enabled)) {
+	if (isModEnabled('productbatch')) {
 		print '<td>';
 		print $langs->trans("Batch");
 		print '</td>';
@@ -944,7 +944,7 @@ if ($object->id > 0) {
 		print '<td>';
 		print $form->select_produits((GETPOSTISSET('fk_product') ? GETPOST('fk_product', 'int') : $object->fk_product), 'fk_product', '', 0, 0, -1, 2, '', 0, null, 0, '1', 0, 'maxwidth300');
 		print '</td>';
-		if (!empty($conf->productbatch->enabled)) {
+		if (isModEnabled('productbatch')) {
 			print '<td>';
 			print '<input type="text" name="batch" class="maxwidth100" value="'.(GETPOSTISSET('batch') ? GETPOST('batch') : '').'">';
 			print '</td>';
@@ -1022,7 +1022,7 @@ if ($object->id > 0) {
 			print $product_static->getNomUrl(1).' - '.$product_static->label;
 			print '</td>';
 
-			if (!empty($conf->productbatch->enabled)) {
+			if (isModEnabled('productbatch')) {
 				print '<td id="id_'.$obj->rowid.'_batch" data-batch="'.dol_escape_htmltag($obj->batch).'">';
 				$batch_static = new Productlot($db);
 				$res = $batch_static->fetch(0, $product_static->id, $obj->batch);
@@ -1039,7 +1039,7 @@ if ($object->id > 0) {
 			$valuetoshow = $obj->qty_stock;
 			// For inventory not yet close, we overwrite with the real value in stock now
 			if ($object->status == $object::STATUS_DRAFT || $object->status == $object::STATUS_VALIDATED) {
-				if (!empty($conf->productbatch->enabled) && $product_static->hasbatch()) {
+				if (isModEnabled('productbatch') && $product_static->hasbatch()) {
 					$valuetoshow = $product_static->stock_warehouse[$obj->fk_warehouse]->detail_batch[$obj->batch]->qty;
 				} else {
 					$valuetoshow = $product_static->stock_warehouse[$obj->fk_warehouse]->real;
diff --git a/htdocs/product/list.php b/htdocs/product/list.php
index 38c3c0c80ea..dcea4f4b8f7 100644
--- a/htdocs/product/list.php
+++ b/htdocs/product/list.php
@@ -49,7 +49,7 @@ if (!empty($conf->categorie->enabled)) {
 
 // Load translation files required by the page
 $langs->loadLangs(array('products', 'stocks', 'suppliers', 'companies', 'margins'));
-if (!empty($conf->productbatch->enabled)) {
+if (isModEnabled('productbatch')) {
 	$langs->load("productbatch");
 }
 
@@ -238,7 +238,7 @@ $arrayfields = array(
 	'p.desiredstock'=>array('label'=>"DesiredStock", 'checked'=>1, 'enabled'=>(!empty($conf->stock->enabled) && $user->rights->stock->lire && ($contextpage != 'servicelist' || !empty($conf->global->STOCK_SUPPORTS_SERVICES))), 'position'=>51),
 	'p.stock'=>array('label'=>"PhysicalStock", 'checked'=>1, 'enabled'=>(!empty($conf->stock->enabled) && $user->rights->stock->lire && ($contextpage != 'servicelist' || !empty($conf->global->STOCK_SUPPORTS_SERVICES))), 'position'=>52),
 	'stock_virtual'=>array('label'=>"VirtualStock", 'checked'=>1, 'enabled'=>(!empty($conf->stock->enabled) && $user->rights->stock->lire && ($contextpage != 'servicelist' || !empty($conf->global->STOCK_SUPPORTS_SERVICES)) && $virtualdiffersfromphysical), 'position'=>53),
-	'p.tobatch'=>array('label'=>"ManageLotSerial", 'checked'=>0, 'enabled'=>(!empty($conf->productbatch->enabled)), 'position'=>60),
+	'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'=>empty($conf->global->PRODUCT_DISABLE_ACCOUNTING), 'position'=>400),
diff --git a/htdocs/product/stock/class/mouvementstock.class.php b/htdocs/product/stock/class/mouvementstock.class.php
index 5653a564b9e..8edb3be32da 100644
--- a/htdocs/product/stock/class/mouvementstock.class.php
+++ b/htdocs/product/stock/class/mouvementstock.class.php
@@ -272,7 +272,7 @@ class MouvementStock extends CommonObject
 		}
 
 		// Test if product require batch data. If yes, and there is not or values are not correct, we throw an error.
-		if (!empty($conf->productbatch->enabled) && $product->hasbatch() && !$skip_batch) {
+		if (isModEnabled('productbatch') && $product->hasbatch() && !$skip_batch) {
 			if (empty($batch)) {
 				$langs->load("errors");
 				$this->errors[] = $langs->transnoentitiesnoconv("ErrorTryToMakeMoveOnProductRequiringBatchData", $product->ref);
@@ -384,7 +384,7 @@ class MouvementStock extends CommonObject
 		// Check if stock is enough when qty is < 0
 		// Note that qty should be > 0 with type 0 or 3, < 0 with type 1 or 2.
 		if ($movestock && $qty < 0 && empty($conf->global->STOCK_ALLOW_NEGATIVE_TRANSFER)) {
-			if (!empty($conf->productbatch->enabled) && $product->hasbatch() && !$skip_batch) {
+			if (isModEnabled('productbatch') && $product->hasbatch() && !$skip_batch) {
 				$foundforbatch = 0;
 				$qtyisnotenough = 0;
 
@@ -544,7 +544,7 @@ class MouvementStock extends CommonObject
 			}
 
 			// Update detail of stock for the lot.
-			if (!$error && !empty($conf->productbatch->enabled) && $product->hasbatch() && !$skip_batch) {
+			if (!$error && isModEnabled('productbatch') && $product->hasbatch() && !$skip_batch) {
 				if ($id_product_batch > 0) {
 					$result = $this->createBatch($id_product_batch, $qty);
 				} else {
@@ -596,7 +596,7 @@ class MouvementStock extends CommonObject
 			// End call triggers
 
 			// Check unicity for serial numbered equipments once all movement were done.
-			if (!$error && !empty($conf->productbatch->enabled) && $product->hasbatch() && !$skip_batch) {
+			if (!$error && isModEnabled('productbatch') && $product->hasbatch() && !$skip_batch) {
 				if ($product->status_batch == 2 && $qty > 0) {	// We check only if we increased qty
 					if ($this->getBatchCount($fk_product, $batch) > 1) {
 						$error++;
diff --git a/htdocs/product/stock/index.php b/htdocs/product/stock/index.php
index 6efe9f0d9e8..0f9deb92772 100644
--- a/htdocs/product/stock/index.php
+++ b/htdocs/product/stock/index.php
@@ -164,7 +164,7 @@ if ($resql) {
 	print "<tr class=\"liste_titre\">";
 	print '<th>'.$langs->trans("LastMovements", min($num, $max)).'</th>';
 	print '<th>'.$langs->trans("Product").'</th>';
-	if (!empty($conf->productbatch->enabled)) {
+	if (isModEnabled('productbatch')) {
 		print '<th>'.$langs->trans("Batch").'</th>';
 		/*if (empty($conf->global->PRODUCT_DISABLE_SELLBY)) {
 			print '<th>'.$langs->trans("SellByDate").'</th>';
@@ -204,7 +204,7 @@ if ($resql) {
 		print '<td class="tdoverflowmax200">';
 		print $producttmp->getNomUrl(1);
 		print "</td>\n";
-		if (!empty($conf->productbatch->enabled)) {
+		if (isModEnabled('productbatch')) {
 			print '<td>';
 			print $tmplotstatic->getNomUrl(0, 'nolink');
 			print '</td>';
diff --git a/htdocs/product/stock/movement_card.php b/htdocs/product/stock/movement_card.php
index 32c95537947..c31bbbc3101 100644
--- a/htdocs/product/stock/movement_card.php
+++ b/htdocs/product/stock/movement_card.php
@@ -44,7 +44,7 @@ if (!empty($conf->project->enabled)) {
 
 // Load translation files required by the page
 $langs->loadLangs(array('products', 'stocks', 'orders'));
-if (!empty($conf->productbatch->enabled)) {
+if (isModEnabled('productbatch')) {
 	$langs->load("productbatch");
 }
 
@@ -106,9 +106,9 @@ $arrayfields = array(
 	'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'=>(!empty($conf->productbatch->enabled))),
-	'pl.eatby'=>array('label'=>$langs->trans("EatByDate"), 'checked'=>0, 'position'=>10, 'enabled'=>(!empty($conf->productbatch->enabled))),
-	'pl.sellby'=>array('label'=>$langs->trans("SellByDate"), 'checked'=>0, 'position'=>10, 'enabled'=>(!empty($conf->productbatch->enabled))),
+	'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),
@@ -273,7 +273,7 @@ if ($action == "transfert_stock" && !$cancel) {
 		$action = 'transfert';
 	}
 
-	if (!empty($conf->productbatch->enabled)) {
+	if (isModEnabled('productbatch')) {
 		$product = new Product($db);
 		$result = $product->fetch($product_id);
 
diff --git a/htdocs/product/stock/movement_list.php b/htdocs/product/stock/movement_list.php
index 9f097e1c4e3..d2639000270 100644
--- a/htdocs/product/stock/movement_list.php
+++ b/htdocs/product/stock/movement_list.php
@@ -45,7 +45,7 @@ if (!empty($conf->project->enabled)) {
 
 // Load translation files required by the page
 $langs->loadLangs(array('products', 'stocks', 'orders'));
-if (!empty($conf->productbatch->enabled)) {
+if (isModEnabled('productbatch')) {
 	$langs->load("productbatch");
 }
 
@@ -125,9 +125,9 @@ $arrayfields = array(
 	'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'=>(!empty($conf->productbatch->enabled))),
-	'pl.eatby'=>array('label'=>"EatByDate", 'checked'=>0, 'position'=>9, 'enabled'=>(!empty($conf->productbatch->enabled))),
-	'pl.sellby'=>array('label'=>"SellByDate", 'checked'=>0, 'position'=>10, 'enabled'=>(!empty($conf->productbatch->enabled))),
+	'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),
@@ -448,7 +448,7 @@ if ($action == "transfert_stock" && !$cancel) {
 		$action = 'transfert';
 	}
 
-	if (!empty($conf->productbatch->enabled)) {
+	if (isModEnabled('productbatch')) {
 		$product = new Product($db);
 		$result = $product->fetch($product_id);
 
diff --git a/htdocs/product/stock/product.php b/htdocs/product/stock/product.php
index 51b12d4a6b1..ca3624fe147 100644
--- a/htdocs/product/stock/product.php
+++ b/htdocs/product/stock/product.php
@@ -39,7 +39,7 @@ require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.product.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/product.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/product/class/html.formproduct.class.php';
 require_once DOL_DOCUMENT_ROOT.'/product/stock/class/productstockentrepot.class.php';
-if (!empty($conf->productbatch->enabled)) {
+if (isModEnabled('productbatch')) {
 	require_once DOL_DOCUMENT_ROOT.'/product/class/productbatch.class.php';
 }
 if (!empty($conf->project->enabled)) {
@@ -56,7 +56,7 @@ if (!empty($conf->variants->enabled)) {
 
 // Load translation files required by the page
 $langs->loadlangs(array('products', 'suppliers', 'orders', 'bills', 'stocks', 'sendings', 'margins'));
-if (!empty($conf->productbatch->enabled)) {
+if (isModEnabled('productbatch')) {
 	$langs->load("productbatch");
 }
 
@@ -248,7 +248,7 @@ if ($action == "correct_stock" && !$cancel) {
 		$action = 'correction';
 	}
 
-	if (!empty($conf->productbatch->enabled)) {
+	if (isModEnabled('productbatch')) {
 		$object = new Product($db);
 		$result = $object->fetch($id);
 
@@ -345,7 +345,7 @@ if ($action == "transfert_stock" && !$cancel) {
 		$error++;
 		$action = 'transfert';
 	}
-	if (!empty($conf->productbatch->enabled)) {
+	if (isModEnabled('productbatch')) {
 		$object = new Product($db);
 		$result = $object->fetch($id);
 
@@ -761,7 +761,7 @@ if ($id > 0 || $ref) {
 			$found = 0;
 			$helpondiff = '<strong>'.$langs->trans("StockDiffPhysicTeoric").':</strong><br>';
 			// Number of customer orders running
-			if (!empty($conf->commande->enabled)) {
+			if (isModEnabled('commande')) {
 				if ($found) {
 					$helpondiff .= '<br>';
 				} else {
@@ -959,7 +959,7 @@ if (!$variants) {
 	print '<td></td>';
 	print '</tr>';
 
-	if ((!empty($conf->productbatch->enabled)) && $object->hasbatch()) {
+	if ((isModEnabled('productbatch')) && $object->hasbatch()) {
 		$colspan = 3;
 		print '<tr class="liste_titre"><td class="minwidth200">';
 		if (!empty($conf->use_javascript_ajax)) {
@@ -1029,7 +1029,7 @@ if (!$variants) {
 			// Warehouse
 			print '<td colspan="4">';
 			print $entrepotstatic->getNomUrl(1);
-			if (!empty($conf->use_javascript_ajax) && !empty($conf->productbatch->enabled) && $object->hasbatch()) {
+			if (!empty($conf->use_javascript_ajax) && isModEnabled('productbatch') && $object->hasbatch()) {
 				print '<a class="collapse_batch marginleftonly" id="ent' . $entrepotstatic->id . '" href="#">';
 				print (empty($conf->global->STOCK_SHOW_ALL_BATCH_BY_DEFAULT) ? '(+)' : '(-)');
 				print '</a>';
@@ -1096,7 +1096,7 @@ if (!$variants) {
 			$totalvalue = $totalvalue + ($object->pmp * $obj->reel);
 			$totalvaluesell = $totalvaluesell + ($object->price * $obj->reel);
 			// Batch Detail
-			if ((!empty($conf->productbatch->enabled)) && $object->hasbatch()) {
+			if ((isModEnabled('productbatch')) && $object->hasbatch()) {
 				$details = Productbatch::findAll($db, $obj->product_stock_id, 0, $object->id);
 				if ($details < 0) {
 					dol_print_error($db);
diff --git a/htdocs/product/stock/productlot_document.php b/htdocs/product/stock/productlot_document.php
index 89ba063e8d7..842aa83bd07 100644
--- a/htdocs/product/stock/productlot_document.php
+++ b/htdocs/product/stock/productlot_document.php
@@ -85,7 +85,7 @@ if ($id || $ref) {
 	$object->fetch($id, $productid, $batch);
 	$object->ref = $object->batch; // Old system for document management ( it uses $object->ref)
 
-	if (!empty($conf->productbatch->enabled)) {
+	if (isModEnabled('productbatch')) {
 		$upload_dir = $conf->productbatch->multidir_output[$object->entity].'/'.get_exdir(0, 0, 0, 1, $object, $modulepart);
 		$filearray = dol_dir_list($upload_dir, "files");
 		if (empty($filearray)) {
diff --git a/htdocs/product/stock/replenish.php b/htdocs/product/stock/replenish.php
index f2821eab8ce..1eb8a444d8a 100644
--- a/htdocs/product/stock/replenish.php
+++ b/htdocs/product/stock/replenish.php
@@ -413,7 +413,7 @@ if (!empty($conf->global->STOCK_ALLOW_ADD_LIMIT_STOCK_BY_WAREHOUSE) && $fk_entre
 $sql .= ', s.fk_product';
 
 if ($usevirtualstock) {
-	if (!empty($conf->commande->enabled)) {
+	if (isModEnabled('commande')) {
 		$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(!empty($conf->global->STOCK_CALCULATE_VIRTUAL_STOCK_TRANSVERSE_MODE) ? 'stock' : 'commande').")";
diff --git a/htdocs/product/stock/tpl/stocktransfer.tpl.php b/htdocs/product/stock/tpl/stocktransfer.tpl.php
index f2ecfa1d73c..819fa404d52 100644
--- a/htdocs/product/stock/tpl/stocktransfer.tpl.php
+++ b/htdocs/product/stock/tpl/stocktransfer.tpl.php
@@ -93,7 +93,7 @@ print '<tr><td class="fieldrequired">'.$langs->trans("NumberOfUnit").'</td><td c
 print '</tr>';
 
 // Serial / Eat-by date
-if (!empty($conf->productbatch->enabled) &&
+if (isModEnabled('productbatch') &&
 (($object->element == 'product' && $object->hasbatch())
 || ($object->element == 'stock'))
 ) {
diff --git a/htdocs/projet/card.php b/htdocs/projet/card.php
index 246ae6b7ba8..bc182efa3f2 100644
--- a/htdocs/projet/card.php
+++ b/htdocs/projet/card.php
@@ -1348,7 +1348,7 @@ if ($action == 'create' && $user->rights->projet->creer) {
 					$langs->load("propal");
 					print dolGetButtonAction('', $langs->trans('AddProp'), 'default', DOL_URL_ROOT.'/comm/propal/card.php?action=create&amp;projectid='.$object->id.'&amp;socid='.$object->socid, '', 1, array('isDropDown' => true));
 				}
-				if (!empty($conf->commande->enabled) && $user->rights->commande->creer) {
+				if (isModEnabled('commande') && $user->rights->commande->creer) {
 					$langs->load("orders");
 					print dolGetButtonAction('', $langs->trans('CreateOrder'), 'default', DOL_URL_ROOT.'/commande/card.php?action=create&amp;projectid='.$object->id.'&amp;socid='.$object->socid, '', 1, array('isDropDown' => true));
 				}
@@ -1376,7 +1376,7 @@ if ($action == 'create' && $user->rights->projet->creer) {
 					$langs->load("contracts");
 					print dolGetButtonAction('', $langs->trans('AddContract'), 'default', DOL_URL_ROOT.'/contrat/card.php?action=create&amp;projectid='.$object->id.'&amp;socid='.$object->socid, '', 1, array('isDropDown' => true));
 				}
-				if (!empty($conf->expensereport->enabled) && $user->rights->expensereport->creer) {
+				if (isModEnabled('expensereport') && $user->rights->expensereport->creer) {
 					$langs->load("trips");
 					print dolGetButtonAction('', $langs->trans('AddTrip'), 'default', DOL_URL_ROOT.'/expensereport/card.php?action=create&amp;projectid='.$object->id.'&amp;socid='.$object->socid, '', 1, array('isDropDown' => true));
 				}
diff --git a/htdocs/projet/element.php b/htdocs/projet/element.php
index a96ba8c2819..57583a538fb 100644
--- a/htdocs/projet/element.php
+++ b/htdocs/projet/element.php
@@ -46,7 +46,7 @@ if (isModEnabled('facture')) {
 	require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
 	require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture-rec.class.php';
 }
-if (!empty($conf->commande->enabled)) {
+if (isModEnabled('commande')) {
 	require_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
 }
 if (!empty($conf->supplier_proposal->enabled)) {
@@ -67,10 +67,10 @@ if (!empty($conf->ficheinter->enabled)) {
 if (isModEnabled("expedition")) {
 	require_once DOL_DOCUMENT_ROOT.'/expedition/class/expedition.class.php';
 }
-if (!empty($conf->deplacement->enabled)) {
+if (isModEnabled('deplacement')) {
 	require_once DOL_DOCUMENT_ROOT.'/compta/deplacement/class/deplacement.class.php';
 }
-if (!empty($conf->expensereport->enabled)) {
+if (isModEnabled('expensereport')) {
 	require_once DOL_DOCUMENT_ROOT.'/expensereport/class/expensereport.class.php';
 }
 if (isModEnabled('agenda')) {
@@ -86,7 +86,7 @@ if (!empty($conf->loan->enabled)) {
 if (!empty($conf->stock->enabled)) {
 	require_once DOL_DOCUMENT_ROOT.'/product/stock/class/mouvementstock.class.php';
 }
-if (!empty($conf->tax->enabled)) {
+if (isModEnabled('tax')) {
 	require_once DOL_DOCUMENT_ROOT.'/compta/sociales/class/chargesociales.class.php';
 }
 if (isModEnabled("banque")) {
@@ -107,7 +107,7 @@ $langs->loadLangs(array('projects', 'companies', 'suppliers', 'compta'));
 if (isModEnabled('facture')) {
 	$langs->load("bills");
 }
-if (!empty($conf->commande->enabled)) {
+if (isModEnabled('commande')) {
 	$langs->load("orders");
 }
 if (isModEnabled("propal")) {
@@ -116,10 +116,10 @@ if (isModEnabled("propal")) {
 if (!empty($conf->ficheinter->enabled)) {
 	$langs->load("interventions");
 }
-if (!empty($conf->deplacement->enabled)) {
+if (isModEnabled('deplacement')) {
 	$langs->load("trips");
 }
-if (!empty($conf->expensereport->enabled)) {
+if (isModEnabled('expensereport')) {
 	$langs->load("trips");
 }
 if (!empty($conf->don->enabled)) {
diff --git a/htdocs/projet/info.php b/htdocs/projet/info.php
index e3532fb6471..8964cca8c19 100644
--- a/htdocs/projet/info.php
+++ b/htdocs/projet/info.php
@@ -109,7 +109,7 @@ if ($id > 0 || !empty($ref)) {
 	}
 	$object->info($object->id);
 }
-$agenda = (!empty($conf->agenda->enabled) && (!empty($user->rights->agenda->myactions->read) || !empty($user->rights->agenda->allactions->read))) ? '/'.$langs->trans("Agenda") : '';
+$agenda = (isModEnabled('agenda') && (!empty($user->rights->agenda->myactions->read) || !empty($user->rights->agenda->allactions->read))) ? '/'.$langs->trans("Agenda") : '';
 $title = $langs->trans('Events').$agenda.' - '.$object->ref.' '.$object->name;
 if (!empty($conf->global->MAIN_HTML_TITLE) && preg_match('/projectnameonly/', $conf->global->MAIN_HTML_TITLE) && $object->name) {
 	$title = $object->ref.' '.$object->name.' - '.$langs->trans("Info");
diff --git a/htdocs/reception/card.php b/htdocs/reception/card.php
index 00f534a388c..6ca72ea2d97 100644
--- a/htdocs/reception/card.php
+++ b/htdocs/reception/card.php
@@ -54,7 +54,7 @@ if ((isModEnabled("fournisseur") && empty($conf->global->MAIN_USE_NEW_SUPPLIERMO
 	require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.commande.class.php';
 	require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.commande.dispatch.class.php';
 }
-if (!empty($conf->productbatch->enabled)) {
+if (isModEnabled('productbatch')) {
 	require_once DOL_DOCUMENT_ROOT.'/product/class/productbatch.class.php';
 }
 if (!empty($conf->project->enabled)) {
@@ -67,7 +67,7 @@ $langs->loadLangs(array("receptions", "companies", "bills", 'deliveries', 'order
 if (!empty($conf->incoterm->enabled)) {
 	$langs->load('incoterm');
 }
-if (!empty($conf->productbatch->enabled)) {
+if (isModEnabled('productbatch')) {
 	$langs->load('productbatch');
 }
 
@@ -626,7 +626,7 @@ if (empty($reshook)) {
 					$line->qty = GETPOST($qty, 'int');
 					$line->comment = GETPOST($comment, 'alpha');
 
-					if (!empty($conf->productbatch->enabled)) {
+					if (isModEnabled('productbatch')) {
 						$batch = "batch".$line_id;
 						$dlc = "dlc".$line_id;
 						$dluo = "dluo".$line_id;
@@ -1041,7 +1041,7 @@ if ($action == 'create') {
 				if (!empty($conf->stock->enabled)) {
 					print '<td class="left">'.$langs->trans("Warehouse").' ('.$langs->trans("Stock").')</td>';
 				}
-				if (!empty($conf->productbatch->enabled)) {
+				if (isModEnabled('productbatch')) {
 					print '<td class="left">'.$langs->trans("batch_number").'</td>';
 					if (empty($conf->global->PRODUCT_DISABLE_SELLBY)) {
 						print '<td class="left">'.$langs->trans("SellByDate").'</td>';
@@ -1216,7 +1216,7 @@ if ($action == 'create') {
 						print '</td>';
 					}
 
-					if (!empty($conf->productbatch->enabled)) {
+					if (isModEnabled('productbatch')) {
 						if (!empty($product->status_batch)) {
 							print '<td><input name="batch'.$indiceAsked.'" value="'.$dispatchLines[$indiceAsked]['lot'].'"></td>';
 							if (empty($conf->global->PRODUCT_DISABLE_SELLBY)) {
@@ -1358,7 +1358,7 @@ if ($action == 'create') {
 		$totalVolume = $tmparray['volume'];
 
 
-		if ($typeobject == 'commande' && $object->$typeobject->id && !empty($conf->commande->enabled)) {
+		if ($typeobject == 'commande' && $object->$typeobject->id && isModEnabled('commande')) {
 			$objectsrc = new Commande($db);
 			$objectsrc->fetch($object->$typeobject->id);
 		}
@@ -1427,7 +1427,7 @@ if ($action == 'create') {
 		print '<table class="border centpercent tableforfield">';
 
 		// Linked documents
-		if ($typeobject == 'commande' && $object->$typeobject->id && !empty($conf->commande->enabled)) {
+		if ($typeobject == 'commande' && $object->$typeobject->id && isModEnabled('commande')) {
 			print '<tr><td>';
 			print $langs->trans("RefOrder").'</td>';
 			print '<td colspan="3">';
@@ -1700,7 +1700,7 @@ if ($action == 'create') {
 			if (!empty($conf->stock->enabled)) {
 				print $langs->trans("WarehouseSource").' - ';
 			}
-			if (!empty($conf->productbatch->enabled)) {
+			if (isModEnabled('productbatch')) {
 				print $langs->trans("Batch");
 			}
 			print '</td>';
@@ -1721,7 +1721,7 @@ if ($action == 'create') {
 				print '<td class="left">'.$langs->trans("WarehouseSource").'</td>';
 			}
 
-			if (!empty($conf->productbatch->enabled)) {
+			if (isModEnabled('productbatch')) {
 				print '<td class="left">'.$langs->trans("Batch").'</td>';
 			}
 		}
@@ -1957,7 +1957,7 @@ if ($action == 'create') {
 				}
 
 				// Batch number managment
-				if (!empty($conf->productbatch->enabled)) {
+				if (isModEnabled('productbatch')) {
 					if (isset($lines[$i]->batch)) {
 						print '<!-- Detail of lot -->';
 						print '<td class="linecolbatch">';
diff --git a/htdocs/reception/class/reception.class.php b/htdocs/reception/class/reception.class.php
index ceb71624292..85071a49b94 100644
--- a/htdocs/reception/class/reception.class.php
+++ b/htdocs/reception/class/reception.class.php
@@ -38,7 +38,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 (!empty($conf->commande->enabled)) {
+if (isModEnabled('commande')) {
 	require_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
 }
 
@@ -849,7 +849,7 @@ class Reception extends CommonObject
 		// Check batch is set
 		$product = new Product($this->db);
 		$product->fetch($fk_product);
-		if (!empty($conf->productbatch->enabled)) {
+		if (isModEnabled('productbatch')) {
 			$langs->load("errors");
 			if (!empty($product->status_batch) && empty($batch)) {
 				$this->error = $langs->trans('ErrorProductNeedBatchNumber', $product->ref);
diff --git a/htdocs/reception/note.php b/htdocs/reception/note.php
index fadf222aa3e..cb2c84ebd76 100644
--- a/htdocs/reception/note.php
+++ b/htdocs/reception/note.php
@@ -51,7 +51,7 @@ if ($id > 0 || !empty($ref)) {
 	}
 
 	// Linked documents
-	if ($typeobject == 'commande' && $object->$typeobject->id && !empty($conf->commande->enabled)) {
+	if ($typeobject == 'commande' && $object->$typeobject->id && isModEnabled('commande')) {
 		$objectsrc = new Commande($db);
 		$objectsrc->fetch($object->$typeobject->id);
 	}
diff --git a/htdocs/societe/canvas/actions_card_common.class.php b/htdocs/societe/canvas/actions_card_common.class.php
index 5a26946913c..e71ee255981 100644
--- a/htdocs/societe/canvas/actions_card_common.class.php
+++ b/htdocs/societe/canvas/actions_card_common.class.php
@@ -342,7 +342,7 @@ abstract class ActionsCardCommon
 			}
 
 			// Linked member
-			if (!empty($conf->adherent->enabled)) {
+			if (isModEnabled('adherent')) {
 				$langs->load("members");
 				$adh = new Adherent($this->db);
 				$result = $adh->fetch('', '', $this->object->id);
diff --git a/htdocs/societe/canvas/company/tpl/card_view.tpl.php b/htdocs/societe/canvas/company/tpl/card_view.tpl.php
index 0c6f2caf1e1..d1ba18f82fd 100644
--- a/htdocs/societe/canvas/company/tpl/card_view.tpl.php
+++ b/htdocs/societe/canvas/company/tpl/card_view.tpl.php
@@ -247,7 +247,7 @@ for ($i = 1; $i <= 4; $i++) {
 	<td colspan="3"><?php echo $this->control->tpl['sales_representatives']; ?></td>
 </tr>
 
-<?php if (!empty($conf->adherent->enabled)) { ?>
+<?php if (isModEnabled('adherent')) { ?>
 <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 bfbf6271711..98979c917d4 100644
--- a/htdocs/societe/canvas/individual/tpl/card_view.tpl.php
+++ b/htdocs/societe/canvas/individual/tpl/card_view.tpl.php
@@ -174,7 +174,7 @@ if ($this->control->tpl['action_delete']) {
 	<td colspan="3"><?php echo $this->control->tpl['sales_representatives']; ?></td>
 </tr>
 
-<?php if (!empty($conf->adherent->enabled)) { ?>
+<?php if (isModEnabled('adherent')) { ?>
 <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/card.php b/htdocs/societe/card.php
index d5ccb96eaf7..331fb58ae9c 100644
--- a/htdocs/societe/card.php
+++ b/htdocs/societe/card.php
@@ -47,7 +47,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 (!empty($conf->adherent->enabled)) {
+if (isModEnabled('adherent')) {
 	require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
 }
 if (!empty($conf->accounting->enabled)) {
@@ -68,7 +68,7 @@ if (! empty($conf->eventorganization->enabled)) {
 
 $langs->loadLangs(array("companies", "commercial", "bills", "banks", "users"));
 
-if (!empty($conf->adherent->enabled)) {
+if (isModEnabled('adherent')) {
 	$langs->load("members");
 }
 if (!empty($conf->categorie->enabled)) {
@@ -3035,7 +3035,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 		include DOL_DOCUMENT_ROOT.'/societe/tpl/linesalesrepresentative.tpl.php';
 
 		// Module Adherent
-		if (!empty($conf->adherent->enabled)) {
+		if (isModEnabled('adherent')) {
 			$langs->load("members");
 			print '<tr><td>'.$langs->trans("LinkedToDolibarrMember").'</td>';
 			print '<td>';
@@ -3108,7 +3108,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 
 				print dolGetButtonAction('', $langs->trans('Modify'), 'default', $_SERVER["PHP_SELF"].'?socid='.$object->id.'&action=edit&token='.newToken(), '', $permissiontoadd);
 
-				if (!empty($conf->adherent->enabled)) {
+				if (isModEnabled('adherent')) {
 					$adh = new Adherent($db);
 					$result = $adh->fetch('', '', $object->id);
 					if ($result == 0 && ($object->client == 1 || $object->client == 3) && !empty($conf->global->MEMBER_CAN_CONVERT_CUSTOMERS_TO_MEMBERS)) {
diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php
index ee2d71f6d12..3f7bb239c51 100644
--- a/htdocs/societe/class/societe.class.php
+++ b/htdocs/societe/class/societe.class.php
@@ -214,8 +214,8 @@ class Societe extends CommonObject
 		'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'=>'!empty($conf->commande->enabled) && !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'=>'!empty($conf->commande->enabled) && !empty($conf->global->ORDER_MANAGE_MIN_AMOUNT)', 'visible'=>-1, 'position'=>320, '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),
@@ -1561,7 +1561,7 @@ class Societe extends CommonObject
 
 				if (!$error && $nbrowsaffected) {
 					// Update information on linked member if it is an update
-					if (!$nosyncmember && !empty($conf->adherent->enabled)) {
+					if (!$nosyncmember && isModEnabled('adherent')) {
 						require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
 
 						dol_syslog(get_class($this)."::update update linked member");
diff --git a/htdocs/societe/consumption.php b/htdocs/societe/consumption.php
index 53408fd00ff..a8f250f29d5 100644
--- a/htdocs/societe/consumption.php
+++ b/htdocs/societe/consumption.php
@@ -170,7 +170,7 @@ if ($object->client) {
 	if (isModEnabled("propal") && $user->rights->propal->lire) {
 		$elementTypeArray['propal'] = $langs->transnoentitiesnoconv('Proposals');
 	}
-	if (!empty($conf->commande->enabled) && $user->rights->commande->lire) {
+	if (isModEnabled('commande') && $user->rights->commande->lire) {
 		$elementTypeArray['order'] = $langs->transnoentitiesnoconv('Orders');
 	}
 	if (isModEnabled('facture') && $user->rights->facture->lire) {
diff --git a/htdocs/societe/contact.php b/htdocs/societe/contact.php
index 1bc64658735..14c1347c98c 100644
--- a/htdocs/societe/contact.php
+++ b/htdocs/societe/contact.php
@@ -43,7 +43,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 (!empty($conf->adherent->enabled)) {
+if (isModEnabled('adherent')) {
 	require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
 }
 
diff --git a/htdocs/societe/paymentmodes.php b/htdocs/societe/paymentmodes.php
index 5b9bd1046ef..f22a5fb440b 100644
--- a/htdocs/societe/paymentmodes.php
+++ b/htdocs/societe/paymentmodes.php
@@ -791,7 +791,7 @@ if ($socid && $action != 'edit' && $action != 'create' && $action != 'editcard'
 		if (isModEnabled("propal") && $user->rights->propal->lire) {
 			$elementTypeArray['propal'] = $langs->transnoentitiesnoconv('Proposals');
 		}
-		if (!empty($conf->commande->enabled) && $user->rights->commande->lire) {
+		if (isModEnabled('commande') && $user->rights->commande->lire) {
 			$elementTypeArray['order'] = $langs->transnoentitiesnoconv('Orders');
 		}
 		if (isModEnabled('facture') && $user->rights->facture->lire) {
diff --git a/htdocs/societe/societecontact.php b/htdocs/societe/societecontact.php
index a061933ba11..1767973a001 100644
--- a/htdocs/societe/societecontact.php
+++ b/htdocs/societe/societecontact.php
@@ -205,7 +205,7 @@ if ($id > 0 || !empty($ref)) {
 		}
 
 		// additionnal list with adherents of company
-		if (!empty($conf->adherent->enabled) && $user->rights->adherent->lire) {
+		if (isModEnabled('adherent') && $user->rights->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/user/bank.php b/htdocs/user/bank.php
index 0dd8a7f9d08..2c6dd47b234 100644
--- a/htdocs/user/bank.php
+++ b/htdocs/user/bank.php
@@ -36,7 +36,7 @@ require_once DOL_DOCUMENT_ROOT.'/user/class/userbankaccount.class.php';
 if (isModEnabled('holiday')) {
 	require_once DOL_DOCUMENT_ROOT.'/holiday/class/holiday.class.php';
 }
-if (!empty($conf->expensereport->enabled)) {
+if (isModEnabled('expensereport')) {
 	require_once DOL_DOCUMENT_ROOT.'/expensereport/class/expensereport.class.php';
 }
 if (!empty($conf->salaries->enabled)) {
@@ -361,7 +361,7 @@ if ($action != 'edit' && $action != 'create') {		// If not bank account yet, $ac
 	print "</tr>\n";
 
 	// Expense report validator
-	if (!empty($conf->expensereport->enabled)) {
+	if (isModEnabled('expensereport')) {
 		print '<tr><td>';
 		$text = $langs->trans("ForceUserExpenseValidator");
 		print $form->textwithpicto($text, $langs->trans("ValidatorIsSupervisorByDefault"), 1, 'help');
@@ -691,7 +691,7 @@ if ($action != 'edit' && $action != 'create') {		// If not bank account yet, $ac
 	}
 
 	// Latest expense report
-	if (!empty($conf->expensereport->enabled) &&
+	if (isModEnabled('expensereport') &&
 		($user->rights->expensereport->readall || ($user->rights->expensereport->lire && $object->id == $user->id))
 		) {
 		$exp = new ExpenseReport($db);
diff --git a/htdocs/user/card.php b/htdocs/user/card.php
index 45d7c91a8bb..7ae7bb70566 100644
--- a/htdocs/user/card.php
+++ b/htdocs/user/card.php
@@ -51,7 +51,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/security2.lib.php';
 if (!empty($conf->ldap->enabled)) {
 	require_once DOL_DOCUMENT_ROOT.'/core/class/ldap.class.php';
 }
-if (!empty($conf->adherent->enabled)) {
+if (isModEnabled('adherent')) {
 	require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
 }
 if (!empty($conf->categorie->enabled)) {
@@ -950,7 +950,7 @@ if ($action == 'create' || $action == 'adduserldap') {
 	print "</tr>\n";
 
 	// Expense report validator
-	if (!empty($conf->expensereport->enabled)) {
+	if (isModEnabled('expensereport')) {
 		print '<tr><td class="titlefieldcreate">';
 		$text = $langs->trans("ForceUserExpenseValidator");
 		print $form->textwithpicto($text, $langs->trans("ValidatorIsSupervisorByDefault"), 1, 'help');
@@ -1498,7 +1498,7 @@ if ($action == 'create' || $action == 'adduserldap') {
 			print "</tr>\n";
 
 			// Expense report validator
-			if (!empty($conf->expensereport->enabled)) {
+			if (isModEnabled('expensereport')) {
 				print '<tr><td>';
 				$text = $langs->trans("ForceUserExpenseValidator");
 				print $form->textwithpicto($text, $langs->trans("ValidatorIsSupervisorByDefault"), 1, 'help');
@@ -1707,7 +1707,7 @@ if ($action == 'create' || $action == 'adduserldap') {
 			}
 
 			// Module Adherent
-			if (!empty($conf->adherent->enabled)) {
+			if (isModEnabled('adherent')) {
 				$langs->load("members");
 				print '<tr><td>'.$langs->trans("LinkedToDolibarrMember").'</td>';
 				print '<td>';
@@ -2239,7 +2239,7 @@ if ($action == 'create' || $action == 'adduserldap') {
 			print "</tr>\n";
 
 			// Expense report validator
-			if (!empty($conf->expensereport->enabled)) {
+			if (isModEnabled('expensereport')) {
 				print '<tr><td class="titlefield">';
 				$text = $langs->trans("ForceUserExpenseValidator");
 				print $form->textwithpicto($text, $langs->trans("ValidatorIsSupervisorByDefault"), 1, 'help');
@@ -2629,7 +2629,7 @@ if ($action == 'create' || $action == 'adduserldap') {
 			}
 
 			// Module Adherent
-			if (!empty($conf->adherent->enabled)) {
+			if (isModEnabled('adherent')) {
 				$langs->load("members");
 				print '<tr><td>'.$langs->trans("LinkedToDolibarrMember").'</td>';
 				print '<td>';
diff --git a/htdocs/user/param_ihm.php b/htdocs/user/param_ihm.php
index 6d5a27cd8ba..1df44179461 100644
--- a/htdocs/user/param_ihm.php
+++ b/htdocs/user/param_ihm.php
@@ -192,19 +192,19 @@ if (isModEnabled("societe")) {
 if (!empty($conf->project->enabled)) {
 	$tmparray['projet/index.php?mainmenu=project&leftmenu='] = 'ProjectsArea';
 }
-if (isModEnabled('holiday') || !empty($conf->expensereport->enabled)) {
+if (isModEnabled('holiday') || isModEnabled('expensereport')) {
 	$tmparray['hrm/index.php?mainmenu=hrm&leftmenu='] = 'HRMArea'; // TODO Complete list with first level of menus
 }
 if (isModEnabled("product") || isModEnabled("service")) {
 	$tmparray['product/index.php?mainmenu=products&leftmenu='] = 'ProductsAndServicesArea';
 }
-if (isModEnabled("propal") || !empty($conf->commande->enabled) || !empty($conf->ficheinter->enabled) || !empty($conf->contrat->enabled)) {
+if (isModEnabled("propal") || isModEnabled('commande') || !empty($conf->ficheinter->enabled) || !empty($conf->contrat->enabled)) {
 	$tmparray['comm/index.php?mainmenu=commercial&leftmenu='] = 'CommercialArea';
 }
 if (!empty($conf->comptabilite->enabled) || !empty($conf->accounting->enabled)) {
 	$tmparray['compta/index.php?mainmenu=compta&leftmenu='] = 'AccountancyTreasuryArea';
 }
-if (!empty($conf->adherent->enabled)) {
+if (isModEnabled('adherent')) {
 	$tmparray['adherents/index.php?mainmenu=members&leftmenu='] = 'MembersArea';
 }
 if (isModEnabled('agenda')) {
diff --git a/htdocs/webhook/target_agenda.php b/htdocs/webhook/target_agenda.php
index ccc61d806af..a8d110eb081 100644
--- a/htdocs/webhook/target_agenda.php
+++ b/htdocs/webhook/target_agenda.php
@@ -227,7 +227,7 @@ if ($object->id > 0) {
 
 	print '<div class="tabsAction">';
 
-	if (!empty($conf->agenda->enabled)) {
+	if (isModEnabled('agenda')) {
 		if (!empty($user->rights->agenda->myactions->create) || !empty($user->rights->agenda->allactions->create)) {
 			print '<a class="butAction" href="'.DOL_URL_ROOT.'/comm/action/card.php?action=create'.$out.'">'.$langs->trans("AddAction").'</a>';
 		} else {
@@ -237,7 +237,7 @@ if ($object->id > 0) {
 
 	print '</div>';
 
-	if (!empty($conf->agenda->enabled) && (!empty($user->rights->agenda->myactions->read) || !empty($user->rights->agenda->allactions->read))) {
+	if (isModEnabled('agenda') && (!empty($user->rights->agenda->myactions->read) || !empty($user->rights->agenda->allactions->read))) {
 		$param = '&id='.$object->id.'&socid='.$socid;
 		if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) {
 			$param .= '&contextpage='.urlencode($contextpage);
diff --git a/htdocs/webservices/admin/index.php b/htdocs/webservices/admin/index.php
index 97b8a4768a0..79d222f7e84 100644
--- a/htdocs/webservices/admin/index.php
+++ b/htdocs/webservices/admin/index.php
@@ -103,10 +103,10 @@ $webservices = array(
 		'thirdparty'		=> 'isModEnabled("societe")',
 		'contact'			=> 'isModEnabled("societe")',
 		'productorservice'	=> '(isModEnabled("product") || isModEnabled("service"))',
-		'order'				=> '!empty($conf->commande->enabled)',
+		'order'				=> 'isModEnabled('commande')',
 		'invoice'			=> 'isModEnabled("facture")',
 		'supplier_invoice'	=> 'isModEnabled("fournisseur")',
-		'actioncomm'		=> '!empty($conf->agenda->enabled)',
+		'actioncomm'		=> 'isModEnabled('agenda')',
 		'category'			=> '!empty($conf->categorie->enabled)',
 		'project'			=> '!empty($conf->project->enabled)',
 		'other'				=> ''

From c86617c7b1d49e19eb780e7c35710647ae5ab1d2 Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Wed, 31 Aug 2022 21:56:30 +0200
Subject: [PATCH 458/974] update code

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

diff --git a/htdocs/commande/contact.php b/htdocs/commande/contact.php
index c9ef518d1d0..1be1384df30 100644
--- a/htdocs/commande/contact.php
+++ b/htdocs/commande/contact.php
@@ -2,7 +2,7 @@
 /* Copyright (C) 2005      Patrick Rouillon     <patrick@rouillon.net>
  * Copyright (C) 2005-2011 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2005-2012 Regis Houssin        <regis.houssin@inodbox.com>
- * Copyright (C) 2011-2015 Philippe Grand       <philippe.grand@atoo-net.com>
+ * Copyright (C) 2011-2022 Philippe Grand       <philippe.grand@atoo-net.com>
  * Copyright (C) 2021 		Frédéric France		<frederic.france@netlogic.fr>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -131,7 +131,7 @@ if ($id > 0 || !empty($ref)) {
 		// Thirdparty
 		$morehtmlref .= '<br>'.$langs->trans('ThirdParty').' : '.$object->thirdparty->getNomUrl(1);
 		// Project
-		if (!empty($conf->project->enabled)) {
+		if (isModEnabled('project')) {
 			$langs->load("projects");
 			$morehtmlref .= '<br>'.$langs->trans('Project').' ';
 			if ($user->rights->commande->creer) {

From 18fba7a8e7114c8a7887cf8bbbff3c5470a4af8f Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Wed, 31 Aug 2022 21:56:58 +0200
Subject: [PATCH 459/974] update code

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

diff --git a/htdocs/commande/document.php b/htdocs/commande/document.php
index af04389b8d9..501a803b697 100644
--- a/htdocs/commande/document.php
+++ b/htdocs/commande/document.php
@@ -32,7 +32,7 @@ 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.'/commande/class/commande.class.php';
-if (!empty($conf->project->enabled)) {
+if (isModEnabled('project')) {
 	require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 }
 
@@ -130,7 +130,7 @@ if ($id > 0 || !empty($ref)) {
 		// Thirdparty
 		$morehtmlref .= '<br>'.$langs->trans('ThirdParty').' : '.$object->thirdparty->getNomUrl(1);
 		// Project
-		if (!empty($conf->project->enabled)) {
+		if (isModEnabled('project')) {
 			$langs->load("projects");
 			$morehtmlref .= '<br>'.$langs->trans('Project').' ';
 			if ($user->rights->commande->creer) {

From 6cf7a80ce3e887d05495af51f6a4006f16508e35 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20France?= <frederic.france@free.fr>
Date: Wed, 31 Aug 2022 21:57:05 +0200
Subject: [PATCH 460/974] fix php8 warnings

---
 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 1db1afd124c..3503421d7fe 100644
--- a/htdocs/admin/dict.php
+++ b/htdocs/admin/dict.php
@@ -11,7 +11,7 @@
  * Copyright (C) 2011-2022	Alexandre Spangaro		<aspangaro@open-dsi.fr>
  * Copyright (C) 2015		Ferran Marcet			<fmarcet@2byte.es>
  * Copyright (C) 2016		Raphaël Doursenaud		<rdoursenaud@gpcsolutions.fr>
- * Copyright (C) 2019-2020  Frédéric France         <frederic.france@netlogic.fr>
+ * Copyright (C) 2019-2022  Frédéric France         <frederic.france@netlogic.fr>
  * Copyright (C) 2020-2022  Open-Dsi                <support@open-dsi.fr>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -496,7 +496,7 @@ $tabcond[10] = true;
 $tabcond[11] = (isModEnabled("societe"));
 $tabcond[12] = (isModEnabled('commande') || isModEnabled("propal") || isModEnabled('facture') || (isModEnabled("fournisseur") && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD)) || isModEnabled("supplier_invoice") || isModEnabled("supplier_order"));
 $tabcond[13] = (isModEnabled('commande') || isModEnabled("propal") || isModEnabled('facture') || (isModEnabled("fournisseur") && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD)) || isModEnabled("supplier_invoice") || isModEnabled("supplier_order"));
-$tabcond[14] = (isModEnabled("product") && (!empty($conf->ecotax->enabled) || !empty($conf->global->MAIN_SHOW_ECOTAX_DICTIONNARY)));
+$tabcond[14] = (isModEnabled("product") && (isModEnabled('ecotax') || !empty($conf->global->MAIN_SHOW_ECOTAX_DICTIONNARY)));
 $tabcond[15] = true;
 $tabcond[16] = (isModEnabled("societe") && empty($conf->global->SOCIETE_DISABLE_PROSPECTS));
 $tabcond[17] = (isModEnabled('deplacement') || isModEnabled('expensereport'));

From 1b7934062fb21c8f2bb1713c9843b2f2c65b154b Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Wed, 31 Aug 2022 21:57:27 +0200
Subject: [PATCH 461/974] update code

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

diff --git a/htdocs/commande/info.php b/htdocs/commande/info.php
index 93b80b80f1c..396052082c5 100644
--- a/htdocs/commande/info.php
+++ b/htdocs/commande/info.php
@@ -27,7 +27,7 @@ require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/order.lib.php';
-if (!empty($conf->project->enabled)) {
+if (isModEnabled('project')) {
 	require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 }
 
@@ -83,7 +83,7 @@ $morehtmlref .= $form->editfieldval("RefCustomer", 'ref_client', $object->ref_cl
 // Thirdparty
 $morehtmlref .= '<br>'.$langs->trans('ThirdParty').' : '.$object->thirdparty->getNomUrl(1);
 // Project
-if (!empty($conf->project->enabled)) {
+if (isModEnabled('project')) {
 	$langs->load("projects");
 	$morehtmlref .= '<br>'.$langs->trans('Project').' ';
 	if ($user->rights->commande->creer) {

From b04125f9f950b7a44dbdaef362015aaf8a9a1160 Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Wed, 31 Aug 2022 21:58:38 +0200
Subject: [PATCH 462/974] update code

---
 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 4ba2f410cc9..03569128fe3 100644
--- a/htdocs/commande/list.php
+++ b/htdocs/commande/list.php
@@ -170,8 +170,8 @@ $checkedtypetiers = 0;
 $arrayfields = array(
 	'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),
+	'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),
 	's.name_alias'=>array('label'=>"AliasNameShort", 'checked'=>-1, 'position'=>31),
 	's.town'=>array('label'=>"Town", 'checked'=>-1, 'position'=>35),

From 52fed85676d5a9d945e2274ad95adb84bda7026d Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Wed, 31 Aug 2022 21:59:06 +0200
Subject: [PATCH 463/974] update code

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

diff --git a/htdocs/commande/note.php b/htdocs/commande/note.php
index 934299377e5..2082e356797 100644
--- a/htdocs/commande/note.php
+++ b/htdocs/commande/note.php
@@ -28,7 +28,7 @@
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/order.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
-if (!empty($conf->project->enabled)) {
+if (isModEnabled('project')) {
 	require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 }
 
@@ -102,7 +102,7 @@ if ($id > 0 || !empty($ref)) {
 	// Thirdparty
 	$morehtmlref .= '<br>'.$langs->trans('ThirdParty').' : '.$object->thirdparty->getNomUrl(1);
 	// Project
-	if (!empty($conf->project->enabled)) {
+	if (isModEnabled('project')) {
 		$langs->load("projects");
 		$morehtmlref .= '<br>'.$langs->trans('Project').' ';
 		if ($user->rights->commande->creer) {

From b5b9871c115461f293efec193e0aa5526aafa81c Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Wed, 31 Aug 2022 22:00:12 +0200
Subject: [PATCH 464/974] update code

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

diff --git a/htdocs/compta/accounting-files.php b/htdocs/compta/accounting-files.php
index 688b0fd544b..4e7ab4802b7 100644
--- a/htdocs/compta/accounting-files.php
+++ b/htdocs/compta/accounting-files.php
@@ -48,7 +48,7 @@ require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/paymentvarious.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
 require_once DOL_DOCUMENT_ROOT.'/loan/class/paymentloan.class.php';
 
-if (!empty($conf->project->enabled)) {
+if (isModEnabled('project')) {
 	require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 	require_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php';
 }

From fd707eede1dc26203dd3b86b07930a3a32ca604a Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Wed, 31 Aug 2022 22:01:21 +0200
Subject: [PATCH 465/974] update code

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

diff --git a/htdocs/compta/bank/various_payment/list.php b/htdocs/compta/bank/various_payment/list.php
index 6644a81f62a..fe9bb032fa8 100644
--- a/htdocs/compta/bank/various_payment/list.php
+++ b/htdocs/compta/bank/various_payment/list.php
@@ -151,7 +151,7 @@ $arrayfields = array(
 	'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"=>!empty($conf->project->enabled)),
+	'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")),
 	'account'		=>array('label'=>"AccountAccountingShort", 'checked'=>1, 'position'=>400, "enabled"=>isModEnabled('accounting')),

From e71692e7456bb82bf131c68b552ac81b5ef9f08d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20France?= <frederic.france@free.fr>
Date: Wed, 31 Aug 2022 22:02:31 +0200
Subject: [PATCH 466/974] fix php8 warnings

---
 htdocs/admin/fckeditor.php                         |  2 +-
 htdocs/admin/mails_templates.php                   |  4 ++--
 htdocs/admin/workflow.php                          |  2 +-
 htdocs/comm/action/card.php                        |  6 +++---
 htdocs/comm/card.php                               |  8 ++++----
 htdocs/comm/index.php                              |  6 +++---
 htdocs/comm/mailing/advtargetemailing.php          |  2 +-
 htdocs/comm/mailing/card.php                       |  2 +-
 htdocs/comm/propal/card.php                        |  2 +-
 htdocs/comm/propal/list.php                        |  4 ++--
 htdocs/commande/card.php                           |  2 +-
 htdocs/commande/list.php                           |  4 ++--
 htdocs/compta/facture/card.php                     |  2 +-
 .../stats/supplier_turnover_by_thirdparty.php      |  2 +-
 .../canvas/actions_contactcard_common.class.php    |  2 +-
 htdocs/contact/card.php                            | 10 +++++-----
 htdocs/contact/consumption.php                     |  2 +-
 htdocs/contact/list.php                            |  2 +-
 htdocs/contrat/index.php                           |  2 +-
 htdocs/contrat/list.php                            |  2 +-
 htdocs/core/class/commonobject.class.php           |  2 +-
 htdocs/core/class/doleditor.class.php              |  2 +-
 htdocs/core/class/extrafields.class.php            |  2 +-
 htdocs/core/class/html.form.class.php              |  4 ++--
 htdocs/core/class/html.formmail.class.php          |  4 ++--
 htdocs/core/lib/company.lib.php                    |  2 +-
 htdocs/core/lib/functions.lib.php                  |  2 +-
 htdocs/core/lib/pdf.lib.php                        |  2 +-
 htdocs/core/lib/product.lib.php                    |  4 ++--
 htdocs/core/lib/project.lib.php                    |  6 +++---
 .../doc/doc_generic_project_odt.modules.php        |  2 +-
 .../task/doc/doc_generic_task_odt.modules.php      |  2 +-
 htdocs/core/tpl/advtarget.tpl.php                  |  6 +++---
 htdocs/core/tpl/notes.tpl.php                      |  6 +++---
 htdocs/core/tpl/onlinepaymentlinks.tpl.php         |  2 +-
 ...erface_20_modWorkflow_WorkflowManager.class.php |  2 +-
 htdocs/ecm/index_auto.php                          |  4 ++--
 htdocs/ecm/search.php                              |  4 ++--
 htdocs/expedition/list.php                         |  4 ++--
 htdocs/fichinter/card-rec.php                      | 14 +++++++-------
 htdocs/fichinter/card.php                          |  4 ++--
 htdocs/fichinter/list.php                          | 10 +++++-----
 htdocs/fourn/card.php                              |  8 ++++----
 htdocs/fourn/commande/card.php                     |  2 +-
 htdocs/fourn/commande/list.php                     |  2 +-
 htdocs/fourn/facture/list.php                      |  4 ++--
 .../knowledgemanagement/knowledgerecord_card.php   |  4 ++--
 .../knowledgemanagement/knowledgerecord_list.php   |  4 ++--
 htdocs/main.inc.php                                |  4 ++--
 htdocs/product/card.php                            |  2 +-
 htdocs/product/composition/card.php                |  6 +++---
 htdocs/product/index.php                           |  2 +-
 htdocs/product/inventory/list.php                  |  4 ++--
 htdocs/product/list.php                            |  4 ++--
 htdocs/product/reassort.php                        |  2 +-
 htdocs/product/reassortlot.php                     |  2 +-
 htdocs/product/stock/card.php                      |  2 +-
 htdocs/product/stock/list.php                      | 10 +++++-----
 htdocs/projet/card.php                             |  6 +++---
 htdocs/projet/element.php                          |  6 +++---
 htdocs/projet/list.php                             | 10 +++++-----
 htdocs/projet/tasks.php                            |  2 +-
 htdocs/projet/tasks/list.php                       |  2 +-
 htdocs/projet/tasks/time.php                       |  2 +-
 htdocs/societe/card.php                            | 12 ++++++------
 htdocs/societe/consumption.php                     |  2 +-
 htdocs/societe/contact.php                         |  2 +-
 htdocs/societe/index.php                           |  2 +-
 htdocs/societe/list.php                            |  4 ++--
 htdocs/societe/paymentmodes.php                    |  2 +-
 htdocs/supplier_proposal/index.php                 |  4 ++--
 htdocs/supplier_proposal/list.php                  |  2 +-
 htdocs/user/card.php                               |  8 ++++----
 htdocs/user/list.php                               |  4 ++--
 htdocs/user/param_ihm.php                          |  2 +-
 htdocs/webservices/admin/index.php                 |  2 +-
 htdocs/website/index.php                           |  8 ++++----
 77 files changed, 151 insertions(+), 151 deletions(-)

diff --git a/htdocs/admin/fckeditor.php b/htdocs/admin/fckeditor.php
index 3c15fc9f48f..3c3cd731a7d 100644
--- a/htdocs/admin/fckeditor.php
+++ b/htdocs/admin/fckeditor.php
@@ -63,7 +63,7 @@ $conditions = array(
 	'NOTE_PRIVATE' => 1,
 	'SOCIETE' => 1,
 	'PRODUCTDESC' => (isModEnabled("product") || isModEnabled("service")),
-	'DETAILS' => (isModEnabled('facture') || isModEnabled("propal") || isModEnabled('commande') || !empty($conf->supplier_proposal->enabled) || (isModEnabled("fournisseur") && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD)) || isModEnabled("supplier_order") || isModEnabled("supplier_invoice")),
+	'DETAILS' => (isModEnabled('facture') || isModEnabled("propal") || isModEnabled('commande') || isModEnabled('supplier_proposal') || (isModEnabled("fournisseur") && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD)) || isModEnabled("supplier_order") || isModEnabled("supplier_invoice")),
 	'USERSIGN' => 1,
 	'MAILING' => !empty($conf->mailing->enabled),
 	'MAIL' => (isModEnabled('facture') || isModEnabled("propal") || isModEnabled('commande')),
diff --git a/htdocs/admin/mails_templates.php b/htdocs/admin/mails_templates.php
index a60f3f407d1..f53e8c6b0d0 100644
--- a/htdocs/admin/mails_templates.php
+++ b/htdocs/admin/mails_templates.php
@@ -209,7 +209,7 @@ if (isModEnabled("reception")) {
 if (!empty($conf->ficheinter->enabled)) {
 	$elementList['fichinter_send'] = img_picto('', 'intervention', 'class="pictofixedwidth"').dol_escape_htmltag($langs->trans('MailToSendIntervention'));
 }
-if (!empty($conf->supplier_proposal->enabled)) {
+if (isModEnabled('supplier_proposal')) {
 	$elementList['supplier_proposal_send'] = img_picto('', 'propal', 'class="pictofixedwidth"').dol_escape_htmltag($langs->trans('MailToSendSupplierRequestForQuotation'));
 }
 if ((isModEnabled("fournisseur") && !empty($user->rights->fournisseur->commande->lire) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD)) || (isModEnabled("supplier_order") && !empty($user->rights->supplier_order->lire))) {
@@ -218,7 +218,7 @@ if ((isModEnabled("fournisseur") && !empty($user->rights->fournisseur->commande-
 if ((isModEnabled("fournisseur") && !empty($user->rights->fournisseur->facture->lire) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD)) || (isModEnabled("supplier_invoice") && !empty($user->rights->supplier_invoice->lire))) {
 	$elementList['invoice_supplier_send'] = img_picto('', 'bill', 'class="pictofixedwidth"').dol_escape_htmltag($langs->trans('MailToSendSupplierInvoice'));
 }
-if (!empty($conf->contrat->enabled) && !empty($user->rights->contrat->lire)) {
+if (isModEnabled('contrat') && !empty($user->rights->contrat->lire)) {
 	$elementList['contract'] = img_picto('', 'contract', 'class="pictofixedwidth"').dol_escape_htmltag($langs->trans('MailToSendContract'));
 }
 if (!empty($conf->ticket->enabled) && !empty($user->rights->ticket->read)) {
diff --git a/htdocs/admin/workflow.php b/htdocs/admin/workflow.php
index c4a8790896e..e29a351a705 100644
--- a/htdocs/admin/workflow.php
+++ b/htdocs/admin/workflow.php
@@ -123,7 +123,7 @@ $workflowcodes = array(
 	'WORKFLOW_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL'=>array(
 		'family'=>'classify_supplier_proposal',
 		'position'=>60,
-		'enabled'=>(!empty($conf->supplier_proposal->enabled) && ((isModEnabled("fournisseur") && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD)) || isModEnabled("supplier_order") || isModEnabled("supplier_invoice"))),
+		'enabled'=>(isModEnabled('supplier_proposal') && ((isModEnabled("fournisseur") && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD)) || isModEnabled("supplier_order") || isModEnabled("supplier_invoice"))),
 		'picto'=>'supplier_proposal',
 		'warning'=>''
 	),
diff --git a/htdocs/comm/action/card.php b/htdocs/comm/action/card.php
index 6f6ddc5383e..0d7953db900 100644
--- a/htdocs/comm/action/card.php
+++ b/htdocs/comm/action/card.php
@@ -1362,7 +1362,7 @@ if ($action == 'create') {
 	$formactions->form_select_status_action('formaction', $percent, 1, 'complete', 0, 0, 'maxwidth200');
 	print '</td></tr>';
 
-	if (!empty($conf->categorie->enabled)) {
+	if (isModEnabled('categorie')) {
 		// Categories
 		print '<tr><td>'.$langs->trans("Categories").'</td><td>';
 		$cate_arbo = $form->select_all_categories(Categorie::TYPE_ACTIONCOMM, '', 'parent', 64, 0, 1);
@@ -1870,7 +1870,7 @@ if ($id > 0) {
 		print '</td></tr>';
 
 		// Tags-Categories
-		if (!empty($conf->categorie->enabled)) {
+		if (isModEnabled('categorie')) {
 			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);
@@ -2285,7 +2285,7 @@ if ($id > 0) {
 		}
 
 		// Categories
-		if (!empty($conf->categorie->enabled)) {
+		if (isModEnabled('categorie')) {
 			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/card.php b/htdocs/comm/card.php
index 267b84285ee..27391a4cd3d 100644
--- a/htdocs/comm/card.php
+++ b/htdocs/comm/card.php
@@ -53,7 +53,7 @@ if (isModEnabled('commande')) {
 if (isModEnabled("expedition")) {
 	require_once DOL_DOCUMENT_ROOT.'/expedition/class/expedition.class.php';
 }
-if (!empty($conf->contrat->enabled)) {
+if (isModEnabled('contrat')) {
 	require_once DOL_DOCUMENT_ROOT.'/contrat/class/contrat.class.php';
 }
 if (isModEnabled('adherent')) {
@@ -66,7 +66,7 @@ if (!empty($conf->ficheinter->enabled)) {
 // Load translation files required by the page
 $langs->loadLangs(array('companies', 'banks'));
 
-if (!empty($conf->contrat->enabled)) {
+if (isModEnabled('contrat')) {
 	$langs->load("contracts");
 }
 if (isModEnabled('commande')) {
@@ -605,7 +605,7 @@ if ($object->id > 0) {
 	}
 
 	// Categories
-	if (!empty($conf->categorie->enabled) && !empty($user->rights->categorie->lire)) {
+	if (isModEnabled('categorie') && !empty($user->rights->categorie->lire)) {
 		$langs->load("categories");
 		print '<tr><td>'.$langs->trans("CustomersCategoriesShort").'</td>';
 		print '<td>';
@@ -1122,7 +1122,7 @@ if ($object->id > 0) {
 	/*
 	 * Latest contracts
 	 */
-	if (!empty($conf->contrat->enabled) && $user->rights->contrat->lire) {
+	if (isModEnabled('contrat') && $user->rights->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";
diff --git a/htdocs/comm/index.php b/htdocs/comm/index.php
index 419f85cb28f..c2852cd45c9 100644
--- a/htdocs/comm/index.php
+++ b/htdocs/comm/index.php
@@ -93,7 +93,7 @@ $companystatic = new Societe($db);
 if (isModEnabled("propal")) {
 	$propalstatic = new Propal($db);
 }
-if (!empty($conf->supplier_proposal->enabled)) {
+if (isModEnabled('supplier_proposal')) {
 	$supplierproposalstatic = new SupplierProposal($db);
 }
 if (isModEnabled('commande')) {
@@ -226,7 +226,7 @@ if (isModEnabled("propal") && $user->rights->propal->lire) {
  * Draft supplier proposals
  */
 
-if (!empty($conf->supplier_proposal->enabled) && $user->rights->supplier_proposal->lire) {
+if (isModEnabled('supplier_proposal') && $user->rights->supplier_proposal->lire) {
 	$sql = "SELECT p.rowid, p.ref, p.total_ht, p.total_tva, p.total_ttc, p.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";
@@ -810,7 +810,7 @@ if (((isModEnabled("fournisseur") && empty($conf->global->MAIN_USE_NEW_SUPPLIERM
 /*
  * Latest contracts
  */
-if (!empty($conf->contrat->enabled) && $user->rights->contrat->lire && 0) { // TODO A REFAIRE DEPUIS NOUVEAU CONTRAT
+if (isModEnabled('contrat') && $user->rights->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";
diff --git a/htdocs/comm/mailing/advtargetemailing.php b/htdocs/comm/mailing/advtargetemailing.php
index bd052f4161e..8f0a2b38c7d 100644
--- a/htdocs/comm/mailing/advtargetemailing.php
+++ b/htdocs/comm/mailing/advtargetemailing.php
@@ -38,7 +38,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 (!empty($conf->categorie->enabled)) {
+if (isModEnabled('categorie')) {
 	$langs->load("categories");
 }
 
diff --git a/htdocs/comm/mailing/card.php b/htdocs/comm/mailing/card.php
index eb1b50cee1b..ed1fa3f523e 100644
--- a/htdocs/comm/mailing/card.php
+++ b/htdocs/comm/mailing/card.php
@@ -980,7 +980,7 @@ if ($action == 'create') {
 				}
 
 				if (($object->statut == 0 || $object->statut == 1 || $object->statut == 2) && $user->rights->mailing->creer) {
-					if (!empty($conf->fckeditor->enabled) && !empty($conf->global->FCKEDITOR_ENABLE_MAILING)) {
+					if (isModEnabled('fckeditor') && !empty($conf->global->FCKEDITOR_ENABLE_MAILING)) {
 						print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?action=edit&token='.newToken().'&id='.$object->id.'">'.$langs->trans("EditWithEditor").'</a>';
 					} else {
 						print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?action=edit&token='.newToken().'&id='.$object->id.'">'.$langs->trans("EditWithTextEditor").'</a>';
diff --git a/htdocs/comm/propal/card.php b/htdocs/comm/propal/card.php
index a0b181230fa..f0e1e57249e 100644
--- a/htdocs/comm/propal/card.php
+++ b/htdocs/comm/propal/card.php
@@ -2850,7 +2850,7 @@ if ($action == 'create') {
 				}
 
 				// Create contract
-				if (!empty($conf->contrat->enabled) && $object->statut == Propal::STATUS_SIGNED) {
+				if (isModEnabled('contrat') && $object->statut == Propal::STATUS_SIGNED) {
 					$langs->load("contracts");
 
 					if ($usercancreatecontract) {
diff --git a/htdocs/comm/propal/list.php b/htdocs/comm/propal/list.php
index 6b717d3ea6f..31c4489d47f 100644
--- a/htdocs/comm/propal/list.php
+++ b/htdocs/comm/propal/list.php
@@ -1057,7 +1057,7 @@ if ($resql) {
 		$moreforfilter .= '</div>';
 	}
 	// If the user can view products
-	if (!empty($conf->categorie->enabled) && $user->rights->categorie->lire && ($user->rights->produit->lire || $user->rights->service->lire)) {
+	if (isModEnabled('categorie') && $user->rights->categorie->lire && ($user->rights->produit->lire || $user->rights->service->lire)) {
 		include_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 		$moreforfilter .= '<div class="divsearchfield">';
 		$tmptitle = $langs->trans('IncludingProductWithTag');
@@ -1065,7 +1065,7 @@ if ($resql) {
 		$moreforfilter .= img_picto($tmptitle, 'category', 'class="pictofixedwidth"').$form->selectarray('search_product_category', $cate_arbo, $search_product_category, $tmptitle, 0, 0, '', 0, 0, 0, 0, (empty($conf->dol_optimize_smallscreen) ? 'maxwidth300 widthcentpercentminusx' : 'maxwidth250 widthcentpercentminusx'), 1);
 		$moreforfilter .= '</div>';
 	}
-	if (!empty($conf->categorie->enabled) && $user->rights->categorie->lire) {
+	if (isModEnabled('categorie') && $user->rights->categorie->lire) {
 		require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 		$moreforfilter .= '<div class="divsearchfield">';
 		$tmptitle = $langs->trans('CustomersProspectsCategoriesShort');
diff --git a/htdocs/commande/card.php b/htdocs/commande/card.php
index c5b00c3c41e..507a24fd758 100644
--- a/htdocs/commande/card.php
+++ b/htdocs/commande/card.php
@@ -2836,7 +2836,7 @@ if ($action == 'create' && $usercancreate) {
 				}
 
 				// Create contract
-				if (!empty($conf->contrat->enabled) && ($object->statut == Commande::STATUS_VALIDATED || $object->statut == Commande::STATUS_SHIPMENTONPROCESS || $object->statut == Commande::STATUS_CLOSED)) {
+				if (isModEnabled('contrat') && ($object->statut == Commande::STATUS_VALIDATED || $object->statut == Commande::STATUS_SHIPMENTONPROCESS || $object->statut == Commande::STATUS_CLOSED)) {
 					$langs->load("contracts");
 
 					if ($user->hasRight('contrat', 'creer')) {
diff --git a/htdocs/commande/list.php b/htdocs/commande/list.php
index 84dafaba2e8..7acd7c78261 100644
--- a/htdocs/commande/list.php
+++ b/htdocs/commande/list.php
@@ -1343,7 +1343,7 @@ if ($resql) {
 		$moreforfilter .= '</div>';
 	}
 	// If the user can view prospects other than his'
-	if (!empty($conf->categorie->enabled) && $user->rights->categorie->lire && ($user->rights->produit->lire || $user->rights->service->lire)) {
+	if (isModEnabled('categorie') && $user->rights->categorie->lire && ($user->rights->produit->lire || $user->rights->service->lire)) {
 		include_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 		$moreforfilter .= '<div class="divsearchfield">';
 		$tmptitle = $langs->trans('IncludingProductWithTag');
@@ -1351,7 +1351,7 @@ if ($resql) {
 		$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 (!empty($conf->categorie->enabled) && $user->rights->categorie->lire) {
+	if (isModEnabled('categorie') && $user->rights->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/card.php b/htdocs/compta/facture/card.php
index f9c6f4edd3e..04c6df7ff1e 100644
--- a/htdocs/compta/facture/card.php
+++ b/htdocs/compta/facture/card.php
@@ -5511,7 +5511,7 @@ if ($action == 'create') {
 
 			// Create contract
 			if (!empty($conf->global->CONTRACT_CREATE_FROM_INVOICE)) {
-				if (!empty($conf->contrat->enabled) && $object->statut == Facture::STATUS_VALIDATED) {
+				if (isModEnabled('contrat') && $object->statut == Facture::STATUS_VALIDATED) {
 					$langs->load("contracts");
 
 					if ($usercancreatecontract) {
diff --git a/htdocs/compta/stats/supplier_turnover_by_thirdparty.php b/htdocs/compta/stats/supplier_turnover_by_thirdparty.php
index 2a405ba870f..28e932dcb4a 100644
--- a/htdocs/compta/stats/supplier_turnover_by_thirdparty.php
+++ b/htdocs/compta/stats/supplier_turnover_by_thirdparty.php
@@ -587,7 +587,7 @@ if (count($amount)) {
 
 		// Other stats
 		print '<td class="center">';
-		if (!empty($conf->supplier_proposal->enabled) && $key > 0) {
+		if (isModEnabled('supplier_proposal') && $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("fournisseur") && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD)) || isModEnabled("supplier_order")) && $key > 0) {
diff --git a/htdocs/contact/canvas/actions_contactcard_common.class.php b/htdocs/contact/canvas/actions_contactcard_common.class.php
index a0834139bd2..c4bfc127262 100644
--- a/htdocs/contact/canvas/actions_contactcard_common.class.php
+++ b/htdocs/contact/canvas/actions_contactcard_common.class.php
@@ -201,7 +201,7 @@ abstract class ActionsContactCardCommon
 				$this->tpl['contact_element'][$i]['linked_element_value'] = $this->object->ref_propal ? $this->object->ref_propal : $langs->trans("NoContactForAnyProposal");
 				$i++;
 			}
-			if (!empty($conf->contrat->enabled)) {
+			if (isModEnabled('contrat')) {
 				$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++;
diff --git a/htdocs/contact/card.php b/htdocs/contact/card.php
index d3b050e5e0b..3028a3719f1 100644
--- a/htdocs/contact/card.php
+++ b/htdocs/contact/card.php
@@ -892,7 +892,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 			}
 
 			// Categories
-			if (!empty($conf->categorie->enabled) && !empty($user->rights->categorie->lire)) {
+			if (isModEnabled('categorie') && !empty($user->rights->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').$form->multiselectarray('contcats', $cate_arbo, GETPOST('contcats', 'array'), null, null, null, null, '90%');
@@ -1197,7 +1197,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 			print '</td></tr>';
 
 			// Categories
-			if (!empty($conf->categorie->enabled) && !empty($user->rights->categorie->lire)) {
+			if (isModEnabled('categorie') && !empty($user->rights->categorie->lire)) {
 				$arrayselected = array();
 				print '<tr><td>'.$form->editfieldkey('Categories', 'contcats', '', $object, 0).'</td>';
 				print '<td colspan="3">';
@@ -1237,7 +1237,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 				print '</td></tr>';
 			}
 
-			if (!empty($conf->contrat->enabled)) {
+			if (isModEnabled('contrat')) {
 				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>';
@@ -1471,7 +1471,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 		print '<table class="border tableforfield centpercent">';
 
 		// Categories
-		if (!empty($conf->categorie->enabled) && !empty($user->rights->categorie->lire)) {
+		if (isModEnabled('categorie') && !empty($user->rights->categorie->lire)) {
 			print '<tr><td class="titlefield">'.$langs->trans("Categories").'</td>';
 			print '<td colspan="3">';
 			print $form->showCategories($object->id, Categorie::TYPE_CONTACT, 1);
@@ -1514,7 +1514,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 			print '</td></tr>';
 		}
 
-		if (!empty($conf->contrat->enabled)) {
+		if (isModEnabled('contrat')) {
 			print '<tr><td>'.$langs->trans("ContactForContracts").'</td><td colspan="3">';
 			print $object->ref_contrat ? $object->ref_contrat : $langs->trans("NoContactForAnyContract");
 			print '</td></tr>';
diff --git a/htdocs/contact/consumption.php b/htdocs/contact/consumption.php
index 569a155cc99..e4cc743159e 100644
--- a/htdocs/contact/consumption.php
+++ b/htdocs/contact/consumption.php
@@ -165,7 +165,7 @@ if ($object->thirdparty->client) {
 	if (isModEnabled('facture') && $user->rights->facture->lire) {
 		$elementTypeArray['invoice'] = $langs->transnoentitiesnoconv('Invoices');
 	}
-	if (!empty($conf->contrat->enabled) && $user->rights->contrat->lire) {
+	if (isModEnabled('contrat') && $user->rights->contrat->lire) {
 		$elementTypeArray['contract'] = $langs->transnoentitiesnoconv('Contracts');
 	}
 }
diff --git a/htdocs/contact/list.php b/htdocs/contact/list.php
index 6d66f70ceeb..ec56b4f7c2a 100644
--- a/htdocs/contact/list.php
+++ b/htdocs/contact/list.php
@@ -734,7 +734,7 @@ if ($search_firstlast_only) {
 }
 
 $moreforfilter = '';
-if (!empty($conf->categorie->enabled) && $user->rights->categorie->lire) {
+if (isModEnabled('categorie') && $user->rights->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/index.php b/htdocs/contrat/index.php
index 62b60d9a091..d537934a299 100644
--- a/htdocs/contrat/index.php
+++ b/htdocs/contrat/index.php
@@ -239,7 +239,7 @@ print "</table></div><br>";
 
 // Draft contracts
 
-if (!empty($conf->contrat->enabled) && $user->rights->contrat->lire) {
+if (isModEnabled('contrat') && $user->rights->contrat->lire) {
 	$sql = "SELECT c.rowid, c.ref,";
 	$sql .= " s.nom as name, s.rowid as socid";
 	$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 5ceec0a4cb9..0630f664b8d 100644
--- a/htdocs/contrat/list.php
+++ b/htdocs/contrat/list.php
@@ -571,7 +571,7 @@ if ($user->rights->user->user->lire) {
 	$moreforfilter .= '</div>';
 }
 // If the user can view categories of products
-if (!empty($conf->categorie->enabled) && $user->rights->categorie->lire && ($user->rights->produit->lire || $user->rights->service->lire)) {
+if (isModEnabled('categorie') && $user->rights->categorie->lire && ($user->rights->produit->lire || $user->rights->service->lire)) {
 	include_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 	$moreforfilter .= '<div class="divsearchfield">';
 	$tmptitle = $langs->trans('IncludingProductWithTag');
diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index 2c438fdd98c..a16881cd61e 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -6902,7 +6902,7 @@ abstract class CommonObject
 		} elseif (preg_match('/^html/', $type)) {
 			if (!preg_match('/search_/', $keyprefix)) {		// If keyprefix is search_ or search_options_, we must just use a simple text field
 				require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
-				$doleditor = new DolEditor($keyprefix.$key.$keysuffix, $value, '', 200, 'dolibarr_notes', 'In', false, false, !empty($conf->fckeditor->enabled) && $conf->global->FCKEDITOR_ENABLE_SOCIETE, ROWS_5, '90%');
+				$doleditor = new DolEditor($keyprefix.$key.$keysuffix, $value, '', 200, 'dolibarr_notes', 'In', false, false, isModEnabled('fckeditor') && $conf->global->FCKEDITOR_ENABLE_SOCIETE, ROWS_5, '90%');
 				$out = $doleditor->Create(1, '', true, '', '', $moreparam, $morecss);
 			} else {
 				$out = '<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" value="'.dol_escape_htmltag($value).'" '.($moreparam ? $moreparam : '').'>';
diff --git a/htdocs/core/class/doleditor.class.php b/htdocs/core/class/doleditor.class.php
index 2be0c36c56c..b529d23ebda 100644
--- a/htdocs/core/class/doleditor.class.php
+++ b/htdocs/core/class/doleditor.class.php
@@ -152,7 +152,7 @@ class DolEditor
 			$out .= htmlspecialchars($this->content);
 			$out .= '</textarea>';
 
-			if ($this->tool == 'ckeditor' && !empty($conf->use_javascript_ajax) && !empty($conf->fckeditor->enabled)) {
+			if ($this->tool == 'ckeditor' && !empty($conf->use_javascript_ajax) && isModEnabled('fckeditor')) {
 				if (!defined('REQUIRE_CKEDITOR')) {
 					define('REQUIRE_CKEDITOR', '1');
 				}
diff --git a/htdocs/core/class/extrafields.class.php b/htdocs/core/class/extrafields.class.php
index bbc5e8604ce..cea529726e5 100644
--- a/htdocs/core/class/extrafields.class.php
+++ b/htdocs/core/class/extrafields.class.php
@@ -1098,7 +1098,7 @@ class ExtraFields
 		} elseif ($type == 'html') {
 			if (!preg_match('/search_/', $keyprefix)) {		// If keyprefix is search_ or search_options_, we must just use a simple text field
 				require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
-				$doleditor = new DolEditor($keyprefix.$key.$keysuffix, $value, '', 200, 'dolibarr_notes', 'In', false, false, !empty($conf->fckeditor->enabled) && $conf->global->FCKEDITOR_ENABLE_SOCIETE, ROWS_5, '90%');
+				$doleditor = new DolEditor($keyprefix.$key.$keysuffix, $value, '', 200, 'dolibarr_notes', 'In', false, false, isModEnabled('fckeditor') && $conf->global->FCKEDITOR_ENABLE_SOCIETE, ROWS_5, '90%');
 				$out = $doleditor->Create(1);
 			} else {
 				$out = '<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" value="'.dol_escape_htmltag($value).'" '.($moreparam ? $moreparam : '').'>';
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index c2f17314c81..1ecd05cc3a5 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -529,7 +529,7 @@ class Form
 					$savemethod = $tmp[4];
 				}
 
-				if (!empty($conf->fckeditor->enabled)) {
+				if (isModEnabled('fckeditor')) {
 					$out .= '<input id="ckeditor_toolbar" value="'.$toolbar.'" type="hidden"/>'."\n";
 				} else {
 					$inputType = 'textarea';
@@ -8721,7 +8721,7 @@ class Form
 					'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').')'),
 				'supplier_proposal'=>array(
-					'enabled'=>(!empty($conf->supplier_proposal->enabled) ? $conf->supplier_proposal->enabled : 0),
+					'enabled'=>(isModEnabled('supplier_proposal') ? $conf->supplier_proposal->enabled : 0),
 					'perms'=>1,
 					'label'=>'LinkToSupplierProposal',
 					'sql'=>"SELECT s.rowid as socid, s.nom as name, s.client, t.rowid, t.ref, '' as ref_supplier, t.total_ht FROM ".$this->db->prefix()."societe as s, ".$this->db->prefix()."supplier_proposal as t WHERE t.fk_soc = s.rowid AND t.fk_soc IN (".$this->db->sanitize($listofidcompanytoscan).') AND t.entity IN ('.getEntity('supplier_proposal').')'),
diff --git a/htdocs/core/class/html.formmail.class.php b/htdocs/core/class/html.formmail.class.php
index 0c5aa54b5ca..80e69a39532 100644
--- a/htdocs/core/class/html.formmail.class.php
+++ b/htdocs/core/class/html.formmail.class.php
@@ -1642,7 +1642,7 @@ class FormMail extends Form
 					if (isModEnabled('commande')) {
 						$tmparray['__SECUREKEYPAYMENT_ORDER__'] = 'SecureKeyPAYMENTUniquePerOrder';
 					}
-					if (!empty($conf->contrat->enabled)) {
+					if (isModEnabled('contrat')) {
 						$tmparray['__SECUREKEYPAYMENT_CONTRACTLINE__'] = 'SecureKeyPAYMENTUniquePerContractLine';
 					}
 
@@ -1659,7 +1659,7 @@ class FormMail extends Form
 					if (isModEnabled('commande')) {
 						$tmparray['__ONLINEPAYMENTLINK_ORDER__'] = 'OnlinePaymentLinkUniquePerOrder';
 					}
-					if (!empty($conf->contrat->enabled)) {
+					if (isModEnabled('contrat')) {
 						$tmparray['__ONLINEPAYMENTLINK_CONTRACTLINE__'] = 'OnlinePaymentLinkUniquePerContractLine';
 					}
 				}
diff --git a/htdocs/core/lib/company.lib.php b/htdocs/core/lib/company.lib.php
index 6ba3ca18094..9b1c46d7c53 100644
--- a/htdocs/core/lib/company.lib.php
+++ b/htdocs/core/lib/company.lib.php
@@ -128,7 +128,7 @@ function societe_prepare_head(Societe $object)
 		}
 	}
 	$supplier_module_enabled = 0;
-	if ((isModEnabled('fournisseur') && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD)) || !empty($conf->supplier_proposal->enabled) || isModEnabled("supplier_order") || isModEnabled("supplier_invoice")) {
+	if ((isModEnabled('fournisseur') && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD)) || isModEnabled('supplier_proposal') || isModEnabled("supplier_order") || isModEnabled("supplier_invoice")) {
 		$supplier_module_enabled = 1;
 	}
 	if ($supplier_module_enabled == 1 && $object->fournisseur && !empty($user->rights->fournisseur->lire)) {
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index a0e57c173c8..dcecd69769b 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -7405,7 +7405,7 @@ function getCommonSubstitutionArray($outputlangs, $onlykey = 0, $exclude = null,
 				/*$substitutionarray['__PROJECT_NOTE_PUBLIC__'] = '__PROJECT_NOTE_PUBLIC__';
 				$substitutionarray['__PROJECT_NOTE_PRIVATE__'] = '__PROJECT_NOTE_PRIVATE__';*/
 			}
-			if (!empty($conf->contrat->enabled) && (!is_object($object) || $object->element == 'contract')) {
+			if (isModEnabled('contrat') && (!is_object($object) || $object->element == 'contract')) {
 				$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';
diff --git a/htdocs/core/lib/pdf.lib.php b/htdocs/core/lib/pdf.lib.php
index ca9bfcfe0e4..91e0b382b44 100644
--- a/htdocs/core/lib/pdf.lib.php
+++ b/htdocs/core/lib/pdf.lib.php
@@ -1605,7 +1605,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 (!empty($conf->global->CATEGORY_ADD_DESC_INTO_DOC) && $idprod && !empty($conf->categorie->enabled)) {
+	if (!empty($conf->global->CATEGORY_ADD_DESC_INTO_DOC) && $idprod && isModEnabled('categorie')) {
 		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 710b2462afa..56cb195060b 100644
--- a/htdocs/core/lib/product.lib.php
+++ b/htdocs/core/lib/product.lib.php
@@ -398,7 +398,7 @@ function show_stats_for_company($product, $socid)
 		print '</tr>';
 	}
 	// Supplier proposals
-	if (!empty($conf->supplier_proposal->enabled) && $user->rights->supplier_proposal->lire) {
+	if (isModEnabled('supplier_proposal') && $user->rights->supplier_proposal->lire) {
 		$nblines++;
 		$ret = $product->load_stats_proposal_supplier($socid);
 		if ($ret < 0) {
@@ -513,7 +513,7 @@ function show_stats_for_company($product, $socid)
 	}
 
 	// Contracts
-	if (!empty($conf->contrat->enabled) && $user->rights->contrat->lire) {
+	if (isModEnabled('contrat') && $user->rights->contrat->lire) {
 		$nblines++;
 		$ret = $product->load_stats_contrat($socid);
 		if ($ret < 0) {
diff --git a/htdocs/core/lib/project.lib.php b/htdocs/core/lib/project.lib.php
index ba71d22b7f8..3d0ab7f083d 100644
--- a/htdocs/core/lib/project.lib.php
+++ b/htdocs/core/lib/project.lib.php
@@ -126,7 +126,7 @@ function project_prepare_head(Project $project, $moreparam = '')
 
 	if (((isModEnabled("fournisseur") && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD)) || isModEnabled("supplier_order") || isModEnabled("supplier_invoice"))
 		|| isModEnabled("propal") || isModEnabled('commande')
-		|| isModEnabled('facture') || !empty($conf->contrat->enabled)
+		|| isModEnabled('facture') || isModEnabled('contrat')
 		|| !empty($conf->ficheinter->enabled) || isModEnabled('agenda') || isModEnabled('deplacement') || !empty($conf->stock->enabled)) {
 		$nbElements = 0;
 		// Enable caching of thirdrparty count Contacts
@@ -150,7 +150,7 @@ function project_prepare_head(Project $project, $moreparam = '')
 			if (isModEnabled('facture')) {
 				$nbElements += $project->getElementCount('invoice_predefined', 'facture_rec');
 			}
-			if (!empty($conf->supplier_proposal->enabled)) {
+			if (isModEnabled('supplier_proposal')) {
 				$nbElements += $project->getElementCount('proposal_supplier', 'supplier_proposal');
 			}
 			if (isModEnabled("supplier_order")) {
@@ -159,7 +159,7 @@ function project_prepare_head(Project $project, $moreparam = '')
 			if (isModEnabled("supplier_invoice")) {
 				$nbElements += $project->getElementCount('invoice_supplier', 'facture_fourn');
 			}
-			if (!empty($conf->contrat->enabled)) {
+			if (isModEnabled('contrat')) {
 				$nbElements += $project->getElementCount('contract', 'contrat');
 			}
 			if (!empty($conf->ficheinter->enabled)) {
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 beec387020a..29050c6b780 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
@@ -55,7 +55,7 @@ if ((isModEnabled("fournisseur") && empty($conf->global->MAIN_USE_NEW_SUPPLIERMO
 if ((isModEnabled("fournisseur") && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD)) || isModEnabled("supplier_order")) {
 	require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.commande.class.php';
 }
-if (!empty($conf->contrat->enabled)) {
+if (isModEnabled('contrat')) {
 	require_once DOL_DOCUMENT_ROOT.'/contrat/class/contrat.class.php';
 }
 if (!empty($conf->ficheinter->enabled)) {
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 07bd3ee03ab..35f00912143 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
@@ -56,7 +56,7 @@ if ((isModEnabled("fournisseur") && empty($conf->global->MAIN_USE_NEW_SUPPLIERMO
 if ((isModEnabled("fournisseur") && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD)) || isModEnabled("supplier_order")) {
 	require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.commande.class.php';
 }
-if (!empty($conf->contrat->enabled)) {
+if (isModEnabled('contrat')) {
 	require_once DOL_DOCUMENT_ROOT.'/contrat/class/contrat.class.php';
 }
 if (!empty($conf->ficheinter->enabled)) {
diff --git a/htdocs/core/tpl/advtarget.tpl.php b/htdocs/core/tpl/advtarget.tpl.php
index 86292ec0ff4..07595012466 100644
--- a/htdocs/core/tpl/advtarget.tpl.php
+++ b/htdocs/core/tpl/advtarget.tpl.php
@@ -15,7 +15,7 @@
  * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
-if (!empty($conf->categorie->enabled) && $user->rights->categorie->lire) {
+if (isModEnabled('categorie') && $user->rights->categorie->lire) {
 	require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 }
 
@@ -254,7 +254,7 @@ if (!empty($conf->global->MAIN_MULTILANGS)) {
 	print '</td></tr>'."\n";
 }
 
-if (!empty($conf->categorie->enabled) && $user->rights->categorie->lire) {
+if (isModEnabled('categorie') && $user->rights->categorie->lire) {
 	// Customer Categories
 	print '<tr><td>'.$langs->trans("CustomersCategoryShort");
 	if (!empty($array_query['cust_categ'])) {
@@ -451,7 +451,7 @@ print '</td></tr></table>';
 print '</td><td>'."\n";
 print '</td></tr>'."\n";
 
-if (!empty($conf->categorie->enabled) && $user->rights->categorie->lire) {
+if (isModEnabled('categorie') && $user->rights->categorie->lire) {
 	// Customer Categories
 	print '<tr><td>'.$langs->trans("ContactCategoriesShort");
 	if (!empty($array_query['contact_categ'])) {
diff --git a/htdocs/core/tpl/notes.tpl.php b/htdocs/core/tpl/notes.tpl.php
index e0f0c5d9142..1110e91b019 100644
--- a/htdocs/core/tpl/notes.tpl.php
+++ b/htdocs/core/tpl/notes.tpl.php
@@ -94,17 +94,17 @@ if ($module == 'propal') {
 }
 //else dol_print_error('','Bad value '.$module.' for param module');
 
-if (!empty($conf->fckeditor->enabled) && !empty($conf->global->FCKEDITOR_ENABLE_SOCIETE)) {
+if (isModEnabled('fckeditor') && !empty($conf->global->FCKEDITOR_ENABLE_SOCIETE)) {
 	$typeofdata = 'ckeditor:dolibarr_notes:100%:200::1:12:95%:0'; // Rem: This var is for all notes, not only thirdparties note.
 } else {
 	$typeofdata = 'textarea:12:95%';
 }
-if (!empty($conf->fckeditor->enabled) && !empty($conf->global->FCKEDITOR_ENABLE_NOTE_PUBLIC)) {
+if (isModEnabled('fckeditor') && !empty($conf->global->FCKEDITOR_ENABLE_NOTE_PUBLIC)) {
 	$typeofdatapub = 'ckeditor:dolibarr_notes:100%:200::1:12:95%:0'; // Rem: This var is for all notes, not only thirdparties note.
 } else {
 	$typeofdatapub = 'textarea:12:95%';
 }
-if (!empty($conf->fckeditor->enabled) && !empty($conf->global->FCKEDITOR_ENABLE_NOTE_PRIVATE)) {
+if (isModEnabled('fckeditor') && !empty($conf->global->FCKEDITOR_ENABLE_NOTE_PRIVATE)) {
 	$typeofdatapriv = 'ckeditor:dolibarr_notes:100%:200::1:12:95%:0'; // Rem: This var is for all notes, not only thirdparties note.
 } else {
 	$typeofdatapriv = 'textarea:12:95%';
diff --git a/htdocs/core/tpl/onlinepaymentlinks.tpl.php b/htdocs/core/tpl/onlinepaymentlinks.tpl.php
index 1615dbe87ed..611c556d98c 100644
--- a/htdocs/core/tpl/onlinepaymentlinks.tpl.php
+++ b/htdocs/core/tpl/onlinepaymentlinks.tpl.php
@@ -74,7 +74,7 @@ if (isModEnabled('facture')) {
 	}
 	print '<br>';
 }
-if (!empty($conf->contrat->enabled)) {
+if (isModEnabled('contrat')) {
 	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";
diff --git a/htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php b/htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php
index 49f2873f472..73312ec52cf 100644
--- a/htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php
+++ b/htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php
@@ -222,7 +222,7 @@ class InterfaceWorkflowManager extends DolibarrTriggers
 			}
 
 			// Secondly, we set to linked Proposal to "Billed" if WORKFLOW_INVOICE_CLASSIFY_BILLED_SUPPLIER_PROPOSAL is set.
-			if (!empty($conf->supplier_proposal->enabled) && !empty($conf->global->WORKFLOW_INVOICE_CLASSIFY_BILLED_SUPPLIER_PROPOSAL)) {
+			if (isModEnabled('supplier_proposal') && !empty($conf->global->WORKFLOW_INVOICE_CLASSIFY_BILLED_SUPPLIER_PROPOSAL)) {
 				$object->fetchObjectLinked('', 'supplier_proposal', $object->id, $object->element);
 				if (!empty($object->linkedObjects)) {
 					$totalonlinkedelements = 0;
diff --git a/htdocs/ecm/index_auto.php b/htdocs/ecm/index_auto.php
index c7a4a570a5c..70e22db92a2 100644
--- a/htdocs/ecm/index_auto.php
+++ b/htdocs/ecm/index_auto.php
@@ -319,7 +319,7 @@ if (!empty($conf->global->ECM_AUTO_TREE_ENABLED)) {
 	if (isModEnabled("propal")) {
 		$rowspan++; $sectionauto[] = array('position'=>30, 'level'=>1, 'module'=>'propal', 'test'=>$conf->propal->enabled, 'label'=>$langs->trans("Proposals"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("Proposals")));
 	}
-	if (!empty($conf->contrat->enabled)) {
+	if (isModEnabled('contrat')) {
 		$rowspan++; $sectionauto[] = array('position'=>40, 'level'=>1, 'module'=>'contract', 'test'=>$conf->contrat->enabled, 'label'=>$langs->trans("Contracts"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("Contracts")));
 	}
 	if (isModEnabled('commande')) {
@@ -328,7 +328,7 @@ if (!empty($conf->global->ECM_AUTO_TREE_ENABLED)) {
 	if (isModEnabled('facture')) {
 		$rowspan++; $sectionauto[] = array('position'=>60, 'level'=>1, 'module'=>'invoice', 'test'=>$conf->facture->enabled, 'label'=>$langs->trans("CustomersInvoices"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("Invoices")));
 	}
-	if (!empty($conf->supplier_proposal->enabled)) {
+	if (isModEnabled('supplier_proposal')) {
 		$langs->load("supplier_proposal");
 		$rowspan++; $sectionauto[] = array('position'=>70, 'level'=>1, 'module'=>'supplier_proposal', 'test'=>$conf->supplier_proposal->enabled, 'label'=>$langs->trans("SupplierProposals"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("SupplierProposals")));
 	}
diff --git a/htdocs/ecm/search.php b/htdocs/ecm/search.php
index ac986ad00f4..bb22566ef1e 100644
--- a/htdocs/ecm/search.php
+++ b/htdocs/ecm/search.php
@@ -122,7 +122,7 @@ if (isModEnabled("societe")) {
 if (isModEnabled("propal")) {
 	$rowspan++; $sectionauto[] = array('level'=>1, 'module'=>'propal', 'test'=>$conf->propal->enabled, 'label'=>$langs->trans("Proposals"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("Proposals")));
 }
-if (!empty($conf->contrat->enabled)) {
+if (isModEnabled('contrat')) {
 	$rowspan++; $sectionauto[] = array('level'=>1, 'module'=>'contract', 'test'=>$conf->contrat->enabled, 'label'=>$langs->trans("Contracts"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("Contracts")));
 }
 if (isModEnabled('commande')) {
@@ -131,7 +131,7 @@ if (isModEnabled('commande')) {
 if (isModEnabled('facture')) {
 	$rowspan++; $sectionauto[] = array('level'=>1, 'module'=>'invoice', 'test'=>$conf->facture->enabled, 'label'=>$langs->trans("CustomersInvoices"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("Invoices")));
 }
-if (!empty($conf->supplier_proposal->enabled)) {
+if (isModEnabled('supplier_proposal')) {
 	$langs->load("supplier_proposal"); $rowspan++; $sectionauto[] = array('level'=>1, 'module'=>'supplier_proposal', 'test'=>$conf->supplier_proposal->enabled, 'label'=>$langs->trans("SupplierProposals"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("SupplierProposals")));
 }
 if ((isModEnabled("fournisseur") && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD)) || isModEnabled("supplier_order")) {
diff --git a/htdocs/expedition/list.php b/htdocs/expedition/list.php
index adc80e27b64..b693800e253 100644
--- a/htdocs/expedition/list.php
+++ b/htdocs/expedition/list.php
@@ -577,7 +577,7 @@ if ($user->rights->user->user->lire) {
 	$moreforfilter .= '</div>';
 }
 // If the user can view prospects other than his'
-if (!empty($conf->categorie->enabled) && $user->rights->categorie->lire && ($user->rights->produit->lire || $user->rights->service->lire)) {
+if (isModEnabled('categorie') && $user->rights->categorie->lire && ($user->rights->produit->lire || $user->rights->service->lire)) {
 	include_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 	$moreforfilter .= '<div class="divsearchfield">';
 	$tmptitle = $langs->trans('IncludingProductWithTag');
@@ -588,7 +588,7 @@ if (!empty($conf->categorie->enabled) && $user->rights->categorie->lire && ($use
 
 	$moreforfilter .= '</div>';
 }
-if (!empty($conf->categorie->enabled) && $user->rights->categorie->lire) {
+if (isModEnabled('categorie') && $user->rights->categorie->lire) {
 	require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 	$moreforfilter .= '<div class="divsearchfield">';
 	$tmptitle = $langs->trans('CustomersProspectsCategoriesShort');
diff --git a/htdocs/fichinter/card-rec.php b/htdocs/fichinter/card-rec.php
index 3f644b074bd..3d10693d4e1 100644
--- a/htdocs/fichinter/card-rec.php
+++ b/htdocs/fichinter/card-rec.php
@@ -41,7 +41,7 @@ if (!empty($conf->project->enabled)) {
 	require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 	require_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php';
 }
-if (!empty($conf->contrat->enabled)) {
+if (isModEnabled('contrat')) {
 	require_once DOL_DOCUMENT_ROOT.'/contrat/class/contrat.class.php';
 	require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcontract.class.php';
 }
@@ -241,7 +241,7 @@ llxHeader('', $langs->trans("RepeatableIntervention"), $help_url);
 
 $form = new Form($db);
 $companystatic = new Societe($db);
-if (!empty($conf->contrat->enabled)) {
+if (isModEnabled('contrat')) {
 	$contratstatic = new Contrat($db);
 }
 if (!empty($conf->project->enabled)) {
@@ -275,7 +275,7 @@ if ($action == 'create') {
 		if (!empty($conf->project->enabled) && $object->fk_project > 0) {
 			$rowspan++;
 		}
-		if (!empty($conf->contrat->enabled) && $object->fk_contrat > 0) {
+		if (isModEnabled('contrat') && $object->fk_contrat > 0) {
 			$rowspan++;
 		}
 
@@ -328,7 +328,7 @@ if ($action == 'create') {
 		}
 
 		// Contrat
-		if (!empty($conf->contrat->enabled)) {
+		if (isModEnabled('contrat')) {
 			$formcontract = new FormContract($db);
 			print "<tr><td>".$langs->trans("Contract")."</td><td>";
 			$contractid = GETPOST('contractid') ?GETPOST('contractid') : $object->fk_contract;
@@ -539,7 +539,7 @@ if ($action == 'create') {
 			print '<tr><td>'.$langs->trans("Description").'</td><td colspan="3">'.nl2br($object->description)."</td></tr>";
 
 			// Contract
-			if (!empty($conf->contrat->enabled)) {
+			if (isModEnabled('contrat')) {
 				$langs->load('contracts');
 				print '<tr>';
 				print '<td>';
@@ -800,7 +800,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 (!empty($conf->contrat->enabled)) {
+			if (isModEnabled('contrat')) {
 				print_liste_field_titre("Contract", $_SERVER['PHP_SELF'], "f.fk_contrat", "", "", 'width="100px"', $sortfield, $sortorder, 'left ');
 			}
 			if (!empty($conf->project->enabled)) {
@@ -834,7 +834,7 @@ if ($action == 'create') {
 						print '<td>'.$langs->trans("None").'</td>';
 					}
 
-					if (!empty($conf->contrat->enabled)) {
+					if (isModEnabled('contrat')) {
 						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 e2d03790f78..1c83726f7e6 100644
--- a/htdocs/fichinter/card.php
+++ b/htdocs/fichinter/card.php
@@ -784,7 +784,7 @@ if (empty($reshook)) {
 
 $form = new Form($db);
 $formfile = new FormFile($db);
-if (!empty($conf->contrat->enabled)) {
+if (isModEnabled('contrat')) {
 	$formcontract = new FormContract($db);
 }
 if (!empty($conf->project->enabled)) {
@@ -1233,7 +1233,7 @@ if ($action == 'create') {
 	print '</tr>';
 
 	// Contract
-	if (!empty($conf->contrat->enabled)) {
+	if (isModEnabled('contrat')) {
 		$langs->load('contracts');
 		print '<tr>';
 		print '<td>';
diff --git a/htdocs/fichinter/list.php b/htdocs/fichinter/list.php
index d8bb62f6b5d..52af477741d 100644
--- a/htdocs/fichinter/list.php
+++ b/htdocs/fichinter/list.php
@@ -37,7 +37,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
 if (!empty($conf->project->enabled)) {
 	require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 }
-if (!empty($conf->contrat->enabled)) {
+if (isModEnabled('contrat')) {
 	require_once DOL_DOCUMENT_ROOT.'/contrat/class/contrat.class.php';
 }
 
@@ -46,7 +46,7 @@ $langs->loadLangs(array('companies', 'bills', 'interventions'));
 if (!empty($conf->project->enabled)) {
 	$langs->load("projects");
 }
-if (!empty($conf->contrat->enabled)) {
+if (isModEnabled('contrat')) {
 	$langs->load("contracts");
 }
 
@@ -205,7 +205,7 @@ $companystatic = new Societe($db);
 if (!empty($conf->project->enabled)) {
 	$projetstatic = new Project($db);
 }
-if (!empty($conf->contrat->enabled)) {
+if (isModEnabled('contrat')) {
 	$contratstatic = new Contrat($db);
 }
 
@@ -237,7 +237,7 @@ $sql .= " s.nom as name, s.rowid as socid, s.client, s.fournisseur, s.email, s.s
 if (!empty($conf->project->enabled)) {
 	$sql .= ", pr.rowid as projet_id, pr.ref as projet_ref, pr.title as projet_title";
 }
-if (!empty($conf->contrat->enabled)) {
+if (isModEnabled('contrat')) {
 	$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
@@ -254,7 +254,7 @@ $sql .= " FROM ".MAIN_DB_PREFIX."fichinter as f";
 if (!empty($conf->project->enabled)) {
 	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."projet as pr on f.fk_projet = pr.rowid";
 }
-if (!empty($conf->contrat->enabled)) {
+if (isModEnabled('contrat')) {
 	$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 9d5c5b70fe4..9a7a3d7dcc0 100644
--- a/htdocs/fourn/card.php
+++ b/htdocs/fourn/card.php
@@ -39,7 +39,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
 if (isModEnabled('adherent')) {
 	require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
 }
-if (!empty($conf->categorie->enabled)) {
+if (isModEnabled('categorie')) {
 	require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 }
 
@@ -340,7 +340,7 @@ if ($object->id > 0) {
 	}
 
 	// Categories
-	if (!empty($conf->categorie->enabled)) {
+	if (isModEnabled('categorie')) {
 		$langs->load("categories");
 		print '<tr><td>'.$langs->trans("SuppliersCategoriesShort").'</td>';
 		print '<td>';
@@ -387,7 +387,7 @@ if ($object->id > 0) {
 	$boxstat .= '<table summary="'.dol_escape_htmltag($langs->trans("DolibarrStateBoard")).'" class="border boxtable boxtablenobottom boxtablenotop" width="100%">';
 	$boxstat .= '<tr class="impair nohover"><td colspan="2" class="tdboxstats nohover">';
 
-	if (!empty($conf->supplier_proposal->enabled)) {
+	if (isModEnabled('supplier_proposal')) {
 		// Box proposals
 		$tmp = $object->getOutstandingProposals('supplier');
 		$outstandingOpened = $tmp['opened'];
@@ -842,7 +842,7 @@ if ($object->id > 0) {
 			print dolGetButtonAction($langs->trans('ThirdPartyIsClosed'), $langs->trans('ThirdPartyIsClosed'), 'default', $_SERVER['PHP_SELF'].'#', '', false);
 		}
 
-		if (!empty($conf->supplier_proposal->enabled) && !empty($user->rights->supplier_proposal->creer)) {
+		if (isModEnabled('supplier_proposal') && !empty($user->rights->supplier_proposal->creer)) {
 			$langs->load("supplier_proposal");
 			if ($object->status == 1) {
 				print dolGetButtonAction('', $langs->trans('AddSupplierProposal'), 'default', DOL_URL_ROOT.'/supplier_proposal/card.php?action=create&amp;socid='.$object->id, '');
diff --git a/htdocs/fourn/commande/card.php b/htdocs/fourn/commande/card.php
index 67ec98e3c96..769d8c451da 100644
--- a/htdocs/fourn/commande/card.php
+++ b/htdocs/fourn/commande/card.php
@@ -43,7 +43,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/fourn.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
-if (!empty($conf->supplier_proposal->enabled)) {
+if (isModEnabled('supplier_proposal')) {
 	require_once DOL_DOCUMENT_ROOT.'/supplier_proposal/class/supplier_proposal.class.php';
 }
 if (isModEnabled("product")) {
diff --git a/htdocs/fourn/commande/list.php b/htdocs/fourn/commande/list.php
index 5676cd4aae3..c6401b0a70a 100644
--- a/htdocs/fourn/commande/list.php
+++ b/htdocs/fourn/commande/list.php
@@ -1227,7 +1227,7 @@ if ($resql) {
 		$moreforfilter .= '</div>';
 	}
 	// If the user can view prospects other than his'
-	if (!empty($conf->categorie->enabled) && $user->rights->categorie->lire && ($user->rights->produit->lire || $user->rights->service->lire)) {
+	if (isModEnabled('categorie') && $user->rights->categorie->lire && ($user->rights->produit->lire || $user->rights->service->lire)) {
 		include_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 		$moreforfilter .= '<div class="divsearchfield">';
 		$tmptitle = $langs->trans('IncludingProductWithTag');
diff --git a/htdocs/fourn/facture/list.php b/htdocs/fourn/facture/list.php
index 47e6786f2f0..e7f1785cb95 100644
--- a/htdocs/fourn/facture/list.php
+++ b/htdocs/fourn/facture/list.php
@@ -900,7 +900,7 @@ if ($resql) {
 		$moreforfilter .= '</div>';
 	}
 	// If the user can view prospects other than his'
-	if (!empty($conf->categorie->enabled) && $user->rights->categorie->lire && ($user->rights->produit->lire || $user->rights->service->lire)) {
+	if (isModEnabled('categorie') && $user->rights->categorie->lire && ($user->rights->produit->lire || $user->rights->service->lire)) {
 		include_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 		$moreforfilter .= '<div class="divsearchfield">';
 		$tmptitle = $langs->trans('IncludingProductWithTag');
@@ -909,7 +909,7 @@ if ($resql) {
 		$moreforfilter .= '</div>';
 	}
 
-	if (!empty($conf->categorie->enabled)) {
+	if (isModEnabled('categorie')) {
 		require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 		$moreforfilter .= '<div class="divsearchfield">';
 		$tmptitle = $langs->trans('SuppliersCategoriesShort');
diff --git a/htdocs/knowledgemanagement/knowledgerecord_card.php b/htdocs/knowledgemanagement/knowledgerecord_card.php
index 66b7b0ca160..8da0dd34b92 100644
--- a/htdocs/knowledgemanagement/knowledgerecord_card.php
+++ b/htdocs/knowledgemanagement/knowledgerecord_card.php
@@ -189,7 +189,7 @@ if ($action == 'create') {
 	// Common attributes
 	include DOL_DOCUMENT_ROOT.'/core/tpl/commonfields_add.tpl.php';
 
-	if (!empty($conf->categorie->enabled)) {
+	if (isModEnabled('categorie')) {
 		$cate_arbo = $form->select_all_categories(Categorie::TYPE_KNOWLEDGEMANAGEMENT, '', 'parent', 64, 0, 1);
 
 		if (count($cate_arbo)) {
@@ -236,7 +236,7 @@ if (($id || $ref) && $action == 'edit') {
 	// Common attributes
 	include DOL_DOCUMENT_ROOT.'/core/tpl/commonfields_edit.tpl.php';
 
-	if (!empty($conf->categorie->enabled)) {
+	if (isModEnabled('categorie')) {
 		$cate_arbo = $form->select_all_categories(Categorie::TYPE_KNOWLEDGEMANAGEMENT, '', 'parent', 64, 0, 1);
 
 		if (count($cate_arbo)) {
diff --git a/htdocs/knowledgemanagement/knowledgerecord_list.php b/htdocs/knowledgemanagement/knowledgerecord_list.php
index 18ec0d67738..ff28b79a4ad 100644
--- a/htdocs/knowledgemanagement/knowledgerecord_list.php
+++ b/htdocs/knowledgemanagement/knowledgerecord_list.php
@@ -34,7 +34,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/knowledgemanagement/class/knowledgerecord.class.php';
 
 // for other modules
-if (!empty($conf->categorie->enabled)) {
+if (isModEnabled('categorie')) {
 	require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 }
 //dol_include_once('/othermodule/class/otherobject.class.php');
@@ -475,7 +475,7 @@ $moreforfilter.= '</div>';*/
 
 // Filter on categories
 $moreforfilter = '';
-if (!empty($conf->categorie->enabled) && $user->rights->categorie->lire) {
+if (isModEnabled('categorie') && $user->rights->categorie->lire) {
 	$moreforfilter .= '<div class="divsearchfield">';
 	$moreforfilter .= img_picto($langs->trans('Categories'), 'category', 'class="pictofixedwidth"');
 	$categoriesKnowledgeArr = $form->select_all_categories(Categorie::TYPE_KNOWLEDGEMANAGEMENT, '', '', 64, 0, 1);
diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index 989e856b690..a2098b11a8f 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -2481,7 +2481,7 @@ function printDropdownQuickadd()
 				"title" => "NewContractSubscription@contracts",
 				"name" => "Contract@contracts",
 				"picto" => "object_contract",
-				"activation" => !empty($conf->contrat->enabled) && $user->hasRight("contrat", "write"), // vs hooking
+				"activation" => isModEnabled('contrat') && $user->hasRight("contrat", "write"), // vs hooking
 				"position" => 60,
 			),
 			array(
@@ -2489,7 +2489,7 @@ function printDropdownQuickadd()
 				"title" => "SupplierProposalNew@supplier_proposal",
 				"name" => "SupplierProposal@supplier_proposal",
 				"picto" => "supplier_proposal",
-				"activation" => !empty($conf->supplier_proposal->enabled) && $user->hasRight("supplier_invoice", "write"), // vs hooking
+				"activation" => isModEnabled('supplier_proposal') && $user->hasRight("supplier_invoice", "write"), // vs hooking
 				"position" => 70,
 			),
 			array(
diff --git a/htdocs/product/card.php b/htdocs/product/card.php
index d9b943fb40f..fd107c06351 100644
--- a/htdocs/product/card.php
+++ b/htdocs/product/card.php
@@ -1615,7 +1615,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 			print "</td></tr>";
 		//}
 
-		if (!empty($conf->categorie->enabled)) {
+		if (isModEnabled('categorie')) {
 			// Categories
 			print '<tr><td>'.$langs->trans("Categories").'</td><td>';
 			$cate_arbo = $form->select_all_categories(Categorie::TYPE_PRODUCT, '', 'parent', 64, 0, 1);
diff --git a/htdocs/product/composition/card.php b/htdocs/product/composition/card.php
index e6a3b3171bc..3018312cd0e 100644
--- a/htdocs/product/composition/card.php
+++ b/htdocs/product/composition/card.php
@@ -179,7 +179,7 @@ if ($action == 'search') {
 		}
 		$sql .= natural_search($params, $key);
 	}
-	if (!empty($conf->categorie->enabled) && !empty($parent) && $parent != -1) {
+	if (isModEnabled('categorie') && !empty($parent) && $parent != -1) {
 		$sql .= " AND cp.fk_categorie ='".$db->escape($parent)."'";
 	}
 	$sql .= " ORDER BY p.ref ASC";
@@ -590,7 +590,7 @@ if ($id > 0 || !empty($ref)) {
 			print '<br>';
 
 			$rowspan = 1;
-			if (!empty($conf->categorie->enabled)) {
+			if (isModEnabled('categorie')) {
 				$rowspan++;
 			}
 
@@ -603,7 +603,7 @@ if ($id > 0 || !empty($ref)) {
 			print $langs->trans("KeywordFilter").': ';
 			print '<input type="text" name="key" value="'.$key.'"> &nbsp; ';
 			print '</div>';
-			if (!empty($conf->categorie->enabled)) {
+			if (isModEnabled('categorie')) {
 				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 e976e176224..4e90371a3f4 100644
--- a/htdocs/product/index.php
+++ b/htdocs/product/index.php
@@ -215,7 +215,7 @@ if ((isModEnabled("product") || isModEnabled("service")) && ($user->rights->prod
 }
 
 
-if (!empty($conf->categorie->enabled) && !empty($conf->global->CATEGORY_GRAPHSTATS_ON_PRODUCTS)) {
+if (isModEnabled('categorie') && !empty($conf->global->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 553f4ed8baa..00f440f1990 100644
--- a/htdocs/product/inventory/list.php
+++ b/htdocs/product/inventory/list.php
@@ -27,7 +27,7 @@ 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 (!empty($conf->categorie->enabled)) {
+if (isModEnabled('categorie')) {
 	require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 }
 
@@ -464,7 +464,7 @@ $moreforfilter.= $langs->trans('MyFilter') . ': <input type="text" name="search_
 $moreforfilter.= '</div>';*/
 
 // Filter on categories
-if (!empty($conf->global->MAIN_SEARCH_CATEGORY_PRODUCT_ON_LISTS) && !empty($conf->categorie->enabled) && $user->rights->categorie->lire) {
+if (!empty($conf->global->MAIN_SEARCH_CATEGORY_PRODUCT_ON_LISTS) && isModEnabled('categorie') && $user->rights->categorie->lire) {
 	$moreforfilter .= '<div class="divsearchfield">';
 	$tmptitle = $langs->transnoentities('ProductsCategoriesShort');
 	$moreforfilter .= img_picto($tmptitle, 'category', 'class="pictofixedwidth"');
diff --git a/htdocs/product/list.php b/htdocs/product/list.php
index dcea4f4b8f7..6028a0a871d 100644
--- a/htdocs/product/list.php
+++ b/htdocs/product/list.php
@@ -43,7 +43,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/product.lib.php';
 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.'/product/class/html.formproduct.class.php';
-if (!empty($conf->categorie->enabled)) {
+if (isModEnabled('categorie')) {
 	require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 }
 
@@ -820,7 +820,7 @@ if ($resql) {
 
 	// Filter on categories
 	$moreforfilter = '';
-	if (!empty($conf->categorie->enabled) && $user->rights->categorie->lire) {
+	if (isModEnabled('categorie') && $user->rights->categorie->lire) {
 		$moreforfilter .= '<div class="divsearchfield">';
 		$moreforfilter .= img_picto($langs->trans('Categories'), 'category', 'class="pictofixedwidth"');
 		$categoriesProductArr = $form->select_all_categories(Categorie::TYPE_PRODUCT, '', '', 64, 0, 1);
diff --git a/htdocs/product/reassort.php b/htdocs/product/reassort.php
index 10e70545af6..5585b8221a2 100644
--- a/htdocs/product/reassort.php
+++ b/htdocs/product/reassort.php
@@ -328,7 +328,7 @@ if ($resql) {
 
 	// Filter on categories
 	$moreforfilter = '';
-	if (!empty($conf->categorie->enabled)) {
+	if (isModEnabled('categorie')) {
 		$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 a39dc246772..14d9815361d 100644
--- a/htdocs/product/reassortlot.php
+++ b/htdocs/product/reassortlot.php
@@ -481,7 +481,7 @@ if ($search_categ > 0) {
 
 // Filter on categories
 $moreforfilter = '';
-if (!empty($conf->categorie->enabled)) {
+if (isModEnabled('categorie')) {
 	$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/stock/card.php b/htdocs/product/stock/card.php
index b4730778d32..43fb04b1ad3 100644
--- a/htdocs/product/stock/card.php
+++ b/htdocs/product/stock/card.php
@@ -378,7 +378,7 @@ if ($action == 'create') {
 	// Other attributes
 	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_add.tpl.php';
 
-	if (!empty($conf->categorie->enabled)) {
+	if (isModEnabled('categorie')) {
 		// Categories
 		print '<tr><td>'.$langs->trans("Categories").'</td><td colspan="3">';
 		$cate_arbo = $form->select_all_categories(Categorie::TYPE_WAREHOUSE, '', 'parent', 64, 0, 1);
diff --git a/htdocs/product/stock/list.php b/htdocs/product/stock/list.php
index cc94ae303ec..f182cf1847b 100644
--- a/htdocs/product/stock/list.php
+++ b/htdocs/product/stock/list.php
@@ -28,7 +28,7 @@
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/product/stock/class/entrepot.class.php';
 
-if (!empty($conf->categorie->enabled)) {
+if (isModEnabled('categorie')) {
 	require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcategory.class.php';
 	require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 }
@@ -53,7 +53,7 @@ $search_ref = GETPOST("sref", "alpha") ?GETPOST("sref", "alpha") : GETPOST("sear
 $search_label = GETPOST("snom", "alpha") ?GETPOST("snom", "alpha") : GETPOST("search_label", "alpha");
 $search_status = GETPOST("search_status", "int");
 
-if (!empty($conf->categorie->enabled)) {
+if (isModEnabled('categorie')) {
 	$search_category_list = GETPOST("search_category_".Categorie::TYPE_WAREHOUSE."_list", "array");
 }
 
@@ -226,7 +226,7 @@ $reshook = $hookmanager->executeHooks('printFieldListSelect', $parameters, $obje
 $sql .= $hookmanager->resPrint;
 $sql = preg_replace('/,\s*$/', '', $sql);
 $sql .= " FROM ".MAIN_DB_PREFIX.$object->table_element." as t";
-if (!empty($conf->categorie->enabled)) {
+if (isModEnabled('categorie')) {
 	$sql .= Categorie::getFilterJoinQuery(Categorie::TYPE_WAREHOUSE, "t.rowid");
 }
 if (!empty($extrafields->attributes[$object->table_element]['label']) && is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label'])) {
@@ -242,7 +242,7 @@ if ($separatedPMP) {
 
 $sql .= " WHERE t.entity IN (".getEntity('stock').")";
 
-if (!empty($conf->categorie->enabled)) {
+if (isModEnabled('categorie')) {
 	$sql .= Categorie::getFilterSelectQuery(Categorie::TYPE_WAREHOUSE, "t.rowid", $search_category_list);
 }
 foreach ($search as $key => $val) {
@@ -419,7 +419,7 @@ if ($search_all) {
 
 $moreforfilter = '';
 
-if (!empty($conf->categorie->enabled) && $user->rights->categorie->lire) {
+if (isModEnabled('categorie') && $user->rights->categorie->lire) {
 	$formcategory = new FormCategory($db);
 	$moreforfilter .= $formcategory->getFilterBox(Categorie::TYPE_WAREHOUSE, $search_category_list);
 }
diff --git a/htdocs/projet/card.php b/htdocs/projet/card.php
index bc182efa3f2..8008ed4780f 100644
--- a/htdocs/projet/card.php
+++ b/htdocs/projet/card.php
@@ -714,7 +714,7 @@ if ($action == 'create' && $user->rights->projet->creer) {
 	$doleditor->Create();
 	print '</td></tr>';
 
-	if (!empty($conf->categorie->enabled)) {
+	if (isModEnabled('categorie')) {
 		// Categories
 		print '<tr><td>'.$langs->trans("Categories").'</td><td colspan="3">';
 		$cate_arbo = $form->select_all_categories(Categorie::TYPE_PROJECT, '', 'parent', 64, 0, 1);
@@ -1356,7 +1356,7 @@ if ($action == 'create' && $user->rights->projet->creer) {
 					$langs->load("bills");
 					print dolGetButtonAction('', $langs->trans('CreateBill'), 'default', DOL_URL_ROOT.'/compta/facture/card.php?action=create&amp;projectid='.$object->id.'&amp;socid='.$object->socid, '', 1, array('isDropDown' => true));
 				}
-				if (!empty($conf->supplier_proposal->enabled) && $user->rights->supplier_proposal->creer) {
+				if (isModEnabled('supplier_proposal') && $user->rights->supplier_proposal->creer) {
 					$langs->load("supplier_proposal");
 					print dolGetButtonAction('', $langs->trans('AddSupplierProposal'), 'default', DOL_URL_ROOT.'/supplier_proposal/card.php?action=create&amp;projectid='.$object->id.'&amp;socid='.$object->socid, '', 1, array('isDropDown' => true));
 				}
@@ -1372,7 +1372,7 @@ if ($action == 'create' && $user->rights->projet->creer) {
 					$langs->load("interventions");
 					print dolGetButtonAction('', $langs->trans('AddIntervention'), 'default', DOL_URL_ROOT.'/fichinter/card.php?action=create&amp;projectid='.$object->id.'&amp;socid='.$object->socid, '', 1, array('isDropDown' => true));
 				}
-				if (!empty($conf->contrat->enabled) && $user->rights->contrat->creer) {
+				if (isModEnabled('contrat') && $user->rights->contrat->creer) {
 					$langs->load("contracts");
 					print dolGetButtonAction('', $langs->trans('AddContract'), 'default', DOL_URL_ROOT.'/contrat/card.php?action=create&amp;projectid='.$object->id.'&amp;socid='.$object->socid, '', 1, array('isDropDown' => true));
 				}
diff --git a/htdocs/projet/element.php b/htdocs/projet/element.php
index 57583a538fb..cf5c8fbde86 100644
--- a/htdocs/projet/element.php
+++ b/htdocs/projet/element.php
@@ -49,7 +49,7 @@ if (isModEnabled('facture')) {
 if (isModEnabled('commande')) {
 	require_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
 }
-if (!empty($conf->supplier_proposal->enabled)) {
+if (isModEnabled('supplier_proposal')) {
 	require_once DOL_DOCUMENT_ROOT.'/supplier_proposal/class/supplier_proposal.class.php';
 }
 if ((isModEnabled("fournisseur") && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD)) || isModEnabled("supplier_invoice")) {
@@ -58,7 +58,7 @@ if ((isModEnabled("fournisseur") && empty($conf->global->MAIN_USE_NEW_SUPPLIERMO
 if ((isModEnabled("fournisseur") && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD)) || isModEnabled("supplier_order")) {
 	require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.commande.class.php';
 }
-if (!empty($conf->contrat->enabled)) {
+if (isModEnabled('contrat')) {
 	require_once DOL_DOCUMENT_ROOT.'/contrat/class/contrat.class.php';
 }
 if (!empty($conf->ficheinter->enabled)) {
@@ -95,7 +95,7 @@ if (isModEnabled("banque")) {
 if (!empty($conf->salaries->enabled)) {
 	require_once DOL_DOCUMENT_ROOT.'/salaries/class/salary.class.php';
 }
-if (!empty($conf->categorie->enabled)) {
+if (isModEnabled('categorie')) {
 	require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 }
 if (!empty($conf->mrp->enabled)) {
diff --git a/htdocs/projet/list.php b/htdocs/projet/list.php
index 7cfb66288e1..7deaf0a1870 100644
--- a/htdocs/projet/list.php
+++ b/htdocs/projet/list.php
@@ -35,7 +35,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/html.formprojet.class.php';
 
-if (!empty($conf->categorie->enabled)) {
+if (isModEnabled('categorie')) {
 	require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcategory.class.php';
 	require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 }
@@ -148,7 +148,7 @@ if ($search_status == '') {
 	$search_status = -1; // -1 or 1
 }
 
-if (!empty($conf->categorie->enabled)) {
+if (isModEnabled('categorie')) {
 	$search_category_array = GETPOST("search_category_".Categorie::TYPE_PROJECT."_list", "array");
 }
 
@@ -413,7 +413,7 @@ $reshook = $hookmanager->executeHooks('printFieldListSelect', $parameters, $obje
 $sql .= preg_replace('/^,/', '', $hookmanager->resPrint);
 $sql = preg_replace('/,\s*$/', '', $sql);
 $sql .= " FROM ".MAIN_DB_PREFIX.$object->table_element." as p";
-if (!empty($conf->categorie->enabled)) {
+if (isModEnabled('categorie')) {
 	$sql .= Categorie::getFilterJoinQuery(Categorie::TYPE_PROJECT, "p.rowid");
 }
 if (!empty($extrafields->attributes[$object->table_element]['label']) &&is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label'])) {
@@ -436,7 +436,7 @@ if ($search_project_contact > 0) {
 	$sql .= ", ".MAIN_DB_PREFIX."element_contact as ecp_contact";
 }
 $sql .= " WHERE p.entity IN (".getEntity('project').')';
-if (!empty($conf->categorie->enabled)) {
+if (isModEnabled('categorie')) {
 	$sql .= Categorie::getFilterSelectQuery(Categorie::TYPE_PROJECT, "p.rowid", $search_category_array);
 }
 if (empty($user->rights->projet->all->lire)) {
@@ -859,7 +859,7 @@ if ($user->rights->user->user->lire) {
 }
 
 // Filter on categories
-if (!empty($conf->categorie->enabled) && $user->rights->categorie->lire) {
+if (isModEnabled('categorie') && $user->rights->categorie->lire) {
 	$formcategory = new FormCategory($db);
 	$moreforfilter .= $formcategory->getFilterBox(Categorie::TYPE_PROJECT, $search_category_array);
 }
diff --git a/htdocs/projet/tasks.php b/htdocs/projet/tasks.php
index 018cb5c3408..de9bdf7855c 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 (!empty($conf->categorie->enabled)) {
+if (isModEnabled('categorie')) {
 	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 5a91f47dbd9..a25b44082a0 100644
--- a/htdocs/projet/tasks/list.php
+++ b/htdocs/projet/tasks/list.php
@@ -671,7 +671,7 @@ if ($search_all) {
 $moreforfilter = '';
 
 // Filter on categories
-if (!empty($conf->categorie->enabled) && $user->rights->categorie->lire) {
+if (isModEnabled('categorie') && $user->rights->categorie->lire) {
 	require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 	$moreforfilter .= '<div class="divsearchfield">';
 	$tmptitle = $langs->trans('ProjectCategories');
diff --git a/htdocs/projet/tasks/time.php b/htdocs/projet/tasks/time.php
index d803162afc4..c1152510cca 100644
--- a/htdocs/projet/tasks/time.php
+++ b/htdocs/projet/tasks/time.php
@@ -542,7 +542,7 @@ if ($action == 'confirm_generateinvoice') {
 					$arrayoftasks[$object->timespent_id]['totalvaluetodivideby3600'] = $object->timespent_duration * $object->timespent_thm;
 					$arrayoftasks[$object->timespent_id]['note'] = $ftask->ref.' - '.$ftask->label.' - '.$username.($object->timespent_note ? ' - '.$object->timespent_note : '');		// TODO Add user name in note
 					if (!empty($withdetail)) {
-						if (!empty($conf->fckeditor->enabled) && !empty($conf->global->FCKEDITOR_ENABLE_DETAILS)) {
+						if (isModEnabled('fckeditor') && !empty($conf->global->FCKEDITOR_ENABLE_DETAILS)) {
 							$arrayoftasks[$object->timespent_id]['note'] .= "<br/>";
 						} else {
 							$arrayoftasks[$object->timespent_id]['note'] .= "\n";
diff --git a/htdocs/societe/card.php b/htdocs/societe/card.php
index 331fb58ae9c..2467d9959bc 100644
--- a/htdocs/societe/card.php
+++ b/htdocs/societe/card.php
@@ -71,7 +71,7 @@ $langs->loadLangs(array("companies", "commercial", "bills", "banks", "users"));
 if (isModEnabled('adherent')) {
 	$langs->load("members");
 }
-if (!empty($conf->categorie->enabled)) {
+if (isModEnabled('categorie')) {
 	$langs->load("categories");
 }
 if (!empty($conf->incoterm->enabled)) {
@@ -1477,7 +1477,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 		print '</td></tr>';
 
 		if ((isModEnabled("fournisseur") && !empty($user->rights->fournisseur->lire) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD)) || (isModEnabled("supplier_order") && !empty($user->rights->supplier_order->lire)) || (isModEnabled("supplier_invoice") && !empty($user->rights->supplier_invoice->lire))
-			|| (!empty($conf->supplier_proposal->enabled) && !empty($user->rights->supplier_proposal->lire))) {
+			|| (isModEnabled('supplier_proposal') && !empty($user->rights->supplier_proposal->lire))) {
 			// Supplier
 			print '<tr>';
 			print '<td>'.$form->editfieldkey('Vendor', 'fournisseur', '', $object, 0, 'string', '', 1).'</td><td>';
@@ -1762,7 +1762,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 		}
 
 		// Categories
-		if (!empty($conf->categorie->enabled) && !empty($user->rights->categorie->lire)) {
+		if (isModEnabled('categorie') && !empty($user->rights->categorie->lire)) {
 			$langs->load('categories');
 
 			// Customer
@@ -2177,7 +2177,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 
 			// Supplier
 			if (((isModEnabled("fournisseur") && !empty($user->rights->fournisseur->lire) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD)) || (isModEnabled("supplier_order") && !empty($user->rights->supplier_order->lire)) || (isModEnabled("supplier_invoice") && !empty($user->rights->supplier_invoice->lire)))
-				|| (!empty($conf->supplier_proposal->enabled) && !empty($user->rights->supplier_proposal->lire))) {
+				|| (isModEnabled('supplier_proposal') && !empty($user->rights->supplier_proposal->lire))) {
 				print '<tr>';
 				print '<td>'.$form->editfieldkey('Supplier', 'fournisseur', '', $object, 0, 'string', '', 1).'</td>';
 				print '<td class="maxwidthonsmartphone">';
@@ -2463,7 +2463,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 			}
 
 			// Categories
-			if (!empty($conf->categorie->enabled) && !empty($user->rights->categorie->lire)) {
+			if (isModEnabled('categorie') && !empty($user->rights->categorie->lire)) {
 				// Customer
 				print '<tr class="visibleifcustomer"><td>'.$form->editfieldkey('CustomersCategoriesShort', 'custcats', '', $object, 0).'</td>';
 				print '<td colspan="3">';
@@ -2888,7 +2888,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 		print '<table class="border tableforfield centpercent">';
 
 		// Tags / categories
-		if (!empty($conf->categorie->enabled) && !empty($user->rights->categorie->lire)) {
+		if (isModEnabled('categorie') && !empty($user->rights->categorie->lire)) {
 			// Customer
 			if ($object->prospect || $object->client || !empty($conf->global->THIRDPARTY_CAN_HAVE_CUSTOMER_CATEGORY_EVEN_IF_NOT_CUSTOMER_PROSPECT)) {
 				print '<tr><td>'.$langs->trans("CustomersCategoriesShort").'</td>';
diff --git a/htdocs/societe/consumption.php b/htdocs/societe/consumption.php
index a8f250f29d5..58f568b6f6a 100644
--- a/htdocs/societe/consumption.php
+++ b/htdocs/societe/consumption.php
@@ -176,7 +176,7 @@ if ($object->client) {
 	if (isModEnabled('facture') && $user->rights->facture->lire) {
 		$elementTypeArray['invoice'] = $langs->transnoentitiesnoconv('Invoices');
 	}
-	if (!empty($conf->contrat->enabled) && $user->rights->contrat->lire) {
+	if (isModEnabled('contrat') && $user->rights->contrat->lire) {
 		$elementTypeArray['contract'] = $langs->transnoentitiesnoconv('Contracts');
 	}
 }
diff --git a/htdocs/societe/contact.php b/htdocs/societe/contact.php
index 14c1347c98c..313947cbb0e 100644
--- a/htdocs/societe/contact.php
+++ b/htdocs/societe/contact.php
@@ -50,7 +50,7 @@ if (isModEnabled('adherent')) {
 // Load translation files required by the page
 $langs->loadLangs(array("companies", "commercial", "bills", "banks", "users"));
 
-if (!empty($conf->categorie->enabled)) {
+if (isModEnabled('categorie')) {
 	$langs->load("categories");
 }
 if (!empty($conf->incoterm->enabled)) {
diff --git a/htdocs/societe/index.php b/htdocs/societe/index.php
index c90dc1537d1..1d0bdfe39a1 100644
--- a/htdocs/societe/index.php
+++ b/htdocs/societe/index.php
@@ -199,7 +199,7 @@ $thirdpartygraph .= '</table>';
 $thirdpartygraph .= '</div>';
 
 $thirdpartycateggraph = '';
-if (!empty($conf->categorie->enabled) && !empty($conf->global->CATEGORY_GRAPHSTATS_ON_THIRDPARTIES)) {
+if (isModEnabled('categorie') && !empty($conf->global->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 c8f0045d619..ff6de888284 100644
--- a/htdocs/societe/list.php
+++ b/htdocs/societe/list.php
@@ -979,7 +979,7 @@ if ($search_all) {
 // Filter on categories
 $moreforfilter = '';
 if (empty($type) || $type == 'c' || $type == 'p') {
-	if (!empty($conf->categorie->enabled) && $user->rights->categorie->lire) {
+	if (isModEnabled('categorie') && $user->rights->categorie->lire) {
 		require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 		$moreforfilter .= '<div class="divsearchfield">';
 		$tmptitle = $langs->trans('Categories');
@@ -990,7 +990,7 @@ if (empty($type) || $type == 'c' || $type == 'p') {
 }
 
 if (empty($type) || $type == 'f') {
-	if (isModEnabled("fournisseur") && !empty($conf->categorie->enabled) && $user->rights->categorie->lire) {
+	if (isModEnabled("fournisseur") && isModEnabled('categorie') && $user->rights->categorie->lire) {
 		require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 		$moreforfilter .= '<div class="divsearchfield">';
 		$tmptitle = $langs->trans('Categories');
diff --git a/htdocs/societe/paymentmodes.php b/htdocs/societe/paymentmodes.php
index f22a5fb440b..02d58d0dfe3 100644
--- a/htdocs/societe/paymentmodes.php
+++ b/htdocs/societe/paymentmodes.php
@@ -797,7 +797,7 @@ if ($socid && $action != 'edit' && $action != 'create' && $action != 'editcard'
 		if (isModEnabled('facture') && $user->rights->facture->lire) {
 			$elementTypeArray['invoice'] = $langs->transnoentitiesnoconv('Invoices');
 		}
-		if (!empty($conf->contrat->enabled) && $user->rights->contrat->lire) {
+		if (isModEnabled('contrat') && $user->rights->contrat->lire) {
 			$elementTypeArray['contract'] = $langs->transnoentitiesnoconv('Contracts');
 		}
 
diff --git a/htdocs/supplier_proposal/index.php b/htdocs/supplier_proposal/index.php
index f151651d186..6fd6480105b 100644
--- a/htdocs/supplier_proposal/index.php
+++ b/htdocs/supplier_proposal/index.php
@@ -162,7 +162,7 @@ if ($resql) {
 /*
  * Draft askprice
  */
-if (!empty($conf->supplier_proposal->enabled)) {
+if (isModEnabled('supplier_proposal')) {
 	$sql = "SELECT c.rowid, c.ref, s.nom as socname, s.rowid as socid, s.canvas, s.client";
 	$sql .= " FROM ".MAIN_DB_PREFIX."supplier_proposal as c";
 	$sql .= ", ".MAIN_DB_PREFIX."societe as s";
@@ -297,7 +297,7 @@ if ($resql) {
 /*
  * Opened askprice
  */
-if (!empty($conf->supplier_proposal->enabled) && $user->rights->supplier_proposal->lire) {
+if (isModEnabled('supplier_proposal') && $user->rights->supplier_proposal->lire) {
 	$langs->load("supplier_proposal");
 
 	$now = dol_now();
diff --git a/htdocs/supplier_proposal/list.php b/htdocs/supplier_proposal/list.php
index 03de4f7ecca..6a8ad41dbd2 100644
--- a/htdocs/supplier_proposal/list.php
+++ b/htdocs/supplier_proposal/list.php
@@ -644,7 +644,7 @@ if ($resql) {
 		$moreforfilter .= '</div>';
 	}
 	// If the user can view products
-	if (!empty($conf->categorie->enabled) && $user->rights->categorie->lire && ($user->rights->produit->lire || $user->rights->service->lire)) {
+	if (isModEnabled('categorie') && $user->rights->categorie->lire && ($user->rights->produit->lire || $user->rights->service->lire)) {
 		include_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 		$moreforfilter .= '<div class="divsearchfield">';
 		$tmptitle = $langs->trans('IncludingProductWithTag');
diff --git a/htdocs/user/card.php b/htdocs/user/card.php
index 7ae7bb70566..3b8b401f372 100644
--- a/htdocs/user/card.php
+++ b/htdocs/user/card.php
@@ -54,7 +54,7 @@ if (!empty($conf->ldap->enabled)) {
 if (isModEnabled('adherent')) {
 	require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
 }
-if (!empty($conf->categorie->enabled)) {
+if (isModEnabled('categorie')) {
 	require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 }
 if (!empty($conf->stock->enabled)) {
@@ -1171,7 +1171,7 @@ if ($action == 'create' || $action == 'adduserldap') {
 	}
 
 	// Categories
-	if (!empty($conf->categorie->enabled) && $user->hasRight("categorie", "read")) {
+	if (isModEnabled('categorie') && $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%');
@@ -1627,7 +1627,7 @@ if ($action == 'create' || $action == 'adduserldap') {
 			}
 
 			// Categories
-			if (!empty($conf->categorie->enabled) && $user->hasRight("categorie", "read")) {
+			if (isModEnabled('categorie') && $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);
@@ -2575,7 +2575,7 @@ if ($action == 'create' || $action == 'adduserldap') {
 			print '</tr>';
 
 			// Categories
-			if (!empty($conf->categorie->enabled) && $user->hasRight("categorie", "read")) {
+			if (isModEnabled('categorie') && $user->hasRight("categorie", "read")) {
 				print '<tr><td>'.$form->editfieldkey('Categories', 'usercats', '', $object, 0).'</td>';
 				print '<td>';
 				print img_picto('', 'category', 'class="pictofixedwidth"');
diff --git a/htdocs/user/list.php b/htdocs/user/list.php
index e22f95d1055..858a46887ba 100644
--- a/htdocs/user/list.php
+++ b/htdocs/user/list.php
@@ -27,7 +27,7 @@
 
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
-if (!empty($conf->categorie->enabled)) {
+if (isModEnabled('categorie')) {
 	require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 }
 
@@ -658,7 +658,7 @@ $moreforfilter = '';
  $moreforfilter.= '</div>';*/
 
 // Filter on categories
-if (!empty($conf->categorie->enabled) && $user->hasRight("categorie", "read")) {
+if (isModEnabled('categorie') && $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 1df44179461..40c39ba3879 100644
--- a/htdocs/user/param_ihm.php
+++ b/htdocs/user/param_ihm.php
@@ -198,7 +198,7 @@ if (isModEnabled('holiday') || isModEnabled('expensereport')) {
 if (isModEnabled("product") || isModEnabled("service")) {
 	$tmparray['product/index.php?mainmenu=products&leftmenu='] = 'ProductsAndServicesArea';
 }
-if (isModEnabled("propal") || isModEnabled('commande') || !empty($conf->ficheinter->enabled) || !empty($conf->contrat->enabled)) {
+if (isModEnabled("propal") || isModEnabled('commande') || !empty($conf->ficheinter->enabled) || isModEnabled('contrat')) {
 	$tmparray['comm/index.php?mainmenu=commercial&leftmenu='] = 'CommercialArea';
 }
 if (!empty($conf->comptabilite->enabled) || !empty($conf->accounting->enabled)) {
diff --git a/htdocs/webservices/admin/index.php b/htdocs/webservices/admin/index.php
index 79d222f7e84..9214b4ad392 100644
--- a/htdocs/webservices/admin/index.php
+++ b/htdocs/webservices/admin/index.php
@@ -107,7 +107,7 @@ $webservices = array(
 		'invoice'			=> 'isModEnabled("facture")',
 		'supplier_invoice'	=> 'isModEnabled("fournisseur")',
 		'actioncomm'		=> 'isModEnabled('agenda')',
-		'category'			=> '!empty($conf->categorie->enabled)',
+		'category'			=> 'isModEnabled('categorie')',
 		'project'			=> '!empty($conf->project->enabled)',
 		'other'				=> ''
 );
diff --git a/htdocs/website/index.php b/htdocs/website/index.php
index 0b599ba640b..e83ea15a34d 100644
--- a/htdocs/website/index.php
+++ b/htdocs/website/index.php
@@ -2767,7 +2767,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 (!empty($conf->categorie->enabled)) {
+			if (isModEnabled('categorie')) {
 				//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);
 			}
@@ -3948,7 +3948,7 @@ if ($action == 'editmeta' || $action == 'createcontainer') {	// Edit properties
 	print '</td></tr>';
 
 	// Categories
-	if (!empty($conf->categorie->enabled) && !empty($user->rights->categorie->lire)) {
+	if (isModEnabled('categorie') && !empty($user->rights->categorie->lire)) {
 		$langs->load('categories');
 
 		if (!GETPOSTISSET('categories')) {
@@ -4270,7 +4270,7 @@ if ($action == 'replacesite' || $action == 'replacesiteconfirm' || $massaction =
 	print '</div>';
 
 	// Categories
-	if (!empty($conf->categorie->enabled) && !empty($user->rights->categorie->lire)) {
+	if (isModEnabled('categorie') && !empty($user->rights->categorie->lire)) {
 		print '<div class="tagtr">';
 		print '<div class="tagtd paddingrightonly marginrightonly opacitymedium tdoverflowmax100onsmartphone" style="padding-right: 10px !important">';
 		print $langs->trans("Category");
@@ -4404,7 +4404,7 @@ if ($action == 'replacesite' || $action == 'replacesiteconfirm' || $massaction =
 
 					// Categories - Tags
 					print '<td>';
-					if (!empty($conf->categorie->enabled) && !empty($user->rights->categorie->lire)) {
+					if (isModEnabled('categorie') && !empty($user->rights->categorie->lire)) {
 						// Get current categories
 						$existing = $c->containing($answerrecord->id, Categorie::TYPE_WEBSITE_PAGE, 'object');
 						if (is_array($existing)) {

From 628ed5495571e8463da5ac35b1b6af32b58c0ba8 Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Wed, 31 Aug 2022 22:02:34 +0200
Subject: [PATCH 467/974] update code

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

diff --git a/htdocs/comm/propal/class/propal.class.php b/htdocs/comm/propal/class/propal.class.php
index 9e4001c3274..3bb8a5b44de 100644
--- a/htdocs/comm/propal/class/propal.class.php
+++ b/htdocs/comm/propal/class/propal.class.php
@@ -7,7 +7,7 @@
  * Copyright (C) 2006       Andre Cianfarani        <acianfa@free.fr>
  * Copyright (C) 2008       Raphael Bertrand        <raphael.bertrand@resultic.fr>
  * Copyright (C) 2010-2020  Juanjo Menent           <jmenent@2byte.es>
- * Copyright (C) 2010-2017  Philippe Grand          <philippe.grand@atoo-net.com>
+ * Copyright (C) 2010-2022  Philippe Grand          <philippe.grand@atoo-net.com>
  * Copyright (C) 2012-2014  Christophe Battarel     <christophe.battarel@altairis.fr>
  * Copyright (C) 2012       Cedric Salvador         <csalvador@gpcsolutions.fr>
  * Copyright (C) 2013       Florian Henry           <florian.henry@open-concept.pro>
@@ -297,7 +297,7 @@ class Propal extends CommonObject
 		'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'=>'$conf->societe->enabled', 'visible'=>-1, 'position'=>23),
-		'fk_projet' =>array('type'=>'integer:Project:projet/class/project.class.php:1:fk_statut=1', 'label'=>'Fk projet', 'enabled'=>'$conf->project->enabled', 'visible'=>-1, 'position'=>24),
+		'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),

From 81c13bcc4c84959ee05df21256b58a0687cce1b1 Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Wed, 31 Aug 2022 22:03:33 +0200
Subject: [PATCH 468/974] update code

---
 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 bf97deb3fd8..10cd8357e21 100644
--- a/htdocs/commande/class/commande.class.php
+++ b/htdocs/commande/class/commande.class.php
@@ -314,7 +314,7 @@ class Commande extends CommonOrder
 		'ref_int' =>array('type'=>'varchar(255)', 'label'=>'RefInt', 'enabled'=>1, 'visible'=>0, 'position'=>27), // deprecated
 		'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'=>'$conf->societe->enabled', 'visible'=>-1, 'notnull'=>1, 'position'=>20),
-		'fk_projet' =>array('type'=>'integer:Project:projet/class/project.class.php:1:fk_statut=1', 'label'=>'Project', 'enabled'=>'$conf->project->enabled', 'visible'=>-1, 'position'=>25),
+		'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),
 		'date_valid' =>array('type'=>'datetime', 'label'=>'DateValidation', 'enabled'=>1, 'visible'=>-1, 'position'=>62),
 		'date_cloture' =>array('type'=>'datetime', 'label'=>'DateClosing', 'enabled'=>1, 'visible'=>-1, 'position'=>65),

From b0ec6adf6b30288019ea91ecaba89a6d1eb892d8 Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Wed, 31 Aug 2022 22:04:45 +0200
Subject: [PATCH 469/974] update code

---
 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 520f074a0c1..f36694bb3b2 100644
--- a/htdocs/compta/sociales/list.php
+++ b/htdocs/compta/sociales/list.php
@@ -100,7 +100,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'=>(!empty($conf->project->enabled))),
+	'p.ref'			=>array('label'=>"ProjectRef", 'checked'=>1, 'position'=>60, 'enable'=>(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 d44a75d7c9f05a8edfc332dc6c19dcc77d20f78b Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Wed, 31 Aug 2022 22:05:18 +0200
Subject: [PATCH 470/974] update code

---
 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 f15f65954cf..2809b586ea1 100644
--- a/htdocs/compta/facture/class/facture-rec.class.php
+++ b/htdocs/compta/facture/class/facture-rec.class.php
@@ -181,7 +181,7 @@ class FactureRec extends CommonInvoice
 		'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'=>'$conf->project->enabled', 'visible'=>-1, 'position'=>85),
+		'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),

From 8a73872130ac3d8a1130873119c80d2f8178843b Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Wed, 31 Aug 2022 22:05:44 +0200
Subject: [PATCH 471/974] update code

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

diff --git a/htdocs/compta/facture/list.php b/htdocs/compta/facture/list.php
index 51257583ef7..5e8507e7229 100644
--- a/htdocs/compta/facture/list.php
+++ b/htdocs/compta/facture/list.php
@@ -215,8 +215,8 @@ $arrayfields = array(
 	'f.date_valid'=>array('label'=>"DateValidation", 'checked'=>0, 'position'=>22),
 	'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", 'checked'=>1, 'enabled'=>(empty($conf->project->enabled) ? 0 : 1), 'position'=>40),
-	'p.title'=>array('label'=>"ProjectLabel", 'checked'=>0, 'enabled'=>(empty($conf->project->enabled) ? 0 : 1), 'position'=>41),
+	'p.ref'=>array('label'=>"ProjectRef", '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.town'=>array('label'=>"Town", 'checked'=>-1, 'position'=>55),

From 7929f752dcaff04eeb33baa129fb45cf6201baee Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Wed, 31 Aug 2022 22:06:11 +0200
Subject: [PATCH 472/974] update code

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

diff --git a/htdocs/contrat/agenda.php b/htdocs/contrat/agenda.php
index a8dc5e7ee3b..da28bdca8bf 100644
--- a/htdocs/contrat/agenda.php
+++ b/htdocs/contrat/agenda.php
@@ -27,7 +27,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/contract.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
 require_once DOL_DOCUMENT_ROOT.'/contrat/class/contrat.class.php';
-if (!empty($conf->project->enabled)) {
+if (isModEnabled('project')) {
 	require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 	require_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php';
 }
@@ -110,7 +110,7 @@ if (empty($reshook)) {
 
 $form = new Form($db);
 $formfile = new FormFile($db);
-if (!empty($conf->project->enabled)) {
+if (isModEnabled('project')) {
 	$formproject = new FormProjets($db);
 }
 
@@ -171,7 +171,7 @@ if ($id > 0) {
 		$morehtmlref .= ' (<a href="'.DOL_URL_ROOT.'/contrat/list.php?socid='.$object->thirdparty->id.'&search_name='.urlencode($object->thirdparty->name).'">'.$langs->trans("OtherContracts").'</a>)';
 	}
 	// Project
-	if (!empty($conf->project->enabled)) {
+	if (isModEnabled('project')) {
 		$langs->load("projects");
 		$morehtmlref .= '<br>'.$langs->trans('Project').' ';
 		if ($user->rights->contrat->creer) {

From d8a25f1b9dae8c14520d21021056aea120bf16bc Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Wed, 31 Aug 2022 22:06:49 +0200
Subject: [PATCH 473/974] update code

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

diff --git a/htdocs/contrat/card.php b/htdocs/contrat/card.php
index 439f312bef6..2b724d006d7 100644
--- a/htdocs/contrat/card.php
+++ b/htdocs/contrat/card.php
@@ -44,7 +44,7 @@ require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
 if (isModEnabled("propal")) {
 	require_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php';
 }
-if (!empty($conf->project->enabled)) {
+if (isModEnabled('project')) {
 	require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 	require_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php';
 }
@@ -1045,7 +1045,7 @@ llxHeader('', $langs->trans("Contract"), $help_url);
 
 $form = new Form($db);
 $formfile = new FormFile($db);
-if (!empty($conf->project->enabled)) {
+if (isModEnabled('project')) {
 	$formproject = new FormProjets($db);
 }
 
@@ -1204,7 +1204,7 @@ if ($action == 'create') {
 	print "</td></tr>";
 
 	// Project
-	if (!empty($conf->project->enabled)) {
+	if (isModEnabled('project')) {
 		$langs->load('projects');
 
 		$formproject = new FormProjets($db);
@@ -1368,7 +1368,7 @@ if ($action == 'create') {
 			$morehtmlref .= ' (<a href="'.DOL_URL_ROOT.'/contrat/list.php?socid='.$object->thirdparty->id.'&search_name='.urlencode($object->thirdparty->name).'">'.$langs->trans("OtherContracts").'</a>)';
 		}
 		// Project
-		if (!empty($conf->project->enabled)) {
+		if (isModEnabled('project')) {
 			$langs->load("projects");
 			$morehtmlref .= '<br>'.$langs->trans('Project').' ';
 			if ($user->rights->contrat->creer) {

From 4e390dd29c26b006d9d3bf587e0fd366ee520861 Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Wed, 31 Aug 2022 22:07:15 +0200
Subject: [PATCH 474/974] update code

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

diff --git a/htdocs/contrat/contact.php b/htdocs/contrat/contact.php
index 1bd9d3388f6..1866fb24c3e 100644
--- a/htdocs/contrat/contact.php
+++ b/htdocs/contrat/contact.php
@@ -29,7 +29,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/contract.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/contrat/class/contrat.class.php';
 require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php';
-if (!empty($conf->project->enabled)) {
+if (isModEnabled('project')) {
 	require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 }
 
@@ -154,7 +154,7 @@ if ($id > 0 || !empty($ref)) {
 		// Thirdparty
 		$morehtmlref .= '<br>'.$langs->trans('ThirdParty').' : '.$object->thirdparty->getNomUrl(1);
 		// Project
-		if (!empty($conf->project->enabled)) {
+		if (isModEnabled('project')) {
 			$langs->load("projects");
 			$morehtmlref .= '<br>'.$langs->trans('Project').' ';
 			if ($user->rights->contrat->creer) {

From 0f080269f1b6b0c397cebea879990a29b28ac7b9 Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Wed, 31 Aug 2022 22:07:45 +0200
Subject: [PATCH 475/974] update code

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

diff --git a/htdocs/contrat/document.php b/htdocs/contrat/document.php
index ce386fe21b9..7f38e9561a4 100644
--- a/htdocs/contrat/document.php
+++ b/htdocs/contrat/document.php
@@ -33,7 +33,7 @@ require_once DOL_DOCUMENT_ROOT.'/contrat/class/contrat.class.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';
-if (!empty($conf->project->enabled)) {
+if (isModEnabled('project')) {
 	require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 }
 
@@ -144,7 +144,7 @@ if ($object->id) {
 		$morehtmlref .= ' (<a href="'.DOL_URL_ROOT.'/contrat/list.php?socid='.$object->thirdparty->id.'&search_name='.urlencode($object->thirdparty->name).'">'.$langs->trans("OtherContracts").'</a>)';
 	}
 	// Project
-	if (!empty($conf->project->enabled)) {
+	if (isModEnabled('project')) {
 		$langs->load("projects");
 		$morehtmlref .= '<br>'.$langs->trans('Project').' ';
 		if ($user->rights->contrat->creer) {

From 42597a3ff3958e4fa102a30a6f5752ea9497bbac Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Wed, 31 Aug 2022 22:08:12 +0200
Subject: [PATCH 476/974] update code

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

diff --git a/htdocs/contrat/note.php b/htdocs/contrat/note.php
index 540491698c1..547604d9f4d 100644
--- a/htdocs/contrat/note.php
+++ b/htdocs/contrat/note.php
@@ -27,7 +27,7 @@
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/contract.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/contrat/class/contrat.class.php';
-if (!empty($conf->project->enabled)) {
+if (isModEnabled('project')) {
 	require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 }
 
@@ -111,7 +111,7 @@ if ($id > 0 || !empty($ref)) {
 	// Thirdparty
 	$morehtmlref .= '<br>'.$langs->trans('ThirdParty').' : '.$object->thirdparty->getNomUrl(1);
 	// Project
-	if (!empty($conf->project->enabled)) {
+	if (isModEnabled('project')) {
 		$langs->load("projects");
 		$morehtmlref .= '<br>'.$langs->trans('Project').' ';
 		if ($user->rights->contrat->creer) {

From e6be63c50a327eca29f199c72547e342ddc1e7c3 Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Wed, 31 Aug 2022 22:08:38 +0200
Subject: [PATCH 477/974] update code

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

diff --git a/htdocs/contrat/class/contrat.class.php b/htdocs/contrat/class/contrat.class.php
index 088d8f9b6d5..9a6326db10c 100644
--- a/htdocs/contrat/class/contrat.class.php
+++ b/htdocs/contrat/class/contrat.class.php
@@ -233,7 +233,7 @@ class Contrat extends CommonObject
 		'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'=>'$conf->societe->enabled', 'visible'=>-1, 'notnull'=>1, '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, 'position'=>75),
+		'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),

From 7a6e8d82d578d95d0b2dc93fd6e50bbf6b019e58 Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Wed, 31 Aug 2022 22:09:11 +0200
Subject: [PATCH 478/974] update code

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

diff --git a/htdocs/core/actions_massactions.inc.php b/htdocs/core/actions_massactions.inc.php
index 3f74ba7fdb2..2854a631e42 100644
--- a/htdocs/core/actions_massactions.inc.php
+++ b/htdocs/core/actions_massactions.inc.php
@@ -456,7 +456,7 @@ if (!$error && $massaction == 'confirm_presend') {
 				//var_dump($oneemailperrecipient); var_dump($listofqualifiedobj); var_dump($listofqualifiedref);
 				foreach ($looparray as $objectid => $objecttmp) {		// $objecttmp is a real object or an empty object if we choose to send one email per thirdparty instead of one per object
 					// Make substitution in email content
-					if (!empty($conf->project->enabled) && method_exists($objecttmp, 'fetch_projet') && is_null($objecttmp->project)) {
+					if (isModEnabled('project') && method_exists($objecttmp, 'fetch_projet') && is_null($objecttmp->project)) {
 						$objecttmp->fetch_projet();
 					}
 					$substitutionarray = getCommonSubstitutionArray($langs, 0, null, $objecttmp);

From 2d2d2546de6546844b6be6a73cb44e3957c3eeff Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Wed, 31 Aug 2022 22:10:05 +0200
Subject: [PATCH 479/974] update code

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

diff --git a/htdocs/core/class/html.formticket.class.php b/htdocs/core/class/html.formticket.class.php
index 83071830ae7..fbf148c8d1b 100644
--- a/htdocs/core/class/html.formticket.class.php
+++ b/htdocs/core/class/html.formticket.class.php
@@ -622,7 +622,7 @@ class FormTicket
 		}
 
 		if ($subelement != 'project') {
-			if (!empty($conf->project->enabled) && !$this->ispublic) {
+			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');

From 033597082017a7f4e51f20b057ad8e8bf5f483a8 Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Wed, 31 Aug 2022 22:10:38 +0200
Subject: [PATCH 480/974] update code

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

diff --git a/htdocs/core/lib/company.lib.php b/htdocs/core/lib/company.lib.php
index 6ba3ca18094..b6900ae22b5 100644
--- a/htdocs/core/lib/company.lib.php
+++ b/htdocs/core/lib/company.lib.php
@@ -138,7 +138,7 @@ function societe_prepare_head(Societe $object)
 		$h++;
 	}
 
-	if (!empty($conf->project->enabled) && (!empty($user->rights->projet->lire))) {
+	if (isModEnabled('project') && (!empty($user->rights->projet->lire))) {
 		$nbProject = 0;
 		// Enable caching of thirdrparty count projects
 		require_once DOL_DOCUMENT_ROOT.'/core/lib/memory.lib.php';
@@ -781,11 +781,11 @@ function show_projects($conf, $langs, $db, $object, $backtopage = '', $nocreatel
 
 	$i = -1;
 
-	if (!empty($conf->project->enabled) && $user->rights->projet->lire) {
+	if (isModEnabled('project') && $user->rights->projet->lire) {
 		$langs->load("projects");
 
 		$newcardbutton = '';
-		if (!empty($conf->project->enabled) && $user->rights->projet->creer && empty($nocreatelink)) {
+		if (isModEnabled('project') && $user->rights->projet->creer && empty($nocreatelink)) {
 			$newcardbutton .= dolGetButtonTitle($langs->trans('AddProject'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/projet/card.php?socid='.$object->id.'&amp;action=create&amp;backtopage='.urlencode($backtopage));
 		}
 

From 1530361963053dc0ec5bce6ad9a0bd51a1afee43 Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Wed, 31 Aug 2022 22:11:06 +0200
Subject: [PATCH 481/974] update code

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

diff --git a/htdocs/core/lib/contact.lib.php b/htdocs/core/lib/contact.lib.php
index ad9c47f4c48..322f1cdbb0e 100644
--- a/htdocs/core/lib/contact.lib.php
+++ b/htdocs/core/lib/contact.lib.php
@@ -57,7 +57,7 @@ function contact_prepare_head(Contact $object)
 	$head[$tab][2] = 'perso';
 	$tab++;
 
-	if (!empty($conf->project->enabled) && $user->hasRight('project', 'lire')) {
+	if (isModEnabled('project') && $user->hasRight('project', 'lire')) {
 		$nbProject = 0;
 		// Enable caching of thirdrparty count projects
 		require_once DOL_DOCUMENT_ROOT.'/core/lib/memory.lib.php';
@@ -170,11 +170,11 @@ function show_contacts_projects($conf, $langs, $db, $object, $backtopage = '', $
 
 	$i = -1;
 
-	if (!empty($conf->project->enabled) && $user->rights->projet->lire) {
+	if (isModEnabled('project') && $user->rights->projet->lire) {
 		$langs->load("projects");
 
 		$newcardbutton = '';
-		if (!empty($conf->project->enabled) && $user->rights->projet->creer && empty($nocreatelink)) {
+		if (isModEnabled('project') && $user->rights->projet->creer && empty($nocreatelink)) {
 			$newcardbutton .= dolGetButtonTitle($langs->trans('AddProject'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/projet/card.php?socid='.$object->id.'&amp;action=create&amp;backtopage='.urlencode($backtopage));
 		}
 

From 6fc7c9bca8b7c05f33c422e8595d92c3107c2d84 Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Wed, 31 Aug 2022 22:11:46 +0200
Subject: [PATCH 482/974] update code

---
 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 53204c4cc41..c82e7deaa5d 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -7398,7 +7398,7 @@ function getCommonSubstitutionArray($outputlangs, $onlykey = 0, $exclude = null,
 				$substitutionarray['__CANDIDATE_FIRSTNAME__'] = '__CANDIDATE_FIRSTNAME__';
 				$substitutionarray['__CANDIDATE_LASTNAME__'] = '__CANDIDATE_LASTNAME__';
 			}
-			if (!empty($conf->project->enabled)) {		// Most objects
+			if (isModEnabled('project')) {		// Most objects
 				$substitutionarray['__PROJECT_ID__'] = '__PROJECT_ID__';
 				$substitutionarray['__PROJECT_REF__'] = '__PROJECT_REF__';
 				$substitutionarray['__PROJECT_NAME__'] = '__PROJECT_NAME__';

From 886cb4f0836f926457bdbbe5818e26c3067a9327 Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Wed, 31 Aug 2022 22:12:10 +0200
Subject: [PATCH 483/974] update code

---
 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 8e514a505bf..226a6a6d7cd 100644
--- a/htdocs/core/lib/project.lib.php
+++ b/htdocs/core/lib/project.lib.php
@@ -186,7 +186,7 @@ function project_prepare_head(Project $project, $moreparam = '')
 			if (!empty($conf->tax->enabled)) {
 				$nbElements += $project->getElementCount('chargesociales', 'chargesociales');
 			}
-			if (!empty($conf->project->enabled)) {
+			if (isModEnabled('project')) {
 				$nbElements += $project->getElementCount('project_task', 'projet_task');
 			}
 			if (!empty($conf->stock->enabled)) {

From 00da52ef8c7751cba212e62c8aa081ff2a3df094 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20France?= <frederic.france@free.fr>
Date: Wed, 31 Aug 2022 22:12:25 +0200
Subject: [PATCH 484/974] fix php8 warnings

---
 htdocs/adherents/class/adherent.class.php           | 6 +++---
 htdocs/admin/commande.php                           | 4 ++--
 htdocs/admin/compta.php                             | 2 +-
 htdocs/modulebuilder/template/mymoduleindex.php     | 4 ++--
 htdocs/modulebuilder/template/myobject_document.php | 4 ++--
 htdocs/website/websiteaccount_card.php              | 4 ++--
 test/phpunit/FactureTest.php                        | 2 +-
 test/phpunit/PricesTest.php                         | 2 +-
 test/phpunit/SocieteTest.php                        | 2 +-
 test/phpunit/UserTest.php                           | 2 +-
 10 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/htdocs/adherents/class/adherent.class.php b/htdocs/adherents/class/adherent.class.php
index 1d2df6c04ab..786814d30fc 100644
--- a/htdocs/adherents/class/adherent.class.php
+++ b/htdocs/adherents/class/adherent.class.php
@@ -2061,7 +2061,7 @@ class Adherent extends CommonObject
 		$err = 0;
 
 		// mailman
-		if (!empty($conf->global->ADHERENT_USE_MAILMAN) && !empty($conf->mailmanspip->enabled)) {
+		if (!empty($conf->global->ADHERENT_USE_MAILMAN) && isModEnabled('mailmanspip')) {
 			$result = $mailmanspip->add_to_mailman($this);
 
 			if ($result < 0) {
@@ -2081,7 +2081,7 @@ class Adherent extends CommonObject
 		}
 
 		// spip
-		if (!empty($conf->global->ADHERENT_USE_SPIP) && !empty($conf->mailmanspip->enabled)) {
+		if (!empty($conf->global->ADHERENT_USE_SPIP) && isModEnabled('mailmanspip')) {
 			$result = $mailmanspip->add_to_spip($this);
 			if ($result < 0) {
 				$this->errors[] = $mailmanspip->error;
@@ -2132,7 +2132,7 @@ class Adherent extends CommonObject
 			}
 		}
 
-		if ($conf->global->ADHERENT_USE_SPIP && !empty($conf->mailmanspip->enabled)) {
+		if ($conf->global->ADHERENT_USE_SPIP && isModEnabled('mailmanspip')) {
 			$result = $mailmanspip->del_to_spip($this);
 			if ($result < 0) {
 				$this->errors[] = $mailmanspip->error;
diff --git a/htdocs/admin/commande.php b/htdocs/admin/commande.php
index eec8bb16417..4bffad16ee3 100644
--- a/htdocs/admin/commande.php
+++ b/htdocs/admin/commande.php
@@ -644,7 +644,7 @@ if ($conf->banque->enabled) {
 
 	print '<tr class="oddeven"><td>';
 	print $langs->trans("BANK_ASK_PAYMENT_BANK_DURING_ORDER").'</td><td>&nbsp;</td><td class="center">';
-	if (! empty($conf->use_javascript_ajax)) {
+	if (!empty($conf->use_javascript_ajax)) {
 		print ajax_constantonoff('BANK_ASK_PAYMENT_BANK_DURING_ORDER');
 	} else {
 		if (empty($conf->global->BANK_ASK_PAYMENT_BANK_DURING_ORDER)) {
@@ -664,7 +664,7 @@ if ($conf->banque->enabled) {
 if (isModEnabled('stock')) {
 	print '<tr class="oddeven"><td>';
 	print $langs->trans("WAREHOUSE_ASK_WAREHOUSE_DURING_ORDER").'</td><td>&nbsp;</td><td class="center">';
-	if (! empty($conf->use_javascript_ajax)) {
+	if (!empty($conf->use_javascript_ajax)) {
 		print ajax_constantonoff('WAREHOUSE_ASK_WAREHOUSE_DURING_ORDER');
 	} else {
 		if (empty($conf->global->WAREHOUSE_ASK_WAREHOUSE_DURING_ORDER)) {
diff --git a/htdocs/admin/compta.php b/htdocs/admin/compta.php
index d215125d51e..7bb291d521e 100644
--- a/htdocs/admin/compta.php
+++ b/htdocs/admin/compta.php
@@ -146,7 +146,7 @@ print "</tr>\n";
 print '<tr class="oddeven"><td width="200"><input type="radio" name="accounting_mode" value="RECETTES-DEPENSES"'.($accounting_mode != 'CREANCES-DETTES' ? ' checked' : '').'> '.$langs->trans('OptionModeTrue').'</td>';
 print '<td colspan="2">'.nl2br($langs->trans('OptionModeTrueDesc'));
 // Write info on way to count VAT
-//if (! empty($conf->global->MAIN_MODULE_COMPTABILITE))
+//if (!empty($conf->global->MAIN_MODULE_COMPTABILITE))
 //{
 //	//	print "<br>\n";
 //	//	print nl2br($langs->trans('OptionModeTrueInfoModuleComptabilite'));
diff --git a/htdocs/modulebuilder/template/mymoduleindex.php b/htdocs/modulebuilder/template/mymoduleindex.php
index 15f3d83ac54..a5620a45966 100644
--- a/htdocs/modulebuilder/template/mymoduleindex.php
+++ b/htdocs/modulebuilder/template/mymoduleindex.php
@@ -100,7 +100,7 @@ print '<div class="fichecenter"><div class="fichethirdleft">';
 
 /* BEGIN MODULEBUILDER DRAFT MYOBJECT
 // Draft MyObject
-if (! empty($conf->mymodule->enabled) && $user->rights->mymodule->read)
+if (isModEnabled('mymodule') && $user->rights->mymodule->read)
 {
 	$langs->load("orders");
 
@@ -181,7 +181,7 @@ $max = $conf->global->MAIN_SIZE_SHORTLIST_LIMIT;
 
 /* BEGIN MODULEBUILDER LASTMODIFIED MYOBJECT
 // Last modified myobject
-if (! empty($conf->mymodule->enabled) && $user->rights->mymodule->read)
+if (isModEnabled('mymodule') && $user->rights->mymodule->read)
 {
 	$sql = "SELECT s.rowid, s.ref, s.label, s.date_creation, s.tms";
 	$sql.= " FROM ".MAIN_DB_PREFIX."mymodule_myobject as s";
diff --git a/htdocs/modulebuilder/template/myobject_document.php b/htdocs/modulebuilder/template/myobject_document.php
index 78d20a1863a..173bea760a0 100644
--- a/htdocs/modulebuilder/template/myobject_document.php
+++ b/htdocs/modulebuilder/template/myobject_document.php
@@ -190,7 +190,7 @@ if ($object->id) {
 	 // Thirdparty
 	 $morehtmlref.='<br>'.$langs->trans('ThirdParty') . ' : ' . (is_object($object->thirdparty) ? $object->thirdparty->getNomUrl(1) : '');
 	 // Project
-	 if (! empty($conf->project->enabled))
+	 if (!empty($conf->project->enabled))
 	 {
 	 $langs->load("projects");
 	 $morehtmlref.='<br>'.$langs->trans('Project') . ' ';
@@ -211,7 +211,7 @@ if ($object->id) {
 	 $morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
 	 }
 	 } else {
-	 if (! empty($object->fk_project)) {
+	 if (!empty($object->fk_project)) {
 	 $proj = new Project($db);
 	 $proj->fetch($object->fk_project);
 	 $morehtmlref .= ': '.$proj->getNomUrl();
diff --git a/htdocs/website/websiteaccount_card.php b/htdocs/website/websiteaccount_card.php
index 261839940e5..39e6e10e3d7 100644
--- a/htdocs/website/websiteaccount_card.php
+++ b/htdocs/website/websiteaccount_card.php
@@ -223,7 +223,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 	// Thirdparty
 	$morehtmlref.='<br>'.$langs->trans('ThirdParty') . ' : ' . $soc->getNomUrl(1);
 	// Project
-	if (! empty($conf->project->enabled))
+	if (!empty($conf->project->enabled))
 	{
 		$langs->load("projects");
 		$morehtmlref.='<br>'.$langs->trans('Project') . ' ';
@@ -245,7 +245,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 				}
 			}
 		} else {
-			if (! empty($object->fk_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=' . $object->fk_project . '" title="' . $langs->trans('ShowProject') . '">';
diff --git a/test/phpunit/FactureTest.php b/test/phpunit/FactureTest.php
index e40ed6aa2e7..891eaf05b99 100644
--- a/test/phpunit/FactureTest.php
+++ b/test/phpunit/FactureTest.php
@@ -86,7 +86,7 @@ class FactureTest extends PHPUnit\Framework\TestCase
 		if (!isModEnabled('facture')) {
 			print __METHOD__." module customer invoice must be enabled.\n"; die(1);
 		}
-		if (! empty($conf->ecotaxdeee->enabled)) {
+		if (!empty($conf->ecotaxdeee->enabled)) {
 			print __METHOD__." ecotaxdeee module must not be enabled.\n"; die(1);
 		}
 
diff --git a/test/phpunit/PricesTest.php b/test/phpunit/PricesTest.php
index 1845bf05149..de847e68411 100644
--- a/test/phpunit/PricesTest.php
+++ b/test/phpunit/PricesTest.php
@@ -38,7 +38,7 @@ if (empty($user->id)) {
 }
 $conf->global->MAIN_DISABLE_ALL_MAILS=1;
 
-if (! empty($conf->global->MAIN_ROUNDING_RULE_TOT)) {
+if (!empty($conf->global->MAIN_ROUNDING_RULE_TOT)) {
 	print "Parameter MAIN_ROUNDING_RULE_TOT must be set to 0 or not set.\n";
 	exit(1);
 }
diff --git a/test/phpunit/SocieteTest.php b/test/phpunit/SocieteTest.php
index 73363140acd..1a93fb5d21f 100644
--- a/test/phpunit/SocieteTest.php
+++ b/test/phpunit/SocieteTest.php
@@ -87,7 +87,7 @@ class SocieteTest extends PHPUnit\Framework\TestCase
 			print "\n".__METHOD__." third party ref checker must be setup to 'mod_codeclient_monkey' not to '".$conf->global->SOCIETE_CODECLIENT_ADDON."'.\n"; die(1);
 		}
 
-		if (! empty($conf->global->MAIN_DISABLEPROFIDRULES)) {
+		if (!empty($conf->global->MAIN_DISABLEPROFIDRULES)) {
 			print "\n".__METHOD__." constant MAIN_DISABLEPROFIDRULES must be empty (if a module set it, disable module).\n"; die(1);
 		}
 
diff --git a/test/phpunit/UserTest.php b/test/phpunit/UserTest.php
index ea7090f2b54..d6bc1093258 100644
--- a/test/phpunit/UserTest.php
+++ b/test/phpunit/UserTest.php
@@ -82,7 +82,7 @@ class UserTest extends PHPUnit\Framework\TestCase
 	{
 		global $conf,$user,$langs,$db;
 
-		if (! empty($conf->global->MAIN_MODULE_LDAP)) {
+		if (!empty($conf->global->MAIN_MODULE_LDAP)) {
 			print "\n".__METHOD__." module LDAP must be disabled.\n"; die(1);
 		}
 

From 01f3d626f2faf3ca9004d2a0353810164aa5ba52 Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Wed, 31 Aug 2022 22:12:45 +0200
Subject: [PATCH 485/974] update code

---
 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 79b020b4883..d0067d7575b 100644
--- a/htdocs/core/lib/security.lib.php
+++ b/htdocs/core/lib/security.lib.php
@@ -876,7 +876,7 @@ function checkUserAccessToObject($user, array $featuresarray, $object = 0, $tabl
 			$checkonentitydone = 1;
 		}
 		if (in_array($feature, $checkproject) && $objectid > 0) {
-			if (!empty($conf->project->enabled) && empty($user->rights->projet->all->lire)) {
+			if (isModEnabled('project') && empty($user->rights->projet->all->lire)) {
 				$projectid = $objectid;
 
 				include_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
@@ -897,7 +897,7 @@ function checkUserAccessToObject($user, array $featuresarray, $object = 0, $tabl
 			$checkonentitydone = 1;
 		}
 		if (in_array($feature, $checktask) && $objectid > 0) {
-			if (!empty($conf->project->enabled) && empty($user->rights->projet->all->lire)) {
+			if (isModEnabled('project') && empty($user->rights->projet->all->lire)) {
 				$task = new Task($db);
 				$task->fetch($objectid);
 				$projectid = $task->fk_project;

From 8e66b7207ec587edb1b74489bcc6865495f3e881 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20France?= <frederic.france@free.fr>
Date: Wed, 31 Aug 2022 22:14:20 +0200
Subject: [PATCH 486/974] replace ! empty by !empty

---
 build/generate_filelist_xml.php               |  2 +-
 dev/initdata/generate-proposal.php            |  2 +-
 dev/initdata/purge-data.php                   |  2 +-
 dev/tools/dolibarr-postgres2mysql.php         |  6 +-
 dev/translation/autotranslator.class.php      |  6 +-
 dev/translation/sanity_check_en_langfiles.php |  4 +-
 dev/translation/strip_language_file.php       |  4 +-
 .../class/accountancyexport.class.php         |  4 +-
 .../actions_adherentcard_common.class.php     |  2 +-
 htdocs/adherents/class/adherent.class.php     |  2 +-
 htdocs/admin/clicktodial.php                  |  2 +-
 htdocs/admin/delais.php                       |  4 +-
 htdocs/admin/mails_senderprofile_list.php     |  2 +-
 htdocs/admin/mails_templates.php              |  4 +-
 htdocs/admin/modulehelp.php                   |  2 +-
 htdocs/admin/paymentbybanktransfer.php        |  2 +-
 htdocs/admin/pdf.php                          |  2 +-
 htdocs/admin/prelevement.php                  |  2 +-
 htdocs/admin/propal.php                       |  2 +-
 htdocs/admin/stock.php                        |  4 +-
 htdocs/admin/supplier_order.php               |  2 +-
 htdocs/admin/tools/export.php                 |  2 +-
 htdocs/admin/tools/export_files.php           |  2 +-
 htdocs/api/class/api_login.class.php          |  2 +-
 htdocs/asset/agenda.php                       |  2 +-
 htdocs/asset/model/agenda.php                 |  2 +-
 htdocs/bom/bom_agenda.php                     |  6 +-
 htdocs/bom/bom_card.php                       | 10 +--
 htdocs/bom/bom_list.php                       |  2 +-
 htdocs/bom/bom_net_needs.php                  | 20 ++---
 htdocs/bom/class/bom.class.php                | 26 +++---
 htdocs/comm/action/class/actioncomm.class.php |  4 +-
 htdocs/comm/action/index.php                  |  2 +-
 htdocs/comm/action/list.php                   |  2 +-
 htdocs/comm/mailing/cibles.php                |  2 +-
 htdocs/comm/mailing/index.php                 |  2 +-
 htdocs/comm/propal/card.php                   | 12 +--
 htdocs/comm/propal/class/propal.class.php     |  4 +-
 htdocs/comm/propal/index.php                  |  4 +-
 htdocs/commande/card.php                      | 14 +--
 htdocs/commande/class/commande.class.php      |  6 +-
 .../compta/cashcontrol/cashcontrol_list.php   |  2 +-
 .../cashcontrol/class/cashcontrol.class.php   |  2 +-
 htdocs/compta/facture/card-rec.php            |  4 +-
 htdocs/compta/facture/card.php                | 10 +--
 htdocs/compta/facture/class/facture.class.php | 14 +--
 htdocs/compta/localtax/index.php              |  2 +-
 htdocs/compta/localtax/quadri_detail.php      |  2 +-
 htdocs/compta/paiement.php                    |  4 +-
 htdocs/compta/paiement/card.php               |  4 +-
 htdocs/compta/payment_sc/card.php             |  2 +-
 htdocs/compta/payment_vat/card.php            |  4 +-
 htdocs/compta/resultat/result.php             | 10 +--
 .../actions_contactcard_common.class.php      |  2 +-
 htdocs/contact/card.php                       |  2 +-
 htdocs/contact/consumption.php                |  4 +-
 htdocs/contact/list.php                       | 12 +--
 htdocs/contact/project.php                    |  4 +-
 htdocs/contrat/agenda.php                     |  4 +-
 htdocs/contrat/class/contrat.class.php        |  2 +-
 htdocs/contrat/contact.php                    |  2 +-
 htdocs/contrat/document.php                   |  2 +-
 htdocs/contrat/note.php                       |  2 +-
 htdocs/contrat/services_list.php              |  2 +-
 htdocs/core/actions_dellink.inc.php           |  2 +-
 htdocs/core/ajax/saveinplace.php              |  4 +-
 htdocs/core/boxes/box_contracts.php           |  2 +-
 htdocs/core/boxes/box_services_contracts.php  |  2 +-
 htdocs/core/boxes/modules_boxes.php           |  2 +-
 htdocs/core/class/CMailFile.class.php         |  6 +-
 htdocs/core/class/antivir.class.php           |  2 +-
 htdocs/core/class/commonobject.class.php      | 10 +--
 htdocs/core/class/extrafields.class.php       |  2 +-
 htdocs/core/class/html.form.class.php         | 28 +++---
 htdocs/core/class/html.formfile.class.php     |  2 +-
 htdocs/core/class/html.formprojet.class.php   |  4 +-
 htdocs/core/class/utils.class.php             |  2 +-
 htdocs/core/customreports.php                 |  2 +-
 htdocs/core/lib/agenda.lib.php                |  2 +-
 htdocs/core/lib/files.lib.php                 |  2 +-
 htdocs/core/lib/functions.lib.php             |  4 +-
 htdocs/core/lib/pdf.lib.php                   | 44 ++++-----
 htdocs/core/lib/project.lib.php               | 46 +++++-----
 htdocs/core/lib/security2.lib.php             |  2 +-
 htdocs/core/lib/sendings.lib.php              |  4 +-
 htdocs/core/lib/stock.lib.php                 |  2 +-
 htdocs/core/lib/usergroups.lib.php            | 14 +--
 htdocs/core/lib/website2.lib.php              |  4 +-
 htdocs/core/menus/standard/auguria.lib.php    |  2 +-
 htdocs/core/menus/standard/eldy.lib.php       |  6 +-
 .../commande/doc/pdf_einstein.modules.php     | 10 +--
 .../commande/doc/pdf_eratosthene.modules.php  | 10 +--
 .../doc/pdf_standard.modules.php              |  2 +-
 .../modules/facture/doc/pdf_crabe.modules.php | 12 +--
 .../facture/doc/pdf_sponge.modules.php        | 12 +--
 htdocs/core/modules/modBlockedLog.class.php   |  2 +-
 htdocs/core/modules/modECM.class.php          |  2 +-
 htdocs/core/modules/modSociete.class.php      |  2 +-
 .../movement/doc/pdf_standard.modules.php     |  2 +-
 .../modules/mrp/doc/pdf_vinci.modules.php     |  6 +-
 .../product/doc/pdf_standard.modules.php      | 10 +--
 .../modules/propale/doc/pdf_azur.modules.php  | 10 +--
 .../modules/propale/doc/pdf_cyan.modules.php  | 10 +--
 .../societe/mod_codecompta_aquarium.php       |  2 +-
 .../doc/pdf_eagle_proforma.modules.php        |  2 +-
 .../doc/pdf_canelle.modules.php               |  6 +-
 .../supplier_order/doc/pdf_cornas.modules.php |  6 +-
 .../doc/pdf_muscadet.modules.php              |  6 +-
 .../doc/pdf_standard.modules.php              |  6 +-
 .../doc/pdf_aurore.modules.php                |  8 +-
 htdocs/core/tpl/login.tpl.php                 |  2 +-
 .../interface_80_modStripe_Stripe.class.php   |  2 +-
 htdocs/don/card.php                           |  4 +-
 htdocs/don/class/don.class.php                |  4 +-
 htdocs/ecm/file_card.php                      |  4 +-
 .../class/emailcollector.class.php            |  2 +-
 .../class/conferenceorbooth.class.php         | 12 +--
 .../class/conferenceorboothattendee.class.php | 16 ++--
 .../conferenceorbooth_contact.php             |  4 +-
 .../conferenceorboothattendee_note.php        |  4 +-
 .../eventorganizationindex.php                |  4 +-
 htdocs/expedition/card.php                    |  8 +-
 htdocs/expensereport/card.php                 | 10 +--
 htdocs/fichinter/class/fichinter.class.php    |  4 +-
 htdocs/fourn/ajax/getSupplierPrices.php       |  2 +-
 .../class/fournisseur.commande.class.php      |  2 +-
 .../class/fournisseur.facture-rec.class.php   | 10 +--
 .../fourn/class/fournisseur.facture.class.php | 14 +--
 htdocs/fourn/commande/card.php                |  4 +-
 htdocs/fourn/facture/card-rec.php             | 90 +++++++++----------
 htdocs/fourn/facture/card.php                 |  8 +-
 htdocs/fourn/facture/list.php                 |  2 +-
 htdocs/ftp/index.php                          |  2 +-
 htdocs/holiday/document.php                   |  2 +-
 htdocs/hrm/class/evaluationdet.class.php      | 16 ++--
 htdocs/hrm/class/job.class.php                | 16 ++--
 htdocs/hrm/class/position.class.php           | 16 ++--
 htdocs/hrm/class/skill.class.php              | 16 ++--
 htdocs/hrm/class/skilldet.class.php           | 16 ++--
 htdocs/hrm/class/skillrank.class.php          | 16 ++--
 htdocs/hrm/establishment/info.php             |  6 +-
 htdocs/hrm/evaluation_agenda.php              |  2 +-
 htdocs/hrm/evaluation_contact.php             |  4 +-
 htdocs/hrm/job_agenda.php                     |  2 +-
 htdocs/hrm/job_contact.php                    |  4 +-
 htdocs/hrm/position_agenda.php                |  2 +-
 htdocs/hrm/position_contact.php               |  4 +-
 htdocs/hrm/skill_agenda.php                   |  2 +-
 htdocs/hrm/skill_contact.php                  |  4 +-
 .../PrintConnectors/ApiPrintConnector.php     |  2 +-
 .../nusoap/lib/class.soap_transport_http.php  |  6 +-
 .../includes/nusoap/lib/class.soapclient.php  |  2 +-
 htdocs/includes/nusoap/lib/nusoap.php         |  8 +-
 htdocs/includes/odtphp/Segment.php            |  2 +-
 htdocs/includes/odtphp/odf.php                |  4 +-
 .../vendor/illuminate/collections/Arr.php     |  2 +-
 .../illuminate/collections/Collection.php     |  2 +-
 .../illuminate/support/ServiceProvider.php    |  2 +-
 .../vendor/illuminate/support/Stringable.php  |  2 +-
 .../support/Testing/Fakes/BusFake.php         |  6 +-
 .../support/Testing/Fakes/EventFake.php       |  2 +-
 .../Testing/Fakes/NotificationFake.php        |  2 +-
 .../support/Testing/Fakes/QueueFake.php       |  2 +-
 htdocs/index.php                              |  4 +-
 htdocs/install/upgrade2.php                   |  4 +-
 htdocs/intracommreport/list.php               |  6 +-
 .../class/knowledgerecord.class.php           | 16 ++--
 .../knowledgemanagementindex.php              |  4 +-
 .../knowledgerecord_agenda.php                |  6 +-
 .../knowledgerecord_card.php                  |  8 +-
 .../knowledgerecord_contact.php               |  4 +-
 .../knowledgerecord_document.php              |  4 +-
 .../knowledgerecord_list.php                  |  2 +-
 .../knowledgerecord_note.php                  |  4 +-
 .../template/class/myobject.class.php         | 16 ++--
 .../template/css/mymodule.css.php             |  2 +-
 .../template/myobject_agenda.php              |  6 +-
 .../modulebuilder/template/myobject_card.php  |  6 +-
 .../template/myobject_contact.php             |  4 +-
 .../modulebuilder/template/myobject_note.php  |  4 +-
 htdocs/mrp/class/mo.class.php                 | 22 ++---
 htdocs/mrp/mo_agenda.php                      |  2 +-
 htdocs/mrp/mo_card.php                        |  2 +-
 htdocs/mrp/mo_list.php                        |  2 +-
 htdocs/mrp/mo_production.php                  |  2 +-
 htdocs/mrp/tpl/originproductline.tpl.php      |  2 +-
 htdocs/multicurrency/multicurrency_rate.php   |  4 +-
 .../partnership/class/partnership.class.php   | 20 ++---
 .../class/partnership_type.class.php          | 12 +--
 htdocs/partnership/partnership_agenda.php     |  6 +-
 htdocs/partnership/partnership_card.php       |  4 +-
 htdocs/partnership/partnership_contact.php    |  4 +-
 htdocs/partnership/partnership_document.php   |  4 +-
 htdocs/partnership/partnership_list.php       |  2 +-
 htdocs/partnership/partnership_note.php       |  4 +-
 htdocs/partnership/partnershipindex.php       |  4 +-
 htdocs/product/card.php                       |  2 +-
 htdocs/product/composition/card.php           |  2 +-
 htdocs/product/inventory/card.php             |  4 +-
 .../inventory/class/inventory.class.php       |  4 +-
 htdocs/product/inventory/inventory.php        | 16 ++--
 htdocs/product/inventory/list.php             |  2 +-
 htdocs/product/list.php                       |  4 +-
 htdocs/product/stock/movement_list.php        |  2 +-
 htdocs/product/stock/productlot_list.php      |  2 +-
 .../class/stocktransfer.class.php             | 16 ++--
 .../class/stocktransferline.class.php         | 16 ++--
 .../stocktransfer/stocktransfer_agenda.php    |  6 +-
 .../stocktransfer/stocktransfer_card.php      |  4 +-
 .../stocktransfer/stocktransfer_document.php  |  6 +-
 .../stocktransfer/stocktransfer_list.php      |  2 +-
 .../stocktransfer/stocktransfer_note.php      |  4 +-
 htdocs/projet/activity/perday.php             |  2 +-
 htdocs/projet/activity/permonth.php           |  2 +-
 htdocs/projet/activity/perweek.php            |  4 +-
 htdocs/projet/card.php                        |  2 +-
 htdocs/projet/class/task.class.php            |  6 +-
 htdocs/projet/tasks/list.php                  |  2 +-
 htdocs/projet/tasks/time.php                  |  6 +-
 htdocs/public/opensurvey/studs.php            |  2 +-
 htdocs/public/payment/newpayment.php          |  6 +-
 htdocs/reception/card.php                     |  4 +-
 .../class/recruitmentcandidature.class.php    | 16 ++--
 .../class/recruitmentjobposition.class.php    | 16 ++--
 htdocs/recruitment/index.php                  |  2 +-
 .../recruitmentcandidature_agenda.php         |  6 +-
 .../recruitmentcandidature_card.php           |  4 +-
 .../recruitmentcandidature_document.php       |  4 +-
 .../recruitmentcandidature_list.php           |  2 +-
 .../recruitmentcandidature_note.php           |  4 +-
 .../recruitmentjobposition_agenda.php         |  2 +-
 htdocs/societe/ajax/ajaxcompanies.php         |  2 +-
 htdocs/societe/card.php                       | 14 +--
 .../class/companypaymentmode.class.php        |  2 +-
 htdocs/societe/consumption.php                |  4 +-
 htdocs/societe/notify/card.php                |  2 +-
 htdocs/societe/paymentmodes.php               |  2 +-
 htdocs/societe/website.php                    |  2 +-
 htdocs/stripe/charge.php                      |  2 +-
 htdocs/stripe/payout.php                      |  4 +-
 htdocs/stripe/transaction.php                 |  4 +-
 htdocs/supplier_proposal/card.php             |  2 +-
 htdocs/takepos/index.php                      |  2 +-
 htdocs/takepos/invoice.php                    |  4 +-
 htdocs/ticket/class/ticket.class.php          |  2 +-
 htdocs/user/card.php                          |  2 +-
 htdocs/user/class/user.class.php              |  2 +-
 htdocs/user/class/usergroup.class.php         |  2 +-
 htdocs/user/param_ihm.php                     |  2 +-
 htdocs/user/perms.php                         |  2 +-
 htdocs/webhook/class/target.class.php         | 16 ++--
 htdocs/webhook/target_agenda.php              |  6 +-
 htdocs/webhook/target_card.php                |  6 +-
 htdocs/webhook/target_contact.php             |  4 +-
 htdocs/webhook/target_note.php                |  4 +-
 htdocs/webhook/webhookindex.php               |  4 +-
 htdocs/website/index.php                      |  6 +-
 test/phpunit/AdherentTest.php                 |  6 +-
 test/phpunit/AllTests.php                     |  4 +-
 test/phpunit/WebservicesInvoicesTest.php      |  6 +-
 test/phpunit/WebservicesOrdersTest.php        |  2 +-
 test/phpunit/WebservicesOtherTest.php         |  4 +-
 test/phpunit/WebservicesProductsTest.php      |  6 +-
 test/phpunit/WebservicesThirdpartyTest.php    |  8 +-
 test/phpunit/WebservicesUserTest.php          |  4 +-
 265 files changed, 762 insertions(+), 762 deletions(-)

diff --git a/build/generate_filelist_xml.php b/build/generate_filelist_xml.php
index 7065e20f92b..3d72ebe6739 100755
--- a/build/generate_filelist_xml.php
+++ b/build/generate_filelist_xml.php
@@ -56,7 +56,7 @@ if (empty($argv[1])) {
 
 $i=0;
 while ($i < $argc) {
-	if (! empty($argv[$i])) {
+	if (!empty($argv[$i])) {
 		parse_str($argv[$i]);	// set all params $release, $includecustom, $includeconstant, $buildzip ...
 	}
 	if (preg_match('/includeconstant=/', $argv[$i])) {
diff --git a/dev/initdata/generate-proposal.php b/dev/initdata/generate-proposal.php
index 0b1c24dc139..8af71d441a1 100755
--- a/dev/initdata/generate-proposal.php
+++ b/dev/initdata/generate-proposal.php
@@ -152,7 +152,7 @@ $user->rights->propal->creer=1;
 $user->rights->propal->propal_advance->validate=1;
 
 
-if (! empty($conf->global->PROPALE_ADDON) && is_readable(DOL_DOCUMENT_ROOT ."/core/modules/propale/".$conf->global->PROPALE_ADDON.".php")) {
+if (!empty($conf->global->PROPALE_ADDON) && is_readable(DOL_DOCUMENT_ROOT ."/core/modules/propale/".$conf->global->PROPALE_ADDON.".php")) {
 	require_once DOL_DOCUMENT_ROOT ."/core/modules/propale/".$conf->global->PROPALE_ADDON.".php";
 }
 
diff --git a/dev/initdata/purge-data.php b/dev/initdata/purge-data.php
index 9214f34d810..d75c9fae8b2 100755
--- a/dev/initdata/purge-data.php
+++ b/dev/initdata/purge-data.php
@@ -218,7 +218,7 @@ if ($date == 'all') {
 }
 
 // Replace database handler
-if (! empty($argv[4])) {
+if (!empty($argv[4])) {
 	$db->close();
 	unset($db);
 	$db=getDoliDBInstance($argv[4], $argv[5], $argv[6], $argv[7], $argv[8], $argv[9]);
diff --git a/dev/tools/dolibarr-postgres2mysql.php b/dev/tools/dolibarr-postgres2mysql.php
index 1a997ddc63c..76be3804f1a 100644
--- a/dev/tools/dolibarr-postgres2mysql.php
+++ b/dev/tools/dolibarr-postgres2mysql.php
@@ -487,7 +487,7 @@ function pg2mysql(&$input, &$arrayofprimaryalreadyintabledef, $header = true)
 			$pkey = $line;
 
 			$linenumber ++;
-			if (! empty($lines[$linenumber])) {
+			if (!empty($lines[$linenumber])) {
 				$line = $lines[$linenumber];
 			} else {
 				$line = '';
@@ -517,7 +517,7 @@ function pg2mysql(&$input, &$arrayofprimaryalreadyintabledef, $header = true)
 		if (substr($line, 0, 12) == "CREATE INDEX") {
 			$matches = array();
 			preg_match('/CREATE INDEX "?([a-zA-Z0-9_]*)"? ON "?([a-zA-Z0-9_\.]*)"? USING btree \((.*)\);/', $line, $matches);
-			if (! empty($matches[3])) {
+			if (!empty($matches[3])) {
 				$indexname = $matches[1];
 				$tablename = str_replace('public.', '', $matches[2]);
 				$columns = $matches[3];
@@ -529,7 +529,7 @@ function pg2mysql(&$input, &$arrayofprimaryalreadyintabledef, $header = true)
 		if (substr($line, 0, 19) == "CREATE UNIQUE INDEX") {
 			$matches = array();
 			preg_match('/CREATE UNIQUE INDEX "?([a-zA-Z0-9_]*)"? ON "?([a-zA-Z0-9_\.]*)"? USING btree \((.*)\);/', $line, $matches);
-			if (! empty($matches[3])) {
+			if (!empty($matches[3])) {
 				$indexname = $matches[1];
 				$tablename = str_replace('public.', '', $matches[2]);
 				$columns = str_replace('"', '', $matches[3]);
diff --git a/dev/translation/autotranslator.class.php b/dev/translation/autotranslator.class.php
index 956ad95b9b6..bf1b121b03f 100644
--- a/dev/translation/autotranslator.class.php
+++ b/dev/translation/autotranslator.class.php
@@ -309,11 +309,11 @@ class autoTranslator
 	{
 		// We want to be sure that src_lang and dest_lang are using 2 chars only
 		$tmp=explode('_', $src_lang);
-		if (! empty($tmp[1]) && $tmp[0] == $tmp[1]) {
+		if (!empty($tmp[1]) && $tmp[0] == $tmp[1]) {
 			$src_lang=$tmp[0];
 		}
 		$tmp=explode('_', $dest_lang);
-		if (! empty($tmp[1]) && $tmp[0] == $tmp[1]) {
+		if (!empty($tmp[1]) && $tmp[0] == $tmp[1]) {
 			$dest_lang=$tmp[0];
 		}
 
@@ -349,7 +349,7 @@ class autoTranslator
 		// now, process the JSON string
 		$json = json_decode($body, true);
 
-		if ((! empty($json['responseStatus']) && $json['responseStatus'] != 200)
+		if ((!empty($json['responseStatus']) && $json['responseStatus'] != 200)
 		|| count($json['data']['translations']) == 0) {
 			print "Error: ".$json['responseStatus']." ".$url."\n";
 			return false;
diff --git a/dev/translation/sanity_check_en_langfiles.php b/dev/translation/sanity_check_en_langfiles.php
index 840f09a0adb..95ea90e3f34 100755
--- a/dev/translation/sanity_check_en_langfiles.php
+++ b/dev/translation/sanity_check_en_langfiles.php
@@ -221,7 +221,7 @@ foreach ($dups as $string => $pages) {
 		// Loop on each line keword was found into file.
 		$listoffilesforthisentry=array();
 		foreach ($lines as $line => $translatedvalue) {
-			if (! empty($listoffilesforthisentry[$file])) {
+			if (!empty($listoffilesforthisentry[$file])) {
 				$duplicateinsamefile=1;
 			}
 			$listoffilesforthisentry[$file]=1;
@@ -300,7 +300,7 @@ if ($web) {
 
 // STEP 2 - Search key not used
 
-if ((! empty($_REQUEST['unused']) && $_REQUEST['unused'] == 'true') || (isset($argv[1]) && $argv[1]=='unused=true')) {
+if ((!empty($_REQUEST['unused']) && $_REQUEST['unused'] == 'true') || (isset($argv[1]) && $argv[1]=='unused=true')) {
 	print "***** Strings in en_US that are never used:\n";
 
 	$unused=array();
diff --git a/dev/translation/strip_language_file.php b/dev/translation/strip_language_file.php
index f0a0397cd6e..b2427c9f57a 100755
--- a/dev/translation/strip_language_file.php
+++ b/dev/translation/strip_language_file.php
@@ -303,8 +303,8 @@ foreach ($filesToProcess as $fileToProcess) {
 
 			// String exists in both files and value into alternative language differs from main language but also from english files
 			// so we keep it.
-			if ((! empty($aSecondary[$key]) && $aSecondary[$key] != $aPrimary[$key]
-				&& ! empty($aEnglish[$key]) && $aSecondary[$key] != $aEnglish[$key])
+			if ((!empty($aSecondary[$key]) && $aSecondary[$key] != $aPrimary[$key]
+				&& !empty($aEnglish[$key]) && $aSecondary[$key] != $aEnglish[$key])
 				|| in_array($key, $arrayofkeytoalwayskeep) || preg_match('/^FormatDate/', $key) || preg_match('/^FormatHour/', $key)
 				) {
 				//print "Key $key differs (aSecondary=".$aSecondary[$key].", aPrimary=".$aPrimary[$key].", aEnglish=".$aEnglish[$key].") so we add it into new secondary language (line: $cnt).\n";
diff --git a/htdocs/accountancy/class/accountancyexport.class.php b/htdocs/accountancy/class/accountancyexport.class.php
index c8c4099e67e..e4af034b1f4 100644
--- a/htdocs/accountancy/class/accountancyexport.class.php
+++ b/htdocs/accountancy/class/accountancyexport.class.php
@@ -1347,7 +1347,7 @@ class AccountancyExport
 			}
 			print $nature_piece.$separator;
 			// RACI
-			//			if (! empty($line->subledger_account)) {
+			//			if (!empty($line->subledger_account)) {
 			//              if ($line->doc_type == 'supplier_invoice') {
 			//                  $racine_subledger_account = '40';
 			//              } elseif ($line->doc_type == 'customer_invoice') {
@@ -1610,7 +1610,7 @@ class AccountancyExport
 			}
 			print $nature_piece.$separator;
 			// RACI
-			//			if (! empty($line->subledger_account)) {
+			//			if (!empty($line->subledger_account)) {
 			//				if ($line->doc_type == 'supplier_invoice') {
 			//					$racine_subledger_account = '40';
 			//				} elseif ($line->doc_type == 'customer_invoice') {
diff --git a/htdocs/adherents/canvas/actions_adherentcard_common.class.php b/htdocs/adherents/canvas/actions_adherentcard_common.class.php
index 502249907e8..45d9c4f8fce 100644
--- a/htdocs/adherents/canvas/actions_adherentcard_common.class.php
+++ b/htdocs/adherents/canvas/actions_adherentcard_common.class.php
@@ -65,7 +65,7 @@ abstract class ActionsAdherentCardCommon
 
 		/*if (is_object($this->object) && method_exists($this->object,'fetch'))
 		{
-			if (! empty($id)) $this->object->fetch($id);
+			if (!empty($id)) $this->object->fetch($id);
 		}
 		else
 		{*/
diff --git a/htdocs/adherents/class/adherent.class.php b/htdocs/adherents/class/adherent.class.php
index 786814d30fc..46420995312 100644
--- a/htdocs/adherents/class/adherent.class.php
+++ b/htdocs/adherents/class/adherent.class.php
@@ -1108,7 +1108,7 @@ class Adherent extends CommonObject
 		// Mise a jour
 		$sql = "UPDATE ".MAIN_DB_PREFIX."adherent";
 		$sql .= " SET pass_crypted = '".$this->db->escape($password_crypted)."'";
-		//if (! empty($conf->global->DATABASE_PWD_ENCRYPTED))
+		//if (!empty($conf->global->DATABASE_PWD_ENCRYPTED))
 		if ($isencrypted) {
 			$sql .= ", pass = null";
 		} else {
diff --git a/htdocs/admin/clicktodial.php b/htdocs/admin/clicktodial.php
index 8f98b4d25e9..8b8f2c6c921 100644
--- a/htdocs/admin/clicktodial.php
+++ b/htdocs/admin/clicktodial.php
@@ -107,7 +107,7 @@ print '* https://myphoneserver/phoneurl?login=__LOGIN__&password=__PASS__&caller
 print '* sip:__PHONETO__@my.sip.server';
 print '</span>';
 
-//if (! empty($user->clicktodial_url))
+//if (!empty($user->clicktodial_url))
 //{
 	print '<br>';
 	print info_admin($langs->trans("ValueOverwrittenByUserSetup"));
diff --git a/htdocs/admin/delais.php b/htdocs/admin/delais.php
index af8fed1c197..e64d1bda876 100644
--- a/htdocs/admin/delais.php
+++ b/htdocs/admin/delais.php
@@ -317,8 +317,8 @@ if (empty($conf->global->MAIN_DISABLE_METEO) || $conf->global->MAIN_DISABLE_METE
 
 	$offset = 0;
 	$cursor = 10; // By default
-	//if (! empty($conf->global->MAIN_METEO_OFFSET)) $offset=$conf->global->MAIN_METEO_OFFSET;
-	//if (! empty($conf->global->MAIN_METEO_GAP)) $cursor=$conf->global->MAIN_METEO_GAP;
+	//if (!empty($conf->global->MAIN_METEO_OFFSET)) $offset=$conf->global->MAIN_METEO_OFFSET;
+	//if (!empty($conf->global->MAIN_METEO_GAP)) $cursor=$conf->global->MAIN_METEO_GAP;
 	$level0 = $offset; if (!empty($conf->global->MAIN_METEO_LEVEL0)) {
 		$level0 = $conf->global->MAIN_METEO_LEVEL0;
 	}
diff --git a/htdocs/admin/mails_senderprofile_list.php b/htdocs/admin/mails_senderprofile_list.php
index db92c33a7fb..3f72fc77c6c 100644
--- a/htdocs/admin/mails_senderprofile_list.php
+++ b/htdocs/admin/mails_senderprofile_list.php
@@ -285,7 +285,7 @@ foreach($object->fields as $key => $val)
 	$sql .= "t.".$key.", ";
 }
 // Add fields from extrafields
-if (! empty($extrafields->attributes[$object->table_element]['label'])) {
+if (!empty($extrafields->attributes[$object->table_element]['label'])) {
 	foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val) $sql.=($extrafields->attributes[$object->table_element]['type'][$key] != 'separate' ? "ef.".$key.', ' : '');
 }
 // Add where from hooks
diff --git a/htdocs/admin/mails_templates.php b/htdocs/admin/mails_templates.php
index f53e8c6b0d0..e9b36be353a 100644
--- a/htdocs/admin/mails_templates.php
+++ b/htdocs/admin/mails_templates.php
@@ -823,7 +823,7 @@ if ($action == 'add') {
 		} elseif ($tmpfieldlist == 'joinfiles') {
 			print '<input type="text" class="flat maxwidth50" name="'.$tmpfieldlist.'" value="'.(isset($obj->{$tmpfieldlist}) ? $obj->{$tmpfieldlist} : '1').'">';
 		} else {
-			// print '<textarea cols="3" rows="'.ROWS_2.'" class="flat" name="'.$fieldlist[$field].'">'.(! empty($obj->{$fieldlist[$field]})?$obj->{$fieldlist[$field]}:'').'</textarea>';
+			// print '<textarea cols="3" rows="'.ROWS_2.'" class="flat" name="'.$fieldlist[$field].'">'.(!empty($obj->{$fieldlist[$field]})?$obj->{$fieldlist[$field]}:'').'</textarea>';
 			$okforextended = true;
 			if (empty($conf->global->FCKEDITOR_ENABLE_MAIL)) {
 				$okforextended = false;
@@ -1074,7 +1074,7 @@ if ($num) {
 							$okforextended = true;
 							if (empty($conf->global->FCKEDITOR_ENABLE_MAIL))
 								$okforextended = false;
-							$doleditor = new DolEditor($tmpfieldlist.'-'.$rowid, (! empty($obj->{$tmpfieldlist}) ? $obj->{$tmpfieldlist} : ''), '', 140, 'dolibarr_mailings', 'In', 0, false, $okforextended, ROWS_6, '90%');
+							$doleditor = new DolEditor($tmpfieldlist.'-'.$rowid, (!empty($obj->{$tmpfieldlist}) ? $obj->{$tmpfieldlist} : ''), '', 140, 'dolibarr_mailings', 'In', 0, false, $okforextended, ROWS_6, '90%');
 							print $doleditor->Create(1);
 						}
 						print '</td>';
diff --git a/htdocs/admin/modulehelp.php b/htdocs/admin/modulehelp.php
index 16500c62d59..dbcc9cfdade 100644
--- a/htdocs/admin/modulehelp.php
+++ b/htdocs/admin/modulehelp.php
@@ -137,7 +137,7 @@ foreach ($modulesdir as $dir) {
 								}
 
 								// We discard modules according to property disabled
-								//if (! empty($objMod->hidden)) $modulequalified=0;
+								//if (!empty($objMod->hidden)) $modulequalified=0;
 
 								if ($modulequalified > 0) {
 									$publisher = dol_escape_htmltag($objMod->getPublisher());
diff --git a/htdocs/admin/paymentbybanktransfer.php b/htdocs/admin/paymentbybanktransfer.php
index 997c71bb335..eb918086720 100644
--- a/htdocs/admin/paymentbybanktransfer.php
+++ b/htdocs/admin/paymentbybanktransfer.php
@@ -378,7 +378,7 @@ print '<br>';
  */
 
 /* Disable this, there is no trigger with elementtype 'withdraw'
-if (! empty($conf->global->MAIN_MODULE_NOTIFICATION))
+if (!empty($conf->global->MAIN_MODULE_NOTIFICATION))
 {
 	$langs->load("mails");
 	print load_fiche_titre($langs->trans("Notifications"));
diff --git a/htdocs/admin/pdf.php b/htdocs/admin/pdf.php
index f534ff881da..3468c997a58 100644
--- a/htdocs/admin/pdf.php
+++ b/htdocs/admin/pdf.php
@@ -471,7 +471,7 @@ print '<tr class="liste_titre"><td>'.$langs->trans("Parameter").'</td><td width=
 // Use 2 languages into PDF
 
 print '<tr class="oddeven"><td>'.$langs->trans("PDF_USE_ALSO_LANGUAGE_CODE").'</td><td>';
-//if (! empty($conf->global->MAIN_MULTILANGS))
+//if (!empty($conf->global->MAIN_MULTILANGS))
 	//{
 $selected = GETPOSTISSET('PDF_USE_ALSO_LANGUAGE_CODE') ? GETPOST('PDF_USE_ALSO_LANGUAGE_CODE') : (!empty($conf->global->PDF_USE_ALSO_LANGUAGE_CODE) ? $conf->global->PDF_USE_ALSO_LANGUAGE_CODE : 0);
 print $formadmin->select_language($selected, 'PDF_USE_ALSO_LANGUAGE_CODE', 0, null, 1);
diff --git a/htdocs/admin/prelevement.php b/htdocs/admin/prelevement.php
index 88a02e90457..c76cccdcc5c 100644
--- a/htdocs/admin/prelevement.php
+++ b/htdocs/admin/prelevement.php
@@ -392,7 +392,7 @@ print '<br>';
  */
 
 /* Disable this, there is no trigger with elementtype 'withdraw'
-if (! empty($conf->global->MAIN_MODULE_NOTIFICATION))
+if (!empty($conf->global->MAIN_MODULE_NOTIFICATION))
 {
 	$langs->load("mails");
 	print load_fiche_titre($langs->trans("Notifications"));
diff --git a/htdocs/admin/propal.php b/htdocs/admin/propal.php
index eea567ea27c..408c42cc3a8 100644
--- a/htdocs/admin/propal.php
+++ b/htdocs/admin/propal.php
@@ -705,7 +705,7 @@ if (isModEnabled('facture'))
 
 	print '<tr class="oddeven"><td>';
 	print $langs->trans("BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL").'</td><td>&nbsp;</td><td class="right">';
-	if (! empty($conf->use_javascript_ajax))
+	if (!empty($conf->use_javascript_ajax))
 	{
 		print ajax_constantonoff('BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL');
 	}
diff --git a/htdocs/admin/stock.php b/htdocs/admin/stock.php
index 4103c8cd354..402119e6e51 100644
--- a/htdocs/admin/stock.php
+++ b/htdocs/admin/stock.php
@@ -186,7 +186,7 @@ if (isModEnabled('productbatch')) {
 	print info_admin($langs->trans("WhenProductBatchModuleOnOptionAreForced"));
 }
 
-//if (! empty($conf->global->STOCK_CALCULATE_ON_VALIDATE_ORDER) || ! empty($conf->global->STOCK_CALCULATE_ON_SHIPMENT))
+//if (!empty($conf->global->STOCK_CALCULATE_ON_VALIDATE_ORDER) || !empty($conf->global->STOCK_CALCULATE_ON_SHIPMENT))
 //{
 print info_admin($langs->trans("IfYouUsePointOfSaleCheckModule"));
 print '<br>';
@@ -239,7 +239,7 @@ if (isModEnabled('commande')) {
 print "</td>\n</tr>\n";
 $found++;
 
-//if (! empty($conf->expedition->enabled))
+//if (!empty($conf->expedition->enabled))
 //{
 
 print '<tr class="oddeven">';
diff --git a/htdocs/admin/supplier_order.php b/htdocs/admin/supplier_order.php
index 9482a06be41..0204f184de7 100644
--- a/htdocs/admin/supplier_order.php
+++ b/htdocs/admin/supplier_order.php
@@ -468,7 +468,7 @@ if (isModEnabled('banque')) {
 
 	print '<tr class="oddeven"><td>';
 	print $langs->trans("BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDER").'</td><td>&nbsp;</td><td align="center">';
-	if (! empty($conf->use_javascript_ajax))
+	if (!empty($conf->use_javascript_ajax))
 	{
 		print ajax_constantonoff('BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDER');
 	}
diff --git a/htdocs/admin/tools/export.php b/htdocs/admin/tools/export.php
index 8b1e8ebf8c0..3f3316f6996 100644
--- a/htdocs/admin/tools/export.php
+++ b/htdocs/admin/tools/export.php
@@ -153,7 +153,7 @@ if ($what == 'postgresql') {
 	$cmddump = dol_sanitizePathName($cmddump);
 
 	/* Not required, the command is output on screen but not ran for pgsql
-	if (! empty($dolibarr_main_restrict_os_commands))
+	if (!empty($dolibarr_main_restrict_os_commands))
 	{
 		$arrayofallowedcommand=explode(',', $dolibarr_main_restrict_os_commands);
 		dol_syslog("Command are restricted to ".$dolibarr_main_restrict_os_commands.". We check that one of this command is inside ".$cmddump);
diff --git a/htdocs/admin/tools/export_files.php b/htdocs/admin/tools/export_files.php
index 68cb81ccc24..84bbd197a64 100644
--- a/htdocs/admin/tools/export_files.php
+++ b/htdocs/admin/tools/export_files.php
@@ -127,7 +127,7 @@ $result = dol_mkdir($outputdir);
 
 $utils = new Utils($db);
 
-if ($export_type == 'externalmodule' && ! empty($what)) {
+if ($export_type == 'externalmodule' && !empty($what)) {
 	$fulldirtocompress = DOL_DOCUMENT_ROOT.'/custom/'.dol_sanitizeFileName($what);
 } else {
 	$fulldirtocompress = DOL_DATA_ROOT;
diff --git a/htdocs/api/class/api_login.class.php b/htdocs/api/class/api_login.class.php
index 5282a43dacc..d5362f4ac56 100644
--- a/htdocs/api/class/api_login.class.php
+++ b/htdocs/api/class/api_login.class.php
@@ -88,7 +88,7 @@ class Login
 		global $conf, $dolibarr_main_authentication, $dolibarr_auto_user;
 
 		// Is the login API disabled ? The token must be generated from backoffice only.
-		if (! empty($conf->global->API_DISABLE_LOGIN_API)) {
+		if (!empty($conf->global->API_DISABLE_LOGIN_API)) {
 			dol_syslog("Warning: A try to use the login API has been done while the login API is disabled. You must generate or get the token from the backoffice.", LOG_WARNING);
 			throw new RestException(403, "Error, the login API has been disabled for security purpose. You must generate or get the token from the backoffice.");
 		}
diff --git a/htdocs/asset/agenda.php b/htdocs/asset/agenda.php
index 437e51cf0b1..8d325954a76 100644
--- a/htdocs/asset/agenda.php
+++ b/htdocs/asset/agenda.php
@@ -123,7 +123,7 @@ $form = new Form($db);
 
 if ($object->id > 0) {
 	$title = $langs->trans("Agenda");
-	//if (! empty($conf->global->MAIN_HTML_TITLE) && preg_match('/thirdpartynameonly/',$conf->global->MAIN_HTML_TITLE) && $object->name) $title=$object->name." - ".$title;
+	//if (!empty($conf->global->MAIN_HTML_TITLE) && preg_match('/thirdpartynameonly/',$conf->global->MAIN_HTML_TITLE) && $object->name) $title=$object->name." - ".$title;
 	$help_url = 'EN:Module_Agenda_En';
 	llxHeader('', $title, $help_url);
 
diff --git a/htdocs/asset/model/agenda.php b/htdocs/asset/model/agenda.php
index 51a7fb515bf..fb2ff12aa88 100644
--- a/htdocs/asset/model/agenda.php
+++ b/htdocs/asset/model/agenda.php
@@ -125,7 +125,7 @@ $form = new Form($db);
 
 if ($object->id > 0) {
 	$title = $langs->trans("Agenda");
-	//if (! empty($conf->global->MAIN_HTML_TITLE) && preg_match('/thirdpartynameonly/',$conf->global->MAIN_HTML_TITLE) && $object->name) $title=$object->name." - ".$title;
+	//if (!empty($conf->global->MAIN_HTML_TITLE) && preg_match('/thirdpartynameonly/',$conf->global->MAIN_HTML_TITLE) && $object->name) $title=$object->name." - ".$title;
 	$help_url = 'EN:Module_Agenda_En';
 	llxHeader('', $title, $help_url);
 
diff --git a/htdocs/bom/bom_agenda.php b/htdocs/bom/bom_agenda.php
index d2c64eea0b6..623af8c79d8 100644
--- a/htdocs/bom/bom_agenda.php
+++ b/htdocs/bom/bom_agenda.php
@@ -126,7 +126,7 @@ $form = new Form($db);
 
 if ($object->id > 0) {
 	$title = $langs->trans("Agenda");
-	//if (! empty($conf->global->MAIN_HTML_TITLE) && preg_match('/thirdpartynameonly/',$conf->global->MAIN_HTML_TITLE) && $object->name) $title=$object->name." - ".$title;
+	//if (!empty($conf->global->MAIN_HTML_TITLE) && preg_match('/thirdpartynameonly/',$conf->global->MAIN_HTML_TITLE) && $object->name) $title=$object->name." - ".$title;
 	$help_url = 'EN:Module_Agenda_En|FR:Module_Agenda|ES:Módulo_Agenda|DE:Modul_Agenda';
 	llxHeader('', $title, $help_url);
 
@@ -150,7 +150,7 @@ if ($object->id > 0) {
 	 // Thirdparty
 	 $morehtmlref.='<br>'.$langs->trans('ThirdParty') . ' : ' . $object->thirdparty->getNomUrl(1);
 	 // Project
-	 if (! empty($conf->project->enabled))
+	 if (!empty($conf->project->enabled))
 	 {
 	 $langs->load("projects");
 	 $morehtmlref.='<br>'.$langs->trans('Project') . ' ';
@@ -171,7 +171,7 @@ if ($object->id > 0) {
 		 $morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
 		 }
 		 } else {
-		 if (! empty($object->fk_project)) {
+		 if (!empty($object->fk_project)) {
 		 $proj = new Project($db);
 		 $proj->fetch($object->fk_project);
 		 $morehtmlref.='<a href="'.DOL_URL_ROOT.'/projet/card.php?id=' . $object->fk_project . '" title="' . $langs->trans('ShowProject') . '">';
diff --git a/htdocs/bom/bom_card.php b/htdocs/bom/bom_card.php
index f088ae34050..25b7a8730dd 100644
--- a/htdocs/bom/bom_card.php
+++ b/htdocs/bom/bom_card.php
@@ -335,7 +335,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 		}
 
 		$text = $langs->trans('ConfirmValidateBom', $numref);
-		/*if (! empty($conf->notification->enabled))
+		/*if (!empty($conf->notification->enabled))
 		{
 			require_once DOL_DOCUMENT_ROOT . '/core/class/notify.class.php';
 			$notify = new Notify($db);
@@ -363,7 +363,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 	// Confirmation of closing
 	if ($action == 'close') {
 		$text = $langs->trans('ConfirmCloseBom', $object->ref);
-		/*if (! empty($conf->notification->enabled))
+		/*if (!empty($conf->notification->enabled))
 		{
 			require_once DOL_DOCUMENT_ROOT . '/core/class/notify.class.php';
 			$notify = new Notify($db);
@@ -391,7 +391,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 	// Confirmation of reopen
 	if ($action == 'reopen') {
 		$text = $langs->trans('ConfirmReopenBom', $object->ref);
-		/*if (! empty($conf->notification->enabled))
+		/*if (!empty($conf->notification->enabled))
 		 {
 		 require_once DOL_DOCUMENT_ROOT . '/core/class/notify.class.php';
 		 $notify = new Notify($db);
@@ -457,7 +457,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 	// Thirdparty
 	$morehtmlref.='<br>'.$langs->trans('ThirdParty') . ' : ' . $soc->getNomUrl(1);
 	// Project
-	if (! empty($conf->project->enabled))
+	if (!empty($conf->project->enabled))
 	{
 		$langs->load("projects");
 		$morehtmlref.='<br>'.$langs->trans('Project') . ' ';
@@ -477,7 +477,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 				$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
 			}
 		} else {
-			if (! empty($object->fk_project)) {
+			if (!empty($object->fk_project)) {
 				$proj = new Project($db);
 				$proj->fetch($object->fk_project);
 				$morehtmlref.=$proj->getNomUrl();
diff --git a/htdocs/bom/bom_list.php b/htdocs/bom/bom_list.php
index 48798db9b8f..eb78228f068 100644
--- a/htdocs/bom/bom_list.php
+++ b/htdocs/bom/bom_list.php
@@ -366,7 +366,7 @@ foreach($object->fields as $key => $val)
 	$sql .= "t.".$key.", ";
 }
 // Add fields from extrafields
-if (! empty($extrafields->attributes[$object->table_element]['label'])) {
+if (!empty($extrafields->attributes[$object->table_element]['label'])) {
 	foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val) {
 		$sql .= ($extrafields->attributes[$object->table_element]['type'][$key] != 'separate' ? "ef.".$key.', ' : '');
 	}
diff --git a/htdocs/bom/bom_net_needs.php b/htdocs/bom/bom_net_needs.php
index baf4b096324..668ed29a62e 100644
--- a/htdocs/bom/bom_net_needs.php
+++ b/htdocs/bom/bom_net_needs.php
@@ -195,19 +195,19 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 	 */
 	$text_stock_options = $langs->trans("RealStockDesc").'<br>';
 	$text_stock_options .= $langs->trans("RealStockWillAutomaticallyWhen").'<br>';
-	$text_stock_options .= (! empty($conf->global->STOCK_CALCULATE_ON_SHIPMENT) || ! empty($conf->global->STOCK_CALCULATE_ON_SHIPMENT_CLOSE) ? '- '.$langs->trans("DeStockOnShipment").'<br>' : '');
-	$text_stock_options .= (! empty($conf->global->STOCK_CALCULATE_ON_VALIDATE_ORDER) ? '- '.$langs->trans("DeStockOnValidateOrder").'<br>' : '');
-	$text_stock_options .= (! empty($conf->global->STOCK_CALCULATE_ON_BILL) ? '- '.$langs->trans("DeStockOnBill").'<br>' : '');
-	$text_stock_options .= (! empty($conf->global->STOCK_CALCULATE_ON_SUPPLIER_BILL) ? '- '.$langs->trans("ReStockOnBill").'<br>' : '');
-	$text_stock_options .= (! empty($conf->global->STOCK_CALCULATE_ON_SUPPLIER_VALIDATE_ORDER) ? '- '.$langs->trans("ReStockOnValidateOrder").'<br>' : '');
-	$text_stock_options .= (! empty($conf->global->STOCK_CALCULATE_ON_SUPPLIER_DISPATCH_ORDER) ? '- '.$langs->trans("ReStockOnDispatchOrder").'<br>' : '');
+	$text_stock_options .= (!empty($conf->global->STOCK_CALCULATE_ON_SHIPMENT) || !empty($conf->global->STOCK_CALCULATE_ON_SHIPMENT_CLOSE) ? '- '.$langs->trans("DeStockOnShipment").'<br>' : '');
+	$text_stock_options .= (!empty($conf->global->STOCK_CALCULATE_ON_VALIDATE_ORDER) ? '- '.$langs->trans("DeStockOnValidateOrder").'<br>' : '');
+	$text_stock_options .= (!empty($conf->global->STOCK_CALCULATE_ON_BILL) ? '- '.$langs->trans("DeStockOnBill").'<br>' : '');
+	$text_stock_options .= (!empty($conf->global->STOCK_CALCULATE_ON_SUPPLIER_BILL) ? '- '.$langs->trans("ReStockOnBill").'<br>' : '');
+	$text_stock_options .= (!empty($conf->global->STOCK_CALCULATE_ON_SUPPLIER_VALIDATE_ORDER) ? '- '.$langs->trans("ReStockOnValidateOrder").'<br>' : '');
+	$text_stock_options .= (!empty($conf->global->STOCK_CALCULATE_ON_SUPPLIER_DISPATCH_ORDER) ? '- '.$langs->trans("ReStockOnDispatchOrder").'<br>' : '');
 	$text_stock_options .= (!empty($conf->global->STOCK_CALCULATE_ON_RECEPTION) || !empty($conf->global->STOCK_CALCULATE_ON_RECEPTION_CLOSE) ? '- '.$langs->trans("StockOnReception").'<br>' : '');
 
 	print '<table id="tablelines" class="noborder noshadow" width="100%">';
 	print "<thead>\n";
 	print '<tr class="liste_titre nodrag nodrop">';
 	print '<td class="linecoldescription">'.$langs->trans('Product');
-	if (! empty($conf->global->BOM_SUB_BOM)  && $action == 'treeview') {
+	if (!empty($conf->global->BOM_SUB_BOM)  && $action == 'treeview') {
 		print ' &nbsp; <a id="show_all" href="#">'.img_picto('', 'folder-open', 'class="paddingright"').$langs->trans("ExpandAll").'</a>&nbsp;&nbsp;';
 		print '<a id="hide_all" href="#">'.img_picto('', 'folder', 'class="paddingright"').$langs->trans("UndoExpandAll").'</a>&nbsp;';
 	}
@@ -216,11 +216,11 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 	print '<td class="linecolstock right">'.$form->textwithpicto($langs->trans("PhysicalStock"), $text_stock_options, 1).'</td>';
 	print '<td class="linecoltheoricalstock right">'.$form->textwithpicto($langs->trans("VirtualStock"), $langs->trans("VirtualStockDesc")).'</td>';
 	print  '</tr>';
-	if (! empty($TChildBom)) {
+	if (!empty($TChildBom)) {
 		if ($action == 'treeview') {
 			foreach ($TChildBom as $fk_bom => $TProduct) {
 				$repeatChar = '&emsp;';
-				if (! empty($TProduct['bom'])) {
+				if (!empty($TProduct['bom'])) {
 					if ($TProduct['parentid'] != $object->id) print '<tr class="sub_bom_lines oddeven" parentid="'.$TProduct['parentid'].'">';
 					else print '<tr class="oddeven">';
 					print '<td class="linecoldescription">'.str_repeat($repeatChar, $TProduct['level']).$TProduct['bom']->getNomUrl(1);
@@ -233,7 +233,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 					print '<td class="linecoltheoricalstock right"></td>';
 					print '</tr>';
 				}
-				if (! empty($TProduct['product'])) {
+				if (!empty($TProduct['product'])) {
 					foreach ($TProduct['product'] as $fk_product => $TInfos) {
 						$prod = new Product($db);
 						$prod->fetch($fk_product);
diff --git a/htdocs/bom/class/bom.class.php b/htdocs/bom/class/bom.class.php
index 576d8f5fb09..1bbd9babfba 100644
--- a/htdocs/bom/class/bom.class.php
+++ b/htdocs/bom/class/bom.class.php
@@ -821,8 +821,8 @@ class BOM extends CommonObject
 			return 0;
 		}
 
-		/*if (! ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->bom->create))
-			|| (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->bom->bom_advance->validate))))
+		/*if (! ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->bom->create))
+			|| (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->bom->bom_advance->validate))))
 		{
 			$this->error='NotEnoughPermissions';
 			dol_syslog(get_class($this)."::valid ".$this->error, LOG_ERR);
@@ -933,8 +933,8 @@ class BOM extends CommonObject
 			return 0;
 		}
 
-		/*if (! ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->bom->write))
-		 || (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->bom->bom_advance->validate))))
+		/*if (! ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->bom->write))
+		 || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->bom->bom_advance->validate))))
 		 {
 		 $this->error='Permission denied';
 		 return -1;
@@ -957,8 +957,8 @@ class BOM extends CommonObject
 			return 0;
 		}
 
-		/*if (! ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->bom->write))
-		 || (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->bom->bom_advance->validate))))
+		/*if (! ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->bom->write))
+		 || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->bom->bom_advance->validate))))
 		 {
 		 $this->error='Permission denied';
 		 return -1;
@@ -981,8 +981,8 @@ class BOM extends CommonObject
 			return 0;
 		}
 
-		/*if (! ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->bom->write))
-		 || (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->bom->bom_advance->validate))))
+		/*if (! ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->bom->write))
+		 || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->bom->bom_advance->validate))))
 		 {
 		 $this->error='Permission denied';
 		 return -1;
@@ -1338,9 +1338,9 @@ class BOM extends CommonObject
 	 */
 	public function getNetNeeds(&$TNetNeeds = array(), $qty = 0)
 	{
-		if (! empty($this->lines)) {
+		if (!empty($this->lines)) {
 			foreach ($this->lines as $line) {
-				if (! empty($line->childBom)) {
+				if (!empty($line->childBom)) {
 					foreach ($line->childBom as $childBom) $childBom->getNetNeeds($TNetNeeds, $line->qty*$qty);
 				} else {
 					if (empty($TNetNeeds[$line->fk_product])) {
@@ -1362,9 +1362,9 @@ class BOM extends CommonObject
 	 */
 	public function getNetNeedsTree(&$TNetNeeds = array(), $qty = 0, $level = 0)
 	{
-		if (! empty($this->lines)) {
+		if (!empty($this->lines)) {
 			foreach ($this->lines as $line) {
-				if (! empty($line->childBom)) {
+				if (!empty($line->childBom)) {
 					foreach ($line->childBom as $childBom) {
 						$TNetNeeds[$childBom->id]['bom'] = $childBom;
 						$TNetNeeds[$childBom->id]['parentid'] = $this->id;
@@ -1572,7 +1572,7 @@ class BOMLine extends CommonObjectLine
 	public function fetch($id, $ref = null)
 	{
 		$result = $this->fetchCommon($id, $ref);
-		//if ($result > 0 && ! empty($this->table_element_line)) $this->fetchLines();
+		//if ($result > 0 && !empty($this->table_element_line)) $this->fetchLines();
 		return $result;
 	}
 
diff --git a/htdocs/comm/action/class/actioncomm.class.php b/htdocs/comm/action/class/actioncomm.class.php
index 9a7114a6113..571815fb615 100644
--- a/htdocs/comm/action/class/actioncomm.class.php
+++ b/htdocs/comm/action/class/actioncomm.class.php
@@ -457,11 +457,11 @@ class ActionComm extends CommonObject
 		if (!empty($this->datep) && !empty($this->datef)) {
 			$this->durationp = ($this->datef - $this->datep); // deprecated
 		}
-		//if (! empty($this->date)  && ! empty($this->dateend)) $this->durationa=($this->dateend - $this->date);
+		//if (!empty($this->date)  && !empty($this->dateend)) $this->durationa=($this->dateend - $this->date);
 		if (!empty($this->datep) && !empty($this->datef) && $this->datep > $this->datef) {
 			$this->datef = $this->datep;
 		}
-		//if (! empty($this->date)  && ! empty($this->dateend) && $this->date > $this->dateend) $this->dateend=$this->date;
+		//if (!empty($this->date)  && !empty($this->dateend) && $this->date > $this->dateend) $this->dateend=$this->date;
 		if (!isset($this->fk_project) || $this->fk_project < 0) {
 			$this->fk_project = 0;
 		}
diff --git a/htdocs/comm/action/index.php b/htdocs/comm/action/index.php
index 7fb2f0f129e..4260cd0c583 100644
--- a/htdocs/comm/action/index.php
+++ b/htdocs/comm/action/index.php
@@ -1911,7 +1911,7 @@ function show_day_events($db, $day, $month, $year, $monthshown, $style, &$eventa
 					}
 					//print 'background: #'.$colortouse.';';
 					//print 'background: -webkit-gradient(linear, left top, left bottom, from(#'.dol_color_minus($color, -3).'), to(#'.dol_color_minus($color, -1).'));';
-					//if (! empty($event->transparency)) print 'background: #'.$color.'; background: -webkit-gradient(linear, left top, left bottom, from(#'.$color.'), to(#'.dol_color_minus($color,1).'));';
+					//if (!empty($event->transparency)) print 'background: #'.$color.'; background: -webkit-gradient(linear, left top, left bottom, from(#'.$color.'), to(#'.dol_color_minus($color,1).'));';
 					//else print 'background-color: transparent !important; background: none; border: 1px solid #bbb;';
 					//print ' -moz-border-radius:4px;"';
 					//print 'border: 1px solid #ccc" width="100%"';
diff --git a/htdocs/comm/action/list.php b/htdocs/comm/action/list.php
index dd877e903e4..b42bf003333 100644
--- a/htdocs/comm/action/list.php
+++ b/htdocs/comm/action/list.php
@@ -830,7 +830,7 @@ if (!empty($arrayfields['a.note']['checked'])) {
 	print_liste_field_titre($arrayfields['a.note']['label'], $_SERVER["PHP_SELF"], "a.note", $param, "", "", $sortfield, $sortorder);
 	$totalarray['nbfield']++;
 }
-//if (! empty($conf->global->AGENDA_USE_EVENT_TYPE))
+//if (!empty($conf->global->AGENDA_USE_EVENT_TYPE))
 if (!empty($arrayfields['a.datep']['checked'])) {
 	print_liste_field_titre($arrayfields['a.datep']['label'], $_SERVER["PHP_SELF"], "a.datep,a.id", $param, '', 'align="center"', $sortfield, $sortorder);
 	$totalarray['nbfield']++;
diff --git a/htdocs/comm/mailing/cibles.php b/htdocs/comm/mailing/cibles.php
index c9b48665c95..764455e5f62 100644
--- a/htdocs/comm/mailing/cibles.php
+++ b/htdocs/comm/mailing/cibles.php
@@ -515,7 +515,7 @@ if ($object->fetch($id) >= 0) {
 		$num = $db->num_rows($resql);
 
 		$param = "&id=".$object->id;
-		//if (! empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param.='&contextpage='.urlencode($contextpage);
+		//if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param.='&contextpage='.urlencode($contextpage);
 		if ($limit > 0 && $limit != $conf->liste_limit) {
 			$param .= '&limit='.urlencode($limit);
 		}
diff --git a/htdocs/comm/mailing/index.php b/htdocs/comm/mailing/index.php
index bd1a83e9959..9ac09ac529b 100644
--- a/htdocs/comm/mailing/index.php
+++ b/htdocs/comm/mailing/index.php
@@ -58,7 +58,7 @@ print load_fiche_titre($title);
 print '<div class="fichecenter"><div class="fichethirdleft">';
 
 
-//if (! empty($conf->global->MAIN_SEARCH_FORM_ON_HOME_AREAS))     // This is useless due to the global search combo
+//if (!empty($conf->global->MAIN_SEARCH_FORM_ON_HOME_AREAS))     // This is useless due to the global search combo
 //{
 	// Search into emailings
 	print '<form method="post" action="'.DOL_URL_ROOT.'/comm/mailing/list.php">';
diff --git a/htdocs/comm/propal/card.php b/htdocs/comm/propal/card.php
index f0e1e57249e..fb75b3f0c6b 100644
--- a/htdocs/comm/propal/card.php
+++ b/htdocs/comm/propal/card.php
@@ -693,7 +693,7 @@ if (empty($reshook)) {
 
 				if (
 					!$error && GETPOST('statut', 'int') == $object::STATUS_SIGNED && GETPOST('generate_deposit', 'alpha') == 'on'
-					&& ! empty($deposit_percent_from_payment_terms) && isModEnabled('facture') && !empty($user->rights->facture->creer)
+					&& !empty($deposit_percent_from_payment_terms) && isModEnabled('facture') && !empty($user->rights->facture->creer)
 				) {
 					require_once DOL_DOCUMENT_ROOT . '/compta/facture/class/facture.class.php';
 
@@ -1405,7 +1405,7 @@ if (empty($reshook)) {
 
 			$pu = $pu_ht;
 			$price_base_type = 'HT';
-			if (empty($pu) && ! empty($pu_ttc)) {
+			if (empty($pu) && !empty($pu_ttc)) {
 				$pu = $pu_ttc;
 				$price_base_type = 'TTC';
 			}
@@ -2057,7 +2057,7 @@ if ($action == 'create') {
 
 		$deposit_percent_from_payment_terms = getDictionaryValue('c_payment_term', 'deposit_percent', $object->cond_reglement_id);
 
-		if (!empty($deposit_percent_from_payment_terms) && isModEnabled('facture') && ! empty($user->rights->facture->creer)) {
+		if (!empty($deposit_percent_from_payment_terms) && isModEnabled('facture') && !empty($user->rights->facture->creer)) {
 			require_once DOL_DOCUMENT_ROOT . '/compta/facture/class/facture.class.php';
 
 			$object->fetchObjectLinked();
@@ -2106,7 +2106,7 @@ if ($action == 'create') {
 					'datenow' => true
 				);
 
-				if (! empty($conf->global->INVOICE_POINTOFTAX_DATE)) {
+				if (!empty($conf->global->INVOICE_POINTOFTAX_DATE)) {
 					$formquestion[] = array(
 						'type' => 'date',
 						'tdclass' => 'fieldrequired showonlyifgeneratedeposit',
@@ -2799,7 +2799,7 @@ if ($action == 'create') {
 					}
 				}
 				// Create event
-				/*if ($conf->agenda->enabled && ! empty($conf->global->MAIN_ADD_EVENT_ON_ELEMENT_CARD)) 	// Add hidden condition because this is not a "workflow" action so should appears somewhere else on page.
+				/*if ($conf->agenda->enabled && !empty($conf->global->MAIN_ADD_EVENT_ON_ELEMENT_CARD)) 	// Add hidden condition because this is not a "workflow" action so should appears somewhere else on page.
 				{
 					print '<a class="butAction" href="' . DOL_URL_ROOT . '/comm/action/card.php?action=create&amp;origin=' . $object->element . '&amp;originid=' . $object->id . '&amp;socid=' . $object->socid . '">' . $langs->trans("AddAction") . '</a></div>';
 				}*/
@@ -2809,7 +2809,7 @@ if ($action == 'create') {
 				}
 
 				// ReOpen
-				if ( (( ! empty($conf->global->PROPAL_REOPEN_UNSIGNED_ONLY) && $object->statut == Propal::STATUS_NOTSIGNED) || (empty($conf->global->PROPAL_REOPEN_UNSIGNED_ONLY) && ($object->statut == Propal::STATUS_SIGNED || $object->statut == Propal::STATUS_NOTSIGNED || $object->statut == Propal::STATUS_BILLED))) && $usercanclose) {
+				if ( (( !empty($conf->global->PROPAL_REOPEN_UNSIGNED_ONLY) && $object->statut == Propal::STATUS_NOTSIGNED) || (empty($conf->global->PROPAL_REOPEN_UNSIGNED_ONLY) && ($object->statut == Propal::STATUS_SIGNED || $object->statut == Propal::STATUS_NOTSIGNED || $object->statut == Propal::STATUS_BILLED))) && $usercanclose) {
 					print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=reopen&token='.newToken().(empty($conf->global->MAIN_JUMP_TAG) ? '' : '#reopen').'"';
 					print '>'.$langs->trans('ReOpen').'</a>';
 				}
diff --git a/htdocs/comm/propal/class/propal.class.php b/htdocs/comm/propal/class/propal.class.php
index aa7753946a7..51c07f15269 100644
--- a/htdocs/comm/propal/class/propal.class.php
+++ b/htdocs/comm/propal/class/propal.class.php
@@ -1132,7 +1132,7 @@ class Propal extends CommonObject
 		$sql .= ", '".$this->db->escape($this->model_pdf)."'";
 		$sql .= ", ".($this->fin_validite != '' ? "'".$this->db->idate($this->fin_validite)."'" : "NULL");
 		$sql .= ", ".($this->cond_reglement_id > 0 ? ((int) $this->cond_reglement_id) : 'NULL');
-		$sql .= ", ".(! empty($this->deposit_percent) ? "'".$this->db->escape($this->deposit_percent)."'" : 'NULL');
+		$sql .= ", ".(!empty($this->deposit_percent) ? "'".$this->db->escape($this->deposit_percent)."'" : 'NULL');
 		$sql .= ", ".($this->mode_reglement_id > 0 ? ((int) $this->mode_reglement_id) : 'NULL');
 		$sql .= ", ".($this->fk_account > 0 ? ((int) $this->fk_account) : 'NULL');
 		$sql .= ", '".$this->db->escape($this->ref_client)."'";
@@ -1738,7 +1738,7 @@ class Propal extends CommonObject
 		$sql .= " fk_user_valid=".(isset($this->user_valid) ? $this->user_valid : "null").",";
 		$sql .= " fk_projet=".(isset($this->fk_project) ? $this->fk_project : "null").",";
 		$sql .= " fk_cond_reglement=".(isset($this->cond_reglement_id) ? $this->cond_reglement_id : "null").",";
-		$sql .= " deposit_percent=".(! empty($this->deposit_percent) ? "'".$this->db->escape($this->deposit_percent)."'" : "null").",";
+		$sql .= " deposit_percent=".(!empty($this->deposit_percent) ? "'".$this->db->escape($this->deposit_percent)."'" : "null").",";
 		$sql .= " fk_mode_reglement=".(isset($this->mode_reglement_id) ? $this->mode_reglement_id : "null").",";
 		$sql .= " fk_input_reason=".(isset($this->demand_reason_id) ? $this->demand_reason_id : "null").",";
 		$sql .= " note_private=".(isset($this->note_private) ? "'".$this->db->escape($this->note_private)."'" : "null").",";
diff --git a/htdocs/comm/propal/index.php b/htdocs/comm/propal/index.php
index c03cdf4fdcc..0e108b8ee9f 100644
--- a/htdocs/comm/propal/index.php
+++ b/htdocs/comm/propal/index.php
@@ -311,7 +311,7 @@ if (isModEnabled("propal") && $user->rights->propale->lire) {
  */
 
 /*
-if (! empty($conf->propal->enabled))
+if (!empty($conf->propal->enabled))
 {
 	$sql = "SELECT c.rowid, c.ref, c.fk_statut, s.nom as name, s.rowid as socid";
 	$sql.=" FROM ".MAIN_DB_PREFIX."propal as c";
@@ -386,7 +386,7 @@ if (! empty($conf->propal->enabled))
  */
 
 /*
-if (! empty($conf->propal->enabled))
+if (!empty($conf->propal->enabled))
 {
 	$sql = "SELECT c.rowid, c.ref, c.fk_statut, c.facture, s.nom as name, s.rowid as socid";
 	$sql.= " FROM ".MAIN_DB_PREFIX."commande as c";
diff --git a/htdocs/commande/card.php b/htdocs/commande/card.php
index 507a24fd758..73bf27c0cfd 100644
--- a/htdocs/commande/card.php
+++ b/htdocs/commande/card.php
@@ -445,7 +445,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 (!empty($conf->global->MAIN_PROPAGATE_CONTACTS_FROM_ORIGIN))
 						{
 							$originforcontact = $object->origin;
 							$originidforcontact = $object->origin_id;
@@ -1170,7 +1170,7 @@ if (empty($reshook)) {
 
 			$price_base_type = 'HT';
 			$pu = $pu_ht;
-			if (empty($pu) && ! empty($pu_ttc)) {
+			if (empty($pu) && !empty($pu_ttc)) {
 				$pu = $pu_ttc;
 				$price_base_type = 'TTC';
 			}
@@ -1260,8 +1260,8 @@ if (empty($reshook)) {
 				$deposit_percent_from_payment_terms = getDictionaryValue('c_payment_term', 'deposit_percent', $object->cond_reglement_id);
 
 				if (
-					GETPOST('generate_deposit', 'alpha') == 'on' && ! empty($deposit_percent_from_payment_terms)
-					&& ! empty($conf->facture->enabled) && ! empty($user->rights->facture->creer)
+					GETPOST('generate_deposit', 'alpha') == 'on' && !empty($deposit_percent_from_payment_terms)
+					&& !empty($conf->facture->enabled) && !empty($user->rights->facture->creer)
 				) {
 					require_once DOL_DOCUMENT_ROOT . '/compta/facture/class/facture.class.php';
 
@@ -2108,7 +2108,7 @@ if ($action == 'create' && $usercancreate) {
 
 			$deposit_percent_from_payment_terms = getDictionaryValue('c_payment_term', 'deposit_percent', $object->cond_reglement_id);
 
-			if (! empty($deposit_percent_from_payment_terms) && ! empty($conf->facture->enabled) && ! empty($user->rights->facture->creer)) {
+			if (!empty($deposit_percent_from_payment_terms) && !empty($conf->facture->enabled) && !empty($user->rights->facture->creer)) {
 				require_once DOL_DOCUMENT_ROOT . '/compta/facture/class/facture.class.php';
 
 				$object->fetchObjectLinked();
@@ -2157,7 +2157,7 @@ if ($action == 'create' && $usercancreate) {
 						'datenow' => true
 					);
 
-					if (! empty($conf->global->INVOICE_POINTOFTAX_DATE)) {
+					if (!empty($conf->global->INVOICE_POINTOFTAX_DATE)) {
 						$formquestion[] = array(
 							'type' => 'date',
 							'tdclass' => 'fieldrequired showonlyifgeneratedeposit',
@@ -2805,7 +2805,7 @@ if ($action == 'create' && $usercancreate) {
 					print dolGetButtonAction('', $langs->trans('Modify'), 'default', $_SERVER["PHP_SELF"].'?action=modif&amp;token='.newToken().'&amp;id='.$object->id, '');
 				}
 				// Create event
-				/*if ($conf->agenda->enabled && ! empty($conf->global->MAIN_ADD_EVENT_ON_ELEMENT_CARD))
+				/*if ($conf->agenda->enabled && !empty($conf->global->MAIN_ADD_EVENT_ON_ELEMENT_CARD))
 				{
 					// Add hidden condition because this is not a
 					// "workflow" action so should appears somewhere else on
diff --git a/htdocs/commande/class/commande.class.php b/htdocs/commande/class/commande.class.php
index bf97deb3fd8..ca7d462a432 100644
--- a/htdocs/commande/class/commande.class.php
+++ b/htdocs/commande/class/commande.class.php
@@ -967,7 +967,7 @@ class Commande extends CommonOrder
 		$sql .= ", ".($this->ref_int ? "'".$this->db->escape($this->ref_int)."'" : "null");
 		$sql .= ", '".$this->db->escape($this->model_pdf)."'";
 		$sql .= ", ".($this->cond_reglement_id > 0 ? ((int) $this->cond_reglement_id) : "null");
-		$sql .= ", ".(! empty($this->deposit_percent) ? "'".$this->db->escape($this->deposit_percent)."'" : "null");
+		$sql .= ", ".(!empty($this->deposit_percent) ? "'".$this->db->escape($this->deposit_percent)."'" : "null");
 		$sql .= ", ".($this->mode_reglement_id > 0 ? ((int) $this->mode_reglement_id) : "null");
 		$sql .= ", ".($this->fk_account > 0 ? ((int) $this->fk_account) : 'NULL');
 		$sql .= ", ".($this->availability_id > 0 ? ((int) $this->availability_id) : "null");
@@ -1782,7 +1782,7 @@ class Commande extends CommonOrder
 			$this->lines[] = $line;
 
 			/** POUR AJOUTER AUTOMATIQUEMENT LES SOUSPRODUITS a LA COMMANDE
-			 if (! empty($conf->global->PRODUIT_SOUSPRODUITS))
+			 if (!empty($conf->global->PRODUIT_SOUSPRODUITS))
 			 {
 			 $prod = new Product($this->db);
 			 $prod->fetch($idproduct);
@@ -3355,7 +3355,7 @@ class Commande extends CommonOrder
 		$sql .= " fk_user_valid=".((isset($this->user_valid) && $this->user_valid > 0) ? $this->user_valid : "null").",";
 		$sql .= " fk_projet=".(isset($this->fk_project) ? $this->fk_project : "null").",";
 		$sql .= " fk_cond_reglement=".(isset($this->cond_reglement_id) ? $this->cond_reglement_id : "null").",";
-		$sql .= " deposit_percent=".(! empty($this->deposit_percent) ? strval($this->deposit_percent) : "null").",";
+		$sql .= " deposit_percent=".(!empty($this->deposit_percent) ? strval($this->deposit_percent) : "null").",";
 		$sql .= " fk_mode_reglement=".(isset($this->mode_reglement_id) ? $this->mode_reglement_id : "null").",";
 		$sql .= " date_livraison=".(strval($this->delivery_date) != '' ? "'".$this->db->idate($this->delivery_date)."'" : 'null').",";
 		$sql .= " fk_shipping_method=".(isset($this->shipping_method_id) ? $this->shipping_method_id : "null").",";
diff --git a/htdocs/compta/cashcontrol/cashcontrol_list.php b/htdocs/compta/cashcontrol/cashcontrol_list.php
index 2315f12757a..4e86cb21141 100644
--- a/htdocs/compta/cashcontrol/cashcontrol_list.php
+++ b/htdocs/compta/cashcontrol/cashcontrol_list.php
@@ -269,7 +269,7 @@ foreach($object->fields as $key => $val) {
 	$sql .= "t.".$key.", ";
 }
 // Add fields from extrafields
-if (! empty($extrafields->attributes[$object->table_element]['label'])) {
+if (!empty($extrafields->attributes[$object->table_element]['label'])) {
 	foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val) $sql.=($extrafields->attributes[$object->table_element]['type'][$key] != 'separate' ? "ef.".$key.', ' : '');
 }
 // Add where from hooks
diff --git a/htdocs/compta/cashcontrol/class/cashcontrol.class.php b/htdocs/compta/cashcontrol/class/cashcontrol.class.php
index d7744f777fe..bc45f3b417d 100644
--- a/htdocs/compta/cashcontrol/class/cashcontrol.class.php
+++ b/htdocs/compta/cashcontrol/class/cashcontrol.class.php
@@ -258,7 +258,7 @@ class CashControl extends CommonObject
 
 		/*
 		 $posmodule = $this->posmodule;
-		 if (! empty($user->rights->$posmodule->use))
+		 if (!empty($user->rights->$posmodule->use))
 		 {
 		 $this->error='NotEnoughPermissions';
 		 dol_syslog(get_class($this)."::valid ".$this->error, LOG_ERR);
diff --git a/htdocs/compta/facture/card-rec.php b/htdocs/compta/facture/card-rec.php
index bdb375c6b6b..031247951e9 100644
--- a/htdocs/compta/facture/card-rec.php
+++ b/htdocs/compta/facture/card-rec.php
@@ -652,7 +652,7 @@ if (empty($reshook)) {
 						$newlang = '';
 						if (!empty($conf->global->MAIN_MULTILANGS) && empty($newlang) && GETPOST('lang_id','aZ09')) $newlang = GETPOST('lang_id','aZ09');
 						if (!empty($conf->global->MAIN_MULTILANGS) && empty($newlang))	$newlang = $object->thirdparty->default_lang;
-						if (! empty($newlang)) {
+						if (!empty($newlang)) {
 						$outputlangs = new Translate("", $conf);
 						$outputlangs->setDefaultLang($newlang);
 						}
@@ -861,7 +861,7 @@ if (empty($reshook)) {
 							$newlang = GETPOST('lang_id','aZ09');
 							if (!empty($conf->global->MAIN_MULTILANGS) && empty($newlang))
 								$newlang = $object->thirdparty->default_lang;
-								if (! empty($newlang)) {
+								if (!empty($newlang)) {
 									$outputlangs = new Translate("", $conf);
 									$outputlangs->setDefaultLang($newlang);
 								}
diff --git a/htdocs/compta/facture/card.php b/htdocs/compta/facture/card.php
index 04c6df7ff1e..589eb9dfcab 100644
--- a/htdocs/compta/facture/card.php
+++ b/htdocs/compta/facture/card.php
@@ -1787,7 +1787,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 (!empty($conf->global->MAIN_PROPAGATE_CONTACTS_FROM_ORIGIN))
 						{
 							$originforcontact = $object->origin;
 							$originidforcontact = $object->origin_id;
@@ -2559,7 +2559,7 @@ if (empty($reshook)) {
 
 			$price_base_type = 'HT';
 			$pu = $pu_ht;
-			if (empty($pu) && ! empty($pu_ttc)) {
+			if (empty($pu) && !empty($pu_ttc)) {
 				$pu = $pu_ttc;
 				$price_base_type = 'TTC';
 			}
@@ -3367,13 +3367,13 @@ if ($action == 'create') {
 				);
 				$typedeposit = GETPOST('typedeposit', 'aZ09');
 				$valuedeposit = GETPOST('valuedeposit', 'int');
-				if (empty($typedeposit) && ! empty($objectsrc->deposit_percent)) {
+				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)) {
+					if (!empty($origin_payment_conditions_deposit_percent)) {
 						$typedeposit = 'variable';
 					}
 				}
-				if (empty($valuedeposit) && $typedeposit == 'variable' && ! empty($objectsrc->deposit_percent)) {
+				if (empty($valuedeposit) && $typedeposit == 'variable' && !empty($objectsrc->deposit_percent)) {
 					$valuedeposit = $objectsrc->deposit_percent;
 				}
 				print $form->selectarray('typedeposit', $arraylist, $typedeposit, 0, 0, 0, '', 1);
diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php
index ab0fd8029d8..594ee548da7 100644
--- a/htdocs/compta/facture/class/facture.class.php
+++ b/htdocs/compta/facture/class/facture.class.php
@@ -1587,7 +1587,7 @@ class Facture extends CommonInvoice
 		$amountdeposit = array();
 		$descriptions = array();
 
-		if (! empty($conf->global->MAIN_DEPOSIT_MULTI_TVA)) {
+		if (!empty($conf->global->MAIN_DEPOSIT_MULTI_TVA)) {
 			$amount = $origin->total_ttc * ($origin->deposit_percent / 100);
 
 			$TTotalByTva = array();
@@ -1596,8 +1596,8 @@ class Facture extends CommonInvoice
 					continue;
 				}
 				$TTotalByTva[$line->tva_tx] += $line->total_ttc;
-				$descriptions[$line->tva_tx] .= '<li>' . (! empty($line->product_ref) ? $line->product_ref . ' - ' :  '');
-				$descriptions[$line->tva_tx] .= (! empty($line->product_label) ? $line->product_label . ' - ' : '');
+				$descriptions[$line->tva_tx] .= '<li>' . (!empty($line->product_ref) ? $line->product_ref . ' - ' :  '');
+				$descriptions[$line->tva_tx] .= (!empty($line->product_label) ? $line->product_label . ' - ' : '');
 				$descriptions[$line->tva_tx] .= $langs->trans('Qty') . ' : ' . $line->qty;
 				$descriptions[$line->tva_tx] .= ' - ' . $langs->trans('TotalHT') . ' : ' . price($line->total_ht) . '</li>';
 			}
@@ -1623,8 +1623,8 @@ class Facture extends CommonInvoice
 				$totalamount += $lines[$i]->total_ht; // Fixme : is it not for the customer ? Shouldn't we take total_ttc ?
 				$tva_tx = $lines[$i]->tva_tx;
 				$amountdeposit[$tva_tx] += ($lines[$i]->total_ht * $origin->deposit_percent) / 100;
-				$descriptions[$tva_tx] .= '<li>' . (! empty($lines[$i]->product_ref) ? $lines[$i]->product_ref . ' - ' :  '');
-				$descriptions[$tva_tx] .= (! empty($lines[$i]->product_label) ? $lines[$i]->product_label . ' - ' : '');
+				$descriptions[$tva_tx] .= '<li>' . (!empty($lines[$i]->product_ref) ? $lines[$i]->product_ref . ' - ' :  '');
+				$descriptions[$tva_tx] .= (!empty($lines[$i]->product_label) ? $lines[$i]->product_label . ' - ' : '');
 				$descriptions[$tva_tx] .= $langs->trans('Qty') . ' : ' . $lines[$i]->qty;
 				$descriptions[$tva_tx] .= ' - ' . $langs->trans('TotalHT') . ' : ' . price($lines[$i]->total_ht) . '</li>';
 			}
@@ -1644,7 +1644,7 @@ class Facture extends CommonInvoice
 			$descline = '(DEPOSIT) ('. $origin->deposit_percent .'%) - '.$origin->ref;
 
 			// Hidden conf
-			if (! empty($conf->global->INVOICE_DEPOSIT_VARIABLE_MODE_DETAIL_LINES_IN_DESCRIPTION) && ! empty($descriptions[$tva])) {
+			if (!empty($conf->global->INVOICE_DEPOSIT_VARIABLE_MODE_DETAIL_LINES_IN_DESCRIPTION) && !empty($descriptions[$tva])) {
 				$descline .= '<ul>' . $descriptions[$tva] . '</ul>';
 			}
 
@@ -1739,7 +1739,7 @@ class Facture extends CommonInvoice
 			return null;
 		}
 
-		if (! empty($autoValidateDeposit)) {
+		if (!empty($autoValidateDeposit)) {
 			$validateReturn = $deposit->validate($user, '', 0, $notrigger);
 
 			if ($validateReturn < 0) {
diff --git a/htdocs/compta/localtax/index.php b/htdocs/compta/localtax/index.php
index 28d095715c2..e9aab173337 100644
--- a/htdocs/compta/localtax/index.php
+++ b/htdocs/compta/localtax/index.php
@@ -244,7 +244,7 @@ $description .= $langs->trans($LT);
 $calcmode = $langs->trans("LTReportBuildWithOptionDefinedInModule").' ';
 $calcmode .= ' <span class="opacitymedium">('.$langs->trans("TaxModuleSetupToModifyRulesLT", DOL_URL_ROOT.'/admin/company.php').')</span>';
 
-//if (! empty($conf->global->MAIN_MODULE_ACCOUNTING)) $description.='<br>'.$langs->trans("ThisIsAnEstimatedValue");
+//if (!empty($conf->global->MAIN_MODULE_ACCOUNTING)) $description.='<br>'.$langs->trans("ThisIsAnEstimatedValue");
 
 $period = $form->selectDate($date_start, 'date_start', 0, 0, 0, '', 1, 0).' - '.$form->selectDate($date_end, 'date_end', 0, 0, 0, '', 1, 0);
 
diff --git a/htdocs/compta/localtax/quadri_detail.php b/htdocs/compta/localtax/quadri_detail.php
index 969376209eb..696e70ab40d 100644
--- a/htdocs/compta/localtax/quadri_detail.php
+++ b/htdocs/compta/localtax/quadri_detail.php
@@ -190,7 +190,7 @@ $builddate = dol_now();
 if ($conf->global->TAX_MODE_SELL_PRODUCT == 'payment') $description.=$langs->trans("RulesVATInProducts");
 if ($conf->global->TAX_MODE_SELL_SERVICE == 'invoice') $description.='<br>'.$langs->trans("RulesVATDueServices");
 if ($conf->global->TAX_MODE_SELL_SERVICE == 'payment') $description.='<br>'.$langs->trans("RulesVATInServices");
-if (! empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) {
+if (!empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) {
 	$description.='<br>'.$langs->trans("DepositsAreNotIncluded");
 }
 */
diff --git a/htdocs/compta/paiement.php b/htdocs/compta/paiement.php
index a2b33f4fc7b..46a01e4ba70 100644
--- a/htdocs/compta/paiement.php
+++ b/htdocs/compta/paiement.php
@@ -858,10 +858,10 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
 
 			print '<br><div class="center">';
 			print '<input type="checkbox" checked name="closepaidinvoices"> '.$checkboxlabel;
-			/*if (! empty($conf->prelevement->enabled))
+			/*if (!empty($conf->prelevement->enabled))
 			{
 				$langs->load("withdrawals");
-				if (! empty($conf->global->WITHDRAW_DISABLE_AUTOCREATE_ONPAYMENTS)) print '<br>'.$langs->trans("IfInvoiceNeedOnWithdrawPaymentWontBeClosed");
+				if (!empty($conf->global->WITHDRAW_DISABLE_AUTOCREATE_ONPAYMENTS)) print '<br>'.$langs->trans("IfInvoiceNeedOnWithdrawPaymentWontBeClosed");
 			}*/
 			print '<br><input type="submit" class="button" value="'.dol_escape_htmltag($buttontitle).'"><br><br>';
 			print '</div>';
diff --git a/htdocs/compta/paiement/card.php b/htdocs/compta/paiement/card.php
index f163041a43a..1b2a8dcfc34 100644
--- a/htdocs/compta/paiement/card.php
+++ b/htdocs/compta/paiement/card.php
@@ -119,8 +119,8 @@ if ($action == 'confirm_validate' && $confirm == 'yes' && $user->rights->facture
 				$outputlangs->setDefaultLang(GETPOST('lang_id', 'aZ09'));
 			}
 
-			$hidedetails = ! empty($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_DETAILS) ? 1 : 0;
-			$hidedesc = ! empty($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_DESC) ? 1 : 0;
+			$hidedetails = !empty($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_DETAILS) ? 1 : 0;
+			$hidedesc = !empty($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_DESC) ? 1 : 0;
 			$hideref = !empty($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_REF) ? 1 : 0;
 
 			$sql = 'SELECT f.rowid as facid';
diff --git a/htdocs/compta/payment_sc/card.php b/htdocs/compta/payment_sc/card.php
index f76cc6b27c1..1b2bbe63525 100644
--- a/htdocs/compta/payment_sc/card.php
+++ b/htdocs/compta/payment_sc/card.php
@@ -237,7 +237,7 @@ if ($resql) {
 print '<div class="tabsAction">';
 
 /*
-if (! empty($conf->global->BILL_ADD_PAYMENT_VALIDATION))
+if (!empty($conf->global->BILL_ADD_PAYMENT_VALIDATION))
 {
 	if ($user->socid == 0 && $object->statut == 0 && $_GET['action'] == '')
 	{
diff --git a/htdocs/compta/payment_vat/card.php b/htdocs/compta/payment_vat/card.php
index 401752af11b..ae3e1a201fa 100644
--- a/htdocs/compta/payment_vat/card.php
+++ b/htdocs/compta/payment_vat/card.php
@@ -95,7 +95,7 @@ if ($action == 'confirm_valide' && $confirm == 'yes' && $user->rights->tax->char
 			$fac->fetch($id);
 
 			$outputlangs = $langs;
-			if (! empty($_REQUEST['lang_id']))
+			if (!empty($_REQUEST['lang_id']))
 			{
 				$outputlangs = new Translate("",$conf);
 				$outputlangs->setDefaultLang($_REQUEST['lang_id']);
@@ -292,7 +292,7 @@ if ($resql) {
 print '<div class="tabsAction">';
 
 /*
-if (! empty($conf->global->BILL_ADD_PAYMENT_VALIDATION))
+if (!empty($conf->global->BILL_ADD_PAYMENT_VALIDATION))
 {
 	if ($user->socid == 0 && $object->statut == 0 && $_GET['action'] == '')
 	{
diff --git a/htdocs/compta/resultat/result.php b/htdocs/compta/resultat/result.php
index 57157ec0140..bbe32d0cbc1 100644
--- a/htdocs/compta/resultat/result.php
+++ b/htdocs/compta/resultat/result.php
@@ -230,7 +230,7 @@ if ($modecompta == "CREANCES-DETTES") {
 	$exportlink = '';
 	$description = $langs->trans("RulesResultBookkeepingPersonalized");
 	$description .= ' ('.$langs->trans("SeePageForSetup", DOL_URL_ROOT.'/accountancy/admin/categories_list.php?search_country_id='.$mysoc->country_id.'&mainmenu=accountancy&leftmenu=accountancy_admin', $langs->transnoentitiesnoconv("Accountancy").' / '.$langs->transnoentitiesnoconv("Setup").' / '.$langs->transnoentitiesnoconv("AccountingCategory")).')';
-	//if (! empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) $description.= $langs->trans("DepositsAreNotIncluded");
+	//if (!empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) $description.= $langs->trans("DepositsAreNotIncluded");
 	//else  $description.= $langs->trans("DepositsAreIncluded");
 	$builddate = dol_now();
 }
@@ -266,10 +266,10 @@ foreach ($months as $k => $v) {
 print	'</tr>';
 
 if ($modecompta == 'CREANCES-DETTES') {
-	//if (! empty($date_start) && ! empty($date_end))
+	//if (!empty($date_start) && !empty($date_end))
 	//	$sql.= " AND f.datef >= '".$db->idate($date_start)."' AND f.datef <= '".$db->idate($date_end)."'";
 } elseif ($modecompta == "RECETTES-DEPENSES") {
-	//if (! empty($date_start) && ! empty($date_end))
+	//if (!empty($date_start) && !empty($date_end))
 	//	$sql.= " AND p.datep >= '".$db->idate($date_start)."' AND p.datep <= '".$db->idate($date_end)."'";
 } elseif ($modecompta == "BOOKKEEPING") {
 	// Get array of all report groups that are active
@@ -278,9 +278,9 @@ if ($modecompta == 'CREANCES-DETTES') {
 	/*
 	$sql = 'SELECT DISTINCT t.numero_compte as nb FROM '.MAIN_DB_PREFIX.'accounting_bookkeeping as t, '.MAIN_DB_PREFIX.'accounting_account as aa';
 	$sql.= " WHERE t.numero_compte = aa.account_number AND aa.fk_accounting_category = 0";
-	if (! empty($date_start) && ! empty($date_end))
+	if (!empty($date_start) && !empty($date_end))
 		$sql.= " AND t.doc_date >= '".$db->idate($date_start)."' AND t.doc_date <= '".$db->idate($date_end)."'";
-	if (! empty($month)) {
+	if (!empty($month)) {
 		$sql .= " AND MONTH(t.doc_date) = " . ((int) $month);
 	}
 	$resql = $db->query($sql);
diff --git a/htdocs/contact/canvas/actions_contactcard_common.class.php b/htdocs/contact/canvas/actions_contactcard_common.class.php
index c4bfc127262..d1cc70b4927 100644
--- a/htdocs/contact/canvas/actions_contactcard_common.class.php
+++ b/htdocs/contact/canvas/actions_contactcard_common.class.php
@@ -66,7 +66,7 @@ abstract class ActionsContactCardCommon
 
 		if (is_object($this->object) && method_exists($this->object,'fetch'))
 		{
-			if (! empty($id)) $this->object->fetch($id);
+			if (!empty($id)) $this->object->fetch($id);
 		}
 		else
 		{*/
diff --git a/htdocs/contact/card.php b/htdocs/contact/card.php
index 3028a3719f1..bd45ae69ada 100644
--- a/htdocs/contact/card.php
+++ b/htdocs/contact/card.php
@@ -532,7 +532,7 @@ if (empty($reshook)) {
 	}
 
 	// Update extrafields
-	if ($action == 'update_extras' && ! empty($user->rights->societe->contact->creer)) {
+	if ($action == 'update_extras' && !empty($user->rights->societe->contact->creer)) {
 		$object->oldcopy = dol_clone($object);
 
 		// Fill array 'array_options' with data from update form
diff --git a/htdocs/contact/consumption.php b/htdocs/contact/consumption.php
index e4cc743159e..729c99f1186 100644
--- a/htdocs/contact/consumption.php
+++ b/htdocs/contact/consumption.php
@@ -608,9 +608,9 @@ if ($sql_select) {
 		// Show range
 		$prodreftxt .= get_date_range($objp->date_start, $objp->date_end);
 		// Add description in form
-		if (! empty($conf->global->PRODUIT_DESC_IN_FORM))
+		if (!empty($conf->global->PRODUIT_DESC_IN_FORM))
 		{
-			$prodreftxt .= (! empty($objp->description) && $objp->description!=$objp->product_label)?'<br>'.dol_htmlentitiesbr($objp->description):'';
+			$prodreftxt .= (!empty($objp->description) && $objp->description!=$objp->product_label)?'<br>'.dol_htmlentitiesbr($objp->description):'';
 		}
 		*/
 		print '</td>';
diff --git a/htdocs/contact/list.php b/htdocs/contact/list.php
index ec56b4f7c2a..a247e9b1302 100644
--- a/htdocs/contact/list.php
+++ b/htdocs/contact/list.php
@@ -831,14 +831,14 @@ if (!empty($arrayfields['p.town']['checked'])) {
 	print '</td>';
 }
 // State
-/*if (! empty($arrayfields['state.nom']['checked']))
+/*if (!empty($arrayfields['state.nom']['checked']))
  {
  print '<td class="liste_titre">';
  print '<input class="flat searchstring" size="4" type="text" name="search_state" value="'.dol_escape_htmltag($search_state).'">';
  print '</td>';
  }
  // Region
- if (! empty($arrayfields['region.nom']['checked']))
+ if (!empty($arrayfields['region.nom']['checked']))
  {
  print '<td class="liste_titre">';
  print '<input class="flat searchstring" size="4" type="text" name="search_region" value="'.dol_escape_htmltag($search_region).'">';
@@ -981,8 +981,8 @@ if (!empty($arrayfields['p.zip']['checked'])) {
 if (!empty($arrayfields['p.town']['checked'])) {
 	print_liste_field_titre($arrayfields['p.town']['label'], $_SERVER["PHP_SELF"], "p.town", $begin, $param, '', $sortfield, $sortorder);
 }
-//if (! empty($arrayfields['state.nom']['checked']))           print_liste_field_titre($arrayfields['state.nom']['label'],$_SERVER["PHP_SELF"],"state.nom","",$param,'',$sortfield,$sortorder);
-//if (! empty($arrayfields['region.nom']['checked']))          print_liste_field_titre($arrayfields['region.nom']['label'],$_SERVER["PHP_SELF"],"region.nom","",$param,'',$sortfield,$sortorder);
+//if (!empty($arrayfields['state.nom']['checked']))           print_liste_field_titre($arrayfields['state.nom']['label'],$_SERVER["PHP_SELF"],"state.nom","",$param,'',$sortfield,$sortorder);
+//if (!empty($arrayfields['region.nom']['checked']))          print_liste_field_titre($arrayfields['region.nom']['label'],$_SERVER["PHP_SELF"],"region.nom","",$param,'',$sortfield,$sortorder);
 if (!empty($arrayfields['country.code_iso']['checked'])) {
 	print_liste_field_titre($arrayfields['country.code_iso']['label'], $_SERVER["PHP_SELF"], "co.code_iso", "", $param, '', $sortfield, $sortorder, 'center ');
 }
@@ -1150,13 +1150,13 @@ while ($i < min($num, $limit)) {
 		}
 	}
 	// State
-	/*if (! empty($arrayfields['state.nom']['checked']))
+	/*if (!empty($arrayfields['state.nom']['checked']))
 	{
 		print "<td>".$obj->state_name."</td>\n";
 		if (! $i) $totalarray['nbfield']++;
 	}
 	// Region
-	if (! empty($arrayfields['region.nom']['checked']))
+	if (!empty($arrayfields['region.nom']['checked']))
 	{
 		print "<td>".$obj->region_name."</td>\n";
 		if (! $i) $totalarray['nbfield']++;
diff --git a/htdocs/contact/project.php b/htdocs/contact/project.php
index e88c056af37..6680f7f7ee3 100644
--- a/htdocs/contact/project.php
+++ b/htdocs/contact/project.php
@@ -62,12 +62,12 @@ if ($id) {
 	}
 	$socid = $object->thirdparty->id;
 	$title = $langs->trans("Projects");
-	if (! empty($conf->global->MAIN_HTML_TITLE) && preg_match('/thirdpartynameonly/', $conf->global->MAIN_HTML_TITLE) && $object->name) {
+	if (!empty($conf->global->MAIN_HTML_TITLE) && preg_match('/thirdpartynameonly/', $conf->global->MAIN_HTML_TITLE) && $object->name) {
 		$title = $object->name." - ".$title;
 	}
 	llxHeader('', $title);
 
-	if (! empty($conf->notification->enabled)) {
+	if (!empty($conf->notification->enabled)) {
 		$langs->load("mails");
 	}
 	$head = contact_prepare_head($object);
diff --git a/htdocs/contrat/agenda.php b/htdocs/contrat/agenda.php
index a8dc5e7ee3b..29288708664 100644
--- a/htdocs/contrat/agenda.php
+++ b/htdocs/contrat/agenda.php
@@ -227,11 +227,11 @@ if ($id > 0) {
 
 	$out='';
 	$permok=$user->rights->agenda->myactions->create;
-	if ((! empty($objthirdparty->id) || ! empty($objcon->id)) && $permok)
+	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.='&amp;socid='.$objthirdparty->id;
-		$out.=(! empty($objcon->id)?'&amp;contactid='.$objcon->id:'').'&amp;backtopage=1&amp;percentage=-1';
+		$out.=(!empty($objcon->id)?'&amp;contactid='.$objcon->id:'').'&amp;backtopage=1&amp;percentage=-1';
 		//$out.=$langs->trans("AddAnAction").' ';
 		//$out.=img_picto($langs->trans("AddAnAction"),'filenew');
 		//$out.="</a>";
diff --git a/htdocs/contrat/class/contrat.class.php b/htdocs/contrat/class/contrat.class.php
index 088d8f9b6d5..bc43c54a8ec 100644
--- a/htdocs/contrat/class/contrat.class.php
+++ b/htdocs/contrat/class/contrat.class.php
@@ -2650,7 +2650,7 @@ class Contrat extends CommonObject
 			while ($i < $num) {
 				$obj = $this->db->fetch_object($resql);
 				if ($obj) {
-					if (! empty($contractlineprocessed[$obj->lid]) || ! empty($contractignored[$obj->rowid]) || ! empty($contracterror[$obj->rowid])) {
+					if (!empty($contractlineprocessed[$obj->lid]) || !empty($contractignored[$obj->rowid]) || !empty($contracterror[$obj->rowid])) {
 						continue;
 					}
 
diff --git a/htdocs/contrat/contact.php b/htdocs/contrat/contact.php
index 1bd9d3388f6..92a5a3f5999 100644
--- a/htdocs/contrat/contact.php
+++ b/htdocs/contrat/contact.php
@@ -136,7 +136,7 @@ if ($id > 0 || !empty($ref)) {
 
 
 		$morehtmlref = '';
-		//if (! empty($modCodeContract->code_auto)) {
+		//if (!empty($modCodeContract->code_auto)) {
 			$morehtmlref .= $object->ref;
 		/*} else {
 			$morehtmlref.=$form->editfieldkey("",'ref',$object->ref,0,'string','',0,3);
diff --git a/htdocs/contrat/document.php b/htdocs/contrat/document.php
index ce386fe21b9..bf1c83dccb3 100644
--- a/htdocs/contrat/document.php
+++ b/htdocs/contrat/document.php
@@ -123,7 +123,7 @@ if ($object->id) {
 
 
 	$morehtmlref = '';
-	//if (! empty($modCodeContract->code_auto)) {
+	//if (!empty($modCodeContract->code_auto)) {
 	$morehtmlref .= $object->ref;
 	/*} else {
 	 $morehtmlref.=$form->editfieldkey("",'ref',$object->ref,0,'string','',0,3);
diff --git a/htdocs/contrat/note.php b/htdocs/contrat/note.php
index 540491698c1..044d6e4941e 100644
--- a/htdocs/contrat/note.php
+++ b/htdocs/contrat/note.php
@@ -93,7 +93,7 @@ if ($id > 0 || !empty($ref)) {
 
 
 	$morehtmlref = '';
-	//if (! empty($modCodeContract->code_auto)) {
+	//if (!empty($modCodeContract->code_auto)) {
 	$morehtmlref .= $object->ref;
 	/*} else {
 	 $morehtmlref.=$form->editfieldkey("",'ref',$object->ref,0,'string','',0,3);
diff --git a/htdocs/contrat/services_list.php b/htdocs/contrat/services_list.php
index 2869c66cd9f..cfc888e229a 100644
--- a/htdocs/contrat/services_list.php
+++ b/htdocs/contrat/services_list.php
@@ -375,7 +375,7 @@ if (!$resql) {
 $num = $db->num_rows($resql);
 
 /*
-if ($num == 1 && ! empty($conf->global->MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE) && $search_all)
+if ($num == 1 && !empty($conf->global->MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE) && $search_all)
 {
 	$obj = $db->fetch_object($resql);
 	$id = $obj->id;
diff --git a/htdocs/core/actions_dellink.inc.php b/htdocs/core/actions_dellink.inc.php
index 9bf56b2f876..4db2c64206a 100644
--- a/htdocs/core/actions_dellink.inc.php
+++ b/htdocs/core/actions_dellink.inc.php
@@ -40,7 +40,7 @@ if ($action == 'addlink' && !empty($permissiondellink) && !$cancellink && $id >
 }
 
 // Link by reference
-if ($action == 'addlinkbyref' && ! empty($permissiondellink) && !$cancellink && $id > 0 && !empty($addlinkref) && !empty($conf->global->MAIN_LINK_BY_REF_IN_LINKTO)) {
+if ($action == 'addlinkbyref' && !empty($permissiondellink) && !$cancellink && $id > 0 && !empty($addlinkref) && !empty($conf->global->MAIN_LINK_BY_REF_IN_LINKTO)) {
 	$element_prop = getElementProperties($addlink);
 	if (is_array($element_prop)) {
 		dol_include_once('/' . $element_prop['classpath'] . '/' . $element_prop['classfile'] . '.class.php');
diff --git a/htdocs/core/ajax/saveinplace.php b/htdocs/core/ajax/saveinplace.php
index 05fad8148fa..a127fa08645 100644
--- a/htdocs/core/ajax/saveinplace.php
+++ b/htdocs/core/ajax/saveinplace.php
@@ -126,8 +126,8 @@ if (!empty($field) && !empty($element) && !empty($table_element) && !empty($fk_e
 	$check_access = restrictedArea($user, $feature, $object_id, '', $feature2);
 	//var_dump($user->rights);
 	/*
-	if (! empty($user->rights->$newelement->creer) || ! empty($user->rights->$newelement->create) || ! empty($user->rights->$newelement->write)
-		|| (isset($subelement) && (! empty($user->rights->$newelement->$subelement->creer) || ! empty($user->rights->$newelement->$subelement->write)))
+	if (!empty($user->rights->$newelement->creer) || !empty($user->rights->$newelement->create) || !empty($user->rights->$newelement->write)
+		|| (isset($subelement) && (!empty($user->rights->$newelement->$subelement->creer) || !empty($user->rights->$newelement->$subelement->write)))
 		|| ($element == 'payment' && $user->rights->facture->paiement)
 		|| ($element == 'payment_supplier' && $user->rights->fournisseur->facture->creer))
 	*/
diff --git a/htdocs/core/boxes/box_contracts.php b/htdocs/core/boxes/box_contracts.php
index 99ea5541c98..4251a4491f6 100644
--- a/htdocs/core/boxes/box_contracts.php
+++ b/htdocs/core/boxes/box_contracts.php
@@ -97,7 +97,7 @@ class box_contracts extends ModeleBoxes
 			if ($user->socid) {
 				$sql .= " AND s.rowid = ".((int) $user->socid);
 			}
-			if (! empty($conf->global->MAIN_LASTBOX_ON_OBJECT_DATE)) {
+			if (!empty($conf->global->MAIN_LASTBOX_ON_OBJECT_DATE)) {
 				$sql .= " ORDER BY c.date_contrat DESC, c.ref DESC ";
 			} else {
 				$sql .= " ORDER BY c.tms DESC, c.ref DESC ";
diff --git a/htdocs/core/boxes/box_services_contracts.php b/htdocs/core/boxes/box_services_contracts.php
index 9a212d0a10e..9ec279fe2d0 100644
--- a/htdocs/core/boxes/box_services_contracts.php
+++ b/htdocs/core/boxes/box_services_contracts.php
@@ -171,7 +171,7 @@ class box_services_contracts extends ModeleBoxes
 
 						// Add description in form
 						if (!empty($conf->global->PRODUIT_DESC_IN_FORM)) {
-							//$text .= (! empty($objp->description) && $objp->description!=$objp->product_label)?'<br>'.dol_htmlentitiesbr($objp->description):'';
+							//$text .= (!empty($objp->description) && $objp->description!=$objp->product_label)?'<br>'.dol_htmlentitiesbr($objp->description):'';
 							$description = ''; // Already added into main visible desc
 						}
 
diff --git a/htdocs/core/boxes/modules_boxes.php b/htdocs/core/boxes/modules_boxes.php
index 910e6d3ca77..5d423a9e202 100644
--- a/htdocs/core/boxes/modules_boxes.php
+++ b/htdocs/core/boxes/modules_boxes.php
@@ -259,7 +259,7 @@ class ModeleBoxes // Can't be abtract as it is instantiated to build "empty" box
 					$out .= img_picto($langs->trans("MoveBox", $this->box_id), 'grip_title', 'class="opacitymedium boxhandle hideonsmartphone cursormove marginleftonly"');
 					$out .= img_picto($langs->trans("CloseBox", $this->box_id), 'close_title', 'class="opacitymedium boxclose cursorpointer marginleftonly" rel="x:y" id="imgclose'.$this->box_id.'"');
 					$label = $head['text'];
-					//if (! empty($head['graph'])) $label.=' ('.$langs->trans("Graph").')';
+					//if (!empty($head['graph'])) $label.=' ('.$langs->trans("Graph").')';
 					if (!empty($head['graph'])) {
 						$label .= ' <span class="opacitymedium fa fa-bar-chart"></span>';
 					}
diff --git a/htdocs/core/class/CMailFile.class.php b/htdocs/core/class/CMailFile.class.php
index f9157a6a3c2..ba657f58087 100644
--- a/htdocs/core/class/CMailFile.class.php
+++ b/htdocs/core/class/CMailFile.class.php
@@ -471,7 +471,7 @@ class CMailFile
 			$msgid = $headers->get('Message-ID');
 			$msgid->setId($headerID);
 			$headers->addIdHeader('References', $headerID);
-			// TODO if (! empty($moreinheader)) ...
+			// TODO if (!empty($moreinheader)) ...
 
 			// Give the message a subject
 			try {
@@ -580,7 +580,7 @@ class CMailFile
 					$this->errors[] = $e->getMessage();
 				}
 			}
-			//if (! empty($this->errors_to)) $this->message->setErrorsTo($this->getArrayAddress($this->errors_to));
+			//if (!empty($this->errors_to)) $this->message->setErrorsTo($this->getArrayAddress($this->errors_to));
 			if (isset($this->deliveryreceipt) && $this->deliveryreceipt == 1) {
 				try {
 					$this->message->setReadReceiptTo($this->getArrayAddress($this->addr_from));
@@ -1561,7 +1561,7 @@ class CMailFile
 				$host = 'ssl://'.$host;
 			}
 			// tls smtp start with no encryption
-			//if (! empty($conf->global->MAIN_MAIL_EMAIL_STARTTLS) && function_exists('openssl_open')) $host='tls://'.$host;
+			//if (!empty($conf->global->MAIN_MAIL_EMAIL_STARTTLS) && function_exists('openssl_open')) $host='tls://'.$host;
 
 			dol_syslog("Try socket connection to host=".$host." port=".$port);
 			//See if we can connect to the SMTP server
diff --git a/htdocs/core/class/antivir.class.php b/htdocs/core/class/antivir.class.php
index 7a60e7b6e03..dc38d38185e 100644
--- a/htdocs/core/class/antivir.class.php
+++ b/htdocs/core/class/antivir.class.php
@@ -116,7 +116,7 @@ class AntiVir
 
 			fclose($handle);
 
-			if (! empty($conf->global->MAIN_UMASK))
+			if (!empty($conf->global->MAIN_UMASK))
 				@chmod($outputfile, octdec($conf->global->MAIN_UMASK));
 		}
 		else
diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index a16881cd61e..7f99363794a 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -1085,8 +1085,8 @@ abstract class CommonObject
 		$forcedownload = 0;
 
 		$paramlink = '';
-		//if (! empty($modulepart)) $paramlink.=($paramlink?'&':'').'modulepart='.$modulepart;		// For sharing with hash (so public files), modulepart is not required.
-		//if (! empty($ecmfile->entity)) $paramlink.='&entity='.$ecmfile->entity; 					// For sharing with hash (so public files), entity is not required.
+		//if (!empty($modulepart)) $paramlink.=($paramlink?'&':'').'modulepart='.$modulepart;		// For sharing with hash (so public files), modulepart is not required.
+		//if (!empty($ecmfile->entity)) $paramlink.='&entity='.$ecmfile->entity; 					// For sharing with hash (so public files), entity is not required.
 		//$paramlink.=($paramlink?'&':'').'file='.urlencode($filepath);								// No need of name of file for public link, we will use the hash
 		if (!empty($ecmfile->share)) {
 			$paramlink .= ($paramlink ? '&' : '').'hashp='.$ecmfile->share; // Hash for public share
@@ -4917,7 +4917,7 @@ abstract class CommonObject
 			//Line extrafield
 			$line->fetch_optionals();
 
-			//if (is_object($hookmanager) && (($line->product_type == 9 && ! empty($line->special_code)) || ! empty($line->fk_parent_line)))
+			//if (is_object($hookmanager) && (($line->product_type == 9 && !empty($line->special_code)) || !empty($line->fk_parent_line)))
 			if (is_object($hookmanager)) {   // Old code is commented on preceding line.
 				if (empty($line->fk_parent_line)) {
 					$parameters = array('line'=>$line, 'num'=>$num, 'i'=>$i, 'dateSelector'=>$dateSelector, 'seller'=>$seller, 'buyer'=>$buyer, 'selected'=>$selected, 'table_element_line'=>$line->table_element);
@@ -6159,7 +6159,7 @@ abstract class CommonObject
 
 				// If we clone, we have to clean unique extrafields to prevent duplicates.
 				// This behaviour can be prevented by external code by changing $this->context['createfromclone'] value in createFrom hook
-				if (! empty($this->context['createfromclone']) && $this->context['createfromclone'] == 'createfromclone' && ! empty($attributeUnique)) {
+				if (!empty($this->context['createfromclone']) && $this->context['createfromclone'] == 'createfromclone' && !empty($attributeUnique)) {
 					$new_array_options[$key] = null;
 				}
 
@@ -8582,7 +8582,7 @@ abstract class CommonObject
 
 		$filearray = dol_dir_list($dir, "files", 0, '', '(\.meta|_preview.*\.png)$', $sortfield, (strtolower($sortorder) == 'desc' ?SORT_DESC:SORT_ASC), 1);
 
-		/*if (! empty($conf->global->PRODUCT_USE_OLD_PATH_FOR_PHOTO))    // For backward compatiblity, we scan also old dirs
+		/*if (!empty($conf->global->PRODUCT_USE_OLD_PATH_FOR_PHOTO))    // For backward compatiblity, we scan also old dirs
 		 {
 		 $filearrayold=dol_dir_list($dirold,"files",0,'','(\.meta|_preview.*\.png)$',$sortfield,(strtolower($sortorder)=='desc'?SORT_DESC:SORT_ASC),1);
 		 $filearray=array_merge($filearray, $filearrayold);
diff --git a/htdocs/core/class/extrafields.class.php b/htdocs/core/class/extrafields.class.php
index cea529726e5..8ddfb9290e7 100644
--- a/htdocs/core/class/extrafields.class.php
+++ b/htdocs/core/class/extrafields.class.php
@@ -1571,7 +1571,7 @@ class ExtraFields
 		 if ($type == 'date') $out.=' (YYYY-MM-DD)';
 		 elseif ($type == 'datetime') $out.=' (YYYY-MM-DD HH:MM:SS)';
 		 */
-		/*if (! empty($help) && $keyprefix != 'search_options_') {
+		/*if (!empty($help) && $keyprefix != 'search_options_') {
 			$out .= $form->textwithpicto('', $help, 1, 'help', '', 0, 3);
 		}*/
 		return $out;
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 1ecd05cc3a5..838aea25f53 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -732,7 +732,7 @@ class Form
 			}
 		}
 		// If info or help with smartphone, show only text (tooltip on click does not works with dialog on smaprtphone)
-		//if (! empty($conf->dol_no_mouse_hover) && ! empty($tooltiptrigger))
+		//if (!empty($conf->dol_no_mouse_hover) && !empty($tooltiptrigger))
 		//{
 		//if ($type == 'info' || $type == 'help') return '<a href="'..'">'.$text.''</a>';
 		//}
@@ -1433,7 +1433,7 @@ class Form
 			$textifempty = (($showempty && !is_numeric($showempty)) ? $langs->trans($showempty) : '');
 			if (!empty($conf->global->COMPANY_USE_SEARCH_TO_SELECT)) {
 				// Do not use textifempty = ' ' or '&nbsp;' here, or search on key will search on ' key'.
-				//if (! empty($conf->use_javascript_ajax) || $forcecombo) $textifempty='';
+				//if (!empty($conf->use_javascript_ajax) || $forcecombo) $textifempty='';
 				if ($showempty && !is_numeric($showempty)) {
 					$textifempty = $langs->trans($showempty);
 				} else {
@@ -2674,7 +2674,7 @@ class Form
 				if (!empty($conf->global->MAIN_MULTILANGS)) {
 					$sql .= " OR pl.label LIKE '".$this->db->escape($prefix.$crit)."%'";
 				}
-				if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES) && ! empty($socid)) {
+				if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES) && !empty($socid)) {
 					$sql .= " OR pcp.ref_customer LIKE '".$this->db->escape($prefix.$crit)."%'";
 				}
 				if (!empty($conf->global->PRODUCT_AJAX_SEARCH_ON_DESCRIPTION)) {
@@ -2733,7 +2733,7 @@ class Form
 
 			$textifempty = '';
 			// Do not use textifempty = ' ' or '&nbsp;' here, or search on key will search on ' key'.
-			//if (! empty($conf->use_javascript_ajax) || $forcecombo) $textifempty='';
+			//if (!empty($conf->use_javascript_ajax) || $forcecombo) $textifempty='';
 			if (!empty($conf->global->PRODUIT_USE_SEARCH_TO_SELECT)) {
 				if ($showempty && !is_numeric($showempty)) {
 					$textifempty = $langs->trans($showempty);
@@ -2959,7 +2959,7 @@ class Form
 		}
 		$opt .= '>';
 		$opt .= $objp->ref;
-		if (! empty($objp->custref)) {
+		if (!empty($objp->custref)) {
 			$opt.= ' (' . $objp->custref . ')';
 		}
 		if ($outbarcode) {
@@ -2971,7 +2971,7 @@ class Form
 		}
 
 		$objRef = $objp->ref;
-		if (! empty($objp->custref)) {
+		if (!empty($objp->custref)) {
 			$objRef .= ' (' . $objp->custref . ')';
 		}
 		if (!empty($filterkey) && $filterkey != '') {
@@ -4086,7 +4086,7 @@ class Form
 		$selectedDepositPercent = null;
 
 		foreach ($this->cache_conditions_paiements as $id => $arrayconditions) {
-			if ($filtertype <= 0 && ! empty($arrayconditions['deposit_percent'])) {
+			if ($filtertype <= 0 && !empty($arrayconditions['deposit_percent'])) {
 				continue;
 			}
 
@@ -4098,7 +4098,7 @@ class Form
 			}
 			$label = $arrayconditions['label'];
 
-			if (! empty($arrayconditions['deposit_percent'])) {
+			if (!empty($arrayconditions['deposit_percent'])) {
 				$label = str_replace('__DEPOSIT_PERCENT__', $deposit_percent > 0 ? $deposit_percent : $arrayconditions['deposit_percent'], $label);
 			}
 
@@ -5380,7 +5380,7 @@ class Form
 				if (isset($this->cache_conditions_paiements[$selected])) {
 					$label = $this->cache_conditions_paiements[$selected]['label'];
 
-					if (! empty($this->cache_conditions_paiements[$selected]['deposit_percent'])) {
+					if (!empty($this->cache_conditions_paiements[$selected]['deposit_percent'])) {
 						$label = str_replace('__DEPOSIT_PERCENT__', $deposit_percent > 0 ? $deposit_percent : $this->cache_conditions_paiements[$selected]['deposit_percent'], $label);
 					}
 
@@ -6231,7 +6231,7 @@ class Form
 					}
 				}
 				$return .= '>';
-				//if (! empty($conf->global->MAIN_VAT_SHOW_POSITIVE_RATES))
+				//if (!empty($conf->global->MAIN_VAT_SHOW_POSITIVE_RATES))
 				if ($mysoc->country_code == 'IN' || !empty($conf->global->MAIN_VAT_LABEL_IS_POSITIVE_RATES)) {
 					$return .= $rate['labelpositiverates'];
 				} else {
@@ -7031,7 +7031,7 @@ class Form
 
 			$textifempty = '';
 			// Do not use textifempty = ' ' or '&nbsp;' here, or search on key will search on ' key'.
-			//if (! empty($conf->use_javascript_ajax) || $forcecombo) $textifempty='';
+			//if (!empty($conf->use_javascript_ajax) || $forcecombo) $textifempty='';
 			if (!empty($conf->global->TICKET_USE_SEARCH_TO_SELECT)) {
 				if ($showempty && !is_numeric($showempty)) $textifempty = $langs->trans($showempty);
 				else $textifempty .= $langs->trans("All");
@@ -7229,7 +7229,7 @@ class Form
 
 			$textifempty = '';
 			// Do not use textifempty = ' ' or '&nbsp;' here, or search on key will search on ' key'.
-			//if (! empty($conf->use_javascript_ajax) || $forcecombo) $textifempty='';
+			//if (!empty($conf->use_javascript_ajax) || $forcecombo) $textifempty='';
 			if (!empty($conf->global->PROJECT_USE_SEARCH_TO_SELECT)) {
 				if ($showempty && !is_numeric($showempty)) $textifempty = $langs->trans($showempty);
 				else $textifempty .= $langs->trans("All");
@@ -7441,7 +7441,7 @@ class Form
 
 			$textifempty = '';
 			// Do not use textifempty = ' ' or '&nbsp;' here, or search on key will search on ' key'.
-			//if (! empty($conf->use_javascript_ajax) || $forcecombo) $textifempty='';
+			//if (!empty($conf->use_javascript_ajax) || $forcecombo) $textifempty='';
 			if (!empty($conf->global->PROJECT_USE_SEARCH_TO_SELECT)) {
 				if ($showempty && !is_numeric($showempty)) $textifempty = $langs->trans($showempty);
 				else $textifempty .= $langs->trans("All");
@@ -7773,7 +7773,7 @@ class Form
 			// Warning: Do not use textifempty = ' ' or '&nbsp;' here, or search on key will search on ' key'. Seems it is no more true with selec2 v4
 			$textifempty = '&nbsp;';
 
-			//if (! empty($conf->use_javascript_ajax) || $forcecombo) $textifempty='';
+			//if (!empty($conf->use_javascript_ajax) || $forcecombo) $textifempty='';
 			if (!empty($conf->global->$confkeyforautocompletemode)) {
 				if ($showempty && !is_numeric($showempty)) {
 					$textifempty = $langs->trans($showempty);
diff --git a/htdocs/core/class/html.formfile.class.php b/htdocs/core/class/html.formfile.class.php
index 98b1fbd6593..612e555a6b0 100644
--- a/htdocs/core/class/html.formfile.class.php
+++ b/htdocs/core/class/html.formfile.class.php
@@ -1889,7 +1889,7 @@ class FormFile
 					print img_picto($langs->trans("FileSharedViaALink"), 'globe').' ';
 					print '<input type="text" class="quatrevingtpercent width100 nopadding nopadding small" id="downloadlink" name="downloadexternallink" value="'.dol_escape_htmltag($fulllink).'">';
 				}
-				//if (! empty($useinecm) && $useinecm != 6)  print '<a data-ajax="false" href="'.DOL_URL_ROOT.'/document.php?modulepart='.$modulepart;
+				//if (!empty($useinecm) && $useinecm != 6)  print '<a data-ajax="false" href="'.DOL_URL_ROOT.'/document.php?modulepart='.$modulepart;
 				//if ($forcedownload) print '&attachment=1';
 				//print '&file='.urlencode($relativefile).'">';
 				//print img_view().'</a> &nbsp; ';
diff --git a/htdocs/core/class/html.formprojet.class.php b/htdocs/core/class/html.formprojet.class.php
index 47bbdec0fb2..4d34211ed17 100644
--- a/htdocs/core/class/html.formprojet.class.php
+++ b/htdocs/core/class/html.formprojet.class.php
@@ -381,9 +381,9 @@ class FormProjets
 			if (!empty($show_empty)) {
 				$out .= '<option value="0" class="optiongrey">';
 				if (!is_numeric($show_empty)) {
-					//if (! empty($conf->use_javascript_ajax)) $out .= '<span class="opacitymedium">aaa';
+					//if (!empty($conf->use_javascript_ajax)) $out .= '<span class="opacitymedium">aaa';
 					$out .= $show_empty;
-					//if (! empty($conf->use_javascript_ajax)) $out .= '</span>';
+					//if (!empty($conf->use_javascript_ajax)) $out .= '</span>';
 				} else {
 					$out .= '&nbsp;';
 				}
diff --git a/htdocs/core/class/utils.class.php b/htdocs/core/class/utils.class.php
index 8805f7376c2..cd1ea12bb40 100644
--- a/htdocs/core/class/utils.class.php
+++ b/htdocs/core/class/utils.class.php
@@ -614,7 +614,7 @@ class Utils
 			//if ($compression == 'bz')
 			$paramcrypted = $param;
 			$paramclear = $param;
-			/*if (! empty($dolibarr_main_db_pass))
+			/*if (!empty($dolibarr_main_db_pass))
 			 {
 			 $paramcrypted.=" -W".preg_replace('/./i','*',$dolibarr_main_db_pass);
 			 $paramclear.=" -W".$dolibarr_main_db_pass;
diff --git a/htdocs/core/customreports.php b/htdocs/core/customreports.php
index 4fbee42b0dd..0cf1c27c8a5 100644
--- a/htdocs/core/customreports.php
+++ b/htdocs/core/customreports.php
@@ -1265,7 +1265,7 @@ function fillArrayOfGroupBy($object, $tablealias, $labelofobject, &$arrayofgroup
 	}
 
 	// Add extrafields to Group by
-	if (! empty($object->isextrafieldmanaged)) {
+	if (!empty($object->isextrafieldmanaged)) {
 		foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val) {
 			if ($extrafields->attributes[$object->table_element]['type'][$key] == 'separate') {
 				continue;
diff --git a/htdocs/core/lib/agenda.lib.php b/htdocs/core/lib/agenda.lib.php
index 0f7334345fa..96bd34143c7 100644
--- a/htdocs/core/lib/agenda.lib.php
+++ b/htdocs/core/lib/agenda.lib.php
@@ -498,7 +498,7 @@ function calendars_prepare_head($param)
 	$head[$h][2] = 'cardday';
 	$h++;
 
-	//if (! empty($conf->global->AGENDA_USE_EVENT_TYPE))
+	//if (!empty($conf->global->AGENDA_USE_EVENT_TYPE))
 	if (!empty($conf->global->AGENDA_SHOW_PERTYPE)) {
 		$head[$h][0] = DOL_URL_ROOT.'/comm/action/pertype.php'.($param ? '?'.$param : '');
 		$head[$h][1] = $langs->trans("ViewPerType");
diff --git a/htdocs/core/lib/files.lib.php b/htdocs/core/lib/files.lib.php
index 42d0d96f7a9..2b53fbbf230 100644
--- a/htdocs/core/lib/files.lib.php
+++ b/htdocs/core/lib/files.lib.php
@@ -2310,7 +2310,7 @@ function dol_compress_dir($inputdir, $outputfile, $mode = "zip", $excludefiles =
 			 return 1;
 			 }
 			 else*/
-			//if (class_exists('ZipArchive') && ! empty($conf->global->MAIN_USE_ZIPARCHIVE_FOR_ZIP_COMPRESS))
+			//if (class_exists('ZipArchive') && !empty($conf->global->MAIN_USE_ZIPARCHIVE_FOR_ZIP_COMPRESS))
 			if (class_exists('ZipArchive')) {
 				$foundhandler = 1;
 
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index dcecd69769b..895dfe5b5cf 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -3418,7 +3418,7 @@ function dol_print_phone($phone, $countrycode = '', $cid = 0, $socid = 0, $addli
 			}
 		}
 
-		//if (($cid || $socid) && ! empty($conf->agenda->enabled) && $user->rights->agenda->myactions->create)
+		//if (($cid || $socid) && !empty($conf->agenda->enabled) && $user->rights->agenda->myactions->create)
 		if (isModEnabled('agenda') && $user->rights->agenda->myactions->create) {
 			$type = 'AC_TEL';
 			$link = '';
@@ -6833,7 +6833,7 @@ function dol_string_onlythesehtmlattributes($stringtoclean, $allowed_attributes
 			for ($els = $dom->getElementsByTagname('*'), $i = $els->length - 1; $i >= 0; $i--) {
 				for ($attrs = $els->item($i)->attributes, $ii = $attrs->length - 1; $ii >= 0; $ii--) {
 					//var_dump($attrs->item($ii));
-					if (! empty($attrs->item($ii)->name)) {
+					if (!empty($attrs->item($ii)->name)) {
 						if (! in_array($attrs->item($ii)->name, $allowed_attributes)) {
 							// Delete attribute if not into allowed_attributes
 							$els->item($i)->removeAttribute($attrs->item($ii)->name);
diff --git a/htdocs/core/lib/pdf.lib.php b/htdocs/core/lib/pdf.lib.php
index 91e0b382b44..4efea43b044 100644
--- a/htdocs/core/lib/pdf.lib.php
+++ b/htdocs/core/lib/pdf.lib.php
@@ -1350,7 +1350,7 @@ function pdf_writelinedesc(&$pdf, $object, $i, $outputlangs, $w, $h, $posx, $pos
 
 	$reshook = 0;
 	$result = '';
-	//if (is_object($hookmanager) && ( (isset($object->lines[$i]->product_type) && $object->lines[$i]->product_type == 9 && ! empty($object->lines[$i]->special_code)) || ! empty($object->lines[$i]->fk_parent_line) ) )
+	//if (is_object($hookmanager) && ( (isset($object->lines[$i]->product_type) && $object->lines[$i]->product_type == 9 && !empty($object->lines[$i]->special_code)) || !empty($object->lines[$i]->fk_parent_line) ) )
 	if (is_object($hookmanager)) {   // Old code is commented on preceding line. Reproduct this test in the pdf_xxx function if you don't want your hook to run
 		$special_code = empty($object->lines[$i]->special_code) ? '' : $object->lines[$i]->special_code;
 		if (!empty($object->lines[$i]->fk_parent_line)) {
@@ -1412,7 +1412,7 @@ function pdf_getlinedesc($object, $i, $outputlangs, $hideref = 0, $hidedesc = 0,
 		include_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
 		$prodser = new Product($db);
 
-		if (! empty($conf->global->PRODUIT_CUSTOMER_PRICES)) {
+		if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES)) {
 			include_once DOL_DOCUMENT_ROOT . '/product/class/productcustomerprice.class.php';
 		}
 	}
@@ -1563,7 +1563,7 @@ function pdf_getlinedesc($object, $i, $outputlangs, $hideref = 0, $hidedesc = 0,
 		} else {
 			$ref_prodserv = $prodser->ref; // Show local ref only
 
-			if (! empty($conf->global->PRODUIT_CUSTOMER_PRICES)) {
+			if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES)) {
 				$productCustomerPriceStatic = new Productcustomerprice($db);
 				$filter = array('fk_product' => $idprod, 'fk_soc' => $object->socid);
 
@@ -1572,7 +1572,7 @@ function pdf_getlinedesc($object, $i, $outputlangs, $hideref = 0, $hidedesc = 0,
 				if ($nbCustomerPrices > 0) {
 					$productCustomerPrice = $productCustomerPriceStatic->lines[0];
 
-					if (! empty($productCustomerPrice->ref_customer)) {
+					if (!empty($productCustomerPrice->ref_customer)) {
 						switch ($conf->global->PRODUIT_CUSTOMER_PRICES_PDF_REF_MODE) {
 							case 1:
 								$ref_prodserv = $productCustomerPrice->ref_customer;
@@ -1688,7 +1688,7 @@ function pdf_getlinenum($object, $i, $outputlangs, $hidedetails = 0)
 
 	$reshook = 0;
 	$result = '';
-	//if (is_object($hookmanager) && ( (isset($object->lines[$i]->product_type) && $object->lines[$i]->product_type == 9 && ! empty($object->lines[$i]->special_code)) || ! empty($object->lines[$i]->fk_parent_line) ) )
+	//if (is_object($hookmanager) && ( (isset($object->lines[$i]->product_type) && $object->lines[$i]->product_type == 9 && !empty($object->lines[$i]->special_code)) || !empty($object->lines[$i]->fk_parent_line) ) )
 	if (is_object($hookmanager)) {   // Old code is commented on preceding line. Reproduct this test in the pdf_xxx function if you don't want your hook to run
 		$special_code = $object->lines[$i]->special_code;
 		if (!empty($object->lines[$i]->fk_parent_line)) {
@@ -1721,7 +1721,7 @@ function pdf_getlineref($object, $i, $outputlangs, $hidedetails = 0)
 
 	$reshook = 0;
 	$result = '';
-	//if (is_object($hookmanager) && ( (isset($object->lines[$i]->product_type) && $object->lines[$i]->product_type == 9 && ! empty($object->lines[$i]->special_code)) || ! empty($object->lines[$i]->fk_parent_line) ) )
+	//if (is_object($hookmanager) && ( (isset($object->lines[$i]->product_type) && $object->lines[$i]->product_type == 9 && !empty($object->lines[$i]->special_code)) || !empty($object->lines[$i]->fk_parent_line) ) )
 	if (is_object($hookmanager)) {   // Old code is commented on preceding line. Reproduct this test in the pdf_xxx function if you don't want your hook to run
 		$special_code = $object->lines[$i]->special_code;
 		if (!empty($object->lines[$i]->fk_parent_line)) {
@@ -1753,7 +1753,7 @@ function pdf_getlineref_supplier($object, $i, $outputlangs, $hidedetails = 0)
 
 	$reshook = 0;
 	$result = '';
-	//if (is_object($hookmanager) && ( (isset($object->lines[$i]->product_type) && $object->lines[$i]->product_type == 9 && ! empty($object->lines[$i]->special_code)) || ! empty($object->lines[$i]->fk_parent_line) ) )
+	//if (is_object($hookmanager) && ( (isset($object->lines[$i]->product_type) && $object->lines[$i]->product_type == 9 && !empty($object->lines[$i]->special_code)) || !empty($object->lines[$i]->fk_parent_line) ) )
 	if (is_object($hookmanager)) {   // Old code is commented on preceding line. Reproduct this test in the pdf_xxx function if you don't want your hook to run
 		$special_code = $object->lines[$i]->special_code;
 		if (!empty($object->lines[$i]->fk_parent_line)) {
@@ -1785,7 +1785,7 @@ function pdf_getlinevatrate($object, $i, $outputlangs, $hidedetails = 0)
 
 	$result = '';
 	$reshook = 0;
-	//if (is_object($hookmanager) && ( (isset($object->lines[$i]->product_type) && $object->lines[$i]->product_type == 9 && ! empty($object->lines[$i]->special_code)) || ! empty($object->lines[$i]->fk_parent_line) ) )
+	//if (is_object($hookmanager) && ( (isset($object->lines[$i]->product_type) && $object->lines[$i]->product_type == 9 && !empty($object->lines[$i]->special_code)) || !empty($object->lines[$i]->fk_parent_line) ) )
 	if (is_object($hookmanager)) {   // Old code is commented on preceding line. Reproduce this test in the pdf_xxx function if you don't want your hook to run
 		$special_code = $object->lines[$i]->special_code;
 		if (!empty($object->lines[$i]->fk_parent_line)) {
@@ -1852,7 +1852,7 @@ function pdf_getlineupexcltax($object, $i, $outputlangs, $hidedetails = 0)
 
 	$result = '';
 	$reshook = 0;
-	//if (is_object($hookmanager) && ( (isset($object->lines[$i]->product_type) && $object->lines[$i]->product_type == 9 && ! empty($object->lines[$i]->special_code)) || ! empty($object->lines[$i]->fk_parent_line) ) )
+	//if (is_object($hookmanager) && ( (isset($object->lines[$i]->product_type) && $object->lines[$i]->product_type == 9 && !empty($object->lines[$i]->special_code)) || !empty($object->lines[$i]->fk_parent_line) ) )
 	if (is_object($hookmanager)) {   // Old code is commented on preceding line. Reproduct this test in the pdf_xxx function if you don't want your hook to run
 		$special_code = $object->lines[$i]->special_code;
 		if (!empty($object->lines[$i]->fk_parent_line)) {
@@ -1895,7 +1895,7 @@ function pdf_getlineupwithtax($object, $i, $outputlangs, $hidedetails = 0)
 
 	$result = '';
 	$reshook = 0;
-	//if (is_object($hookmanager) && ( (isset($object->lines[$i]->product_type) && $object->lines[$i]->product_type == 9 && ! empty($object->lines[$i]->special_code)) || ! empty($object->lines[$i]->fk_parent_line) ) )
+	//if (is_object($hookmanager) && ( (isset($object->lines[$i]->product_type) && $object->lines[$i]->product_type == 9 && !empty($object->lines[$i]->special_code)) || !empty($object->lines[$i]->fk_parent_line) ) )
 	if (is_object($hookmanager)) {   // Old code is commented on preceding line. Reproduct this test in the pdf_xxx function if you don't want your hook to run
 		$special_code = $object->lines[$i]->special_code;
 		if (!empty($object->lines[$i]->fk_parent_line)) {
@@ -1932,7 +1932,7 @@ function pdf_getlineqty($object, $i, $outputlangs, $hidedetails = 0)
 
 	$result = '';
 	$reshook = 0;
-	//if (is_object($hookmanager) && ( (isset($object->lines[$i]->product_type) && $object->lines[$i]->product_type == 9 && ! empty($object->lines[$i]->special_code)) || ! empty($object->lines[$i]->fk_parent_line) ) )
+	//if (is_object($hookmanager) && ( (isset($object->lines[$i]->product_type) && $object->lines[$i]->product_type == 9 && !empty($object->lines[$i]->special_code)) || !empty($object->lines[$i]->fk_parent_line) ) )
 	if (is_object($hookmanager)) {   // Old code is commented on preceding line. Reproduct this test in the pdf_xxx function if you don't want your hook to run
 		$special_code = $object->lines[$i]->special_code;
 		if (!empty($object->lines[$i]->fk_parent_line)) {
@@ -1972,7 +1972,7 @@ function pdf_getlineqty_asked($object, $i, $outputlangs, $hidedetails = 0)
 
 	$reshook = 0;
 	$result = '';
-	//if (is_object($hookmanager) && ( (isset($object->lines[$i]->product_type) && $object->lines[$i]->product_type == 9 && ! empty($object->lines[$i]->special_code)) || ! empty($object->lines[$i]->fk_parent_line) ) )
+	//if (is_object($hookmanager) && ( (isset($object->lines[$i]->product_type) && $object->lines[$i]->product_type == 9 && !empty($object->lines[$i]->special_code)) || !empty($object->lines[$i]->fk_parent_line) ) )
 	if (is_object($hookmanager)) {   // Old code is commented on preceding line. Reproduct this test in the pdf_xxx function if you don't want your hook to run
 		$special_code = $object->lines[$i]->special_code;
 		if (!empty($object->lines[$i]->fk_parent_line)) {
@@ -2012,7 +2012,7 @@ function pdf_getlineqty_shipped($object, $i, $outputlangs, $hidedetails = 0)
 
 	$reshook = 0;
 	$result = '';
-	//if (is_object($hookmanager) && ( (isset($object->lines[$i]->product_type) && $object->lines[$i]->product_type == 9 && ! empty($object->lines[$i]->special_code)) || ! empty($object->lines[$i]->fk_parent_line) ) )
+	//if (is_object($hookmanager) && ( (isset($object->lines[$i]->product_type) && $object->lines[$i]->product_type == 9 && !empty($object->lines[$i]->special_code)) || !empty($object->lines[$i]->fk_parent_line) ) )
 	if (is_object($hookmanager)) {   // Old code is commented on preceding line. Reproduct this test in the pdf_xxx function if you don't want your hook to run
 		$special_code = $object->lines[$i]->special_code;
 		if (!empty($object->lines[$i]->fk_parent_line)) {
@@ -2052,7 +2052,7 @@ function pdf_getlineqty_keeptoship($object, $i, $outputlangs, $hidedetails = 0)
 
 	$reshook = 0;
 	$result = '';
-	//if (is_object($hookmanager) && ( (isset($object->lines[$i]->product_type) && $object->lines[$i]->product_type == 9 && ! empty($object->lines[$i]->special_code)) || ! empty($object->lines[$i]->fk_parent_line) ) )
+	//if (is_object($hookmanager) && ( (isset($object->lines[$i]->product_type) && $object->lines[$i]->product_type == 9 && !empty($object->lines[$i]->special_code)) || !empty($object->lines[$i]->fk_parent_line) ) )
 	if (is_object($hookmanager)) {   // Old code is commented on preceding line. Reproduct this test in the pdf_xxx function if you don't want your hook to run
 		$special_code = $object->lines[$i]->special_code;
 		if (!empty($object->lines[$i]->fk_parent_line)) {
@@ -2093,7 +2093,7 @@ function pdf_getlineunit($object, $i, $outputlangs, $hidedetails = 0, $hookmanag
 
 	$reshook = 0;
 	$result = '';
-	//if (is_object($hookmanager) && ( (isset($object->lines[$i]->product_type) && $object->lines[$i]->product_type == 9 && ! empty($object->lines[$i]->special_code)) || ! empty($object->lines[$i]->fk_parent_line) ) )
+	//if (is_object($hookmanager) && ( (isset($object->lines[$i]->product_type) && $object->lines[$i]->product_type == 9 && !empty($object->lines[$i]->special_code)) || !empty($object->lines[$i]->fk_parent_line) ) )
 	if (is_object($hookmanager)) {   // Old code is commented on preceding line. Reproduct this test in the pdf_xxx function if you don't want your hook to run
 		$special_code = $object->lines[$i]->special_code;
 		if (!empty($object->lines[$i]->fk_parent_line)) {
@@ -2138,7 +2138,7 @@ function pdf_getlineremisepercent($object, $i, $outputlangs, $hidedetails = 0)
 
 	$reshook = 0;
 	$result = '';
-	//if (is_object($hookmanager) && ( (isset($object->lines[$i]->product_type) && $object->lines[$i]->product_type == 9 && ! empty($object->lines[$i]->special_code)) || ! empty($object->lines[$i]->fk_parent_line) ) )
+	//if (is_object($hookmanager) && ( (isset($object->lines[$i]->product_type) && $object->lines[$i]->product_type == 9 && !empty($object->lines[$i]->special_code)) || !empty($object->lines[$i]->fk_parent_line) ) )
 	if (is_object($hookmanager)) {   // Old code is commented on preceding line. Reproduct this test in the pdf_xxx function if you don't want your hook to run
 		$special_code = $object->lines[$i]->special_code;
 		if (!empty($object->lines[$i]->fk_parent_line)) {
@@ -2182,7 +2182,7 @@ function pdf_getlineprogress($object, $i, $outputlangs, $hidedetails = 0, $hookm
 
 	$reshook = 0;
 	$result = '';
-	//if (is_object($hookmanager) && ( (isset($object->lines[$i]->product_type) && $object->lines[$i]->product_type == 9 && ! empty($object->lines[$i]->special_code)) || ! empty($object->lines[$i]->fk_parent_line) ) )
+	//if (is_object($hookmanager) && ( (isset($object->lines[$i]->product_type) && $object->lines[$i]->product_type == 9 && !empty($object->lines[$i]->special_code)) || !empty($object->lines[$i]->fk_parent_line) ) )
 	if (is_object($hookmanager)) {   // Old code is commented on preceding line. Reproduct this test in the pdf_xxx function if you don't want your hook to run
 		$special_code = $object->lines[$i]->special_code;
 		if (!empty($object->lines[$i]->fk_parent_line)) {
@@ -2235,7 +2235,7 @@ function pdf_getlinetotalexcltax($object, $i, $outputlangs, $hidedetails = 0)
 
 	$reshook = 0;
 	$result = '';
-	//if (is_object($hookmanager) && ( (isset($object->lines[$i]->product_type) && $object->lines[$i]->product_type == 9 && ! empty($object->lines[$i]->special_code)) || ! empty($object->lines[$i]->fk_parent_line) ) )
+	//if (is_object($hookmanager) && ( (isset($object->lines[$i]->product_type) && $object->lines[$i]->product_type == 9 && !empty($object->lines[$i]->special_code)) || !empty($object->lines[$i]->fk_parent_line) ) )
 	if (is_object($hookmanager)) {   // Old code is commented on preceding line. Reproduct this test in the pdf_xxx function if you don't want your hook to run
 		$special_code = $object->lines[$i]->special_code;
 		if (!empty($object->lines[$i]->fk_parent_line)) {
@@ -2291,7 +2291,7 @@ function pdf_getlinetotalwithtax($object, $i, $outputlangs, $hidedetails = 0)
 
 	$reshook = 0;
 	$result = '';
-	//if (is_object($hookmanager) && ( (isset($object->lines[$i]->product_type) && $object->lines[$i]->product_type == 9 && ! empty($object->lines[$i]->special_code)) || ! empty($object->lines[$i]->fk_parent_line) ) )
+	//if (is_object($hookmanager) && ( (isset($object->lines[$i]->product_type) && $object->lines[$i]->product_type == 9 && !empty($object->lines[$i]->special_code)) || !empty($object->lines[$i]->fk_parent_line) ) )
 	if (is_object($hookmanager)) {   // Old code is commented on preceding line. Reproduct this test in the pdf_xxx function if you don't want your hook to run
 		$special_code = $object->lines[$i]->special_code;
 		if (!empty($object->lines[$i]->fk_parent_line)) {
@@ -2401,7 +2401,7 @@ function pdf_getLinkedObjects(&$object, $outputlangs)
 				foreach ($objects as $elementobject) {
 					if (empty($object->linkedObjects['commande']) && $object->element != 'commande') {    // There is not already a link to order and object is not the order, so we show also info with order
 						$elementobject->fetchObjectLinked(null, '', null, '', 'OR', 1, 'sourcetype', 0);
-						if (! empty($elementobject->linkedObjectsIds['commande'])) {
+						if (!empty($elementobject->linkedObjectsIds['commande'])) {
 							include_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
 							$order = new Commande($db);
 							$ret = $order->fetch(reset($elementobject->linkedObjectsIds['commande']));
@@ -2426,7 +2426,7 @@ function pdf_getLinkedObjects(&$object, $outputlangs)
 				// We concat this record info into fields xxx_value. title is overwrote.
 				if (empty($object->linkedObjects['commande']) && $object->element != 'commande') {    // There is not already a link to order and object is not the order, so we show also info with order
 					$elementobject->fetchObjectLinked(null, '', null, '', 'OR', 1, 'sourcetype', 0);
-					if (! empty($elementobject->linkedObjectsIds['commande'])) {
+					if (!empty($elementobject->linkedObjectsIds['commande'])) {
 						include_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
 						$order = new Commande($db);
 						$ret = $order->fetch(reset($elementobject->linkedObjectsIds['commande']));
@@ -2438,7 +2438,7 @@ function pdf_getLinkedObjects(&$object, $outputlangs)
 
 				if (! is_object($order)) {
 					$linkedobjects[$objecttype]['ref_title'] = $outputlangs->transnoentities("RefSending");
-					if (! empty($linkedobjects[$objecttype]['ref_value'])) $linkedobjects[$objecttype]['ref_value'] .= ' / ';
+					if (!empty($linkedobjects[$objecttype]['ref_value'])) $linkedobjects[$objecttype]['ref_value'] .= ' / ';
 					$linkedobjects[$objecttype]['ref_value'] .= $outputlangs->transnoentities($elementobject->ref);
 				} else {
 					$linkedobjects[$objecttype]['ref_title'] = $outputlangs->transnoentities("RefOrder").' / '.$outputlangs->transnoentities("RefSending");
diff --git a/htdocs/core/lib/project.lib.php b/htdocs/core/lib/project.lib.php
index 3d0ab7f083d..02423980002 100644
--- a/htdocs/core/lib/project.lib.php
+++ b/htdocs/core/lib/project.lib.php
@@ -1314,7 +1314,7 @@ function projectLinesPerDay(&$inc, $parent, $fuser, $lines, &$level, &$projectsr
 
 	$restrictBefore = null;
 
-	if (! empty($conf->global->PROJECT_TIMESHEET_PREVENT_AFTER_MONTHS)) {
+	if (!empty($conf->global->PROJECT_TIMESHEET_PREVENT_AFTER_MONTHS)) {
 		require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
 		$restrictBefore = dol_time_plus_duree(dol_now(), - $conf->global->PROJECT_TIMESHEET_PREVENT_AFTER_MONTHS, 'm');
 	}
@@ -1398,11 +1398,11 @@ function projectLinesPerDay(&$inc, $parent, $fuser, $lines, &$level, &$projectsr
 					print '<tr class="liste_titre">';
 
 					// PROJECT fields
-					if (! empty($arrayfields['p.fk_opp_status']['checked'])) print_liste_field_titre($arrayfields['p.fk_opp_status']['label'], $_SERVER["PHP_SELF"], 'p.fk_opp_status', "", $param, '', $sortfield, $sortorder, 'center ');
-					if (! empty($arrayfields['p.opp_amount']['checked']))    print_liste_field_titre($arrayfields['p.opp_amount']['label'], $_SERVER["PHP_SELF"], 'p.opp_amount', "", $param, '', $sortfield, $sortorder, 'right ');
-					if (! empty($arrayfields['p.opp_percent']['checked']))   print_liste_field_titre($arrayfields['p.opp_percent']['label'], $_SERVER["PHP_SELF"], 'p.opp_percent', "", $param, '', $sortfield, $sortorder, 'right ');
-					if (! empty($arrayfields['p.budget_amount']['checked'])) print_liste_field_titre($arrayfields['p.budget_amount']['label'], $_SERVER["PHP_SELF"], 'p.budget_amount', "", $param, '', $sortfield, $sortorder, 'right ');
-					if (! empty($arrayfields['p.usage_bill_time']['checked']))     print_liste_field_titre($arrayfields['p.usage_bill_time']['label'], $_SERVER["PHP_SELF"], 'p.usage_bill_time', "", $param, '', $sortfield, $sortorder, 'right ');
+					if (!empty($arrayfields['p.fk_opp_status']['checked'])) print_liste_field_titre($arrayfields['p.fk_opp_status']['label'], $_SERVER["PHP_SELF"], 'p.fk_opp_status', "", $param, '', $sortfield, $sortorder, 'center ');
+					if (!empty($arrayfields['p.opp_amount']['checked']))    print_liste_field_titre($arrayfields['p.opp_amount']['label'], $_SERVER["PHP_SELF"], 'p.opp_amount', "", $param, '', $sortfield, $sortorder, 'right ');
+					if (!empty($arrayfields['p.opp_percent']['checked']))   print_liste_field_titre($arrayfields['p.opp_percent']['label'], $_SERVER["PHP_SELF"], 'p.opp_percent', "", $param, '', $sortfield, $sortorder, 'right ');
+					if (!empty($arrayfields['p.budget_amount']['checked'])) print_liste_field_titre($arrayfields['p.budget_amount']['label'], $_SERVER["PHP_SELF"], 'p.budget_amount', "", $param, '', $sortfield, $sortorder, 'right ');
+					if (!empty($arrayfields['p.usage_bill_time']['checked']))     print_liste_field_titre($arrayfields['p.usage_bill_time']['label'], $_SERVER["PHP_SELF"], 'p.usage_bill_time', "", $param, '', $sortfield, $sortorder, 'right ');
 
 					$extrafieldsobjectkey='projet';
 					$extrafieldsobjectprefix='efp.';
@@ -1412,32 +1412,32 @@ function projectLinesPerDay(&$inc, $parent, $fuser, $lines, &$level, &$projectsr
 					print '<tr>';
 
 					// PROJECT fields
-					if (! empty($arrayfields['p.fk_opp_status']['checked']))
+					if (!empty($arrayfields['p.fk_opp_status']['checked']))
 					{
 						print '<td class="nowrap">';
 						$code = dol_getIdFromCode($db, $lines[$i]->fk_opp_status, 'c_lead_status', 'rowid', 'code');
 						if ($code) print $langs->trans("OppStatus".$code);
 						print "</td>\n";
 					}
-					if (! empty($arrayfields['p.opp_amount']['checked']))
+					if (!empty($arrayfields['p.opp_amount']['checked']))
 					{
 						print '<td class="nowrap">';
 						print price($lines[$i]->opp_amount, 0, $langs, 1, 0, -1, $conf->currency);
 						print "</td>\n";
 					}
-					if (! empty($arrayfields['p.opp_percent']['checked']))
+					if (!empty($arrayfields['p.opp_percent']['checked']))
 					{
 						print '<td class="nowrap">';
 						print price($lines[$i]->opp_percent, 0, $langs, 1, 0).' %';
 						print "</td>\n";
 					}
-					if (! empty($arrayfields['p.budget_amount']['checked']))
+					if (!empty($arrayfields['p.budget_amount']['checked']))
 					{
 						print '<td class="nowrap">';
 						print price($lines[$i]->budget_amount, 0, $langs, 1, 0, 0, $conf->currency);
 						print "</td>\n";
 					}
-					if (! empty($arrayfields['p.usage_bill_time']['checked']))
+					if (!empty($arrayfields['p.usage_bill_time']['checked']))
 					{
 						print '<td class="nowrap">';
 						print yn($lines[$i]->usage_bill_time);
@@ -1718,7 +1718,7 @@ function projectLinesPerWeek(&$inc, $firstdaytoshow, $fuser, $parent, $lines, &$
 
 	$restrictBefore = null;
 
-	if (! empty($conf->global->PROJECT_TIMESHEET_PREVENT_AFTER_MONTHS)) {
+	if (!empty($conf->global->PROJECT_TIMESHEET_PREVENT_AFTER_MONTHS)) {
 		require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
 		$restrictBefore = dol_time_plus_duree(dol_now(), - $conf->global->PROJECT_TIMESHEET_PREVENT_AFTER_MONTHS, 'm');
 	}
@@ -1802,11 +1802,11 @@ function projectLinesPerWeek(&$inc, $firstdaytoshow, $fuser, $parent, $lines, &$
 					print '<tr class="liste_titre">';
 
 					// PROJECT fields
-					if (! empty($arrayfields['p.fk_opp_status']['checked'])) print_liste_field_titre($arrayfields['p.fk_opp_status']['label'], $_SERVER["PHP_SELF"], 'p.fk_opp_status', "", $param, '', $sortfield, $sortorder, 'center ');
-					if (! empty($arrayfields['p.opp_amount']['checked']))    print_liste_field_titre($arrayfields['p.opp_amount']['label'], $_SERVER["PHP_SELF"], 'p.opp_amount', "", $param, '', $sortfield, $sortorder, 'right ');
-					if (! empty($arrayfields['p.opp_percent']['checked']))   print_liste_field_titre($arrayfields['p.opp_percent']['label'], $_SERVER["PHP_SELF"], 'p.opp_percent', "", $param, '', $sortfield, $sortorder, 'right ');
-					if (! empty($arrayfields['p.budget_amount']['checked'])) print_liste_field_titre($arrayfields['p.budget_amount']['label'], $_SERVER["PHP_SELF"], 'p.budget_amount', "", $param, '', $sortfield, $sortorder, 'right ');
-					if (! empty($arrayfields['p.usage_bill_time']['checked']))     print_liste_field_titre($arrayfields['p.usage_bill_time']['label'], $_SERVER["PHP_SELF"], 'p.usage_bill_time', "", $param, '', $sortfield, $sortorder, 'right ');
+					if (!empty($arrayfields['p.fk_opp_status']['checked'])) print_liste_field_titre($arrayfields['p.fk_opp_status']['label'], $_SERVER["PHP_SELF"], 'p.fk_opp_status', "", $param, '', $sortfield, $sortorder, 'center ');
+					if (!empty($arrayfields['p.opp_amount']['checked']))    print_liste_field_titre($arrayfields['p.opp_amount']['label'], $_SERVER["PHP_SELF"], 'p.opp_amount', "", $param, '', $sortfield, $sortorder, 'right ');
+					if (!empty($arrayfields['p.opp_percent']['checked']))   print_liste_field_titre($arrayfields['p.opp_percent']['label'], $_SERVER["PHP_SELF"], 'p.opp_percent', "", $param, '', $sortfield, $sortorder, 'right ');
+					if (!empty($arrayfields['p.budget_amount']['checked'])) print_liste_field_titre($arrayfields['p.budget_amount']['label'], $_SERVER["PHP_SELF"], 'p.budget_amount', "", $param, '', $sortfield, $sortorder, 'right ');
+					if (!empty($arrayfields['p.usage_bill_time']['checked']))     print_liste_field_titre($arrayfields['p.usage_bill_time']['label'], $_SERVER["PHP_SELF"], 'p.usage_bill_time', "", $param, '', $sortfield, $sortorder, 'right ');
 
 					$extrafieldsobjectkey='projet';
 					$extrafieldsobjectprefix='efp.';
@@ -1816,32 +1816,32 @@ function projectLinesPerWeek(&$inc, $firstdaytoshow, $fuser, $parent, $lines, &$
 					print '<tr>';
 
 					// PROJECT fields
-					if (! empty($arrayfields['p.fk_opp_status']['checked']))
+					if (!empty($arrayfields['p.fk_opp_status']['checked']))
 					{
 						print '<td class="nowrap">';
 						$code = dol_getIdFromCode($db, $lines[$i]->fk_opp_status, 'c_lead_status', 'rowid', 'code');
 						if ($code) print $langs->trans("OppStatus".$code);
 						print "</td>\n";
 					}
-					if (! empty($arrayfields['p.opp_amount']['checked']))
+					if (!empty($arrayfields['p.opp_amount']['checked']))
 					{
 						print '<td class="nowrap">';
 						print price($lines[$i]->opp_amount, 0, $langs, 1, 0, -1, $conf->currency);
 						print "</td>\n";
 					}
-					if (! empty($arrayfields['p.opp_percent']['checked']))
+					if (!empty($arrayfields['p.opp_percent']['checked']))
 					{
 						print '<td class="nowrap">';
 						print price($lines[$i]->opp_percent, 0, $langs, 1, 0).' %';
 						print "</td>\n";
 					}
-					if (! empty($arrayfields['p.budget_amount']['checked']))
+					if (!empty($arrayfields['p.budget_amount']['checked']))
 					{
 						print '<td class="nowrap">';
 						print price($lines[$i]->budget_amount, 0, $langs, 1, 0, 0, $conf->currency);
 						print "</td>\n";
 					}
-					if (! empty($arrayfields['p.usage_bill_time']['checked']))
+					if (!empty($arrayfields['p.usage_bill_time']['checked']))
 					{
 						print '<td class="nowrap">';
 						print yn($lines[$i]->usage_bill_time);
@@ -2111,7 +2111,7 @@ function projectLinesPerMonth(&$inc, $firstdaytoshow, $fuser, $parent, $lines, &
 
 	$restrictBefore = null;
 
-	if (! empty($conf->global->PROJECT_TIMESHEET_PREVENT_AFTER_MONTHS)) {
+	if (!empty($conf->global->PROJECT_TIMESHEET_PREVENT_AFTER_MONTHS)) {
 		require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
 		$restrictBefore = dol_time_plus_duree(dol_now(), - $conf->global->PROJECT_TIMESHEET_PREVENT_AFTER_MONTHS, 'm');
 	}
diff --git a/htdocs/core/lib/security2.lib.php b/htdocs/core/lib/security2.lib.php
index 380282fc48b..287a151f41c 100644
--- a/htdocs/core/lib/security2.lib.php
+++ b/htdocs/core/lib/security2.lib.php
@@ -159,7 +159,7 @@ if (!function_exists('dol_loginfunction')) {
 		/*
 		$conf->css = "/theme/".(GETPOST('theme','aZ09')?GETPOST('theme','aZ09'):$conf->theme)."/style.css.php";
 		$themepath=dol_buildpath($conf->css,1);
-		if (! empty($conf->modules_parts['theme']))		// Using this feature slow down application
+		if (!empty($conf->modules_parts['theme']))		// Using this feature slow down application
 		{
 			foreach($conf->modules_parts['theme'] as $reldir)
 			{
diff --git a/htdocs/core/lib/sendings.lib.php b/htdocs/core/lib/sendings.lib.php
index 4988be3cefd..df6e3231a0b 100644
--- a/htdocs/core/lib/sendings.lib.php
+++ b/htdocs/core/lib/sendings.lib.php
@@ -280,7 +280,7 @@ function show_list_sending_receive($origin, $origin_id, $filter = '')
 				print '<td>'.$langs->trans("Warehouse").'</td>';
 			}
 			/*TODO Add link to expeditiondet_batch
-			if (! empty($conf->productbatch->enabled))
+			if (!empty($conf->productbatch->enabled))
 			{
 				print '<td>';
 				print '</td>';
@@ -396,7 +396,7 @@ function show_list_sending_receive($origin, $origin_id, $filter = '')
 
 				// Batch number managment
 				/*TODO Add link to expeditiondet_batch
-				if (! empty($conf->productbatch->enabled))
+				if (!empty($conf->productbatch->enabled))
 				{
 					//var_dump($objp->edrowid);
 					$lines[$i]->detail_batch
diff --git a/htdocs/core/lib/stock.lib.php b/htdocs/core/lib/stock.lib.php
index c6b1bdefe6c..afad01ebcff 100644
--- a/htdocs/core/lib/stock.lib.php
+++ b/htdocs/core/lib/stock.lib.php
@@ -54,7 +54,7 @@ function stock_prepare_head($object)
 	*/
 
 	/* Disabled because will never be implemented. Table always empty.
-	if (! empty($conf->global->STOCK_USE_WAREHOUSE_BY_USER))
+	if (!empty($conf->global->STOCK_USE_WAREHOUSE_BY_USER))
 	{
 		// Should not be enabled by defaut because does not work yet correctly because
 		// personnal stocks are not tagged into table llx_entrepot
diff --git a/htdocs/core/lib/usergroups.lib.php b/htdocs/core/lib/usergroups.lib.php
index aef55e09bd6..962ae897bca 100644
--- a/htdocs/core/lib/usergroups.lib.php
+++ b/htdocs/core/lib/usergroups.lib.php
@@ -483,7 +483,7 @@ 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 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 '<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>';
@@ -565,7 +565,7 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
 		print '<tr class="oddeven">';
 		print '<td>'.$langs->trans("TopMenuBackgroundColor").'</td>';
 		print '<td>'.($conf->global->THEME_ELDY_TOPMENU_BACK1?$conf->global->THEME_ELDY_TOPMENU_BACK1:$langs->trans("Default")).'</td>';
-		print '<td class="nowrap left" width="20%"><input name="check_THEME_ELDY_TOPMENU_BACK1" id="check_THEME_ELDY_TOPMENU_BACK1" type="checkbox" '.(! empty($object->conf->THEME_ELDY_TOPMENU_BACK1)?" checked":"");
+		print '<td class="nowrap left" width="20%"><input name="check_THEME_ELDY_TOPMENU_BACK1" id="check_THEME_ELDY_TOPMENU_BACK1" type="checkbox" '.(!empty($object->conf->THEME_ELDY_TOPMENU_BACK1)?" checked":"");
 		print (empty($dolibarr_main_demo) && $edit)?'':' disabled="disabled"';	// Disabled for demo
 		print '> '.$langs->trans("UsePersonalValue").'</td>';
 		print '<td>';
@@ -608,7 +608,7 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
 		print '<tr class="oddeven">';
 		print '<td>'.$langs->trans("TopMenuBackgroundColor").'</td>';
 		print '<td>'.($conf->global->THEME_ELDY_TOPMENU_BACK1?$conf->global->THEME_ELDY_TOPMENU_BACK1:$langs->trans("Default")).'</td>';
-		print '<td class="nowrap left" width="20%"><input name="check_THEME_ELDY_TOPMENU_BACK1" id="check_THEME_ELDY_TOPMENU_BACK1" type="checkbox" '.(! empty($object->conf->THEME_ELDY_TOPMENU_BACK1)?" checked":"");
+		print '<td class="nowrap left" width="20%"><input name="check_THEME_ELDY_TOPMENU_BACK1" id="check_THEME_ELDY_TOPMENU_BACK1" type="checkbox" '.(!empty($object->conf->THEME_ELDY_TOPMENU_BACK1)?" checked":"");
 		print (empty($dolibarr_main_demo) && $edit)?'':' disabled="disabled"';	// Disabled for demo
 		print '> '.$langs->trans("UsePersonalValue").'</td>';
 		print '<td>';
@@ -652,7 +652,7 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
 		 print '<tr class="oddeven">';
 		 print '<td>'.$langs->trans("TopMenuBackgroundColor").'</td>';
 		 print '<td>'.($conf->global->THEME_ELDY_TOPMENU_BACK1?$conf->global->THEME_ELDY_VERMENU_BACK1:$langs->trans("Default")).'</td>';
-		 print '<td class="nowrap left" width="20%"><input name="check_THEME_ELDY_VERMENU_BACK1" id="check_THEME_ELDY_VERMENU_BACK1" type="checkbox" '.(! empty($object->conf->THEME_ELDY_TOPMENU_BACK1)?" checked":"");
+		 print '<td class="nowrap left" width="20%"><input name="check_THEME_ELDY_VERMENU_BACK1" id="check_THEME_ELDY_VERMENU_BACK1" type="checkbox" '.(!empty($object->conf->THEME_ELDY_TOPMENU_BACK1)?" checked":"");
 		 print (empty($dolibarr_main_demo) && $edit)?'':' disabled="disabled"';	// Disabled for demo
 		 print '> '.$langs->trans("UsePersonalValue").'</td>';
 		 print '<td>';
@@ -825,7 +825,7 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
 		 print '<tr class="oddeven">';
 		 print '<td>'.$langs->trans("TopMenuBackgroundColor").'</td>';
 		 print '<td>'.($conf->global->THEME_ELDY_TOPMENU_BACK1?$conf->global->THEME_ELDY_TEXTLINK:$langs->trans("Default")).'</td>';
-		 print '<td class="nowrap left" width="20%"><input name="check_THEME_ELDY_TEXTLINK" id="check_THEME_ELDY_TEXTLINK" type="checkbox" '.(! empty($object->conf->THEME_ELDY_TEXTLINK)?" checked":"");
+		 print '<td class="nowrap left" width="20%"><input name="check_THEME_ELDY_TEXTLINK" id="check_THEME_ELDY_TEXTLINK" 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>';
@@ -968,7 +968,7 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
 		 print '<tr class="oddeven">';
 		 print '<td>'.$langs->trans("TopMenuBackgroundColor").'</td>';
 		 print '<td>'.($conf->global->THEME_ELDY_TOPMENU_BACK1?$conf->global->THEME_ELDY_BTNACTION:$langs->trans("Default")).'</td>';
-		 print '<td class="nowrap left" width="20%"><input name="check_THEME_ELDY_BTNACTION" id="check_THEME_ELDY_BTNACTION" type="checkbox" '.(! empty($object->conf->THEME_ELDY_BTNACTION)?" checked":"");
+		 print '<td class="nowrap left" width="20%"><input name="check_THEME_ELDY_BTNACTION" id="check_THEME_ELDY_BTNACTION" type="checkbox" '.(!empty($object->conf->THEME_ELDY_BTNACTION)?" checked":"");
 		 print (empty($dolibarr_main_demo) && $edit)?'':' disabled="disabled"';	// Disabled for demo
 		 print '> '.$langs->trans("UsePersonalValue").'</td>';
 		 print '<td>';
@@ -1014,7 +1014,7 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
 		 print '<tr class="oddeven">';
 		 print '<td>'.$langs->trans("TopMenuBackgroundColor").'</td>';
 		 print '<td>'.($conf->global->THEME_ELDY_TOPMENU_BACK1?$conf->global->THEME_ELDY_TEXTBTNACTION:$langs->trans("Default")).'</td>';
-		 print '<td class="nowrap left" width="20%"><input name="check_THEME_ELDY_TEXTBTNACTION" id="check_THEME_ELDY_TEXTBTNACTION" type="checkbox" '.(! empty($object->conf->THEME_ELDY_TEXTBTNACTION)?" checked":"");
+		 print '<td class="nowrap left" width="20%"><input name="check_THEME_ELDY_TEXTBTNACTION" id="check_THEME_ELDY_TEXTBTNACTION" type="checkbox" '.(!empty($object->conf->THEME_ELDY_TEXTBTNACTION)?" checked":"");
 		 print (empty($dolibarr_main_demo) && $edit)?'':' disabled="disabled"'; // Disabled for demo
 		 print '> '.$langs->trans("UsePersonalValue").'</td>';
 		 print '<td>';
diff --git a/htdocs/core/lib/website2.lib.php b/htdocs/core/lib/website2.lib.php
index e5042807b02..58a0c6a64dd 100644
--- a/htdocs/core/lib/website2.lib.php
+++ b/htdocs/core/lib/website2.lib.php
@@ -309,7 +309,7 @@ function dolSaveIndexPage($pathofwebsite, $fileindex, $filetpl, $filewrapper, $o
 		$indexcontent .= "// BEGIN PHP File generated to provide an index.php as Home Page or alias redirector - DO NOT MODIFY - It is just a generated wrapper.\n";
 		$indexcontent .= '$websitekey=basename(__DIR__); if (empty($websitepagefile)) $websitepagefile=__FILE__;'."\n";
 		$indexcontent .= "if (! defined('USEDOLIBARRSERVER') && ! defined('USEDOLIBARREDITOR')) { require_once './master.inc.php'; } // Load master if not already loaded\n";
-		$indexcontent .= 'if (! empty($_GET[\'pageref\']) || ! empty($_GET[\'pagealiasalt\']) || ! empty($_GET[\'pageid\'])) {'."\n";
+		$indexcontent .= 'if (!empty($_GET[\'pageref\']) || !empty($_GET[\'pagealiasalt\']) || !empty($_GET[\'pageid\'])) {'."\n";
 		$indexcontent .= "	require_once DOL_DOCUMENT_ROOT.'/core/lib/website.lib.php';\n";
 		$indexcontent .= "	require_once DOL_DOCUMENT_ROOT.'/core/website.inc.php';\n";
 		$indexcontent .= '	redirectToContainer($_GET[\'pageref\'], $_GET[\'pagealiasalt\'], $_GET[\'pageid\']);'."\n";
@@ -341,7 +341,7 @@ function dolSaveIndexPage($pathofwebsite, $fileindex, $filetpl, $filewrapper, $o
 						$indexcontent .= "// BEGIN PHP File generated to provide an index.php as Home Page or alias redirector - DO NOT MODIFY - It is just a generated wrapper.\n";
 						$indexcontent .= '$websitekey=basename(__DIR__); if (empty($websitepagefile)) $websitepagefile=__FILE__;'."\n";
 						$indexcontent .= "if (! defined('USEDOLIBARRSERVER') && ! defined('USEDOLIBARREDITOR')) { require_once '".$relpath."/master.inc.php'; } // Load master if not already loaded\n";
-						$indexcontent .= 'if (! empty($_GET[\'pageref\']) || ! empty($_GET[\'pagealiasalt\']) || ! empty($_GET[\'pageid\'])) {'."\n";
+						$indexcontent .= 'if (!empty($_GET[\'pageref\']) || !empty($_GET[\'pagealiasalt\']) || !empty($_GET[\'pageid\'])) {'."\n";
 						$indexcontent .= "	require_once DOL_DOCUMENT_ROOT.'/core/lib/website.lib.php';\n";
 						$indexcontent .= "	require_once DOL_DOCUMENT_ROOT.'/core/website.inc.php';\n";
 						$indexcontent .= '	redirectToContainer($_GET[\'pageref\'], $_GET[\'pagealiasalt\'], $_GET[\'pageid\']);'."\n";
diff --git a/htdocs/core/menus/standard/auguria.lib.php b/htdocs/core/menus/standard/auguria.lib.php
index 71f399497c7..037d1fee8c2 100644
--- a/htdocs/core/menus/standard/auguria.lib.php
+++ b/htdocs/core/menus/standard/auguria.lib.php
@@ -148,7 +148,7 @@ function print_auguria_menu($db, $atarget, $type_user, &$tabMenu, &$menu, $noout
 
 		if (!empty($mysoc->logo_squarred_mini) && is_readable($conf->mycompany->dir_output.'/logos/thumbs/'.$mysoc->logo_squarred_mini)) {
 			$urllogo = DOL_URL_ROOT.'/viewimage.php?cache=1&amp;modulepart=mycompany&amp;file='.urlencode('logos/thumbs/'.$mysoc->logo_squarred_mini);
-			/*} elseif (! empty($mysoc->logo_mini) && is_readable($conf->mycompany->dir_output.'/logos/thumbs/'.$mysoc->logo_mini))
+			/*} elseif (!empty($mysoc->logo_mini) && is_readable($conf->mycompany->dir_output.'/logos/thumbs/'.$mysoc->logo_mini))
 			 {
 			 $urllogo=DOL_URL_ROOT.'/viewimage.php?cache=1&amp;modulepart=mycompany&amp;file='.urlencode('logos/thumbs/'.$mysoc->logo_mini);
 			 }*/
diff --git a/htdocs/core/menus/standard/eldy.lib.php b/htdocs/core/menus/standard/eldy.lib.php
index 4707657d3e3..35b233ba6e5 100644
--- a/htdocs/core/menus/standard/eldy.lib.php
+++ b/htdocs/core/menus/standard/eldy.lib.php
@@ -208,7 +208,7 @@ function print_eldy_menu($db, $atarget, $type_user, &$tabMenu, &$menu, $noout =
 	$menu_arr[] = array(
 		'name' => 'Projet',
 		'link' => '/projet/index.php?mainmenu=project&amp;leftmenu=',
-		'title' => (! empty($conf->global->PROJECT_USE_OPPORTUNITIES) && $conf->global->PROJECT_USE_OPPORTUNITIES == 2 ? "Leads" : "Projects"),
+		'title' => (!empty($conf->global->PROJECT_USE_OPPORTUNITIES) && $conf->global->PROJECT_USE_OPPORTUNITIES == 2 ? "Leads" : "Projects"),
 		'level' => 0,
 		'enabled' => $showmode = isVisibleToUserType($type_user, $tmpentry, $listofmodulesforexternal),
 		'target' => $atarget,
@@ -544,7 +544,7 @@ function print_eldy_menu($db, $atarget, $type_user, &$tabMenu, &$menu, $noout =
 
 		if (!empty($mysoc->logo_squarred_mini) && is_readable($conf->mycompany->dir_output.'/logos/thumbs/'.$mysoc->logo_squarred_mini)) {
 			$urllogo = DOL_URL_ROOT.'/viewimage.php?cache=1&amp;modulepart=mycompany&amp;file='.urlencode('logos/thumbs/'.$mysoc->logo_squarred_mini);
-			/*} elseif (! empty($mysoc->logo_mini) && is_readable($conf->mycompany->dir_output.'/logos/thumbs/'.$mysoc->logo_mini))
+			/*} elseif (!empty($mysoc->logo_mini) && is_readable($conf->mycompany->dir_output.'/logos/thumbs/'.$mysoc->logo_mini))
 			 {
 			 $urllogo=DOL_URL_ROOT.'/viewimage.php?cache=1&amp;modulepart=mycompany&amp;file='.urlencode('logos/thumbs/'.$mysoc->logo_mini);
 			 }*/
@@ -1773,7 +1773,7 @@ function get_left_menu_accountancy($mainmenu, &$newmenu, $usemenuhider = 1, $lef
 			}
 
 			$modecompta = 'RECETTES-DEPENSES';
-			//if (isModEnabled('accounting') && ! empty($user->rights->accounting->comptarapport->lire) && $mainmenu == 'accountancy') $modecompta='';	// Not yet implemented. Should be BOOKKEEPINGCOLLECTED
+			//if (isModEnabled('accounting') && !empty($user->rights->accounting->comptarapport->lire) && $mainmenu == 'accountancy') $modecompta='';	// Not yet implemented. Should be BOOKKEEPINGCOLLECTED
 			if ($modecompta) {
 				if ($usemenuhider || empty($leftmenu) || preg_match('/accountancy_report/', $leftmenu)) {
 					$newmenu->add("/compta/stats/index.php?leftmenu=accountancy_report&modecompta=".$modecompta, $langs->trans("ReportTurnoverCollected"), 2, $user->rights->accounting->comptarapport->lire);
diff --git a/htdocs/core/modules/commande/doc/pdf_einstein.modules.php b/htdocs/core/modules/commande/doc/pdf_einstein.modules.php
index cb73b6fc282..d34c66c0def 100644
--- a/htdocs/core/modules/commande/doc/pdf_einstein.modules.php
+++ b/htdocs/core/modules/commande/doc/pdf_einstein.modules.php
@@ -774,7 +774,7 @@ class pdf_einstein extends ModelePDFCommandes
 		}
 		*/
 		/* TODO
-		else if (! empty($object->availability_code))
+		else if (!empty($object->availability_code))
 		{
 			$pdf->SetXY($this->marge_gauche, $posy);
 			$pdf->SetTextColor(200,0,0);
@@ -954,7 +954,7 @@ class pdf_einstein extends ModelePDFCommandes
 				// Nothing to do
 			} else {
 				//Local tax 1 before VAT
-				//if (! empty($conf->global->FACTURE_LOCAL_TAX1_OPTION) && $conf->global->FACTURE_LOCAL_TAX1_OPTION=='localtax1on')
+				//if (!empty($conf->global->FACTURE_LOCAL_TAX1_OPTION) && $conf->global->FACTURE_LOCAL_TAX1_OPTION=='localtax1on')
 				//{
 				foreach ($this->localtax1 as $localtax_type => $localtax_rate) {
 					if (in_array((string) $localtax_type, array('1', '3', '5'))) {
@@ -984,7 +984,7 @@ class pdf_einstein extends ModelePDFCommandes
 				}
 				//}
 				//Local tax 2 before VAT
-				//if (! empty($conf->global->FACTURE_LOCAL_TAX2_OPTION) && $conf->global->FACTURE_LOCAL_TAX2_OPTION=='localtax2on')
+				//if (!empty($conf->global->FACTURE_LOCAL_TAX2_OPTION) && $conf->global->FACTURE_LOCAL_TAX2_OPTION=='localtax2on')
 				//{
 				foreach ($this->localtax2 as $localtax_type => $localtax_rate) {
 					if (in_array((string) $localtax_type, array('1', '3', '5'))) {
@@ -1044,7 +1044,7 @@ class pdf_einstein extends ModelePDFCommandes
 				}
 
 				//Local tax 1 after VAT
-				//if (! empty($conf->global->FACTURE_LOCAL_TAX1_OPTION) && $conf->global->FACTURE_LOCAL_TAX1_OPTION=='localtax1on')
+				//if (!empty($conf->global->FACTURE_LOCAL_TAX1_OPTION) && $conf->global->FACTURE_LOCAL_TAX1_OPTION=='localtax1on')
 				//{
 				foreach ($this->localtax1 as $localtax_type => $localtax_rate) {
 					if (in_array((string) $localtax_type, array('2', '4', '6'))) {
@@ -1075,7 +1075,7 @@ class pdf_einstein extends ModelePDFCommandes
 				}
 				//}
 				//Local tax 2 after VAT
-				//if (! empty($conf->global->FACTURE_LOCAL_TAX2_OPTION) && $conf->global->FACTURE_LOCAL_TAX2_OPTION=='localtax2on')
+				//if (!empty($conf->global->FACTURE_LOCAL_TAX2_OPTION) && $conf->global->FACTURE_LOCAL_TAX2_OPTION=='localtax2on')
 				//{
 				foreach ($this->localtax2 as $localtax_type => $localtax_rate) {
 					if (in_array((string) $localtax_type, array('2', '4', '6'))) {
diff --git a/htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php b/htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php
index 8930481d219..28003fff639 100644
--- a/htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php
+++ b/htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php
@@ -992,7 +992,7 @@ class pdf_eratosthene extends ModelePDFCommandes
 		}
 		*/
 		/* TODO
-		else if (! empty($object->availability_code))
+		else if (!empty($object->availability_code))
 		{
 			$pdf->SetXY($this->marge_gauche, $posy);
 			$pdf->SetTextColor(200,0,0);
@@ -1168,7 +1168,7 @@ class pdf_eratosthene extends ModelePDFCommandes
 				// Nothing to do
 			} else {
 				//Local tax 1 before VAT
-				//if (! empty($conf->global->FACTURE_LOCAL_TAX1_OPTION) && $conf->global->FACTURE_LOCAL_TAX1_OPTION=='localtax1on')
+				//if (!empty($conf->global->FACTURE_LOCAL_TAX1_OPTION) && $conf->global->FACTURE_LOCAL_TAX1_OPTION=='localtax1on')
 				//{
 				foreach ($this->localtax1 as $localtax_type => $localtax_rate) {
 					if (in_array((string) $localtax_type, array('1', '3', '5'))) {
@@ -1197,7 +1197,7 @@ class pdf_eratosthene extends ModelePDFCommandes
 				}
 				//}
 				//Local tax 2 before VAT
-				//if (! empty($conf->global->FACTURE_LOCAL_TAX2_OPTION) && $conf->global->FACTURE_LOCAL_TAX2_OPTION=='localtax2on')
+				//if (!empty($conf->global->FACTURE_LOCAL_TAX2_OPTION) && $conf->global->FACTURE_LOCAL_TAX2_OPTION=='localtax2on')
 				//{
 				foreach ($this->localtax2 as $localtax_type => $localtax_rate) {
 					if (in_array((string) $localtax_type, array('1', '3', '5'))) {
@@ -1257,7 +1257,7 @@ class pdf_eratosthene extends ModelePDFCommandes
 				}
 
 				//Local tax 1 after VAT
-				//if (! empty($conf->global->FACTURE_LOCAL_TAX1_OPTION) && $conf->global->FACTURE_LOCAL_TAX1_OPTION=='localtax1on')
+				//if (!empty($conf->global->FACTURE_LOCAL_TAX1_OPTION) && $conf->global->FACTURE_LOCAL_TAX1_OPTION=='localtax1on')
 				//{
 				foreach ($this->localtax1 as $localtax_type => $localtax_rate) {
 					if (in_array((string) $localtax_type, array('2', '4', '6'))) {
@@ -1288,7 +1288,7 @@ class pdf_eratosthene extends ModelePDFCommandes
 				}
 				//}
 				//Local tax 2 after VAT
-				//if (! empty($conf->global->FACTURE_LOCAL_TAX2_OPTION) && $conf->global->FACTURE_LOCAL_TAX2_OPTION=='localtax2on')
+				//if (!empty($conf->global->FACTURE_LOCAL_TAX2_OPTION) && $conf->global->FACTURE_LOCAL_TAX2_OPTION=='localtax2on')
 				//{
 				foreach ($this->localtax2 as $localtax_type => $localtax_rate) {
 					if (in_array((string) $localtax_type, array('2', '4', '6'))) {
diff --git a/htdocs/core/modules/expensereport/doc/pdf_standard.modules.php b/htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
index 365a2326281..380fb5b79a0 100644
--- a/htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
+++ b/htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
@@ -600,7 +600,7 @@ class pdf_standard extends ModeleExpenseReport
 		//$pdf->MultiCell($nextColumnPosX-$this->posxtype-0.8, 4, $expensereporttypecodetoshow, 0, 'C');
 
 		// Project
-		//if (! empty($conf->project->enabled))
+		//if (!empty($conf->project->enabled))
 		//{
 		//    $pdf->SetFont('','', $default_font_size - 1);
 		//    $pdf->SetXY($this->posxprojet, $curY);
diff --git a/htdocs/core/modules/facture/doc/pdf_crabe.modules.php b/htdocs/core/modules/facture/doc/pdf_crabe.modules.php
index 14c13ceb57c..3b82e92f1ab 100644
--- a/htdocs/core/modules/facture/doc/pdf_crabe.modules.php
+++ b/htdocs/core/modules/facture/doc/pdf_crabe.modules.php
@@ -453,9 +453,9 @@ class pdf_crabe extends ModelePDFFactures
 				// You can add more thing under header here, if you increase $extra_under_address_shift too.
 				$extra_under_address_shift = 0;
 				$qrcodestring = '';
-				if (! empty($conf->global->INVOICE_ADD_ZATCA_QR_CODE)) {
+				if (!empty($conf->global->INVOICE_ADD_ZATCA_QR_CODE)) {
 					$qrcodestring = $object->buildZATCAQRString();
-				} elseif (! empty($conf->global->INVOICE_ADD_SWISS_QR_CODE)) {
+				} elseif (!empty($conf->global->INVOICE_ADD_SWISS_QR_CODE)) {
 					$qrcodestring = $object->buildSwitzerlandQRString();
 				}
 				if ($qrcodestring) {
@@ -1341,7 +1341,7 @@ class pdf_crabe extends ModelePDFFactures
 				// 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')
+				//if (!empty($conf->global->FACTURE_LOCAL_TAX1_OPTION) && $conf->global->FACTURE_LOCAL_TAX1_OPTION=='localtax1on')
 				//{
 				foreach ($this->localtax1 as $localtax_type => $localtax_rate) {
 					if (in_array((string) $localtax_type, array('1', '3', '5'))) {
@@ -1373,7 +1373,7 @@ class pdf_crabe extends ModelePDFFactures
 				}
 				//}
 				//Local tax 2 before VAT
-				//if (! empty($conf->global->FACTURE_LOCAL_TAX2_OPTION) && $conf->global->FACTURE_LOCAL_TAX2_OPTION=='localtax2on')
+				//if (!empty($conf->global->FACTURE_LOCAL_TAX2_OPTION) && $conf->global->FACTURE_LOCAL_TAX2_OPTION=='localtax2on')
 				//{
 				foreach ($this->localtax2 as $localtax_type => $localtax_rate) {
 					if (in_array((string) $localtax_type, array('1', '3', '5'))) {
@@ -1435,7 +1435,7 @@ class pdf_crabe extends ModelePDFFactures
 				}
 
 				//Local tax 1 after VAT
-				//if (! empty($conf->global->FACTURE_LOCAL_TAX1_OPTION) && $conf->global->FACTURE_LOCAL_TAX1_OPTION=='localtax1on')
+				//if (!empty($conf->global->FACTURE_LOCAL_TAX1_OPTION) && $conf->global->FACTURE_LOCAL_TAX1_OPTION=='localtax1on')
 				//{
 				foreach ($this->localtax1 as $localtax_type => $localtax_rate) {
 					if (in_array((string) $localtax_type, array('2', '4', '6'))) {
@@ -1465,7 +1465,7 @@ class pdf_crabe extends ModelePDFFactures
 				}
 				//}
 				//Local tax 2 after VAT
-				//if (! empty($conf->global->FACTURE_LOCAL_TAX2_OPTION) && $conf->global->FACTURE_LOCAL_TAX2_OPTION=='localtax2on')
+				//if (!empty($conf->global->FACTURE_LOCAL_TAX2_OPTION) && $conf->global->FACTURE_LOCAL_TAX2_OPTION=='localtax2on')
 				//{
 				foreach ($this->localtax2 as $localtax_type => $localtax_rate) {
 					if (in_array((string) $localtax_type, array('2', '4', '6'))) {
diff --git a/htdocs/core/modules/facture/doc/pdf_sponge.modules.php b/htdocs/core/modules/facture/doc/pdf_sponge.modules.php
index 5555589b910..a537e35223f 100644
--- a/htdocs/core/modules/facture/doc/pdf_sponge.modules.php
+++ b/htdocs/core/modules/facture/doc/pdf_sponge.modules.php
@@ -462,9 +462,9 @@ class pdf_sponge extends ModelePDFFactures
 				// You can add more thing under header here, if you increase $extra_under_address_shift too.
 				$extra_under_address_shift = 0;
 				$qrcodestring = '';
-				if (! empty($conf->global->INVOICE_ADD_ZATCA_QR_CODE)) {
+				if (!empty($conf->global->INVOICE_ADD_ZATCA_QR_CODE)) {
 					$qrcodestring = $object->buildZATCAQRString();
-				} elseif (! empty($conf->global->INVOICE_ADD_SWISS_QR_CODE)) {
+				} elseif (!empty($conf->global->INVOICE_ADD_SWISS_QR_CODE)) {
 					$qrcodestring = $object->buildSwitzerlandQRString();
 				}
 				if ($qrcodestring) {
@@ -1613,7 +1613,7 @@ class pdf_sponge extends ModelePDFFactures
 				// 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')
+				//if (!empty($conf->global->FACTURE_LOCAL_TAX1_OPTION) && $conf->global->FACTURE_LOCAL_TAX1_OPTION=='localtax1on')
 				//{
 				foreach ($this->localtax1 as $localtax_type => $localtax_rate) {
 					if (in_array((string) $localtax_type, array('1', '3', '5'))) {
@@ -1645,7 +1645,7 @@ class pdf_sponge extends ModelePDFFactures
 				}
 				//}
 				//Local tax 2 before VAT
-				//if (! empty($conf->global->FACTURE_LOCAL_TAX2_OPTION) && $conf->global->FACTURE_LOCAL_TAX2_OPTION=='localtax2on')
+				//if (!empty($conf->global->FACTURE_LOCAL_TAX2_OPTION) && $conf->global->FACTURE_LOCAL_TAX2_OPTION=='localtax2on')
 				//{
 				foreach ($this->localtax2 as $localtax_type => $localtax_rate) {
 					if (in_array((string) $localtax_type, array('1', '3', '5'))) {
@@ -1730,7 +1730,7 @@ class pdf_sponge extends ModelePDFFactures
 				}
 
 				//Local tax 1 after VAT
-				//if (! empty($conf->global->FACTURE_LOCAL_TAX1_OPTION) && $conf->global->FACTURE_LOCAL_TAX1_OPTION=='localtax1on')
+				//if (!empty($conf->global->FACTURE_LOCAL_TAX1_OPTION) && $conf->global->FACTURE_LOCAL_TAX1_OPTION=='localtax1on')
 				//{
 				foreach ($this->localtax1 as $localtax_type => $localtax_rate) {
 					if (in_array((string) $localtax_type, array('2', '4', '6'))) {
@@ -1761,7 +1761,7 @@ class pdf_sponge extends ModelePDFFactures
 				}
 				//}
 				//Local tax 2 after VAT
-				//if (! empty($conf->global->FACTURE_LOCAL_TAX2_OPTION) && $conf->global->FACTURE_LOCAL_TAX2_OPTION=='localtax2on')
+				//if (!empty($conf->global->FACTURE_LOCAL_TAX2_OPTION) && $conf->global->FACTURE_LOCAL_TAX2_OPTION=='localtax2on')
 				//{
 				foreach ($this->localtax2 as $localtax_type => $localtax_rate) {
 					if (in_array((string) $localtax_type, array('2', '4', '6'))) {
diff --git a/htdocs/core/modules/modBlockedLog.class.php b/htdocs/core/modules/modBlockedLog.class.php
index 0c645099f56..0a07fff6aaf 100644
--- a/htdocs/core/modules/modBlockedLog.class.php
+++ b/htdocs/core/modules/modBlockedLog.class.php
@@ -79,7 +79,7 @@ class modBlockedLog extends DolibarrModules
 
 		// Currently, activation is not automatic because only companies (in France) making invoices to non business customers must
 		// enable this module.
-		/*if (! empty($conf->global->BLOCKEDLOG_DISABLE_NOT_ALLOWED_FOR_COUNTRY))
+		/*if (!empty($conf->global->BLOCKEDLOG_DISABLE_NOT_ALLOWED_FOR_COUNTRY))
 		{
 			$tmp=explode(',', $conf->global->BLOCKEDLOG_DISABLE_NOT_ALLOWED_FOR_COUNTRY);
 			$this->automatic_activation = array();
diff --git a/htdocs/core/modules/modECM.class.php b/htdocs/core/modules/modECM.class.php
index 8b846089a03..e90b42a40aa 100644
--- a/htdocs/core/modules/modECM.class.php
+++ b/htdocs/core/modules/modECM.class.php
@@ -182,7 +182,7 @@ class modECM extends DolibarrModules
 			'langs'=>'ecm',
 			'position'=>103,
 			'perms'=>'$user->rights->ecm->read || $user->rights->ecm->upload',
-			'enabled'=>'($user->rights->ecm->read || $user->rights->ecm->upload) && ! empty($conf->global->ECM_AUTO_TREE_ENABLED)',
+			'enabled'=>'($user->rights->ecm->read || $user->rights->ecm->upload) && !empty($conf->global->ECM_AUTO_TREE_ENABLED)',
 			'target'=>'',
 			'user'=>2, // 0=Menu for internal users, 1=external users, 2=both
 		);
diff --git a/htdocs/core/modules/modSociete.class.php b/htdocs/core/modules/modSociete.class.php
index 7e7d010ed5d..5f898584ba4 100644
--- a/htdocs/core/modules/modSociete.class.php
+++ b/htdocs/core/modules/modSociete.class.php
@@ -378,7 +378,7 @@ class modSociete extends DolibarrModules
 			't.libelle'=>"ThirdPartyType"
 		);
 		// Add multicompany field
-		if (! empty($conf->global->MULTICOMPANY_ENTITY_IN_EXPORT_IF_SHARED)) {
+		if (!empty($conf->global->MULTICOMPANY_ENTITY_IN_EXPORT_IF_SHARED)) {
 			if (isModEnabled('multicompany')) {
 				$nbofallowedentities = count(explode(',', getEntity('contact')));
 				if ($nbofallowedentities > 1) {
diff --git a/htdocs/core/modules/movement/doc/pdf_standard.modules.php b/htdocs/core/modules/movement/doc/pdf_standard.modules.php
index f83b6efa1ed..6f2a6fcf694 100644
--- a/htdocs/core/modules/movement/doc/pdf_standard.modules.php
+++ b/htdocs/core/modules/movement/doc/pdf_standard.modules.php
@@ -1119,7 +1119,7 @@ class pdf_standard extends ModelePDFMovement
 			// Show sender
 			$posy=42;
 			$posx=$this->marge_gauche;
-			if (! empty($conf->global->MAIN_INVERT_SENDER_RECIPIENT)) $posx=$this->page_largeur-$this->marge_droite-80;
+			if (!empty($conf->global->MAIN_INVERT_SENDER_RECIPIENT)) $posx=$this->page_largeur-$this->marge_droite-80;
 			$hautcadre=40;
 
 			// Show sender frame
diff --git a/htdocs/core/modules/mrp/doc/pdf_vinci.modules.php b/htdocs/core/modules/mrp/doc/pdf_vinci.modules.php
index af37f6bbfcd..ba41c94ab4f 100644
--- a/htdocs/core/modules/mrp/doc/pdf_vinci.modules.php
+++ b/htdocs/core/modules/mrp/doc/pdf_vinci.modules.php
@@ -875,7 +875,7 @@ class pdf_vinci extends ModelePDFMo
 				$pdf->MultiCell($largcol2, $tab2_hl, price($object->total_localtax2), $useborder, 'R', 1);
 			}
 		} else {
-			//if (! empty($conf->global->FACTURE_LOCAL_TAX1_OPTION) && $conf->global->FACTURE_LOCAL_TAX1_OPTION=='localtax1on')
+			//if (!empty($conf->global->FACTURE_LOCAL_TAX1_OPTION) && $conf->global->FACTURE_LOCAL_TAX1_OPTION=='localtax1on')
 			//{
 				//Local tax 1
 			foreach ($this->localtax1 as $localtax_type => $localtax_rate) {
@@ -905,7 +905,7 @@ class pdf_vinci extends ModelePDFMo
 				}
 			}
 
-			//if (! empty($conf->global->FACTURE_LOCAL_TAX2_OPTION) && $conf->global->FACTURE_LOCAL_TAX2_OPTION=='localtax2on')
+			//if (!empty($conf->global->FACTURE_LOCAL_TAX2_OPTION) && $conf->global->FACTURE_LOCAL_TAX2_OPTION=='localtax2on')
 			//{
 				//Local tax 2
 			foreach ($this->localtax2 as $localtax_type => $localtax_rate) {
@@ -1085,7 +1085,7 @@ class pdf_vinci extends ModelePDFMo
 		//pdf_pagehead($pdf,$outputlangs,$this->page_hauteur);
 
 		//Affiche le filigrane brouillon - Print Draft Watermark
-		/*if($object->statut==0 && (! empty($conf->global->COMMANDE_DRAFT_WATERMARK)) )
+		/*if($object->statut==0 && (!empty($conf->global->COMMANDE_DRAFT_WATERMARK)) )
 		{
 			pdf_watermark($pdf,$outputlangs,$this->page_hauteur,$this->page_largeur,'mm',$conf->global->COMMANDE_DRAFT_WATERMARK);
 		}*/
diff --git a/htdocs/core/modules/product/doc/pdf_standard.modules.php b/htdocs/core/modules/product/doc/pdf_standard.modules.php
index ea52b9c3c70..3f75a87fc73 100644
--- a/htdocs/core/modules/product/doc/pdf_standard.modules.php
+++ b/htdocs/core/modules/product/doc/pdf_standard.modules.php
@@ -351,7 +351,7 @@ class pdf_standard extends ModelePDFProduct
 							if ($i == ($nblines-1))	// No more lines, and no space left to show total, so we create a new page
 							{
 								$pdf->AddPage('','',true);
-								if (! empty($tplidx)) $pdf->useTemplate($tplidx);
+								if (!empty($tplidx)) $pdf->useTemplate($tplidx);
 								if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
 								$pdf->setPage($pageposafter+1);
 							}
@@ -439,7 +439,7 @@ class pdf_standard extends ModelePDFProduct
 
 					// 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
+					&& (!empty($localtax1_rate) || !empty($localtax2_rate))) // and there is local tax
 					{
 						$localtaxtmp_array=getLocalTaxesFromRate($vatrate,0,$object->thirdparty,$mysoc);
 						$localtax1_type = isset($localtaxtmp_array[0]) ? $localtaxtmp_array[0] : '';
@@ -457,7 +457,7 @@ class pdf_standard extends ModelePDFProduct
 					$this->tva[$vatrate] += $tvaligne;
 
 					// Add line
-					if (! empty($conf->global->MAIN_PDF_DASH_BETWEEN_LINES) && $i < ($nblines - 1))
+					if (!empty($conf->global->MAIN_PDF_DASH_BETWEEN_LINES) && $i < ($nblines - 1))
 					{
 						$pdf->setPage($pageposafter);
 						$pdf->SetLineStyle(array('dash'=>'1,1','color'=>array(80,80,80)));
@@ -499,7 +499,7 @@ class pdf_standard extends ModelePDFProduct
 						$this->_pagefoot($pdf,$object,$outputlangs,1);
 						// New page
 						$pdf->AddPage();
-						if (! empty($tplidx)) $pdf->useTemplate($tplidx);
+						if (!empty($tplidx)) $pdf->useTemplate($tplidx);
 						$pagenb++;
 						if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
 					}
@@ -775,7 +775,7 @@ class pdf_standard extends ModelePDFProduct
 			// Show sender
 			$posy=42;
 			$posx=$this->marge_gauche;
-			if (! empty($conf->global->MAIN_INVERT_SENDER_RECIPIENT)) $posx=$this->page_largeur-$this->marge_droite-80;
+			if (!empty($conf->global->MAIN_INVERT_SENDER_RECIPIENT)) $posx=$this->page_largeur-$this->marge_droite-80;
 			$hautcadre=40;
 
 			// Show sender frame
diff --git a/htdocs/core/modules/propale/doc/pdf_azur.modules.php b/htdocs/core/modules/propale/doc/pdf_azur.modules.php
index bb6389a2e67..3d209fce798 100644
--- a/htdocs/core/modules/propale/doc/pdf_azur.modules.php
+++ b/htdocs/core/modules/propale/doc/pdf_azur.modules.php
@@ -1129,7 +1129,7 @@ class pdf_azur extends ModelePDFPropales
 				// Nothing to do
 			} else {
 				//Local tax 1 before VAT
-				//if (! empty($conf->global->FACTURE_LOCAL_TAX1_OPTION) && $conf->global->FACTURE_LOCAL_TAX1_OPTION=='localtax1on')
+				//if (!empty($conf->global->FACTURE_LOCAL_TAX1_OPTION) && $conf->global->FACTURE_LOCAL_TAX1_OPTION=='localtax1on')
 				//{
 				foreach ($this->localtax1 as $localtax_type => $localtax_rate) {
 					if (in_array((string) $localtax_type, array('1', '3', '5'))) {
@@ -1159,7 +1159,7 @@ class pdf_azur extends ModelePDFPropales
 				}
 				//}
 				//Local tax 2 before VAT
-				//if (! empty($conf->global->FACTURE_LOCAL_TAX2_OPTION) && $conf->global->FACTURE_LOCAL_TAX2_OPTION=='localtax2on')
+				//if (!empty($conf->global->FACTURE_LOCAL_TAX2_OPTION) && $conf->global->FACTURE_LOCAL_TAX2_OPTION=='localtax2on')
 				//{
 				foreach ($this->localtax2 as $localtax_type => $localtax_rate) {
 					if (in_array((string) $localtax_type, array('1', '3', '5'))) {
@@ -1221,7 +1221,7 @@ class pdf_azur extends ModelePDFPropales
 				}
 
 				//Local tax 1 after VAT
-				//if (! empty($conf->global->FACTURE_LOCAL_TAX1_OPTION) && $conf->global->FACTURE_LOCAL_TAX1_OPTION=='localtax1on')
+				//if (!empty($conf->global->FACTURE_LOCAL_TAX1_OPTION) && $conf->global->FACTURE_LOCAL_TAX1_OPTION=='localtax1on')
 				//{
 				foreach ($this->localtax1 as $localtax_type => $localtax_rate) {
 					if (in_array((string) $localtax_type, array('2', '4', '6'))) {
@@ -1251,7 +1251,7 @@ class pdf_azur extends ModelePDFPropales
 				}
 				//}
 				//Local tax 2 after VAT
-				//if (! empty($conf->global->FACTURE_LOCAL_TAX2_OPTION) && $conf->global->FACTURE_LOCAL_TAX2_OPTION=='localtax2on')
+				//if (!empty($conf->global->FACTURE_LOCAL_TAX2_OPTION) && $conf->global->FACTURE_LOCAL_TAX2_OPTION=='localtax2on')
 				//{
 				foreach ($this->localtax2 as $localtax_type => $localtax_rate) {
 					if (in_array((string) $localtax_type, array('2', '4', '6'))) {
@@ -1299,7 +1299,7 @@ class pdf_azur extends ModelePDFPropales
 
 		/*
 		$resteapayer = $object->total_ttc - $deja_regle;
-		if (! empty($object->paye)) $resteapayer=0;
+		if (!empty($object->paye)) $resteapayer=0;
 		*/
 
 		if ($deja_regle > 0) {
diff --git a/htdocs/core/modules/propale/doc/pdf_cyan.modules.php b/htdocs/core/modules/propale/doc/pdf_cyan.modules.php
index 7be7170edb2..224e3979f38 100644
--- a/htdocs/core/modules/propale/doc/pdf_cyan.modules.php
+++ b/htdocs/core/modules/propale/doc/pdf_cyan.modules.php
@@ -1254,7 +1254,7 @@ class pdf_cyan extends ModelePDFPropales
 				// Nothing to do
 			} else {
 				//Local tax 1 before VAT
-				//if (! empty($conf->global->FACTURE_LOCAL_TAX1_OPTION) && $conf->global->FACTURE_LOCAL_TAX1_OPTION=='localtax1on')
+				//if (!empty($conf->global->FACTURE_LOCAL_TAX1_OPTION) && $conf->global->FACTURE_LOCAL_TAX1_OPTION=='localtax1on')
 				//{
 				foreach ($this->localtax1 as $localtax_type => $localtax_rate) {
 					if (in_array((string) $localtax_type, array('1', '3', '5'))) {
@@ -1285,7 +1285,7 @@ class pdf_cyan extends ModelePDFPropales
 				}
 				//}
 				//Local tax 2 before VAT
-				//if (! empty($conf->global->FACTURE_LOCAL_TAX2_OPTION) && $conf->global->FACTURE_LOCAL_TAX2_OPTION=='localtax2on')
+				//if (!empty($conf->global->FACTURE_LOCAL_TAX2_OPTION) && $conf->global->FACTURE_LOCAL_TAX2_OPTION=='localtax2on')
 				//{
 				foreach ($this->localtax2 as $localtax_type => $localtax_rate) {
 					if (in_array((string) $localtax_type, array('1', '3', '5'))) {
@@ -1342,7 +1342,7 @@ class pdf_cyan extends ModelePDFPropales
 				}
 
 				//Local tax 1 after VAT
-				//if (! empty($conf->global->FACTURE_LOCAL_TAX1_OPTION) && $conf->global->FACTURE_LOCAL_TAX1_OPTION=='localtax1on')
+				//if (!empty($conf->global->FACTURE_LOCAL_TAX1_OPTION) && $conf->global->FACTURE_LOCAL_TAX1_OPTION=='localtax1on')
 				//{
 				foreach ($this->localtax1 as $localtax_type => $localtax_rate) {
 					if (in_array((string) $localtax_type, array('2', '4', '6'))) {
@@ -1373,7 +1373,7 @@ class pdf_cyan extends ModelePDFPropales
 				}
 				//}
 				//Local tax 2 after VAT
-				//if (! empty($conf->global->FACTURE_LOCAL_TAX2_OPTION) && $conf->global->FACTURE_LOCAL_TAX2_OPTION=='localtax2on')
+				//if (!empty($conf->global->FACTURE_LOCAL_TAX2_OPTION) && $conf->global->FACTURE_LOCAL_TAX2_OPTION=='localtax2on')
 				//{
 				foreach ($this->localtax2 as $localtax_type => $localtax_rate) {
 					if (in_array((string) $localtax_type, array('2', '4', '6'))) {
@@ -1423,7 +1423,7 @@ class pdf_cyan extends ModelePDFPropales
 		$resteapayer = 0;
 		/*
 		$resteapayer = $object->total_ttc - $deja_regle;
-		if (! empty($object->paye)) $resteapayer=0;
+		if (!empty($object->paye)) $resteapayer=0;
 		*/
 
 		if ($deja_regle > 0) {
diff --git a/htdocs/core/modules/societe/mod_codecompta_aquarium.php b/htdocs/core/modules/societe/mod_codecompta_aquarium.php
index 4d1d01db682..257bdf55e52 100644
--- a/htdocs/core/modules/societe/mod_codecompta_aquarium.php
+++ b/htdocs/core/modules/societe/mod_codecompta_aquarium.php
@@ -98,7 +98,7 @@ class mod_codecompta_aquarium extends ModeleAccountancyCode
 		if (!isset($conf->global->COMPANY_AQUARIUM_REMOVE_SPECIAL) || !empty($conf->global->$conf->global->COMPANY_AQUARIUM_REMOVE_SPECIAL)) {
 			$texte .= $langs->trans('RemoveSpecialChars').' = '.yn(1)."<br>\n";
 		}
-		//if (! empty($conf->global->COMPANY_AQUARIUM_REMOVE_ALPHA)) $texte.=$langs->trans('COMPANY_AQUARIUM_REMOVE_ALPHA').' = '.yn($conf->global->COMPANY_AQUARIUM_REMOVE_ALPHA)."<br>\n";
+		//if (!empty($conf->global->COMPANY_AQUARIUM_REMOVE_ALPHA)) $texte.=$langs->trans('COMPANY_AQUARIUM_REMOVE_ALPHA').' = '.yn($conf->global->COMPANY_AQUARIUM_REMOVE_ALPHA)."<br>\n";
 		if (!empty($conf->global->COMPANY_AQUARIUM_CLEAN_REGEX)) {
 			$texte .= $langs->trans('COMPANY_AQUARIUM_CLEAN_REGEX').' = '.$conf->global->COMPANY_AQUARIUM_CLEAN_REGEX."<br>\n";
 		}
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 5bff26a9d1d..9a6ee3c5f01 100644
--- a/htdocs/core/modules/stocktransfer/doc/pdf_eagle_proforma.modules.php
+++ b/htdocs/core/modules/stocktransfer/doc/pdf_eagle_proforma.modules.php
@@ -882,7 +882,7 @@ class pdf_eagle_proforma extends ModelePDFCommandes
 		}
 		*/
 		/* TODO
-		else if (! empty($object->availability_code))
+		else if (!empty($object->availability_code))
 		{
 			$pdf->SetXY($this->marge_gauche, $posy);
 			$pdf->SetTextColor(200,0,0);
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 76c0ed56851..5cbdad90b03 100644
--- a/htdocs/core/modules/supplier_invoice/doc/pdf_canelle.modules.php
+++ b/htdocs/core/modules/supplier_invoice/doc/pdf_canelle.modules.php
@@ -167,7 +167,7 @@ class pdf_canelle extends ModelePDFSuppliersInvoices
 			$this->posxqty = 130;
 			$this->posxunit = 147;
 		}
-		//if (! empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT)) $this->posxtva=$this->posxup;
+		//if (!empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT)) $this->posxtva=$this->posxup;
 		$this->posxpicture = $this->posxtva - (empty($conf->global->MAIN_DOCUMENTS_WITH_PICTURE_WIDTH) ? 20 : $conf->global->MAIN_DOCUMENTS_WITH_PICTURE_WIDTH); // width of images
 		if ($this->page_largeur < 210) { // To work with US executive format
 			$this->posxpicture -= 20;
@@ -740,7 +740,7 @@ class pdf_canelle extends ModelePDFSuppliersInvoices
 				$pdf->MultiCell($largcol2, $tab2_hl, price($object->total_localtax2, 0, $outputlangs), 0, 'R', 1);
 			}
 		} else {
-			//if (! empty($conf->global->FACTURE_LOCAL_TAX1_OPTION) && $conf->global->FACTURE_LOCAL_TAX1_OPTION=='localtax1on')
+			//if (!empty($conf->global->FACTURE_LOCAL_TAX1_OPTION) && $conf->global->FACTURE_LOCAL_TAX1_OPTION=='localtax1on')
 			//{
 			//Local tax 1
 			foreach ($this->localtax1 as $tvakey => $tvaval) {
@@ -765,7 +765,7 @@ class pdf_canelle extends ModelePDFSuppliersInvoices
 			}
 			//}
 
-			//if (! empty($conf->global->FACTURE_LOCAL_TAX2_OPTION) && $conf->global->FACTURE_LOCAL_TAX2_OPTION=='localtax2on')
+			//if (!empty($conf->global->FACTURE_LOCAL_TAX2_OPTION) && $conf->global->FACTURE_LOCAL_TAX2_OPTION=='localtax2on')
 			//{
 			//Local tax 2
 			foreach ($this->localtax2 as $tvakey => $tvaval) {
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 233d18ce229..a8f671fb528 100644
--- a/htdocs/core/modules/supplier_order/doc/pdf_cornas.modules.php
+++ b/htdocs/core/modules/supplier_order/doc/pdf_cornas.modules.php
@@ -1031,7 +1031,7 @@ class pdf_cornas extends ModelePDFSuppliersOrders
 				$pdf->MultiCell($largcol2, $tab2_hl, price($object->total_localtax2), $useborder, 'R', 1);
 			}
 		} else {
-			//if (! empty($conf->global->FACTURE_LOCAL_TAX1_OPTION) && $conf->global->FACTURE_LOCAL_TAX1_OPTION=='localtax1on')
+			//if (!empty($conf->global->FACTURE_LOCAL_TAX1_OPTION) && $conf->global->FACTURE_LOCAL_TAX1_OPTION=='localtax1on')
 			//{
 				//Local tax 1
 			foreach ($this->localtax1 as $localtax_type => $localtax_rate) {
@@ -1061,7 +1061,7 @@ class pdf_cornas extends ModelePDFSuppliersOrders
 				}
 			}
 
-			//if (! empty($conf->global->FACTURE_LOCAL_TAX2_OPTION) && $conf->global->FACTURE_LOCAL_TAX2_OPTION=='localtax2on')
+			//if (!empty($conf->global->FACTURE_LOCAL_TAX2_OPTION) && $conf->global->FACTURE_LOCAL_TAX2_OPTION=='localtax2on')
 			//{
 				//Local tax 2
 			foreach ($this->localtax2 as $localtax_type => $localtax_rate) {
@@ -1241,7 +1241,7 @@ class pdf_cornas extends ModelePDFSuppliersOrders
 		//pdf_pagehead($pdf,$outputlangs,$this->page_hauteur);
 
 		//Affiche le filigrane brouillon - Print Draft Watermark
-		/*if($object->statut==0 && (! empty($conf->global->COMMANDE_DRAFT_WATERMARK)) )
+		/*if($object->statut==0 && (!empty($conf->global->COMMANDE_DRAFT_WATERMARK)) )
 		{
 			pdf_watermark($pdf,$outputlangs,$this->page_hauteur,$this->page_largeur,'mm',$conf->global->COMMANDE_DRAFT_WATERMARK);
 		}*/
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 5498800aefc..12b5b990648 100644
--- a/htdocs/core/modules/supplier_order/doc/pdf_muscadet.modules.php
+++ b/htdocs/core/modules/supplier_order/doc/pdf_muscadet.modules.php
@@ -912,7 +912,7 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
 				$pdf->MultiCell($largcol2, $tab2_hl, price($object->total_localtax2), $useborder, 'R', 1);
 			}
 		} else {
-			//if (! empty($conf->global->FACTURE_LOCAL_TAX1_OPTION) && $conf->global->FACTURE_LOCAL_TAX1_OPTION=='localtax1on')
+			//if (!empty($conf->global->FACTURE_LOCAL_TAX1_OPTION) && $conf->global->FACTURE_LOCAL_TAX1_OPTION=='localtax1on')
 			//{
 				//Local tax 1
 			foreach ($this->localtax1 as $localtax_type => $localtax_rate) {
@@ -942,7 +942,7 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
 				}
 			}
 
-			//if (! empty($conf->global->FACTURE_LOCAL_TAX2_OPTION) && $conf->global->FACTURE_LOCAL_TAX2_OPTION=='localtax2on')
+			//if (!empty($conf->global->FACTURE_LOCAL_TAX2_OPTION) && $conf->global->FACTURE_LOCAL_TAX2_OPTION=='localtax2on')
 			//{
 				//Local tax 2
 			foreach ($this->localtax2 as $localtax_type => $localtax_rate) {
@@ -1150,7 +1150,7 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
 		//pdf_pagehead($pdf,$outputlangs,$this->page_hauteur);
 
 		//Affiche le filigrane brouillon - Print Draft Watermark
-		/*if($object->statut==0 && (! empty($conf->global->COMMANDE_DRAFT_WATERMARK)) )
+		/*if($object->statut==0 && (!empty($conf->global->COMMANDE_DRAFT_WATERMARK)) )
 		{
 			pdf_watermark($pdf,$outputlangs,$this->page_hauteur,$this->page_largeur,'mm',$conf->global->COMMANDE_DRAFT_WATERMARK);
 		}*/
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 6919ffe69aa..676c5768ea3 100644
--- a/htdocs/core/modules/supplier_payment/doc/pdf_standard.modules.php
+++ b/htdocs/core/modules/supplier_payment/doc/pdf_standard.modules.php
@@ -131,7 +131,7 @@ class pdf_standard extends ModelePDFSuppliersPayments
 		$this->posxtva = 90;
 		$this->posxtotalttc = 180;
 
-		//if (! empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT)) $this->posxtva=$this->posxup;
+		//if (!empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT)) $this->posxtva=$this->posxup;
 		if ($this->page_largeur < 210) { // To work with US executive format
 			$this->posxreffacturefourn -= 20;
 			$this->posxreffacture -= 20;
@@ -676,10 +676,10 @@ class pdf_standard extends ModelePDFSuppliersPayments
 			}
 		}
 
-		if (! empty($conf->global->PDF_SHOW_PROJECT))
+		if (!empty($conf->global->PDF_SHOW_PROJECT))
 		{
 			$object->fetch_projet();
-			if (! empty($object->project->ref))
+			if (!empty($object->project->ref))
 			{
 				$outputlangs->load("projects");
 				$posy+=4;
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 70ee5d75710..f5825957845 100644
--- a/htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php
+++ b/htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php
@@ -964,7 +964,7 @@ class pdf_aurore extends ModelePDFSupplierProposal
 				// Nothing to do
 			} else {
 				//Local tax 1 before VAT
-				//if (! empty($conf->global->FACTURE_LOCAL_TAX1_OPTION) && $conf->global->FACTURE_LOCAL_TAX1_OPTION=='localtax1on')
+				//if (!empty($conf->global->FACTURE_LOCAL_TAX1_OPTION) && $conf->global->FACTURE_LOCAL_TAX1_OPTION=='localtax1on')
 				//{
 				foreach ($this->localtax1 as $localtax_type => $localtax_rate) {
 					if (in_array((string) $localtax_type, array('1', '3', '5'))) {
@@ -994,7 +994,7 @@ class pdf_aurore extends ModelePDFSupplierProposal
 				}
 				//}
 				//Local tax 2 before VAT
-				//if (! empty($conf->global->FACTURE_LOCAL_TAX2_OPTION) && $conf->global->FACTURE_LOCAL_TAX2_OPTION=='localtax2on')
+				//if (!empty($conf->global->FACTURE_LOCAL_TAX2_OPTION) && $conf->global->FACTURE_LOCAL_TAX2_OPTION=='localtax2on')
 				//{
 				foreach ($this->localtax2 as $localtax_type => $localtax_rate) {
 					if (in_array((string) $localtax_type, array('1', '3', '5'))) {
@@ -1048,7 +1048,7 @@ class pdf_aurore extends ModelePDFSupplierProposal
 				}
 
 				//Local tax 1 after VAT
-				//if (! empty($conf->global->FACTURE_LOCAL_TAX1_OPTION) && $conf->global->FACTURE_LOCAL_TAX1_OPTION=='localtax1on')
+				//if (!empty($conf->global->FACTURE_LOCAL_TAX1_OPTION) && $conf->global->FACTURE_LOCAL_TAX1_OPTION=='localtax1on')
 				//{
 				foreach ($this->localtax1 as $localtax_type => $localtax_rate) {
 					if (in_array((string) $localtax_type, array('2', '4', '6'))) {
@@ -1078,7 +1078,7 @@ class pdf_aurore extends ModelePDFSupplierProposal
 				}
 				//}
 				//Local tax 2 after VAT
-				//if (! empty($conf->global->FACTURE_LOCAL_TAX2_OPTION) && $conf->global->FACTURE_LOCAL_TAX2_OPTION=='localtax2on')
+				//if (!empty($conf->global->FACTURE_LOCAL_TAX2_OPTION) && $conf->global->FACTURE_LOCAL_TAX2_OPTION=='localtax2on')
 				//{
 				foreach ($this->localtax2 as $localtax_type => $localtax_rate) {
 					if (in_array((string) $localtax_type, array('2', '4', '6'))) {
diff --git a/htdocs/core/tpl/login.tpl.php b/htdocs/core/tpl/login.tpl.php
index 5965132d68c..b07bb66b46c 100644
--- a/htdocs/core/tpl/login.tpl.php
+++ b/htdocs/core/tpl/login.tpl.php
@@ -316,7 +316,7 @@ if ($forgetpasslink || $helpcenterlink) {
 if (isset($conf->file->main_authentication) && preg_match('/openid/', $conf->file->main_authentication)) {
 	$langs->load("users");
 
-	//if (! empty($conf->global->MAIN_OPENIDURL_PERUSER)) $url=
+	//if (!empty($conf->global->MAIN_OPENIDURL_PERUSER)) $url=
 	echo '<br>';
 	echo '<div class="center" style="margin-top: 4px;">';
 
diff --git a/htdocs/core/triggers/interface_80_modStripe_Stripe.class.php b/htdocs/core/triggers/interface_80_modStripe_Stripe.class.php
index 54ee9929cb2..44cd1d1f660 100644
--- a/htdocs/core/triggers/interface_80_modStripe_Stripe.class.php
+++ b/htdocs/core/triggers/interface_80_modStripe_Stripe.class.php
@@ -141,7 +141,7 @@ class InterfaceStripe extends DolibarrTriggers
 					}
 
 					if ($changerequested) {
-						/*if (! empty($object->email)) $customer->email = $object->email;
+						/*if (!empty($object->email)) $customer->email = $object->email;
 						$customer->description = $namecleaned;
 						if (empty($taxinfo)) $customer->tax_info = array('type'=>'vat', 'tax_id'=>null);
 						else $customer->tax_info = $taxinfo; */
diff --git a/htdocs/don/card.php b/htdocs/don/card.php
index bf9ba2e6388..f3bfca6ee95 100644
--- a/htdocs/don/card.php
+++ b/htdocs/don/card.php
@@ -351,9 +351,9 @@ if (empty($reshook)) {
 		// Define output language
 		$outputlangs = $langs;
 		$newlang='';
-		if (!empty($conf->global->MAIN_MULTILANGS) && empty($newlang) && ! empty($_REQUEST['lang_id'])) $newlang=$_REQUEST['lang_id'];
+		if (!empty($conf->global->MAIN_MULTILANGS) && empty($newlang) && !empty($_REQUEST['lang_id'])) $newlang=$_REQUEST['lang_id'];
 		if (!empty($conf->global->MAIN_MULTILANGS) && empty($newlang)) $newlang=$object->thirdparty->default_lang;
-		if (! empty($newlang))
+		if (!empty($newlang))
 		{
 			$outputlangs = new Translate("",$conf);
 			$outputlangs->setDefaultLang($newlang);
diff --git a/htdocs/don/class/don.class.php b/htdocs/don/class/don.class.php
index 4c0811e70c9..080ac3b9540 100644
--- a/htdocs/don/class/don.class.php
+++ b/htdocs/don/class/don.class.php
@@ -832,8 +832,8 @@ class Don extends CommonObject
 			return 0;
 		}
 
-		/*if (! ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->bom->write))
-		 || (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->bom->bom_advance->validate))))
+		/*if (! ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->bom->write))
+		 || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->bom->bom_advance->validate))))
 		 {
 		 $this->error='Permission denied';
 		 return -1;
diff --git a/htdocs/ecm/file_card.php b/htdocs/ecm/file_card.php
index 624f8d6ddf0..0a1114fb40c 100644
--- a/htdocs/ecm/file_card.php
+++ b/htdocs/ecm/file_card.php
@@ -371,8 +371,8 @@ if (!empty($object->share)) {
 		}
 
 		$fulllink = $urlwithroot.'/document.php'.($paramlink ? '?'.$paramlink : '');
-		//if (! empty($object->ref))       $fulllink.='&hashn='.$object->ref;		// Hash of file path
-		//elseif (! empty($object->label)) $fulllink.='&hashc='.$object->label;		// Hash of file content
+		//if (!empty($object->ref))       $fulllink.='&hashn='.$object->ref;		// Hash of file path
+		//elseif (!empty($object->label)) $fulllink.='&hashc='.$object->label;		// Hash of file content
 
 		print img_picto('', 'globe').' ';
 		if ($action != 'edit') {
diff --git a/htdocs/emailcollector/class/emailcollector.class.php b/htdocs/emailcollector/class/emailcollector.class.php
index 50b7047b90d..006376cfd55 100644
--- a/htdocs/emailcollector/class/emailcollector.class.php
+++ b/htdocs/emailcollector/class/emailcollector.class.php
@@ -432,7 +432,7 @@ class EmailCollector extends CommonObject
 		include_once DOL_DOCUMENT_ROOT.'/core/lib/security.lib.php';
 		$this->password = dolDecrypt($this->password);
 
-		//if ($result > 0 && ! empty($this->table_element_line)) $this->fetchLines();
+		//if ($result > 0 && !empty($this->table_element_line)) $this->fetchLines();
 		return $result;
 	}
 
diff --git a/htdocs/eventorganization/class/conferenceorbooth.class.php b/htdocs/eventorganization/class/conferenceorbooth.class.php
index 2c22bfb77ab..faddee08d29 100644
--- a/htdocs/eventorganization/class/conferenceorbooth.class.php
+++ b/htdocs/eventorganization/class/conferenceorbooth.class.php
@@ -444,8 +444,8 @@ class ConferenceOrBooth extends ActionComm
 			return 0;
 		}
 
-		/*if (! ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->eventorganization->write))
-		 || (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->eventorganization->eventorganization_advance->validate))))
+		/*if (! ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->eventorganization->write))
+		 || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->eventorganization->eventorganization_advance->validate))))
 		 {
 		 $this->error='Permission denied';
 		 return -1;
@@ -468,8 +468,8 @@ class ConferenceOrBooth extends ActionComm
 			return 0;
 		}
 
-		/*if (! ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->eventorganization->write))
-		 || (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->eventorganization->eventorganization_advance->validate))))
+		/*if (! ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->eventorganization->write))
+		 || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->eventorganization->eventorganization_advance->validate))))
 		 {
 		 $this->error='Permission denied';
 		 return -1;
@@ -492,8 +492,8 @@ class ConferenceOrBooth extends ActionComm
 			return 0;
 		}
 
-		/*if (! ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->eventorganization->write))
-		 || (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->eventorganization->eventorganization_advance->validate))))
+		/*if (! ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->eventorganization->write))
+		 || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->eventorganization->eventorganization_advance->validate))))
 		 {
 		 $this->error='Permission denied';
 		 return -1;
diff --git a/htdocs/eventorganization/class/conferenceorboothattendee.class.php b/htdocs/eventorganization/class/conferenceorboothattendee.class.php
index 158b29e4cf6..78fe18366b7 100644
--- a/htdocs/eventorganization/class/conferenceorboothattendee.class.php
+++ b/htdocs/eventorganization/class/conferenceorboothattendee.class.php
@@ -541,8 +541,8 @@ class ConferenceOrBoothAttendee extends CommonObject
 			return 0;
 		}
 
-		/*if (! ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->eventorganization->conferenceorboothattendee->write))
-		 || (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->eventorganization->conferenceorboothattendee->conferenceorboothattendee_advance->validate))))
+		/*if (! ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->eventorganization->conferenceorboothattendee->write))
+		 || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->eventorganization->conferenceorboothattendee->conferenceorboothattendee_advance->validate))))
 		 {
 		 $this->error='NotEnoughPermissions';
 		 dol_syslog(get_class($this)."::valid ".$this->error, LOG_ERR);
@@ -684,8 +684,8 @@ class ConferenceOrBoothAttendee extends CommonObject
 			return 0;
 		}
 
-		/*if (! ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->eventorganization->write))
-		 || (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->eventorganization->eventorganization_advance->validate))))
+		/*if (! ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->eventorganization->write))
+		 || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->eventorganization->eventorganization_advance->validate))))
 		 {
 		 $this->error='Permission denied';
 		 return -1;
@@ -708,8 +708,8 @@ class ConferenceOrBoothAttendee extends CommonObject
 			return 0;
 		}
 
-		/*if (! ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->eventorganization->write))
-		 || (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->eventorganization->eventorganization_advance->validate))))
+		/*if (! ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->eventorganization->write))
+		 || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->eventorganization->eventorganization_advance->validate))))
 		 {
 		 $this->error='Permission denied';
 		 return -1;
@@ -732,8 +732,8 @@ class ConferenceOrBoothAttendee extends CommonObject
 			return 0;
 		}
 
-		/*if (! ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->eventorganization->write))
-		 || (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->eventorganization->eventorganization_advance->validate))))
+		/*if (! ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->eventorganization->write))
+		 || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->eventorganization->eventorganization_advance->validate))))
 		 {
 		 $this->error='Permission denied';
 		 return -1;
diff --git a/htdocs/eventorganization/conferenceorbooth_contact.php b/htdocs/eventorganization/conferenceorbooth_contact.php
index 33b8f633b3a..499c6d7ac6d 100644
--- a/htdocs/eventorganization/conferenceorbooth_contact.php
+++ b/htdocs/eventorganization/conferenceorbooth_contact.php
@@ -396,7 +396,7 @@ if ($object->id) {
 	 // Thirdparty
 	 $morehtmlref.='<br>'.$langs->trans('ThirdParty') . ' : ' . (is_object($object->thirdparty) ? $object->thirdparty->getNomUrl(1) : '');
 	 // Project
-	 if (! empty($conf->project->enabled))
+	 if (!empty($conf->project->enabled))
 	 {
 	 $langs->load("projects");
 	 $morehtmlref.='<br>'.$langs->trans('Project') . ' ';
@@ -417,7 +417,7 @@ if ($object->id) {
 	 $morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
 	 }
 	 } else {
-	 if (! empty($object->fk_project)) {
+	 if (!empty($object->fk_project)) {
 	 $proj = new Project($db);
 	 $proj->fetch($object->fk_project);
 	 $morehtmlref .= ': '.$proj->getNomUrl();
diff --git a/htdocs/eventorganization/conferenceorboothattendee_note.php b/htdocs/eventorganization/conferenceorboothattendee_note.php
index 4c5b2f394a9..b5e25872bf5 100644
--- a/htdocs/eventorganization/conferenceorboothattendee_note.php
+++ b/htdocs/eventorganization/conferenceorboothattendee_note.php
@@ -151,7 +151,7 @@ if ($id > 0 || !empty($ref)) {
 	 // Thirdparty
 	 $morehtmlref.='<br>'.$langs->trans('ThirdParty') . ' : ' . (is_object($object->thirdparty) ? $object->thirdparty->getNomUrl(1) : '');
 	 // Project
-	 if (! empty($conf->project->enabled))
+	 if (!empty($conf->project->enabled))
 	 {
 	 $langs->load("projects");
 	 $morehtmlref.='<br>'.$langs->trans('Project') . ' ';
@@ -172,7 +172,7 @@ if ($id > 0 || !empty($ref)) {
 	 $morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
 	 }
 	 } else {
-	 if (! empty($object->fk_project)) {
+	 if (!empty($object->fk_project)) {
 	 $proj = new Project($db);
 	 $proj->fetch($object->fk_project);
 	 $morehtmlref .= ': '.$proj->getNomUrl();
diff --git a/htdocs/eventorganization/eventorganizationindex.php b/htdocs/eventorganization/eventorganizationindex.php
index 77c2ec512f4..d770d5e1900 100644
--- a/htdocs/eventorganization/eventorganizationindex.php
+++ b/htdocs/eventorganization/eventorganizationindex.php
@@ -71,7 +71,7 @@ print '<div class="fichecenter"><div class="fichethirdleft">';
 
 /* BEGIN MODULEBUILDER DRAFT MYOBJECT
 // Draft MyObject
-if (! empty($conf->eventorganization->enabled) && $user->rights->eventorganization->read)
+if (!empty($conf->eventorganization->enabled) && $user->rights->eventorganization->read)
 {
 	$langs->load("orders");
 
@@ -152,7 +152,7 @@ $max = $conf->global->MAIN_SIZE_SHORTLIST_LIMIT;
 
 /* BEGIN MODULEBUILDER LASTMODIFIED MYOBJECT
 // Last modified myobject
-if (! empty($conf->eventorganization->enabled) && $user->rights->eventorganization->read)
+if (!empty($conf->eventorganization->enabled) && $user->rights->eventorganization->read)
 {
 	$sql = "SELECT s.rowid, s.ref, s.label, s.date_creation, s.tms";
 	$sql.= " FROM ".MAIN_DB_PREFIX."eventorganization_myobject as s";
diff --git a/htdocs/expedition/card.php b/htdocs/expedition/card.php
index 333c93fdfd7..f947e86a66a 100644
--- a/htdocs/expedition/card.php
+++ b/htdocs/expedition/card.php
@@ -466,7 +466,7 @@ if (empty($reshook)) {
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
 		// TODO add alternative status
-		//} elseif ($action == 'reopen' && (! empty($user->rights->expedition->creer) || ! empty($user->rights->expedition->shipping_advance->validate)))
+		//} elseif ($action == 'reopen' && (!empty($user->rights->expedition->creer) || !empty($user->rights->expedition->shipping_advance->validate)))
 		//{
 		//	$result = $object->setStatut(0);
 		//	if ($result < 0)
@@ -1218,7 +1218,7 @@ if ($action == 'create') {
 								print '<input name="idl'.$indiceAsked.'" type="hidden" value="'.$line->id.'">';
 								print '<input name="qtyl'.$indiceAsked.'" id="qtyl'.$indiceAsked.'" class="qtyl center" type="text" size="4" value="'.$deliverableQty.'">';
 							} else {
-								if (! empty($conf->global->SHIPMENT_GETS_ALL_ORDER_PRODUCTS)) {
+								if (!empty($conf->global->SHIPMENT_GETS_ALL_ORDER_PRODUCTS)) {
 									print '<input name="idl'.$indiceAsked.'" type="hidden" value="'.$line->id.'">';
 									print '<input name="qtyl'.$indiceAsked.'" id="qtyl'.$indiceAsked.'" type="hidden" value="0">';
 								}
@@ -1402,7 +1402,7 @@ if ($action == 'create') {
 										print '<input '.$tooltip.' name="qtyl'.$indiceAsked.'_'.$subj.'" id="qtyl'.$indiceAsked.'" type="text" size="4" value="'.$deliverableQty.'">';
 										print '<input name="ent1'.$indiceAsked.'_'.$subj.'" type="hidden" value="'.$warehouse_id.'">';
 									} else {
-										if (! empty($conf->global->SHIPMENT_GETS_ALL_ORDER_PRODUCTS)) {
+										if (!empty($conf->global->SHIPMENT_GETS_ALL_ORDER_PRODUCTS)) {
 											print '<input name="qtyl'.$indiceAsked.'_'.$subj.'" id="qtyl'.$indiceAsked.'" type="hidden" value="0">';
 										}
 
@@ -2515,7 +2515,7 @@ if ($action == 'create') {
 			// Create bill
 			if (isModEnabled('facture') && ($object->statut == Expedition::STATUS_VALIDATED || $object->statut == Expedition::STATUS_CLOSED)) {
 				if ($user->rights->facture->creer) {
-					// TODO show button only   if (! empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))
+					// TODO show button only   if (!empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))
 					// If we do that, we must also make this option official.
 					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/expensereport/card.php b/htdocs/expensereport/card.php
index 9daa03a3ec8..3c1656ebf84 100644
--- a/htdocs/expensereport/card.php
+++ b/htdocs/expensereport/card.php
@@ -68,7 +68,7 @@ $socid = GETPOST('socid', 'int') ?GETPOST('socid', 'int') : GETPOST('socid_id',
 
 $childids = $user->getAllChildIds(1);
 
-if (! empty($conf->global->EXPENSEREPORT_PREFILL_DATES_WITH_CURRENT_MONTH)) {
+if (!empty($conf->global->EXPENSEREPORT_PREFILL_DATES_WITH_CURRENT_MONTH)) {
 	if (empty($date_start)) {
 		$date_start = dol_mktime(0, 0, 0, (int) dol_print_date(dol_now(), '%m'),  1, (int) dol_print_date(dol_now(), '%Y'));
 	}
@@ -117,7 +117,7 @@ $permissiontoadd = $user->rights->expensereport->creer; // Used by the include o
 
 $upload_dir = $conf->expensereport->dir_output.'/'.dol_sanitizeFileName($object->ref);
 
-$projectRequired = isModEnabled('project') && ! empty($conf->global->EXPENSEREPORT_PROJECT_IS_REQUIRED);
+$projectRequired = isModEnabled('project') && !empty($conf->global->EXPENSEREPORT_PROJECT_IS_REQUIRED);
 $fileRequired = !empty($conf->global->EXPENSEREPORT_FILE_IS_REQUIRED);
 
 if ($object->id > 0) {
@@ -1624,7 +1624,7 @@ if ($action == 'create') {
 
 			print '</form>';
 		} else {
-			$taxlessUnitPriceDisabled = ! empty($conf->global->EXPENSEREPORT_FORCE_LINE_AMOUNTS_INCLUDING_TAXES_ONLY) ? ' disabled' : '';
+			$taxlessUnitPriceDisabled = !empty($conf->global->EXPENSEREPORT_FORCE_LINE_AMOUNTS_INCLUDING_TAXES_ONLY) ? ' disabled' : '';
 
 			print dol_get_fiche_head($head, 'card', $langs->trans("ExpenseReport"), -1, 'trip');
 
@@ -1697,7 +1697,7 @@ if ($action == 'create') {
 			 // Thirdparty
 			 $morehtmlref.='<br>'.$langs->trans('ThirdParty') . ' : ' . $soc->getNomUrl(1);
 			 // Project
-			 if (! empty($conf->project->enabled))
+			 if (!empty($conf->project->enabled))
 			 {
 			 $langs->load("projects");
 			 $morehtmlref.='<br>'.$langs->trans('Project') . ' ';
@@ -1717,7 +1717,7 @@ if ($action == 'create') {
 			 $morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
 			 }
 			 } else {
-			 if (! empty($object->fk_project)) {
+			 if (!empty($object->fk_project)) {
 			 $proj = new Project($db);
 			 $proj->fetch($object->fk_project);
 			 $morehtmlref.='<a href="'.DOL_URL_ROOT.'/projet/card.php?id=' . $object->fk_project . '" title="' . $langs->trans('ShowProject') . '">';
diff --git a/htdocs/fichinter/class/fichinter.class.php b/htdocs/fichinter/class/fichinter.class.php
index 61c127cab9b..18d051a0fa3 100644
--- a/htdocs/fichinter/class/fichinter.class.php
+++ b/htdocs/fichinter/class/fichinter.class.php
@@ -1187,8 +1187,8 @@ class Fichinter extends CommonObject
 
 			if ($objsoc->fetch($socid) > 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->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->fk_delivery_address = '';
 			}
diff --git a/htdocs/fourn/ajax/getSupplierPrices.php b/htdocs/fourn/ajax/getSupplierPrices.php
index 6cfc4fbe7b9..6ebac09d8fb 100644
--- a/htdocs/fourn/ajax/getSupplierPrices.php
+++ b/htdocs/fourn/ajax/getSupplierPrices.php
@@ -114,7 +114,7 @@ if ($idprod > 0) {
 
 	// Add price for costprice (at end)
 	$price = $producttmp->cost_price;
-	if (empty($price) && ! empty($conf->global->PRODUCT_USE_SUB_COST_PRICES_IF_COST_PRICE_EMPTY)) {
+	if (empty($price) && !empty($conf->global->PRODUCT_USE_SUB_COST_PRICES_IF_COST_PRICE_EMPTY)) {
 		// get costprice for subproducts if any
 		$producttmp->get_sousproduits_arbo();
 		$prods_arbo=$producttmp->get_arbo_each_prod();
diff --git a/htdocs/fourn/class/fournisseur.commande.class.php b/htdocs/fourn/class/fournisseur.commande.class.php
index b90b03a06cb..8a1dcf682b2 100644
--- a/htdocs/fourn/class/fournisseur.commande.class.php
+++ b/htdocs/fourn/class/fournisseur.commande.class.php
@@ -2831,7 +2831,7 @@ class CommandeFournisseur extends CommonOrder
 				if ($qty < $this->line->packaging) {
 					$qty = $this->line->packaging;
 				} else {
-					if (! empty($this->line->packaging) && ($qty % $this->line->packaging) > 0) {
+					if (!empty($this->line->packaging) && ($qty % $this->line->packaging) > 0) {
 						$coeff = intval($qty / $this->line->packaging) + 1;
 						$qty = $this->line->packaging * $coeff;
 						setEventMessage($langs->trans('QtyRecalculatedWithPackaging'), 'mesgs');
diff --git a/htdocs/fourn/class/fournisseur.facture-rec.class.php b/htdocs/fourn/class/fournisseur.facture-rec.class.php
index 31bc37b6e1a..915ce532412 100644
--- a/htdocs/fourn/class/fournisseur.facture-rec.class.php
+++ b/htdocs/fourn/class/fournisseur.facture-rec.class.php
@@ -982,9 +982,9 @@ class FactureFournisseurRec extends CommonInvoice
 			$sql .= ', fk_multicurrency, multicurrency_code, multicurrency_subprice, multicurrency_total_ht, multicurrency_total_tva, multicurrency_total_ttc';
 			$sql .= ') VALUES (';
 			$sql .= ' ' . (int) $facid;   // source supplier invoie id
-			$sql .= ', ' . (! empty($fk_product) ? "'" . $this->db->escape($fk_product) . "'" : 'null');
-			$sql .= ', ' . (! empty($ref) ? "'" . $this->db->escape($ref) . "'" : 'null');
-			$sql .= ', ' . (! empty($label) ? "'" . $this->db->escape($label) . "'" : 'null');
+			$sql .= ', ' . (!empty($fk_product) ? "'" . $this->db->escape($fk_product) . "'" : 'null');
+			$sql .= ', ' . (!empty($ref) ? "'" . $this->db->escape($ref) . "'" : 'null');
+			$sql .= ', ' . (!empty($label) ? "'" . $this->db->escape($label) . "'" : 'null');
 			$sql .= ", '" . $this->db->escape($desc) . "'";
 			$sql .= ', ' . price2num($pu_ht);
 			$sql .= ', ' . price2num($pu_ttc);
@@ -2154,8 +2154,8 @@ class FactureFournisseurLigneRec extends CommonObjectLine
 		$sql .= ' fk_facture_fourn = ' . (int) $this->fk_facture_fourn;
 		$sql .= ', fk_parent_line = ' . (int) $this->fk_parent;
 		$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 .= ', 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 .= ', pu_ht = ' . price2num($this->pu_ht);
 		$sql .= ', pu_ttc = ' . price2num($this->pu_ttc);
diff --git a/htdocs/fourn/class/fournisseur.facture.class.php b/htdocs/fourn/class/fournisseur.facture.class.php
index 830430f3730..2103b97d2e1 100644
--- a/htdocs/fourn/class/fournisseur.facture.class.php
+++ b/htdocs/fourn/class/fournisseur.facture.class.php
@@ -433,7 +433,7 @@ class FactureFournisseur extends CommonInvoice
 			$result = $_facrec->fetchObjectLinked(null, '', null, '', 'OR', 1, 'sourcetype', 0); // This load $_facrec->linkedObjectsIds
 
 			// Define some dates
-			if (! empty($_facrec->frequency)) {
+			if (!empty($_facrec->frequency)) {
 				$originaldatewhen = $_facrec->date_when;
 				$nextdatewhen = dol_time_plus_duree($originaldatewhen, $_facrec->frequency, $_facrec->unit_frequency);
 				$previousdaynextdatewhen = dol_time_plus_duree($nextdatewhen, -1, 'd');
@@ -464,7 +464,7 @@ class FactureFournisseur extends CommonInvoice
 			if (! $this->type) {
 				$this->type = self::TYPE_STANDARD;
 			}
-			if (! empty(GETPOST('ref_supplier'))) {
+			if (!empty(GETPOST('ref_supplier'))) {
 				$this->ref_supplier = trim($this->ref_supplier);
 			} else {
 				$this->ref_supplier = trim($this->ref_supplier . '_' . ($_facrec->nb_gen_done + 1));
@@ -510,7 +510,7 @@ class FactureFournisseur extends CommonInvoice
 			if (!empty($conf->global->MAIN_MULTILANGS) && empty($newlang) && isset($this->default_lang)) {
 				$newlang = $this->default_lang; // for thirdparty
 			}
-			if (! empty($newlang)) {
+			if (!empty($newlang)) {
 				$outputlangs = new Translate("", $conf);
 				$outputlangs->setDefaultLang($newlang);
 			}
@@ -540,7 +540,7 @@ class FactureFournisseur extends CommonInvoice
 		}
 
 		// Define due date if not already defined
-		if (! empty($forceduedate)) {
+		if (!empty($forceduedate)) {
 			$this->date_echeance = $forceduedate;
 		}
 
@@ -760,9 +760,9 @@ class FactureFournisseur extends CommonInvoice
 						// If margin module defined on costprice, we try the costprice
 						// If not defined or if module margin defined and pmp and stock module enabled, we try pmp price
 						// else we get the best supplier price
-						if ($conf->global->MARGIN_TYPE == 'costprice' && ! empty($producttmp->cost_price)) {
+						if ($conf->global->MARGIN_TYPE == 'costprice' && !empty($producttmp->cost_price)) {
 							$buyprice = $producttmp->cost_price;
-						} elseif (! empty($conf->stock->enabled) && ($conf->global->MARGIN_TYPE == 'costprice' || $conf->global->MARGIN_TYPE == 'pmp') && ! empty($producttmp->pmp)) {
+						} elseif (!empty($conf->stock->enabled) && ($conf->global->MARGIN_TYPE == 'costprice' || $conf->global->MARGIN_TYPE == 'pmp') && !empty($producttmp->pmp)) {
 							$buyprice = $producttmp->pmp;
 						} else {
 							if ($producttmp->find_min_price_product_fournisseur($_facrec->lines[$i]->fk_product) > 0) {
@@ -3861,7 +3861,7 @@ class SupplierInvoiceLine extends CommonObjectLine
 		$sql .= ' '.((!empty($this->fk_product) && $this->fk_product > 0) ? $this->fk_product : "null").',';
 		$sql .= " ".((int) $this->product_type).",";
 		$sql .= " ".price2num($this->remise_percent).",";
-		$sql .= ' '.(! empty($this->fk_remise_except) ? ((int) $this->fk_remise_except) : "null").',';
+		$sql .= ' '.(!empty($this->fk_remise_except) ? ((int) $this->fk_remise_except) : "null").',';
 		$sql .= " ".price2num($this->subprice).",";
 		$sql .= " ".(!empty($this->qty) ?price2num($this->total_ttc / $this->qty) : price2num($this->total_ttc)).",";
 		$sql .= " ".(!empty($this->date_start) ? "'".$this->db->idate($this->date_start)."'" : "null").",";
diff --git a/htdocs/fourn/commande/card.php b/htdocs/fourn/commande/card.php
index 769d8c451da..660d555676f 100644
--- a/htdocs/fourn/commande/card.php
+++ b/htdocs/fourn/commande/card.php
@@ -2357,7 +2357,7 @@ if ($action == 'create') {
 	print '</table>';
 
 	// Margin Infos
-	/*if (! empty($conf->margin->enabled)) {
+	/*if (!empty($conf->margin->enabled)) {
 		$formmargin->displayMarginInfos($object);
 	}*/
 
@@ -2462,7 +2462,7 @@ if ($action == 'create') {
 					}
 				}
 				// Create event
-				/*if ($conf->agenda->enabled && ! empty($conf->global->MAIN_ADD_EVENT_ON_ELEMENT_CARD)) 	// Add hidden condition because this is not a "workflow" action so should appears somewhere else on page.
+				/*if ($conf->agenda->enabled && !empty($conf->global->MAIN_ADD_EVENT_ON_ELEMENT_CARD)) 	// Add hidden condition because this is not a "workflow" action so should appears somewhere else on page.
 				{
 					print '<div class="inline-block divButAction"><a class="butAction" href="' . DOL_URL_ROOT . '/comm/action/card.php?action=create&amp;origin=' . $object->element . '&amp;originid=' . $object->id . '&amp;socid=' . $object->socid . '">' . $langs->trans("AddAction") . '</a></div>';
 				}*/
diff --git a/htdocs/fourn/facture/card-rec.php b/htdocs/fourn/facture/card-rec.php
index e996f29b3c8..8f8d9ec9e47 100644
--- a/htdocs/fourn/facture/card-rec.php
+++ b/htdocs/fourn/facture/card-rec.php
@@ -35,7 +35,7 @@ require_once DOL_DOCUMENT_ROOT . '/fourn/class/fournisseur.facture-rec.class.php
 require_once DOL_DOCUMENT_ROOT . '/fourn/class/fournisseur.product.class.php';
 require_once DOL_DOCUMENT_ROOT . '/product/class/product.class.php';
 require_once DOL_DOCUMENT_ROOT . '/core/class/html.formother.class.php';
-if (! empty($conf->project->enabled)) {
+if (!empty($conf->project->enabled)) {
 	include_once DOL_DOCUMENT_ROOT . '/projet/class/project.class.php';
 }
 require_once DOL_DOCUMENT_ROOT . '/core/class/html.formprojet.class.php';
@@ -112,10 +112,10 @@ $permissiontoedit = $user->rights->fournisseur->facture->creer || $user->rights-
 $usercanread = $user->rights->fournisseur->facture->lire || $user->rights->supplier_invoice->lire;
 $usercancreate = $user->rights->fournisseur->facture->creer || $user->rights->supplier_invoice->creer;
 $usercandelete = $user->rights->fournisseur->facture->supprimer || $user->rights->supplier_invoice->supprimer;
-$usercanvalidate = ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($usercancreate)) || (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->fournisseur->supplier_invoice_advance->validate)));
+$usercanvalidate = ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($usercancreate)) || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->fournisseur->supplier_invoice_advance->validate)));
 $usercansend = (empty($conf->global->MAIN_USE_ADVANCED_PERMS) || $user->rights->fournisseur->supplier_invoice_advance->send);
 
-$usercanproductignorepricemin = ((! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && empty($user->rights->produit->ignore_price_min_advance)) || empty($conf->global->MAIN_USE_ADVANCED_PERMS));
+$usercanproductignorepricemin = ((!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && empty($user->rights->produit->ignore_price_min_advance)) || empty($conf->global->MAIN_USE_ADVANCED_PERMS));
 $usercancreatemargin = $user->rights->margins->creer;
 $usercanreadallmargin = $user->rights->margins->liretous;
 $usercancreatewithdrarequest = $user->rights->prelevement->bons->creer;
@@ -301,7 +301,7 @@ if (empty($reshook)) {
 	} 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'));
-		if (! empty($date)) {
+		if (!empty($date)) {
 			$object->setNextDate($date);
 		}
 	} elseif ($action == 'setnb_gen_max' && $usercancreate) {
@@ -484,7 +484,7 @@ if (empty($reshook)) {
 				$res = $productsupplier->fetch($idprod); // Load product from its id
 				// Call to init some price properties of $productsupplier
 				// So if a supplier price already exists for another thirdparty (first one found), we use it as reference price
-				if (! empty($conf->global->SUPPLIER_TAKE_FIRST_PRICE_IF_NO_PRICE_FOR_CURRENT_SUPPLIER)) {
+				if (!empty($conf->global->SUPPLIER_TAKE_FIRST_PRICE_IF_NO_PRICE_FOR_CURRENT_SUPPLIER)) {
 					$fksoctosearch = 0;
 					$productsupplier->get_buyprice(0, -1, $idprod, 'none', $fksoctosearch); // We force qty to -1 to be sure to find if a supplier price exist
 					if ($productsupplier->fourn_socid != $socid) {    // The price we found is for another supplier, so we clear supplier price
@@ -502,7 +502,7 @@ if (empty($reshook)) {
 			}
 		}
 
-		if (! $error && ($qty >= 0) && (! empty($product_desc) || (! empty($idprod) && $idprod > 0))) {
+		if (! $error && ($qty >= 0) && (!empty($product_desc) || (!empty($idprod) && $idprod > 0))) {
 			$ret = $object->fetch($id);
 			if ($ret < 0) {
 				dol_print_error($db, $object->error);
@@ -524,7 +524,7 @@ if (empty($reshook)) {
 			// Ecrase $tva_tx par celui du produit
 			// Ecrase $base_price_type par celui du produit
 			// Replaces $fk_unit with the product's
-			if (! empty($idprod) && $idprod > 0) {
+			if (!empty($idprod) && $idprod > 0) {
 				$prod = new Product($db);
 				$prod->fetch($idprod);
 
@@ -553,7 +553,7 @@ if (empty($reshook)) {
 				$tmpprodvat = price2num(preg_replace('/\s*\(.*\)/', '', $prod->tva_tx));
 
 				// if price ht was forced (ie: from gui when calculated by margin rate and cost price). TODO Why this ?
-				if (! empty($price_ht)) {
+				if (!empty($price_ht)) {
 					$pu_ht = price2num($price_ht, 'MU');
 					$pu_ttc = price2num($pu_ht * (1 + ($tmpvat / 100)), 'MU');
 				} elseif ($tmpvat != $tmpprodvat) {
@@ -569,7 +569,7 @@ if (empty($reshook)) {
 				$desc = '';
 
 				// Define output language
-				if (! empty($conf->global->MAIN_MULTILANGS) && ! empty($conf->global->PRODUIT_TEXTS_IN_THIRDPARTY_LANGUAGE)) {
+				if (!empty($conf->global->MAIN_MULTILANGS) && !empty($conf->global->PRODUIT_TEXTS_IN_THIRDPARTY_LANGUAGE)) {
 					$outputlangs = $langs;
 					$newlang = '';
 					if (empty($newlang) && GETPOST('lang_id', 'aZ09')) {
@@ -578,12 +578,12 @@ if (empty($reshook)) {
 					if (empty($newlang)) {
 						$newlang = $object->thirdparty->default_lang;
 					}
-					if (! empty($newlang)) {
+					if (!empty($newlang)) {
 						$outputlangs = new Translate("", $conf);
 						$outputlangs->setDefaultLang($newlang);
 					}
 
-					$desc = (! empty($prod->multilangs [$outputlangs->defaultlang] ["description"])) ? $prod->multilangs [$outputlangs->defaultlang] ["description"] : $prod->description;
+					$desc = (!empty($prod->multilangs [$outputlangs->defaultlang] ["description"])) ? $prod->multilangs [$outputlangs->defaultlang] ["description"] : $prod->description;
 				} else {
 					$desc = $prod->description;
 				}
@@ -591,10 +591,10 @@ if (empty($reshook)) {
 				$desc = dol_concatdesc($desc, $product_desc);
 
 				// Add custom code and origin country into description
-				if (empty($conf->global->MAIN_PRODUCT_DISABLE_CUSTOMCOUNTRYCODE) && (! empty($prod->customcode) || ! empty($prod->country_code))) {
+				if (empty($conf->global->MAIN_PRODUCT_DISABLE_CUSTOMCOUNTRYCODE) && (!empty($prod->customcode) || !empty($prod->country_code))) {
 					$tmptxt = '(';
 					// Define output language
-					if (! empty($conf->global->MAIN_MULTILANGS) && ! empty($conf->global->PRODUIT_TEXTS_IN_THIRDPARTY_LANGUAGE)) {
+					if (!empty($conf->global->MAIN_MULTILANGS) && !empty($conf->global->PRODUIT_TEXTS_IN_THIRDPARTY_LANGUAGE)) {
 						$outputlangs = $langs;
 						$newlang = '';
 						if (empty($newlang) && GETPOST('lang_id', 'alpha')) {
@@ -603,28 +603,28 @@ if (empty($reshook)) {
 						if (empty($newlang)) {
 							$newlang = $object->thirdparty->default_lang;
 						}
-						if (! empty($newlang)) {
+						if (!empty($newlang)) {
 							$outputlangs = new Translate("", $conf);
 							$outputlangs->setDefaultLang($newlang);
 							$outputlangs->load('products');
 						}
-						if (! empty($prod->customcode)) {
+						if (!empty($prod->customcode)) {
 							$tmptxt .= $outputlangs->transnoentitiesnoconv("CustomCode") . ': ' . $prod->customcode;
 						}
-						if (! empty($prod->customcode) && ! empty($prod->country_code)) {
+						if (!empty($prod->customcode) && !empty($prod->country_code)) {
 							$tmptxt .= ' - ';
 						}
-						if (! empty($prod->country_code)) {
+						if (!empty($prod->country_code)) {
 							$tmptxt .= $outputlangs->transnoentitiesnoconv("CountryOrigin") . ': ' . getCountry($prod->country_code, 0, $db, $outputlangs, 0);
 						}
 					} else {
-						if (! empty($prod->customcode)) {
+						if (!empty($prod->customcode)) {
 							$tmptxt .= $langs->transnoentitiesnoconv("CustomCode") . ': ' . $prod->customcode;
 						}
-						if (! empty($prod->customcode) && ! empty($prod->country_code)) {
+						if (!empty($prod->customcode) && !empty($prod->country_code)) {
 							$tmptxt .= ' - ';
 						}
-						if (! empty($prod->country_code)) {
+						if (!empty($prod->country_code)) {
 							$tmptxt .= $langs->transnoentitiesnoconv("CountryOrigin") . ': ' . getCountry($prod->country_code, 0, $db, $langs, 0);
 						}
 					}
@@ -647,8 +647,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(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;
 
 			// Margin
 			$fournprice = price2num(GETPOST('fournprice' . $predef) ? GETPOST('fournprice' . $predef) : '');
@@ -667,7 +667,7 @@ if (empty($reshook)) {
 			$remise_percent = (float) price2num($remise_percent);
 
 			$price_min = (float) price2num($price_min);
-			if ($usercanproductignorepricemin && (! empty($price_min) && ($pu_ht * (1 - $remise_percent / 100) < $price_min))) {
+			if ($usercanproductignorepricemin && (!empty($price_min) && ($pu_ht * (1 - $remise_percent / 100) < $price_min))) {
 				$mesg = $langs->trans("CantBeLessThanMinPrice", price(price2num($price_min, 'MU'), 0, $langs, 0, 0, -1, $conf->currency));
 				setEventMessages($mesg, null, 'errors');
 			} else {
@@ -778,21 +778,21 @@ if (empty($reshook)) {
 
 		// Check minimum price
 		$productid = GETPOST('productid', 'int');
-		if (! empty($productid)) {
+		if (!empty($productid)) {
 			$product = new Product($db);
 			$product->fetch($productid);
 
 			$type = $product->type;
 
 			$price_min = $product->price_min;
-			if (! empty($conf->global->PRODUIT_MULTIPRICES) && ! empty($object->thirdparty->price_level)) {
+			if (!empty($conf->global->PRODUIT_MULTIPRICES) && !empty($object->thirdparty->price_level)) {
 				$price_min = $product->multiprices_min[$object->thirdparty->price_level];
 			}
 
 			$label = $product->label;
 
 			// Check price is not lower than minimum (check is done only for standard or replacement invoices)
-			if (((! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && empty($user->rights->produit->ignore_price_min_advance)) || empty($conf->global->MAIN_USE_ADVANCED_PERMS)) && $price_min && (price2num($pu_ht) * (1 - $remise_percent / 100) < price2num($price_min))) {
+			if (((!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && empty($user->rights->produit->ignore_price_min_advance)) || empty($conf->global->MAIN_USE_ADVANCED_PERMS)) && $price_min && (price2num($pu_ht) * (1 - $remise_percent / 100) < price2num($price_min))) {
 				setEventMessages($langs->trans("CantBeLessThanMinPrice", price(price2num($price_min, 'MU'), 0, $langs, 0, 0, -1, $conf->currency)), null, 'errors');
 				$error++;
 			}
@@ -812,8 +812,8 @@ 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(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';
 
 		// Update line
 		if (! $error) {
@@ -869,7 +869,7 @@ llxHeader('', $langs->trans("RepeatableSupplierInvoice"), $help_url);
 
 $form = new Form($db);
 $formother = new FormOther($db);
-if (! empty($conf->project->enabled)) {
+if (!empty($conf->project->enabled)) {
 	$formproject = new FormProjets($db);
 }
 $companystatic = new Societe($db);
@@ -898,7 +898,7 @@ if ($action == 'create') {
 		print dol_get_fiche_head(null, '', '', 0);
 
 		$rowspan = 4;
-		if (! empty($conf->project->enabled)) $rowspan++;
+		if (!empty($conf->project->enabled)) $rowspan++;
 		if ($object->fk_account > 0) $rowspan++;
 
 		print '<table class="border centpercent">';
@@ -986,12 +986,12 @@ if ($action == 'create') {
 		print "</td></tr>";
 
 		// Project
-		if (! empty($conf->project->enabled) && is_object($object->thirdparty) && $object->thirdparty->id > 0) {
+		if (!empty($conf->project->enabled) && is_object($object->thirdparty) && $object->thirdparty->id > 0) {
 			$projectid = GETPOST('projectid') ? GETPOST('projectid') : $object->fk_project;
 			$langs->load('projects');
 			print '<tr><td>' . $langs->trans('Project') . '</td><td>';
 			$numprojet = $formproject->select_projects($object->thirdparty->id, $projectid, 'projectid', 0, 0, 1, 0, 0, 0, 0, '', 0, 0, '');
-			print ' &nbsp; <a href="' . DOL_URL_ROOT . '/projet/card.php?socid=' . $object->thirdparty->id . '&action=create&status=1&backtopage=' . urlencode($_SERVER["PHP_SELF"] . '?action=create&socid=' . $object->thirdparty->id . (! empty($id) ? '&id=' . $id : '')) . '">' . $langs->trans("AddProject") . '</a>';
+			print ' &nbsp; <a href="' . DOL_URL_ROOT . '/projet/card.php?socid=' . $object->thirdparty->id . '&action=create&status=1&backtopage=' . urlencode($_SERVER["PHP_SELF"] . '?action=create&socid=' . $object->thirdparty->id . (!empty($id) ? '&id=' . $id : '')) . '">' . $langs->trans("AddProject") . '</a>';
 			print '</td></tr>';
 		}
 
@@ -1044,7 +1044,7 @@ if ($action == 'create') {
 		print "</td></tr>";
 
 		// Auto generate document
-		if (! empty($conf->global->INVOICE_REC_CAN_DISABLE_DOCUMENT_FILE_GENERATION)) {
+		if (!empty($conf->global->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'));
 			print $form->selectarray('generate_pdf', $select, GETPOST('generate_pdf'));
@@ -1072,7 +1072,7 @@ if ($action == 'create') {
 		print '<div class="div-table-responsive-no-min">';
 		print '<table id="tablelines" class="noborder noshadow" width="100%">';
 		// Show object lines
-		if (! empty($object->lines)) {
+		if (!empty($object->lines)) {
 			$disableedit = 1;
 			$disablemove = 1;
 			$disableremove = 1;
@@ -1119,7 +1119,7 @@ if ($action == 'create') {
 
 		// Recurring invoice content
 
-		$linkback = '<a href="' . DOL_URL_ROOT . '/fourn/facture/list-rec.php?restore_lastsearch_values=1' . (! empty($socid) ? '&socid=' . $socid : '') . '">' . $langs->trans('BackToList') . '</a>';
+		$linkback = '<a href="' . DOL_URL_ROOT . '/fourn/facture/list-rec.php?restore_lastsearch_values=1' . (!empty($socid) ? '&socid=' . $socid : '') . '">' . $langs->trans('BackToList') . '</a>';
 
 		$morehtmlref = '';
 		if ($action != 'edittitle') {
@@ -1135,7 +1135,7 @@ if ($action == 'create') {
 		$morehtmlref .= '<br>' . $langs->trans('ThirdParty') . ' : ' . $object->thirdparty->getNomUrl(1);
 
 		// Project
-		if (! empty($conf->project->enabled)) {
+		if (!empty($conf->project->enabled)) {
 			$langs->load('projects');
 			$morehtmlref .= '<br>' . $langs->trans('Project') . ' ';
 			if ($usercancreate) {
@@ -1153,7 +1153,7 @@ if ($action == 'create') {
 					$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
 				}
 			} else {
-				if (! empty($object->fk_project)) {
+				if (!empty($object->fk_project)) {
 					$project = new Project($db);
 					$project->fetch($object->fk_project);
 					$morehtmlref .= ' : ' . $project->getNomUrl(1);
@@ -1243,14 +1243,14 @@ if ($action == 'create') {
 		print '</td></tr>';
 
 		// Multicurrency
-		if (! empty($conf->multicurrency->enabled)) {
+		if (!empty($conf->multicurrency->enabled)) {
 			// Multicurrency code
 			print '<tr>';
 			print '<td>';
 			print '<table class="nobordernopadding" width="100%"><tr><td>';
 			print $form->editfieldkey('Currency', 'multicurrency_code', '', $object, 0);
 			print '</td>';
-			if ($usercancreate && $action != 'editmulticurrencycode' && ! empty($object->brouillon)) {
+			if ($usercancreate && $action != 'editmulticurrencycode' && !empty($object->brouillon)) {
 				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>';
@@ -1266,7 +1266,7 @@ if ($action == 'create') {
 				print '<table class="nobordernopadding" width="100%"><tr><td>';
 				print $form->editfieldkey('CurrencyRate', 'multicurrency_tx', '', $object, 0);
 				print '</td>';
-				if ($usercancreate && $action != 'editmulticurrencyrate' && ! empty($object->brouillon) && $object->multicurrency_code && $object->multicurrency_code != $conf->currency) {
+				if ($usercancreate && $action != 'editmulticurrencyrate' && !empty($object->brouillon) && $object->multicurrency_code && $object->multicurrency_code != $conf->currency) {
 					print '<td class="right"><a class="editfielda" href="' . $_SERVER["PHP_SELF"] . '?action=editmulticurrencyrate&token=' . newToken() . '&id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetMultiCurrencyCode'), 1) . '</a></td>';
 				}
 				print '</tr></table>';
@@ -1290,7 +1290,7 @@ if ($action == 'create') {
 
 		// Help of substitution key
 		$dateexample = dol_now();
-		if (! empty($object->frequency) && ! empty($object->date_when)) {
+		if (!empty($object->frequency) && !empty($object->date_when)) {
 			$dateexample = $object->date_when;
 		}
 
@@ -1478,7 +1478,7 @@ if ($action == 'create') {
 		}
 		print '</td>';
 		// Auto generate documents
-		if (! empty($conf->global->INVOICE_REC_CAN_DISABLE_DOCUMENT_FILE_GENERATION)) {
+		if (!empty($conf->global->INVOICE_REC_CAN_DISABLE_DOCUMENT_FILE_GENERATION)) {
 			print '<tr>';
 			print '<td>';
 			if ($action == 'generate_pdf' || $object->frequency > 0) {
@@ -1544,7 +1544,7 @@ if ($action == 'create') {
         	<input type="hidden" name="id" value="' . $object->id . '">
         	';
 
-		if (! empty($conf->use_javascript_ajax) && $object->statut == 0) {
+		if (!empty($conf->use_javascript_ajax) && $object->statut == 0) {
 			include DOL_DOCUMENT_ROOT . '/core/tpl/ajaxrow.tpl.php';
 		}
 
@@ -1552,7 +1552,7 @@ if ($action == 'create') {
 		print '<table id="tablelines" class="noborder noshadow" width="100%">';
 		$object->fetch_lines();
 		// Show object lines
-		if (! empty($object->lines)) {
+		if (!empty($object->lines)) {
 			$canchangeproduct = 1;
 			// To set ref for getNomURL function
 			foreach ($object->lines as $line) {
@@ -1598,7 +1598,7 @@ if ($action == 'create') {
 
 		if (empty($object->suspended)) {
 			if ($usercancreate) {
-				if (! empty($object->frequency) && $object->nb_gen_max > 0 && ($object->nb_gen_done >= $object->nb_gen_max)) {
+				if (!empty($object->frequency) && $object->nb_gen_max > 0 && ($object->nb_gen_done >= $object->nb_gen_max)) {
 					print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#" title="' . dol_escape_htmltag($langs->trans("MaxGenerationReached")) . '">' . $langs->trans("CreateBill") . '</a></div>';
 				} else {
 					if (empty($object->frequency) || $object->date_when <= $nowlasthour) {
diff --git a/htdocs/fourn/facture/card.php b/htdocs/fourn/facture/card.php
index f5ed12fd984..f0640681e7f 100644
--- a/htdocs/fourn/facture/card.php
+++ b/htdocs/fourn/facture/card.php
@@ -277,7 +277,7 @@ if (empty($reshook)) {
 				$newlang = GETPOST('lang_id','aZ09');
 			if (!empty($conf->global->MAIN_MULTILANGS) && empty($newlang))
 				$newlang = $object->thirdparty->default_lang;
-			if (! empty($newlang)) {
+			if (!empty($newlang)) {
 				$outputlangs = new Translate("", $conf);
 				$outputlangs->setDefaultLang($newlang);
 			}
@@ -2692,7 +2692,7 @@ if ($action == 'create') {
 				$action = '';
 			} else {
 				$text = $langs->trans('ConfirmValidateBill', $numref);
-				/*if (! empty($conf->notification->enabled))
+				/*if (!empty($conf->notification->enabled))
 				 {
 				 require_once DOL_DOCUMENT_ROOT .'/core/class/notify.class.php';
 				 $notify=new Notify($db);
@@ -3588,7 +3588,7 @@ if ($action == 'create') {
 		global $forceall, $senderissupplier, $dateSelector, $inputalsopricewithtax;
 		$forceall = 1; $dateSelector = 0; $inputalsopricewithtax = 1;
 		$senderissupplier = 2; // $senderissupplier=2 is same than 1 but disable test on minimum qty and disable autofill qty with minimum.
-		//if (! empty($conf->global->SUPPLIER_INVOICE_WITH_NOPRICEDEFINED)) $senderissupplier=2;
+		//if (!empty($conf->global->SUPPLIER_INVOICE_WITH_NOPRICEDEFINED)) $senderissupplier=2;
 		if (!empty($conf->global->SUPPLIER_INVOICE_WITH_PREDEFINED_PRICES_ONLY)) {
 			$senderissupplier = 1;
 		}
@@ -3741,7 +3741,7 @@ if ($action == 'create') {
 				}
 
 				// Create event
-				/*if ($conf->agenda->enabled && ! empty($conf->global->MAIN_ADD_EVENT_ON_ELEMENT_CARD)) 	// Add hidden condition because this is not a "workflow" action so should appears somewhere else on page.
+				/*if ($conf->agenda->enabled && !empty($conf->global->MAIN_ADD_EVENT_ON_ELEMENT_CARD)) 	// Add hidden condition because this is not a "workflow" action so should appears somewhere else on page.
 				{
 					print '<div class="inline-block divButAction"><a class="butAction" href="' . DOL_URL_ROOT . '/comm/action/card.php?action=create&amp;origin=' . $object->element . '&amp;originid=' . $object->id . '&amp;socid=' . $object->socid . '">' . $langs->trans("AddAction") . '</a></div>';
 				}*/
diff --git a/htdocs/fourn/facture/list.php b/htdocs/fourn/facture/list.php
index e7f1785cb95..0072349c06b 100644
--- a/htdocs/fourn/facture/list.php
+++ b/htdocs/fourn/facture/list.php
@@ -963,7 +963,7 @@ if ($resql) {
 				FactureFournisseur::TYPE_DEPOSIT=>$langs->trans("InvoiceDeposit"),
 		);
 		/*
-		if (! empty($conf->global->INVOICE_USE_SITUATION))
+		if (!empty($conf->global->INVOICE_USE_SITUATION))
 		{
 			$listtype[Facture::TYPE_SITUATION] = $langs->trans("InvoiceSituation");
 		}
diff --git a/htdocs/ftp/index.php b/htdocs/ftp/index.php
index ea9cd9ec996..f798ff10973 100644
--- a/htdocs/ftp/index.php
+++ b/htdocs/ftp/index.php
@@ -647,7 +647,7 @@ if (!function_exists('ftp_connect')) {
 
 		// Actions
 		/*
-		if ($user->rights->ftp->write && ! empty($section))
+		if ($user->rights->ftp->write && !empty($section))
 		{
 		$formfile->form_attach_new_file(DOL_URL_ROOT.'/ftp/index.php','',0,$section,1);
 		}
diff --git a/htdocs/holiday/document.php b/htdocs/holiday/document.php
index a4b9bcfcfdb..9d3e63bd09a 100644
--- a/htdocs/holiday/document.php
+++ b/htdocs/holiday/document.php
@@ -239,7 +239,7 @@ if ($object->id) {
 	print '<table class="border tableforfield centpercent">'."\n";
 	print '<tbody>';
 
-	if (! empty($object->fk_user_create)) {
+	if (!empty($object->fk_user_create)) {
 		$userCreate=new User($db);
 		$userCreate->fetch($object->fk_user_create);
 		print '<tr>';
diff --git a/htdocs/hrm/class/evaluationdet.class.php b/htdocs/hrm/class/evaluationdet.class.php
index 239e66ee48f..e8476d0449d 100644
--- a/htdocs/hrm/class/evaluationdet.class.php
+++ b/htdocs/hrm/class/evaluationdet.class.php
@@ -500,8 +500,8 @@ class Evaluationline extends CommonObject
 			return 0;
 		}
 
-		/*if (! ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->hrm->evaluationdet->write))
-		 || (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->hrm->evaluationdet->evaluationdet_advance->validate))))
+		/*if (! ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->hrm->evaluationdet->write))
+		 || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->hrm->evaluationdet->evaluationdet_advance->validate))))
 		 {
 		 $this->error='NotEnoughPermissions';
 		 dol_syslog(get_class($this)."::valid ".$this->error, LOG_ERR);
@@ -618,8 +618,8 @@ class Evaluationline extends CommonObject
 			return 0;
 		}
 
-		/*if (! ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->hrm->write))
-		 || (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->hrm->hrm_advance->validate))))
+		/*if (! ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->hrm->write))
+		 || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->hrm->hrm_advance->validate))))
 		 {
 		 $this->error='Permission denied';
 		 return -1;
@@ -642,8 +642,8 @@ class Evaluationline extends CommonObject
 			return 0;
 		}
 
-		/*if (! ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->hrm->write))
-		 || (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->hrm->hrm_advance->validate))))
+		/*if (! ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->hrm->write))
+		 || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->hrm->hrm_advance->validate))))
 		 {
 		 $this->error='Permission denied';
 		 return -1;
@@ -666,8 +666,8 @@ class Evaluationline extends CommonObject
 			return 0;
 		}
 
-		/*if (! ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->hrm->write))
-		 || (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->hrm->hrm_advance->validate))))
+		/*if (! ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->hrm->write))
+		 || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->hrm->hrm_advance->validate))))
 		 {
 		 $this->error='Permission denied';
 		 return -1;
diff --git a/htdocs/hrm/class/job.class.php b/htdocs/hrm/class/job.class.php
index bc5af1f661d..117878c10c9 100644
--- a/htdocs/hrm/class/job.class.php
+++ b/htdocs/hrm/class/job.class.php
@@ -496,8 +496,8 @@ class Job extends CommonObject
 			return 0;
 		}
 
-		/*if (! ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->hrm->job->write))
-		 || (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->hrm->job->job_advance->validate))))
+		/*if (! ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->hrm->job->write))
+		 || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->hrm->job->job_advance->validate))))
 		 {
 		 $this->error='NotEnoughPermissions';
 		 dol_syslog(get_class($this)."::valid ".$this->error, LOG_ERR);
@@ -652,8 +652,8 @@ class Job extends CommonObject
 			return 0;
 		}
 
-		/*if (! ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->hrm->write))
-		 || (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->hrm->hrm_advance->validate))))
+		/*if (! ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->hrm->write))
+		 || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->hrm->hrm_advance->validate))))
 		 {
 		 $this->error='Permission denied';
 		 return -1;
@@ -676,8 +676,8 @@ class Job extends CommonObject
 			return 0;
 		}
 
-		/*if (! ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->hrm->write))
-		 || (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->hrm->hrm_advance->validate))))
+		/*if (! ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->hrm->write))
+		 || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->hrm->hrm_advance->validate))))
 		 {
 		 $this->error='Permission denied';
 		 return -1;
@@ -700,8 +700,8 @@ class Job extends CommonObject
 			return 0;
 		}
 
-		/*if (! ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->hrm->write))
-		 || (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->hrm->hrm_advance->validate))))
+		/*if (! ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->hrm->write))
+		 || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->hrm->hrm_advance->validate))))
 		 {
 		 $this->error='Permission denied';
 		 return -1;
diff --git a/htdocs/hrm/class/position.class.php b/htdocs/hrm/class/position.class.php
index 37a8300a1e2..19246dc2313 100644
--- a/htdocs/hrm/class/position.class.php
+++ b/htdocs/hrm/class/position.class.php
@@ -507,8 +507,8 @@ class Position extends CommonObject
 			return 0;
 		}
 
-		/*if (! ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->hrm->position->write))
-		 || (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->hrm->position->position_advance->validate))))
+		/*if (! ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->hrm->position->write))
+		 || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->hrm->position->position_advance->validate))))
 		 {
 		 $this->error='NotEnoughPermissions';
 		 dol_syslog(get_class($this)."::valid ".$this->error, LOG_ERR);
@@ -626,8 +626,8 @@ class Position extends CommonObject
 			return 0;
 		}
 
-		/*if (! ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->hrm->write))
-		 || (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->hrm->hrm_advance->validate))))
+		/*if (! ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->hrm->write))
+		 || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->hrm->hrm_advance->validate))))
 		 {
 		 $this->error='Permission denied';
 		 return -1;
@@ -650,8 +650,8 @@ class Position extends CommonObject
 			return 0;
 		}
 
-		/*if (! ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->hrm->write))
-		 || (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->hrm->hrm_advance->validate))))
+		/*if (! ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->hrm->write))
+		 || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->hrm->hrm_advance->validate))))
 		 {
 		 $this->error='Permission denied';
 		 return -1;
@@ -674,8 +674,8 @@ class Position extends CommonObject
 			return 0;
 		}
 
-		/*if (! ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->hrm->write))
-		 || (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->hrm->hrm_advance->validate))))
+		/*if (! ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->hrm->write))
+		 || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->hrm->hrm_advance->validate))))
 		 {
 		 $this->error='Permission denied';
 		 return -1;
diff --git a/htdocs/hrm/class/skill.class.php b/htdocs/hrm/class/skill.class.php
index 99dc0902f95..2c86c5dca56 100644
--- a/htdocs/hrm/class/skill.class.php
+++ b/htdocs/hrm/class/skill.class.php
@@ -564,8 +564,8 @@ class Skill extends CommonObject
 			return 0;
 		}
 
-		/*if (! ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->hrm->skill->write))
-		 || (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->hrm->skill->skill_advance->validate))))
+		/*if (! ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->hrm->skill->write))
+		 || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->hrm->skill->skill_advance->validate))))
 		 {
 		 $this->error='NotEnoughPermissions';
 		 dol_syslog(get_class($this)."::valid ".$this->error, LOG_ERR);
@@ -682,8 +682,8 @@ class Skill extends CommonObject
 			return 0;
 		}
 
-		/*if (! ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->hrm->write))
-		 || (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->hrm->hrm_advance->validate))))
+		/*if (! ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->hrm->write))
+		 || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->hrm->hrm_advance->validate))))
 		 {
 		 $this->error='Permission denied';
 		 return -1;
@@ -706,8 +706,8 @@ class Skill extends CommonObject
 			return 0;
 		}
 
-		/*if (! ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->hrm->write))
-		 || (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->hrm->hrm_advance->validate))))
+		/*if (! ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->hrm->write))
+		 || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->hrm->hrm_advance->validate))))
 		 {
 		 $this->error='Permission denied';
 		 return -1;
@@ -730,8 +730,8 @@ class Skill extends CommonObject
 			return 0;
 		}
 
-		/*if (! ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->hrm->write))
-		 || (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->hrm->hrm_advance->validate))))
+		/*if (! ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->hrm->write))
+		 || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->hrm->hrm_advance->validate))))
 		 {
 		 $this->error='Permission denied';
 		 return -1;
diff --git a/htdocs/hrm/class/skilldet.class.php b/htdocs/hrm/class/skilldet.class.php
index d1ae24b7efe..4f6d43baa59 100644
--- a/htdocs/hrm/class/skilldet.class.php
+++ b/htdocs/hrm/class/skilldet.class.php
@@ -488,8 +488,8 @@ class Skilldet extends CommonObject
 			return 0;
 		}
 
-		/*if (! ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->hrm->skilldet->write))
-		 || (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->hrm->skilldet->skilldet_advance->validate))))
+		/*if (! ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->hrm->skilldet->write))
+		 || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->hrm->skilldet->skilldet_advance->validate))))
 		 {
 		 $this->error='NotEnoughPermissions';
 		 dol_syslog(get_class($this)."::valid ".$this->error, LOG_ERR);
@@ -606,8 +606,8 @@ class Skilldet extends CommonObject
 			return 0;
 		}
 
-		/*if (! ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->hrm->write))
-		 || (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->hrm->hrm_advance->validate))))
+		/*if (! ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->hrm->write))
+		 || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->hrm->hrm_advance->validate))))
 		 {
 		 $this->error='Permission denied';
 		 return -1;
@@ -630,8 +630,8 @@ class Skilldet extends CommonObject
 			return 0;
 		}
 
-		/*if (! ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->hrm->write))
-		 || (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->hrm->hrm_advance->validate))))
+		/*if (! ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->hrm->write))
+		 || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->hrm->hrm_advance->validate))))
 		 {
 		 $this->error='Permission denied';
 		 return -1;
@@ -654,8 +654,8 @@ class Skilldet extends CommonObject
 			return 0;
 		}
 
-		/*if (! ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->hrm->write))
-		 || (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->hrm->hrm_advance->validate))))
+		/*if (! ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->hrm->write))
+		 || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->hrm->hrm_advance->validate))))
 		 {
 		 $this->error='Permission denied';
 		 return -1;
diff --git a/htdocs/hrm/class/skillrank.class.php b/htdocs/hrm/class/skillrank.class.php
index c5f5ccb8ff7..6db80642bab 100644
--- a/htdocs/hrm/class/skillrank.class.php
+++ b/htdocs/hrm/class/skillrank.class.php
@@ -527,8 +527,8 @@ class SkillRank extends CommonObject
 			return 0;
 		}
 
-		/*if (! ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->hrm->skillrank->write))
-		 || (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->hrm->skillrank->skillrank_advance->validate))))
+		/*if (! ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->hrm->skillrank->write))
+		 || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->hrm->skillrank->skillrank_advance->validate))))
 		 {
 		 $this->error='NotEnoughPermissions';
 		 dol_syslog(get_class($this)."::valid ".$this->error, LOG_ERR);
@@ -645,8 +645,8 @@ class SkillRank extends CommonObject
 			return 0;
 		}
 
-		/*if (! ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->hrm->write))
-		 || (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->hrm->hrm_advance->validate))))
+		/*if (! ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->hrm->write))
+		 || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->hrm->hrm_advance->validate))))
 		 {
 		 $this->error='Permission denied';
 		 return -1;
@@ -669,8 +669,8 @@ class SkillRank extends CommonObject
 			return 0;
 		}
 
-		/*if (! ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->hrm->write))
-		 || (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->hrm->hrm_advance->validate))))
+		/*if (! ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->hrm->write))
+		 || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->hrm->hrm_advance->validate))))
 		 {
 		 $this->error='Permission denied';
 		 return -1;
@@ -693,8 +693,8 @@ class SkillRank extends CommonObject
 			return 0;
 		}
 
-		/*if (! ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->hrm->write))
-		 || (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->hrm->hrm_advance->validate))))
+		/*if (! ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->hrm->write))
+		 || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->hrm->hrm_advance->validate))))
 		 {
 		 $this->error='Permission denied';
 		 return -1;
diff --git a/htdocs/hrm/establishment/info.php b/htdocs/hrm/establishment/info.php
index afbd480e928..9d125f450e7 100644
--- a/htdocs/hrm/establishment/info.php
+++ b/htdocs/hrm/establishment/info.php
@@ -123,7 +123,7 @@ $form = new Form($db);
 
 if ($object->id > 0) {
 	$title = $langs->trans("Agenda");
-	//if (! empty($conf->global->MAIN_HTML_TITLE) && preg_match('/thirdpartynameonly/',$conf->global->MAIN_HTML_TITLE) && $object->name) $title=$object->name." - ".$title;
+	//if (!empty($conf->global->MAIN_HTML_TITLE) && preg_match('/thirdpartynameonly/',$conf->global->MAIN_HTML_TITLE) && $object->name) $title=$object->name." - ".$title;
 	$help_url = '';
 	llxHeader('', $title, $help_url);
 
@@ -147,7 +147,7 @@ if ($object->id > 0) {
 	 // Thirdparty
 	 $morehtmlref.='<br>'.$langs->trans('ThirdParty') . ' : ' . (is_object($object->thirdparty) ? $object->thirdparty->getNomUrl(1) : '');
 	 // Project
-	 if (! empty($conf->project->enabled))
+	 if (!empty($conf->project->enabled))
 	 {
 	 $langs->load("projects");
 	 $morehtmlref.='<br>'.$langs->trans('Project') . ' ';
@@ -168,7 +168,7 @@ if ($object->id > 0) {
 	 $morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
 	 }
 	 } else {
-	 if (! empty($object->fk_project)) {
+	 if (!empty($object->fk_project)) {
 	 $proj = new Project($db);
 	 $proj->fetch($object->fk_project);
 	 $morehtmlref .= ': '.$proj->getNomUrl();
diff --git a/htdocs/hrm/evaluation_agenda.php b/htdocs/hrm/evaluation_agenda.php
index 8d2d234dd43..ed9e9ecc196 100644
--- a/htdocs/hrm/evaluation_agenda.php
+++ b/htdocs/hrm/evaluation_agenda.php
@@ -134,7 +134,7 @@ $form = new Form($db);
 
 if ($object->id > 0) {
 	$title = $langs->trans("Agenda");
-	//if (! empty($conf->global->MAIN_HTML_TITLE) && preg_match('/thirdpartynameonly/',$conf->global->MAIN_HTML_TITLE) && $object->name) $title=$object->name." - ".$title;
+	//if (!empty($conf->global->MAIN_HTML_TITLE) && preg_match('/thirdpartynameonly/',$conf->global->MAIN_HTML_TITLE) && $object->name) $title=$object->name." - ".$title;
 	$help_url = 'EN:Module_Agenda_En';
 	llxHeader('', $title, $help_url);
 
diff --git a/htdocs/hrm/evaluation_contact.php b/htdocs/hrm/evaluation_contact.php
index 0cc25901302..4b301720f07 100644
--- a/htdocs/hrm/evaluation_contact.php
+++ b/htdocs/hrm/evaluation_contact.php
@@ -139,7 +139,7 @@ if ($object->id) {
 	 // Thirdparty
 	 $morehtmlref.='<br>'.$langs->trans('ThirdParty') . ' : ' . (is_object($object->thirdparty) ? $object->thirdparty->getNomUrl(1) : '');
 	 // Project
-	 if (! empty($conf->project->enabled))
+	 if (!empty($conf->project->enabled))
 	 {
 	 $langs->load("projects");
 	 $morehtmlref.='<br>'.$langs->trans('Project') . ' ';
@@ -160,7 +160,7 @@ if ($object->id) {
 	 $morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
 	 }
 	 } else {
-	 if (! empty($object->fk_project)) {
+	 if (!empty($object->fk_project)) {
 	 $proj = new Project($db);
 	 $proj->fetch($object->fk_project);
 	 $morehtmlref .= ': '.$proj->getNomUrl();
diff --git a/htdocs/hrm/job_agenda.php b/htdocs/hrm/job_agenda.php
index b8008f009ea..b6ce99c9801 100644
--- a/htdocs/hrm/job_agenda.php
+++ b/htdocs/hrm/job_agenda.php
@@ -133,7 +133,7 @@ $form = new Form($db);
 
 if ($object->id > 0) {
 	$title = $langs->trans("Agenda");
-	//if (! empty($conf->global->MAIN_HTML_TITLE) && preg_match('/thirdpartynameonly/',$conf->global->MAIN_HTML_TITLE) && $object->name) $title=$object->name." - ".$title;
+	//if (!empty($conf->global->MAIN_HTML_TITLE) && preg_match('/thirdpartynameonly/',$conf->global->MAIN_HTML_TITLE) && $object->name) $title=$object->name." - ".$title;
 	$help_url = 'EN:Module_Agenda_En';
 	llxHeader('', $title, $help_url);
 
diff --git a/htdocs/hrm/job_contact.php b/htdocs/hrm/job_contact.php
index 76f6e73d690..9e0e5323053 100644
--- a/htdocs/hrm/job_contact.php
+++ b/htdocs/hrm/job_contact.php
@@ -139,7 +139,7 @@ if ($object->id) {
 	 // Thirdparty
 	 $morehtmlref.='<br>'.$langs->trans('ThirdParty') . ' : ' . (is_object($object->thirdparty) ? $object->thirdparty->getNomUrl(1) : '');
 	 // Project
-	 if (! empty($conf->project->enabled))
+	 if (!empty($conf->project->enabled))
 	 {
 	 $langs->load("projects");
 	 $morehtmlref.='<br>'.$langs->trans('Project') . ' ';
@@ -160,7 +160,7 @@ if ($object->id) {
 	 $morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
 	 }
 	 } else {
-	 if (! empty($object->fk_project)) {
+	 if (!empty($object->fk_project)) {
 	 $proj = new Project($db);
 	 $proj->fetch($object->fk_project);
 	 $morehtmlref .= ': '.$proj->getNomUrl();
diff --git a/htdocs/hrm/position_agenda.php b/htdocs/hrm/position_agenda.php
index ccbfabb985b..fc90a24dec6 100644
--- a/htdocs/hrm/position_agenda.php
+++ b/htdocs/hrm/position_agenda.php
@@ -134,7 +134,7 @@ $form = new Form($db);
 
 if ($object->id > 0) {
 	$title = $langs->trans("Agenda");
-	//if (! empty($conf->global->MAIN_HTML_TITLE) && preg_match('/thirdpartynameonly/',$conf->global->MAIN_HTML_TITLE) && $object->name) $title=$object->name." - ".$title;
+	//if (!empty($conf->global->MAIN_HTML_TITLE) && preg_match('/thirdpartynameonly/',$conf->global->MAIN_HTML_TITLE) && $object->name) $title=$object->name." - ".$title;
 	$help_url = 'EN:Module_Agenda_En';
 	llxHeader('', $title, $help_url);
 
diff --git a/htdocs/hrm/position_contact.php b/htdocs/hrm/position_contact.php
index 56029f790a7..92eab8e63b2 100644
--- a/htdocs/hrm/position_contact.php
+++ b/htdocs/hrm/position_contact.php
@@ -139,7 +139,7 @@ if ($object->id) {
 	 // Thirdparty
 	 $morehtmlref.='<br>'.$langs->trans('ThirdParty') . ' : ' . (is_object($object->thirdparty) ? $object->thirdparty->getNomUrl(1) : '');
 	 // Project
-	 if (! empty($conf->project->enabled))
+	 if (!empty($conf->project->enabled))
 	 {
 	 $langs->load("projects");
 	 $morehtmlref.='<br>'.$langs->trans('Project') . ' ';
@@ -160,7 +160,7 @@ if ($object->id) {
 	 $morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
 	 }
 	 } else {
-	 if (! empty($object->fk_project)) {
+	 if (!empty($object->fk_project)) {
 	 $proj = new Project($db);
 	 $proj->fetch($object->fk_project);
 	 $morehtmlref .= ': '.$proj->getNomUrl();
diff --git a/htdocs/hrm/skill_agenda.php b/htdocs/hrm/skill_agenda.php
index e1947741bde..23f98d75f3f 100644
--- a/htdocs/hrm/skill_agenda.php
+++ b/htdocs/hrm/skill_agenda.php
@@ -133,7 +133,7 @@ $form = new Form($db);
 
 if ($object->id > 0) {
 	$title = $langs->trans("Agenda");
-	//if (! empty($conf->global->MAIN_HTML_TITLE) && preg_match('/thirdpartynameonly/',$conf->global->MAIN_HTML_TITLE) && $object->name) $title=$object->name." - ".$title;
+	//if (!empty($conf->global->MAIN_HTML_TITLE) && preg_match('/thirdpartynameonly/',$conf->global->MAIN_HTML_TITLE) && $object->name) $title=$object->name." - ".$title;
 	$help_url = 'EN:Module_Agenda_En';
 	llxHeader('', $title, $help_url);
 
diff --git a/htdocs/hrm/skill_contact.php b/htdocs/hrm/skill_contact.php
index 5f284c4e72c..0e7f50c042d 100644
--- a/htdocs/hrm/skill_contact.php
+++ b/htdocs/hrm/skill_contact.php
@@ -139,7 +139,7 @@ if ($object->id) {
 	 // Thirdparty
 	 $morehtmlref.='<br>'.$langs->trans('ThirdParty') . ' : ' . (is_object($object->thirdparty) ? $object->thirdparty->getNomUrl(1) : '');
 	 // Project
-	 if (! empty($conf->project->enabled))
+	 if (!empty($conf->project->enabled))
 	 {
 	 $langs->load("projects");
 	 $morehtmlref.='<br>'.$langs->trans('Project') . ' ';
@@ -160,7 +160,7 @@ if ($object->id) {
 	 $morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
 	 }
 	 } else {
-	 if (! empty($object->fk_project)) {
+	 if (!empty($object->fk_project)) {
 	 $proj = new Project($db);
 	 $proj->fetch($object->fk_project);
 	 $morehtmlref .= ': '.$proj->getNomUrl();
diff --git a/htdocs/includes/mike42/escpos-php/src/Mike42/Escpos/PrintConnectors/ApiPrintConnector.php b/htdocs/includes/mike42/escpos-php/src/Mike42/Escpos/PrintConnectors/ApiPrintConnector.php
index 893a4858c8e..0f75fe15089 100644
--- a/htdocs/includes/mike42/escpos-php/src/Mike42/Escpos/PrintConnectors/ApiPrintConnector.php
+++ b/htdocs/includes/mike42/escpos-php/src/Mike42/Escpos/PrintConnectors/ApiPrintConnector.php
@@ -49,7 +49,7 @@ class ApiPrintConnector implements PrintConnector
      */
     public function __destruct()
     {
-        if (! empty($this->stream)) {
+        if (!empty($this->stream)) {
             trigger_error("Print connector was not finalized. Did you forget to close the printer?", E_USER_NOTICE);
         }
     }
diff --git a/htdocs/includes/nusoap/lib/class.soap_transport_http.php b/htdocs/includes/nusoap/lib/class.soap_transport_http.php
index 4ff49345083..1f3aa35a9a0 100644
--- a/htdocs/includes/nusoap/lib/class.soap_transport_http.php
+++ b/htdocs/includes/nusoap/lib/class.soap_transport_http.php
@@ -1270,20 +1270,20 @@ class soap_transport_http extends nusoap_base {
 					continue;
 				}
 	    		$this->debug("check cookie for validity: ".$cookie['name'].'='.$cookie['value']);
-				if ((isset($cookie['expires'])) && (! empty($cookie['expires']))) {
+				if ((isset($cookie['expires'])) && (!empty($cookie['expires']))) {
 					if (strtotime($cookie['expires']) <= time()) {
 						$this->debug('cookie has expired');
 						continue;
 					}
 				}
-				if ((isset($cookie['domain'])) && (! empty($cookie['domain']))) {
+				if ((isset($cookie['domain'])) && (!empty($cookie['domain']))) {
 					$domain = preg_quote($cookie['domain']);
 					if (! preg_match("'.*$domain$'i", $this->host)) {
 						$this->debug('cookie has different domain');
 						continue;
 					}
 				}
-				if ((isset($cookie['path'])) && (! empty($cookie['path']))) {
+				if ((isset($cookie['path'])) && (!empty($cookie['path']))) {
 					$path = preg_quote($cookie['path']);
 					if (! preg_match("'^$path.*'i", $this->path)) {
 						$this->debug('cookie is for a different path');
diff --git a/htdocs/includes/nusoap/lib/class.soapclient.php b/htdocs/includes/nusoap/lib/class.soapclient.php
index de0ca3c9882..598ad62246a 100644
--- a/htdocs/includes/nusoap/lib/class.soapclient.php
+++ b/htdocs/includes/nusoap/lib/class.soapclient.php
@@ -900,7 +900,7 @@ class nusoap_client extends nusoap_base  {
 				$this->debug('Remove cookie that is not an array');
 				continue;
 			}
-			if ((isset($cookie['expires'])) && (! empty($cookie['expires']))) {
+			if ((isset($cookie['expires'])) && (!empty($cookie['expires']))) {
 				if (strtotime($cookie['expires']) > time()) {
 					$this->cookies[] = $cookie;
 				} else {
diff --git a/htdocs/includes/nusoap/lib/nusoap.php b/htdocs/includes/nusoap/lib/nusoap.php
index 7e0ebd94da4..eda7ad20092 100644
--- a/htdocs/includes/nusoap/lib/nusoap.php
+++ b/htdocs/includes/nusoap/lib/nusoap.php
@@ -3421,20 +3421,20 @@ class soap_transport_http extends nusoap_base {
 					continue;
 				}
 	    		$this->debug("check cookie for validity: ".$cookie['name'].'='.$cookie['value']);
-				if ((isset($cookie['expires'])) && (! empty($cookie['expires']))) {
+				if ((isset($cookie['expires'])) && (!empty($cookie['expires']))) {
 					if (strtotime($cookie['expires']) <= time()) {
 						$this->debug('cookie has expired');
 						continue;
 					}
 				}
-				if ((isset($cookie['domain'])) && (! empty($cookie['domain']))) {
+				if ((isset($cookie['domain'])) && (!empty($cookie['domain']))) {
 					$domain = preg_quote($cookie['domain']);
 					if (! preg_match("'.*$domain$'i", $this->host)) {
 						$this->debug('cookie has different domain');
 						continue;
 					}
 				}
-				if ((isset($cookie['path'])) && (! empty($cookie['path']))) {
+				if ((isset($cookie['path'])) && (!empty($cookie['path']))) {
 					$path = preg_quote($cookie['path']);
 					if (! preg_match("'^$path.*'i", $this->path)) {
 						$this->debug('cookie is for a different path');
@@ -8057,7 +8057,7 @@ class nusoap_client extends nusoap_base  {
 				$this->debug('Remove cookie that is not an array');
 				continue;
 			}
-			if ((isset($cookie['expires'])) && (! empty($cookie['expires']))) {
+			if ((isset($cookie['expires'])) && (!empty($cookie['expires']))) {
 				if (strtotime($cookie['expires']) > time()) {
 					$this->cookies[] = $cookie;
 				} else {
diff --git a/htdocs/includes/odtphp/Segment.php b/htdocs/includes/odtphp/Segment.php
index b57983321a3..8d767de4620 100644
--- a/htdocs/includes/odtphp/Segment.php
+++ b/htdocs/includes/odtphp/Segment.php
@@ -101,7 +101,7 @@ class Segment implements IteratorAggregate, Countable
 		preg_match_all($reg, $this->xml, $matches, PREG_SET_ORDER);
 		//var_dump($tmpvars);exit;
 		foreach ($matches as $match) {   // For each match, if there is no entry into this->vars, we add it
-			if (! empty($match[1]) && ! isset($tmpvars[$match[1]])) {
+			if (!empty($match[1]) && ! isset($tmpvars[$match[1]])) {
 				$tmpvars[$match[1]] = '';     // Not defined, so we set it to '', we just need entry into this->vars for next loop
 			}
 		}
diff --git a/htdocs/includes/odtphp/odf.php b/htdocs/includes/odtphp/odf.php
index 6c63da727b7..e993f85f7fd 100644
--- a/htdocs/includes/odtphp/odf.php
+++ b/htdocs/includes/odtphp/odf.php
@@ -530,7 +530,7 @@ IMG;
 
 		//var_dump($this->vars);exit;
 		foreach ($matches as $match) {   // For each match, if there is no entry into this->vars, we add it
-			if (! empty($match[1]) && ! isset($this->vars[$match[1]])) {
+			if (!empty($match[1]) && ! isset($this->vars[$match[1]])) {
 				$this->vars[$match[1]] = '';     // Not defined, so we set it to '', we just need entry into this->vars for next loop
 			}
 		}
@@ -877,7 +877,7 @@ IMG;
 				pclose($handlein);
 				fclose($handle);
 			}
-			if (! empty($conf->global->MAIN_UMASK)) @chmod($outputfile, octdec($conf->global->MAIN_UMASK));
+			if (!empty($conf->global->MAIN_UMASK)) @chmod($outputfile, octdec($conf->global->MAIN_UMASK));
 		}
 
 		if ($retval == 0) {
diff --git a/htdocs/includes/webklex/php-imap/vendor/illuminate/collections/Arr.php b/htdocs/includes/webklex/php-imap/vendor/illuminate/collections/Arr.php
index fd7dca8a586..a5052f8f248 100644
--- a/htdocs/includes/webklex/php-imap/vendor/illuminate/collections/Arr.php
+++ b/htdocs/includes/webklex/php-imap/vendor/illuminate/collections/Arr.php
@@ -111,7 +111,7 @@ class Arr
         $results = [];
 
         foreach ($array as $key => $value) {
-            if (is_array($value) && ! empty($value)) {
+            if (is_array($value) && !empty($value)) {
                 $results = array_merge($results, static::dot($value, $prepend.$key.'.'));
             } else {
                 $results[$prepend.$key] = $value;
diff --git a/htdocs/includes/webklex/php-imap/vendor/illuminate/collections/Collection.php b/htdocs/includes/webklex/php-imap/vendor/illuminate/collections/Collection.php
index 61a48841c11..5dfec085be4 100644
--- a/htdocs/includes/webklex/php-imap/vendor/illuminate/collections/Collection.php
+++ b/htdocs/includes/webklex/php-imap/vendor/illuminate/collections/Collection.php
@@ -482,7 +482,7 @@ class Collection implements ArrayAccess, CanBeEscapedWhenCastToString, Enumerabl
 
         $result = new static($results);
 
-        if (! empty($nextGroups)) {
+        if (!empty($nextGroups)) {
             return $result->map->groupBy($nextGroups, $preserveKeys);
         }
 
diff --git a/htdocs/includes/webklex/php-imap/vendor/illuminate/support/ServiceProvider.php b/htdocs/includes/webklex/php-imap/vendor/illuminate/support/ServiceProvider.php
index 6c530c121d3..d76ef31a081 100755
--- a/htdocs/includes/webklex/php-imap/vendor/illuminate/support/ServiceProvider.php
+++ b/htdocs/includes/webklex/php-imap/vendor/illuminate/support/ServiceProvider.php
@@ -363,7 +363,7 @@ abstract class ServiceProvider
      */
     protected static function pathsForProviderAndGroup($provider, $group)
     {
-        if (! empty(static::$publishes[$provider]) && ! empty(static::$publishGroups[$group])) {
+        if (!empty(static::$publishes[$provider]) && !empty(static::$publishGroups[$group])) {
             return array_intersect_key(static::$publishes[$provider], static::$publishGroups[$group]);
         }
 
diff --git a/htdocs/includes/webklex/php-imap/vendor/illuminate/support/Stringable.php b/htdocs/includes/webklex/php-imap/vendor/illuminate/support/Stringable.php
index 414be0c2735..63c4f9e1df1 100644
--- a/htdocs/includes/webklex/php-imap/vendor/illuminate/support/Stringable.php
+++ b/htdocs/includes/webklex/php-imap/vendor/illuminate/support/Stringable.php
@@ -223,7 +223,7 @@ class Stringable implements JsonSerializable
 
         $segments = preg_split($pattern, $this->value, $limit, $flags);
 
-        return ! empty($segments) ? collect($segments) : collect();
+        return !empty($segments) ? collect($segments) : collect();
     }
 
     /**
diff --git a/htdocs/includes/webklex/php-imap/vendor/illuminate/support/Testing/Fakes/BusFake.php b/htdocs/includes/webklex/php-imap/vendor/illuminate/support/Testing/Fakes/BusFake.php
index 122252d8f00..1e4167247ef 100644
--- a/htdocs/includes/webklex/php-imap/vendor/illuminate/support/Testing/Fakes/BusFake.php
+++ b/htdocs/includes/webklex/php-imap/vendor/illuminate/support/Testing/Fakes/BusFake.php
@@ -517,7 +517,7 @@ class BusFake implements QueueingDispatcher
      */
     public function hasDispatched($command)
     {
-        return isset($this->commands[$command]) && ! empty($this->commands[$command]);
+        return isset($this->commands[$command]) && !empty($this->commands[$command]);
     }
 
     /**
@@ -528,7 +528,7 @@ class BusFake implements QueueingDispatcher
      */
     public function hasDispatchedSync($command)
     {
-        return isset($this->commandsSync[$command]) && ! empty($this->commandsSync[$command]);
+        return isset($this->commandsSync[$command]) && !empty($this->commandsSync[$command]);
     }
 
     /**
@@ -539,7 +539,7 @@ class BusFake implements QueueingDispatcher
      */
     public function hasDispatchedAfterResponse($command)
     {
-        return isset($this->commandsAfterResponse[$command]) && ! empty($this->commandsAfterResponse[$command]);
+        return isset($this->commandsAfterResponse[$command]) && !empty($this->commandsAfterResponse[$command]);
     }
 
     /**
diff --git a/htdocs/includes/webklex/php-imap/vendor/illuminate/support/Testing/Fakes/EventFake.php b/htdocs/includes/webklex/php-imap/vendor/illuminate/support/Testing/Fakes/EventFake.php
index 436173e9d3a..cdbf5b18a2c 100644
--- a/htdocs/includes/webklex/php-imap/vendor/illuminate/support/Testing/Fakes/EventFake.php
+++ b/htdocs/includes/webklex/php-imap/vendor/illuminate/support/Testing/Fakes/EventFake.php
@@ -189,7 +189,7 @@ class EventFake implements Dispatcher
      */
     public function hasDispatched($event)
     {
-        return isset($this->events[$event]) && ! empty($this->events[$event]);
+        return isset($this->events[$event]) && !empty($this->events[$event]);
     }
 
     /**
diff --git a/htdocs/includes/webklex/php-imap/vendor/illuminate/support/Testing/Fakes/NotificationFake.php b/htdocs/includes/webklex/php-imap/vendor/illuminate/support/Testing/Fakes/NotificationFake.php
index c7b12f42d47..40c694119e1 100644
--- a/htdocs/includes/webklex/php-imap/vendor/illuminate/support/Testing/Fakes/NotificationFake.php
+++ b/htdocs/includes/webklex/php-imap/vendor/illuminate/support/Testing/Fakes/NotificationFake.php
@@ -227,7 +227,7 @@ class NotificationFake implements NotificationDispatcher, NotificationFactory
      */
     public function hasSent($notifiable, $notification)
     {
-        return ! empty($this->notificationsFor($notifiable, $notification));
+        return !empty($this->notificationsFor($notifiable, $notification));
     }
 
     /**
diff --git a/htdocs/includes/webklex/php-imap/vendor/illuminate/support/Testing/Fakes/QueueFake.php b/htdocs/includes/webklex/php-imap/vendor/illuminate/support/Testing/Fakes/QueueFake.php
index d37cd67237a..f49f4745b88 100644
--- a/htdocs/includes/webklex/php-imap/vendor/illuminate/support/Testing/Fakes/QueueFake.php
+++ b/htdocs/includes/webklex/php-imap/vendor/illuminate/support/Testing/Fakes/QueueFake.php
@@ -242,7 +242,7 @@ class QueueFake extends QueueManager implements Queue
      */
     public function hasPushed($job)
     {
-        return isset($this->jobs[$job]) && ! empty($this->jobs[$job]);
+        return isset($this->jobs[$job]) && !empty($this->jobs[$job]);
     }
 
     /**
diff --git a/htdocs/index.php b/htdocs/index.php
index 553fee4855f..2a0a163f44e 100644
--- a/htdocs/index.php
+++ b/htdocs/index.php
@@ -114,7 +114,7 @@ if ($user->admin && empty($conf->global->MAIN_REMOVE_INSTALL_WARNING)) {
 	$lockfile = DOL_DATA_ROOT.'/install.lock';
 	if (!empty($lockfile) && !file_exists($lockfile) && is_dir(DOL_DOCUMENT_ROOT."/install")) {
 		$langs->load("errors");
-		//if (! empty($message)) $message.='<br>';
+		//if (!empty($message)) $message.='<br>';
 		$message .= info_admin($langs->trans("WarningLockFileDoesNotExists", DOL_DATA_ROOT).' '.$langs->trans("WarningUntilDirRemoved", DOL_DOCUMENT_ROOT."/install"), 0, 0, '1', 'clearboth');
 	}
 
@@ -122,7 +122,7 @@ if ($user->admin && empty($conf->global->MAIN_REMOVE_INSTALL_WARNING)) {
 	if (is_writable($conffile)) {
 		$langs->load("errors");
 		//$langs->load("other");
-		//if (! empty($message)) $message.='<br>';
+		//if (!empty($message)) $message.='<br>';
 		$message .= info_admin($langs->transnoentities("WarningConfFileMustBeReadOnly").' '.$langs->trans("WarningUntilDirRemoved", DOL_DOCUMENT_ROOT."/install"), 0, 0, '1', 'clearboth');
 	}
 
diff --git a/htdocs/install/upgrade2.php b/htdocs/install/upgrade2.php
index 02b3ce48ca4..01e89bf51ff 100644
--- a/htdocs/install/upgrade2.php
+++ b/htdocs/install/upgrade2.php
@@ -574,7 +574,7 @@ if (!GETPOST('action', 'aZ09') || preg_match('/upgrade/i', GETPOST('action', 'aZ
 					print '</td></tr>';
 				}
 			} else {
-				//if (! empty($conf->modules))
+				//if (!empty($conf->modules))
 				if (!empty($conf->modules_parts['hooks'])) {     // If there is at least one module with one hook, we show message to say nothing was done
 					print '<tr class="trforrunsql"><td colspan="4">';
 					print '<b>'.$langs->trans('UpgradeExternalModule').'</b>: '.$langs->trans("NodoUpgradeAfterDB");
@@ -646,7 +646,7 @@ if (!GETPOST('action', 'aZ09') || preg_match('/upgrade/i', GETPOST('action', 'aZ
 				print '</td></tr>';
 			}
 		} else {
-			//if (! empty($conf->modules))
+			//if (!empty($conf->modules))
 			if (!empty($conf->modules_parts['hooks'])) {     // If there is at least one module with one hook, we show message to say nothing was done
 				print '<tr class="trforrunsql"><td colspan="4">';
 				print '<b>'.$langs->trans('UpgradeExternalModule').'</b>: '.$langs->trans("NodoUpgradeAfterFiles");
diff --git a/htdocs/intracommreport/list.php b/htdocs/intracommreport/list.php
index 2c47ab3c7a2..244ebdd862f 100644
--- a/htdocs/intracommreport/list.php
+++ b/htdocs/intracommreport/list.php
@@ -129,7 +129,7 @@ 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]))
+		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((int) $extrafields->attributes[$object->table_element]['list'][$key])!=3 && $extrafields->attributes[$object->table_element]['perms'][$key]));
 	}
 }
@@ -206,7 +206,7 @@ $title = $langs->trans('IntracommReportList'.$type);
 $sql = 'SELECT DISTINCT i.rowid, i.type_declaration, i.type_export, i.periods, i.mode, i.entity';
 /*
 // Add fields from extrafields
-if (! empty($extrafields->attributes[$object->table_element]['label'])) {
+if (!empty($extrafields->attributes[$object->table_element]['label'])) {
 	foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val) $sql.=($extrafields->attributes[$object->table_element]['type'][$key] != 'separate' ? ", ef.".$key." as options_".$key : '');
 }
 */
@@ -255,7 +255,7 @@ $sql .= " GROUP BY i.rowid, i.type_declaration, i.type_export, i.periods, i.mode
 
 /*
 // Add fields from extrafields
-if (! empty($extrafields->attributes[$object->table_element]['label'])) {
+if (!empty($extrafields->attributes[$object->table_element]['label'])) {
 	foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val) $sql.=($extrafields->attributes[$object->table_element]['type'][$key] != 'separate' ? ", ef.".$key : '');
 }
 */
diff --git a/htdocs/knowledgemanagement/class/knowledgerecord.class.php b/htdocs/knowledgemanagement/class/knowledgerecord.class.php
index f063db604e0..c20fa91c621 100644
--- a/htdocs/knowledgemanagement/class/knowledgerecord.class.php
+++ b/htdocs/knowledgemanagement/class/knowledgerecord.class.php
@@ -530,8 +530,8 @@ class KnowledgeRecord extends CommonObject
 			return 0;
 		}
 
-		/*if (! ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->knowledgemanagement->knowledgerecord->write))
-		 || (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->knowledgemanagement->knowledgerecord->knowledgerecord_advance->validate))))
+		/*if (! ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->knowledgemanagement->knowledgerecord->write))
+		 || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->knowledgemanagement->knowledgerecord->knowledgerecord_advance->validate))))
 		 {
 		 $this->error='NotEnoughPermissions';
 		 dol_syslog(get_class($this)."::valid ".$this->error, LOG_ERR);
@@ -648,8 +648,8 @@ class KnowledgeRecord extends CommonObject
 			return 0;
 		}
 
-		/*if (! ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->knowledgemanagement->write))
-		 || (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->knowledgemanagement->knowledgemanagement_advance->validate))))
+		/*if (! ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->knowledgemanagement->write))
+		 || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->knowledgemanagement->knowledgemanagement_advance->validate))))
 		 {
 		 $this->error='Permission denied';
 		 return -1;
@@ -672,8 +672,8 @@ class KnowledgeRecord extends CommonObject
 			return 0;
 		}
 
-		/*if (! ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->knowledgemanagement->write))
-		 || (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->knowledgemanagement->knowledgemanagement_advance->validate))))
+		/*if (! ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->knowledgemanagement->write))
+		 || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->knowledgemanagement->knowledgemanagement_advance->validate))))
 		 {
 		 $this->error='Permission denied';
 		 return -1;
@@ -696,8 +696,8 @@ class KnowledgeRecord extends CommonObject
 			return 0;
 		}
 
-		/*if (! ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->knowledgemanagement->write))
-		 || (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->knowledgemanagement->knowledgemanagement_advance->validate))))
+		/*if (! ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->knowledgemanagement->write))
+		 || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->knowledgemanagement->knowledgemanagement_advance->validate))))
 		 {
 		 $this->error='Permission denied';
 		 return -1;
diff --git a/htdocs/knowledgemanagement/knowledgemanagementindex.php b/htdocs/knowledgemanagement/knowledgemanagementindex.php
index ccb3503eb2f..8f168e62598 100644
--- a/htdocs/knowledgemanagement/knowledgemanagementindex.php
+++ b/htdocs/knowledgemanagement/knowledgemanagementindex.php
@@ -72,7 +72,7 @@ print '<div class="fichecenter"><div class="fichethirdleft">';
 
 /* BEGIN MODULEBUILDER DRAFT MYOBJECT
 // Draft MyObject
-if (! empty($conf->knowledgemanagement->enabled) && $user->rights->knowledgemanagement->read)
+if (!empty($conf->knowledgemanagement->enabled) && $user->rights->knowledgemanagement->read)
 {
 	$langs->load("orders");
 
@@ -153,7 +153,7 @@ $max = $NBMAX;
 
 /* BEGIN MODULEBUILDER LASTMODIFIED MYOBJECT
 // Last modified myobject
-if (! empty($conf->knowledgemanagement->enabled) && $user->rights->knowledgemanagement->read) {
+if (!empty($conf->knowledgemanagement->enabled) && $user->rights->knowledgemanagement->read) {
 	$sql = "SELECT s.rowid, s.ref, s.label, s.date_creation, s.tms";
 	$sql.= " FROM ".MAIN_DB_PREFIX."knowledgemanagement_myobject as s";
 	//if (! $user->rights->societe->client->voir && ! $socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
diff --git a/htdocs/knowledgemanagement/knowledgerecord_agenda.php b/htdocs/knowledgemanagement/knowledgerecord_agenda.php
index cbf8ccf0895..a3cd190f196 100644
--- a/htdocs/knowledgemanagement/knowledgerecord_agenda.php
+++ b/htdocs/knowledgemanagement/knowledgerecord_agenda.php
@@ -126,7 +126,7 @@ $form = new Form($db);
 
 if ($object->id > 0) {
 	$title = $langs->trans("Agenda");
-	//if (! empty($conf->global->MAIN_HTML_TITLE) && preg_match('/thirdpartynameonly/',$conf->global->MAIN_HTML_TITLE) && $object->name) $title=$object->name." - ".$title;
+	//if (!empty($conf->global->MAIN_HTML_TITLE) && preg_match('/thirdpartynameonly/',$conf->global->MAIN_HTML_TITLE) && $object->name) $title=$object->name." - ".$title;
 	$help_url = '';
 	llxHeader('', $title, $help_url);
 
@@ -150,7 +150,7 @@ if ($object->id > 0) {
 	// Thirdparty
 	$morehtmlref.='<br>'.$langs->trans('ThirdParty') . ' : ' . (is_object($object->thirdparty) ? $object->thirdparty->getNomUrl(1) : '');
 	// Project
-	if (! empty($conf->project->enabled)) {
+	if (!empty($conf->project->enabled)) {
 		$langs->load("projects");
 		$morehtmlref.='<br>'.$langs->trans('Project') . ' ';
 		if ($permissiontoadd) {
@@ -170,7 +170,7 @@ if ($object->id > 0) {
 				$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
 			}
 		} else {
-			if (! empty($object->fk_project)) {
+			if (!empty($object->fk_project)) {
 				$proj = new Project($db);
 				$proj->fetch($object->fk_project);
 				$morehtmlref .= ': '.$proj->getNomUrl();
diff --git a/htdocs/knowledgemanagement/knowledgerecord_card.php b/htdocs/knowledgemanagement/knowledgerecord_card.php
index 8da0dd34b92..d62f9d7f98a 100644
--- a/htdocs/knowledgemanagement/knowledgerecord_card.php
+++ b/htdocs/knowledgemanagement/knowledgerecord_card.php
@@ -294,7 +294,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 	// Confirmation of action xxxx (You can use it for xxx = 'close', xxx = 'reopen', ...)
 	if ($action == 'close') {
 		$text = $langs->trans('ConfirmCloseKM', $object->ref);
-		/*if (! empty($conf->notification->enabled))
+		/*if (!empty($conf->notification->enabled))
 		 {
 		 require_once DOL_DOCUMENT_ROOT . '/core/class/notify.class.php';
 		 $notify = new Notify($db);
@@ -319,7 +319,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 	// Confirmation of action xxxx (You can use it for xxx = 'close', xxx = 'reopen', ...)
 	if ($action == 'reopen') {
 		$text = $langs->trans('ConfirmReopenKM', $object->ref);
-		/*if (! empty($conf->notification->enabled))
+		/*if (!empty($conf->notification->enabled))
 		 {
 		 require_once DOL_DOCUMENT_ROOT . '/core/class/notify.class.php';
 		 $notify = new Notify($db);
@@ -366,7 +366,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 	 // Thirdparty
 	 $morehtmlref.='<br>'.$langs->trans('ThirdParty') . ' : ' . (is_object($object->thirdparty) ? $object->thirdparty->getNomUrl(1) : '');
 	 // Project
-	 if (! empty($conf->project->enabled)) {
+	 if (!empty($conf->project->enabled)) {
 	 $langs->load("projects");
 	 $morehtmlref .= '<br>'.$langs->trans('Project') . ' ';
 	 if ($permissiontoadd) {
@@ -384,7 +384,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 	 $morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
 	 }
 	 } else {
-	 if (! empty($object->fk_project)) {
+	 if (!empty($object->fk_project)) {
 	 $proj = new Project($db);
 	 $proj->fetch($object->fk_project);
 	 $morehtmlref .= ': '.$proj->getNomUrl();
diff --git a/htdocs/knowledgemanagement/knowledgerecord_contact.php b/htdocs/knowledgemanagement/knowledgerecord_contact.php
index 2b2facafc18..820a596c6c2 100644
--- a/htdocs/knowledgemanagement/knowledgerecord_contact.php
+++ b/htdocs/knowledgemanagement/knowledgerecord_contact.php
@@ -132,7 +132,7 @@ if ($object->id) {
 	 // Thirdparty
 	 $morehtmlref.='<br>'.$langs->trans('ThirdParty') . ' : ' . (is_object($object->thirdparty) ? $object->thirdparty->getNomUrl(1) : '');
 	 // Project
-	 if (! empty($conf->project->enabled))
+	 if (!empty($conf->project->enabled))
 	 {
 	 $langs->load("projects");
 	 $morehtmlref.='<br>'.$langs->trans('Project') . ' ';
@@ -153,7 +153,7 @@ if ($object->id) {
 	 $morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
 	 }
 	 } else {
-	 if (! empty($object->fk_project)) {
+	 if (!empty($object->fk_project)) {
 	 $proj = new Project($db);
 	 $proj->fetch($object->fk_project);
 	 $morehtmlref .= ': '.$proj->getNomUrl();
diff --git a/htdocs/knowledgemanagement/knowledgerecord_document.php b/htdocs/knowledgemanagement/knowledgerecord_document.php
index ce185c9b8cf..7f4da244271 100644
--- a/htdocs/knowledgemanagement/knowledgerecord_document.php
+++ b/htdocs/knowledgemanagement/knowledgerecord_document.php
@@ -130,7 +130,7 @@ if ($object->id) {
 	 // Thirdparty
 	 $morehtmlref.='<br>'.$langs->trans('ThirdParty') . ' : ' . (is_object($object->thirdparty) ? $object->thirdparty->getNomUrl(1) : '');
 	 // Project
-	 if (! empty($conf->project->enabled))
+	 if (!empty($conf->project->enabled))
 	 {
 	 $langs->load("projects");
 	 $morehtmlref.='<br>'.$langs->trans('Project') . ' ';
@@ -151,7 +151,7 @@ if ($object->id) {
 	 $morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
 	 }
 	 } else {
-	 if (! empty($object->fk_project)) {
+	 if (!empty($object->fk_project)) {
 	 $proj = new Project($db);
 	 $proj->fetch($object->fk_project);
 	 $morehtmlref .= ': '.$proj->getNomUrl();
diff --git a/htdocs/knowledgemanagement/knowledgerecord_list.php b/htdocs/knowledgemanagement/knowledgerecord_list.php
index ff28b79a4ad..92b2b3f2adc 100644
--- a/htdocs/knowledgemanagement/knowledgerecord_list.php
+++ b/htdocs/knowledgemanagement/knowledgerecord_list.php
@@ -330,7 +330,7 @@ foreach($object->fields as $key => $val) {
 	$sql .= "t.".$key.", ";
 }
 // Add fields from extrafields
-if (! empty($extrafields->attributes[$object->table_element]['label'])) {
+if (!empty($extrafields->attributes[$object->table_element]['label'])) {
 	foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val) $sql.=($extrafields->attributes[$object->table_element]['type'][$key] != 'separate' ? "ef.".$key.', ' : '');
 }
 // Add where from hooks
diff --git a/htdocs/knowledgemanagement/knowledgerecord_note.php b/htdocs/knowledgemanagement/knowledgerecord_note.php
index 0f56a6115a3..e61d2c1034c 100644
--- a/htdocs/knowledgemanagement/knowledgerecord_note.php
+++ b/htdocs/knowledgemanagement/knowledgerecord_note.php
@@ -104,7 +104,7 @@ if ($id > 0 || !empty($ref)) {
 	 // Thirdparty
 	 $morehtmlref.='<br>'.$langs->trans('ThirdParty') . ' : ' . (is_object($object->thirdparty) ? $object->thirdparty->getNomUrl(1) : '');
 	 // Project
-	 if (! empty($conf->project->enabled))
+	 if (!empty($conf->project->enabled))
 	 {
 	 $langs->load("projects");
 	 $morehtmlref.='<br>'.$langs->trans('Project') . ' ';
@@ -125,7 +125,7 @@ if ($id > 0 || !empty($ref)) {
 	 $morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
 	 }
 	 } else {
-	 if (! empty($object->fk_project)) {
+	 if (!empty($object->fk_project)) {
 	 $proj = new Project($db);
 	 $proj->fetch($object->fk_project);
 	 $morehtmlref .= ': '.$proj->getNomUrl();
diff --git a/htdocs/modulebuilder/template/class/myobject.class.php b/htdocs/modulebuilder/template/class/myobject.class.php
index 94f57bdd776..1d6b6650d27 100644
--- a/htdocs/modulebuilder/template/class/myobject.class.php
+++ b/htdocs/modulebuilder/template/class/myobject.class.php
@@ -573,8 +573,8 @@ class MyObject extends CommonObject
 			return 0;
 		}
 
-		/*if (! ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->mymodule->myobject->write))
-		 || (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->mymodule->myobject->myobject_advance->validate))))
+		/*if (! ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->mymodule->myobject->write))
+		 || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->mymodule->myobject->myobject_advance->validate))))
 		 {
 		 $this->error='NotEnoughPermissions';
 		 dol_syslog(get_class($this)."::valid ".$this->error, LOG_ERR);
@@ -691,8 +691,8 @@ class MyObject extends CommonObject
 			return 0;
 		}
 
-		/*if (! ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->mymodule->write))
-		 || (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->mymodule->mymodule_advance->validate))))
+		/*if (! ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->mymodule->write))
+		 || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->mymodule->mymodule_advance->validate))))
 		 {
 		 $this->error='Permission denied';
 		 return -1;
@@ -715,8 +715,8 @@ class MyObject extends CommonObject
 			return 0;
 		}
 
-		/*if (! ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->mymodule->write))
-		 || (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->mymodule->mymodule_advance->validate))))
+		/*if (! ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->mymodule->write))
+		 || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->mymodule->mymodule_advance->validate))))
 		 {
 		 $this->error='Permission denied';
 		 return -1;
@@ -739,8 +739,8 @@ class MyObject extends CommonObject
 			return 0;
 		}
 
-		/*if (! ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->mymodule->write))
-		 || (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->mymodule->mymodule_advance->validate))))
+		/*if (! ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->mymodule->write))
+		 || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->mymodule->mymodule_advance->validate))))
 		 {
 		 $this->error='Permission denied';
 		 return -1;
diff --git a/htdocs/modulebuilder/template/css/mymodule.css.php b/htdocs/modulebuilder/template/css/mymodule.css.php
index 985cbe6aa18..6d38c782184 100644
--- a/htdocs/modulebuilder/template/css/mymodule.css.php
+++ b/htdocs/modulebuilder/template/css/mymodule.css.php
@@ -80,7 +80,7 @@ if (!$res) {
 require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 
 // Load user to have $user->conf loaded (not done by default here because of NOLOGIN constant defined) and load permission if we need to use them in CSS
-/*if (empty($user->id) && ! empty($_SESSION['dol_login'])) {
+/*if (empty($user->id) && !empty($_SESSION['dol_login'])) {
 	$user->fetch('',$_SESSION['dol_login']);
 	$user->getrights();
 }*/
diff --git a/htdocs/modulebuilder/template/myobject_agenda.php b/htdocs/modulebuilder/template/myobject_agenda.php
index b37da30f229..3e6213eaa26 100644
--- a/htdocs/modulebuilder/template/myobject_agenda.php
+++ b/htdocs/modulebuilder/template/myobject_agenda.php
@@ -186,7 +186,7 @@ $form = new Form($db);
 
 if ($object->id > 0) {
 	$title = $langs->trans("Agenda");
-	//if (! empty($conf->global->MAIN_HTML_TITLE) && preg_match('/thirdpartynameonly/',$conf->global->MAIN_HTML_TITLE) && $object->name) $title=$object->name." - ".$title;
+	//if (!empty($conf->global->MAIN_HTML_TITLE) && preg_match('/thirdpartynameonly/',$conf->global->MAIN_HTML_TITLE) && $object->name) $title=$object->name." - ".$title;
 	$help_url = 'EN:Module_Agenda_En';
 	llxHeader('', $title, $help_url);
 
@@ -210,7 +210,7 @@ if ($object->id > 0) {
 	// Thirdparty
 	$morehtmlref.='<br>'.$langs->trans('ThirdParty') . ' : ' . (is_object($object->thirdparty) ? $object->thirdparty->getNomUrl(1) : '');
 	// Project
-	if (! empty($conf->project->enabled)) {
+	if (!empty($conf->project->enabled)) {
 		$langs->load("projects");
 		$morehtmlref.='<br>'.$langs->trans('Project') . ' ';
 		if ($permissiontoadd) {
@@ -230,7 +230,7 @@ if ($object->id > 0) {
 				$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
 			}
 		} else {
-			if (! empty($object->fk_project)) {
+			if (!empty($object->fk_project)) {
 				$proj = new Project($db);
 				$proj->fetch($object->fk_project);
 				$morehtmlref .= ': '.$proj->getNomUrl();
diff --git a/htdocs/modulebuilder/template/myobject_card.php b/htdocs/modulebuilder/template/myobject_card.php
index 0e1815fade1..18328de1f9d 100644
--- a/htdocs/modulebuilder/template/myobject_card.php
+++ b/htdocs/modulebuilder/template/myobject_card.php
@@ -346,7 +346,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 	// Confirmation of action xxxx (You can use it for xxx = 'close', xxx = 'reopen', ...)
 	if ($action == 'xxx') {
 		$text = $langs->trans('ConfirmActionMyObject', $object->ref);
-		/*if (! empty($conf->notification->enabled))
+		/*if (!empty($conf->notification->enabled))
 		{
 			require_once DOL_DOCUMENT_ROOT . '/core/class/notify.class.php';
 			$notify = new Notify($db);
@@ -393,7 +393,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 	 // Thirdparty
 	 $morehtmlref.='<br>'.$langs->trans('ThirdParty') . ' : ' . (is_object($object->thirdparty) ? $object->thirdparty->getNomUrl(1) : '');
 	 // Project
-	 if (! empty($conf->project->enabled)) {
+	 if (!empty($conf->project->enabled)) {
 	 $langs->load("projects");
 	 $morehtmlref .= '<br>'.$langs->trans('Project') . ' ';
 	 if ($permissiontoadd) {
@@ -411,7 +411,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 	 $morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
 	 }
 	 } else {
-	 if (! empty($object->fk_project)) {
+	 if (!empty($object->fk_project)) {
 	 $proj = new Project($db);
 	 $proj->fetch($object->fk_project);
 	 $morehtmlref .= ': '.$proj->getNomUrl();
diff --git a/htdocs/modulebuilder/template/myobject_contact.php b/htdocs/modulebuilder/template/myobject_contact.php
index 01efbec8cdc..9a365dd88f2 100644
--- a/htdocs/modulebuilder/template/myobject_contact.php
+++ b/htdocs/modulebuilder/template/myobject_contact.php
@@ -173,7 +173,7 @@ if ($object->id) {
 	 // Thirdparty
 	 $morehtmlref.='<br>'.$langs->trans('ThirdParty') . ' : ' . (is_object($object->thirdparty) ? $object->thirdparty->getNomUrl(1) : '');
 	 // Project
-	 if (! empty($conf->project->enabled))
+	 if (!empty($conf->project->enabled))
 	 {
 	 $langs->load("projects");
 	 $morehtmlref.='<br>'.$langs->trans('Project') . ' ';
@@ -194,7 +194,7 @@ if ($object->id) {
 	 $morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
 	 }
 	 } else {
-	 if (! empty($object->fk_project)) {
+	 if (!empty($object->fk_project)) {
 	 $proj = new Project($db);
 	 $proj->fetch($object->fk_project);
 	 $morehtmlref .= ': '.$proj->getNomUrl();
diff --git a/htdocs/modulebuilder/template/myobject_note.php b/htdocs/modulebuilder/template/myobject_note.php
index fb5a773be81..f38e703fa69 100644
--- a/htdocs/modulebuilder/template/myobject_note.php
+++ b/htdocs/modulebuilder/template/myobject_note.php
@@ -168,7 +168,7 @@ if ($id > 0 || !empty($ref)) {
 	 // Thirdparty
 	 $morehtmlref.='<br>'.$langs->trans('ThirdParty') . ' : ' . (is_object($object->thirdparty) ? $object->thirdparty->getNomUrl(1) : '');
 	 // Project
-	 if (! empty($conf->project->enabled))
+	 if (!empty($conf->project->enabled))
 	 {
 	 $langs->load("projects");
 	 $morehtmlref.='<br>'.$langs->trans('Project') . ' ';
@@ -189,7 +189,7 @@ if ($id > 0 || !empty($ref)) {
 	 $morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
 	 }
 	 } else {
-	 if (! empty($object->fk_project)) {
+	 if (!empty($object->fk_project)) {
 	 $proj = new Project($db);
 	 $proj->fetch($object->fk_project);
 	 $morehtmlref .= ': '.$proj->getNomUrl();
diff --git a/htdocs/mrp/class/mo.class.php b/htdocs/mrp/class/mo.class.php
index 4a3a6bc8dd8..263ca494518 100644
--- a/htdocs/mrp/class/mo.class.php
+++ b/htdocs/mrp/class/mo.class.php
@@ -697,7 +697,7 @@ class Mo extends CommonObject
 							if ($line->qty_frozen) {
 								$moline->qty = $line->qty; // Qty to consume does not depends on quantity to produce
 							} else {
-								$moline->qty = price2num(($line->qty / ( ! empty($bom->qty) ? $bom->qty : 1 ) ) * $this->qty / ( ! empty($line->efficiency) ? $line->efficiency : 1 ), 'MS'); // Calculate with Qty to produce and  more presition
+								$moline->qty = price2num(($line->qty / ( !empty($bom->qty) ? $bom->qty : 1 ) ) * $this->qty / ( !empty($line->efficiency) ? $line->efficiency : 1 ), 'MS'); // Calculate with Qty to produce and  more presition
 							}
 							if ($moline->qty <= 0) {
 								$error++;
@@ -770,13 +770,13 @@ class Mo extends CommonObject
 		$fk_movement = GETPOST('fk_movement', 'int');
 		$arrayoflines = $this->fetchLinesLinked('consumed', $idline);
 
-		if (! empty($arrayoflines)) {
+		if (!empty($arrayoflines)) {
 			$this->db->begin();
 
 			$stockmove = new MouvementStock($this->db);
 			$stockmove->setOrigin($this->element, $this->id);
 
-			if (! empty($fk_movement)) {
+			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);
@@ -903,8 +903,8 @@ class Mo extends CommonObject
 			return 0;
 		}
 
-		/*if (! ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->mrp->create))
-		 || (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->mrp->mrp_advance->validate))))
+		/*if (! ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->mrp->create))
+		 || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->mrp->mrp_advance->validate))))
 		 {
 		 $this->error='NotEnoughPermissions';
 		 dol_syslog(get_class($this)."::valid ".$this->error, LOG_ERR);
@@ -1015,8 +1015,8 @@ class Mo extends CommonObject
 			return 0;
 		}
 
-		/*if (! ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->mymodule->write))
-		 || (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->mymodule->mymodule_advance->validate))))
+		/*if (! ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->mymodule->write))
+		 || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->mymodule->mymodule_advance->validate))))
 		 {
 		 $this->error='Permission denied';
 		 return -1;
@@ -1039,8 +1039,8 @@ class Mo extends CommonObject
 			return 0;
 		}
 
-		/*if (! ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->mymodule->write))
-		 || (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->mymodule->mymodule_advance->validate))))
+		/*if (! ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->mymodule->write))
+		 || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->mymodule->mymodule_advance->validate))))
 		 {
 		 $this->error='Permission denied';
 		 return -1;
@@ -1063,8 +1063,8 @@ class Mo extends CommonObject
 			return 0;
 		}
 
-		/*if (! ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->mymodule->write))
-		 || (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->mymodule->mymodule_advance->validate))))
+		/*if (! ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->mymodule->write))
+		 || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->mymodule->mymodule_advance->validate))))
 		 {
 		 $this->error='Permission denied';
 		 return -1;
diff --git a/htdocs/mrp/mo_agenda.php b/htdocs/mrp/mo_agenda.php
index 60ac81e20cd..491240cff55 100644
--- a/htdocs/mrp/mo_agenda.php
+++ b/htdocs/mrp/mo_agenda.php
@@ -130,7 +130,7 @@ $formproject = new FormProjets($db);
 
 if ($object->id > 0) {
 	$title = $langs->trans("Agenda");
-	//if (! empty($conf->global->MAIN_HTML_TITLE) && preg_match('/thirdpartynameonly/',$conf->global->MAIN_HTML_TITLE) && $object->name) $title=$object->name." - ".$title;
+	//if (!empty($conf->global->MAIN_HTML_TITLE) && preg_match('/thirdpartynameonly/',$conf->global->MAIN_HTML_TITLE) && $object->name) $title=$object->name." - ".$title;
 	$help_url = 'EN:Module_Agenda_En|FR:Module_Agenda|ES:Módulo_Agenda|DE:Modul_Agenda';
 	llxHeader('', $title, $help_url);
 
diff --git a/htdocs/mrp/mo_card.php b/htdocs/mrp/mo_card.php
index 032f9a7961c..5d06f8c0f52 100644
--- a/htdocs/mrp/mo_card.php
+++ b/htdocs/mrp/mo_card.php
@@ -424,7 +424,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 		}
 
 		$text = $langs->trans('ConfirmValidateMo', $numref);
-		/*if (! empty($conf->notification->enabled))
+		/*if (!empty($conf->notification->enabled))
 		 {
 		 require_once DOL_DOCUMENT_ROOT . '/core/class/notify.class.php';
 		 $notify = new Notify($db);
diff --git a/htdocs/mrp/mo_list.php b/htdocs/mrp/mo_list.php
index 12d2320742d..9bcc446b7c8 100644
--- a/htdocs/mrp/mo_list.php
+++ b/htdocs/mrp/mo_list.php
@@ -292,7 +292,7 @@ foreach($object->fields as $key => $val) {
 	$sql .= "t.".$key.", ";
 }
 // Add fields from extrafields
-if (! empty($extrafields->attributes[$object->table_element]['label'])) {
+if (!empty($extrafields->attributes[$object->table_element]['label'])) {
 	foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val) {
 		$sql .= ($extrafields->attributes[$object->table_element]['type'][$key] != 'separate' ? "ef.".$key.", " : "");
 	}
diff --git a/htdocs/mrp/mo_production.php b/htdocs/mrp/mo_production.php
index 88788da8b43..3dbfe40106d 100644
--- a/htdocs/mrp/mo_production.php
+++ b/htdocs/mrp/mo_production.php
@@ -473,7 +473,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 		}
 
 		$text = $langs->trans('ConfirmValidateMo', $numref);
-		/*if (! empty($conf->notification->enabled))
+		/*if (!empty($conf->notification->enabled))
 		 {
 		 require_once DOL_DOCUMENT_ROOT . '/core/class/notify.class.php';
 		 $notify = new Notify($db);
diff --git a/htdocs/mrp/tpl/originproductline.tpl.php b/htdocs/mrp/tpl/originproductline.tpl.php
index 7e0468119bd..bd4ecbc4cd4 100644
--- a/htdocs/mrp/tpl/originproductline.tpl.php
+++ b/htdocs/mrp/tpl/originproductline.tpl.php
@@ -28,7 +28,7 @@ if (!empty($form) && !is_object($form)) {
 	$form = new Form($db);
 }
 
-$qtytoconsumeforline = $this->tpl['qty'] / ( ! empty($this->tpl['efficiency']) ? $this->tpl['efficiency'] : 1 );
+$qtytoconsumeforline = $this->tpl['qty'] / ( !empty($this->tpl['efficiency']) ? $this->tpl['efficiency'] : 1 );
 /*if ((empty($this->tpl['qty_frozen']) && $this->tpl['qty_bom'] > 1)) {
 	$qtytoconsumeforline = $qtytoconsumeforline / $this->tpl['qty_bom'];
 }*/
diff --git a/htdocs/multicurrency/multicurrency_rate.php b/htdocs/multicurrency/multicurrency_rate.php
index 91dc0bce0ad..06fe91c120d 100644
--- a/htdocs/multicurrency/multicurrency_rate.php
+++ b/htdocs/multicurrency/multicurrency_rate.php
@@ -506,7 +506,7 @@ if ($resql) {
 			}
 
 			// code
-			if (! empty($arrayfields['m.code']['checked'])) {
+			if (!empty($arrayfields['m.code']['checked'])) {
 				print '<td class="tdoverflowmax200">';
 				print $obj->code;
 				print ' - <span class="opacitymedium">'.$obj->name.'</span>';
@@ -516,7 +516,7 @@ if ($resql) {
 			}
 
 			// rate
-			if (! empty($arrayfields['cr.rate']['checked'])) {
+			if (!empty($arrayfields['cr.rate']['checked'])) {
 				print '<td class="tdoverflowmax200">';
 				print $obj->rate;
 				print "</td>\n";
diff --git a/htdocs/partnership/class/partnership.class.php b/htdocs/partnership/class/partnership.class.php
index 8b1ede66506..9e7cfdd5d03 100644
--- a/htdocs/partnership/class/partnership.class.php
+++ b/htdocs/partnership/class/partnership.class.php
@@ -611,8 +611,8 @@ class Partnership extends CommonObject
 			return 0;
 		}
 
-		/*if (! ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->partnership->write))
-		 || (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->partnership->partnership_advance->validate))))
+		/*if (! ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->partnership->write))
+		 || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->partnership->partnership_advance->validate))))
 		 {
 		 $this->error='NotEnoughPermissions';
 		 dol_syslog(get_class($this)."::valid ".$this->error, LOG_ERR);
@@ -735,8 +735,8 @@ class Partnership extends CommonObject
 			return 0;
 		}
 
-		/*if (! ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->partnership->write))
-		 || (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->partnership->partnership_advance->accept))))
+		/*if (! ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->partnership->write))
+		 || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->partnership->partnership_advance->accept))))
 		 {
 		 $this->error='NotEnoughPermissions';
 		 dol_syslog(get_class($this)."::valid ".$this->error, LOG_ERR);
@@ -853,8 +853,8 @@ class Partnership extends CommonObject
 			return 0;
 		}
 
-		/*if (! ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->partnership->write))
-		 || (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->partnership_advance->validate))))
+		/*if (! ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->partnership->write))
+		 || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->partnership_advance->validate))))
 		 {
 		 $this->error='Permission denied';
 		 return -1;
@@ -905,8 +905,8 @@ class Partnership extends CommonObject
 			return 0;
 		}
 
-		/*if (! ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->partnership->write))
-		 || (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->partnership_advance->validate))))
+		/*if (! ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->partnership->write))
+		 || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->partnership_advance->validate))))
 		 {
 		 $this->error='Permission denied';
 		 return -1;
@@ -929,8 +929,8 @@ class Partnership extends CommonObject
 			return 0;
 		}
 
-		/*if (! ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->partnership->write))
-		 || (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->partnership_advance->validate))))
+		/*if (! ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->partnership->write))
+		 || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->partnership_advance->validate))))
 		 {
 		 $this->error='Permission denied';
 		 return -1;
diff --git a/htdocs/partnership/class/partnership_type.class.php b/htdocs/partnership/class/partnership_type.class.php
index 32162ae0b97..0074d2e80ee 100644
--- a/htdocs/partnership/class/partnership_type.class.php
+++ b/htdocs/partnership/class/partnership_type.class.php
@@ -270,8 +270,8 @@ class PartnershipType extends CommonObject
 			return 0;
 		}
 
-		/*if (! ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->mymodule->write))
-		 || (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->mymodule->mymodule_advance->validate))))
+		/*if (! ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->mymodule->write))
+		 || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->mymodule->mymodule_advance->validate))))
 		 {
 		 $this->error='Permission denied';
 		 return -1;
@@ -294,8 +294,8 @@ class PartnershipType extends CommonObject
 			return 0;
 		}
 
-		/*if (! ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->mymodule->write))
-		 || (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->mymodule->mymodule_advance->validate))))
+		/*if (! ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->mymodule->write))
+		 || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->mymodule->mymodule_advance->validate))))
 		 {
 		 $this->error='Permission denied';
 		 return -1;
@@ -318,8 +318,8 @@ class PartnershipType extends CommonObject
 			return 0;
 		}
 
-		/*if (! ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->mymodule->write))
-		 || (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->mymodule->mymodule_advance->validate))))
+		/*if (! ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->mymodule->write))
+		 || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->mymodule->mymodule_advance->validate))))
 		 {
 		 $this->error='Permission denied';
 		 return -1;
diff --git a/htdocs/partnership/partnership_agenda.php b/htdocs/partnership/partnership_agenda.php
index ab6d7ea083a..02580c1f73a 100644
--- a/htdocs/partnership/partnership_agenda.php
+++ b/htdocs/partnership/partnership_agenda.php
@@ -125,7 +125,7 @@ $form = new Form($db);
 
 if ($object->id > 0) {
 	$title = $langs->trans("Agenda");
-	//if (! empty($conf->global->MAIN_HTML_TITLE) && preg_match('/thirdpartynameonly/',$conf->global->MAIN_HTML_TITLE) && $object->name) $title=$object->name." - ".$title;
+	//if (!empty($conf->global->MAIN_HTML_TITLE) && preg_match('/thirdpartynameonly/',$conf->global->MAIN_HTML_TITLE) && $object->name) $title=$object->name." - ".$title;
 	$help_url = '';
 	llxHeader('', $title, $help_url);
 
@@ -149,7 +149,7 @@ if ($object->id > 0) {
 	// Thirdparty
 	$morehtmlref.='<br>'.$langs->trans('ThirdParty') . ' : ' . (is_object($object->thirdparty) ? $object->thirdparty->getNomUrl(1) : '');
 	// Project
-	if (! empty($conf->project->enabled)) {
+	if (!empty($conf->project->enabled)) {
 		$langs->load("projects");
 		$morehtmlref.='<br>'.$langs->trans('Project') . ' ';
 		if ($permissiontoadd) {
@@ -169,7 +169,7 @@ if ($object->id > 0) {
 				$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
 			}
 		} else {
-			if (! empty($object->fk_project)) {
+			if (!empty($object->fk_project)) {
 				$proj = new Project($db);
 				$proj->fetch($object->fk_project);
 				$morehtmlref .= ': '.$proj->getNomUrl();
diff --git a/htdocs/partnership/partnership_card.php b/htdocs/partnership/partnership_card.php
index fb826efcd91..279b72593da 100644
--- a/htdocs/partnership/partnership_card.php
+++ b/htdocs/partnership/partnership_card.php
@@ -406,7 +406,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 	 // Thirdparty
 	 $morehtmlref.='<br>'.$langs->trans('ThirdParty') . ' : ' . (is_object($object->thirdparty) ? $object->thirdparty->getNomUrl(1) : '');
 	 // Project
-	 if (! empty($conf->project->enabled)) {
+	 if (!empty($conf->project->enabled)) {
 	 $langs->load("projects");
 	 $morehtmlref .= '<br>'.$langs->trans('Project') . ' ';
 	 if ($permissiontoadd) {
@@ -424,7 +424,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 	 $morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
 	 }
 	 } else {
-	 if (! empty($object->fk_project)) {
+	 if (!empty($object->fk_project)) {
 	 $proj = new Project($db);
 	 $proj->fetch($object->fk_project);
 	 $morehtmlref .= ': '.$proj->getNomUrl();
diff --git a/htdocs/partnership/partnership_contact.php b/htdocs/partnership/partnership_contact.php
index 094380ab83b..75d315ae396 100644
--- a/htdocs/partnership/partnership_contact.php
+++ b/htdocs/partnership/partnership_contact.php
@@ -133,7 +133,7 @@ if ($object->id) {
 	 // Thirdparty
 	 $morehtmlref.='<br>'.$langs->trans('ThirdParty') . ' : ' . (is_object($object->thirdparty) ? $object->thirdparty->getNomUrl(1) : '');
 	 // Project
-	 if (! empty($conf->project->enabled))
+	 if (!empty($conf->project->enabled))
 	 {
 	 $langs->load("projects");
 	 $morehtmlref.='<br>'.$langs->trans('Project') . ' ';
@@ -154,7 +154,7 @@ if ($object->id) {
 	 $morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
 	 }
 	 } else {
-	 if (! empty($object->fk_project)) {
+	 if (!empty($object->fk_project)) {
 	 $proj = new Project($db);
 	 $proj->fetch($object->fk_project);
 	 $morehtmlref .= ': '.$proj->getNomUrl();
diff --git a/htdocs/partnership/partnership_document.php b/htdocs/partnership/partnership_document.php
index f9ea6559979..0b6d0e6bd07 100644
--- a/htdocs/partnership/partnership_document.php
+++ b/htdocs/partnership/partnership_document.php
@@ -130,7 +130,7 @@ if ($object->id) {
 	 // Thirdparty
 	 $morehtmlref.='<br>'.$langs->trans('ThirdParty') . ' : ' . (is_object($object->thirdparty) ? $object->thirdparty->getNomUrl(1) : '');
 	 // Project
-	 if (! empty($conf->project->enabled))
+	 if (!empty($conf->project->enabled))
 	 {
 	 $langs->load("projects");
 	 $morehtmlref.='<br>'.$langs->trans('Project') . ' ';
@@ -151,7 +151,7 @@ if ($object->id) {
 	 $morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
 	 }
 	 } else {
-	 if (! empty($object->fk_project)) {
+	 if (!empty($object->fk_project)) {
 	 $proj = new Project($db);
 	 $proj->fetch($object->fk_project);
 	 $morehtmlref .= ': '.$proj->getNomUrl();
diff --git a/htdocs/partnership/partnership_list.php b/htdocs/partnership/partnership_list.php
index 12c63b2f5bd..bc99655efa3 100644
--- a/htdocs/partnership/partnership_list.php
+++ b/htdocs/partnership/partnership_list.php
@@ -385,7 +385,7 @@ foreach($object->fields as $key => $val) {
 	$sql .= "t.".$db->escape($key).", ";
 }
 // Add fields from extrafields
-if (! empty($extrafields->attributes[$object->table_element]['label'])) {
+if (!empty($extrafields->attributes[$object->table_element]['label'])) {
 	foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val) {
 		$sql .= ($extrafields->attributes[$object->table_element]['type'][$key] != 'separate' ? "ef.".$key.', ' : '');
 	}
diff --git a/htdocs/partnership/partnership_note.php b/htdocs/partnership/partnership_note.php
index 3bd2b913163..a38fdc65ade 100644
--- a/htdocs/partnership/partnership_note.php
+++ b/htdocs/partnership/partnership_note.php
@@ -103,7 +103,7 @@ if ($id > 0 || !empty($ref)) {
 	 // Thirdparty
 	 $morehtmlref.='<br>'.$langs->trans('ThirdParty') . ' : ' . (is_object($object->thirdparty) ? $object->thirdparty->getNomUrl(1) : '');
 	 // Project
-	 if (! empty($conf->project->enabled))
+	 if (!empty($conf->project->enabled))
 	 {
 	 $langs->load("projects");
 	 $morehtmlref.='<br>'.$langs->trans('Project') . ' ';
@@ -124,7 +124,7 @@ if ($id > 0 || !empty($ref)) {
 	 $morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
 	 }
 	 } else {
-	 if (! empty($object->fk_project)) {
+	 if (!empty($object->fk_project)) {
 	 $proj = new Project($db);
 	 $proj->fetch($object->fk_project);
 	 $morehtmlref .= ': '.$proj->getNomUrl();
diff --git a/htdocs/partnership/partnershipindex.php b/htdocs/partnership/partnershipindex.php
index 0b8a6cd33c9..565a218d063 100644
--- a/htdocs/partnership/partnershipindex.php
+++ b/htdocs/partnership/partnershipindex.php
@@ -72,7 +72,7 @@ print '<div class="fichecenter"><div class="fichethirdleft">';
 
 /* BEGIN MODULEBUILDER DRAFT MYOBJECT
 // Draft MyObject
-if (! empty($conf->partnership->enabled) && $user->rights->partnership->read) {
+if (!empty($conf->partnership->enabled) && $user->rights->partnership->read) {
 	$langs->load("orders");
 
 	$sql = "SELECT c.rowid, c.ref, c.ref_client, c.total_ht, c.tva as total_tva, c.total_ttc, s.rowid as socid, s.nom as name, s.client, s.canvas";
@@ -141,7 +141,7 @@ $max = $conf->global->MAIN_SIZE_SHORTLIST_LIMIT;
 
 /* BEGIN MODULEBUILDER LASTMODIFIED MYOBJECT
 // Last modified myobject
-if (! empty($conf->partnership->enabled) && $user->rights->partnership->read) {
+if (!empty($conf->partnership->enabled) && $user->rights->partnership->read) {
 	$sql = "SELECT s.rowid, s.ref, s.label, s.date_creation, s.tms";
 	$sql.= " FROM ".MAIN_DB_PREFIX."partnership_myobject as s";
 	//if (! $user->rights->societe->client->voir && ! $socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
diff --git a/htdocs/product/card.php b/htdocs/product/card.php
index fd107c06351..17387e3948d 100644
--- a/htdocs/product/card.php
+++ b/htdocs/product/card.php
@@ -1604,7 +1604,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 		}
 
 		// Note (private, no output on invoices, propales...)
-		//if (! empty($conf->global->MAIN_DISABLE_NOTES_TAB))       available in create mode
+		//if (!empty($conf->global->MAIN_DISABLE_NOTES_TAB))       available in create mode
 		//{
 			print '<tr><td class="tdtop">'.$langs->trans("NoteNotVisibleOnBill").'</td><td>';
 
diff --git a/htdocs/product/composition/card.php b/htdocs/product/composition/card.php
index 3018312cd0e..7f7b8ca01a8 100644
--- a/htdocs/product/composition/card.php
+++ b/htdocs/product/composition/card.php
@@ -293,7 +293,7 @@ if ($id > 0 || !empty($ref)) {
 		$prods_arbo = $object->get_arbo_each_prod();
 
 		$tmpid = $id;
-		if (! empty($conf->use_javascript_ajax)) {
+		if (!empty($conf->use_javascript_ajax)) {
 			$nboflines = $prods_arbo;
 			$table_element_line='product_association';
 
diff --git a/htdocs/product/inventory/card.php b/htdocs/product/inventory/card.php
index 47404ba4f04..796470c469c 100644
--- a/htdocs/product/inventory/card.php
+++ b/htdocs/product/inventory/card.php
@@ -313,7 +313,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 	// Thirdparty
 	$morehtmlref.='<br>'.$langs->trans('ThirdParty') . ' : ' . $soc->getNomUrl(1);
 	// Project
-	if (! empty($conf->project->enabled))
+	if (!empty($conf->project->enabled))
 	{
 		$langs->load("projects");
 		$morehtmlref.='<br>'.$langs->trans('Project') . ' ';
@@ -335,7 +335,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 				}
 			}
 		} else {
-			if (! empty($object->fk_project)) {
+			if (!empty($object->fk_project)) {
 				$proj = new Project($db);
 				$proj->fetch($object->fk_project);
 				$morehtmlref .= $proj->getNomUrl();
diff --git a/htdocs/product/inventory/class/inventory.class.php b/htdocs/product/inventory/class/inventory.class.php
index f00f90e120b..281d58ea99e 100644
--- a/htdocs/product/inventory/class/inventory.class.php
+++ b/htdocs/product/inventory/class/inventory.class.php
@@ -488,7 +488,7 @@ class Inventory extends CommonObject
 	public function fetch($id, $ref = null)
 	{
 		$result = $this->fetchCommon($id, $ref);
-		//if ($result > 0 && ! empty($this->table_element_line)) $this->fetchLines();
+		//if ($result > 0 && !empty($this->table_element_line)) $this->fetchLines();
 		return $result;
 	}
 
@@ -815,7 +815,7 @@ class InventoryLine extends CommonObjectLine
 	public function fetch($id, $ref = null)
 	{
 		$result = $this->fetchCommon($id, $ref);
-		//if ($result > 0 && ! empty($this->table_element_line)) $this->fetchLines();
+		//if ($result > 0 && !empty($this->table_element_line)) $this->fetchLines();
 		return $result;
 	}
 
diff --git a/htdocs/product/inventory/inventory.php b/htdocs/product/inventory/inventory.php
index c1ef43c5c02..be7512df6fc 100644
--- a/htdocs/product/inventory/inventory.php
+++ b/htdocs/product/inventory/inventory.php
@@ -494,7 +494,7 @@ if ($object->id > 0) {
 	// Thirdparty
 	$morehtmlref.='<br>'.$langs->trans('ThirdParty') . ' : ' . $soc->getNomUrl(1);
 	// Project
-	if (! empty($conf->project->enabled))
+	if (!empty($conf->project->enabled))
 	{
 		$langs->load("projects");
 		$morehtmlref.='<br>'.$langs->trans('Project') . ' ';
@@ -516,7 +516,7 @@ if ($object->id > 0) {
 				}
 			}
 		} else {
-			if (! empty($object->fk_project)) {
+			if (!empty($object->fk_project)) {
 				$proj = new Project($db);
 				$proj->fetch($object->fk_project);
 				$morehtmlref.=$proj->getNomUrl();
@@ -1058,9 +1058,9 @@ if ($object->id > 0) {
 					$hasinput = true;
 				}
 
-				if (! empty($conf->global->INVENTORY_MANAGE_REAL_PMP)) {
+				if (!empty($conf->global->INVENTORY_MANAGE_REAL_PMP)) {
 					//PMP Expected
-					if (! empty($obj->pmp_expected)) $pmp_expected = $obj->pmp_expected;
+					if (!empty($obj->pmp_expected)) $pmp_expected = $obj->pmp_expected;
 					else $pmp_expected = $product_static->pmp;
 					$pmp_valuation = $pmp_expected * $valuetoshow;
 					print '<td class="right">';
@@ -1082,7 +1082,7 @@ if ($object->id > 0) {
 					print '<td class="right">';
 
 
-					if (! empty($obj->pmp_real)) $pmp_real = $obj->pmp_real;
+					if (!empty($obj->pmp_real)) $pmp_real = $obj->pmp_real;
 					else $pmp_real = $product_static->pmp;
 					$pmp_valuation_real = $pmp_real * $qty_view;
 					print '<input type="text" class="maxwidth75 right realpmp'.$obj->fk_product.'" name="realpmp_'.$obj->rowid.'" id="id_'.$obj->rowid.'_input_pmp" value="'.price2num($pmp_real).'">';
@@ -1111,7 +1111,7 @@ if ($object->id > 0) {
 			} else {
 				if (!empty($conf->global->INVENTORY_MANAGE_REAL_PMP)) {
 					//PMP Expected
-					if (! empty($obj->pmp_expected)) $pmp_expected = $obj->pmp_expected;
+					if (!empty($obj->pmp_expected)) $pmp_expected = $obj->pmp_expected;
 					else $pmp_expected = $product_static->pmp;
 					$pmp_valuation = $pmp_expected * $valuetoshow;
 					print '<td class="right">';
@@ -1127,7 +1127,7 @@ if ($object->id > 0) {
 
 					//PMP Real
 					print '<td class="right">';
-					if (! empty($obj->pmp_real)) $pmp_real = $obj->pmp_real;
+					if (!empty($obj->pmp_real)) $pmp_real = $obj->pmp_real;
 					else $pmp_real = $product_static->pmp;
 					$pmp_valuation_real = $pmp_real * $obj->qty_view;
 					print price($pmp_real);
@@ -1190,7 +1190,7 @@ if ($object->id > 0) {
 	print '</form>';
 
 
-	if (! empty($conf->global->INVENTORY_MANAGE_REAL_PMP)) {
+	if (!empty($conf->global->INVENTORY_MANAGE_REAL_PMP)) {
 		?>
 		<script type="text/javascript">
 			$('.realqty').on('change', function () {
diff --git a/htdocs/product/inventory/list.php b/htdocs/product/inventory/list.php
index 00f440f1990..793fedd3a2d 100644
--- a/htdocs/product/inventory/list.php
+++ b/htdocs/product/inventory/list.php
@@ -329,7 +329,7 @@ foreach($object->fields as $key => $val)
 	$sql .= "t.".$key.", ";
 }
 // Add fields from extrafields
-if (! empty($extrafields->attributes[$object->table_element]['label'])) {
+if (!empty($extrafields->attributes[$object->table_element]['label'])) {
 	foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val) $sql.=($extrafields->attributes[$object->table_element]['type'][$key] != 'separate' ? "ef.".$key.', ' : '');
 }
 // Add where from hooks
diff --git a/htdocs/product/list.php b/htdocs/product/list.php
index 6028a0a871d..d24b4e0d12b 100644
--- a/htdocs/product/list.php
+++ b/htdocs/product/list.php
@@ -208,7 +208,7 @@ $alias_product_perentity = empty($conf->global->MAIN_PRODUCT_PERENTITY_SHARED) ?
 $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'=>"Ref", 'checked'=>1, 'position'=>10),
-	//'pfp.ref_fourn'=>array('label'=>$langs->trans("RefSupplier"), 'checked'=>1, 'enabled'=>(! empty($conf->barcode->enabled))),
+	//'pfp.ref_fourn'=>array('label'=>$langs->trans("RefSupplier"), 'checked'=>1, 'enabled'=>(!empty($conf->barcode->enabled))),
 	'thumbnail'=>array('label'=>'Photo', '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),
@@ -1646,7 +1646,7 @@ if ($resql) {
 
 
 		// Multiprices
-		if (! empty($conf->global->PRODUIT_MULTIPRICES)) {
+		if (!empty($conf->global->PRODUIT_MULTIPRICES)) {
 			if (! isset($productpricescache)) {
 				$productpricescache=array();
 			}
diff --git a/htdocs/product/stock/movement_list.php b/htdocs/product/stock/movement_list.php
index d2639000270..b0f83cae0ec 100644
--- a/htdocs/product/stock/movement_list.php
+++ b/htdocs/product/stock/movement_list.php
@@ -1098,7 +1098,7 @@ if (!empty($arrayfields['m.rowid']['checked'])) {
 	print '<input class="flat maxwidth25" type="text" name="search_ref" value="'.dol_escape_htmltag($search_ref).'">';
 	print '</td>';
 }
-if (! empty($arrayfields['m.datem']['checked'])) {
+if (!empty($arrayfields['m.datem']['checked'])) {
 	// Date
 	print '<td class="liste_titre center">';
 	print '<div class="nowrap">';
diff --git a/htdocs/product/stock/productlot_list.php b/htdocs/product/stock/productlot_list.php
index ba6b81abd79..ed0c62564c6 100644
--- a/htdocs/product/stock/productlot_list.php
+++ b/htdocs/product/stock/productlot_list.php
@@ -285,7 +285,7 @@ foreach($object->fields as $key => $val) {
 	$sql .= "t.".$db->escape($key).", ";
 }
 // Add fields from extrafields
-if (! empty($extrafields->attributes[$object->table_element]['label'])) {
+if (!empty($extrafields->attributes[$object->table_element]['label'])) {
 	foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val) {
 		$sql .= ($extrafields->attributes[$object->table_element]['type'][$key] != 'separate' ? "ef.".$key.', ' : '');
 	}
diff --git a/htdocs/product/stock/stocktransfer/class/stocktransfer.class.php b/htdocs/product/stock/stocktransfer/class/stocktransfer.class.php
index fbf66d90468..d0f27eb46f4 100644
--- a/htdocs/product/stock/stocktransfer/class/stocktransfer.class.php
+++ b/htdocs/product/stock/stocktransfer/class/stocktransfer.class.php
@@ -541,8 +541,8 @@ class StockTransfer extends CommonObject
 			return 0;
 		}
 
-		/*if (! ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->stocktransfer->stocktransfer->write))
-		 || (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->stocktransfer->stocktransfer->stocktransfer_advance->validate))))
+		/*if (! ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->stocktransfer->stocktransfer->write))
+		 || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->stocktransfer->stocktransfer->stocktransfer_advance->validate))))
 		 {
 		 $this->error='NotEnoughPermissions';
 		 dol_syslog(get_class($this)."::valid ".$this->error, LOG_ERR);
@@ -651,8 +651,8 @@ class StockTransfer extends CommonObject
 			return 0;
 		}
 
-		/*if (! ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->stocktransfer->write))
-		 || (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->stocktransfer->stocktransfer_advance->validate))))
+		/*if (! ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->stocktransfer->write))
+		 || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->stocktransfer->stocktransfer_advance->validate))))
 		 {
 		 $this->error='Permission denied';
 		 return -1;
@@ -675,8 +675,8 @@ class StockTransfer extends CommonObject
 			return 0;
 		}
 
-		/*if (! ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->stocktransfer->write))
-		 || (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->stocktransfer->stocktransfer_advance->validate))))
+		/*if (! ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->stocktransfer->write))
+		 || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->stocktransfer->stocktransfer_advance->validate))))
 		 {
 		 $this->error='Permission denied';
 		 return -1;
@@ -699,8 +699,8 @@ class StockTransfer extends CommonObject
 			return 0;
 		}
 
-		/*if (! ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->stocktransfer->write))
-		 || (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->stocktransfer->stocktransfer_advance->validate))))
+		/*if (! ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->stocktransfer->write))
+		 || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->stocktransfer->stocktransfer_advance->validate))))
 		 {
 		 $this->error='Permission denied';
 		 return -1;
diff --git a/htdocs/product/stock/stocktransfer/class/stocktransferline.class.php b/htdocs/product/stock/stocktransfer/class/stocktransferline.class.php
index 0495dada008..a5d49dcc3a7 100644
--- a/htdocs/product/stock/stocktransfer/class/stocktransferline.class.php
+++ b/htdocs/product/stock/stocktransfer/class/stocktransferline.class.php
@@ -562,8 +562,8 @@ class StockTransferLine extends CommonObjectLine
 			return 0;
 		}
 
-		/*if (! ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->stocktransfer->stocktransferline->write))
-		 || (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->stocktransfer->stocktransferline->stocktransferline_advance->validate))))
+		/*if (! ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->stocktransfer->stocktransferline->write))
+		 || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->stocktransfer->stocktransferline->stocktransferline_advance->validate))))
 		 {
 		 $this->error='NotEnoughPermissions';
 		 dol_syslog(get_class($this)."::valid ".$this->error, LOG_ERR);
@@ -672,8 +672,8 @@ class StockTransferLine extends CommonObjectLine
 			return 0;
 		}
 
-		/*if (! ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->stocktransfer->write))
-		 || (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->stocktransfer->stocktransfer_advance->validate))))
+		/*if (! ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->stocktransfer->write))
+		 || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->stocktransfer->stocktransfer_advance->validate))))
 		 {
 		 $this->error='Permission denied';
 		 return -1;
@@ -696,8 +696,8 @@ class StockTransferLine extends CommonObjectLine
 			return 0;
 		}
 
-		/*if (! ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->stocktransfer->write))
-		 || (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->stocktransfer->stocktransfer_advance->validate))))
+		/*if (! ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->stocktransfer->write))
+		 || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->stocktransfer->stocktransfer_advance->validate))))
 		 {
 		 $this->error='Permission denied';
 		 return -1;
@@ -720,8 +720,8 @@ class StockTransferLine extends CommonObjectLine
 			return 0;
 		}
 
-		/*if (! ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->stocktransfer->write))
-		 || (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->stocktransfer->stocktransfer_advance->validate))))
+		/*if (! ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->stocktransfer->write))
+		 || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->stocktransfer->stocktransfer_advance->validate))))
 		 {
 		 $this->error='Permission denied';
 		 return -1;
diff --git a/htdocs/product/stock/stocktransfer/stocktransfer_agenda.php b/htdocs/product/stock/stocktransfer/stocktransfer_agenda.php
index 5396e87d142..6d09dd03b44 100644
--- a/htdocs/product/stock/stocktransfer/stocktransfer_agenda.php
+++ b/htdocs/product/stock/stocktransfer/stocktransfer_agenda.php
@@ -111,7 +111,7 @@ $form = new Form($db);
 
 if ($object->id > 0) {
 	$title = $langs->trans("Agenda");
-	//if (! empty($conf->global->MAIN_HTML_TITLE) && preg_match('/thirdpartynameonly/',$conf->global->MAIN_HTML_TITLE) && $object->name) $title=$object->name." - ".$title;
+	//if (!empty($conf->global->MAIN_HTML_TITLE) && preg_match('/thirdpartynameonly/',$conf->global->MAIN_HTML_TITLE) && $object->name) $title=$object->name." - ".$title;
 	$help_url = '';
 	llxHeader('', $title, $help_url);
 
@@ -133,7 +133,7 @@ if ($object->id > 0) {
 	// Thirdparty
 	$morehtmlref.='<br>'.$langs->trans('ThirdParty') . ' : ' . (is_object($object->thirdparty) ? $object->thirdparty->getNomUrl(1) : '');
 	// Project
-	if (! empty($conf->project->enabled))
+	if (!empty($conf->project->enabled))
 	{
 		$langs->load("projects");
 		$morehtmlref.='<br>'.$langs->trans('Project') . ' ';
@@ -154,7 +154,7 @@ if ($object->id > 0) {
 				$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
 			}
 		} else {
-			if (! empty($object->fk_project)) {
+			if (!empty($object->fk_project)) {
 				$proj = new Project($db);
 				$proj->fetch($object->fk_project);
 				$morehtmlref .= ': '.$proj->getNomUrl();
diff --git a/htdocs/product/stock/stocktransfer/stocktransfer_card.php b/htdocs/product/stock/stocktransfer/stocktransfer_card.php
index f9f02aea384..921ee89758a 100644
--- a/htdocs/product/stock/stocktransfer/stocktransfer_card.php
+++ b/htdocs/product/stock/stocktransfer/stocktransfer_card.php
@@ -562,7 +562,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 		$morehtmlref .= $langs->trans('ThirdParty') . ' : ' . (is_object($object->thirdparty) ? $object->thirdparty->getNomUrl(1) : '').'<br>';
 	}
 	// Project
-	if (! empty($conf->project->enabled)) {
+	if (!empty($conf->project->enabled)) {
 		$langs->load("projects");
 		$morehtmlref.=$langs->trans('Project') . ' ';
 		if ($permissiontoadd) {
@@ -580,7 +580,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 				$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
 			}
 		} else {
-			if (! empty($object->fk_project)) {
+			if (!empty($object->fk_project)) {
 				$proj = new Project($db);
 				$proj->fetch($object->fk_project);
 				$morehtmlref .= ': '.$proj->getNomUrl();
diff --git a/htdocs/product/stock/stocktransfer/stocktransfer_document.php b/htdocs/product/stock/stocktransfer/stocktransfer_document.php
index b196601d387..68233cd358f 100644
--- a/htdocs/product/stock/stocktransfer/stocktransfer_document.php
+++ b/htdocs/product/stock/stocktransfer/stocktransfer_document.php
@@ -63,7 +63,7 @@ $extrafields->fetch_name_optionals_label($object->table_element);
 // Load object
 include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be include, not include_once  // Must be include, not include_once. Include fetch and fetch_thirdparty but not fetch_optionals
 
-//if ($id > 0 || ! empty($ref)) $upload_dir = $conf->stocktransfer->multidir_output[$object->entity?$object->entity:$conf->entity] . "/stocktransfer/" . dol_sanitizeFileName($object->id);
+//if ($id > 0 || !empty($ref)) $upload_dir = $conf->stocktransfer->multidir_output[$object->entity?$object->entity:$conf->entity] . "/stocktransfer/" . dol_sanitizeFileName($object->id);
 if ($id > 0 || !empty($ref)) $upload_dir = $conf->stocktransfer->multidir_output[$object->entity ? $object->entity : $conf->entity]."/stocktransfer/".dol_sanitizeFileName($object->ref);
 
 // Security check - Protection if external user
@@ -121,7 +121,7 @@ if ($object->id) {
 	 // Thirdparty
 	 $morehtmlref.='<br>'.$langs->trans('ThirdParty') . ' : ' . (is_object($object->thirdparty) ? $object->thirdparty->getNomUrl(1) : '');
 	 // Project
-	 if (! empty($conf->project->enabled))
+	 if (!empty($conf->project->enabled))
 	 {
 	 $langs->load("projects");
 	 $morehtmlref.='<br>'.$langs->trans('Project') . ' ';
@@ -142,7 +142,7 @@ if ($object->id) {
 	 $morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
 	 }
 	 } else {
-	 if (! empty($object->fk_project)) {
+	 if (!empty($object->fk_project)) {
 	 $proj = new Project($db);
 	 $proj->fetch($object->fk_project);
 	 $morehtmlref .= ': '.$proj->getNomUrl();
diff --git a/htdocs/product/stock/stocktransfer/stocktransfer_list.php b/htdocs/product/stock/stocktransfer/stocktransfer_list.php
index a2c726ca83b..6b9d98a63b9 100644
--- a/htdocs/product/stock/stocktransfer/stocktransfer_list.php
+++ b/htdocs/product/stock/stocktransfer/stocktransfer_list.php
@@ -218,7 +218,7 @@ foreach($object->fields as $key => $val)
 	$sql.="t.".$key.", ";
 }
 // Add fields from extrafields
-if (! empty($extrafields->attributes[$object->table_element]['label'])) {
+if (!empty($extrafields->attributes[$object->table_element]['label'])) {
 	foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val) $sql.=($extrafields->attributes[$object->table_element]['type'][$key] != 'separate' ? "ef.".$key.', ' : '');
 }
 // Add where from hooks
diff --git a/htdocs/product/stock/stocktransfer/stocktransfer_note.php b/htdocs/product/stock/stocktransfer/stocktransfer_note.php
index 18c192fe44c..5df73f02e73 100644
--- a/htdocs/product/stock/stocktransfer/stocktransfer_note.php
+++ b/htdocs/product/stock/stocktransfer/stocktransfer_note.php
@@ -94,7 +94,7 @@ if ($id > 0 || !empty($ref)) {
 	 // Thirdparty
 	 $morehtmlref.='<br>'.$langs->trans('ThirdParty') . ' : ' . (is_object($object->thirdparty) ? $object->thirdparty->getNomUrl(1) : '');
 	 // Project
-	 if (! empty($conf->project->enabled))
+	 if (!empty($conf->project->enabled))
 	 {
 	 $langs->load("projects");
 	 $morehtmlref.='<br>'.$langs->trans('Project') . ' ';
@@ -115,7 +115,7 @@ if ($id > 0 || !empty($ref)) {
 	 $morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
 	 }
 	 } else {
-	 if (! empty($object->fk_project)) {
+	 if (!empty($object->fk_project)) {
 	 $proj = new Project($db);
 	 $proj->fetch($object->fk_project);
 	 $morehtmlref .= ': '.$proj->getNomUrl();
diff --git a/htdocs/projet/activity/perday.php b/htdocs/projet/activity/perday.php
index c191b3baeaa..0854dceee67 100644
--- a/htdocs/projet/activity/perday.php
+++ b/htdocs/projet/activity/perday.php
@@ -494,7 +494,7 @@ print '<div class="clearboth" style="padding-bottom: 20px;"></div>';
 $moreforfilter = '';
 
 // Filter on categories
-/*if (! empty($conf->categorie->enabled))
+/*if (!empty($conf->categorie->enabled))
 {
 	require_once DOL_DOCUMENT_ROOT . '/categories/class/categorie.class.php';
 	$moreforfilter.='<div class="divsearchfield">';
diff --git a/htdocs/projet/activity/permonth.php b/htdocs/projet/activity/permonth.php
index 79ee8c6172e..ead8d24550f 100644
--- a/htdocs/projet/activity/permonth.php
+++ b/htdocs/projet/activity/permonth.php
@@ -407,7 +407,7 @@ $moreforfilter = '';
 
 // Filter on categories
 /*
-if (! empty($conf->categorie->enabled))
+if (!empty($conf->categorie->enabled))
 {
 	require_once DOL_DOCUMENT_ROOT . '/categories/class/categorie.class.php';
 	$moreforfilter.='<div class="divsearchfield">';
diff --git a/htdocs/projet/activity/perweek.php b/htdocs/projet/activity/perweek.php
index 0b6f23c3bf6..e7bc897db5a 100644
--- a/htdocs/projet/activity/perweek.php
+++ b/htdocs/projet/activity/perweek.php
@@ -135,7 +135,7 @@ $arrayfields['timeconsumed'] = array('label'=>'TimeConsumed', 'checked'=>1, 'ena
 /*foreach($object->fields as $key => $val)
  {
  // If $val['visible']==0, then we never show the field
- if (! empty($val['visible'])) $arrayfields['t.'.$key]=array('label'=>$val['label'], 'checked'=>(($val['visible']<0)?0:1), 'enabled'=>$val['enabled'], 'position'=>$val['position']);
+ if (!empty($val['visible'])) $arrayfields['t.'.$key]=array('label'=>$val['label'], 'checked'=>(($val['visible']<0)?0:1), 'enabled'=>$val['enabled'], 'position'=>$val['position']);
  }*/
 // Definition of fields for list
 // Extra fields
@@ -544,7 +544,7 @@ $moreforfilter = '';
 
 // Filter on categories
 /*
- if (! empty($conf->categorie->enabled))
+ if (!empty($conf->categorie->enabled))
  {
  require_once DOL_DOCUMENT_ROOT . '/categories/class/categorie.class.php';
  $moreforfilter.='<div class="divsearchfield">';
diff --git a/htdocs/projet/card.php b/htdocs/projet/card.php
index 8008ed4780f..4c70278fd1e 100644
--- a/htdocs/projet/card.php
+++ b/htdocs/projet/card.php
@@ -1275,7 +1275,7 @@ if ($action == 'create' && $user->rights->projet->creer) {
 	if (empty($reshook)) {
 		if ($action != "edit" && $action != 'presend') {
 			// Create event
-			/*if ($conf->agenda->enabled && ! empty($conf->global->MAIN_ADD_EVENT_ON_ELEMENT_CARD)) 				// Add hidden condition because this is not a
+			/*if ($conf->agenda->enabled && !empty($conf->global->MAIN_ADD_EVENT_ON_ELEMENT_CARD)) 				// Add hidden condition because this is not a
 				// "workflow" action so should appears somewhere else on
 				// page.
 			{
diff --git a/htdocs/projet/class/task.class.php b/htdocs/projet/class/task.class.php
index 52dd2aae311..48b0b63e31a 100644
--- a/htdocs/projet/class/task.class.php
+++ b/htdocs/projet/class/task.class.php
@@ -1207,7 +1207,7 @@ class Task extends CommonObjectLine
 			$this->timespent_datehour = $this->timespent_date;
 		}
 
-		if (! empty($conf->global->PROJECT_TIMESHEET_PREVENT_AFTER_MONTHS)) {
+		if (!empty($conf->global->PROJECT_TIMESHEET_PREVENT_AFTER_MONTHS)) {
 			require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
 			$restrictBefore = dol_time_plus_duree(dol_now(), - $conf->global->PROJECT_TIMESHEET_PREVENT_AFTER_MONTHS, 'm');
 
@@ -1680,7 +1680,7 @@ class Task extends CommonObjectLine
 			$this->timespent_note = trim($this->timespent_note);
 		}
 
-		if (! empty($conf->global->PROJECT_TIMESHEET_PREVENT_AFTER_MONTHS)) {
+		if (!empty($conf->global->PROJECT_TIMESHEET_PREVENT_AFTER_MONTHS)) {
 			require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
 			$restrictBefore = dol_time_plus_duree(dol_now(), - $conf->global->PROJECT_TIMESHEET_PREVENT_AFTER_MONTHS, 'm');
 
@@ -1776,7 +1776,7 @@ class Task extends CommonObjectLine
 
 		$error = 0;
 
-		if (! empty($conf->global->PROJECT_TIMESHEET_PREVENT_AFTER_MONTHS)) {
+		if (!empty($conf->global->PROJECT_TIMESHEET_PREVENT_AFTER_MONTHS)) {
 			require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
 			$restrictBefore = dol_time_plus_duree(dol_now(), - $conf->global->PROJECT_TIMESHEET_PREVENT_AFTER_MONTHS, 'm');
 
diff --git a/htdocs/projet/tasks/list.php b/htdocs/projet/tasks/list.php
index a25b44082a0..f958a3b217c 100644
--- a/htdocs/projet/tasks/list.php
+++ b/htdocs/projet/tasks/list.php
@@ -1376,7 +1376,7 @@ while ($i < $imaxinloop) {
 				}
 			}
 			// Status
-			/*if (! empty($arrayfields['p.fk_statut']['checked']))
+			/*if (!empty($arrayfields['p.fk_statut']['checked']))
 			{
 				$projectstatic->statut = $obj->fk_statut;
 				print '<td class="right">'.$projectstatic->getLibStatut(5).'</td>';
diff --git a/htdocs/projet/tasks/time.php b/htdocs/projet/tasks/time.php
index c1152510cca..28e641a4877 100644
--- a/htdocs/projet/tasks/time.php
+++ b/htdocs/projet/tasks/time.php
@@ -771,7 +771,7 @@ if ($action == 'confirm_generateinter') {
 		$tmpinter->socid = $projectstatic->thirdparty->id;
 		$tmpinter->date = dol_mktime(GETPOST('rehour', 'int'), GETPOST('remin', 'int'), GETPOST('resec', 'int'), GETPOST('remonth', 'int'), GETPOST('reday', 'int'), GETPOST('reyear', 'int'));
 		$tmpinter->fk_project = $projectstatic->id;
-		$tmpinter->description = $projectstatic->title . ( ! empty($projectstatic->description) ? '-' . $projectstatic->label : '' );
+		$tmpinter->description = $projectstatic->title . ( !empty($projectstatic->description) ? '-' . $projectstatic->label : '' );
 
 		if ($interToUse) {
 			$tmpinter->fetch($interToUse);
@@ -804,7 +804,7 @@ if ($action == 'confirm_generateinter') {
 				$qtyhourtext = convertSecondToTime($value['timespent'], 'all', $conf->global->MAIN_DURATION_OF_WORKDAY);
 
 				// Add lines
-				$lineid = $tmpinter->addline($user, $tmpinter->id, $ftask->label . ( ! empty($value['note']) ? ' - ' . $value['note'] : '' ), $value['date'], $value['timespent']);
+				$lineid = $tmpinter->addline($user, $tmpinter->id, $ftask->label . ( !empty($value['note']) ? ' - ' . $value['note'] : '' ), $value['date'], $value['timespent']);
 			}
 		}
 
@@ -1059,7 +1059,7 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0 || $allprojectforuser
 				//'builddoc'=>$langs->trans("PDFMerge"),
 			);
 		}
-		if ( ! empty($conf->ficheinter->enabled) && $user->rights->ficheinter->creer) {
+		if ( !empty($conf->ficheinter->enabled) && $user->rights->ficheinter->creer) {
 			$langs->load("interventions");
 			$arrayofmassactions['generateinter'] = $langs->trans("GenerateInter");
 		}
diff --git a/htdocs/public/opensurvey/studs.php b/htdocs/public/opensurvey/studs.php
index acf1fb01b56..4853eec496e 100644
--- a/htdocs/public/opensurvey/studs.php
+++ b/htdocs/public/opensurvey/studs.php
@@ -695,7 +695,7 @@ if ($object->allow_spy) {
 		print '<tr>'."\n";
 		print '<td class="somme"></td>'."\n";
 		for ($i = 0; $i < $nbcolonnes; $i++) {
-			//print 'xx'.(! empty($listofanswers[$i]['format'])).'-'.$sumfor[$i].'-'.$meilleurecolonne;
+			//print 'xx'.(!empty($listofanswers[$i]['format'])).'-'.$sumfor[$i].'-'.$meilleurecolonne;
 			if (empty($listofanswers[$i]['format']) || !in_array($listofanswers[$i]['format'], array('yesno', 'foragainst')) && isset($sumfor[$i]) && isset($meilleurecolonne) && $sumfor[$i] == $meilleurecolonne) {
 				print '<td class="somme"><img src="'.dol_buildpath('/opensurvey/img/medaille.png', 1).'"></td>'."\n";
 			} else {
diff --git a/htdocs/public/payment/newpayment.php b/htdocs/public/payment/newpayment.php
index 426d02e2eb9..e75435a8b3f 100644
--- a/htdocs/public/payment/newpayment.php
+++ b/htdocs/public/payment/newpayment.php
@@ -618,9 +618,9 @@ if ($action == 'charge' && !empty($conf->stripe->enabled)) {
 
 				// Create the VAT record in Stripe
 				/* We don't know country of customer, so we can't create tax
-				if (! empty($conf->global->STRIPE_SAVE_TAX_IDS))	// We setup to save Tax info on Stripe side. Warning: This may result in error when saving customer
+				if (!empty($conf->global->STRIPE_SAVE_TAX_IDS))	// We setup to save Tax info on Stripe side. Warning: This may result in error when saving customer
 				{
-					if (! empty($vatcleaned))
+					if (!empty($vatcleaned))
 					{
 						$isineec=isInEEC($object);
 						if ($object->country_code && $isineec)
@@ -2227,7 +2227,7 @@ if (preg_match('/^dopayment/', $action)) {			// If we choosed/click on the payme
 		// $conf->global->STRIPE_USE_INTENT_WITH_AUTOMATIC_CONFIRMATION = 1 = use intent (default value)
 		// $conf->global->STRIPE_USE_INTENT_WITH_AUTOMATIC_CONFIRMATION = 2 = use payment
 
-		//if (empty($conf->global->STRIPE_USE_INTENT_WITH_AUTOMATIC_CONFIRMATION) || ! empty($paymentintent))
+		//if (empty($conf->global->STRIPE_USE_INTENT_WITH_AUTOMATIC_CONFIRMATION) || !empty($paymentintent))
 		//{
 		print '
         <table id="dolpaymenttable" summary="Payment form" class="center centpercent">
diff --git a/htdocs/reception/card.php b/htdocs/reception/card.php
index 6ca72ea2d97..5f49f18a23a 100644
--- a/htdocs/reception/card.php
+++ b/htdocs/reception/card.php
@@ -465,7 +465,7 @@ if (empty($reshook)) {
 		}
 
 		// TODO add alternative status
-		/*} elseif ($action == 'reopen' && (! empty($user->rights->reception->creer) || ! empty($user->rights->reception->reception_advance->validate))) {
+		/*} elseif ($action == 'reopen' && (!empty($user->rights->reception->creer) || !empty($user->rights->reception->reception_advance->validate))) {
 			$result = $object->setStatut(0);
 			if ($result < 0) {
 				setEventMessages($object->error, $object->errors, 'errors');
@@ -2103,7 +2103,7 @@ if ($action == 'create') {
 			// Create bill
 			if (((isModEnabled("fournisseur") && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD)) || isModEnabled("supplier_invoice")) && ($object->statut == Reception::STATUS_VALIDATED || $object->statut == Reception::STATUS_CLOSED)) {
 				if ($user->rights->fournisseur->facture->creer || $user->rights->supplier_invoice->creer) {
-					// TODO show button only   if (! empty($conf->global->WORKFLOW_BILL_ON_RECEPTION))
+					// TODO show button only   if (!empty($conf->global->WORKFLOW_BILL_ON_RECEPTION))
 					// If we do that, we must also make this option official.
 					print '<a class="butAction" href="'.DOL_URL_ROOT.'/fourn/facture/card.php?action=create&amp;origin='.$object->element.'&amp;originid='.$object->id.'&amp;socid='.$object->socid.'">'.$langs->trans("CreateBill").'</a>';
 				}
diff --git a/htdocs/recruitment/class/recruitmentcandidature.class.php b/htdocs/recruitment/class/recruitmentcandidature.class.php
index 849ac400066..4632d90fee6 100644
--- a/htdocs/recruitment/class/recruitmentcandidature.class.php
+++ b/htdocs/recruitment/class/recruitmentcandidature.class.php
@@ -496,8 +496,8 @@ class RecruitmentCandidature extends CommonObject
 			return 0;
 		}
 
-		/*if (! ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->recruitment->recruitmentcandidature->write))
-		 || (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->recruitment->recruitmentcandidature->recruitmentcandidature_advance->validate))))
+		/*if (! ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->recruitment->recruitmentcandidature->write))
+		 || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->recruitment->recruitmentcandidature->recruitmentcandidature_advance->validate))))
 		 {
 		 $this->error='NotEnoughPermissions';
 		 dol_syslog(get_class($this)."::valid ".$this->error, LOG_ERR);
@@ -614,8 +614,8 @@ class RecruitmentCandidature extends CommonObject
 			return 0;
 		}
 
-		/*if (! ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->recruitment->write))
-		 || (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->recruitment->recruitment_advance->validate))))
+		/*if (! ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->recruitment->write))
+		 || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->recruitment->recruitment_advance->validate))))
 		 {
 		 $this->error='Permission denied';
 		 return -1;
@@ -638,8 +638,8 @@ class RecruitmentCandidature extends CommonObject
 			return 0;
 		}
 
-		/*if (! ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->recruitment->write))
-		 || (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->recruitment->recruitment_advance->validate))))
+		/*if (! ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->recruitment->write))
+		 || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->recruitment->recruitment_advance->validate))))
 		 {
 		 $this->error='Permission denied';
 		 return -1;
@@ -662,8 +662,8 @@ class RecruitmentCandidature extends CommonObject
 			return 0;
 		}
 
-		/*if (! ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->recruitment->write))
-		 || (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->recruitment->recruitment_advance->validate))))
+		/*if (! ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->recruitment->write))
+		 || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->recruitment->recruitment_advance->validate))))
 		 {
 		 $this->error='Permission denied';
 		 return -1;
diff --git a/htdocs/recruitment/class/recruitmentjobposition.class.php b/htdocs/recruitment/class/recruitmentjobposition.class.php
index 9d97ab856e0..f95eb6682e3 100644
--- a/htdocs/recruitment/class/recruitmentjobposition.class.php
+++ b/htdocs/recruitment/class/recruitmentjobposition.class.php
@@ -498,8 +498,8 @@ class RecruitmentJobPosition extends CommonObject
 			return 0;
 		}
 
-		/*if (! ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->recruitmentjobposition->create))
-		 || (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->recruitmentjobposition->recruitmentjobposition_advance->validate))))
+		/*if (! ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->recruitmentjobposition->create))
+		 || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->recruitmentjobposition->recruitmentjobposition_advance->validate))))
 		 {
 		 $this->error='NotEnoughPermissions';
 		 dol_syslog(get_class($this)."::valid ".$this->error, LOG_ERR);
@@ -616,8 +616,8 @@ class RecruitmentJobPosition extends CommonObject
 			return 0;
 		}
 
-		/*if (! ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->recruitment->write))
-		 || (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->recruitment->recruitment_advance->validate))))
+		/*if (! ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->recruitment->write))
+		 || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->recruitment->recruitment_advance->validate))))
 		 {
 		 $this->error='Permission denied';
 		 return -1;
@@ -640,8 +640,8 @@ class RecruitmentJobPosition extends CommonObject
 			return 0;
 		}
 
-		/*if (! ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->recruitment->write))
-		 || (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->recruitment->recruitment_advance->validate))))
+		/*if (! ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->recruitment->write))
+		 || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->recruitment->recruitment_advance->validate))))
 		 {
 		 $this->error='Permission denied';
 		 return -1;
@@ -757,8 +757,8 @@ class RecruitmentJobPosition extends CommonObject
 			return 0;
 		}
 
-		/*if (! ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->recruitment->write))
-		 || (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->recruitment->recruitment_advance->validate))))
+		/*if (! ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->recruitment->write))
+		 || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->recruitment->recruitment_advance->validate))))
 		 {
 		 $this->error='Permission denied';
 		 return -1;
diff --git a/htdocs/recruitment/index.php b/htdocs/recruitment/index.php
index d8c037a22a9..f34334c2df6 100644
--- a/htdocs/recruitment/index.php
+++ b/htdocs/recruitment/index.php
@@ -242,7 +242,7 @@ print '<br>';
 
 /* BEGIN MODULEBUILDER DRAFT MYOBJECT
 // Draft MyObject
-if (! empty($conf->recruitment->enabled) && $user->rights->recruitment->read)
+if (!empty($conf->recruitment->enabled) && $user->rights->recruitment->read)
 {
 	$langs->load("orders");
 
diff --git a/htdocs/recruitment/recruitmentcandidature_agenda.php b/htdocs/recruitment/recruitmentcandidature_agenda.php
index 067a472e1f8..50a79a35872 100644
--- a/htdocs/recruitment/recruitmentcandidature_agenda.php
+++ b/htdocs/recruitment/recruitmentcandidature_agenda.php
@@ -125,7 +125,7 @@ $form = new Form($db);
 
 if ($object->id > 0) {
 	$title = $object->ref." - ".$langs->trans('Agenda');
-	//if (! empty($conf->global->MAIN_HTML_TITLE) && preg_match('/thirdpartynameonly/',$conf->global->MAIN_HTML_TITLE) && $object->name) $title=$object->name." - ".$title;
+	//if (!empty($conf->global->MAIN_HTML_TITLE) && preg_match('/thirdpartynameonly/',$conf->global->MAIN_HTML_TITLE) && $object->name) $title=$object->name." - ".$title;
 	$help_url = 'Module_Agenda_En';
 	llxHeader('', $title, $help_url);
 
@@ -150,7 +150,7 @@ if ($object->id > 0) {
 	$morehtmlref.='<br>'.$langs->trans('ThirdParty') . ' : ' . (is_object($object->thirdparty) ? $object->thirdparty->getNomUrl(1) : '');
 	*/
 	// Project
-	/*if (! empty($conf->project->enabled))
+	/*if (!empty($conf->project->enabled))
 	{
 		$langs->load("projects");
 		$morehtmlref .= $langs->trans('Project') . ' ';
@@ -171,7 +171,7 @@ if ($object->id > 0) {
 				$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
 			}
 		} else {
-			if (! empty($object->fk_project)) {
+			if (!empty($object->fk_project)) {
 				$proj = new Project($db);
 				$proj->fetch($object->fk_project);
 				$morehtmlref .= ': '.$proj->getNomUrl();
diff --git a/htdocs/recruitment/recruitmentcandidature_card.php b/htdocs/recruitment/recruitmentcandidature_card.php
index 0a5bd616fd5..f3d41f9de97 100644
--- a/htdocs/recruitment/recruitmentcandidature_card.php
+++ b/htdocs/recruitment/recruitmentcandidature_card.php
@@ -433,7 +433,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 	 // Thirdparty
 	 $morehtmlref.='<br>'.$langs->trans('ThirdParty') . ' : ' . (is_object($object->thirdparty) ? $object->thirdparty->getNomUrl(1) : '');
 	 // Project
-	 if (! empty($conf->project->enabled))
+	 if (!empty($conf->project->enabled))
 	 {
 	 $langs->load("projects");
 	 $morehtmlref .= '<br>'.$langs->trans('Project') . ' ';
@@ -453,7 +453,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 	 $morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
 	 }
 	 } else {
-	 if (! empty($object->fk_project)) {
+	 if (!empty($object->fk_project)) {
 	 $proj = new Project($db);
 	 $proj->fetch($object->fk_project);
 	 $morehtmlref .= ': '.$proj->getNomUrl();
diff --git a/htdocs/recruitment/recruitmentcandidature_document.php b/htdocs/recruitment/recruitmentcandidature_document.php
index 95ce0210303..f72271a3105 100644
--- a/htdocs/recruitment/recruitmentcandidature_document.php
+++ b/htdocs/recruitment/recruitmentcandidature_document.php
@@ -130,7 +130,7 @@ if ($object->id) {
 	 $morehtmlref.='<br>'.$langs->trans('ThirdParty') . ' : ' . (is_object($object->thirdparty) ? $object->thirdparty->getNomUrl(1) : '');
 	*/
 	// Project
-	/*if (! empty($conf->project->enabled))
+	/*if (!empty($conf->project->enabled))
 	{
 		$langs->load("projects");
 		$morehtmlref .= $langs->trans('Project') . ' ';
@@ -151,7 +151,7 @@ if ($object->id) {
 				$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
 			}
 		} else {
-			if (! empty($object->fk_project)) {
+			if (!empty($object->fk_project)) {
 				$proj = new Project($db);
 				$proj->fetch($object->fk_project);
 				$morehtmlref .= ': '.$proj->getNomUrl();
diff --git a/htdocs/recruitment/recruitmentcandidature_list.php b/htdocs/recruitment/recruitmentcandidature_list.php
index 1e3423dfd6c..2b1126e838f 100644
--- a/htdocs/recruitment/recruitmentcandidature_list.php
+++ b/htdocs/recruitment/recruitmentcandidature_list.php
@@ -290,7 +290,7 @@ foreach ($object->fields as $key => $val) {
 	$sql .= "t.".$db->escape($key).", ";
 }
 // Add fields from extrafields
-if (! empty($extrafields->attributes[$object->table_element]['label'])) {
+if (!empty($extrafields->attributes[$object->table_element]['label'])) {
 	foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val) {
 		$sql.=($extrafields->attributes[$object->table_element]['type'][$key] != 'separate' ? "ef.".$key.', ' : '');
 	}
diff --git a/htdocs/recruitment/recruitmentcandidature_note.php b/htdocs/recruitment/recruitmentcandidature_note.php
index a9a14376b94..ccb6b2a60cc 100644
--- a/htdocs/recruitment/recruitmentcandidature_note.php
+++ b/htdocs/recruitment/recruitmentcandidature_note.php
@@ -104,7 +104,7 @@ if ($id > 0 || !empty($ref)) {
 	 $morehtmlref.='<br>'.$langs->trans('ThirdParty') . ' : ' . (is_object($object->thirdparty) ? $object->thirdparty->getNomUrl(1) : '');
 	*/
 	// Project
-	/*if (! empty($conf->project->enabled))
+	/*if (!empty($conf->project->enabled))
 	{
 		$langs->load("projects");
 		$morehtmlref .= $langs->trans('Project') . ' ';
@@ -125,7 +125,7 @@ if ($id > 0 || !empty($ref)) {
 				$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
 			}
 		} else {
-			if (! empty($object->fk_project)) {
+			if (!empty($object->fk_project)) {
 				$proj = new Project($db);
 				$proj->fetch($object->fk_project);
 				$morehtmlref .= ': '.$proj->getNomUrl();
diff --git a/htdocs/recruitment/recruitmentjobposition_agenda.php b/htdocs/recruitment/recruitmentjobposition_agenda.php
index df6ff2ed6ad..11e54486bfe 100644
--- a/htdocs/recruitment/recruitmentjobposition_agenda.php
+++ b/htdocs/recruitment/recruitmentjobposition_agenda.php
@@ -125,7 +125,7 @@ $form = new Form($db);
 
 if ($object->id > 0) {
 	$title = $object->ref." - ".$langs->trans('Agenda');
-	//if (! empty($conf->global->MAIN_HTML_TITLE) && preg_match('/thirdpartynameonly/',$conf->global->MAIN_HTML_TITLE) && $object->name) $title=$object->name." - ".$title;
+	//if (!empty($conf->global->MAIN_HTML_TITLE) && preg_match('/thirdpartynameonly/',$conf->global->MAIN_HTML_TITLE) && $object->name) $title=$object->name." - ".$title;
 	$help_url = '';
 	llxHeader('', $title, $help_url);
 
diff --git a/htdocs/societe/ajax/ajaxcompanies.php b/htdocs/societe/ajax/ajaxcompanies.php
index cbbcb14f361..d9c9885ecc5 100644
--- a/htdocs/societe/ajax/ajaxcompanies.php
+++ b/htdocs/societe/ajax/ajaxcompanies.php
@@ -125,7 +125,7 @@ if (GETPOST('newcompany') || GETPOST('socid', 'int') || GETPOST('id_fourn', 'int
 	if ($resql) {
 		while ($row = $db->fetch_array($resql)) {
 			$label = '';
-			if (! empty($conf->global->SOCIETE_ADD_REF_IN_LIST)) {
+			if (!empty($conf->global->SOCIETE_ADD_REF_IN_LIST)) {
 				if (($row['client']) && (!empty($row['code_client']))) {
 					$label = $row['code_client'].' - ';
 				}
diff --git a/htdocs/societe/card.php b/htdocs/societe/card.php
index 2467d9959bc..daa0c12b2b7 100644
--- a/htdocs/societe/card.php
+++ b/htdocs/societe/card.php
@@ -59,7 +59,7 @@ if (!empty($conf->accounting->enabled)) {
 if (!empty($conf->accounting->enabled)) {
 	require_once DOL_DOCUMENT_ROOT.'/accountancy/class/accountingaccount.class.php';
 }
-if (! empty($conf->eventorganization->enabled)) {
+if (!empty($conf->eventorganization->enabled)) {
 	require_once DOL_DOCUMENT_ROOT.'/eventorganization/class/conferenceorboothattendee.class.php';
 }
 
@@ -1834,7 +1834,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 		if (!empty($conf->global->ACCOUNTANCY_USE_PRODUCT_ACCOUNT_ON_THIRDPARTY)) {
 			print '<table class="border" width="100%">';
 
-			if (! empty($conf->accounting->enabled)) {
+			if (!empty($conf->accounting->enabled)) {
 				// Accountancy_code_sell
 				print '<tr><td class="titlefieldcreate">'.$langs->trans("ProductAccountancySellCode").'</td>';
 				print '<td>';
@@ -2562,7 +2562,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 				print '<br>';
 				print '<table class="border centpercent">';
 
-				if (! empty($conf->accounting->enabled)) {
+				if (!empty($conf->accounting->enabled)) {
 					// Accountancy_code_sell
 					print '<tr><td class="titlefield">'.$langs->trans("ProductAccountancySellCode").'</td>';
 					print '<td>';
@@ -2984,8 +2984,8 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 			print '<tr><td class="nowrap">';
 			print $langs->trans("ProductAccountancySellCode");
 			print '</td><td colspan="2">';
-			if (! empty($conf->accounting->enabled)) {
-				if (! empty($object->accountancy_code_sell)) {
+			if (!empty($conf->accounting->enabled)) {
+				if (!empty($object->accountancy_code_sell)) {
 					$accountingaccount = new AccountingAccount($db);
 					$accountingaccount->fetch('', $object->accountancy_code_sell, 1);
 
@@ -3000,8 +3000,8 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 			print '<tr><td class="nowrap">';
 			print $langs->trans("ProductAccountancyBuyCode");
 			print '</td><td colspan="2">';
-			if (! empty($conf->accounting->enabled)) {
-				if (! empty($object->accountancy_code_buy)) {
+			if (!empty($conf->accounting->enabled)) {
+				if (!empty($object->accountancy_code_buy)) {
 					$accountingaccount2 = new AccountingAccount($db);
 					$accountingaccount2->fetch('', $object->accountancy_code_buy, 1);
 
diff --git a/htdocs/societe/class/companypaymentmode.class.php b/htdocs/societe/class/companypaymentmode.class.php
index 162badd9e12..17889026e89 100644
--- a/htdocs/societe/class/companypaymentmode.class.php
+++ b/htdocs/societe/class/companypaymentmode.class.php
@@ -329,7 +329,7 @@ class CompanyPaymentMode extends CommonObject
 		// For backward compatibility
 		$this->iban = $this->iban_prefix;
 
-		//if ($result > 0 && ! empty($this->table_element_line)) $this->fetchLines();
+		//if ($result > 0 && !empty($this->table_element_line)) $this->fetchLines();
 		return $result;
 	}
 
diff --git a/htdocs/societe/consumption.php b/htdocs/societe/consumption.php
index 58f568b6f6a..0c1370f7440 100644
--- a/htdocs/societe/consumption.php
+++ b/htdocs/societe/consumption.php
@@ -650,9 +650,9 @@ if ($sql_select) {
 		// Show range
 		$prodreftxt .= get_date_range($objp->date_start, $objp->date_end);
 		// Add description in form
-		if (! empty($conf->global->PRODUIT_DESC_IN_FORM))
+		if (!empty($conf->global->PRODUIT_DESC_IN_FORM))
 		{
-			$prodreftxt .= (! empty($objp->description) && $objp->description!=$objp->product_label)?'<br>'.dol_htmlentitiesbr($objp->description):'';
+			$prodreftxt .= (!empty($objp->description) && $objp->description!=$objp->product_label)?'<br>'.dol_htmlentitiesbr($objp->description):'';
 		}
 		*/
 		print '</td>';
diff --git a/htdocs/societe/notify/card.php b/htdocs/societe/notify/card.php
index 45c07c83b76..a9c0bdf04d0 100644
--- a/htdocs/societe/notify/card.php
+++ b/htdocs/societe/notify/card.php
@@ -201,7 +201,7 @@ if ($result > 0) {
 	$tmparray = $notify->getNotificationsArray('', $object->id, null, 0, array('thirdparty'));
 	foreach($tmparray as $tmpkey => $tmpval)
 	{
-		if (! empty($tmpkey)) $nbofrecipientemails++;
+		if (!empty($tmpkey)) $nbofrecipientemails++;
 	}
 	print $nbofrecipientemails;
 	print '</td></tr>';*/
diff --git a/htdocs/societe/paymentmodes.php b/htdocs/societe/paymentmodes.php
index 02d58d0dfe3..3545b324ed4 100644
--- a/htdocs/societe/paymentmodes.php
+++ b/htdocs/societe/paymentmodes.php
@@ -698,7 +698,7 @@ llxHeader('', $title, $help_url);
 $head = societe_prepare_head($object);
 
 // Show sandbox warning
-/*if (! empty($conf->paypal->enabled) && (! empty($conf->global->PAYPAL_API_SANDBOX) || GETPOST('forcesandbox','alpha')))		// We can force sand box with param 'forcesandbox'
+/*if (!empty($conf->paypal->enabled) && (!empty($conf->global->PAYPAL_API_SANDBOX) || GETPOST('forcesandbox','alpha')))		// We can force sand box with param 'forcesandbox'
 {
 	dol_htmloutput_mesg($langs->trans('YouAreCurrentlyInSandboxMode','Paypal'),'','warning');
 }*/
diff --git a/htdocs/societe/website.php b/htdocs/societe/website.php
index b8111274969..8de63dfeffc 100644
--- a/htdocs/societe/website.php
+++ b/htdocs/societe/website.php
@@ -311,7 +311,7 @@ foreach($objectwebsiteaccount->fields as $key => $val)
 	$sql .= "t.".$key.", ";
 }
 // Add fields from extrafields
-if (! empty($extrafields->attributes[$object->table_element]['label'])) {
+if (!empty($extrafields->attributes[$object->table_element]['label'])) {
 	foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val) $sql.=($extrafields->attributes[$object->table_element]['type'][$key] != 'separate' ? "ef.".$key.', ' : '');
 // Add where from hooks
 $parameters=array();
diff --git a/htdocs/stripe/charge.php b/htdocs/stripe/charge.php
index 7f17d51800d..eb30537438c 100644
--- a/htdocs/stripe/charge.php
+++ b/htdocs/stripe/charge.php
@@ -175,7 +175,7 @@ if (!$rowid) {
 		}
 
 		// Why this ?
-		/*if (! empty($charge->payment_intent)) {
+		/*if (!empty($charge->payment_intent)) {
 		 if (empty($stripeacc)) {				// If the Stripe connect account not set, we use common API usage
 		 $charge = \Stripe\PaymentIntent::retrieve($charge->payment_intent);
 		 } else {
diff --git a/htdocs/stripe/payout.php b/htdocs/stripe/payout.php
index 8631b4ecd5f..a33c183a1e7 100644
--- a/htdocs/stripe/payout.php
+++ b/htdocs/stripe/payout.php
@@ -133,7 +133,7 @@ if (!$rowid) {
 			// Save into $tmparray all metadata
 			$tmparray = dolExplodeIntoArray($FULLTAG,'.','=');
 			// Load origin object according to metadata
-			if (! empty($tmparray['CUS']))
+			if (!empty($tmparray['CUS']))
 			{
 				$societestatic->fetch($tmparray['CUS']);
 			}
@@ -141,7 +141,7 @@ if (!$rowid) {
 			{
 				$societestatic->id = 0;
 			}
-			if (! empty($tmparray['MEM']))
+			if (!empty($tmparray['MEM']))
 			{
 				$memberstatic->fetch($tmparray['MEM']);
 			}
diff --git a/htdocs/stripe/transaction.php b/htdocs/stripe/transaction.php
index 92092ca2ebb..f04833ff107 100644
--- a/htdocs/stripe/transaction.php
+++ b/htdocs/stripe/transaction.php
@@ -131,7 +131,7 @@ if (!$rowid) {
 			// Save into $tmparray all metadata
 			$tmparray = dolExplodeIntoArray($FULLTAG,'.','=');
 			// Load origin object according to metadata
-			if (! empty($tmparray['CUS']))
+			if (!empty($tmparray['CUS']))
 			{
 				$societestatic->fetch($tmparray['CUS']);
 			}
@@ -139,7 +139,7 @@ if (!$rowid) {
 			{
 				$societestatic->id = 0;
 			}
-			if (! empty($tmparray['MEM']))
+			if (!empty($tmparray['MEM']))
 			{
 				$memberstatic->fetch($tmparray['MEM']);
 			}
diff --git a/htdocs/supplier_proposal/card.php b/htdocs/supplier_proposal/card.php
index e4c2efd2c72..5228f0ccac2 100644
--- a/htdocs/supplier_proposal/card.php
+++ b/htdocs/supplier_proposal/card.php
@@ -1825,7 +1825,7 @@ if ($action == 'create') {
 	print '</table>';
 
 	// Margin Infos
-	/*if (! empty($conf->margin->enabled)) {
+	/*if (!empty($conf->margin->enabled)) {
 	   $formmargin->displayMarginInfos($object);
 	}*/
 
diff --git a/htdocs/takepos/index.php b/htdocs/takepos/index.php
index 55fbd6e3f0e..410de2c330c 100644
--- a/htdocs/takepos/index.php
+++ b/htdocs/takepos/index.php
@@ -1128,7 +1128,7 @@ if (isset($_SESSION["takeposterminal"]) && $_SESSION["takeposterminal"]) {
 
 			$constantforkey = "CASHDESK_ID_BANKACCOUNT_" . $paycode . $_SESSION["takeposterminal"];
 			//var_dump($constantforkey.' '.$conf->global->$constantforkey);
-			if ( ! empty($conf->global->$constantforkey) && $conf->global->$constantforkey > 0) {
+			if ( !empty($conf->global->$constantforkey) && $conf->global->$constantforkey > 0) {
 				array_push($paiementsModes, $obj);
 			}
 		}
diff --git a/htdocs/takepos/invoice.php b/htdocs/takepos/invoice.php
index 0fb46af0843..8659cc6ea52 100644
--- a/htdocs/takepos/invoice.php
+++ b/htdocs/takepos/invoice.php
@@ -546,10 +546,10 @@ if (empty($reshook)) {
 
 			/* setup of margin calculation */
 			if (isset($conf->global->MARGIN_TYPE)) {
-				if ($conf->global->MARGIN_TYPE == 'pmp' && ! empty($prod->pmp)) {
+				if ($conf->global->MARGIN_TYPE == 'pmp' && !empty($prod->pmp)) {
 					$line['fk_fournprice'] = null;
 					$line['pa_ht'] = $prod->pmp;
-				} elseif ($conf->global->MARGIN_TYPE == 'costprice' && ! empty($prod->cost_price)) {
+				} elseif ($conf->global->MARGIN_TYPE == 'costprice' && !empty($prod->cost_price)) {
 					$line['fk_fournprice'] = null;
 					$line['pa_ht'] = $prod->cost_price;
 				} else {
diff --git a/htdocs/ticket/class/ticket.class.php b/htdocs/ticket/class/ticket.class.php
index cef664db636..18cdf5e1067 100644
--- a/htdocs/ticket/class/ticket.class.php
+++ b/htdocs/ticket/class/ticket.class.php
@@ -504,7 +504,7 @@ class Ticket extends CommonObject
 				$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."ticket");
 			}
 
-			if (!$error && ! empty($conf->global->TICKET_ADD_AUTHOR_AS_CONTACT)) {
+			if (!$error && !empty($conf->global->TICKET_ADD_AUTHOR_AS_CONTACT)) {
 				// add creator as contributor
 				if ($this->add_contact($user->id, 'CONTRIBUTOR', 'internal') < 0) {
 					$error++;
diff --git a/htdocs/user/card.php b/htdocs/user/card.php
index 3b8b401f372..b1038b3a4cd 100644
--- a/htdocs/user/card.php
+++ b/htdocs/user/card.php
@@ -343,7 +343,7 @@ if (empty($reshook)) {
 					setEventMessages($object->error, $object->errors, 'errors');
 					$action = "create"; // Go back to create page
 				} else {
-					if (! empty($conf->categorie->enabled)) {
+					if (!empty($conf->categorie->enabled)) {
 						// Categories association
 						$usercats = GETPOST('usercats', 'array');
 						$object->setCategories($usercats);
diff --git a/htdocs/user/class/user.class.php b/htdocs/user/class/user.class.php
index c7c10fe10cd..8715ee4f389 100644
--- a/htdocs/user/class/user.class.php
+++ b/htdocs/user/class/user.class.php
@@ -739,7 +739,7 @@ class User extends CommonObject
 
 		// If module is abc@module, we check permission user->rights->module->abc->permlevel1
 		$tmp = explode('@', $rightsPath, 2);
-		if (! empty($tmp[1])) {
+		if (!empty($tmp[1])) {
 			$rightsPath = $tmp[1];
 			$permlevel2 = $permlevel1;
 			$permlevel1 = $tmp[0];
diff --git a/htdocs/user/class/usergroup.class.php b/htdocs/user/class/usergroup.class.php
index 96fd14ec2be..bb8fa374eea 100644
--- a/htdocs/user/class/usergroup.class.php
+++ b/htdocs/user/class/usergroup.class.php
@@ -839,7 +839,7 @@ class UserGroup extends CommonObject
 		if ($this->name && !empty($conf->global->LDAP_GROUP_FIELD_FULLNAME)) {
 			$info[$conf->global->LDAP_GROUP_FIELD_FULLNAME] = $this->name;
 		}
-		//if ($this->name && ! empty($conf->global->LDAP_GROUP_FIELD_NAME)) $info[$conf->global->LDAP_GROUP_FIELD_NAME] = $this->name;
+		//if ($this->name && !empty($conf->global->LDAP_GROUP_FIELD_NAME)) $info[$conf->global->LDAP_GROUP_FIELD_NAME] = $this->name;
 		if ($this->note && !empty($conf->global->LDAP_GROUP_FIELD_DESCRIPTION)) {
 			$info[$conf->global->LDAP_GROUP_FIELD_DESCRIPTION] = dol_string_nohtmltag($this->note, 2);
 		}
diff --git a/htdocs/user/param_ihm.php b/htdocs/user/param_ihm.php
index 40c39ba3879..6124b77e95f 100644
--- a/htdocs/user/param_ihm.php
+++ b/htdocs/user/param_ihm.php
@@ -415,7 +415,7 @@ if ($action == 'edit') {
 			print $object->conf->MAIN_LANDING_PAGE;
 		}
 	}
-	//print $form->selectarray('MAIN_LANDING_PAGE', $tmparray, (! empty($object->conf->MAIN_LANDING_PAGE)?$object->conf->MAIN_LANDING_PAGE:''), 0, 0, 0, '', 1);
+	//print $form->selectarray('MAIN_LANDING_PAGE', $tmparray, (!empty($object->conf->MAIN_LANDING_PAGE)?$object->conf->MAIN_LANDING_PAGE:''), 0, 0, 0, '', 1);
 	print '</td></tr>';
 
 	// Landing page for Agenda - AGENDA_DEFAULT_VIEW
diff --git a/htdocs/user/perms.php b/htdocs/user/perms.php
index 571662d80cf..f98e3030eea 100644
--- a/htdocs/user/perms.php
+++ b/htdocs/user/perms.php
@@ -295,7 +295,7 @@ if ($user->admin) {
 	print info_admin($langs->trans("WarningOnlyPermissionOfActivatedModules"));
 }
 // If edited user is an extern user, we show warning for external users
-if (! empty($object->socid)) {
+if (!empty($object->socid)) {
 	print info_admin(showModulesExludedForExternal($modules))."\n";
 }
 
diff --git a/htdocs/webhook/class/target.class.php b/htdocs/webhook/class/target.class.php
index 7eabbe397ab..ae5ba35b584 100644
--- a/htdocs/webhook/class/target.class.php
+++ b/htdocs/webhook/class/target.class.php
@@ -507,8 +507,8 @@ class Target extends CommonObject
 			return 0;
 		}
 
-		/*if (! ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->webhook->target->write))
-		 || (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->webhook->target->target_advance->validate))))
+		/*if (! ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->webhook->target->write))
+		 || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->webhook->target->target_advance->validate))))
 		 {
 		 $this->error='NotEnoughPermissions';
 		 dol_syslog(get_class($this)."::valid ".$this->error, LOG_ERR);
@@ -625,8 +625,8 @@ class Target extends CommonObject
 			return 0;
 		}
 
-		/*if (! ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->webhook->write))
-		 || (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->webhook->webhook_advance->validate))))
+		/*if (! ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->webhook->write))
+		 || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->webhook->webhook_advance->validate))))
 		 {
 		 $this->error='Permission denied';
 		 return -1;
@@ -649,8 +649,8 @@ class Target extends CommonObject
 			return 0;
 		}
 
-		/*if (! ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->webhook->write))
-		 || (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->webhook->webhook_advance->validate))))
+		/*if (! ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->webhook->write))
+		 || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->webhook->webhook_advance->validate))))
 		 {
 		 $this->error='Permission denied';
 		 return -1;
@@ -673,8 +673,8 @@ class Target extends CommonObject
 			return 0;
 		}
 
-		/*if (! ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->webhook->write))
-		 || (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->webhook->webhook_advance->validate))))
+		/*if (! ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->webhook->write))
+		 || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->webhook->webhook_advance->validate))))
 		 {
 		 $this->error='Permission denied';
 		 return -1;
diff --git a/htdocs/webhook/target_agenda.php b/htdocs/webhook/target_agenda.php
index a8d110eb081..5c039f4cc38 100644
--- a/htdocs/webhook/target_agenda.php
+++ b/htdocs/webhook/target_agenda.php
@@ -134,7 +134,7 @@ $form = new Form($db);
 
 if ($object->id > 0) {
 	$title = $langs->trans("Agenda");
-	//if (! empty($conf->global->MAIN_HTML_TITLE) && preg_match('/thirdpartynameonly/',$conf->global->MAIN_HTML_TITLE) && $object->name) $title=$object->name." - ".$title;
+	//if (!empty($conf->global->MAIN_HTML_TITLE) && preg_match('/thirdpartynameonly/',$conf->global->MAIN_HTML_TITLE) && $object->name) $title=$object->name." - ".$title;
 	$help_url = 'EN:Module_Agenda_En';
 	llxHeader('', $title, $help_url);
 
@@ -158,7 +158,7 @@ if ($object->id > 0) {
 	// Thirdparty
 	$morehtmlref.='<br>'.$langs->trans('ThirdParty') . ' : ' . (is_object($object->thirdparty) ? $object->thirdparty->getNomUrl(1) : '');
 	// Project
-	if (! empty($conf->projet->enabled)) {
+	if (!empty($conf->projet->enabled)) {
 		$langs->load("projects");
 		$morehtmlref.='<br>'.$langs->trans('Project') . ' ';
 		if ($permissiontoadd) {
@@ -178,7 +178,7 @@ if ($object->id > 0) {
 				$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
 			}
 		} else {
-			if (! empty($object->fk_project)) {
+			if (!empty($object->fk_project)) {
 				$proj = new Project($db);
 				$proj->fetch($object->fk_project);
 				$morehtmlref .= ': '.$proj->getNomUrl();
diff --git a/htdocs/webhook/target_card.php b/htdocs/webhook/target_card.php
index 0777b984d9a..87c079b1b26 100644
--- a/htdocs/webhook/target_card.php
+++ b/htdocs/webhook/target_card.php
@@ -291,7 +291,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 	// Confirmation of action xxxx (You can use it for xxx = 'close', xxx = 'reopen', ...)
 	if ($action == 'xxx') {
 		$text = $langs->trans('ConfirmActionTarget', $object->ref);
-		/*if (! empty($conf->notification->enabled))
+		/*if (!empty($conf->notification->enabled))
 		{
 			require_once DOL_DOCUMENT_ROOT . '/core/class/notify.class.php';
 			$notify = new Notify($db);
@@ -338,7 +338,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 	 // Thirdparty
 	 $morehtmlref.='<br>'.$langs->trans('ThirdParty') . ' : ' . (is_object($object->thirdparty) ? $object->thirdparty->getNomUrl(1) : '');
 	 // Project
-	 if (! empty($conf->projet->enabled)) {
+	 if (!empty($conf->projet->enabled)) {
 	 $langs->load("projects");
 	 $morehtmlref .= '<br>'.$langs->trans('Project') . ' ';
 	 if ($permissiontoadd) {
@@ -356,7 +356,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 	 $morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
 	 }
 	 } else {
-	 if (! empty($object->fk_project)) {
+	 if (!empty($object->fk_project)) {
 	 $proj = new Project($db);
 	 $proj->fetch($object->fk_project);
 	 $morehtmlref .= ': '.$proj->getNomUrl();
diff --git a/htdocs/webhook/target_contact.php b/htdocs/webhook/target_contact.php
index 76b1a92821f..9b7f261cd59 100644
--- a/htdocs/webhook/target_contact.php
+++ b/htdocs/webhook/target_contact.php
@@ -142,7 +142,7 @@ if ($object->id) {
 	 // Thirdparty
 	 $morehtmlref.='<br>'.$langs->trans('ThirdParty') . ' : ' . (is_object($object->thirdparty) ? $object->thirdparty->getNomUrl(1) : '');
 	 // Project
-	 if (! empty($conf->projet->enabled))
+	 if (!empty($conf->projet->enabled))
 	 {
 	 $langs->load("projects");
 	 $morehtmlref.='<br>'.$langs->trans('Project') . ' ';
@@ -163,7 +163,7 @@ if ($object->id) {
 	 $morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
 	 }
 	 } else {
-	 if (! empty($object->fk_project)) {
+	 if (!empty($object->fk_project)) {
 	 $proj = new Project($db);
 	 $proj->fetch($object->fk_project);
 	 $morehtmlref .= ': '.$proj->getNomUrl();
diff --git a/htdocs/webhook/target_note.php b/htdocs/webhook/target_note.php
index 8ba98fd622d..ef3805d699d 100644
--- a/htdocs/webhook/target_note.php
+++ b/htdocs/webhook/target_note.php
@@ -117,7 +117,7 @@ if ($id > 0 || !empty($ref)) {
 	 // Thirdparty
 	 $morehtmlref.='<br>'.$langs->trans('ThirdParty') . ' : ' . (is_object($object->thirdparty) ? $object->thirdparty->getNomUrl(1) : '');
 	 // Project
-	 if (! empty($conf->projet->enabled))
+	 if (!empty($conf->projet->enabled))
 	 {
 	 $langs->load("projects");
 	 $morehtmlref.='<br>'.$langs->trans('Project') . ' ';
@@ -138,7 +138,7 @@ if ($id > 0 || !empty($ref)) {
 	 $morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
 	 }
 	 } else {
-	 if (! empty($object->fk_project)) {
+	 if (!empty($object->fk_project)) {
 	 $proj = new Project($db);
 	 $proj->fetch($object->fk_project);
 	 $morehtmlref .= ': '.$proj->getNomUrl();
diff --git a/htdocs/webhook/webhookindex.php b/htdocs/webhook/webhookindex.php
index e62c5e3ddae..3d050499a29 100644
--- a/htdocs/webhook/webhookindex.php
+++ b/htdocs/webhook/webhookindex.php
@@ -100,7 +100,7 @@ print '<div class="fichecenter"><div class="fichethirdleft">';
 
 /* BEGIN MODULEBUILDER DRAFT MYOBJECT
 // Draft MyObject
-if (! empty($conf->webhook->enabled) && $user->rights->webhook->read)
+if (!empty($conf->webhook->enabled) && $user->rights->webhook->read)
 {
 	$langs->load("orders");
 
@@ -181,7 +181,7 @@ $max = $conf->global->MAIN_SIZE_SHORTLIST_LIMIT;
 
 /* BEGIN MODULEBUILDER LASTMODIFIED MYOBJECT
 // Last modified myobject
-if (! empty($conf->webhook->enabled) && $user->rights->webhook->read)
+if (!empty($conf->webhook->enabled) && $user->rights->webhook->read)
 {
 	$sql = "SELECT s.rowid, s.ref, s.label, s.date_creation, s.tms";
 	$sql.= " FROM ".MAIN_DB_PREFIX."webhook_myobject as s";
diff --git a/htdocs/website/index.php b/htdocs/website/index.php
index e83ea15a34d..8ee418670b2 100644
--- a/htdocs/website/index.php
+++ b/htdocs/website/index.php
@@ -831,7 +831,7 @@ if ($action == 'addcontainer' && $usercanedit) {
 						$fp = fopen($filetosave, "w");
 						fputs($fp, $tmpgeturl['content']);
 						fclose($fp);
-						if (! empty($conf->global->MAIN_UMASK))
+						if (!empty($conf->global->MAIN_UMASK))
 							@chmod($file, octdec($conf->global->MAIN_UMASK));
 					}
 					*/
@@ -900,7 +900,7 @@ if ($action == 'addcontainer' && $usercanedit) {
 						//$fp = fopen($filetosave, "w");
 						//fputs($fp, $tmpgeturl['content']);
 						//fclose($fp);
-						//if (! empty($conf->global->MAIN_UMASK))
+						//if (!empty($conf->global->MAIN_UMASK))
 						//	@chmod($file, octdec($conf->global->MAIN_UMASK));
 
 						//	$filename = 'image/'.$object->ref.'/'.$objectpage->pageurl.(preg_match('/^\//', $linkwithoutdomain)?'':'/').$linkwithoutdomain;
@@ -4735,7 +4735,7 @@ if ($action == 'preview' || $action == 'createfromclone' || $action == 'createpa
 		print $out;
 
 		/*file_put_contents($filetpl, $out);
-		if (! empty($conf->global->MAIN_UMASK))
+		if (!empty($conf->global->MAIN_UMASK))
 			@chmod($filetpl, octdec($conf->global->MAIN_UMASK));
 
 		// Output file on browser
diff --git a/test/phpunit/AdherentTest.php b/test/phpunit/AdherentTest.php
index 0e4956e3a12..6238466427e 100644
--- a/test/phpunit/AdherentTest.php
+++ b/test/phpunit/AdherentTest.php
@@ -85,14 +85,14 @@ class AdherentTest extends PHPUnit\Framework\TestCase
 		global $conf,$user,$langs,$db;
 		$db->begin(); // This is to have all actions inside a transaction even if test launched without suite.
 
-		if (! empty($conf->global->MAIN_FIRSTNAME_NAME_POSITION)) {
+		if (!empty($conf->global->MAIN_FIRSTNAME_NAME_POSITION)) {
 			print "\n".__METHOD__." Company must be setup to have name-firstname in order 'Firstname Lastname'\n";
 			die(1);
 		}
-		if (! empty($conf->global->MAIN_MODULE_LDAP)) {
+		if (!empty($conf->global->MAIN_MODULE_LDAP)) {
 			print "\n".__METHOD__." module LDAP must be disabled.\n"; die(1);
 		}
-		if (! empty($conf->global->MAIN_MODULE_MAILMANSPIP)) {
+		if (!empty($conf->global->MAIN_MODULE_MAILMANSPIP)) {
 			print "\n".__METHOD__." module MailmanSpip must be disabled.\n"; die(1);
 		}
 
diff --git a/test/phpunit/AllTests.php b/test/phpunit/AllTests.php
index 5979adabcec..12223b17d1c 100644
--- a/test/phpunit/AllTests.php
+++ b/test/phpunit/AllTests.php
@@ -41,11 +41,11 @@ if (empty($conf->adherent->enabled)) {
 	print "Error: Module member must be enabled to have significant results.\n";
 	exit(1);
 }
-if (! empty($conf->ldap->enabled)) {
+if (!empty($conf->ldap->enabled)) {
 	print "Error: LDAP module should not be enabled.\n";
 	exit(1);
 }
-if (! empty($conf->google->enabled)) {
+if (!empty($conf->google->enabled)) {
 	print "Warning: Google module should not be enabled.\n";
 }
 if (empty($user->id)) {
diff --git a/test/phpunit/WebservicesInvoicesTest.php b/test/phpunit/WebservicesInvoicesTest.php
index a077b34e208..04b0b27a44e 100644
--- a/test/phpunit/WebservicesInvoicesTest.php
+++ b/test/phpunit/WebservicesInvoicesTest.php
@@ -261,7 +261,7 @@ class WebservicesInvoicesTest extends PHPUnit\Framework\TestCase
 			echo $exception;
 			$result=0;
 		}
-		if (! $result || ! empty($result['faultstring'])) {
+		if (! $result || !empty($result['faultstring'])) {
 			//var_dump($soapclient);
 			print $this->soapclient->error_str;
 			print "\n<br>\n";
@@ -316,7 +316,7 @@ class WebservicesInvoicesTest extends PHPUnit\Framework\TestCase
 			echo $exception;
 			$result=0;
 		}
-		if (! $result || ! empty($result['faultstring'])) {
+		if (! $result || !empty($result['faultstring'])) {
 			print $this->soapclient->error_str;
 			print "\n<br>\n";
 			print $this->soapclient->request;
@@ -413,7 +413,7 @@ class WebservicesInvoicesTest extends PHPUnit\Framework\TestCase
 			echo $exception;
 			$result=0;
 		}
-		if (! $result || ! empty($result['faultstring'])) {
+		if (! $result || !empty($result['faultstring'])) {
 			print 'Error: '.$this->soapclient->error_str;
 			print "\n<br>\n";
 			print $this->soapclient->request;
diff --git a/test/phpunit/WebservicesOrdersTest.php b/test/phpunit/WebservicesOrdersTest.php
index 45d0bdcccbe..7ad814f98ae 100644
--- a/test/phpunit/WebservicesOrdersTest.php
+++ b/test/phpunit/WebservicesOrdersTest.php
@@ -173,7 +173,7 @@ class WebservicesOrdersTest extends PHPUnit\Framework\TestCase
 			echo $exception;
 			$result=0;
 		}
-		if (! $result || ! empty($result['faultstring'])) {
+		if (! $result || !empty($result['faultstring'])) {
 			//var_dump($soapclient);
 			print 'Error: '.$soapclient->error_str;
 			print "\n<br>\n";
diff --git a/test/phpunit/WebservicesOtherTest.php b/test/phpunit/WebservicesOtherTest.php
index df1e0fa76a1..4b1d66c244d 100644
--- a/test/phpunit/WebservicesOtherTest.php
+++ b/test/phpunit/WebservicesOtherTest.php
@@ -174,7 +174,7 @@ class WebservicesOtherTest extends PHPUnit\Framework\TestCase
 			echo $exception;
 			$result=0;
 		}
-		if (! empty($result['faultstring'])) {
+		if (!empty($result['faultstring'])) {
 			print $result['faultstring']."\n";
 			$result=0;
 		}
@@ -202,7 +202,7 @@ class WebservicesOtherTest extends PHPUnit\Framework\TestCase
 			echo $exception;
 			$result=0;
 		}
-		if (! $result || ! empty($result['faultstring'])) {
+		if (! $result || !empty($result['faultstring'])) {
 			//var_dump($soapclient);
 			print $soapclient->error_str;
 			print "\n<br>\n";
diff --git a/test/phpunit/WebservicesProductsTest.php b/test/phpunit/WebservicesProductsTest.php
index c12323dbec7..0988b5109fe 100644
--- a/test/phpunit/WebservicesProductsTest.php
+++ b/test/phpunit/WebservicesProductsTest.php
@@ -194,7 +194,7 @@ class WebservicesProductsTest extends PHPUnit\Framework\TestCase
 			echo $exception;
 			$result=0;
 		}
-		if (! $result || ! empty($result['faultstring']) || $result['result']['result_code'] != 'OK') {
+		if (! $result || !empty($result['faultstring']) || $result['result']['result_code'] != 'OK') {
 			//var_dump($soapclient);
 			print $soapclient->error_str;
 			print "\n<br>\n";
@@ -257,7 +257,7 @@ class WebservicesProductsTest extends PHPUnit\Framework\TestCase
 			echo $exception;
 			$result=0;
 		}
-		if (! $result || ! empty($result['faultstring'])) {
+		if (! $result || !empty($result['faultstring'])) {
 			//var_dump($soapclient);
 			print $soapclient->error_str;
 			print "\n<br>\n";
@@ -320,7 +320,7 @@ class WebservicesProductsTest extends PHPUnit\Framework\TestCase
 			echo $exception;
 			$result=0;
 		}
-		if (! $result || ! empty($result['faultstring']) || $result['result']['result_code'] != 'OK') {
+		if (! $result || !empty($result['faultstring']) || $result['result']['result_code'] != 'OK') {
 			//var_dump($soapclient);
 			print 'Error: '.$soapclient->error_str;
 			print "\n<br>\n";
diff --git a/test/phpunit/WebservicesThirdpartyTest.php b/test/phpunit/WebservicesThirdpartyTest.php
index 285b8456ffb..d9fb87759f8 100644
--- a/test/phpunit/WebservicesThirdpartyTest.php
+++ b/test/phpunit/WebservicesThirdpartyTest.php
@@ -217,7 +217,7 @@ class WebservicesThirdpartyTest extends PHPUnit\Framework\TestCase
 			echo $exception;
 			$result=0;
 		}
-		if (! $result || ! empty($result['faultstring'])) {
+		if (! $result || !empty($result['faultstring'])) {
 			//var_dump($soapclient);
 			print $this->soapclient->error_str;
 			print "\n<br>\n";
@@ -271,7 +271,7 @@ class WebservicesThirdpartyTest extends PHPUnit\Framework\TestCase
 			echo $exception;
 			$result=0;
 		}
-		if (! $result || ! empty($result['faultstring'])) {
+		if (! $result || !empty($result['faultstring'])) {
 			//var_dump($soapclient);
 			print $this->soapclient->error_str;
 			print "\n<br>\n";
@@ -334,7 +334,7 @@ class WebservicesThirdpartyTest extends PHPUnit\Framework\TestCase
 			$result=0;
 		}
 		print $this->soapclient->response;
-		if (! $result || ! empty($result['faultstring'])) {
+		if (! $result || !empty($result['faultstring'])) {
 			//var_dump($soapclient);
 			print $this->soapclient->error_str;
 			print "\n<br>\n";
@@ -393,7 +393,7 @@ class WebservicesThirdpartyTest extends PHPUnit\Framework\TestCase
 			echo $exception;
 			$result=0;
 		}
-		if (! $result || ! empty($result['faultstring'])) {
+		if (! $result || !empty($result['faultstring'])) {
 			print 'Error: '.$this->soapclient->error_str;
 			print "\n<br>\n";
 			print $this->soapclient->request;
diff --git a/test/phpunit/WebservicesUserTest.php b/test/phpunit/WebservicesUserTest.php
index 8b9ae2739a6..1af8398ffe6 100644
--- a/test/phpunit/WebservicesUserTest.php
+++ b/test/phpunit/WebservicesUserTest.php
@@ -176,7 +176,7 @@ class WebservicesUserTest extends PHPUnit\Framework\TestCase
 			echo $exception;
 			$result=0;
 		}
-		if (! empty($result['faultstring'])) {
+		if (!empty($result['faultstring'])) {
 			print $result['faultstring']."\n";
 			$result=0;
 		}
@@ -203,7 +203,7 @@ class WebservicesUserTest extends PHPUnit\Framework\TestCase
 			echo $exception;
 			$result=0;
 		}
-		if (! $result || ! empty($result['faultstring'])) {
+		if (! $result || !empty($result['faultstring'])) {
 			//var_dump($soapclient);
 			print $soapclient->error_str;
 			print "\n<br>\n";

From 99d30d08adbafc6c698f4d928434e3b32a10212f Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Wed, 31 Aug 2022 22:15:17 +0200
Subject: [PATCH 487/974] update code

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

diff --git a/htdocs/core/modules/modCategorie.class.php b/htdocs/core/modules/modCategorie.class.php
index e70cdad999e..6a7ddc8a864 100644
--- a/htdocs/core/modules/modCategorie.class.php
+++ b/htdocs/core/modules/modCategorie.class.php
@@ -145,7 +145,7 @@ class modCategorie extends DolibarrModules
 		if (!empty($conf->bank->enabled)) {
 			$typeexample .= ($typeexample ? " / " : "")."5=Bank account";
 		}
-		if (!empty($conf->project->enabled)) {
+		if (isModEnabled('project')) {
 			$typeexample .= ($typeexample ? " / " : "")."6=Project";
 		}
 		if (!empty($conf->user->enabled)) {
@@ -179,7 +179,7 @@ class modCategorie extends DolibarrModules
 		$this->export_code[$r] = $this->rights_class.'_0_'.Categorie::$MAP_ID_TO_CODE[0];
 		$this->export_label[$r] = 'CatProdList';
 		$this->export_icon[$r] = $this->picto;
-		$this->export_enabled[$r] = 'isModEnabled("product") || !empty($conf->service->abled)';
+		$this->export_enabled[$r] = 'isModEnabled("product") || !empty($conf->service->enabled)';
 		$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'=>"ParentCategory", 'p.rowid'=>'ProductId', 'p.ref'=>'Ref', 'p.label'=>'Label');
 		$this->export_TypeFields_array[$r] = array('cat.label'=>"Text", 'cat.description'=>"Text", 'cat.fk_parent'=>'List:categorie:label:rowid', 'p.ref'=>'Text', 'p.label'=>'Text');
@@ -379,7 +379,7 @@ class modCategorie extends DolibarrModules
 		$this->export_code[$r] = $this->rights_class.'_6_'.Categorie::$MAP_ID_TO_CODE[6];
 		$this->export_label[$r] = 'CatProjectsList';
 		$this->export_icon[$r] = $this->picto;
-		$this->export_enabled[$r] = '!empty($conf->project->enabled)';
+		$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", 'p.rowid'=>'ProjectId', 'p.ref'=>'Ref', 's.rowid'=>"IdThirdParty", 's.nom'=>"Name");
 		$this->export_TypeFields_array[$r] = array('cat.label'=>"Text", 'cat.description'=>"Text", 'cat.fk_parent'=>'List:categorie:label:rowid', 'p.ref'=>'Text', 's.rowid'=>"Numeric", 's.nom'=>"Text");
@@ -568,7 +568,7 @@ class modCategorie extends DolibarrModules
 		// 5 Bank accounts, TODO ?
 
 		// 6 Projects
-		if (!empty($conf->project->enabled)) {
+		if (isModEnabled('project')) {
 			$r++;
 			$this->import_code[$r] = $this->rights_class.'_6_'.Categorie::$MAP_ID_TO_CODE[6];
 			$this->import_label[$r] = "CatProjectsLinks"; // Translation key

From dd8a9ac1f7ff41cfc34a218799c4f84f48e1652f Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 31 Aug 2022 22:15:43 +0200
Subject: [PATCH 488/974] Fix perms

---
 dev/tools/fixperms.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/dev/tools/fixperms.sh b/dev/tools/fixperms.sh
index 5b027ad1580..6b11f25112b 100755
--- a/dev/tools/fixperms.sh
+++ b/dev/tools/fixperms.sh
@@ -24,6 +24,7 @@ fi
 if [ "x$1" = "xfix" ]
 then
 	find ./htdocs -type f -iname "*.php" -exec chmod a-x {} \; 
+	find ./htdocs/install/ -type d -exec chmod ug+rw {} \; 
 	chmod a+x ./scripts/*/*.php
 	chmod a+x ./scripts/*/*.sh
 	chmod g-w ./scripts/*/*.php

From 948f3964bec54dbc1874f26b87d2fb7211daea0f Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Wed, 31 Aug 2022 22:16:24 +0200
Subject: [PATCH 489/974] update code

---
 .../modules/expensereport/doc/pdf_standard.modules.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/htdocs/core/modules/expensereport/doc/pdf_standard.modules.php b/htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
index 365a2326281..f6536cbb1df 100644
--- a/htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
+++ b/htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
@@ -1,7 +1,7 @@
 <?php
 /* Copyright (C) 2015       Laurent Destailleur     <eldy@users.sourceforge.net>
  * Copyright (C) 2015       Alexandre Spangaro      <aspangaro@open-dsi.fr>
- * Copyright (C) 2016-2021  Philippe Grand          <philippe.grand@atoo-net.com>
+ * Copyright (C) 2016-2022  Philippe Grand          <philippe.grand@atoo-net.com>
  * Copyright (C) 2018-2020  Frédéric France         <frederic.france@netlogic.fr>
  * Copyright (C) 2018       Francis Appels          <francis.appels@z-application.com>
  * Copyright (C) 2019       Markus Welters          <markus@welters.de>
@@ -152,7 +152,7 @@ class pdf_standard extends ModeleExpenseReport
 		$this->posxqty = 150;
 		$this->postotalht = 160;
 		$this->postotalttc = 180;
-		// if (empty($conf->project->enabled)) {
+		// if (!isModEnabled('project')) {
 		//     $this->posxtva-=20;
 		//     $this->posxup-=20;
 		//     $this->posxqty-=20;
@@ -584,7 +584,7 @@ class pdf_standard extends ModeleExpenseReport
 		if (empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT)) {
 			$nextColumnPosX = $this->posxtva;
 		}
-		if (!empty($conf->project->enabled)) {
+		if (isModEnabled('project')) {
 			$nextColumnPosX = $this->posxprojet;
 		}
 
@@ -600,7 +600,7 @@ class pdf_standard extends ModeleExpenseReport
 		//$pdf->MultiCell($nextColumnPosX-$this->posxtype-0.8, 4, $expensereporttypecodetoshow, 0, 'C');
 
 		// Project
-		//if (! empty($conf->project->enabled))
+		//if (isModEnabled('project'))
 		//{
 		//    $pdf->SetFont('','', $default_font_size - 1);
 		//    $pdf->SetXY($this->posxprojet, $curY);
@@ -958,7 +958,7 @@ class pdf_standard extends ModeleExpenseReport
 		//	$pdf->MultiCell($this->posxprojet-$this->posxtype - 1, 2, $outputlangs->transnoentities("Type"), '', 'C');
 		//}
 
-		//if (!empty($conf->project->enabled))
+		//if (isModEnabled('project'))
 		//{
 		//    // Project
 		//    $pdf->line($this->posxprojet - 1, $tab_top, $this->posxprojet - 1, $tab_top + $tab_height);

From d5c251ec2333e6881cb10dac1c7a61b0b9677537 Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Wed, 31 Aug 2022 22:16:52 +0200
Subject: [PATCH 490/974] update code

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

diff --git a/htdocs/delivery/card.php b/htdocs/delivery/card.php
index 108f81751b3..776b02c832e 100644
--- a/htdocs/delivery/card.php
+++ b/htdocs/delivery/card.php
@@ -43,7 +43,7 @@ if (!empty($conf->expedition_bon->enabled)) {
 if (!empty($conf->stock->enabled)) {
 	require_once DOL_DOCUMENT_ROOT.'/product/stock/class/entrepot.class.php';
 }
-if (!empty($conf->project->enabled)) {
+if (isModEnabled('project')) {
 	require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 	require_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php';
 }
@@ -328,7 +328,7 @@ if ($action == 'create') {    // Create. Seems to no be used
 			// Thirdparty
 			$morehtmlref .= '<br>'.$langs->trans('ThirdParty').' : '.$expedition->thirdparty->getNomUrl(1);
 			// Project
-			if (!empty($conf->project->enabled)) {
+			if (isModEnabled('project')) {
 				$langs->load("projects");
 				$morehtmlref .= '<br>'.$langs->trans('Project').' ';
 				if (0) {    // Do not change on shipment

From f547873f9ac14c8da5be75d3c0c446292da94ee2 Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Wed, 31 Aug 2022 22:17:23 +0200
Subject: [PATCH 491/974] update code

---
 htdocs/don/card.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/htdocs/don/card.php b/htdocs/don/card.php
index bf9ba2e6388..2ae4c8fac36 100644
--- a/htdocs/don/card.php
+++ b/htdocs/don/card.php
@@ -38,7 +38,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formmargin.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
-if (!empty($conf->project->enabled)) {
+if (isModEnabled('project')) {
 	require_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php';
 	require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 }
@@ -382,7 +382,7 @@ llxHeader('', $title, $help_url);
 $form = new Form($db);
 $formfile = new FormFile($db);
 $formcompany = new FormCompany($db);
-if (!empty($conf->project->enabled)) {
+if (isModEnabled('project')) {
 	$formproject = new FormProjets($db);
 }
 
@@ -511,7 +511,7 @@ if ($action == 'create') {
 		print '</td></tr>';
 	}
 
-	if (!empty($conf->project->enabled)) {
+	if (isModEnabled('project')) {
 		print "<tr><td>".$langs->trans("Project")."</td><td>";
 		$formproject->select_projects(-1, $projectid, 'fk_project', 0, 0, 1, 1, 0, 0, 0, '', 0, 0, 'maxwidth500');
 		print "</td></tr>\n";
@@ -639,7 +639,7 @@ if (!empty($id) && $action == 'edit') {
 	print "<tr>".'<td>'.$langs->trans("Status").'</td><td>'.$object->getLibStatut(4).'</td></tr>';
 
 	// Project
-	if (!empty($conf->project->enabled)) {
+	if (isModEnabled('project')) {
 		$formproject = new FormProjets($db);
 
 		$langs->load('projects');
@@ -700,7 +700,7 @@ if (!empty($id) && $action != 'edit') {
 
 	$morehtmlref = '<div class="refidno">';
 	// Project
-	if (!empty($conf->project->enabled)) {
+	if (isModEnabled('project')) {
 		$langs->load("projects");
 		$morehtmlref .= $langs->trans('Project').' ';
 		if ($user->rights->don->creer) {

From d55b08d2d153b0b1529badb1741089aef72f8755 Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Wed, 31 Aug 2022 22:17:53 +0200
Subject: [PATCH 492/974] update code

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

diff --git a/htdocs/don/document.php b/htdocs/don/document.php
index 1bb371c7812..53ca935e5ae 100644
--- a/htdocs/don/document.php
+++ b/htdocs/don/document.php
@@ -34,7 +34,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/donation.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/don/class/don.class.php';
-if (!empty($conf->project->enabled)) {
+if (isModEnabled('project')) {
 	require_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php';
 	require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 }
@@ -99,7 +99,7 @@ if ($action == 'classin' && $user->rights->don->creer) {
  */
 
 $form = new Form($db);
-if (!empty($conf->project->enabled)) {
+if (isModEnabled('project')) {
 	$formproject = new FormProjets($db);
 }
 
@@ -129,7 +129,7 @@ if ($object->id) {
 
 	$morehtmlref = '<div class="refidno">';
 	// Project
-	if (!empty($conf->project->enabled)) {
+	if (isModEnabled('project')) {
 		$langs->load("projects");
 		$morehtmlref .= $langs->trans('Project').' ';
 		if ($user->rights->don->creer) {

From 26cdd4db2ae70f6f770d00cf4a471581be05fa79 Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Wed, 31 Aug 2022 22:18:19 +0200
Subject: [PATCH 493/974] update code

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

diff --git a/htdocs/don/info.php b/htdocs/don/info.php
index 29d8f129036..b19826f9bcd 100644
--- a/htdocs/don/info.php
+++ b/htdocs/don/info.php
@@ -25,7 +25,7 @@ require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/donation.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/don/class/don.class.php';
-if (!empty($conf->project->enabled)) {
+if (isModEnabled('project')) {
 	require_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php';
 	require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 }
@@ -68,7 +68,7 @@ $help_url = 'EN:Module_Donations|FR:Module_Dons|ES:M&oacute;dulo_Donaciones|DE:M
 llxHeader('', $title, $help_url);
 
 $form = new Form($db);
-if (!empty($conf->project->enabled)) {
+if (isModEnabled('project')) {
 	$formproject = new FormProjets($db);
 }
 
@@ -82,7 +82,7 @@ $linkback = '<a href="'.DOL_URL_ROOT.'/don/list.php'.(!empty($socid) ? '?socid='
 
 $morehtmlref = '<div class="refidno">';
 // Project
-if (!empty($conf->project->enabled)) {
+if (isModEnabled('project')) {
 	$langs->load("projects");
 	$morehtmlref .= $langs->trans('Project').' ';
 	if ($user->rights->don->creer) {

From b6f6dd53ef08f25f546a0865a4cc94906c10b622 Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Wed, 31 Aug 2022 22:18:47 +0200
Subject: [PATCH 494/974] update code

---
 htdocs/don/list.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/htdocs/don/list.php b/htdocs/don/list.php
index 68f8ab0bbea..73314d9727c 100644
--- a/htdocs/don/list.php
+++ b/htdocs/don/list.php
@@ -27,7 +27,7 @@
 
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/don/class/don.class.php';
-if (!empty($conf->project->enabled)) {
+if (isModEnabled('project')) {
 	require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 }
 
@@ -93,7 +93,7 @@ $fieldstosearchall = array(
 
 $donationstatic = new Don($db);
 $form = new Form($db);
-if (!empty($conf->project->enabled)) {
+if (isModEnabled('project')) {
 	$projectstatic = new Project($db);
 }
 
@@ -219,7 +219,7 @@ if ($resql) {
 	print '<td class="liste_titre left">';
 	print '&nbsp;';
 	print '</td>';
-	if (!empty($conf->project->enabled)) {
+	if (isModEnabled('project')) {
 		print '<td class="liste_titre right">';
 		print '&nbsp;';
 		print '</td>';
@@ -249,7 +249,7 @@ if ($resql) {
 	}
 	print_liste_field_titre("Name", $_SERVER["PHP_SELF"], "d.lastname", "", $param, "", $sortfield, $sortorder);
 	print_liste_field_titre("Date", $_SERVER["PHP_SELF"], "d.datedon", "", $param, '', $sortfield, $sortorder, 'center ');
-	if (!empty($conf->project->enabled)) {
+	if (isModEnabled('project')) {
 		$langs->load("projects");
 		print_liste_field_titre("Project", $_SERVER["PHP_SELF"], "d.fk_projet", "", $param, "", $sortfield, $sortorder);
 	}
@@ -280,7 +280,7 @@ if ($resql) {
 		}
 		print "<td>".$donationstatic->getFullName($langs)."</td>";
 		print '<td class="center">'.dol_print_date($db->jdate($objp->datedon), 'day').'</td>';
-		if (!empty($conf->project->enabled)) {
+		if (isModEnabled('project')) {
 			print "<td>";
 			if ($objp->pid) {
 				$projectstatic->id = $objp->pid;

From 2b03f30f74967dffb4a14cd176870b1a25acf709 Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Wed, 31 Aug 2022 22:19:13 +0200
Subject: [PATCH 495/974] update code

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

diff --git a/htdocs/don/note.php b/htdocs/don/note.php
index 0b1c555e772..57ca862ad77 100644
--- a/htdocs/don/note.php
+++ b/htdocs/don/note.php
@@ -29,7 +29,7 @@ require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/don/class/don.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/donation.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
-if (!empty($conf->project->enabled)) {
+if (isModEnabled('project')) {
 	require_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php';
 	require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 }
@@ -86,7 +86,7 @@ $help_url = 'EN:Module_Donations|FR:Module_Dons|ES:M&oacute;dulo_Donaciones|DE:M
 llxHeader('', $title, $help_url);
 
 $form = new Form($db);
-if (!empty($conf->project->enabled)) {
+if (isModEnabled('project')) {
 	$formproject = new FormProjets($db);
 }
 
@@ -102,7 +102,7 @@ if ($id > 0 || !empty($ref)) {
 
 	$morehtmlref = '<div class="refidno">';
 	// Project
-	if (!empty($conf->project->enabled)) {
+	if (isModEnabled('project')) {
 		$langs->load("projects");
 		$morehtmlref .= $langs->trans('Project').' ';
 		if ($user->rights->don->creer) {

From 501af170f93bf885cdfde0de1738a159ce3bf5f1 Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Wed, 31 Aug 2022 22:19:56 +0200
Subject: [PATCH 496/974] update code

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

diff --git a/htdocs/ecm/index_auto.php b/htdocs/ecm/index_auto.php
index 49bd25d0b90..c75cbdb2807 100644
--- a/htdocs/ecm/index_auto.php
+++ b/htdocs/ecm/index_auto.php
@@ -347,9 +347,9 @@ if (!empty($conf->global->ECM_AUTO_TREE_ENABLED)) {
 		$langs->load("compta");
 		$rowspan++; $sectionauto[] = array('position'=>120, 'level'=>1, 'module'=>'salaries', 'test'=>$conf->salaries->enabled, 'label'=>$langs->trans("Salaries"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("Salaries")));
 	}
-	if (!empty($conf->project->enabled)) {
-		$rowspan++; $sectionauto[] = array('position'=>130, 'level'=>1, 'module'=>'project', 'test'=>$conf->project->enabled, 'label'=>$langs->trans("Projects"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("Projects")));
-		$rowspan++; $sectionauto[] = array('position'=>140, 'level'=>1, 'module'=>'project_task', 'test'=>$conf->project->enabled, 'label'=>$langs->trans("Tasks"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("Tasks")));
+	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")));
+		$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 (!empty($conf->ficheinter->enabled)) {
 		$langs->load("interventions");

From 2ad1ea81bdc170ffe76dd6816969f0372ce2a459 Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Wed, 31 Aug 2022 22:20:27 +0200
Subject: [PATCH 497/974] update code

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

diff --git a/htdocs/ecm/search.php b/htdocs/ecm/search.php
index 6bbca0026e1..3faf2ad7cd3 100644
--- a/htdocs/ecm/search.php
+++ b/htdocs/ecm/search.php
@@ -143,8 +143,8 @@ if ((isModEnabled("fournisseur") && empty($conf->global->MAIN_USE_NEW_SUPPLIERMO
 if (!empty($conf->tax->enabled)) {
 	$langs->load("compta"); $rowspan++; $sectionauto[] = array('level'=>1, 'module'=>'tax', 'test'=>$conf->tax->enabled, 'label'=>$langs->trans("SocialContributions"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("SocialContributions")));
 }
-if (!empty($conf->project->enabled)) {
-	$rowspan++; $sectionauto[] = array('level'=>1, 'module'=>'project', 'test'=>$conf->project->enabled, 'label'=>$langs->trans("Projects"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("Projects")));
+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 (!empty($conf->ficheinter->enabled)) {
 	$langs->load("interventions"); $rowspan++; $sectionauto[] = array('level'=>1, 'module'=>'fichinter', 'test'=>$conf->ficheinter->enabled, 'label'=>$langs->trans("Interventions"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("Interventions")));

From d779dfd7e1ec0e51a2d247c388efea948ea15950 Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Wed, 31 Aug 2022 22:21:03 +0200
Subject: [PATCH 498/974] update code

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

diff --git a/htdocs/eventorganization/conferenceorboothattendee_note.php b/htdocs/eventorganization/conferenceorboothattendee_note.php
index 4c5b2f394a9..d2e912332a6 100644
--- a/htdocs/eventorganization/conferenceorboothattendee_note.php
+++ b/htdocs/eventorganization/conferenceorboothattendee_note.php
@@ -151,7 +151,7 @@ if ($id > 0 || !empty($ref)) {
 	 // Thirdparty
 	 $morehtmlref.='<br>'.$langs->trans('ThirdParty') . ' : ' . (is_object($object->thirdparty) ? $object->thirdparty->getNomUrl(1) : '');
 	 // Project
-	 if (! empty($conf->project->enabled))
+	 if (isModEnabled('project'))
 	 {
 	 $langs->load("projects");
 	 $morehtmlref.='<br>'.$langs->trans('Project') . ' ';

From bcdceebc67e688ac3c6b4ed32a7132d52a078258 Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Wed, 31 Aug 2022 22:21:44 +0200
Subject: [PATCH 499/974] update code

---
 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 2c22bfb77ab..33d7e5ed641 100644
--- a/htdocs/eventorganization/class/conferenceorbooth.class.php
+++ b/htdocs/eventorganization/class/conferenceorbooth.class.php
@@ -107,7 +107,7 @@ class ConferenceOrBooth extends ActionComm
 		'ref' => array('type'=>'integer', 'label'=>'Ref', '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'=>30, 'notnull'=>0, 'visible'=>1, 'searchall'=>1, 'css'=>'minwidth300', 'csslist'=>'tdoverflowmax125', 'help'=>"OrganizationEvenLabelName", 'showoncombobox'=>'1',),
 		'fk_soc' => array('type'=>'integer:Societe:societe/class/societe.class.php:1:status=1 AND entity IN (__SHARED_ENTITIES__)', 'label'=>'ThirdParty', 'enabled'=>'$conf->societe->enabled', 'position'=>50, 'notnull'=>-1, 'visible'=>1, 'index'=>1, 'help'=>"OrganizationEventLinkToThirdParty", 'picto'=>'company', 'css'=>'tdoverflowmax150 maxwidth500'),
-		'fk_project' => array('type'=>'integer:Project:projet/class/project.class.php:1:t.usage_organize_event=1', 'label'=>'Project', 'enabled'=>'$conf->project->enabled', 'position'=>52, 'notnull'=>-1, 'visible'=>-1, 'index'=>1, 'picto'=>'project', 'css'=>'tdoverflowmax150 maxwidth500'),
+		'fk_project' => array('type'=>'integer:Project:projet/class/project.class.php:1:t.usage_organize_event=1', 'label'=>'Project', 'enabled'=>isModEnabled('project'), 'position'=>52, 'notnull'=>-1, 'visible'=>-1, 'index'=>1, 'picto'=>'project', 'css'=>'tdoverflowmax150 maxwidth500'),
 		'note' => array('type'=>'text', 'label'=>'Description', 'enabled'=>'1', 'position'=>60, 'notnull'=>0, 'visible'=>1),
 		'fk_action' => array('type'=>'sellist:c_actioncomm:libelle:id::module LIKE (\'%@eventorganization\')', 'label'=>'Format', 'enabled'=>'1', 'position'=>60, 'notnull'=>1, 'visible'=>1, 'css'=>'width300'),
 		'datep' => array('type'=>'datetime', 'label'=>'DateStart', 'enabled'=>'1', 'position'=>70, 'notnull'=>0, 'visible'=>1, 'showoncombobox'=>'2',),

From 29c76ed93c82453055e1991851945853cc976753 Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Wed, 31 Aug 2022 22:22:14 +0200
Subject: [PATCH 500/974] update code

---
 .../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 158b29e4cf6..75c9220ef3f 100644
--- a/htdocs/eventorganization/class/conferenceorboothattendee.class.php
+++ b/htdocs/eventorganization/class/conferenceorboothattendee.class.php
@@ -104,7 +104,7 @@ class ConferenceOrBoothAttendee extends CommonObject
 		'rowid' => array('type'=>'integer', 'label'=>'TechnicalID', 'enabled'=>'1', 'position'=>1, 'notnull'=>1, 'visible'=>0, 'noteditable'=>'1', 'index'=>1, 'css'=>'left', 'comment'=>"Id"),
 		'ref' => array('type'=>'varchar(128)', 'label'=>'Ref', 'enabled'=>'1', 'position'=>10, 'notnull'=>1, 'visible'=>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'=>55, 'notnull'=>0, 'visible'=>0, 'index'=>1, 'picto'=>'agenda'),
-		'fk_project' => array('type'=>'integer:Project:projet/class/project.class.php:1', 'label'=>'Project', 'enabled'=>'$conf->project->enabled', 'position'=>20, 'notnull'=>1, 'visible'=>0, 'index'=>1, 'picto'=>'project', 'css'=>'tdoverflowmax150 maxwidth500'),
+		'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'=>'tdoverflowmax150 maxwidth500'),
 		'email' => array('type'=>'mail', 'label'=>'EmailAttendee', 'enabled'=>'1', 'position'=>30, 'notnull'=>1, 'visible'=>1, 'index'=>1, 'autofocusoncreate'=>1, 'searchall'=>1),
 		'firstname' => array('type'=>'varchar(100)', 'label'=>'Firstname', 'enabled'=>'1', 'position'=>31, 'notnull'=>0, 'visible'=>1, 'index'=>1, 'searchall'=>1),
 		'lastname' => array('type'=>'varchar(100)', 'label'=>'Lastname', 'enabled'=>'1', 'position'=>32, 'notnull'=>0, 'visible'=>1, 'index'=>1, 'searchall'=>1),

From 7093da905192e962ac0629781a2cdd1392cefb48 Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Wed, 31 Aug 2022 22:22:49 +0200
Subject: [PATCH 501/974] update code

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

diff --git a/htdocs/expedition/card.php b/htdocs/expedition/card.php
index 3a0a9869571..6bab59ecb6e 100644
--- a/htdocs/expedition/card.php
+++ b/htdocs/expedition/card.php
@@ -56,7 +56,7 @@ if (isModEnabled("propal")) {
 if (!empty($conf->productbatch->enabled)) {
 	require_once DOL_DOCUMENT_ROOT.'/product/class/productbatch.class.php';
 }
-if (!empty($conf->project->enabled)) {
+if (isModEnabled('project')) {
 	require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 	require_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php';
 }
@@ -819,7 +819,7 @@ if (empty($action)) {
 $form = new Form($db);
 $formfile = new FormFile($db);
 $formproduct = new FormProduct($db);
-if (!empty($conf->project->enabled)) {
+if (isModEnabled('project')) {
 	$formproject = new FormProjets($db);
 }
 
@@ -906,7 +906,7 @@ if ($action == 'create') {
 			print '</tr>';
 
 			// Project
-			if (!empty($conf->project->enabled)) {
+			if (isModEnabled('project')) {
 				$projectid = GETPOST('projectid', 'int') ?GETPOST('projectid', 'int') : 0;
 				if (empty($projectid) && !empty($object->fk_project)) {
 					$projectid = $object->fk_project;
@@ -1732,7 +1732,7 @@ if ($action == 'create') {
 		// Thirdparty
 		$morehtmlref .= '<br>'.$langs->trans('ThirdParty').' : '.$object->thirdparty->getNomUrl(1);
 		// Project
-		if (!empty($conf->project->enabled)) {
+		if (isModEnabled('project')) {
 			$langs->load("projects");
 			$morehtmlref .= '<br>'.$langs->trans('Project').' ';
 			if (0) {    // Do not change on shipment

From 721b5726f1dcc30df6b37ed4827ac434d85b6ea7 Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Wed, 31 Aug 2022 22:23:14 +0200
Subject: [PATCH 502/974] update code

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

diff --git a/htdocs/expedition/contact.php b/htdocs/expedition/contact.php
index 112d35a63aa..0659229f55c 100644
--- a/htdocs/expedition/contact.php
+++ b/htdocs/expedition/contact.php
@@ -29,7 +29,7 @@ require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/sendings.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php';
-if (!empty($conf->project->enabled)) {
+if (isModEnabled('project')) {
 	require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 	require_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php';
 }
@@ -149,7 +149,7 @@ if ($id > 0 || !empty($ref)) {
 	// Thirdparty
 	$morehtmlref .= '<br>'.$langs->trans('ThirdParty').' : '.$object->thirdparty->getNomUrl(1);
 	// Project
-	if (!empty($conf->project->enabled)) {
+	if (isModEnabled('project')) {
 		$langs->load("projects");
 		$morehtmlref .= '<br>'.$langs->trans('Project').' ';
 		if (0) {    // Do not change on shipment

From eb8097d81c56e1cb415efffd00f517bc203c5f89 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20France?= <frederic.france@free.fr>
Date: Wed, 31 Aug 2022 22:23:32 +0200
Subject: [PATCH 503/974] use isModEnabled

---
 htdocs/admin/delais.php           | 12 ++++++++----
 htdocs/admin/mails_templates.php  |  2 +-
 htdocs/core/lib/functions.lib.php |  2 +-
 htdocs/ecm/index_auto.php         |  2 +-
 htdocs/ecm/search.php             |  2 +-
 htdocs/hrm/index.php              |  4 ++--
 htdocs/recruitment/index.php      |  6 +++---
 7 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/htdocs/admin/delais.php b/htdocs/admin/delais.php
index e64d1bda876..5c2f6e8b3ea 100644
--- a/htdocs/admin/delais.php
+++ b/htdocs/admin/delais.php
@@ -319,16 +319,20 @@ if (empty($conf->global->MAIN_DISABLE_METEO) || $conf->global->MAIN_DISABLE_METE
 	$cursor = 10; // By default
 	//if (!empty($conf->global->MAIN_METEO_OFFSET)) $offset=$conf->global->MAIN_METEO_OFFSET;
 	//if (!empty($conf->global->MAIN_METEO_GAP)) $cursor=$conf->global->MAIN_METEO_GAP;
-	$level0 = $offset; if (!empty($conf->global->MAIN_METEO_LEVEL0)) {
+	$level0 = $offset;
+	if (!empty($conf->global->MAIN_METEO_LEVEL0)) {
 		$level0 = $conf->global->MAIN_METEO_LEVEL0;
 	}
-	$level1 = $offset + 1 * $cursor; if (!empty($conf->global->MAIN_METEO_LEVEL1)) {
+	$level1 = $offset + 1 * $cursor;
+	if (!empty($conf->global->MAIN_METEO_LEVEL1)) {
 		$level1 = $conf->global->MAIN_METEO_LEVEL1;
 	}
-	$level2 = $offset + 2 * $cursor; if (!empty($conf->global->MAIN_METEO_LEVEL2)) {
+	$level2 = $offset + 2 * $cursor;
+	if (!empty($conf->global->MAIN_METEO_LEVEL2)) {
 		$level2 = $conf->global->MAIN_METEO_LEVEL2;
 	}
-	$level3 = $offset + 3 * $cursor; if (!empty($conf->global->MAIN_METEO_LEVEL3)) {
+	$level3 = $offset + 3 * $cursor;
+	if (!empty($conf->global->MAIN_METEO_LEVEL3)) {
 		$level3 = $conf->global->MAIN_METEO_LEVEL3;
 	}
 	$text = ''; $options = 'class="valignmiddle" height="60px"';
diff --git a/htdocs/admin/mails_templates.php b/htdocs/admin/mails_templates.php
index e9b36be353a..10c8ed29801 100644
--- a/htdocs/admin/mails_templates.php
+++ b/htdocs/admin/mails_templates.php
@@ -182,7 +182,7 @@ $elementList['user'] = img_picto('', 'user', 'class="pictofixedwidth"').dol_esca
 if (isModEnabled('adherent') && !empty($user->rights->adherent->lire)) {
 	$elementList['member'] = img_picto('', 'object_member', 'class="pictofixedwidth"').dol_escape_htmltag($langs->trans('MailToMember'));
 }
-if (!empty($conf->recruitment->enabled) && !empty($user->rights->recruitment->recruitmentjobposition->read)) {
+if (isModEnabled('recruitment') && !empty($user->rights->recruitment->recruitmentjobposition->read)) {
 	$elementList['recruitmentcandidature_send'] = img_picto('', 'recruitmentcandidature', 'class="pictofixedwidth"').dol_escape_htmltag($langs->trans('RecruitmentCandidatures'));
 }
 if (isModEnabled("societe") && !empty($user->rights->societe->lire)) {
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 895dfe5b5cf..6c297a53bd9 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -7393,7 +7393,7 @@ function getCommonSubstitutionArray($outputlangs, $onlykey = 0, $exclude = null,
 				$substitutionarray['__TICKET_USER_ASSIGN__'] = '__TICKET_USER_ASSIGN__';
 			}
 
-			if (!empty($conf->recruitment->enabled) && (!is_object($object) || $object->element == 'recruitmentcandidature')) {
+			if (isModEnabled('recruitment') && (!is_object($object) || $object->element == 'recruitmentcandidature')) {
 				$substitutionarray['__CANDIDATE_FULLNAME__'] = '__CANDIDATE_FULLNAME__';
 				$substitutionarray['__CANDIDATE_FIRSTNAME__'] = '__CANDIDATE_FIRSTNAME__';
 				$substitutionarray['__CANDIDATE_LASTNAME__'] = '__CANDIDATE_LASTNAME__';
diff --git a/htdocs/ecm/index_auto.php b/htdocs/ecm/index_auto.php
index 70e22db92a2..c91882e5ab5 100644
--- a/htdocs/ecm/index_auto.php
+++ b/htdocs/ecm/index_auto.php
@@ -372,7 +372,7 @@ if (!empty($conf->global->ECM_AUTO_TREE_ENABLED)) {
 		$langs->load("mrp");
 		$rowspan++; $sectionauto[] = array('position'=>200, 'level'=>1, 'module'=>'mrp-mo', 'test'=>$conf->mrp->enabled, 'label'=>$langs->trans("MOs"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("ManufacturingOrders")));
 	}
-	if (!empty($conf->recruitment->enabled)) {
+	if (isModEnabled('recruitment')) {
 		$langs->load("recruitment");
 		$rowspan++; $sectionauto[] = array('position'=>210, 'level'=>1, 'module'=>'recruitment-recruitmentcandidature', 'test'=>$conf->recruitment->enabled, 'label'=>$langs->trans("Candidatures"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("JobApplications")));
 	}
diff --git a/htdocs/ecm/search.php b/htdocs/ecm/search.php
index bb22566ef1e..2b284e43b0f 100644
--- a/htdocs/ecm/search.php
+++ b/htdocs/ecm/search.php
@@ -161,7 +161,7 @@ if (isModEnabled("banque")) {
 if (!empty($conf->mrp->enabled)) {
 	$langs->load("mrp"); $rowspan++; $sectionauto[] = array('level'=>1, 'module'=>'mrp-mo', 'test'=>$conf->mrp->enabled, 'label'=>$langs->trans("MOs"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("ManufacturingOrders")));
 }
-if (!empty($conf->recruitment->enabled)) {
+if (isModEnabled('recruitment')) {
 	$langs->load("recruitment"); $rowspan++; $sectionauto[] = array('level'=>1, 'module'=>'recruitment-recruitmentcandidature', 'test'=>$conf->recruitment->enabled, 'label'=>$langs->trans("Candidatures"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("JobApplications")));
 }
 
diff --git a/htdocs/hrm/index.php b/htdocs/hrm/index.php
index a86783db2d3..cbbd66cec47 100644
--- a/htdocs/hrm/index.php
+++ b/htdocs/hrm/index.php
@@ -43,7 +43,7 @@ if (isModEnabled('deplacement')) {
 if (isModEnabled('expensereport')) {
 	require_once DOL_DOCUMENT_ROOT.'/expensereport/class/expensereport.class.php';
 }
-if (!empty($conf->recruitment->enabled)) {
+if (isModEnabled('recruitment')) {
 	require_once DOL_DOCUMENT_ROOT.'/recruitment/class/recruitmentcandidature.class.php';
 	require_once DOL_DOCUMENT_ROOT.'/recruitment/class/recruitmentjobposition.class.php';
 }
@@ -342,7 +342,7 @@ if (isModEnabled('expensereport') && $user->rights->expensereport->lire) {
 
 
 // Last modified job position
-if (!empty($conf->recruitment->enabled) && $user->rights->recruitment->recruitmentjobposition->read) {
+if (isModEnabled('recruitment') && $user->rights->recruitment->recruitmentjobposition->read) {
 	$staticrecruitmentcandidature = new RecruitmentCandidature($db);
 	$staticrecruitmentjobposition = new RecruitmentJobPosition($db);
 	$sql = "SELECT rc.rowid, rc.ref, rc.email, rc.lastname, rc.firstname, rc.date_creation, rc.tms, rc.status,";
diff --git a/htdocs/recruitment/index.php b/htdocs/recruitment/index.php
index f34334c2df6..80ef1c9fbd9 100644
--- a/htdocs/recruitment/index.php
+++ b/htdocs/recruitment/index.php
@@ -242,7 +242,7 @@ print '<br>';
 
 /* BEGIN MODULEBUILDER DRAFT MYOBJECT
 // Draft MyObject
-if (!empty($conf->recruitment->enabled) && $user->rights->recruitment->read)
+if (isModEnabled('recruitment') && $user->rights->recruitment->read)
 {
 	$langs->load("orders");
 
@@ -327,7 +327,7 @@ $NBMAX = $conf->global->MAIN_SIZE_SHORTLIST_LIMIT;
 $max = $conf->global->MAIN_SIZE_SHORTLIST_LIMIT;
 
 // Last modified job position
-if (!empty($conf->recruitment->enabled) && $user->rights->recruitment->recruitmentjobposition->read) {
+if (isModEnabled('recruitment') && $user->rights->recruitment->recruitmentjobposition->read) {
 	$sql = "SELECT s.rowid, s.ref, s.label, s.date_creation, s.tms, s.status, COUNT(rc.rowid) as nbapplications";
 	$sql .= " FROM ".MAIN_DB_PREFIX."recruitment_recruitmentjobposition as s";
 	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."recruitment_recruitmentcandidature as rc ON rc.fk_recruitmentjobposition = s.rowid";
@@ -398,7 +398,7 @@ if (!empty($conf->recruitment->enabled) && $user->rights->recruitment->recruitme
 }
 
 // Last modified job position
-if (!empty($conf->recruitment->enabled) && $user->rights->recruitment->recruitmentjobposition->read) {
+if (isModEnabled('recruitment') && $user->rights->recruitment->recruitmentjobposition->read) {
 	$sql = "SELECT rc.rowid, rc.ref, rc.email, rc.lastname, rc.firstname, rc.date_creation, rc.tms, rc.status";
 	$sql .= " FROM ".MAIN_DB_PREFIX."recruitment_recruitmentcandidature as rc";
 	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."recruitment_recruitmentjobposition as s ON rc.fk_recruitmentjobposition = s.rowid";

From 94f4d500352e3c6e8d13f88044f750b17bba3d6f Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Wed, 31 Aug 2022 22:23:39 +0200
Subject: [PATCH 504/974] update code

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

diff --git a/htdocs/expedition/document.php b/htdocs/expedition/document.php
index d0729879017..08f30446f72 100644
--- a/htdocs/expedition/document.php
+++ b/htdocs/expedition/document.php
@@ -33,7 +33,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/images.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/sendings.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
 require_once DOL_DOCUMENT_ROOT.'/expedition/class/expedition.class.php';
-if (!empty($conf->project->enabled)) {
+if (isModEnabled('project')) {
 	require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 }
 
@@ -123,7 +123,7 @@ if ($id > 0 || !empty($ref)) {
 		$morehtmlref .= '<br>'.$langs->trans('ThirdParty').' : '.$object->thirdparty->getNomUrl(1);
 
 		// Project
-		if (!empty($conf->project->enabled)) {
+		if (isModEnabled('project')) {
 			$langs->load("projects");
 			$morehtmlref .= '<br>'.$langs->trans('Project').' ';
 			if (0) {    // Do not change on shipment

From d779a42b22b047f24e62dc56d43ca8d1108cc66b Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Wed, 31 Aug 2022 22:24:03 +0200
Subject: [PATCH 505/974] update code

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

diff --git a/htdocs/expedition/note.php b/htdocs/expedition/note.php
index c8fc0ff35be..b81457141ba 100644
--- a/htdocs/expedition/note.php
+++ b/htdocs/expedition/note.php
@@ -27,7 +27,7 @@
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/expedition/class/expedition.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/sendings.lib.php';
-if (!empty($conf->project->enabled)) {
+if (isModEnabled('project')) {
 	require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 	require_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php';
 }
@@ -110,7 +110,7 @@ if ($id > 0 || !empty($ref)) {
 	// Thirdparty
 	$morehtmlref .= '<br>'.$langs->trans('ThirdParty').' : '.$object->thirdparty->getNomUrl(1);
 	// Project
-	if (!empty($conf->project->enabled)) {
+	if (isModEnabled('project')) {
 		$langs->load("projects");
 		$morehtmlref .= '<br>'.$langs->trans('Project').' ';
 		if (0) {    // Do not change on shipment

From 162cdcc67687e13ee461426410f5f824f929354f Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Wed, 31 Aug 2022 22:24:43 +0200
Subject: [PATCH 506/974] update code

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

diff --git a/htdocs/expedition/shipment.php b/htdocs/expedition/shipment.php
index 0be623ab6bf..ae7d522a115 100644
--- a/htdocs/expedition/shipment.php
+++ b/htdocs/expedition/shipment.php
@@ -4,7 +4,7 @@
  * Copyright (C) 2005-2012	Regis Houssin			<regis.houssin@inodbox.com>
  * Copyright (C) 2012-2015	Juanjo Menent			<jmenent@2byte.es>
  * Copyright (C) 2018-2021  Frédéric France         <frederic.france@netlogic.fr>
- * Copyright (C) 2018       Philippe Grand          <philippe.grand@atoo-net.com>
+ * Copyright (C) 2018-2022  Philippe Grand          <philippe.grand@atoo-net.com>
  *
  * This 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 +33,7 @@ require_once DOL_DOCUMENT_ROOT.'/product/class/html.formproduct.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/order.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/sendings.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
-if (!empty($conf->project->enabled)) {
+if (isModEnabled('project')) {
 	require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 	require_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php';
 }
@@ -227,7 +227,7 @@ if (empty($reshook)) {
 $form = new Form($db);
 $formfile = new FormFile($db);
 $formproduct = new FormProduct($db);
-if (!empty($conf->project->enabled)) {
+if (isModEnabled('project')) {
 	$formproject = new FormProjets($db);
 }
 
@@ -287,7 +287,7 @@ if ($id > 0 || !empty($ref)) {
 		// Thirdparty
 		$morehtmlref .= '<br>'.$langs->trans('ThirdParty').' : '.$soc->getNomUrl(1);
 		// Project
-		if (!empty($conf->project->enabled)) {
+		if (isModEnabled('project')) {
 			$langs->load("projects");
 			$morehtmlref .= '<br>'.$langs->trans('Project').' ';
 			if ($user->rights->commande->creer) {

From fd07c5d6a074bdf6ec089f60c7da2ef94b6e5b8c Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Wed, 31 Aug 2022 22:25:37 +0200
Subject: [PATCH 507/974] update code

---
 htdocs/expensereport/card.php | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/htdocs/expensereport/card.php b/htdocs/expensereport/card.php
index 05831c5dd97..25adb1ff232 100644
--- a/htdocs/expensereport/card.php
+++ b/htdocs/expensereport/card.php
@@ -117,7 +117,7 @@ $permissiontoadd = $user->rights->expensereport->creer; // Used by the include o
 
 $upload_dir = $conf->expensereport->dir_output.'/'.dol_sanitizeFileName($object->ref);
 
-$projectRequired = $conf->project->enabled && ! empty($conf->global->EXPENSEREPORT_PROJECT_IS_REQUIRED);
+$projectRequired = isModEnabled('project') && ! empty($conf->global->EXPENSEREPORT_PROJECT_IS_REQUIRED);
 $fileRequired = !empty($conf->global->EXPENSEREPORT_FILE_IS_REQUIRED);
 
 if ($object->id > 0) {
@@ -1697,7 +1697,7 @@ if ($action == 'create') {
 			 // Thirdparty
 			 $morehtmlref.='<br>'.$langs->trans('ThirdParty') . ' : ' . $soc->getNomUrl(1);
 			 // Project
-			 if (! empty($conf->project->enabled))
+			 if (isModEnabled('project'))
 			 {
 			 $langs->load("projects");
 			 $morehtmlref.='<br>'.$langs->trans('Project') . ' ';
@@ -2064,7 +2064,7 @@ if ($action == 'create') {
 				print '<td class="center linecollinenb">'.$langs->trans('LineNb').'</td>';
 				//print '<td class="center">'.$langs->trans('Piece').'</td>';
 				print '<td class="center linecoldate">'.$langs->trans('Date').'</td>';
-				if (!empty($conf->project->enabled)) {
+				if (isModEnabled('project')) {
 					print '<td class="minwidth100imp linecolproject">'.$langs->trans('Project').'</td>';
 				}
 				print '<td class="center linecoltype">'.$langs->trans('Type').'</td>';
@@ -2109,7 +2109,7 @@ if ($action == 'create') {
 						print '<td class="center linecoldate">'.dol_print_date($db->jdate($line->date), 'day').'</td>';
 
 						// Project
-						if (!empty($conf->project->enabled)) {
+						if (isModEnabled('project')) {
 							print '<td class="center dateproject">';
 							if ($line->fk_project > 0) {
 								$projecttmp->id = $line->fk_project;
@@ -2270,7 +2270,7 @@ if ($action == 'create') {
 					if ($action == 'editline' && $line->rowid == GETPOST('rowid', 'int')) {
 						// Add line with link to add new file or attach line to an existing file
 						$colspan = 11;
-						if (!empty($conf->project->enabled)) {
+						if (isModEnabled('project')) {
 							$colspan++;
 						}
 						if (!empty($conf->global->MAIN_USE_EXPENSE_IK)) {
@@ -2345,7 +2345,7 @@ if ($action == 'create') {
 						print '</td>';
 
 						// Select project
-						if (!empty($conf->project->enabled)) {
+						if (isModEnabled('project')) {
 							print '<td>';
 							$formproject->select_projects(-1, $line->fk_project, 'fk_project', 0, 0, $projectRequired ? 0 : 1, 1, 0, 0, 0, '', 0, 0, 'maxwidth300');
 							print '</td>';
@@ -2418,7 +2418,7 @@ if ($action == 'create') {
 				if (!empty($conf->global->MAIN_USE_EXPENSE_IK)) {
 					$colspan++;
 				}
-				if (!empty($conf->project->enabled)) {
+				if (isModEnabled('project')) {
 					$colspan++;
 				}
 				if ($action != 'editline') {
@@ -2495,7 +2495,7 @@ if ($action == 'create') {
 				print '<tr class="liste_titre expensereportcreate">';
 				print '<td></td>';
 				print '<td class="center expensereportcreatedate">'.$langs->trans('Date').'</td>';
-				if (!empty($conf->project->enabled)) {
+				if (isModEnabled('project')) {
 					print '<td class="minwidth100imp">'.$form->textwithpicto($langs->trans('Project'), $langs->trans("ClosedProjectsAreHidden")).'</td>';
 				}
 				print '<td class="center expensereportcreatetype">'.$langs->trans('Type').'</td>';
@@ -2524,7 +2524,7 @@ if ($action == 'create') {
 				print '</td>';
 
 				// Select project
-				if (!empty($conf->project->enabled)) {
+				if (isModEnabled('project')) {
 					print '<td class="inputproject">';
 					$formproject->select_projects(-1, $fk_project, 'fk_project', 0, 0, $projectRequired ? 0 : 1, -1, 0, 0, 0, '', 0, 0, 'maxwidth300');
 					print '</td>';

From 19e31c0a6f5a7d1b1ffcc3abe6dc9dc528cb8b59 Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Wed, 31 Aug 2022 22:26:20 +0200
Subject: [PATCH 508/974] update code

---
 htdocs/fichinter/card.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/htdocs/fichinter/card.php b/htdocs/fichinter/card.php
index e2d03790f78..80f78b614b9 100644
--- a/htdocs/fichinter/card.php
+++ b/htdocs/fichinter/card.php
@@ -7,7 +7,7 @@
  * Copyright (C) 2014-2018  Ferran Marcet           <fmarcet@2byte.es>
  * Copyright (C) 2014-2022  Charlene Benke          <charlene@patas-monkey.com>
  * Copyright (C) 2015-2016  Abbes Bahfir            <bafbes@gmail.com>
- * Copyright (C) 2018 		Philippe Grand       	<philippe.grand@atoo-net.com>
+ * Copyright (C) 2018-2022 	Philippe Grand       	<philippe.grand@atoo-net.com>
  * Copyright (C) 2020       Frédéric France         <frederic.france@netlogic.fr>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -36,7 +36,7 @@ require_once DOL_DOCUMENT_ROOT.'/fichinter/class/fichinter.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/modules/fichinter/modules_fichinter.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/fichinter.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
-if (!empty($conf->project->enabled)) {
+if (isModEnabled('project')) {
 	require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 	require_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php';
 }
@@ -787,7 +787,7 @@ $formfile = new FormFile($db);
 if (!empty($conf->contrat->enabled)) {
 	$formcontract = new FormContract($db);
 }
-if (!empty($conf->project->enabled)) {
+if (isModEnabled('project')) {
 	$formproject = new FormProjets($db);
 }
 
@@ -908,7 +908,7 @@ if ($action == 'create') {
 		print '</td></tr>';
 
 		// Project
-		if (!empty($conf->project->enabled)) {
+		if (isModEnabled('project')) {
 			$formproject = new FormProjets($db);
 
 			$langs->load("project");
@@ -1159,7 +1159,7 @@ if ($action == 'create') {
 	// Thirdparty
 	$morehtmlref .= '<br><span class="hideonsmartphone">'.$langs->trans('ThirdParty').' : </span>'.$object->thirdparty->getNomUrl(1, 'customer');
 	// Project
-	if (!empty($conf->project->enabled)) {
+	if (isModEnabled('project')) {
 		$langs->load("projects");
 		$morehtmlref .= '<br>'.$langs->trans('Project').' ';
 		if ($user->rights->ficheinter->creer) {

From 4a7417725cbf079ad9a6ac95e5c2313a80703946 Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Wed, 31 Aug 2022 22:26:51 +0200
Subject: [PATCH 509/974] update code

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

diff --git a/htdocs/fichinter/contact.php b/htdocs/fichinter/contact.php
index ef6ffc80881..8528281c607 100644
--- a/htdocs/fichinter/contact.php
+++ b/htdocs/fichinter/contact.php
@@ -123,7 +123,7 @@ if ($id > 0 || !empty($ref)) {
 	// Thirdparty
 	$morehtmlref .= $langs->trans('ThirdParty').' : '.$object->thirdparty->getNomUrl(1);
 	// Project
-	if (!empty($conf->project->enabled)) {
+	if (isModEnabled('project')) {
 		$langs->load("projects");
 		$morehtmlref .= '<br>'.$langs->trans('Project').' ';
 		if ($user->rights->ficheinter->creer) {

From 165d05a8d2e356c922b18261d1f3df94e08eff17 Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Wed, 31 Aug 2022 22:27:14 +0200
Subject: [PATCH 510/974] update code

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

diff --git a/htdocs/fichinter/document.php b/htdocs/fichinter/document.php
index d0dd326df07..a2511cfee8f 100644
--- a/htdocs/fichinter/document.php
+++ b/htdocs/fichinter/document.php
@@ -34,7 +34,7 @@ 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/lib/fichinter.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
-if (!empty($conf->project->enabled)) {
+if (isModEnabled('project')) {
 	require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 }
 
@@ -123,7 +123,7 @@ if ($object->id) {
 	// Thirdparty
 	$morehtmlref .= $langs->trans('ThirdParty').' : '.$object->thirdparty->getNomUrl(1);
 	// Project
-	if (!empty($conf->project->enabled)) {
+	if (isModEnabled('project')) {
 		$langs->load("projects");
 		$morehtmlref .= '<br>'.$langs->trans('Project').' ';
 		if ($user->rights->commande->creer) {

From fae96c2077663144d451294a4a42838812a92fb4 Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Wed, 31 Aug 2022 22:27:36 +0200
Subject: [PATCH 511/974] update code

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

diff --git a/htdocs/fichinter/info.php b/htdocs/fichinter/info.php
index 589f1901cd6..a5c0abfeb3d 100644
--- a/htdocs/fichinter/info.php
+++ b/htdocs/fichinter/info.php
@@ -28,7 +28,7 @@ require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/fichinter/class/fichinter.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/fichinter.lib.php';
-if (!empty($conf->project->enabled)) {
+if (isModEnabled('project')) {
 	require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 }
 
@@ -78,7 +78,7 @@ $morehtmlref = '<div class="refidno">';
 // Thirdparty
 $morehtmlref .= $langs->trans('ThirdParty').' : '.$object->thirdparty->getNomUrl(1);
 // Project
-if (!empty($conf->project->enabled)) {
+if (isModEnabled('project')) {
 	$langs->load("projects");
 	$morehtmlref .= '<br>'.$langs->trans('Project').' ';
 	if ($user->rights->commande->creer) {

From 4b9449e2effa4b738e5f4e32dc49a28915ccc843 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20France?= <frederic.france@free.fr>
Date: Wed, 31 Aug 2022 22:27:58 +0200
Subject: [PATCH 512/974] restore includes files

---
 .../Mike42/Escpos/PrintConnectors/ApiPrintConnector.php   | 2 +-
 htdocs/includes/nusoap/lib/class.soap_transport_http.php  | 6 +++---
 htdocs/includes/nusoap/lib/class.soapclient.php           | 2 +-
 htdocs/includes/nusoap/lib/nusoap.php                     | 8 ++++----
 htdocs/includes/odtphp/Segment.php                        | 2 +-
 htdocs/includes/odtphp/odf.php                            | 4 ++--
 .../php-imap/vendor/illuminate/collections/Arr.php        | 2 +-
 .../php-imap/vendor/illuminate/collections/Collection.php | 2 +-
 .../vendor/illuminate/support/ServiceProvider.php         | 2 +-
 .../php-imap/vendor/illuminate/support/Stringable.php     | 2 +-
 .../vendor/illuminate/support/Testing/Fakes/BusFake.php   | 6 +++---
 .../vendor/illuminate/support/Testing/Fakes/EventFake.php | 2 +-
 .../illuminate/support/Testing/Fakes/NotificationFake.php | 2 +-
 .../vendor/illuminate/support/Testing/Fakes/QueueFake.php | 2 +-
 14 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/htdocs/includes/mike42/escpos-php/src/Mike42/Escpos/PrintConnectors/ApiPrintConnector.php b/htdocs/includes/mike42/escpos-php/src/Mike42/Escpos/PrintConnectors/ApiPrintConnector.php
index 0f75fe15089..893a4858c8e 100644
--- a/htdocs/includes/mike42/escpos-php/src/Mike42/Escpos/PrintConnectors/ApiPrintConnector.php
+++ b/htdocs/includes/mike42/escpos-php/src/Mike42/Escpos/PrintConnectors/ApiPrintConnector.php
@@ -49,7 +49,7 @@ class ApiPrintConnector implements PrintConnector
      */
     public function __destruct()
     {
-        if (!empty($this->stream)) {
+        if (! empty($this->stream)) {
             trigger_error("Print connector was not finalized. Did you forget to close the printer?", E_USER_NOTICE);
         }
     }
diff --git a/htdocs/includes/nusoap/lib/class.soap_transport_http.php b/htdocs/includes/nusoap/lib/class.soap_transport_http.php
index 1f3aa35a9a0..4ff49345083 100644
--- a/htdocs/includes/nusoap/lib/class.soap_transport_http.php
+++ b/htdocs/includes/nusoap/lib/class.soap_transport_http.php
@@ -1270,20 +1270,20 @@ class soap_transport_http extends nusoap_base {
 					continue;
 				}
 	    		$this->debug("check cookie for validity: ".$cookie['name'].'='.$cookie['value']);
-				if ((isset($cookie['expires'])) && (!empty($cookie['expires']))) {
+				if ((isset($cookie['expires'])) && (! empty($cookie['expires']))) {
 					if (strtotime($cookie['expires']) <= time()) {
 						$this->debug('cookie has expired');
 						continue;
 					}
 				}
-				if ((isset($cookie['domain'])) && (!empty($cookie['domain']))) {
+				if ((isset($cookie['domain'])) && (! empty($cookie['domain']))) {
 					$domain = preg_quote($cookie['domain']);
 					if (! preg_match("'.*$domain$'i", $this->host)) {
 						$this->debug('cookie has different domain');
 						continue;
 					}
 				}
-				if ((isset($cookie['path'])) && (!empty($cookie['path']))) {
+				if ((isset($cookie['path'])) && (! empty($cookie['path']))) {
 					$path = preg_quote($cookie['path']);
 					if (! preg_match("'^$path.*'i", $this->path)) {
 						$this->debug('cookie is for a different path');
diff --git a/htdocs/includes/nusoap/lib/class.soapclient.php b/htdocs/includes/nusoap/lib/class.soapclient.php
index 598ad62246a..de0ca3c9882 100644
--- a/htdocs/includes/nusoap/lib/class.soapclient.php
+++ b/htdocs/includes/nusoap/lib/class.soapclient.php
@@ -900,7 +900,7 @@ class nusoap_client extends nusoap_base  {
 				$this->debug('Remove cookie that is not an array');
 				continue;
 			}
-			if ((isset($cookie['expires'])) && (!empty($cookie['expires']))) {
+			if ((isset($cookie['expires'])) && (! empty($cookie['expires']))) {
 				if (strtotime($cookie['expires']) > time()) {
 					$this->cookies[] = $cookie;
 				} else {
diff --git a/htdocs/includes/nusoap/lib/nusoap.php b/htdocs/includes/nusoap/lib/nusoap.php
index eda7ad20092..7e0ebd94da4 100644
--- a/htdocs/includes/nusoap/lib/nusoap.php
+++ b/htdocs/includes/nusoap/lib/nusoap.php
@@ -3421,20 +3421,20 @@ class soap_transport_http extends nusoap_base {
 					continue;
 				}
 	    		$this->debug("check cookie for validity: ".$cookie['name'].'='.$cookie['value']);
-				if ((isset($cookie['expires'])) && (!empty($cookie['expires']))) {
+				if ((isset($cookie['expires'])) && (! empty($cookie['expires']))) {
 					if (strtotime($cookie['expires']) <= time()) {
 						$this->debug('cookie has expired');
 						continue;
 					}
 				}
-				if ((isset($cookie['domain'])) && (!empty($cookie['domain']))) {
+				if ((isset($cookie['domain'])) && (! empty($cookie['domain']))) {
 					$domain = preg_quote($cookie['domain']);
 					if (! preg_match("'.*$domain$'i", $this->host)) {
 						$this->debug('cookie has different domain');
 						continue;
 					}
 				}
-				if ((isset($cookie['path'])) && (!empty($cookie['path']))) {
+				if ((isset($cookie['path'])) && (! empty($cookie['path']))) {
 					$path = preg_quote($cookie['path']);
 					if (! preg_match("'^$path.*'i", $this->path)) {
 						$this->debug('cookie is for a different path');
@@ -8057,7 +8057,7 @@ class nusoap_client extends nusoap_base  {
 				$this->debug('Remove cookie that is not an array');
 				continue;
 			}
-			if ((isset($cookie['expires'])) && (!empty($cookie['expires']))) {
+			if ((isset($cookie['expires'])) && (! empty($cookie['expires']))) {
 				if (strtotime($cookie['expires']) > time()) {
 					$this->cookies[] = $cookie;
 				} else {
diff --git a/htdocs/includes/odtphp/Segment.php b/htdocs/includes/odtphp/Segment.php
index 8d767de4620..b57983321a3 100644
--- a/htdocs/includes/odtphp/Segment.php
+++ b/htdocs/includes/odtphp/Segment.php
@@ -101,7 +101,7 @@ class Segment implements IteratorAggregate, Countable
 		preg_match_all($reg, $this->xml, $matches, PREG_SET_ORDER);
 		//var_dump($tmpvars);exit;
 		foreach ($matches as $match) {   // For each match, if there is no entry into this->vars, we add it
-			if (!empty($match[1]) && ! isset($tmpvars[$match[1]])) {
+			if (! empty($match[1]) && ! isset($tmpvars[$match[1]])) {
 				$tmpvars[$match[1]] = '';     // Not defined, so we set it to '', we just need entry into this->vars for next loop
 			}
 		}
diff --git a/htdocs/includes/odtphp/odf.php b/htdocs/includes/odtphp/odf.php
index e993f85f7fd..6c63da727b7 100644
--- a/htdocs/includes/odtphp/odf.php
+++ b/htdocs/includes/odtphp/odf.php
@@ -530,7 +530,7 @@ IMG;
 
 		//var_dump($this->vars);exit;
 		foreach ($matches as $match) {   // For each match, if there is no entry into this->vars, we add it
-			if (!empty($match[1]) && ! isset($this->vars[$match[1]])) {
+			if (! empty($match[1]) && ! isset($this->vars[$match[1]])) {
 				$this->vars[$match[1]] = '';     // Not defined, so we set it to '', we just need entry into this->vars for next loop
 			}
 		}
@@ -877,7 +877,7 @@ IMG;
 				pclose($handlein);
 				fclose($handle);
 			}
-			if (!empty($conf->global->MAIN_UMASK)) @chmod($outputfile, octdec($conf->global->MAIN_UMASK));
+			if (! empty($conf->global->MAIN_UMASK)) @chmod($outputfile, octdec($conf->global->MAIN_UMASK));
 		}
 
 		if ($retval == 0) {
diff --git a/htdocs/includes/webklex/php-imap/vendor/illuminate/collections/Arr.php b/htdocs/includes/webklex/php-imap/vendor/illuminate/collections/Arr.php
index a5052f8f248..fd7dca8a586 100644
--- a/htdocs/includes/webklex/php-imap/vendor/illuminate/collections/Arr.php
+++ b/htdocs/includes/webklex/php-imap/vendor/illuminate/collections/Arr.php
@@ -111,7 +111,7 @@ class Arr
         $results = [];
 
         foreach ($array as $key => $value) {
-            if (is_array($value) && !empty($value)) {
+            if (is_array($value) && ! empty($value)) {
                 $results = array_merge($results, static::dot($value, $prepend.$key.'.'));
             } else {
                 $results[$prepend.$key] = $value;
diff --git a/htdocs/includes/webklex/php-imap/vendor/illuminate/collections/Collection.php b/htdocs/includes/webklex/php-imap/vendor/illuminate/collections/Collection.php
index 5dfec085be4..61a48841c11 100644
--- a/htdocs/includes/webklex/php-imap/vendor/illuminate/collections/Collection.php
+++ b/htdocs/includes/webklex/php-imap/vendor/illuminate/collections/Collection.php
@@ -482,7 +482,7 @@ class Collection implements ArrayAccess, CanBeEscapedWhenCastToString, Enumerabl
 
         $result = new static($results);
 
-        if (!empty($nextGroups)) {
+        if (! empty($nextGroups)) {
             return $result->map->groupBy($nextGroups, $preserveKeys);
         }
 
diff --git a/htdocs/includes/webklex/php-imap/vendor/illuminate/support/ServiceProvider.php b/htdocs/includes/webklex/php-imap/vendor/illuminate/support/ServiceProvider.php
index d76ef31a081..6c530c121d3 100755
--- a/htdocs/includes/webklex/php-imap/vendor/illuminate/support/ServiceProvider.php
+++ b/htdocs/includes/webklex/php-imap/vendor/illuminate/support/ServiceProvider.php
@@ -363,7 +363,7 @@ abstract class ServiceProvider
      */
     protected static function pathsForProviderAndGroup($provider, $group)
     {
-        if (!empty(static::$publishes[$provider]) && !empty(static::$publishGroups[$group])) {
+        if (! empty(static::$publishes[$provider]) && ! empty(static::$publishGroups[$group])) {
             return array_intersect_key(static::$publishes[$provider], static::$publishGroups[$group]);
         }
 
diff --git a/htdocs/includes/webklex/php-imap/vendor/illuminate/support/Stringable.php b/htdocs/includes/webklex/php-imap/vendor/illuminate/support/Stringable.php
index 63c4f9e1df1..414be0c2735 100644
--- a/htdocs/includes/webklex/php-imap/vendor/illuminate/support/Stringable.php
+++ b/htdocs/includes/webklex/php-imap/vendor/illuminate/support/Stringable.php
@@ -223,7 +223,7 @@ class Stringable implements JsonSerializable
 
         $segments = preg_split($pattern, $this->value, $limit, $flags);
 
-        return !empty($segments) ? collect($segments) : collect();
+        return ! empty($segments) ? collect($segments) : collect();
     }
 
     /**
diff --git a/htdocs/includes/webklex/php-imap/vendor/illuminate/support/Testing/Fakes/BusFake.php b/htdocs/includes/webklex/php-imap/vendor/illuminate/support/Testing/Fakes/BusFake.php
index 1e4167247ef..122252d8f00 100644
--- a/htdocs/includes/webklex/php-imap/vendor/illuminate/support/Testing/Fakes/BusFake.php
+++ b/htdocs/includes/webklex/php-imap/vendor/illuminate/support/Testing/Fakes/BusFake.php
@@ -517,7 +517,7 @@ class BusFake implements QueueingDispatcher
      */
     public function hasDispatched($command)
     {
-        return isset($this->commands[$command]) && !empty($this->commands[$command]);
+        return isset($this->commands[$command]) && ! empty($this->commands[$command]);
     }
 
     /**
@@ -528,7 +528,7 @@ class BusFake implements QueueingDispatcher
      */
     public function hasDispatchedSync($command)
     {
-        return isset($this->commandsSync[$command]) && !empty($this->commandsSync[$command]);
+        return isset($this->commandsSync[$command]) && ! empty($this->commandsSync[$command]);
     }
 
     /**
@@ -539,7 +539,7 @@ class BusFake implements QueueingDispatcher
      */
     public function hasDispatchedAfterResponse($command)
     {
-        return isset($this->commandsAfterResponse[$command]) && !empty($this->commandsAfterResponse[$command]);
+        return isset($this->commandsAfterResponse[$command]) && ! empty($this->commandsAfterResponse[$command]);
     }
 
     /**
diff --git a/htdocs/includes/webklex/php-imap/vendor/illuminate/support/Testing/Fakes/EventFake.php b/htdocs/includes/webklex/php-imap/vendor/illuminate/support/Testing/Fakes/EventFake.php
index cdbf5b18a2c..436173e9d3a 100644
--- a/htdocs/includes/webklex/php-imap/vendor/illuminate/support/Testing/Fakes/EventFake.php
+++ b/htdocs/includes/webklex/php-imap/vendor/illuminate/support/Testing/Fakes/EventFake.php
@@ -189,7 +189,7 @@ class EventFake implements Dispatcher
      */
     public function hasDispatched($event)
     {
-        return isset($this->events[$event]) && !empty($this->events[$event]);
+        return isset($this->events[$event]) && ! empty($this->events[$event]);
     }
 
     /**
diff --git a/htdocs/includes/webklex/php-imap/vendor/illuminate/support/Testing/Fakes/NotificationFake.php b/htdocs/includes/webklex/php-imap/vendor/illuminate/support/Testing/Fakes/NotificationFake.php
index 40c694119e1..c7b12f42d47 100644
--- a/htdocs/includes/webklex/php-imap/vendor/illuminate/support/Testing/Fakes/NotificationFake.php
+++ b/htdocs/includes/webklex/php-imap/vendor/illuminate/support/Testing/Fakes/NotificationFake.php
@@ -227,7 +227,7 @@ class NotificationFake implements NotificationDispatcher, NotificationFactory
      */
     public function hasSent($notifiable, $notification)
     {
-        return !empty($this->notificationsFor($notifiable, $notification));
+        return ! empty($this->notificationsFor($notifiable, $notification));
     }
 
     /**
diff --git a/htdocs/includes/webklex/php-imap/vendor/illuminate/support/Testing/Fakes/QueueFake.php b/htdocs/includes/webklex/php-imap/vendor/illuminate/support/Testing/Fakes/QueueFake.php
index f49f4745b88..d37cd67237a 100644
--- a/htdocs/includes/webklex/php-imap/vendor/illuminate/support/Testing/Fakes/QueueFake.php
+++ b/htdocs/includes/webklex/php-imap/vendor/illuminate/support/Testing/Fakes/QueueFake.php
@@ -242,7 +242,7 @@ class QueueFake extends QueueManager implements Queue
      */
     public function hasPushed($job)
     {
-        return isset($this->jobs[$job]) && !empty($this->jobs[$job]);
+        return isset($this->jobs[$job]) && ! empty($this->jobs[$job]);
     }
 
     /**

From ee0607ace2ed9437c15e1724404f258a85fe4cd1 Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Wed, 31 Aug 2022 22:28:04 +0200
Subject: [PATCH 513/974] update code

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

diff --git a/htdocs/eventorganization/conferenceorbooth_contact.php b/htdocs/eventorganization/conferenceorbooth_contact.php
index 33b8f633b3a..c7a2f044e96 100644
--- a/htdocs/eventorganization/conferenceorbooth_contact.php
+++ b/htdocs/eventorganization/conferenceorbooth_contact.php
@@ -396,7 +396,7 @@ if ($object->id) {
 	 // Thirdparty
 	 $morehtmlref.='<br>'.$langs->trans('ThirdParty') . ' : ' . (is_object($object->thirdparty) ? $object->thirdparty->getNomUrl(1) : '');
 	 // Project
-	 if (! empty($conf->project->enabled))
+	 if (isModEnabled('project'))
 	 {
 	 $langs->load("projects");
 	 $morehtmlref.='<br>'.$langs->trans('Project') . ' ';

From 8568f66d42dbc3dcb23ab2ea2bfb74feb9b28747 Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Wed, 31 Aug 2022 22:29:00 +0200
Subject: [PATCH 514/974] update code

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

diff --git a/htdocs/fichinter/list.php b/htdocs/fichinter/list.php
index d8bb62f6b5d..733dac71987 100644
--- a/htdocs/fichinter/list.php
+++ b/htdocs/fichinter/list.php
@@ -34,7 +34,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
 require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
 require_once DOL_DOCUMENT_ROOT.'/fichinter/class/fichinter.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
-if (!empty($conf->project->enabled)) {
+if (isModEnabled('project')) {
 	require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 }
 if (!empty($conf->contrat->enabled)) {
@@ -43,7 +43,7 @@ if (!empty($conf->contrat->enabled)) {
 
 // Load translation files required by the page
 $langs->loadLangs(array('companies', 'bills', 'interventions'));
-if (!empty($conf->project->enabled)) {
+if (isModEnabled('project')) {
 	$langs->load("projects");
 }
 if (!empty($conf->contrat->enabled)) {
@@ -120,7 +120,7 @@ $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'=>(empty($conf->project->enabled) ? 0 : 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),
@@ -202,7 +202,7 @@ $form = new Form($db);
 $formfile = new FormFile($db);
 $objectstatic = new Fichinter($db);
 $companystatic = new Societe($db);
-if (!empty($conf->project->enabled)) {
+if (isModEnabled('project')) {
 	$projetstatic = new Project($db);
 }
 if (!empty($conf->contrat->enabled)) {
@@ -234,7 +234,7 @@ if (empty($conf->global->FICHINTER_DISABLE_DETAILS) && $atleastonefieldinlines)
 	$sql .= " fd.rowid as lineid, fd.description as descriptiondetail, fd.date as dp, fd.duree,";
 }
 $sql .= " s.nom as name, s.rowid as socid, s.client, s.fournisseur, s.email, s.status as thirdpartystatus";
-if (!empty($conf->project->enabled)) {
+if (isModEnabled('project')) {
 	$sql .= ", pr.rowid as projet_id, pr.ref as projet_ref, pr.title as projet_title";
 }
 if (!empty($conf->contrat->enabled)) {
@@ -251,7 +251,7 @@ $parameters = array();
 $reshook = $hookmanager->executeHooks('printFieldListSelect', $parameters); // Note that $action and $object may have been modified by hook
 $sql .= $hookmanager->resPrint;
 $sql .= " FROM ".MAIN_DB_PREFIX."fichinter as f";
-if (!empty($conf->project->enabled)) {
+if (isModEnabled('project')) {
 	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."projet as pr on f.fk_projet = pr.rowid";
 }
 if (!empty($conf->contrat->enabled)) {

From 536cff5c3f2dc6c7128c0665893aade23d9a2386 Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Wed, 31 Aug 2022 22:29:23 +0200
Subject: [PATCH 515/974] update code

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

diff --git a/htdocs/fichinter/note.php b/htdocs/fichinter/note.php
index be5f67da555..3fb2e349c04 100644
--- a/htdocs/fichinter/note.php
+++ b/htdocs/fichinter/note.php
@@ -27,7 +27,7 @@
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/fichinter/class/fichinter.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/fichinter.lib.php';
-if (!empty($conf->project->enabled)) {
+if (isModEnabled('project')) {
 	require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 }
 
@@ -88,7 +88,7 @@ if ($id > 0 || !empty($ref)) {
 	// Thirdparty
 	$morehtmlref .= $langs->trans('ThirdParty').' : '.$object->thirdparty->getNomUrl(1);
 	// Project
-	if (!empty($conf->project->enabled)) {
+	if (isModEnabled('project')) {
 		$langs->load("projects");
 		$morehtmlref .= '<br>'.$langs->trans('Project').' ';
 		if ($user->rights->commande->creer) {

From 0112c6cd71c52a35cc22a62a5c1d797b7c531329 Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Wed, 31 Aug 2022 22:29:46 +0200
Subject: [PATCH 516/974] update code

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

diff --git a/htdocs/fichinter/class/fichinter.class.php b/htdocs/fichinter/class/fichinter.class.php
index 61c127cab9b..84cf2ae60b7 100644
--- a/htdocs/fichinter/class/fichinter.class.php
+++ b/htdocs/fichinter/class/fichinter.class.php
@@ -40,7 +40,7 @@ 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'=>'$conf->societe->enabled', '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'=>'$conf->project->enabled', 'visible'=>-1, 'position'=>20),
+	'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),

From adf50229d1cca5d0219f383ab432817b103aea8d Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Wed, 31 Aug 2022 22:30:09 +0200
Subject: [PATCH 517/974] update code

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

diff --git a/htdocs/fourn/class/fournisseur.commande.class.php b/htdocs/fourn/class/fournisseur.commande.class.php
index c794a227afa..c7552960a88 100644
--- a/htdocs/fourn/class/fournisseur.commande.class.php
+++ b/htdocs/fourn/class/fournisseur.commande.class.php
@@ -218,7 +218,7 @@ class CommandeFournisseur extends CommonOrder
 		'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'=>'$conf->project->enabled', 'visible'=>-1, 'position'=>45),
+		'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'=>60),
 		'date_approve' =>array('type'=>'datetime', 'label'=>'DateApprove', 'enabled'=>1, 'visible'=>-1, 'position'=>62),
 		'date_approve2' =>array('type'=>'datetime', 'label'=>'DateApprove2', 'enabled'=>1, 'visible'=>3, 'position'=>64),

From 9438b71ebdff1631ad2e0d5466859d375beaa500 Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Wed, 31 Aug 2022 22:30:46 +0200
Subject: [PATCH 518/974] update code

---
 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 830430f3730..3bb8aeec677 100644
--- a/htdocs/fourn/class/fournisseur.facture.class.php
+++ b/htdocs/fourn/class/fournisseur.facture.class.php
@@ -297,7 +297,7 @@ class FactureFournisseur extends CommonInvoice
 		'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'=>'$conf->project->enabled', 'visible'=>-1, 'position'=>145),
+		'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'=>'$conf->banque->enabled', '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),

From bf6a2d4abe95c9f7a2cc380c28e2edf988952e93 Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Wed, 31 Aug 2022 22:31:05 +0200
Subject: [PATCH 519/974] update code

---
 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 31bc37b6e1a..9a9ad1ffe62 100644
--- a/htdocs/fourn/class/fournisseur.facture-rec.class.php
+++ b/htdocs/fourn/class/fournisseur.facture-rec.class.php
@@ -195,7 +195,7 @@ class FactureFournisseurRec extends CommonInvoice
 
 		'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'=>'$conf->project->enabled', 'visible'=>-1, 'position'=>85),
+		'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'=>'$conf->banque->enabled', '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),

From 7af33751c65172e926e24e9e3ffd38fc3cb888b7 Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Wed, 31 Aug 2022 22:31:39 +0200
Subject: [PATCH 520/974] update code

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

diff --git a/htdocs/fourn/commande/card.php b/htdocs/fourn/commande/card.php
index 67ec98e3c96..6c2dc24c8a9 100644
--- a/htdocs/fourn/commande/card.php
+++ b/htdocs/fourn/commande/card.php
@@ -4,7 +4,7 @@
  * Copyright (C) 2005      Eric	Seigne          <eric.seigne@ryxeo.com>
  * Copyright (C) 2005-2016 Regis Houssin        <regis.houssin@inodbox.com>
  * Copyright (C) 2010-2015 Juanjo Menent        <jmenent@2byte.es>
- * Copyright (C) 2011-2018 Philippe Grand       <philippe.grand@atoo-net.com>
+ * Copyright (C) 2011-2022 Philippe Grand       <philippe.grand@atoo-net.com>
  * Copyright (C) 2012-2016 Marcos García        <marcosgdf@gmail.com>
  * Copyright (C) 2013      Florian Henry        <florian.henry@open-concept.pro>
  * Copyright (C) 2014      Ion Agorria          <ion@agorria.com>
@@ -49,7 +49,7 @@ if (!empty($conf->supplier_proposal->enabled)) {
 if (isModEnabled("product")) {
 	require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
 }
-if (!empty($conf->project->enabled)) {
+if (isModEnabled('project')) {
 	require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 	require_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php';
 }
@@ -160,7 +160,7 @@ $permissiontoadd	= $usercancreate; // Used by the include of actions_addupdatede
 
 // Project permission
 $caneditproject = false;
-if (!empty($conf->project->enabled)) {
+if (isModEnabled('project')) {
 	$caneditproject = empty($conf->global->SUPPLIER_ORDER_FORBID_EDIT_PROJECT) || ($object->statut == CommandeFournisseur::STATUS_DRAFT && preg_match('/^[\(]?PROV/i', $object->ref));
 }
 
@@ -1535,7 +1535,7 @@ $form = new	Form($db);
 $formfile = new FormFile($db);
 $formorder = new FormOrder($db);
 $productstatic = new Product($db);
-if (!empty($conf->project->enabled)) {
+if (isModEnabled('project')) {
 	$formproject = new FormProjets($db);
 }
 
@@ -1750,7 +1750,7 @@ if ($action == 'create') {
 	}
 
 	// Project
-	if (!empty($conf->project->enabled)) {
+	if (isModEnabled('project')) {
 		$formproject = new FormProjets($db);
 
 		$langs->load('projects');
@@ -2038,7 +2038,7 @@ if ($action == 'create') {
 	}
 
 	// Project
-	if (!empty($conf->project->enabled)) {
+	if (isModEnabled('project')) {
 		$langs->load("projects");
 		$morehtmlref .= '<br>'.$langs->trans('Project').' ';
 		if ($usercancreate) {

From 7af999df44e8b9d3c3cf7e9f6861d9ffab23e31d Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Wed, 31 Aug 2022 22:32:05 +0200
Subject: [PATCH 521/974] update code

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

diff --git a/htdocs/fourn/commande/contact.php b/htdocs/fourn/commande/contact.php
index 3cae4f04c73..32eb55d2d4c 100644
--- a/htdocs/fourn/commande/contact.php
+++ b/htdocs/fourn/commande/contact.php
@@ -29,7 +29,7 @@ require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.commande.class.php';
 require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/fourn.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php';
-if (!empty($conf->project->enabled)) {
+if (isModEnabled('project')) {
 	require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 }
 
@@ -135,7 +135,7 @@ if ($id > 0 || !empty($ref)) {
 		// Thirdparty
 		$morehtmlref .= '<br>'.$langs->trans('ThirdParty').' : '.$object->thirdparty->getNomUrl(1);
 		// Project
-		if (!empty($conf->project->enabled)) {
+		if (isModEnabled('project')) {
 			$langs->load("projects");
 			$morehtmlref .= '<br>'.$langs->trans('Project').' ';
 			if ($user->rights->fournisseur->commande->creer || $user->rights->supplier_order->creer) {

From e4521498c5f797447354635ac99cd64c20b42e95 Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Wed, 31 Aug 2022 22:32:33 +0200
Subject: [PATCH 522/974] update code

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

diff --git a/htdocs/fourn/commande/dispatch.php b/htdocs/fourn/commande/dispatch.php
index 2f0f7966679..e7bf8ffde81 100644
--- a/htdocs/fourn/commande/dispatch.php
+++ b/htdocs/fourn/commande/dispatch.php
@@ -39,7 +39,7 @@ require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.commande.dispatch.class
 require_once DOL_DOCUMENT_ROOT.'/product/class/html.formproduct.class.php';
 require_once DOL_DOCUMENT_ROOT.'/product/stock/class/mouvementstock.class.php';
 
-if (!empty($conf->project->enabled)) {
+if (isModEnabled('project')) {
 	require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 }
 
@@ -541,7 +541,7 @@ if ($id > 0 || !empty($ref)) {
 	// Thirdparty
 	$morehtmlref .= '<br>'.$langs->trans('ThirdParty').' : '.$object->thirdparty->getNomUrl(1);
 	// Project
-	if (!empty($conf->project->enabled)) {
+	if (isModEnabled('project')) {
 		$langs->load("projects");
 		$morehtmlref .= '<br>'.$langs->trans('Project').' ';
 		if ($user->rights->fournisseur->commande->creer || $user->rights->supplier_order->creer) {

From 0f4e9d1f85761f7328e14cfe76f1b7f71e6c0fdb Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Wed, 31 Aug 2022 22:33:07 +0200
Subject: [PATCH 523/974] update code

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

diff --git a/htdocs/fourn/commande/document.php b/htdocs/fourn/commande/document.php
index 5a017296887..957fa32867f 100644
--- a/htdocs/fourn/commande/document.php
+++ b/htdocs/fourn/commande/document.php
@@ -34,7 +34,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/images.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/fourn.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
 require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.commande.class.php';
-if (!empty($conf->project->enabled)) {
+if (isModEnabled('project')) {
 	require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 }
 
@@ -131,7 +131,7 @@ if ($object->id > 0) {
 	// Thirdparty
 	$morehtmlref .= '<br>'.$langs->trans('ThirdParty').' : '.$object->thirdparty->getNomUrl(1);
 	// Project
-	if (!empty($conf->project->enabled)) {
+	if (isModEnabled('project')) {
 		$langs->load("projects");
 		$morehtmlref .= '<br>'.$langs->trans('Project').' ';
 		if ($user->rights->fournisseur->commande->creer || $user->rights->supplier_order->creer) {

From 75c1d28e1ea4c7956db0bafdbebaf7849f2fa3ed Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Wed, 31 Aug 2022 22:33:30 +0200
Subject: [PATCH 524/974] update code

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

diff --git a/htdocs/fourn/commande/info.php b/htdocs/fourn/commande/info.php
index 18c4f5f2670..27f0483d35a 100644
--- a/htdocs/fourn/commande/info.php
+++ b/htdocs/fourn/commande/info.php
@@ -29,7 +29,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/fourn.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.commande.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
-if (!empty($conf->project->enabled)) {
+if (isModEnabled('project')) {
 	require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 }
 
@@ -139,7 +139,7 @@ $morehtmlref .= $form->editfieldval("RefSupplier", 'ref_supplier', $object->ref_
 // Thirdparty
 $morehtmlref .= '<br>'.$langs->trans('ThirdParty').' : '.$object->thirdparty->getNomUrl(1);
 // Project
-if (!empty($conf->project->enabled)) {
+if (isModEnabled('project')) {
 	$langs->load("projects");
 	$morehtmlref .= '<br>'.$langs->trans('Project').' ';
 	if ($user->rights->fournisseur->commande->creer || $user->rights->supplier_order->creer) {

From 6d826d718aacfc989c577dae0119b9578429c6f0 Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Wed, 31 Aug 2022 22:33:53 +0200
Subject: [PATCH 525/974] update code

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

diff --git a/htdocs/fourn/commande/note.php b/htdocs/fourn/commande/note.php
index cfdea75d9d9..7c19c6c8867 100644
--- a/htdocs/fourn/commande/note.php
+++ b/htdocs/fourn/commande/note.php
@@ -28,7 +28,7 @@
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/fourn.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.commande.class.php';
-if (!empty($conf->project->enabled)) {
+if (isModEnabled('project')) {
 	require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 }
 
@@ -106,7 +106,7 @@ if ($id > 0 || !empty($ref)) {
 		// Thirdparty
 		$morehtmlref .= '<br>'.$langs->trans('ThirdParty').' : '.$object->thirdparty->getNomUrl(1);
 		// Project
-		if (!empty($conf->project->enabled)) {
+		if (isModEnabled('project')) {
 			$langs->load("projects");
 			$morehtmlref .= '<br>'.$langs->trans('Project').' ';
 			if ($user->rights->fournisseur->commande->creer || $user->rights->supplier_order->creer) {

From b6b6ff4b6f5bf9e93bf89b54d22d4487ef3089a6 Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Wed, 31 Aug 2022 22:35:08 +0200
Subject: [PATCH 526/974] update code

---
 htdocs/fourn/facture/card-rec.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/htdocs/fourn/facture/card-rec.php b/htdocs/fourn/facture/card-rec.php
index e996f29b3c8..ba911234e79 100644
--- a/htdocs/fourn/facture/card-rec.php
+++ b/htdocs/fourn/facture/card-rec.php
@@ -35,7 +35,7 @@ require_once DOL_DOCUMENT_ROOT . '/fourn/class/fournisseur.facture-rec.class.php
 require_once DOL_DOCUMENT_ROOT . '/fourn/class/fournisseur.product.class.php';
 require_once DOL_DOCUMENT_ROOT . '/product/class/product.class.php';
 require_once DOL_DOCUMENT_ROOT . '/core/class/html.formother.class.php';
-if (! empty($conf->project->enabled)) {
+if (isModEnabled('project')) {
 	include_once DOL_DOCUMENT_ROOT . '/projet/class/project.class.php';
 }
 require_once DOL_DOCUMENT_ROOT . '/core/class/html.formprojet.class.php';
@@ -869,7 +869,7 @@ llxHeader('', $langs->trans("RepeatableSupplierInvoice"), $help_url);
 
 $form = new Form($db);
 $formother = new FormOther($db);
-if (! empty($conf->project->enabled)) {
+if (isModEnabled('project')) {
 	$formproject = new FormProjets($db);
 }
 $companystatic = new Societe($db);
@@ -898,7 +898,7 @@ if ($action == 'create') {
 		print dol_get_fiche_head(null, '', '', 0);
 
 		$rowspan = 4;
-		if (! empty($conf->project->enabled)) $rowspan++;
+		if (isModEnabled('project')) $rowspan++;
 		if ($object->fk_account > 0) $rowspan++;
 
 		print '<table class="border centpercent">';
@@ -986,7 +986,7 @@ if ($action == 'create') {
 		print "</td></tr>";
 
 		// Project
-		if (! empty($conf->project->enabled) && is_object($object->thirdparty) && $object->thirdparty->id > 0) {
+		if (isModEnabled('project') && is_object($object->thirdparty) && $object->thirdparty->id > 0) {
 			$projectid = GETPOST('projectid') ? GETPOST('projectid') : $object->fk_project;
 			$langs->load('projects');
 			print '<tr><td>' . $langs->trans('Project') . '</td><td>';
@@ -1135,7 +1135,7 @@ if ($action == 'create') {
 		$morehtmlref .= '<br>' . $langs->trans('ThirdParty') . ' : ' . $object->thirdparty->getNomUrl(1);
 
 		// Project
-		if (! empty($conf->project->enabled)) {
+		if (isModEnabled('project')) {
 			$langs->load('projects');
 			$morehtmlref .= '<br>' . $langs->trans('Project') . ' ';
 			if ($usercancreate) {

From 29c7ebad27b31e72f8f8cdffa6b003e22ce0ad3f Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Wed, 31 Aug 2022 22:35:45 +0200
Subject: [PATCH 527/974] update code

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

diff --git a/htdocs/fourn/facture/card.php b/htdocs/fourn/facture/card.php
index ddf54ba0727..b15478dc6c7 100644
--- a/htdocs/fourn/facture/card.php
+++ b/htdocs/fourn/facture/card.php
@@ -5,7 +5,7 @@
  * Copyright (C) 2005		Marc Barilley			<marc@ocebo.fr>
  * Copyright (C) 2005-2013	Regis Houssin			<regis.houssin@inodbox.com>
  * Copyright (C) 2010-2019	Juanjo Menent			<jmenent@2byte.es>
- * Copyright (C) 2013-2015	Philippe Grand			<philippe.grand@atoo-net.com>
+ * Copyright (C) 2013-2022	Philippe Grand			<philippe.grand@atoo-net.com>
  * Copyright (C) 2013		Florian Henry			<florian.henry@open-concept.pro>
  * Copyright (C) 2014-2016  Marcos García			<marcosgdf@gmail.com>
  * Copyright (C) 2016-2022	Alexandre Spangaro		<aspangaro@open-dsi.fr>
@@ -49,7 +49,7 @@ if (isModEnabled("product")) {
 	require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
 	require_once DOL_DOCUMENT_ROOT.'/core/lib/product.lib.php';
 }
-if (!empty($conf->project->enabled)) {
+if (isModEnabled('project')) {
 	require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 	require_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php';
 }
@@ -1888,7 +1888,7 @@ $form = new Form($db);
 $formfile = new FormFile($db);
 $bankaccountstatic = new Account($db);
 $paymentstatic = new PaiementFourn($db);
-if (!empty($conf->project->enabled)) {
+if (isModEnabled('project')) {
 	$formproject = new FormProjets($db);
 }
 
@@ -2408,7 +2408,7 @@ if ($action == 'create') {
 	}
 
 	// Project
-	if (!empty($conf->project->enabled)) {
+	if (isModEnabled('project')) {
 		$formproject = new FormProjets($db);
 
 		$langs->load('projects');
@@ -2864,7 +2864,7 @@ if ($action == 'create') {
 			$morehtmlref .= ' (<a href="'.DOL_URL_ROOT.'/fourn/facture/list.php?socid='.$object->thirdparty->id.'&search_company='.urlencode($object->thirdparty->name).'">'.$langs->trans("OtherBills").'</a>)';
 		}
 		// Project
-		if (!empty($conf->project->enabled)) {
+		if (isModEnabled('project')) {
 			$langs->load("projects");
 			$morehtmlref .= '<br>'.$langs->trans('Project').' ';
 			if ($usercancreate) {
@@ -3247,7 +3247,7 @@ if ($action == 'create') {
 		}
 
 		$nbrows = 9; $nbcols = 3;
-		if (!empty($conf->project->enabled)) {
+		if (isModEnabled('project')) {
 			$nbrows++;
 		}
 		if (isModEnabled("banque")) {

From a36491f4dbbc1145b409507bde59a69f167f3671 Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Wed, 31 Aug 2022 22:36:15 +0200
Subject: [PATCH 528/974] update code

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

diff --git a/htdocs/fourn/facture/contact.php b/htdocs/fourn/facture/contact.php
index 1096cb1eae8..ad36d63e9a7 100644
--- a/htdocs/fourn/facture/contact.php
+++ b/htdocs/fourn/facture/contact.php
@@ -31,7 +31,7 @@ require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php';
 require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/fourn.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php';
-if (!empty($conf->project->enabled)) {
+if (isModEnabled('project')) {
 	require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 }
 
@@ -137,7 +137,7 @@ if ($id > 0 || !empty($ref)) {
 			$morehtmlref .= ' (<a href="'.DOL_URL_ROOT.'/fourn/facture/list.php?socid='.$object->thirdparty->id.'&search_company='.urlencode($object->thirdparty->name).'">'.$langs->trans("OtherBills").'</a>)';
 		}
 		// Project
-		if (!empty($conf->project->enabled)) {
+		if (isModEnabled('project')) {
 			$langs->load("projects");
 			$morehtmlref .= '<br>'.$langs->trans('Project').' ';
 			if ($user->rights->facture->creer) {

From 218d5a774e01ef79fe02eb28f627d822034f7ba7 Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Wed, 31 Aug 2022 22:36:39 +0200
Subject: [PATCH 529/974] update code

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

diff --git a/htdocs/fourn/facture/document.php b/htdocs/fourn/facture/document.php
index 6cedd8884df..4479b89c34d 100644
--- a/htdocs/fourn/facture/document.php
+++ b/htdocs/fourn/facture/document.php
@@ -35,7 +35,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/fourn.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';
-if (!empty($conf->project->enabled)) {
+if (isModEnabled('project')) {
 	require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 }
 
@@ -116,7 +116,7 @@ if ($object->id > 0) {
 		$morehtmlref .= ' (<a href="'.DOL_URL_ROOT.'/fourn/facture/list.php?socid='.$object->thirdparty->id.'&search_company='.urlencode($object->thirdparty->name).'">'.$langs->trans("OtherBills").'</a>)';
 	}
 	// Project
-	if (!empty($conf->project->enabled)) {
+	if (isModEnabled('project')) {
 		$langs->load("projects");
 		$morehtmlref .= '<br>'.$langs->trans('Project').' ';
 		if ($user->rights->facture->creer) {

From e283e867d81de9b7b0156fd4e711e6c49e11df79 Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Wed, 31 Aug 2022 22:37:04 +0200
Subject: [PATCH 530/974] update code

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

diff --git a/htdocs/fourn/facture/info.php b/htdocs/fourn/facture/info.php
index de5985ae28f..c5491dfdbfd 100644
--- a/htdocs/fourn/facture/info.php
+++ b/htdocs/fourn/facture/info.php
@@ -30,7 +30,7 @@ require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.class.php';
 require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/fourn.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
-if (!empty($conf->project->enabled)) {
+if (isModEnabled('project')) {
 	require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 }
 
@@ -79,7 +79,7 @@ if (empty($conf->global->MAIN_DISABLE_OTHER_LINK) && $object->thirdparty->id > 0
 	$morehtmlref .= ' (<a href="'.DOL_URL_ROOT.'/fourn/facture/list.php?socid='.$object->thirdparty->id.'&search_company='.urlencode($object->thirdparty->name).'">'.$langs->trans("OtherBills").'</a>)';
 }
 // Project
-if (!empty($conf->project->enabled)) {
+if (isModEnabled('project')) {
 	$langs->load("projects");
 	$morehtmlref .= '<br>'.$langs->trans('Project').' ';
 	if ($user->rights->facture->creer) {

From ab71f479248f57dc65b4553908a4709b0070741b Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Wed, 31 Aug 2022 22:37:31 +0200
Subject: [PATCH 531/974] update code

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

diff --git a/htdocs/fourn/facture/list-rec.php b/htdocs/fourn/facture/list-rec.php
index f876462e15f..93519ff9524 100644
--- a/htdocs/fourn/facture/list-rec.php
+++ b/htdocs/fourn/facture/list-rec.php
@@ -248,7 +248,7 @@ llxHeader('', $langs->trans("RepeatableSupplierInvoices"), $help_url);
 
 $form = new Form($db);
 $formother = new FormOther($db);
-if (!empty($conf->project->enabled)) {
+if (isModEnabled('project')) {
 	$formproject = new FormProjets($db);
 }
 $companystatic = new Societe($db);

From 7688a2429d863dbbd75f382a52579b14d8c8721d Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Wed, 31 Aug 2022 22:37:55 +0200
Subject: [PATCH 532/974] update code

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

diff --git a/htdocs/fourn/facture/note.php b/htdocs/fourn/facture/note.php
index 46a9f8fdc44..0079e49db50 100644
--- a/htdocs/fourn/facture/note.php
+++ b/htdocs/fourn/facture/note.php
@@ -30,7 +30,7 @@ require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/fourn.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.class.php';
 require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php';
-if (!empty($conf->project->enabled)) {
+if (isModEnabled('project')) {
 	require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 }
 
@@ -110,7 +110,7 @@ if ($object->id > 0) {
 		$morehtmlref .= ' (<a href="'.DOL_URL_ROOT.'/fourn/facture/list.php?socid='.$object->thirdparty->id.'&search_company='.urlencode($object->thirdparty->name).'">'.$langs->trans("OtherBills").'</a>)';
 	}
 	// Project
-	if (!empty($conf->project->enabled)) {
+	if (isModEnabled('project')) {
 		$langs->load("projects");
 		$morehtmlref .= '<br>'.$langs->trans('Project').' ';
 		if ($user->rights->fournisseur->commande->creer || $user->rights->supplier_order->creer) {

From 3e37330669fc0083b04ab7814f9aa9d07152aee0 Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Wed, 31 Aug 2022 22:38:21 +0200
Subject: [PATCH 533/974] update code

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

diff --git a/htdocs/fourn/paiement/document.php b/htdocs/fourn/paiement/document.php
index 58d04d097d5..b69e081cf16 100644
--- a/htdocs/fourn/paiement/document.php
+++ b/htdocs/fourn/paiement/document.php
@@ -35,7 +35,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/payments.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/lib/fourn.lib.php';
-if (!empty($conf->project->enabled)) {
+if (isModEnabled('project')) {
 	require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 }
 

From 6541e23bcd4cd779c4d9c7ce4451deab043fd5f3 Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Wed, 31 Aug 2022 22:38:45 +0200
Subject: [PATCH 534/974] update code

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

diff --git a/htdocs/hrm/evaluation_contact.php b/htdocs/hrm/evaluation_contact.php
index 0cc25901302..380cb070d10 100644
--- a/htdocs/hrm/evaluation_contact.php
+++ b/htdocs/hrm/evaluation_contact.php
@@ -139,7 +139,7 @@ if ($object->id) {
 	 // Thirdparty
 	 $morehtmlref.='<br>'.$langs->trans('ThirdParty') . ' : ' . (is_object($object->thirdparty) ? $object->thirdparty->getNomUrl(1) : '');
 	 // Project
-	 if (! empty($conf->project->enabled))
+	 if (isModEnabled('project'))
 	 {
 	 $langs->load("projects");
 	 $morehtmlref.='<br>'.$langs->trans('Project') . ' ';

From bb58f3a18f3cf3a647161490f9dff17bec1219d6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20France?= <frederic.france@free.fr>
Date: Wed, 31 Aug 2022 22:38:53 +0200
Subject: [PATCH 535/974] use isModEnabled

---
 htdocs/admin/mails_templates.php                   |  4 ++--
 htdocs/admin/stock.php                             |  4 ++--
 htdocs/comm/action/class/cactioncomm.class.php     |  2 +-
 htdocs/commande/list.php                           |  2 +-
 htdocs/core/lib/project.lib.php                    |  2 +-
 .../eventorganization/conferenceorbooth_card.php   |  4 ++--
 .../conferenceorbooth_contact.php                  |  4 ++--
 .../conferenceorbooth_document.php                 |  4 ++--
 .../eventorganization/conferenceorbooth_list.php   |  4 ++--
 .../conferenceorboothattendee_card.php             |  4 ++--
 .../conferenceorboothattendee_list.php             |  4 ++--
 .../eventorganization/eventorganizationindex.php   |  4 ++--
 htdocs/projet/card.php                             | 14 +++++++-------
 htdocs/projet/contact.php                          |  6 +++---
 htdocs/projet/element.php                          |  6 +++---
 htdocs/projet/ganttview.php                        |  4 ++--
 htdocs/projet/list.php                             |  2 +-
 htdocs/projet/tasks.php                            |  6 +++---
 htdocs/projet/tasks/comment.php                    |  4 ++--
 htdocs/projet/tasks/contact.php                    |  4 ++--
 htdocs/projet/tasks/document.php                   |  4 ++--
 htdocs/projet/tasks/note.php                       |  4 ++--
 htdocs/projet/tasks/time.php                       |  2 +-
 htdocs/societe/card.php                            |  2 +-
 24 files changed, 50 insertions(+), 50 deletions(-)

diff --git a/htdocs/admin/mails_templates.php b/htdocs/admin/mails_templates.php
index 10c8ed29801..4bc0de8ac84 100644
--- a/htdocs/admin/mails_templates.php
+++ b/htdocs/admin/mails_templates.php
@@ -48,7 +48,7 @@ $langsArray=array("errors", "admin", "mails", "languages");
 if (isModEnabled('adherent')) {
 	$langsArray[]='members';
 }
-if (!empty($conf->eventorganization->enabled)) {
+if (isModEnabled('eventorganization')) {
 	$langsArray[]='eventorganization';
 }
 
@@ -230,7 +230,7 @@ if (isModEnabled('expensereport') && !empty($user->rights->expensereport->lire))
 if (isModEnabled('agenda')) {
 	$elementList['actioncomm_send'] = img_picto('', 'action', 'class="pictofixedwidth"').dol_escape_htmltag($langs->trans('MailToSendEventPush'));
 }
-if (!empty($conf->eventorganization->enabled) && !empty($user->rights->eventorganization->read)) {
+if (isModEnabled('eventorganization') && !empty($user->rights->eventorganization->read)) {
 	$elementList['conferenceorbooth'] = img_picto('', 'action', 'class="pictofixedwidth"').dol_escape_htmltag($langs->trans('MailToSendEventOrganization'));
 }
 if (!empty($conf->partnership->enabled) && !empty($user->rights->partnership->read)) {
diff --git a/htdocs/admin/stock.php b/htdocs/admin/stock.php
index 402119e6e51..fcca4cf2f18 100644
--- a/htdocs/admin/stock.php
+++ b/htdocs/admin/stock.php
@@ -394,7 +394,7 @@ print "</td>\n";
 print "</tr>\n";
 
 // Option to force stock to be enough before adding a line into document
-if (!empty($conf->invoice->enabled)) {
+if (isModEnabled('facture')) {
 	print '<tr class="oddeven">';
 	print '<td>'.$langs->trans("StockMustBeEnoughForInvoice").'</td>';
 	print '<td class="right">';
@@ -408,7 +408,7 @@ if (!empty($conf->invoice->enabled)) {
 	print "</tr>\n";
 }
 
-if (!empty($conf->order->enabled)) {
+if (isModEnabled('commande')) {
 	print '<tr class="oddeven">';
 	print '<td>'.$langs->trans("StockMustBeEnoughForOrder").'</td>';
 	print '<td class="right">';
diff --git a/htdocs/comm/action/class/cactioncomm.class.php b/htdocs/comm/action/class/cactioncomm.class.php
index 50aaca466e2..2d57cfe1284 100644
--- a/htdocs/comm/action/class/cactioncomm.class.php
+++ b/htdocs/comm/action/class/cactioncomm.class.php
@@ -218,7 +218,7 @@ class CActionComm
 						}
 						// For case module = 'myobject@eventorganization'
 						$tmparray = preg_split("/@/", $obj->module, -1);
-						if (count($tmparray) > 1 && $tmparray[1] == 'eventorganization' && !empty($conf->eventorganization->enabled)) {
+						if (count($tmparray) > 1 && $tmparray[1] == 'eventorganization' && isModEnabled('eventorganization')) {
 							$qualified = 1;
 						}
 						// For the generic case with type = 'module...' and module = 'myobject@mymodule'
diff --git a/htdocs/commande/list.php b/htdocs/commande/list.php
index 7acd7c78261..65c04a02d41 100644
--- a/htdocs/commande/list.php
+++ b/htdocs/commande/list.php
@@ -1221,7 +1221,7 @@ if ($resql) {
 	if ($permissiontocancel) {
 		$arrayofmassactions['cancelorders'] = img_picto('', 'close_title', 'class="pictofixedwidth"').$langs->trans("Cancel");
 	}
-	if (!empty($conf->invoice->enabled) && $user->rights->facture->creer) {
+	if (isModEnabled('facture') && $user->rights->facture->creer) {
 		$arrayofmassactions['createbills'] = img_picto('', 'bill', 'class="pictofixedwidth"').$langs->trans("CreateInvoiceForThisCustomer");
 	}
 	if ($permissiontoclose) {
diff --git a/htdocs/core/lib/project.lib.php b/htdocs/core/lib/project.lib.php
index 02423980002..0c591fd8193 100644
--- a/htdocs/core/lib/project.lib.php
+++ b/htdocs/core/lib/project.lib.php
@@ -209,7 +209,7 @@ function project_prepare_head(Project $project, $moreparam = '')
 		$h++;
 	}
 
-	if (!empty($conf->eventorganization->enabled) && !empty($project->usage_organize_event)) {
+	if (isModEnabled('eventorganization') && !empty($project->usage_organize_event)) {
 		$langs->load('eventorganization');
 		$head[$h][0] = DOL_URL_ROOT . '/eventorganization/conferenceorbooth_list.php?projectid=' . $project->id;
 		$head[$h][1] = $langs->trans("EventOrganization");
diff --git a/htdocs/eventorganization/conferenceorbooth_card.php b/htdocs/eventorganization/conferenceorbooth_card.php
index ac64a16602f..368da1c889a 100644
--- a/htdocs/eventorganization/conferenceorbooth_card.php
+++ b/htdocs/eventorganization/conferenceorbooth_card.php
@@ -220,7 +220,7 @@ if (!empty($withproject)) {
 	print '<table class="border tableforfield centpercent">';
 
 	// Usage
-	if (!empty($conf->global->PROJECT_USE_OPPORTUNITIES) || empty($conf->global->PROJECT_HIDE_TASKS) || !empty($conf->eventorganization->enabled)) {
+	if (!empty($conf->global->PROJECT_USE_OPPORTUNITIES) || empty($conf->global->PROJECT_HIDE_TASKS) || isModEnabled('eventorganization')) {
 		print '<tr><td class="tdtop">';
 		print $langs->trans("Usage");
 		print '</td>';
@@ -243,7 +243,7 @@ if (!empty($withproject)) {
 			print $form->textwithpicto($langs->trans("BillTime"), $htmltext);
 			print '<br>';
 		}
-		if (!empty($conf->eventorganization->enabled)) {
+		if (isModEnabled('eventorganization')) {
 			print '<input type="checkbox" disabled name="usage_organize_event"'.(GETPOSTISSET('usage_organize_event') ? (GETPOST('usage_organize_event', 'alpha') != '' ? ' checked="checked"' : '') : ($projectstatic->usage_organize_event ? ' checked="checked"' : '')).'"> ';
 			$htmltext = $langs->trans("EventOrganizationDescriptionLong");
 			print $form->textwithpicto($langs->trans("ManageOrganizeEvent"), $htmltext);
diff --git a/htdocs/eventorganization/conferenceorbooth_contact.php b/htdocs/eventorganization/conferenceorbooth_contact.php
index 499c6d7ac6d..9521bff2c01 100644
--- a/htdocs/eventorganization/conferenceorbooth_contact.php
+++ b/htdocs/eventorganization/conferenceorbooth_contact.php
@@ -205,7 +205,7 @@ if (!empty($withproject)) {
 	print '<table class="border tableforfield centpercent">';
 
 	// Usage
-	if (!empty($conf->global->PROJECT_USE_OPPORTUNITIES) || empty($conf->global->PROJECT_HIDE_TASKS) || !empty($conf->eventorganization->enabled)) {
+	if (!empty($conf->global->PROJECT_USE_OPPORTUNITIES) || empty($conf->global->PROJECT_HIDE_TASKS) || isModEnabled('eventorganization')) {
 		print '<tr><td class="tdtop">';
 		print $langs->trans("Usage");
 		print '</td>';
@@ -228,7 +228,7 @@ if (!empty($withproject)) {
 			print $form->textwithpicto($langs->trans("BillTime"), $htmltext);
 			print '<br>';
 		}
-		if (!empty($conf->eventorganization->enabled)) {
+		if (isModEnabled('eventorganization')) {
 			print '<input type="checkbox" disabled name="usage_organize_event"'.(GETPOSTISSET('usage_organize_event') ? (GETPOST('usage_organize_event', 'alpha') != '' ? ' checked="checked"' : '') : ($projectstatic->usage_organize_event ? ' checked="checked"' : '')).'"> ';
 			$htmltext = $langs->trans("EventOrganizationDescriptionLong");
 			print $form->textwithpicto($langs->trans("ManageOrganizeEvent"), $htmltext);
diff --git a/htdocs/eventorganization/conferenceorbooth_document.php b/htdocs/eventorganization/conferenceorbooth_document.php
index 4a5b368df02..d056a5b900c 100644
--- a/htdocs/eventorganization/conferenceorbooth_document.php
+++ b/htdocs/eventorganization/conferenceorbooth_document.php
@@ -176,7 +176,7 @@ if (!empty($withproject)) {
 	print '<table class="border tableforfield centpercent">';
 
 	// Usage
-	if (!empty($conf->global->PROJECT_USE_OPPORTUNITIES) || empty($conf->global->PROJECT_HIDE_TASKS) || !empty($conf->eventorganization->enabled)) {
+	if (!empty($conf->global->PROJECT_USE_OPPORTUNITIES) || empty($conf->global->PROJECT_HIDE_TASKS) || isModEnabled('eventorganization')) {
 		print '<tr><td class="tdtop">';
 		print $langs->trans("Usage");
 		print '</td>';
@@ -199,7 +199,7 @@ if (!empty($withproject)) {
 			print $form->textwithpicto($langs->trans("BillTime"), $htmltext);
 			print '<br>';
 		}
-		if (!empty($conf->eventorganization->enabled)) {
+		if (isModEnabled('eventorganization')) {
 			print '<input type="checkbox" disabled name="usage_organize_event"'.(GETPOSTISSET('usage_organize_event') ? (GETPOST('usage_organize_event', 'alpha') != '' ? ' checked="checked"' : '') : ($projectstatic->usage_organize_event ? ' checked="checked"' : '')).'"> ';
 			$htmltext = $langs->trans("EventOrganizationDescriptionLong");
 			print $form->textwithpicto($langs->trans("ManageOrganizeEvent"), $htmltext);
diff --git a/htdocs/eventorganization/conferenceorbooth_list.php b/htdocs/eventorganization/conferenceorbooth_list.php
index 958d1ab897d..7866a83a024 100644
--- a/htdocs/eventorganization/conferenceorbooth_list.php
+++ b/htdocs/eventorganization/conferenceorbooth_list.php
@@ -300,7 +300,7 @@ if ($projectid > 0) {
 	print '<table class="border tableforfield centpercent">';
 
 	// Usage
-	if (!empty($conf->global->PROJECT_USE_OPPORTUNITIES) || empty($conf->global->PROJECT_HIDE_TASKS) || !empty($conf->eventorganization->enabled)) {
+	if (!empty($conf->global->PROJECT_USE_OPPORTUNITIES) || empty($conf->global->PROJECT_HIDE_TASKS) || isModEnabled('eventorganization')) {
 		print '<tr><td class="tdtop">';
 		print $langs->trans("Usage");
 		print '</td>';
@@ -323,7 +323,7 @@ if ($projectid > 0) {
 			print $form->textwithpicto($langs->trans("BillTime"), $htmltext);
 			print '<br>';
 		}
-		if (!empty($conf->eventorganization->enabled)) {
+		if (isModEnabled('eventorganization')) {
 			print '<input type="checkbox" disabled name="usage_organize_event"'.($project->usage_organize_event ? ' checked="checked"' : '').'"> ';
 			$htmltext = $langs->trans("EventOrganizationDescriptionLong");
 			print $form->textwithpicto($langs->trans("ManageOrganizeEvent"), $htmltext);
diff --git a/htdocs/eventorganization/conferenceorboothattendee_card.php b/htdocs/eventorganization/conferenceorboothattendee_card.php
index b02edfc4a34..79b7b1aaa55 100644
--- a/htdocs/eventorganization/conferenceorboothattendee_card.php
+++ b/htdocs/eventorganization/conferenceorboothattendee_card.php
@@ -249,7 +249,7 @@ if (!empty($withproject)) {
 	print '<table class="border tableforfield centpercent">';
 
 	// Usage
-	if (!empty($conf->global->PROJECT_USE_OPPORTUNITIES) || empty($conf->global->PROJECT_HIDE_TASKS) || !empty($conf->eventorganization->enabled)) {
+	if (!empty($conf->global->PROJECT_USE_OPPORTUNITIES) || empty($conf->global->PROJECT_HIDE_TASKS) || isModEnabled('eventorganization')) {
 		print '<tr><td class="tdtop">';
 		print $langs->trans("Usage");
 		print '</td>';
@@ -272,7 +272,7 @@ if (!empty($withproject)) {
 			print $form->textwithpicto($langs->trans("BillTime"), $htmltext);
 			print '<br>';
 		}
-		if (!empty($conf->eventorganization->enabled)) {
+		if (isModEnabled('eventorganization')) {
 			print '<input type="checkbox" disabled name="usage_organize_event"'.(GETPOSTISSET('usage_organize_event') ? (GETPOST('usage_organize_event', 'alpha') != '' ? ' checked="checked"' : '') : ($projectstatic->usage_organize_event ? ' checked="checked"' : '')).'"> ';
 			$htmltext = $langs->trans("EventOrganizationDescriptionLong");
 			print $form->textwithpicto($langs->trans("ManageOrganizeEvent"), $htmltext);
diff --git a/htdocs/eventorganization/conferenceorboothattendee_list.php b/htdocs/eventorganization/conferenceorboothattendee_list.php
index c1626f7bbf3..7b8b6258e5e 100644
--- a/htdocs/eventorganization/conferenceorboothattendee_list.php
+++ b/htdocs/eventorganization/conferenceorboothattendee_list.php
@@ -427,7 +427,7 @@ if ($projectstatic->id > 0 || $confOrBooth > 0) {
 		print '<table class="border tableforfield centpercent">';
 
 		// Usage
-		if (!empty($conf->global->PROJECT_USE_OPPORTUNITIES) || empty($conf->global->PROJECT_HIDE_TASKS) || !empty($conf->eventorganization->enabled)) {
+		if (!empty($conf->global->PROJECT_USE_OPPORTUNITIES) || empty($conf->global->PROJECT_HIDE_TASKS) || isModEnabled('eventorganization')) {
 			print '<tr><td class="tdtop">';
 			print $langs->trans("Usage");
 			print '</td>';
@@ -450,7 +450,7 @@ if ($projectstatic->id > 0 || $confOrBooth > 0) {
 				print $form->textwithpicto($langs->trans("BillTime"), $htmltext);
 				print '<br>';
 			}
-			if (!empty($conf->eventorganization->enabled)) {
+			if (isModEnabled('eventorganization')) {
 				print '<input type="checkbox" disabled name="usage_organize_event"'.(GETPOSTISSET('usage_organize_event') ? (GETPOST('usage_organize_event', 'alpha') != '' ? ' checked="checked"' : '') : ($projectstatic->usage_organize_event ? ' checked="checked"' : '')).'"> ';
 				$htmltext = $langs->trans("EventOrganizationDescriptionLong");
 				print $form->textwithpicto($langs->trans("ManageOrganizeEvent"), $htmltext);
diff --git a/htdocs/eventorganization/eventorganizationindex.php b/htdocs/eventorganization/eventorganizationindex.php
index d770d5e1900..60f5beefd70 100644
--- a/htdocs/eventorganization/eventorganizationindex.php
+++ b/htdocs/eventorganization/eventorganizationindex.php
@@ -71,7 +71,7 @@ print '<div class="fichecenter"><div class="fichethirdleft">';
 
 /* BEGIN MODULEBUILDER DRAFT MYOBJECT
 // Draft MyObject
-if (!empty($conf->eventorganization->enabled) && $user->rights->eventorganization->read)
+if (isModEnabled('eventorganization') && $user->rights->eventorganization->read)
 {
 	$langs->load("orders");
 
@@ -152,7 +152,7 @@ $max = $conf->global->MAIN_SIZE_SHORTLIST_LIMIT;
 
 /* BEGIN MODULEBUILDER LASTMODIFIED MYOBJECT
 // Last modified myobject
-if (!empty($conf->eventorganization->enabled) && $user->rights->eventorganization->read)
+if (isModEnabled('eventorganization') && $user->rights->eventorganization->read)
 {
 	$sql = "SELECT s.rowid, s.ref, s.label, s.date_creation, s.tms";
 	$sql.= " FROM ".MAIN_DB_PREFIX."eventorganization_myobject as s";
diff --git a/htdocs/projet/card.php b/htdocs/projet/card.php
index 4c70278fd1e..451334c5d77 100644
--- a/htdocs/projet/card.php
+++ b/htdocs/projet/card.php
@@ -36,7 +36,7 @@ require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 
 // Load translation files required by the page
 $langsLoad=array('projects', 'companies');
-if (!empty($conf->eventorganization->enabled)) {
+if (isModEnabled('eventorganization')) {
 	$langsLoad[]='eventorganization';
 }
 
@@ -558,7 +558,7 @@ if ($action == 'create' && $user->rights->projet->creer) {
 	print '<tr><td><span class="fieldrequired">'.$langs->trans("ProjectLabel").'</span></td><td><input class="width500 maxwidth150onsmartphone" type="text" name="title" value="'.dol_escape_htmltag(GETPOST("title", 'alphanohtml')).'" autofocus></td></tr>';
 
 	// Usage (opp, task, bill time, ...)
-	if (!empty($conf->global->PROJECT_USE_OPPORTUNITIES) || empty($conf->global->PROJECT_HIDE_TASKS) || !empty($conf->eventorganization->enabled)) {
+	if (!empty($conf->global->PROJECT_USE_OPPORTUNITIES) || empty($conf->global->PROJECT_HIDE_TASKS) || isModEnabled('eventorganization')) {
 		print '<tr><td class="tdtop">';
 		print $langs->trans("Usage");
 		print '</td>';
@@ -598,7 +598,7 @@ if ($action == 'create' && $user->rights->projet->creer) {
 			print '<label for="usage_bill_time">'.$form->textwithpicto($langs->trans("BillTime"), $htmltext).'</label>';
 			print '<br>';
 		}
-		if (!empty($conf->eventorganization->enabled)) {
+		if (isModEnabled('eventorganization')) {
 			print '<input type="checkbox" id="usage_organize_event" name="usage_organize_event"'.(GETPOSTISSET('usage_organize_event') ? (GETPOST('usage_organize_event', 'alpha') ? ' checked="checked"' : '') :'').'"> ';
 			$htmltext = $langs->trans("EventOrganizationDescriptionLong");
 			print '<label for="usage_organize_event">'.$form->textwithpicto($langs->trans("ManageOrganizeEvent"), $htmltext).'</label>';
@@ -859,7 +859,7 @@ if ($action == 'create' && $user->rights->projet->creer) {
 		print '</td></tr>';
 
 		// Usage
-		if (!empty($conf->global->PROJECT_USE_OPPORTUNITIES) || empty($conf->global->PROJECT_HIDE_TASKS) || !empty($conf->eventorganization->enabled)) {
+		if (!empty($conf->global->PROJECT_USE_OPPORTUNITIES) || empty($conf->global->PROJECT_HIDE_TASKS) || isModEnabled('eventorganization')) {
 			print '<tr><td class="tdtop">';
 			print $langs->trans("Usage");
 			print '</td>';
@@ -897,7 +897,7 @@ if ($action == 'create' && $user->rights->projet->creer) {
 				print '<label for="usage_bill_time">'.$form->textwithpicto($langs->trans("BillTime"), $htmltext).'</label>';
 				print '<br>';
 			}
-			if (!empty($conf->eventorganization->enabled)) {
+			if (isModEnabled('eventorganization')) {
 				print '<input type="checkbox" id="usage_organize_event" name="usage_organize_event"'. (GETPOSTISSET('usage_organize_event') ? (GETPOST('usage_organize_event', 'alpha') != '' ? ' checked="checked"' : '') : ($object->usage_organize_event ? ' checked="checked"' : '')) . '"> ';
 				$htmltext = $langs->trans("EventOrganizationDescriptionLong");
 				print '<label for="usage_organize_event">'.$form->textwithpicto($langs->trans("ManageOrganizeEvent"), $htmltext).'</label>';
@@ -1063,7 +1063,7 @@ if ($action == 'create' && $user->rights->projet->creer) {
 		print '<table class="border tableforfield" width="100%">';
 
 		// Usage
-		if (!empty($conf->global->PROJECT_USE_OPPORTUNITIES) || empty($conf->global->PROJECT_HIDE_TASKS) || !empty($conf->eventorganization->enabled)) {
+		if (!empty($conf->global->PROJECT_USE_OPPORTUNITIES) || empty($conf->global->PROJECT_HIDE_TASKS) || isModEnabled('eventorganization')) {
 			print '<tr><td class="tdtop">';
 			print $langs->trans("Usage");
 			print '</td>';
@@ -1087,7 +1087,7 @@ if ($action == 'create' && $user->rights->projet->creer) {
 				print '<br>';
 			}
 
-			if (!empty($conf->eventorganization->enabled)) {
+			if (isModEnabled('eventorganization')) {
 				print '<input type="checkbox" disabled name="usage_organize_event"'.(GETPOSTISSET('usage_organize_event') ? (GETPOST('usage_organize_event', 'alpha') != '' ? ' checked="checked"' : '') : ($object->usage_organize_event ? ' checked="checked"' : '')).'"> ';
 				$htmltext = $langs->trans("EventOrganizationDescriptionLong");
 				print $form->textwithpicto($langs->trans("ManageOrganizeEvent"), $htmltext);
diff --git a/htdocs/projet/contact.php b/htdocs/projet/contact.php
index be130572704..ec1f739f58f 100644
--- a/htdocs/projet/contact.php
+++ b/htdocs/projet/contact.php
@@ -34,7 +34,7 @@ if (isModEnabled('categorie')) {
 
 // Load translation files required by the page
 $langsLoad=array('projects', 'companies');
-if (!empty($conf->eventorganization->enabled)) {
+if (isModEnabled('eventorganization')) {
 	$langsLoad[]='eventorganization';
 }
 
@@ -315,7 +315,7 @@ if ($id > 0 || !empty($ref)) {
 	print '<table class="border tableforfield centpercent">';
 
 	// Usage
-	if (!empty($conf->global->PROJECT_USE_OPPORTUNITIES) || empty($conf->global->PROJECT_HIDE_TASKS) || !empty($conf->eventorganization->enabled)) {
+	if (!empty($conf->global->PROJECT_USE_OPPORTUNITIES) || empty($conf->global->PROJECT_HIDE_TASKS) || isModEnabled('eventorganization')) {
 		print '<tr><td class="tdtop">';
 		print $langs->trans("Usage");
 		print '</td>';
@@ -338,7 +338,7 @@ if ($id > 0 || !empty($ref)) {
 			print $form->textwithpicto($langs->trans("BillTime"), $htmltext);
 			print '<br>';
 		}
-		if (!empty($conf->eventorganization->enabled)) {
+		if (isModEnabled('eventorganization')) {
 			print '<input type="checkbox" disabled name="usage_organize_event"'.(GETPOSTISSET('usage_organize_event') ? (GETPOST('usage_organize_event', 'alpha') != '' ? ' checked="checked"' : '') : ($object->usage_organize_event ? ' checked="checked"' : '')).'"> ';
 			$htmltext = $langs->trans("EventOrganizationDescriptionLong");
 			print $form->textwithpicto($langs->trans("ManageOrganizeEvent"), $htmltext);
diff --git a/htdocs/projet/element.php b/htdocs/projet/element.php
index cf5c8fbde86..594362ba05d 100644
--- a/htdocs/projet/element.php
+++ b/htdocs/projet/element.php
@@ -134,7 +134,7 @@ if (!empty($conf->salaries->enabled)) {
 if (!empty($conf->mrp->enabled)) {
 	$langs->load("mrp");
 }
-if (!empty($conf->eventorganization->enabled)) {
+if (isModEnabled('eventorganization')) {
 	$langs->load("eventorganization");
 }
 
@@ -237,7 +237,7 @@ print '<div class="underbanner clearboth"></div>';
 print '<table class="border tableforfield centpercent">';
 
 // Usage
-if (!empty($conf->global->PROJECT_USE_OPPORTUNITIES) || empty($conf->global->PROJECT_HIDE_TASKS) || !empty($conf->eventorganization->enabled)) {
+if (!empty($conf->global->PROJECT_USE_OPPORTUNITIES) || empty($conf->global->PROJECT_HIDE_TASKS) || isModEnabled('eventorganization')) {
 	print '<tr><td class="tdtop">';
 	print $langs->trans("Usage");
 	print '</td>';
@@ -260,7 +260,7 @@ if (!empty($conf->global->PROJECT_USE_OPPORTUNITIES) || empty($conf->global->PRO
 		print $form->textwithpicto($langs->trans("BillTime"), $htmltext);
 		print '<br>';
 	}
-	if (!empty($conf->eventorganization->enabled)) {
+	if (isModEnabled('eventorganization')) {
 		print '<input type="checkbox" disabled name="usage_organize_event"'.(GETPOSTISSET('usage_organize_event') ? (GETPOST('usage_organize_event', 'alpha') != '' ? ' checked="checked"' : '') : ($object->usage_organize_event ? ' checked="checked"' : '')).'"> ';
 		$htmltext = $langs->trans("EventOrganizationDescriptionLong");
 		print $form->textwithpicto($langs->trans("ManageOrganizeEvent"), $htmltext);
diff --git a/htdocs/projet/ganttview.php b/htdocs/projet/ganttview.php
index dda13754d31..c5549429edb 100644
--- a/htdocs/projet/ganttview.php
+++ b/htdocs/projet/ganttview.php
@@ -137,7 +137,7 @@ if (($id > 0 && is_numeric($id)) || !empty($ref)) {
 	print '<table class="border tableforfield centpercent">';
 
 	// Usage
-	if (!empty($conf->global->PROJECT_USE_OPPORTUNITIES) || empty($conf->global->PROJECT_HIDE_TASKS) || !empty($conf->eventorganization->enabled)) {
+	if (!empty($conf->global->PROJECT_USE_OPPORTUNITIES) || empty($conf->global->PROJECT_HIDE_TASKS) || isModEnabled('eventorganization')) {
 		print '<tr><td class="tdtop">';
 		print $langs->trans("Usage");
 		print '</td>';
@@ -160,7 +160,7 @@ if (($id > 0 && is_numeric($id)) || !empty($ref)) {
 			print $form->textwithpicto($langs->trans("BillTime"), $htmltext);
 			print '<br>';
 		}
-		if (!empty($conf->eventorganization->enabled)) {
+		if (isModEnabled('eventorganization')) {
 			print '<input type="checkbox" disabled name="usage_organize_event"'.(GETPOSTISSET('usage_organize_event') ? (GETPOST('usage_organize_event', 'alpha') != '' ? ' checked="checked"' : '') : ($object->usage_organize_event ? ' checked="checked"' : '')).'"> ';
 			$htmltext = $langs->trans("EventOrganizationDescriptionLong");
 			print $form->textwithpicto($langs->trans("ManageOrganizeEvent"), $htmltext);
diff --git a/htdocs/projet/list.php b/htdocs/projet/list.php
index 7deaf0a1870..b22a8849820 100644
--- a/htdocs/projet/list.php
+++ b/htdocs/projet/list.php
@@ -42,7 +42,7 @@ if (isModEnabled('categorie')) {
 
 // Load translation files required by the page
 $langs->loadLangs(array('projects', 'companies', 'commercial'));
-if (!empty($conf->eventorganization->enabled) && $conf->eventorganization->enabled) {
+if (isModEnabled('eventorganization') && $conf->eventorganization->enabled) {
 	$langs->loadLangs(array('eventorganization'));
 }
 
diff --git a/htdocs/projet/tasks.php b/htdocs/projet/tasks.php
index de9bdf7855c..73d3c238026 100644
--- a/htdocs/projet/tasks.php
+++ b/htdocs/projet/tasks.php
@@ -37,7 +37,7 @@ if (isModEnabled('categorie')) {
 
 // Load translation files required by the page
 $langsLoad=array('projects', 'users', 'companies');
-if (!empty($conf->eventorganization->enabled)) {
+if (isModEnabled('eventorganization')) {
 	$langsLoad[]='eventorganization';
 }
 
@@ -572,7 +572,7 @@ if ($id > 0 || !empty($ref)) {
 	print '<table class="border tableforfield centpercent">';
 
 	// Usage
-	if (!empty($conf->global->PROJECT_USE_OPPORTUNITIES) || empty($conf->global->PROJECT_HIDE_TASKS) || !empty($conf->eventorganization->enabled)) {
+	if (!empty($conf->global->PROJECT_USE_OPPORTUNITIES) || empty($conf->global->PROJECT_HIDE_TASKS) || isModEnabled('eventorganization')) {
 		print '<tr><td class="tdtop">';
 		print $langs->trans("Usage");
 		print '</td>';
@@ -595,7 +595,7 @@ if ($id > 0 || !empty($ref)) {
 			print $form->textwithpicto($langs->trans("BillTime"), $htmltext);
 			print '<br>';
 		}
-		if (!empty($conf->eventorganization->enabled)) {
+		if (isModEnabled('eventorganization')) {
 			print '<input type="checkbox" disabled name="usage_organize_event"'.(GETPOSTISSET('usage_organize_event') ? (GETPOST('usage_organize_event', 'alpha') != '' ? ' checked="checked"' : '') : ($object->usage_organize_event ? ' checked="checked"' : '')).'"> ';
 			$htmltext = $langs->trans("EventOrganizationDescriptionLong");
 			print $form->textwithpicto($langs->trans("ManageOrganizeEvent"), $htmltext);
diff --git a/htdocs/projet/tasks/comment.php b/htdocs/projet/tasks/comment.php
index bed307d65bf..1f5628bb050 100644
--- a/htdocs/projet/tasks/comment.php
+++ b/htdocs/projet/tasks/comment.php
@@ -151,7 +151,7 @@ if ($id > 0 || !empty($ref)) {
 			print '<table class="border centpercent">';
 
 			// Usage
-			if (!empty($conf->global->PROJECT_USE_OPPORTUNITIES) || empty($conf->global->PROJECT_HIDE_TASKS) || !empty($conf->eventorganization->enabled)) {
+			if (!empty($conf->global->PROJECT_USE_OPPORTUNITIES) || empty($conf->global->PROJECT_HIDE_TASKS) || isModEnabled('eventorganization')) {
 				print '<tr><td class="tdtop">';
 				print $langs->trans("Usage");
 				print '</td>';
@@ -174,7 +174,7 @@ if ($id > 0 || !empty($ref)) {
 					print $form->textwithpicto($langs->trans("BillTime"), $htmltext);
 					print '<br>';
 				}
-				if (!empty($conf->eventorganization->enabled)) {
+				if (isModEnabled('eventorganization')) {
 					print '<input type="checkbox" disabled name="usage_organize_event"'.(GETPOSTISSET('usage_organize_event') ? (GETPOST('usage_organize_event', 'alpha') != '' ? ' checked="checked"' : '') : ($projectstatic->usage_organize_event ? ' checked="checked"' : '')).'"> ';
 					$htmltext = $langs->trans("EventOrganizationDescriptionLong");
 					print $form->textwithpicto($langs->trans("ManageOrganizeEvent"), $htmltext);
diff --git a/htdocs/projet/tasks/contact.php b/htdocs/projet/tasks/contact.php
index 680f8ecc70a..14a87b375e8 100644
--- a/htdocs/projet/tasks/contact.php
+++ b/htdocs/projet/tasks/contact.php
@@ -215,7 +215,7 @@ if ($id > 0 || !empty($ref)) {
 			print '<table class="border tableforfield centpercent">';
 
 			// Usage
-			if (!empty($conf->global->PROJECT_USE_OPPORTUNITIES) || empty($conf->global->PROJECT_HIDE_TASKS) || !empty($conf->eventorganization->enabled)) {
+			if (!empty($conf->global->PROJECT_USE_OPPORTUNITIES) || empty($conf->global->PROJECT_HIDE_TASKS) || isModEnabled('eventorganization')) {
 				print '<tr><td class="tdtop">';
 				print $langs->trans("Usage");
 				print '</td>';
@@ -238,7 +238,7 @@ if ($id > 0 || !empty($ref)) {
 					print $form->textwithpicto($langs->trans("BillTime"), $htmltext);
 					print '<br>';
 				}
-				if (!empty($conf->eventorganization->enabled)) {
+				if (isModEnabled('eventorganization')) {
 					print '<input type="checkbox" disabled name="usage_organize_event"'.(GETPOSTISSET('usage_organize_event') ? (GETPOST('usage_organize_event', 'alpha') != '' ? ' checked="checked"' : '') : ($projectstatic->usage_organize_event ? ' checked="checked"' : '')).'"> ';
 					$htmltext = $langs->trans("EventOrganizationDescriptionLong");
 					print $form->textwithpicto($langs->trans("ManageOrganizeEvent"), $htmltext);
diff --git a/htdocs/projet/tasks/document.php b/htdocs/projet/tasks/document.php
index f86d9c8f441..bc313dcebfa 100644
--- a/htdocs/projet/tasks/document.php
+++ b/htdocs/projet/tasks/document.php
@@ -171,7 +171,7 @@ if ($object->id > 0) {
 		print '<table class="border tableforfield centpercent">';
 
 		// Usage
-		if (!empty($conf->global->PROJECT_USE_OPPORTUNITIES) || empty($conf->global->PROJECT_HIDE_TASKS) || !empty($conf->eventorganization->enabled)) {
+		if (!empty($conf->global->PROJECT_USE_OPPORTUNITIES) || empty($conf->global->PROJECT_HIDE_TASKS) || isModEnabled('eventorganization')) {
 			print '<tr><td class="tdtop">';
 			print $langs->trans("Usage");
 			print '</td>';
@@ -194,7 +194,7 @@ if ($object->id > 0) {
 				print $form->textwithpicto($langs->trans("BillTime"), $htmltext);
 				print '<br>';
 			}
-			if (!empty($conf->eventorganization->enabled)) {
+			if (isModEnabled('eventorganization')) {
 				print '<input type="checkbox" disabled name="usage_organize_event"'.(GETPOSTISSET('usage_organize_event') ? (GETPOST('usage_organize_event', 'alpha') != '' ? ' checked="checked"' : '') : ($projectstatic->usage_organize_event ? ' checked="checked"' : '')).'"> ';
 				$htmltext = $langs->trans("EventOrganizationDescriptionLong");
 				print $form->textwithpicto($langs->trans("ManageOrganizeEvent"), $htmltext);
diff --git a/htdocs/projet/tasks/note.php b/htdocs/projet/tasks/note.php
index 6b7142dc0f2..40f8f636e72 100644
--- a/htdocs/projet/tasks/note.php
+++ b/htdocs/projet/tasks/note.php
@@ -161,7 +161,7 @@ if ($object->id > 0) {
 		print '<table class="border tableforfield centpercent">';
 
 		// Usage
-		if (!empty($conf->global->PROJECT_USE_OPPORTUNITIES) || empty($conf->global->PROJECT_HIDE_TASKS) || !empty($conf->eventorganization->enabled)) {
+		if (!empty($conf->global->PROJECT_USE_OPPORTUNITIES) || empty($conf->global->PROJECT_HIDE_TASKS) || isModEnabled('eventorganization')) {
 			print '<tr><td class="tdtop">';
 			print $langs->trans("Usage");
 			print '</td>';
@@ -184,7 +184,7 @@ if ($object->id > 0) {
 				print $form->textwithpicto($langs->trans("BillTime"), $htmltext);
 				print '<br>';
 			}
-			if (!empty($conf->eventorganization->enabled)) {
+			if (isModEnabled('eventorganization')) {
 				print '<input type="checkbox" disabled name="usage_organize_event"'.(GETPOSTISSET('usage_organize_event') ? (GETPOST('usage_organize_event', 'alpha') != '' ? ' checked="checked"' : '') : ($projectstatic->usage_organize_event ? ' checked="checked"' : '')).'"> ';
 				$htmltext = $langs->trans("EventOrganizationDescriptionLong");
 				print $form->textwithpicto($langs->trans("ManageOrganizeEvent"), $htmltext);
diff --git a/htdocs/projet/tasks/time.php b/htdocs/projet/tasks/time.php
index 28e641a4877..3d5c74ff5ed 100644
--- a/htdocs/projet/tasks/time.php
+++ b/htdocs/projet/tasks/time.php
@@ -39,7 +39,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/html.formintervention.class.php';
 
 // Load translation files required by the page
 $langsLoad=array('projects', 'bills', 'orders', 'companies');
-if (!empty($conf->eventorganization->enabled)) {
+if (isModEnabled('eventorganization')) {
 	$langsLoad[]='eventorganization';
 }
 
diff --git a/htdocs/societe/card.php b/htdocs/societe/card.php
index daa0c12b2b7..f8beacdbb2e 100644
--- a/htdocs/societe/card.php
+++ b/htdocs/societe/card.php
@@ -59,7 +59,7 @@ if (!empty($conf->accounting->enabled)) {
 if (!empty($conf->accounting->enabled)) {
 	require_once DOL_DOCUMENT_ROOT.'/accountancy/class/accountingaccount.class.php';
 }
-if (!empty($conf->eventorganization->enabled)) {
+if (isModEnabled('eventorganization')) {
 	require_once DOL_DOCUMENT_ROOT.'/eventorganization/class/conferenceorboothattendee.class.php';
 }
 

From c934fd1dbb40f937de286d8277105a6ca0f931e6 Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Wed, 31 Aug 2022 22:39:10 +0200
Subject: [PATCH 536/974] update code

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

diff --git a/htdocs/hrm/job_contact.php b/htdocs/hrm/job_contact.php
index 76f6e73d690..057e183f0b8 100644
--- a/htdocs/hrm/job_contact.php
+++ b/htdocs/hrm/job_contact.php
@@ -139,7 +139,7 @@ if ($object->id) {
 	 // Thirdparty
 	 $morehtmlref.='<br>'.$langs->trans('ThirdParty') . ' : ' . (is_object($object->thirdparty) ? $object->thirdparty->getNomUrl(1) : '');
 	 // Project
-	 if (! empty($conf->project->enabled))
+	 if (isModEnabled('project'))
 	 {
 	 $langs->load("projects");
 	 $morehtmlref.='<br>'.$langs->trans('Project') . ' ';

From 6d2506eeb9d8cf47968fc7c495cdf14a07d5cf3e Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Wed, 31 Aug 2022 22:39:32 +0200
Subject: [PATCH 537/974] update code

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

diff --git a/htdocs/hrm/position_contact.php b/htdocs/hrm/position_contact.php
index 56029f790a7..811de980af9 100644
--- a/htdocs/hrm/position_contact.php
+++ b/htdocs/hrm/position_contact.php
@@ -139,7 +139,7 @@ if ($object->id) {
 	 // Thirdparty
 	 $morehtmlref.='<br>'.$langs->trans('ThirdParty') . ' : ' . (is_object($object->thirdparty) ? $object->thirdparty->getNomUrl(1) : '');
 	 // Project
-	 if (! empty($conf->project->enabled))
+	 if (isModEnabled('project'))
 	 {
 	 $langs->load("projects");
 	 $morehtmlref.='<br>'.$langs->trans('Project') . ' ';

From 6963e3ddbcc38d5e6b95be232aa6788038864f21 Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Wed, 31 Aug 2022 22:39:53 +0200
Subject: [PATCH 538/974] update code

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

diff --git a/htdocs/hrm/skill_contact.php b/htdocs/hrm/skill_contact.php
index 5f284c4e72c..51610cfebb0 100644
--- a/htdocs/hrm/skill_contact.php
+++ b/htdocs/hrm/skill_contact.php
@@ -139,7 +139,7 @@ if ($object->id) {
 	 // Thirdparty
 	 $morehtmlref.='<br>'.$langs->trans('ThirdParty') . ' : ' . (is_object($object->thirdparty) ? $object->thirdparty->getNomUrl(1) : '');
 	 // Project
-	 if (! empty($conf->project->enabled))
+	 if (isModEnabled('project'))
 	 {
 	 $langs->load("projects");
 	 $morehtmlref.='<br>'.$langs->trans('Project') . ' ';

From 0bef12000bad7e59dcfcf56c0939f77258814f0d Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Wed, 31 Aug 2022 22:40:15 +0200
Subject: [PATCH 539/974] update code

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

diff --git a/htdocs/hrm/establishment/info.php b/htdocs/hrm/establishment/info.php
index afbd480e928..d83577ee349 100644
--- a/htdocs/hrm/establishment/info.php
+++ b/htdocs/hrm/establishment/info.php
@@ -147,7 +147,7 @@ if ($object->id > 0) {
 	 // Thirdparty
 	 $morehtmlref.='<br>'.$langs->trans('ThirdParty') . ' : ' . (is_object($object->thirdparty) ? $object->thirdparty->getNomUrl(1) : '');
 	 // Project
-	 if (! empty($conf->project->enabled))
+	 if (isModEnabled('project'))
 	 {
 	 $langs->load("projects");
 	 $morehtmlref.='<br>'.$langs->trans('Project') . ' ';

From 6ad73b065699265e77f0343330d5358423bf0953 Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Wed, 31 Aug 2022 22:40:37 +0200
Subject: [PATCH 540/974] update code

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

diff --git a/htdocs/knowledgemanagement/knowledgerecord_agenda.php b/htdocs/knowledgemanagement/knowledgerecord_agenda.php
index cbf8ccf0895..6a7817fca92 100644
--- a/htdocs/knowledgemanagement/knowledgerecord_agenda.php
+++ b/htdocs/knowledgemanagement/knowledgerecord_agenda.php
@@ -150,7 +150,7 @@ if ($object->id > 0) {
 	// Thirdparty
 	$morehtmlref.='<br>'.$langs->trans('ThirdParty') . ' : ' . (is_object($object->thirdparty) ? $object->thirdparty->getNomUrl(1) : '');
 	// Project
-	if (! empty($conf->project->enabled)) {
+	if (isModEnabled('project')) {
 		$langs->load("projects");
 		$morehtmlref.='<br>'.$langs->trans('Project') . ' ';
 		if ($permissiontoadd) {

From d5225cdf1d8ca2df954e6933a98427595583cf8e Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Wed, 31 Aug 2022 22:41:05 +0200
Subject: [PATCH 541/974] update code

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

diff --git a/htdocs/knowledgemanagement/knowledgerecord_card.php b/htdocs/knowledgemanagement/knowledgerecord_card.php
index 66b7b0ca160..f68158089b7 100644
--- a/htdocs/knowledgemanagement/knowledgerecord_card.php
+++ b/htdocs/knowledgemanagement/knowledgerecord_card.php
@@ -366,7 +366,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 	 // Thirdparty
 	 $morehtmlref.='<br>'.$langs->trans('ThirdParty') . ' : ' . (is_object($object->thirdparty) ? $object->thirdparty->getNomUrl(1) : '');
 	 // Project
-	 if (! empty($conf->project->enabled)) {
+	 if (isModEnabled('project')) {
 	 $langs->load("projects");
 	 $morehtmlref .= '<br>'.$langs->trans('Project') . ' ';
 	 if ($permissiontoadd) {

From 832d97d997479841de15a7293e6a497fffcc5cbf Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Wed, 31 Aug 2022 22:41:30 +0200
Subject: [PATCH 542/974] update code

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

diff --git a/htdocs/knowledgemanagement/knowledgerecord_contact.php b/htdocs/knowledgemanagement/knowledgerecord_contact.php
index 2b2facafc18..3d1fdc4378f 100644
--- a/htdocs/knowledgemanagement/knowledgerecord_contact.php
+++ b/htdocs/knowledgemanagement/knowledgerecord_contact.php
@@ -132,7 +132,7 @@ if ($object->id) {
 	 // Thirdparty
 	 $morehtmlref.='<br>'.$langs->trans('ThirdParty') . ' : ' . (is_object($object->thirdparty) ? $object->thirdparty->getNomUrl(1) : '');
 	 // Project
-	 if (! empty($conf->project->enabled))
+	 if (isModEnabled('project'))
 	 {
 	 $langs->load("projects");
 	 $morehtmlref.='<br>'.$langs->trans('Project') . ' ';

From fa28f18b263252a0c0557dc89a26cb54163bd5df Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Wed, 31 Aug 2022 22:41:50 +0200
Subject: [PATCH 543/974] update code

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

diff --git a/htdocs/knowledgemanagement/knowledgerecord_document.php b/htdocs/knowledgemanagement/knowledgerecord_document.php
index ce185c9b8cf..53dac51e4e4 100644
--- a/htdocs/knowledgemanagement/knowledgerecord_document.php
+++ b/htdocs/knowledgemanagement/knowledgerecord_document.php
@@ -130,7 +130,7 @@ if ($object->id) {
 	 // Thirdparty
 	 $morehtmlref.='<br>'.$langs->trans('ThirdParty') . ' : ' . (is_object($object->thirdparty) ? $object->thirdparty->getNomUrl(1) : '');
 	 // Project
-	 if (! empty($conf->project->enabled))
+	 if (isModEnabled('project'))
 	 {
 	 $langs->load("projects");
 	 $morehtmlref.='<br>'.$langs->trans('Project') . ' ';

From 656739de33c7b4926e58be11c9ef98262a69fe2b Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Wed, 31 Aug 2022 22:42:11 +0200
Subject: [PATCH 544/974] update code

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

diff --git a/htdocs/knowledgemanagement/knowledgerecord_note.php b/htdocs/knowledgemanagement/knowledgerecord_note.php
index 0f56a6115a3..2d876bf24f3 100644
--- a/htdocs/knowledgemanagement/knowledgerecord_note.php
+++ b/htdocs/knowledgemanagement/knowledgerecord_note.php
@@ -104,7 +104,7 @@ if ($id > 0 || !empty($ref)) {
 	 // Thirdparty
 	 $morehtmlref.='<br>'.$langs->trans('ThirdParty') . ' : ' . (is_object($object->thirdparty) ? $object->thirdparty->getNomUrl(1) : '');
 	 // Project
-	 if (! empty($conf->project->enabled))
+	 if (isModEnabled('project'))
 	 {
 	 $langs->load("projects");
 	 $morehtmlref.='<br>'.$langs->trans('Project') . ' ';

From 9e3f37294183502acbe7087dc25ea3efe4659cdd Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Wed, 31 Aug 2022 22:42:43 +0200
Subject: [PATCH 545/974] update code

---
 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 d209c64d088..7ec8e7894fc 100644
--- a/htdocs/loan/card.php
+++ b/htdocs/loan/card.php
@@ -309,7 +309,7 @@ if ($action == 'create') {
 	print '<tr><td>'.$langs->trans("Insurance").'</td><td><input name="insurance_amount" size="10" value="'.dol_escape_htmltag(GETPOST("insurance_amount")).'" placeholder="'.$langs->trans('Amount').'"></td></tr>';
 
 	// Project
-	if (!empty($conf->project->enabled)) {
+	if (isModEnabled('project')) {
 		$formproject = new FormProjets($db);
 
 		// Projet associe
@@ -424,7 +424,7 @@ if ($id > 0) {
 		$morehtmlref .= $form->editfieldkey("Label", 'label', $object->label, $object, $user->rights->loan->write, 'string', '', 0, 1);
 		$morehtmlref .= $form->editfieldval("Label", 'label', $object->label, $object, $user->rights->loan->write, 'string', '', null, null, '', 1);
 		// Project
-		if (!empty($conf->project->enabled)) {
+		if (isModEnabled('project')) {
 			$langs->loadLangs(array("projects"));
 			$morehtmlref .= '<br>'.$langs->trans('Project').' ';
 			if ($user->rights->loan->write) {

From 234dec1b5960a20da403ac484969f327d9c87017 Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Wed, 31 Aug 2022 22:43:13 +0200
Subject: [PATCH 546/974] update code

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

diff --git a/htdocs/loan/document.php b/htdocs/loan/document.php
index 3bc60980245..a9d92f472f4 100644
--- a/htdocs/loan/document.php
+++ b/htdocs/loan/document.php
@@ -28,7 +28,7 @@ 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/lib/loan.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
-if (!empty($conf->project->enabled)) {
+if (isModEnabled('project')) {
 	require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 }
 
@@ -103,7 +103,7 @@ if ($object->id) {
 	$morehtmlref .= $form->editfieldkey("Label", 'label', $object->label, $object, 0, 'string', '', 0, 1);
 	$morehtmlref .= $form->editfieldval("Label", 'label', $object->label, $object, 0, 'string', '', null, null, '', 1);
 	// Project
-	if (!empty($conf->project->enabled)) {
+	if (isModEnabled('project')) {
 		$langs->load("projects");
 		$morehtmlref .= '<br>'.$langs->trans('Project').' : ';
 		if ($user->rights->loan->write) {

From dae850e6843f692cda39c04d3a7cad965165a4cd Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Wed, 31 Aug 2022 22:43:35 +0200
Subject: [PATCH 547/974] update code

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

diff --git a/htdocs/loan/info.php b/htdocs/loan/info.php
index a0db5ca35a7..a0e235a2afb 100644
--- a/htdocs/loan/info.php
+++ b/htdocs/loan/info.php
@@ -26,7 +26,7 @@ require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/loan/class/loan.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/loan.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
-if (!empty($conf->project->enabled)) {
+if (isModEnabled('project')) {
 	require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 }
 
@@ -67,7 +67,7 @@ $morehtmlref = '<div class="refidno">';
 $morehtmlref .= $form->editfieldkey("Label", 'label', $object->label, $object, 0, 'string', '', 0, 1);
 $morehtmlref .= $form->editfieldval("Label", 'label', $object->label, $object, 0, 'string', '', null, null, '', 1);
 // Project
-if (!empty($conf->project->enabled)) {
+if (isModEnabled('project')) {
 	$langs->load("projects");
 	$morehtmlref .= '<br>'.$langs->trans('Project').' : ';
 	if ($user->rights->loan->write) {

From 9b7ec2dbc8798732003b4d12a1284fddcd16d947 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 31 Aug 2022 22:56:45 +0200
Subject: [PATCH 548/974] Fix missing img

---
 htdocs/core/menus/standard/eldy.lib.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/core/menus/standard/eldy.lib.php b/htdocs/core/menus/standard/eldy.lib.php
index e2f11c9544c..cdba19dd38a 100644
--- a/htdocs/core/menus/standard/eldy.lib.php
+++ b/htdocs/core/menus/standard/eldy.lib.php
@@ -1812,11 +1812,11 @@ function get_left_menu_accountancy($mainmenu, &$newmenu, $usemenuhider = 1, $lef
 		if (isModEnabled('comptabilite')) {
 			// Files
 			if (empty($conf->global->ACCOUNTANCY_HIDE_EXPORT_FILES_MENU)) {
-				$newmenu->add("/compta/accounting-files.php?mainmenu=accountancy&amp;leftmenu=accountancy_files", $langs->trans("AccountantFiles"), 0, $user->rights->compta->resultat->lire, '', $mainmenu, 'files');
+				$newmenu->add("/compta/accounting-files.php?mainmenu=accountancy&leftmenu=accountancy_files", $langs->trans("AccountantFiles"), 0, $user->rights->compta->resultat->lire, '', $mainmenu, 'files', 0, '', '', '', img_picto('', 'accountancy', 'class="paddingright pictofixedwidth"'));
 			}
 
 			// Bilan, resultats
-			$newmenu->add("/compta/resultat/index.php?leftmenu=report&amp;mainmenu=accountancy", $langs->trans("Reportings"), 0, $user->rights->compta->resultat->lire, '', $mainmenu, 'ca');
+			$newmenu->add("/compta/resultat/index.php?leftmenu=report&mainmenu=accountancy", $langs->trans("Reportings"), 0, $user->rights->compta->resultat->lire, '', $mainmenu, 'ca', 0, '', '', '', img_picto('', 'accountancy', 'class="paddingright pictofixedwidth"'));
 
 			if ($usemenuhider || empty($leftmenu) || preg_match('/report/', $leftmenu)) {
 				$newmenu->add("/compta/resultat/index.php?leftmenu=report", $langs->trans("MenuReportInOut"), 1, $user->rights->compta->resultat->lire);

From 4d18ebf0da26966946c5e8d5f4233d9a051de522 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20France?= <frederic.france@free.fr>
Date: Thu, 1 Sep 2022 08:14:29 +0200
Subject: [PATCH 549/974] fix syntax

---
 htdocs/core/modules/modCategorie.class.php | 2 +-
 htdocs/societe/class/societe.class.php     | 4 ++--
 htdocs/webservices/admin/index.php         | 8 ++++----
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/htdocs/core/modules/modCategorie.class.php b/htdocs/core/modules/modCategorie.class.php
index 73606987d9d..2cf66712716 100644
--- a/htdocs/core/modules/modCategorie.class.php
+++ b/htdocs/core/modules/modCategorie.class.php
@@ -297,7 +297,7 @@ 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("adherent")';
 		$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'=>"ParentCategory", 'p.rowid'=>'MemberId', 'p.lastname'=>'LastName', 'p.firstname'=>'Firstname');
 		$this->export_TypeFields_array[$r] = array('cat.label'=>"Text", 'cat.description'=>"Text", 'cat.fk_parent'=>'List:categorie:label:rowid', 'p.lastname'=>'Text', 'p.firstname'=>'Text');
diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php
index 3f7bb239c51..6f735af6d37 100644
--- a/htdocs/societe/class/societe.class.php
+++ b/htdocs/societe/class/societe.class.php
@@ -214,8 +214,8 @@ class Societe extends CommonObject
 		'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),
+		'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),
diff --git a/htdocs/webservices/admin/index.php b/htdocs/webservices/admin/index.php
index 9214b4ad392..4cc7df953b8 100644
--- a/htdocs/webservices/admin/index.php
+++ b/htdocs/webservices/admin/index.php
@@ -103,12 +103,12 @@ $webservices = array(
 		'thirdparty'		=> 'isModEnabled("societe")',
 		'contact'			=> 'isModEnabled("societe")',
 		'productorservice'	=> '(isModEnabled("product") || isModEnabled("service"))',
-		'order'				=> 'isModEnabled('commande')',
+		'order'				=> 'isModEnabled("commande")',
 		'invoice'			=> 'isModEnabled("facture")',
 		'supplier_invoice'	=> 'isModEnabled("fournisseur")',
-		'actioncomm'		=> 'isModEnabled('agenda')',
-		'category'			=> 'isModEnabled('categorie')',
-		'project'			=> '!empty($conf->project->enabled)',
+		'actioncomm'		=> 'isModEnabled("agenda")',
+		'category'			=> 'isModEnabled("categorie")',
+		'project'			=> 'isModEnabled("project")',
 		'other'				=> ''
 );
 

From bc76c9357ec0da856dfebccd80a6be035b6cc2c4 Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Thu, 1 Sep 2022 09:39:16 +0200
Subject: [PATCH 550/974] update code

---
 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 3bb8a5b44de..670f7d10cb8 100644
--- a/htdocs/comm/propal/class/propal.class.php
+++ b/htdocs/comm/propal/class/propal.class.php
@@ -297,7 +297,7 @@ class Propal extends CommonObject
 		'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'=>'$conf->societe->enabled', '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),
+		'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),

From 9ba54b502d3b671630c6871953a0736233d7f05c Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Thu, 1 Sep 2022 09:41:59 +0200
Subject: [PATCH 551/974] update code

---
 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 10cd8357e21..61de56a62fa 100644
--- a/htdocs/commande/class/commande.class.php
+++ b/htdocs/commande/class/commande.class.php
@@ -314,7 +314,7 @@ class Commande extends CommonOrder
 		'ref_int' =>array('type'=>'varchar(255)', 'label'=>'RefInt', 'enabled'=>1, 'visible'=>0, 'position'=>27), // deprecated
 		'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'=>'$conf->societe->enabled', '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),
+		'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),
 		'date_valid' =>array('type'=>'datetime', 'label'=>'DateValidation', 'enabled'=>1, 'visible'=>-1, 'position'=>62),
 		'date_cloture' =>array('type'=>'datetime', 'label'=>'DateClosing', 'enabled'=>1, 'visible'=>-1, 'position'=>65),

From 52bc56bc252b5d5aa29d5b6fc1241db241a9e646 Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Thu, 1 Sep 2022 09:42:58 +0200
Subject: [PATCH 552/974] update code

---
 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 2809b586ea1..4d5387e1b24 100644
--- a/htdocs/compta/facture/class/facture-rec.class.php
+++ b/htdocs/compta/facture/class/facture-rec.class.php
@@ -181,7 +181,7 @@ class FactureRec extends CommonInvoice
 		'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_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),

From 770e5e7dd2bded88266ea93f1788000c15221047 Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Thu, 1 Sep 2022 09:44:13 +0200
Subject: [PATCH 553/974] update code

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

diff --git a/htdocs/contrat/class/contrat.class.php b/htdocs/contrat/class/contrat.class.php
index 9a6326db10c..5b29f9abffe 100644
--- a/htdocs/contrat/class/contrat.class.php
+++ b/htdocs/contrat/class/contrat.class.php
@@ -233,7 +233,7 @@ class Contrat extends CommonObject
 		'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'=>'$conf->societe->enabled', '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_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),

From 08a7daed2f80da01bf82144032c0e41c3e49d3cb Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Thu, 1 Sep 2022 09:49:51 +0200
Subject: [PATCH 554/974] update code

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

diff --git a/htdocs/core/modules/modCategorie.class.php b/htdocs/core/modules/modCategorie.class.php
index 6a7ddc8a864..10955f9511a 100644
--- a/htdocs/core/modules/modCategorie.class.php
+++ b/htdocs/core/modules/modCategorie.class.php
@@ -379,7 +379,7 @@ class modCategorie extends DolibarrModules
 		$this->export_code[$r] = $this->rights_class.'_6_'.Categorie::$MAP_ID_TO_CODE[6];
 		$this->export_label[$r] = 'CatProjectsList';
 		$this->export_icon[$r] = $this->picto;
-		$this->export_enabled[$r] = 'isModEnabled('project')';
+		$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", 'p.rowid'=>'ProjectId', 'p.ref'=>'Ref', 's.rowid'=>"IdThirdParty", 's.nom'=>"Name");
 		$this->export_TypeFields_array[$r] = array('cat.label'=>"Text", 'cat.description'=>"Text", 'cat.fk_parent'=>'List:categorie:label:rowid', 'p.ref'=>'Text', 's.rowid'=>"Numeric", 's.nom'=>"Text");

From 67e523de2094e7ecfda565d955a4e5dfa41c02ce Mon Sep 17 00:00:00 2001
From: Anthony Berton <bertonanthony@gmail.com>
Date: Thu, 1 Sep 2022 09:51:10 +0200
Subject: [PATCH 555/974] fix index

---
 htdocs/product/index.php | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/htdocs/product/index.php b/htdocs/product/index.php
index e976e176224..b76be278a44 100644
--- a/htdocs/product/index.php
+++ b/htdocs/product/index.php
@@ -341,6 +341,11 @@ if ((isModEnabled("product") || isModEnabled("service")) && ($user->rights->prod
 				$product_static->status_buy = $objp->tobuy;
 				$product_static->status_batch = $objp->tobatch;
 
+				$usercancreadprice = getDolGlobalString('MAIN_USE_ADVANCED_PERMS')?$user->hasRight('product', 'product_advance', 'read_prices'):$user->hasRight('product', 'lire');
+				if ($product_static->isService()) {
+					$usercancreadprice = getDolGlobalString('MAIN_USE_ADVANCED_PERMS')?$user->hasRight('service', 'service_advance', 'read_prices'):$user->hasRight('service', 'lire');
+				}
+
 				// Multilangs
 				if (!empty($conf->global->MAIN_MULTILANGS)) {
 					$sql = "SELECT label";
@@ -378,10 +383,12 @@ if ((isModEnabled("product") || isModEnabled("service")) && ($user->rights->prod
 						}
 					}
 					print '<td class="nowraponall amount right">';
-					if (isset($objp->price_base_type) && $objp->price_base_type == 'TTC') {
-						print price($objp->price_ttc).' '.$langs->trans("TTC");
-					} else {
-						print price($objp->price).' '.$langs->trans("HT");
+					if ($usercancreadprice) {
+						if (isset($objp->price_base_type) && $objp->price_base_type == 'TTC') {
+							print price($objp->price_ttc).' '.$langs->trans("TTC");
+						} else {
+							print price($objp->price).' '.$langs->trans("HT");
+						}
 					}
 					print '</td>';
 				}
@@ -410,7 +417,7 @@ if ((isModEnabled("product") || isModEnabled("service")) && ($user->rights->prod
 // TODO Move this into a page that should be available into menu "accountancy - report - turnover - per quarter"
 // Also method used for counting must provide the 2 possible methods like done by all other reports into menu "accountancy - report - turnover":
 // "commitment engagment" method and "cash accounting" method
-if (!empty($conf->global->MAIN_SHOW_PRODUCT_ACTIVITY_TRIM)) {
+if ( isModEnabled("invoice") && $user->hasRight('facture', 'lire') && getDolGlobalString('MAIN_SHOW_PRODUCT_ACTIVITY_TRIM')) {
 	if (isModEnabled("product")) {
 		activitytrim(0);
 	}

From 3c453296e8760f8515c5027719bbb3d53fe1c828 Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Thu, 1 Sep 2022 09:52:10 +0200
Subject: [PATCH 556/974] update code

---
 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 33d7e5ed641..9e2ff6e76e6 100644
--- a/htdocs/eventorganization/class/conferenceorbooth.class.php
+++ b/htdocs/eventorganization/class/conferenceorbooth.class.php
@@ -107,7 +107,7 @@ class ConferenceOrBooth extends ActionComm
 		'ref' => array('type'=>'integer', 'label'=>'Ref', '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'=>30, 'notnull'=>0, 'visible'=>1, 'searchall'=>1, 'css'=>'minwidth300', 'csslist'=>'tdoverflowmax125', 'help'=>"OrganizationEvenLabelName", 'showoncombobox'=>'1',),
 		'fk_soc' => array('type'=>'integer:Societe:societe/class/societe.class.php:1:status=1 AND entity IN (__SHARED_ENTITIES__)', 'label'=>'ThirdParty', 'enabled'=>'$conf->societe->enabled', 'position'=>50, 'notnull'=>-1, 'visible'=>1, 'index'=>1, 'help'=>"OrganizationEventLinkToThirdParty", 'picto'=>'company', 'css'=>'tdoverflowmax150 maxwidth500'),
-		'fk_project' => array('type'=>'integer:Project:projet/class/project.class.php:1:t.usage_organize_event=1', 'label'=>'Project', 'enabled'=>isModEnabled('project'), 'position'=>52, 'notnull'=>-1, 'visible'=>-1, 'index'=>1, 'picto'=>'project', 'css'=>'tdoverflowmax150 maxwidth500'),
+		'fk_project' => array('type'=>'integer:Project:projet/class/project.class.php:1:t.usage_organize_event=1', 'label'=>'Project', 'enabled'=>"isModEnabled('project')", 'position'=>52, 'notnull'=>-1, 'visible'=>-1, 'index'=>1, 'picto'=>'project', 'css'=>'tdoverflowmax150 maxwidth500'),
 		'note' => array('type'=>'text', 'label'=>'Description', 'enabled'=>'1', 'position'=>60, 'notnull'=>0, 'visible'=>1),
 		'fk_action' => array('type'=>'sellist:c_actioncomm:libelle:id::module LIKE (\'%@eventorganization\')', 'label'=>'Format', 'enabled'=>'1', 'position'=>60, 'notnull'=>1, 'visible'=>1, 'css'=>'width300'),
 		'datep' => array('type'=>'datetime', 'label'=>'DateStart', 'enabled'=>'1', 'position'=>70, 'notnull'=>0, 'visible'=>1, 'showoncombobox'=>'2',),

From dc6059b5873079e88b7584fb2c04089ac2de5044 Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Thu, 1 Sep 2022 09:52:54 +0200
Subject: [PATCH 557/974] update code

---
 .../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 75c9220ef3f..df9d9a85f09 100644
--- a/htdocs/eventorganization/class/conferenceorboothattendee.class.php
+++ b/htdocs/eventorganization/class/conferenceorboothattendee.class.php
@@ -104,7 +104,7 @@ class ConferenceOrBoothAttendee extends CommonObject
 		'rowid' => array('type'=>'integer', 'label'=>'TechnicalID', 'enabled'=>'1', 'position'=>1, 'notnull'=>1, 'visible'=>0, 'noteditable'=>'1', 'index'=>1, 'css'=>'left', 'comment'=>"Id"),
 		'ref' => array('type'=>'varchar(128)', 'label'=>'Ref', 'enabled'=>'1', 'position'=>10, 'notnull'=>1, 'visible'=>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'=>55, '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'=>'tdoverflowmax150 maxwidth500'),
+		'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'=>'tdoverflowmax150 maxwidth500'),
 		'email' => array('type'=>'mail', 'label'=>'EmailAttendee', 'enabled'=>'1', 'position'=>30, 'notnull'=>1, 'visible'=>1, 'index'=>1, 'autofocusoncreate'=>1, 'searchall'=>1),
 		'firstname' => array('type'=>'varchar(100)', 'label'=>'Firstname', 'enabled'=>'1', 'position'=>31, 'notnull'=>0, 'visible'=>1, 'index'=>1, 'searchall'=>1),
 		'lastname' => array('type'=>'varchar(100)', 'label'=>'Lastname', 'enabled'=>'1', 'position'=>32, 'notnull'=>0, 'visible'=>1, 'index'=>1, 'searchall'=>1),

From edfee437bca37fbdb3b10850f21127aff9ff23eb Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Thu, 1 Sep 2022 09:53:54 +0200
Subject: [PATCH 558/974] update code

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

diff --git a/htdocs/fichinter/class/fichinter.class.php b/htdocs/fichinter/class/fichinter.class.php
index 84cf2ae60b7..a2b038bc752 100644
--- a/htdocs/fichinter/class/fichinter.class.php
+++ b/htdocs/fichinter/class/fichinter.class.php
@@ -40,7 +40,7 @@ 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'=>'$conf->societe->enabled', '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_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),

From 0f74b049278c60a933abd4086fa54acb9f466485 Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Thu, 1 Sep 2022 09:54:43 +0200
Subject: [PATCH 559/974] update code

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

diff --git a/htdocs/fourn/class/fournisseur.commande.class.php b/htdocs/fourn/class/fournisseur.commande.class.php
index c7552960a88..87c5640479b 100644
--- a/htdocs/fourn/class/fournisseur.commande.class.php
+++ b/htdocs/fourn/class/fournisseur.commande.class.php
@@ -218,7 +218,7 @@ class CommandeFournisseur extends CommonOrder
 		'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),
+		'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'=>60),
 		'date_approve' =>array('type'=>'datetime', 'label'=>'DateApprove', 'enabled'=>1, 'visible'=>-1, 'position'=>62),
 		'date_approve2' =>array('type'=>'datetime', 'label'=>'DateApprove2', 'enabled'=>1, 'visible'=>3, 'position'=>64),

From f5a50c828d8508a4386ffb332b44c01633652090 Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Thu, 1 Sep 2022 09:55:19 +0200
Subject: [PATCH 560/974] update code

---
 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 9a9ad1ffe62..c85cdc2d0ed 100644
--- a/htdocs/fourn/class/fournisseur.facture-rec.class.php
+++ b/htdocs/fourn/class/fournisseur.facture-rec.class.php
@@ -195,7 +195,7 @@ class FactureFournisseurRec extends CommonInvoice
 
 		'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_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'=>'$conf->banque->enabled', '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),

From fb1bfbf800213245ca711334bb35f171cad90e95 Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Thu, 1 Sep 2022 09:55:54 +0200
Subject: [PATCH 561/974] update code

---
 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 3bb8aeec677..c9e4af6b0d5 100644
--- a/htdocs/fourn/class/fournisseur.facture.class.php
+++ b/htdocs/fourn/class/fournisseur.facture.class.php
@@ -297,7 +297,7 @@ class FactureFournisseur extends CommonInvoice
 		'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_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'=>'$conf->banque->enabled', '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),

From a632ae1d9e11bc277d4d5491b0d08a076cf2329c Mon Sep 17 00:00:00 2001
From: Faustin <faustin.boitel@bordeaux-inp.fr>
Date: Thu, 1 Sep 2022 09:59:20 +0200
Subject: [PATCH 562/974] forgotten print

---
 htdocs/admin/emailcollector_card.php | 2 --
 1 file changed, 2 deletions(-)

diff --git a/htdocs/admin/emailcollector_card.php b/htdocs/admin/emailcollector_card.php
index 919ae21f2d4..81a1e9d45b5 100644
--- a/htdocs/admin/emailcollector_card.php
+++ b/htdocs/admin/emailcollector_card.php
@@ -476,9 +476,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 
 				$f = $client->getFolders(false, $object->source_directory);
 				$nbemail = $f[0]->examine()["exists"];
-				print "mails:".$nbemail;
 				$morehtml .= $nbemail;
-				print "helo";
 			} else {
 				try {
 					if ($sourcedir) {

From cd46f8b3b9ad3c8d3cba4fcd569dddfb0f5ee589 Mon Sep 17 00:00:00 2001
From: Anthony Berton <bertonanthony@gmail.com>
Date: Thu, 1 Sep 2022 10:00:36 +0200
Subject: [PATCH 563/974] FIX - Box

---
 htdocs/core/boxes/box_produits.php | 37 ++++++++++++++++++------------
 1 file changed, 22 insertions(+), 15 deletions(-)

diff --git a/htdocs/core/boxes/box_produits.php b/htdocs/core/boxes/box_produits.php
index 7a9518d345e..505d022dccd 100644
--- a/htdocs/core/boxes/box_produits.php
+++ b/htdocs/core/boxes/box_produits.php
@@ -150,6 +150,11 @@ class box_produits extends ModeleBoxes
 					$productstatic->accountancy_code_buy_export = $objp->accountancy_code_buy_export;
 					$productstatic->date_modification = $datem;
 
+					$usercancreadprice = getDolGlobalString('MAIN_USE_ADVANCED_PERMS')?$user->hasRight('product', 'product_advance', 'read_prices'):$user->hasRight('product', 'lire');
+					if ($productstatic->isService()) {
+						$usercancreadprice = getDolGlobalString('MAIN_USE_ADVANCED_PERMS')?$user->hasRight('service', 'service_advance', 'read_prices'):$user->hasRight('service', 'lire');
+					}
+
 					$this->info_box_contents[$line][] = array(
 						'td' => 'class="tdoverflowmax100 maxwidth100onsmartphone"',
 						'text' => $productstatic->getNomUrl(1),
@@ -162,22 +167,24 @@ class box_produits extends ModeleBoxes
 					);
 					$price = '';
 					$price_base_type = '';
-					if (empty($conf->dynamicprices->enabled) || empty($objp->fk_price_expression)) {
-						$price_base_type = $langs->trans($objp->price_base_type);
-						$price = ($objp->price_base_type == 'HT') ?price($objp->price) : $price = price($objp->price_ttc);
-					} else {
-						//Parse the dynamic price
-						$productstatic->fetch($objp->rowid, '', '', 1);
-						$priceparser = new PriceParser($this->db);
-						$price_result = $priceparser->parseProduct($productstatic);
-						if ($price_result >= 0) {
-							if ($objp->price_base_type == 'HT') {
-								$price_base_type = $langs->trans("HT");
-							} else {
-								$price_result = $price_result * (1 + ($productstatic->tva_tx / 100));
-								$price_base_type = $langs->trans("TTC");
+					if ($usercancreadprice) {
+						if (empty($conf->dynamicprices->enabled) || empty($objp->fk_price_expression)) {
+							$price_base_type = $langs->trans($objp->price_base_type);
+							$price = ($objp->price_base_type == 'HT') ?price($objp->price) : $price = price($objp->price_ttc);
+						} else {
+							//Parse the dynamic price
+							$productstatic->fetch($objp->rowid, '', '', 1);
+							$priceparser = new PriceParser($this->db);
+							$price_result = $priceparser->parseProduct($productstatic);
+							if ($price_result >= 0) {
+								if ($objp->price_base_type == 'HT') {
+									$price_base_type = $langs->trans("HT");
+								} else {
+									$price_result = $price_result * (1 + ($productstatic->tva_tx / 100));
+									$price_base_type = $langs->trans("TTC");
+								}
+								$price = price($price_result);
 							}
-							$price = price($price_result);
 						}
 					}
 					$this->info_box_contents[$line][] = array(

From 328c55498376e45b780d085b33a5e55937f1fce5 Mon Sep 17 00:00:00 2001
From: Anthony Berton <bertonanthony@gmail.com>
Date: Thu, 1 Sep 2022 10:05:08 +0200
Subject: [PATCH 564/974] FIX - php V8 warning commonobject class

---
 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 5b5de36406a..2983282a9e1 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -749,7 +749,7 @@ abstract class CommonObject
 			$this->lastname = dol_ucwords(dol_strtolower($this->lastname));
 			$this->firstname = dol_ucwords(dol_strtolower($this->firstname));
 			$this->name = dol_ucwords(dol_strtolower($this->name));
-			$this->name_alias = dol_ucwords(dol_strtolower($this->name_alias));
+			$this->name_alias = isset($this->name_alias)?dol_ucwords(dol_strtolower($this->name_alias)):'';
 		}
 		if (!empty($conf->global->MAIN_ALL_TO_UPPER)) {
 			$this->lastname = dol_strtoupper($this->lastname);

From 8bf8beb8980f7b351bc25921e1f12da1fc340404 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 1 Sep 2022 10:54:20 +0200
Subject: [PATCH 565/974] Debug module ticket

---
 htdocs/admin/ihm.php                         |  28 +-
 htdocs/admin/ticket_public.php               |   8 +-
 htdocs/core/class/html.formticket.class.php  |   6 +-
 htdocs/exports/export.php                    |   2 +-
 htdocs/imports/import.php                    |   6 +-
 htdocs/langs/en_US/ticket.lang               |   2 +-
 htdocs/main.inc.php                          |   5 +
 htdocs/public/ticket/create_ticket.php       | 552 ++++++++++---------
 htdocs/public/ticket/index.php               |  12 +-
 htdocs/public/ticket/list.php                |  30 +-
 htdocs/public/ticket/view.php                |  13 +-
 htdocs/theme/eldy/main_menu_fa_icons.inc.php |   4 -
 htdocs/theme/md/main_menu_fa_icons.inc.php   |   4 -
 htdocs/user/class/user.class.php             |   4 +-
 14 files changed, 348 insertions(+), 328 deletions(-)

diff --git a/htdocs/admin/ihm.php b/htdocs/admin/ihm.php
index 7763c190482..48541310372 100644
--- a/htdocs/admin/ihm.php
+++ b/htdocs/admin/ihm.php
@@ -375,6 +375,20 @@ if ($mode == 'other') {
 	print '<td class="titlefieldmiddle"></td>';
 	print '</tr>';
 
+	// Show Quick Add link
+	print '<tr class="oddeven"><td>' . $langs->trans("ShowQuickAddLink") . '</td><td>';
+	print ajax_constantonoff("MAIN_USE_TOP_MENU_QUICKADD_DROPDOWN", array(), $conf->entity, 0, 0, 1, 0, 0, 0, '', 'other');
+	print '</td>';
+	print '</tr>';
+
+	// Hide wiki link on login page
+	$pictohelp = '<span class="fa fa-question-circle"></span>';
+	print '<tr class="oddeven"><td>' . str_replace('{picto}', $pictohelp, $langs->trans("DisableLinkToHelp", '{picto}')) . '</td><td>';
+	print ajax_constantonoff("MAIN_HELP_DISABLELINK", array(), $conf->entity, 0, 0, 1, 0, 0, 0, '', 'other');
+	//print $form->selectyesno('MAIN_HELP_DISABLELINK', isset($conf->global->MAIN_HELP_DISABLELINK) ? $conf->global->MAIN_HELP_DISABLELINK : 0, 1);
+	print '</td>';
+	print '</tr>';
+
 	// Max size of lists
 	print '<tr class="oddeven"><td>' . $langs->trans("DefaultMaxSizeList") . '</td><td><input class="flat" name="main_size_liste_limit" size="4" value="' . $conf->global->MAIN_SIZE_LISTE_LIMIT . '"></td>';
 	print '</tr>';
@@ -439,12 +453,6 @@ if ($mode == 'other') {
 	print '</tr>';
 	*/
 
-	// Show Quick Add link
-	print '<tr class="oddeven"><td>' . $langs->trans("ShowQuickAddLink") . '</td><td>';
-	print ajax_constantonoff("MAIN_USE_TOP_MENU_QUICKADD_DROPDOWN", array(), $conf->entity, 0, 0, 1, 0, 0, 0, '', 'other');
-	print '</td>';
-	print '</tr>';
-
 	// Show bugtrack link
 	print '<tr class="oddeven"><td>';
 	print $form->textwithpicto($langs->trans("ShowBugTrackLink", $langs->transnoentitiesnoconv("FindBug")), $langs->trans("ShowBugTrackLinkDesc"));
@@ -453,14 +461,6 @@ if ($mode == 'other') {
 	print '</td>';
 	print '</tr>';
 
-	// Hide wiki link on login page
-	$pictohelp = '<span class="fa fa-question-circle"></span>';
-	print '<tr class="oddeven"><td>' . str_replace('{picto}', $pictohelp, $langs->trans("DisableLinkToHelp", '{picto}')) . '</td><td>';
-	print ajax_constantonoff("MAIN_HELP_DISABLELINK", array(), $conf->entity, 0, 0, 1, 0, 0, 0, '', 'other');
-	//print $form->selectyesno('MAIN_HELP_DISABLELINK', isset($conf->global->MAIN_HELP_DISABLELINK) ? $conf->global->MAIN_HELP_DISABLELINK : 0, 1);
-	print '</td>';
-	print '</tr>';
-
 	// Disable javascript and ajax
 	print '<tr class="oddeven"><td>' . $form->textwithpicto($langs->trans("DisableJavascript"), $langs->trans("DisableJavascriptNote")) . '</td><td>';
 	print ajax_constantonoff("MAIN_DISABLE_JAVASCRIPT", array(), $conf->entity, 0, 0, 1, 0, 0, 0, '', 'other');
diff --git a/htdocs/admin/ticket_public.php b/htdocs/admin/ticket_public.php
index fdb3117423b..a0df28a8f84 100644
--- a/htdocs/admin/ticket_public.php
+++ b/htdocs/admin/ticket_public.php
@@ -101,7 +101,7 @@ if ($action == 'setTICKET_ENABLE_PUBLIC_INTERFACE') {
 	}
 
 	$text_home = GETPOST('TICKET_PUBLIC_TEXT_HOME', 'restricthtml');
-	if (!empty($text_home)) {
+	if (GETPOSTISSET('TICKET_PUBLIC_TEXT_HOME')) {
 		$res = dolibarr_set_const($db, 'TICKET_PUBLIC_TEXT_HOME', $text_home, 'chaine', 0, '', $conf->entity);
 	} else {
 		$res = dolibarr_set_const($db, 'TICKET_PUBLIC_TEXT_HOME', $langs->trans('TicketPublicInterfaceTextHome'), 'chaine', 0, '', $conf->entity);
@@ -371,8 +371,8 @@ if (!empty($conf->global->TICKET_ENABLE_PUBLIC_INTERFACE)) {
 	print $form->textwithpicto('', $langs->trans("TicketPublicInterfaceTopicHelp"), 1, 'help');
 	print '</td></tr>';
 
-	// Texte d'accueil homepage
-	$public_text_home = $conf->global->TICKET_PUBLIC_TEXT_HOME ? $conf->global->TICKET_PUBLIC_TEXT_HOME : $langs->trans('TicketPublicInterfaceTextHome');
+	// Text on home page
+	$public_text_home = getDolGlobalString('TICKET_PUBLIC_TEXT_HOME', '<span class="opacitymedium">'.$langs->trans("TicketPublicDesc").'</span>');
 	print '<tr><td>'.$langs->trans("TicketPublicInterfaceTextHomeLabelAdmin").'</label>';
 	print '</td><td>';
 	require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
@@ -383,7 +383,7 @@ if (!empty($conf->global->TICKET_ENABLE_PUBLIC_INTERFACE)) {
 	print $form->textwithpicto('', $langs->trans("TicketPublicInterfaceTextHomeHelpAdmin"), 1, 'help');
 	print '</td></tr>';
 
-	// Texte d'aide à la saisie du message
+	// Text to help to enter a ticket
 	$public_text_help_message = $conf->global->TICKET_PUBLIC_TEXT_HELP_MESSAGE ? $conf->global->TICKET_PUBLIC_TEXT_HELP_MESSAGE : $langs->trans('TicketPublicPleaseBeAccuratelyDescribe');
 	print '<tr><td>'.$langs->trans("TicketPublicInterfaceTextHelpMessageLabelAdmin").'</label>';
 	print '</td><td>';
diff --git a/htdocs/core/class/html.formticket.class.php b/htdocs/core/class/html.formticket.class.php
index 62965413a5d..32e6912b9ea 100644
--- a/htdocs/core/class/html.formticket.class.php
+++ b/htdocs/core/class/html.formticket.class.php
@@ -315,7 +315,7 @@ class FormTicket
 
 		// Type
 		print '<tr><td class="titlefield"><span class="fieldrequired"><label for="selecttype_code">'.$langs->trans("TicketTypeRequest").'</span></label></td><td>';
-		$this->selectTypesTickets((GETPOST('type_code', 'alpha') ? GETPOST('type_code', 'alpha') : $this->type_code), 'type_code', '', 2, 0, 0, 0, 'minwidth200');
+		$this->selectTypesTickets((GETPOST('type_code', 'alpha') ? GETPOST('type_code', 'alpha') : $this->type_code), 'type_code', '', 2, 1, 0, 0, 'minwidth200');
 		print '</td></tr>';
 
 		// Group
@@ -328,7 +328,7 @@ class FormTicket
 		print '</td></tr>';
 
 		// Severity
-		print '<tr><td><span class="fieldrequired"><label for="selectseverity_code">'.$langs->trans("TicketSeverity").'</span></label></td><td>';
+		print '<tr><td><span class=""><label for="selectseverity_code">'.$langs->trans("TicketSeverity").'</span></label></td><td>';
 		$this->selectSeveritiesTickets((GETPOST('severity_code') ? GETPOST('severity_code') : $this->severity_code), 'severity_code', '', 2, 0);
 		print '</td></tr>';
 
@@ -643,7 +643,7 @@ class FormTicket
 			print dol_get_fiche_end();
 		}
 
-		print '<br>';
+		print '<br><br>';
 
 		print $form->buttonsSaveCancel(((isset($this->withreadid) && $this->withreadid > 0) ? "SendResponse" : "CreateTicket"), ($this->withcancel ? "Cancel" : ""));
 
diff --git a/htdocs/exports/export.php b/htdocs/exports/export.php
index f06e83f4c40..4591ccd0bf3 100644
--- a/htdocs/exports/export.php
+++ b/htdocs/exports/export.php
@@ -451,7 +451,7 @@ if ($step == 1 || !$datatoexport) {
 			print $label;
 			print '</td><td class="right">';
 			if ($objexport->array_export_perms[$key]) {
-				print '<a href="'.DOL_URL_ROOT.'/exports/export.php?step=2&module_position='.$objexport->array_export_module[$key]->module_position.'&datatoexport='.$objexport->array_export_code[$key].'">'.img_picto($langs->trans("NewExport"), 'next', 'class="fa-15x"').'</a>';
+				print '<a href="'.DOL_URL_ROOT.'/exports/export.php?step=2&module_position='.$objexport->array_export_module[$key]->module_position.'&datatoexport='.$objexport->array_export_code[$key].'">'.img_picto($langs->trans("NewExport"), 'next', 'class="fa-15"').'</a>';
 			} else {
 				print '<span class="opacitymedium">'.$langs->trans("NotEnoughPermissions").'</span>';
 			}
diff --git a/htdocs/imports/import.php b/htdocs/imports/import.php
index 564a41ab7a0..a66814ce1b1 100644
--- a/htdocs/imports/import.php
+++ b/htdocs/imports/import.php
@@ -394,7 +394,7 @@ if ($step == 1 || !$datatoimport) {
 			print $objimport->array_import_label[$key];
 			print '</td><td style="text-align: right">';
 			if ($objimport->array_import_perms[$key]) {
-				print '<a href="'.DOL_URL_ROOT.'/imports/import.php?step=2&datatoimport='.$objimport->array_import_code[$key].$param.'">'.img_picto($langs->trans("NewImport"), 'next', 'class="fa-15x"').'</a>';
+				print '<a href="'.DOL_URL_ROOT.'/imports/import.php?step=2&datatoimport='.$objimport->array_import_code[$key].$param.'">'.img_picto($langs->trans("NewImport"), 'next', 'class="fa-15"').'</a>';
 			} else {
 				print $langs->trans("NotEnoughPermissions");
 			}
@@ -499,7 +499,7 @@ if ($step == 2 && $datatoimport) {
 		print '</td>';
 		// Action button
 		print '<td style="text-align:right">';
-		print '<a href="'.DOL_URL_ROOT.'/imports/import.php?step=3&format='.$key.$param.'">'.img_picto($langs->trans("SelectFormat"), 'next', 'class="fa-15x"').'</a>';
+		print '<a href="'.DOL_URL_ROOT.'/imports/import.php?step=3&format='.$key.$param.'">'.img_picto($langs->trans("SelectFormat"), 'next', 'class="fa-15"').'</a>';
 		print '</td>';
 		print '</tr>';
 	}
@@ -727,7 +727,7 @@ if ($step == 3 && $datatoimport) {
 			print '">'.img_delete().'</a></td>';
 			// Action button
 			print '<td style="text-align:right">';
-			print '<a href="'.$_SERVER['PHP_SELF'].'?step=4'.$param.'&filetoimport='.urlencode($relativepath).'">'.img_picto($langs->trans("NewImport"), 'next', 'class="fa-15x"').'</a>';
+			print '<a href="'.$_SERVER['PHP_SELF'].'?step=4'.$param.'&filetoimport='.urlencode($relativepath).'">'.img_picto($langs->trans("NewImport"), 'next', 'class="fa-15"').'</a>';
 			print '</td>';
 			print '</tr>';
 		}
diff --git a/htdocs/langs/en_US/ticket.lang b/htdocs/langs/en_US/ticket.lang
index f34f338c931..3e252e407e4 100644
--- a/htdocs/langs/en_US/ticket.lang
+++ b/htdocs/langs/en_US/ticket.lang
@@ -296,7 +296,7 @@ TicketNewEmailBodyInfosTrackUrlCustomer=You can view the progress of the ticket
 TicketCloseEmailBodyInfosTrackUrlCustomer=You can consult the history of this ticket by clicking the following link
 TicketEmailPleaseDoNotReplyToThisEmail=Please do not reply directly to this email! Use the link to reply into the interface.
 TicketPublicInfoCreateTicket=This form allows you to record a support ticket in our management system.
-TicketPublicPleaseBeAccuratelyDescribe=Please accurately describe the problem. Provide the most information possible to allow us to correctly identify your request.
+TicketPublicPleaseBeAccuratelyDescribe=Please accurately describe your question. Provide the most information possible to allow us to correctly identify your request.
 TicketPublicMsgViewLogIn=Please enter ticket tracking ID
 TicketTrackId=Public Tracking ID
 OneOfTicketTrackId=One of your tracking ID
diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index 49c427ace71..3cbef0d799e 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -1153,6 +1153,11 @@ if (!defined('NOLOGIN')) {
 		$conf->theme = $user->conf->MAIN_THEME;
 		$conf->css = "/theme/".$conf->theme."/style.css.php";
 	}
+} else {
+	// We may have NOLOGIN set, but NOREQUIREUSER not
+	if (!empty($user) && method_exists($user, 'loadDefaultValues')) {
+		$user->loadDefaultValues();		// Load default values for everybody (works even if $user->id = 0
+	}
 }
 
 
diff --git a/htdocs/public/ticket/create_ticket.php b/htdocs/public/ticket/create_ticket.php
index 1c302c33b2e..669c5e8d512 100644
--- a/htdocs/public/ticket/create_ticket.php
+++ b/htdocs/public/ticket/create_ticket.php
@@ -22,9 +22,10 @@
  *       \brief      Display public form to add new ticket
  */
 
+/* We need object $user->default_values
 if (!defined('NOREQUIREUSER')) {
 	define('NOREQUIREUSER', '1');
-}
+}*/
 if (!defined('NOTOKENRENEWAL')) {
 	define('NOTOKENRENEWAL', '1');
 }
@@ -37,9 +38,6 @@ if (!defined('NOREQUIREHTML')) {
 if (!defined('NOLOGIN')) {
 	define("NOLOGIN", 1); // This means this output page does not require to be logged.
 }
-if (!defined('NOCSRFCHECK')) {
-	define("NOCSRFCHECK", 1); // We accept to go on this page from external web site.
-}
 if (!defined('NOIPCHECK')) {
 	define('NOIPCHECK', '1'); // Do not check IP defined into conf $dolibarr_main_restrict_ip
 }
@@ -73,6 +71,9 @@ $id = GETPOST('id', 'int');
 $msg_id = GETPOST('msg_id', 'int');
 
 $action = GETPOST('action', 'aZ09');
+$cancel = GETPOST('cancel', 'aZ09');
+
+$backtopage = '';
 
 // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $hookmanager->initHooks(array('publicnewticketcard', 'globalcard'));
@@ -105,298 +106,265 @@ if ($reshook < 0) {
 	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 }
 // Add file in email form
-if (empty($reshook) && GETPOST('addfile', 'alpha') && !GETPOST('save', 'alpha')) {
-	////$res = $object->fetch('','',GETPOST('track_id'));
-	////if($res > 0)
-	////{
-	include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+if (empty($reshook)) {
+	if ($cancel) {
+		$backtopage = DOL_URL_ROOT.'/public/ticket/index.php';
 
-	// Set tmp directory TODO Use a dedicated directory for temp mails files
-	$vardir = $conf->ticket->dir_output;
-	$upload_dir_tmp = $vardir.'/temp/'.session_id();
-	if (!dol_is_dir($upload_dir_tmp)) {
-		dol_mkdir($upload_dir_tmp);
+		header("Location: ".$backtopage);
+		exit;
 	}
 
-	dol_add_file_process($upload_dir_tmp, 0, 0, 'addedfile', '', null, '', 0);
-	$action = 'create_ticket';
-	////}
-}
+	if (GETPOST('addfile', 'alpha') && !GETPOST('save', 'alpha')) {
+		////$res = $object->fetch('','',GETPOST('track_id'));
+		////if($res > 0)
+		////{
+		include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 
-// Remove file
-if (empty($reshook) && GETPOST('removedfile', 'alpha') && !GETPOST('save', 'alpha')) {
-	include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+		// Set tmp directory TODO Use a dedicated directory for temp mails files
+		$vardir = $conf->ticket->dir_output;
+		$upload_dir_tmp = $vardir.'/temp/'.session_id();
+		if (!dol_is_dir($upload_dir_tmp)) {
+			dol_mkdir($upload_dir_tmp);
+		}
 
-	// Set tmp directory
-	$vardir = $conf->ticket->dir_output.'/';
-	$upload_dir_tmp = $vardir.'/temp/'.session_id();
+		dol_add_file_process($upload_dir_tmp, 0, 0, 'addedfile', '', null, '', 0);
+		$action = 'create_ticket';
+		////}
+	}
 
-	// TODO Delete only files that was uploaded from email form
-	dol_remove_file_process(GETPOST('removedfile'), 0, 0);
-	$action = 'create_ticket';
-}
+	// Remove file
+	if (GETPOST('removedfile', 'alpha') && !GETPOST('save', 'alpha')) {
+		include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 
-if (empty($reshook) && $action == 'create_ticket' && GETPOST('save', 'alpha')) {
-	$error = 0;
-	$origin_email = GETPOST('email', 'alpha');
-	if (empty($origin_email)) {
-		$error++;
-		array_push($object->errors, $langs->trans("ErrorFieldRequired", $langs->transnoentities("Email")));
-		$action = '';
-	} else {
-		// Search company saved with email
-		$searched_companies = $object->searchSocidByEmail($origin_email, '0');
+		// Set tmp directory
+		$vardir = $conf->ticket->dir_output.'/';
+		$upload_dir_tmp = $vardir.'/temp/'.session_id();
 
-		// Chercher un contact existant avec cette adresse email
-		// Le premier contact trouvé est utilisé pour déterminer le contact suivi
-		$contacts = $object->searchContactByEmail($origin_email);
+		// TODO Delete only files that was uploaded from email form
+		dol_remove_file_process(GETPOST('removedfile'), 0, 0);
+		$action = 'create_ticket';
+	}
 
-		// Option to require email exists to create ticket
-		if (!empty($conf->global->TICKET_EMAIL_MUST_EXISTS) && !$contacts[0]->socid) {
+	if ($action == 'create_ticket' && GETPOST('save', 'alpha')) {
+		$error = 0;
+		$origin_email = GETPOST('email', 'alpha');
+		if (empty($origin_email)) {
 			$error++;
-			array_push($object->errors, $langs->trans("ErrorEmailMustExistToCreateTicket"));
+			array_push($object->errors, $langs->trans("ErrorFieldRequired", $langs->transnoentities("Email")));
 			$action = '';
-		}
-	}
+		} else {
+			// Search company saved with email
+			$searched_companies = $object->searchSocidByEmail($origin_email, '0');
 
-	$contact_lastname = '';
-	$contact_firstname = '';
-	$company_name = '';
-	$contact_phone = '';
-	if ($with_contact) {
-		// set linked contact to add in form
-		if (is_array($contacts) && count($contacts) == 1) {
-			$with_contact = current($contacts);
-		}
+			// Chercher un contact existant avec cette adresse email
+			// Le premier contact trouvé est utilisé pour déterminer le contact suivi
+			$contacts = $object->searchContactByEmail($origin_email);
 
-		// check mandatory fields on contact
-		$contact_lastname = trim(GETPOST('contact_lastname', 'alphanohtml'));
-		$contact_firstname = trim(GETPOST('contact_firstname', 'alphanohtml'));
-		$company_name = trim(GETPOST('company_name', 'alphanohtml'));
-		$contact_phone = trim(GETPOST('contact_phone', 'alphanohtml'));
-		if (!($with_contact->id > 0)) {
-			// check lastname
-			if (empty($contact_lastname)) {
+			// Option to require email exists to create ticket
+			if (!empty($conf->global->TICKET_EMAIL_MUST_EXISTS) && !$contacts[0]->socid) {
 				$error++;
-				array_push($object->errors, $langs->trans('ErrorFieldRequired', $langs->transnoentities('Lastname')));
-				$action = '';
-			}
-			// check firstname
-			if (empty($contact_firstname)) {
-				$error++;
-				array_push($object->errors, $langs->trans('ErrorFieldRequired', $langs->transnoentities('Firstname')));
+				array_push($object->errors, $langs->trans("ErrorEmailMustExistToCreateTicket"));
 				$action = '';
 			}
 		}
-	}
 
-	if (!GETPOST("subject", "restricthtml")) {
-		$error++;
-		array_push($object->errors, $langs->trans("ErrorFieldRequired", $langs->transnoentities("Subject")));
-		$action = '';
-	}
-	if (!GETPOST("message", "restricthtml")) {
-		$error++;
-		array_push($object->errors, $langs->trans("ErrorFieldRequired", $langs->transnoentities("Message")));
-		$action = '';
-	}
+		$contact_lastname = '';
+		$contact_firstname = '';
+		$company_name = '';
+		$contact_phone = '';
+		if ($with_contact) {
+			// set linked contact to add in form
+			if (is_array($contacts) && count($contacts) == 1) {
+				$with_contact = current($contacts);
+			}
 
-	// Check email address
-	if (!empty($origin_email) && !isValidEmail($origin_email)) {
-		$error++;
-		array_push($object->errors, $langs->trans("ErrorBadEmailAddress", $langs->transnoentities("email")));
-		$action = '';
-	}
+			// check mandatory fields on contact
+			$contact_lastname = trim(GETPOST('contact_lastname', 'alphanohtml'));
+			$contact_firstname = trim(GETPOST('contact_firstname', 'alphanohtml'));
+			$company_name = trim(GETPOST('company_name', 'alphanohtml'));
+			$contact_phone = trim(GETPOST('contact_phone', 'alphanohtml'));
+			if (!($with_contact->id > 0)) {
+				// check lastname
+				if (empty($contact_lastname)) {
+					$error++;
+					array_push($object->errors, $langs->trans('ErrorFieldRequired', $langs->transnoentities('Lastname')));
+					$action = '';
+				}
+				// check firstname
+				if (empty($contact_firstname)) {
+					$error++;
+					array_push($object->errors, $langs->trans('ErrorFieldRequired', $langs->transnoentities('Firstname')));
+					$action = '';
+				}
+			}
+		}
 
-	// Check Captcha code if is enabled
-	if (!empty($conf->global->MAIN_SECURITY_ENABLECAPTCHA) || !empty($conf->global->MAIN_SECURITY_ENABLECAPTCHA_TICKET)) {
-		$sessionkey = 'dol_antispam_value';
-		$ok = (array_key_exists($sessionkey, $_SESSION) === true && (strtolower($_SESSION[$sessionkey]) === strtolower(GETPOST('code', 'restricthtml'))));
-		if (!$ok) {
+		if (!GETPOST("subject", "restricthtml")) {
 			$error++;
-			array_push($object->errors, $langs->trans("ErrorBadValueForCode"));
+			array_push($object->errors, $langs->trans("ErrorFieldRequired", $langs->transnoentities("Subject")));
 			$action = '';
 		}
-	}
-
-	if (!$error) {
-		$object->db->begin();
-
-		$object->track_id = generate_random_id(16);
-
-		$object->subject = GETPOST("subject", "restricthtml");
-		$object->message = GETPOST("message", "restricthtml");
-		$object->origin_email = $origin_email;
-
-		$object->type_code = GETPOST("type_code", 'aZ09');
-		$object->category_code = GETPOST("category_code", 'aZ09');
-		$object->severity_code = GETPOST("severity_code", 'aZ09');
-
-		if (!is_object($user)) {
-			$user = new User($db);
+		if (!GETPOST("message", "restricthtml")) {
+			$error++;
+			array_push($object->errors, $langs->trans("ErrorFieldRequired", $langs->transnoentities("Message")));
+			$action = '';
 		}
 
-		// create third-party with contact
-		$usertoassign = 0;
-		if ($with_contact && !($with_contact->id > 0)) {
-			$company = new Societe($db);
-			if (!empty($company_name)) {
-				$company->name = $company_name;
-			} else {
-				$company->particulier = 1;
-				$company->name = dolGetFirstLastname($contact_firstname, $contact_lastname);
-			}
-			$result = $company->create($user);
-			if ($result < 0) {
+		// Check email address
+		if (!empty($origin_email) && !isValidEmail($origin_email)) {
+			$error++;
+			array_push($object->errors, $langs->trans("ErrorBadEmailAddress", $langs->transnoentities("email")));
+			$action = '';
+		}
+
+		// Check Captcha code if is enabled
+		if (!empty($conf->global->MAIN_SECURITY_ENABLECAPTCHA) || !empty($conf->global->MAIN_SECURITY_ENABLECAPTCHA_TICKET)) {
+			$sessionkey = 'dol_antispam_value';
+			$ok = (array_key_exists($sessionkey, $_SESSION) === true && (strtolower($_SESSION[$sessionkey]) === strtolower(GETPOST('code', 'restricthtml'))));
+			if (!$ok) {
 				$error++;
-				$errors = ($company->error ? array($company->error) : $company->errors);
-				array_push($object->errors, $errors);
+				array_push($object->errors, $langs->trans("ErrorBadValueForCode"));
+				$action = '';
+			}
+		}
+
+		if (!$error) {
+			$object->db->begin();
+
+			$object->track_id = generate_random_id(16);
+
+			$object->subject = GETPOST("subject", "restricthtml");
+			$object->message = GETPOST("message", "restricthtml");
+			$object->origin_email = $origin_email;
+
+			$object->type_code = GETPOST("type_code", 'aZ09');
+			$object->category_code = GETPOST("category_code", 'aZ09');
+			$object->severity_code = GETPOST("severity_code", 'aZ09');
+
+			if (!is_object($user)) {
+				$user = new User($db);
+			}
+
+			// create third-party with contact
+			$usertoassign = 0;
+			if ($with_contact && !($with_contact->id > 0)) {
+				$company = new Societe($db);
+				if (!empty($company_name)) {
+					$company->name = $company_name;
+				} else {
+					$company->particulier = 1;
+					$company->name = dolGetFirstLastname($contact_firstname, $contact_lastname);
+				}
+				$result = $company->create($user);
+				if ($result < 0) {
+					$error++;
+					$errors = ($company->error ? array($company->error) : $company->errors);
+					array_push($object->errors, $errors);
+					$action = 'create_ticket';
+				}
+
+				// create contact and link to this new company
+				if (!$error) {
+					$with_contact->email = $origin_email;
+					$with_contact->lastname = $contact_lastname;
+					$with_contact->firstname = $contact_firstname;
+					$with_contact->socid = $company->id;
+					$with_contact->phone_pro = $contact_phone;
+					$result = $with_contact->create($user);
+					if ($result < 0) {
+						$error++;
+						$errors = ($with_contact->error ? array($with_contact->error) : $with_contact->errors);
+						array_push($object->errors, $errors);
+						$action = 'create_ticket';
+					} else {
+						$contacts = array($with_contact);
+					}
+				}
+			}
+
+			if (is_array($searched_companies)) {
+				$object->fk_soc = $searched_companies[0]->id;
+			}
+
+			if (is_array($contacts) and count($contacts) > 0) {
+				$object->fk_soc = $contacts[0]->socid;
+				$usertoassign = $contacts[0]->id;
+			}
+
+			$ret = $extrafields->setOptionalsFromPost(null, $object);
+
+			// Generate new ref
+			$object->ref = $object->getDefaultRef();
+
+			$object->context['disableticketemail'] = 1; // Disable emails sent by ticket trigger when creation is done from this page, emails are already sent later
+
+			$id = $object->create($user);
+			if ($id <= 0) {
+				$error++;
+				$errors = ($object->error ? array($object->error) : $object->errors);
+				array_push($object->errors, $object->error ? array($object->error) : $object->errors);
 				$action = 'create_ticket';
 			}
 
-			// create contact and link to this new company
+			if (!$error && $id > 0) {
+				if ($usertoassign > 0) {
+					$object->add_contact($usertoassign, "SUPPORTCLI", 'external', 0);
+				}
+			}
+
 			if (!$error) {
-				$with_contact->email = $origin_email;
-				$with_contact->lastname = $contact_lastname;
-				$with_contact->firstname = $contact_firstname;
-				$with_contact->socid = $company->id;
-				$with_contact->phone_pro = $contact_phone;
-				$result = $with_contact->create($user);
-				if ($result < 0) {
-					$error++;
-					$errors = ($with_contact->error ? array($with_contact->error) : $with_contact->errors);
-					array_push($object->errors, $errors);
-					$action = 'create_ticket';
-				} else {
-					$contacts = array($with_contact);
-				}
+				$object->db->commit();
+				$action = "infos_success";
+			} else {
+				$object->db->rollback();
+				setEventMessages($object->error, $object->errors, 'errors');
+				$action = 'create_ticket';
 			}
-		}
 
-		if (is_array($searched_companies)) {
-			$object->fk_soc = $searched_companies[0]->id;
-		}
+			if (!$error) {
+				$res = $object->fetch($id);
+				if ($res) {
+					// Create form object
+					include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';
+					include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+					$formmail = new FormMail($db);
 
-		if (is_array($contacts) and count($contacts) > 0) {
-			$object->fk_soc = $contacts[0]->socid;
-			$usertoassign = $contacts[0]->id;
-		}
+					// Init to avoid errors
+					$filepath = array();
+					$filename = array();
+					$mimetype = array();
 
-		$ret = $extrafields->setOptionalsFromPost(null, $object);
+					$attachedfiles = $formmail->get_attached_files();
+					$filepath = $attachedfiles['paths'];
+					$filename = $attachedfiles['names'];
+					$mimetype = $attachedfiles['mimes'];
 
-		// Generate new ref
-		$object->ref = $object->getDefaultRef();
+					// Send email to customer
 
-		$object->context['disableticketemail'] = 1; // Disable emails sent by ticket trigger when creation is done from this page, emails are already sent later
+					$subject = '['.$conf->global->MAIN_INFO_SOCIETE_NOM.'] '.$langs->transnoentities('TicketNewEmailSubject', $object->ref, $object->track_id);
+					$message  = ($conf->global->TICKET_MESSAGE_MAIL_NEW ? $conf->global->TICKET_MESSAGE_MAIL_NEW : $langs->transnoentities('TicketNewEmailBody')).'<br><br>';
+					$message .= $langs->transnoentities('TicketNewEmailBodyInfosTicket').'<br>';
 
-		$id = $object->create($user);
-		if ($id <= 0) {
-			$error++;
-			$errors = ($object->error ? array($object->error) : $object->errors);
-			array_push($object->errors, $object->error ? array($object->error) : $object->errors);
-			$action = 'create_ticket';
-		}
+					$url_public_ticket = ($conf->global->TICKET_URL_PUBLIC_INTERFACE ? $conf->global->TICKET_URL_PUBLIC_INTERFACE.'/view.php' : dol_buildpath('/public/ticket/view.php', 2)).'?track_id='.$object->track_id;
+					$infos_new_ticket = $langs->transnoentities('TicketNewEmailBodyInfosTrackId', '<a href="'.$url_public_ticket.'" rel="nofollow noopener">'.$object->track_id.'</a>').'<br>';
+					$infos_new_ticket .= $langs->transnoentities('TicketNewEmailBodyInfosTrackUrl').'<br><br>';
 
-		if (!$error && $id > 0) {
-			if ($usertoassign > 0) {
-				$object->add_contact($usertoassign, "SUPPORTCLI", 'external', 0);
-			}
-		}
+					$message .= $infos_new_ticket;
+					$message .= getDolGlobalString('TICKET_MESSAGE_MAIL_SIGNATURE', $langs->transnoentities('TicketMessageMailSignatureText', $mysoc->name));
 
-		if (!$error) {
-			$object->db->commit();
-			$action = "infos_success";
-		} else {
-			$object->db->rollback();
-			setEventMessages($object->error, $object->errors, 'errors');
-			$action = 'create_ticket';
-		}
+					$sendto = GETPOST('email', 'alpha');
 
-		if (!$error) {
-			$res = $object->fetch($id);
-			if ($res) {
-				// Create form object
-				include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';
-				include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
-				$formmail = new FormMail($db);
-
-				// Init to avoid errors
-				$filepath = array();
-				$filename = array();
-				$mimetype = array();
-
-				$attachedfiles = $formmail->get_attached_files();
-				$filepath = $attachedfiles['paths'];
-				$filename = $attachedfiles['names'];
-				$mimetype = $attachedfiles['mimes'];
-
-				// Send email to customer
-
-				$subject = '['.$conf->global->MAIN_INFO_SOCIETE_NOM.'] '.$langs->transnoentities('TicketNewEmailSubject', $object->ref, $object->track_id);
-				$message  = ($conf->global->TICKET_MESSAGE_MAIL_NEW ? $conf->global->TICKET_MESSAGE_MAIL_NEW : $langs->transnoentities('TicketNewEmailBody')).'<br><br>';
-				$message .= $langs->transnoentities('TicketNewEmailBodyInfosTicket').'<br>';
-
-				$url_public_ticket = ($conf->global->TICKET_URL_PUBLIC_INTERFACE ? $conf->global->TICKET_URL_PUBLIC_INTERFACE.'/view.php' : dol_buildpath('/public/ticket/view.php', 2)).'?track_id='.$object->track_id;
-				$infos_new_ticket = $langs->transnoentities('TicketNewEmailBodyInfosTrackId', '<a href="'.$url_public_ticket.'" rel="nofollow noopener">'.$object->track_id.'</a>').'<br>';
-				$infos_new_ticket .= $langs->transnoentities('TicketNewEmailBodyInfosTrackUrl').'<br><br>';
-
-				$message .= $infos_new_ticket;
-				$message .= getDolGlobalString('TICKET_MESSAGE_MAIL_SIGNATURE', $langs->transnoentities('TicketMessageMailSignatureText', $mysoc->name));
-
-				$sendto = GETPOST('email', 'alpha');
-
-				$from = $conf->global->MAIN_INFO_SOCIETE_NOM.' <'.getDolGlobalString('TICKET_NOTIFICATION_EMAIL_FROM').'>';
-				$replyto = $from;
-				$sendtocc = '';
-				$deliveryreceipt = 0;
-
-				if (!empty($conf->global->TICKET_DISABLE_MAIL_AUTOCOPY_TO)) {
-					$old_MAIN_MAIL_AUTOCOPY_TO = $conf->global->MAIN_MAIL_AUTOCOPY_TO;
-					$conf->global->MAIN_MAIL_AUTOCOPY_TO = '';
-				}
-				include_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php';
-				$mailfile = new CMailFile($subject, $sendto, $from, $message, $filepath, $mimetype, $filename, $sendtocc, '', $deliveryreceipt, -1, '', '', 'tic'.$object->id, '', 'ticket');
-				if ($mailfile->error || $mailfile->errors) {
-					setEventMessages($mailfile->error, $mailfile->errors, 'errors');
-				} else {
-					$result = $mailfile->sendfile();
-				}
-				if (!empty($conf->global->TICKET_DISABLE_MAIL_AUTOCOPY_TO)) {
-					$conf->global->MAIN_MAIL_AUTOCOPY_TO = $old_MAIN_MAIL_AUTOCOPY_TO;
-				}
-
-				// Send email to TICKET_NOTIFICATION_EMAIL_TO
-				$sendto = $conf->global->TICKET_NOTIFICATION_EMAIL_TO;
-				if ($sendto) {
-					$subject = '['.$conf->global->MAIN_INFO_SOCIETE_NOM.'] '.$langs->transnoentities('TicketNewEmailSubjectAdmin', $object->ref, $object->track_id);
-					$message_admin = $langs->transnoentities('TicketNewEmailBodyAdmin', $object->track_id).'<br><br>';
-					$message_admin .= '<ul><li>'.$langs->trans('Title').' : '.$object->subject.'</li>';
-					$message_admin .= '<li>'.$langs->trans('Type').' : '.$object->type_label.'</li>';
-					$message_admin .= '<li>'.$langs->trans('Category').' : '.$object->category_label.'</li>';
-					$message_admin .= '<li>'.$langs->trans('Severity').' : '.$object->severity_label.'</li>';
-					$message_admin .= '<li>'.$langs->trans('From').' : '.$object->origin_email.'</li>';
-					// Extrafields
-					$extrafields->fetch_name_optionals_label($object->table_element);
-					if (is_array($object->array_options) && count($object->array_options) > 0) {
-						foreach ($object->array_options as $key => $value) {
-							$key = substr($key, 8); // remove "options_"
-							$message_admin .= '<li>'.$langs->trans($extrafields->attributes[$object->table_element]['label'][$key]).' : '.$extrafields->showOutputField($key, $value, '', $object->table_element).'</li>';
-						}
-					}
-					$message_admin .= '</ul>';
-
-					$message_admin .= '<p>'.$langs->trans('Message').' : <br>'.$object->message.'</p>';
-					$message_admin .= '<p><a href="'.dol_buildpath('/ticket/card.php', 2).'?track_id='.$object->track_id.'" rel="nofollow noopener">'.$langs->trans('SeeThisTicketIntomanagementInterface').'</a></p>';
-
-					$from = $conf->global->MAIN_INFO_SOCIETE_NOM.' <'.$conf->global->TICKET_NOTIFICATION_EMAIL_FROM.'>';
+					$from = $conf->global->MAIN_INFO_SOCIETE_NOM.' <'.getDolGlobalString('TICKET_NOTIFICATION_EMAIL_FROM').'>';
 					$replyto = $from;
+					$sendtocc = '';
+					$deliveryreceipt = 0;
 
 					if (!empty($conf->global->TICKET_DISABLE_MAIL_AUTOCOPY_TO)) {
 						$old_MAIN_MAIL_AUTOCOPY_TO = $conf->global->MAIN_MAIL_AUTOCOPY_TO;
 						$conf->global->MAIN_MAIL_AUTOCOPY_TO = '';
 					}
 					include_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php';
-					$mailfile = new CMailFile($subject, $sendto, $from, $message_admin, $filepath, $mimetype, $filename, $sendtocc, '', $deliveryreceipt, -1, '', '', 'tic'.$object->id, '', 'ticket');
+					$mailfile = new CMailFile($subject, $sendto, $from, $message, $filepath, $mimetype, $filename, $sendtocc, '', $deliveryreceipt, -1, '', '', 'tic'.$object->id, '', 'ticket');
 					if ($mailfile->error || $mailfile->errors) {
 						setEventMessages($mailfile->error, $mailfile->errors, 'errors');
 					} else {
@@ -405,36 +373,77 @@ if (empty($reshook) && $action == 'create_ticket' && GETPOST('save', 'alpha')) {
 					if (!empty($conf->global->TICKET_DISABLE_MAIL_AUTOCOPY_TO)) {
 						$conf->global->MAIN_MAIL_AUTOCOPY_TO = $old_MAIN_MAIL_AUTOCOPY_TO;
 					}
+
+					// Send email to TICKET_NOTIFICATION_EMAIL_TO
+					$sendto = $conf->global->TICKET_NOTIFICATION_EMAIL_TO;
+					if ($sendto) {
+						$subject = '['.$conf->global->MAIN_INFO_SOCIETE_NOM.'] '.$langs->transnoentities('TicketNewEmailSubjectAdmin', $object->ref, $object->track_id);
+						$message_admin = $langs->transnoentities('TicketNewEmailBodyAdmin', $object->track_id).'<br><br>';
+						$message_admin .= '<ul><li>'.$langs->trans('Title').' : '.$object->subject.'</li>';
+						$message_admin .= '<li>'.$langs->trans('Type').' : '.$object->type_label.'</li>';
+						$message_admin .= '<li>'.$langs->trans('Category').' : '.$object->category_label.'</li>';
+						$message_admin .= '<li>'.$langs->trans('Severity').' : '.$object->severity_label.'</li>';
+						$message_admin .= '<li>'.$langs->trans('From').' : '.$object->origin_email.'</li>';
+						// Extrafields
+						$extrafields->fetch_name_optionals_label($object->table_element);
+						if (is_array($object->array_options) && count($object->array_options) > 0) {
+							foreach ($object->array_options as $key => $value) {
+								$key = substr($key, 8); // remove "options_"
+								$message_admin .= '<li>'.$langs->trans($extrafields->attributes[$object->table_element]['label'][$key]).' : '.$extrafields->showOutputField($key, $value, '', $object->table_element).'</li>';
+							}
+						}
+						$message_admin .= '</ul>';
+
+						$message_admin .= '<p>'.$langs->trans('Message').' : <br>'.$object->message.'</p>';
+						$message_admin .= '<p><a href="'.dol_buildpath('/ticket/card.php', 2).'?track_id='.$object->track_id.'" rel="nofollow noopener">'.$langs->trans('SeeThisTicketIntomanagementInterface').'</a></p>';
+
+						$from = $conf->global->MAIN_INFO_SOCIETE_NOM.' <'.$conf->global->TICKET_NOTIFICATION_EMAIL_FROM.'>';
+						$replyto = $from;
+
+						if (!empty($conf->global->TICKET_DISABLE_MAIL_AUTOCOPY_TO)) {
+							$old_MAIN_MAIL_AUTOCOPY_TO = $conf->global->MAIN_MAIL_AUTOCOPY_TO;
+							$conf->global->MAIN_MAIL_AUTOCOPY_TO = '';
+						}
+						include_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php';
+						$mailfile = new CMailFile($subject, $sendto, $from, $message_admin, $filepath, $mimetype, $filename, $sendtocc, '', $deliveryreceipt, -1, '', '', 'tic'.$object->id, '', 'ticket');
+						if ($mailfile->error || $mailfile->errors) {
+							setEventMessages($mailfile->error, $mailfile->errors, 'errors');
+						} else {
+							$result = $mailfile->sendfile();
+						}
+						if (!empty($conf->global->TICKET_DISABLE_MAIL_AUTOCOPY_TO)) {
+							$conf->global->MAIN_MAIL_AUTOCOPY_TO = $old_MAIN_MAIL_AUTOCOPY_TO;
+						}
+					}
 				}
-			}
 
-			// Copy files into ticket directory
-			$destdir = $conf->ticket->dir_output.'/'.$object->ref;
-			if (!dol_is_dir($destdir)) {
-				dol_mkdir($destdir);
-			}
-			foreach ($filename as $i => $val) {
-				dol_move($filepath[$i], $destdir.'/'.$filename[$i], 0, 1);
-				$formmail->remove_attached_files($i);
-			}
+				// Copy files into ticket directory
+				$destdir = $conf->ticket->dir_output.'/'.$object->ref;
+				if (!dol_is_dir($destdir)) {
+					dol_mkdir($destdir);
+				}
+				foreach ($filename as $i => $val) {
+					dol_move($filepath[$i], $destdir.'/'.$filename[$i], 0, 1);
+					$formmail->remove_attached_files($i);
+				}
 
-			//setEventMessages($langs->trans('YourTicketSuccessfullySaved'), null, 'mesgs');
+				//setEventMessages($langs->trans('YourTicketSuccessfullySaved'), null, 'mesgs');
 
-			// Make a redirect to avoid to have ticket submitted twice if we make back
-			$messagetoshow = $langs->trans('MesgInfosPublicTicketCreatedWithTrackId', '{s1}', '{s2}');
-			$messagetoshow = str_replace(array('{s1}', '{s2}'), array('<strong>'.$object->track_id.'</strong>', '<strong>'.$object->ref.'</strong>'), $messagetoshow);
-			setEventMessages($messagetoshow, null, 'warnings');
-			setEventMessages($langs->trans('PleaseRememberThisId'), null, 'warnings');
-			header("Location: index.php".(!empty($entity) && !empty($conf->multicompany->enabled)?'?entity='.$entity:''));
-			exit;
+				// Make a redirect to avoid to have ticket submitted twice if we make back
+				$messagetoshow = $langs->trans('MesgInfosPublicTicketCreatedWithTrackId', '{s1}', '{s2}');
+				$messagetoshow = str_replace(array('{s1}', '{s2}'), array('<strong>'.$object->track_id.'</strong>', '<strong>'.$object->ref.'</strong>'), $messagetoshow);
+				setEventMessages($messagetoshow, null, 'warnings');
+				setEventMessages($langs->trans('PleaseRememberThisId'), null, 'warnings');
+				header("Location: index.php".(!empty($entity) && !empty($conf->multicompany->enabled)?'?entity='.$entity:''));
+				exit;
+			}
+		} else {
+			setEventMessages($object->error, $object->errors, 'errors');
 		}
-	} else {
-		setEventMessages($object->error, $object->errors, 'errors');
 	}
 }
 
 
-
 /*
  * View
  */
@@ -466,6 +475,7 @@ if ($action != "infos_success") {
 	$formticket->ispublic = 1;
 	$formticket->withfile = 2;
 	$formticket->action = 'create_ticket';
+	$formticket->withcancel = 1;
 
 	$formticket->param = array('returnurl' => $_SERVER['PHP_SELF'].($conf->entity > 1 ? '?entity='.$conf->entity : ''));
 
@@ -478,7 +488,7 @@ if ($action != "infos_success") {
 		print $langs->trans("ErrorModuleSetupNotComplete", $langs->transnoentities("Ticket"));
 		print '</div>';
 	} else {
-		print '<div class="info marginleftonly marginrightonly">'.$langs->trans('TicketPublicInfoCreateTicket').'</div>';
+		//print '<div class="info marginleftonly marginrightonly">'.$langs->trans('TicketPublicInfoCreateTicket').'</div>';
 		$formticket->showForm(0, 'edit', 1, $with_contact);
 	}
 }
diff --git a/htdocs/public/ticket/index.php b/htdocs/public/ticket/index.php
index f7abe746832..ece2b41aff7 100644
--- a/htdocs/public/ticket/index.php
+++ b/htdocs/public/ticket/index.php
@@ -22,9 +22,6 @@
  *       \brief      Public page to add and manage ticket
  */
 
-if (!defined('NOCSRFCHECK')) {
-	define('NOCSRFCHECK', '1');
-}
 if (!defined('NOREQUIREMENU')) {
 	define('NOREQUIREMENU', '1');
 }
@@ -82,11 +79,12 @@ $arrayofcss = array('/ticket/css/styles.css.php');
 llxHeaderTicket($langs->trans("Tickets"), "", 0, 0, $arrayofjs, $arrayofcss);
 
 print '<div class="ticketpublicarea">';
-print '<p style="text-align: center">'.($conf->global->TICKET_PUBLIC_TEXT_HOME ? $conf->global->TICKET_PUBLIC_TEXT_HOME : $langs->trans("TicketPublicDesc")).'</p>';
+print '<p style="text-align: center">'.(!empty($conf->global->TICKET_PUBLIC_TEXT_HOME) ? $conf->global->TICKET_PUBLIC_TEXT_HOME : '<span class="opacitymedium">'.$langs->trans("TicketPublicDesc")).'</span></p>';
+print '<br>';
 print '<div class="ticketform">';
-print '<a href="create_ticket.php'.(!empty($entity) && !empty($conf->multicompany->enabled)?'?entity='.$entity:'').'" rel="nofollow noopener" class="butAction marginbottomonly"><div class="index_create bigrounded"><span class="fa fa-15x fa-plus-circle valignmiddle btnTitle-icon"></span><br>'.dol_escape_htmltag($langs->trans("CreateTicket")).'</div></a>';
-print '<a href="list.php'.(!empty($entity) && !empty($conf->multicompany->enabled)?'?entity='.$entity:'').'" rel="nofollow noopener" class="butAction marginbottomonly"><div class="index_display bigrounded"><span class="fa fa-15x fa-list-alt valignmiddle btnTitle-icon"></span><br>'.dol_escape_htmltag($langs->trans("ViewMyTicketList")).'</div></a>';
-print '<a href="view.php'.(!empty($entity) && !empty($conf->multicompany->enabled)?'?entity='.$entity:'').'" rel="nofollow noopener" class="butAction marginbottomonly"><div class="index_display bigrounded">'.img_picto('', 'ticket', 'class="fa-15x"').'<br>'.dol_escape_htmltag($langs->trans("ShowTicketWithTrackId")).'</div></a>';
+print '<a href="create_ticket.php?action=create'.(!empty($entity) && !empty($conf->multicompany->enabled)?'&entity='.$entity:'').'" rel="nofollow noopener" class="butAction marginbottomonly"><div class="index_create bigrounded"><span class="fa fa-15 fa-plus-circle valignmiddle btnTitle-icon"></span><br>'.dol_escape_htmltag($langs->trans("CreateTicket")).'</div></a>';
+print '<a href="list.php'.(!empty($entity) && !empty($conf->multicompany->enabled)?'?entity='.$entity:'').'" rel="nofollow noopener" class="butAction marginbottomonly"><div class="index_display bigrounded"><span class="fa fa-15 fa-list-alt valignmiddle btnTitle-icon"></span><br>'.dol_escape_htmltag($langs->trans("ViewMyTicketList")).'</div></a>';
+print '<a href="view.php'.(!empty($entity) && !empty($conf->multicompany->enabled)?'?entity='.$entity:'').'" rel="nofollow noopener" class="butAction marginbottomonly"><div class="index_display bigrounded">'.img_picto('', 'ticket', 'class="fa-15"').'<br>'.dol_escape_htmltag($langs->trans("ShowTicketWithTrackId")).'</div></a>';
 print '<div style="clear:both;"></div>';
 print '</div>';
 print '</div>';
diff --git a/htdocs/public/ticket/list.php b/htdocs/public/ticket/list.php
index a15beff2856..2259945033b 100644
--- a/htdocs/public/ticket/list.php
+++ b/htdocs/public/ticket/list.php
@@ -21,10 +21,6 @@
  *       \brief      Public file to list tickets
  */
 
-if (!defined('NOCSRFCHECK')) {
-	define('NOCSRFCHECK', '1');
-}
-// Do not check anti CSRF attack test
 if (!defined('NOREQUIREMENU')) {
 	define('NOREQUIREMENU', '1');
 }
@@ -60,8 +56,10 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/payments.lib.php';
 $langs->loadLangs(array("companies", "other", "ticket"));
 
 // Get parameters
-$track_id = GETPOST('track_id', 'alpha');
 $action = GETPOST('action', 'aZ09');
+$cancel = GETPOST('cancel', 'aZ09');
+
+$track_id = GETPOST('track_id', 'alpha');
 $email = strtolower(GETPOST('email', 'alpha'));
 
 if (GETPOST('btn_view_ticket_list')) {
@@ -90,6 +88,13 @@ if (empty($conf->ticket->enabled)) {
  * Actions
  */
 
+if ($cancel) {
+	$backtopage = DOL_URL_ROOT.'/public/ticket/index.php';
+
+	header("Location: ".$backtopage);
+	exit;
+}
+
 if ($action == "view_ticketlist") {
 	$error = 0;
 	$display_ticket_list = false;
@@ -185,9 +190,10 @@ $arrayofcss = array('/ticket/css/styles.css.php');
 llxHeaderTicket($langs->trans("Tickets"), "", 0, 0, $arrayofjs, $arrayofcss);
 
 
-print '<div class="ticketpublicarealist">';
 
 if ($action == "view_ticketlist") {
+	print '<div class="ticketpublicarealist">';
+
 	print '<br>';
 	if ($display_ticket_list) {
 		// Filters
@@ -708,8 +714,12 @@ if ($action == "view_ticketlist") {
 	} else {
 		print '<div class="error">Not Allowed<br><a href="'.$_SERVER['PHP_SELF'].'?track_id='.$object->track_id.'">'.$langs->trans('Back').'</a></div>';
 	}
+
+	print '</div>';
 } else {
-	print '<p class="center">'.$langs->trans("TicketPublicMsgViewLogIn").'</p>';
+	print '<div class="ticketpublicarea">';
+
+	print '<p class="center opacitymedium">'.$langs->trans("TicketPublicMsgViewLogIn").'</p>';
 	print '<br>';
 
 	print '<div id="form_view_ticket">';
@@ -728,13 +738,15 @@ if ($action == "view_ticketlist") {
 
 	print '<p style="text-align: center; margin-top: 1.5em;">';
 	print '<input type="submit" class="button" name="btn_view_ticket_list" value="'.$langs->trans('ViewMyTicketList').'" />';
+	print ' &nbsp; ';
+	print '<input type="submit" class="button button-cancel" name="cancel" value="'.$langs->trans("Cancel").'">';
 	print "</p>\n";
 
 	print "</form>\n";
 	print "</div>\n";
-}
 
-print "</div>";
+	print "</div>";
+}
 
 // End of page
 htmlPrintOnlinePaymentFooter($mysoc, $langs, 0, $suffix, $object);
diff --git a/htdocs/public/ticket/view.php b/htdocs/public/ticket/view.php
index 29a850128ed..e78b1e1b9ee 100644
--- a/htdocs/public/ticket/view.php
+++ b/htdocs/public/ticket/view.php
@@ -22,10 +22,6 @@
  *       \brief      Public file to show one ticket
  */
 
-if (!defined('NOCSRFCHECK')) {
-	define('NOCSRFCHECK', '1');
-}
-// Do not check anti CSRF attack test
 if (!defined('NOREQUIREMENU')) {
 	define('NOREQUIREMENU', '1');
 }
@@ -61,9 +57,10 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/payments.lib.php';
 $langs->loadLangs(array("companies", "other", "ticket"));
 
 // Get parameters
-$track_id = GETPOST('track_id', 'alpha');
-$cancel   = GETPOST('cancel', 'alpha');
 $action   = GETPOST('action', 'aZ09');
+$cancel = GETPOST('cancel', 'aZ09');
+
+$track_id = GETPOST('track_id', 'alpha');
 $email    = GETPOST('email', 'email');
 
 if (GETPOST('btn_view_ticket')) {
@@ -85,6 +82,8 @@ if (empty($conf->ticket->enabled)) {
  */
 
 if ($cancel) {
+	$backtopage = DOL_URL_ROOT.'/public/ticket/index.php';
+
 	if (!empty($backtopage)) {
 		header("Location: ".$backtopage);
 		exit;
@@ -406,6 +405,8 @@ if ($action == "view_ticket" || $action == "presend" || $action == "close" || $a
 
 	print '<p style="text-align: center; margin-top: 1.5em;">';
 	print '<input type="submit" class="button" name="btn_view_ticket" value="'.$langs->trans('ViewTicket').'" />';
+	print ' &nbsp; ';
+	print '<input type="submit" class="button button-cancel" name="cancel" value="'.$langs->trans("Cancel").'">';
 	print "</p>\n";
 
 	print "</form>\n";
diff --git a/htdocs/theme/eldy/main_menu_fa_icons.inc.php b/htdocs/theme/eldy/main_menu_fa_icons.inc.php
index ada1ae23a12..395ab219056 100644
--- a/htdocs/theme/eldy/main_menu_fa_icons.inc.php
+++ b/htdocs/theme/eldy/main_menu_fa_icons.inc.php
@@ -18,10 +18,6 @@
 	/* font-size: <?php echo $topMenuFontSize; ?>; */
 }
 
-.fa-15x {
-	font-size: 1.5em;
-}
-
 div.mainmenu.menu {
 	background-image: none;
 }
diff --git a/htdocs/theme/md/main_menu_fa_icons.inc.php b/htdocs/theme/md/main_menu_fa_icons.inc.php
index 0e0b144d187..f2f5e247e78 100644
--- a/htdocs/theme/md/main_menu_fa_icons.inc.php
+++ b/htdocs/theme/md/main_menu_fa_icons.inc.php
@@ -18,10 +18,6 @@
 	color: var(--colortextbackhmenu);
 }
 
-.fa-15x {
-	font-size: 1.5em;
-}
-
 div.mainmenu.menu {
 	background-image: none;
 }
diff --git a/htdocs/user/class/user.class.php b/htdocs/user/class/user.class.php
index fa38df82147..1fc536d10bd 100644
--- a/htdocs/user/class/user.class.php
+++ b/htdocs/user/class/user.class.php
@@ -316,7 +316,9 @@ class User extends CommonObject
 	 * @var stdClass To store personal config
 	 */
 	public $conf;
-	public $default_values; // To store default values for user
+
+	public $default_values; // To store default values for user. Loaded by loadDefaultValues().
+
 	public $lastsearch_values_tmp; // To store current search criterias for user
 	public $lastsearch_values; // To store last saved search criterias for user
 

From e3f9b15db3faa03c1a64f524af2436dfd4b84570 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 1 Sep 2022 11:18:46 +0200
Subject: [PATCH 566/974] FIX list of email in public ticket interface

---
 htdocs/public/ticket/list.php | 28 +++++++++++++++-------------
 1 file changed, 15 insertions(+), 13 deletions(-)

diff --git a/htdocs/public/ticket/list.php b/htdocs/public/ticket/list.php
index 2259945033b..e309e68c029 100644
--- a/htdocs/public/ticket/list.php
+++ b/htdocs/public/ticket/list.php
@@ -354,25 +354,25 @@ if ($action == "view_ticketlist") {
 			}
 		}
 		$sql .= " FROM ".MAIN_DB_PREFIX."ticket as t";
-		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_ticket_type as type ON type.code=t.type_code";
-		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_ticket_category as category ON category.code=t.category_code";
-		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_ticket_severity as severity ON severity.code=t.severity_code";
-		$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";
-		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."element_contact as ec ON ec.element_id=t.rowid";
-		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_type_contact as tc ON ec.fk_c_type_contact=tc.rowid";
-		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."socpeople sp ON ec.fk_socpeople=sp.rowid";
+		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_ticket_type as type ON type.code = t.type_code";
+		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_ticket_category as category ON category.code = t.category_code";
+		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_ticket_severity as severity ON severity.code = t.severity_code";
+		$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";
+		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."element_contact as ec ON ec.element_id = t.rowid";
+		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_type_contact as tc ON ec.fk_c_type_contact = tc.rowid";
+		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."socpeople sp ON ec.fk_socpeople = sp.rowid";
 		if (is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label'])) {
 			$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."ticket_extrafields as ef on (t.rowid = ef.fk_object)";
 		}
 		$sql .= " WHERE t.entity IN (".getEntity('ticket').")";
 		$sql .= " AND ((tc.source = 'external'";
 		$sql .= " AND tc.element='".$db->escape($object->element)."'";
-		$sql .= " AND tc.active=1)";
-		$sql .= " OR (sp.email='".$db->escape($_SESSION['email_customer'])."'";
-		$sql .= " OR s.email='".$db->escape($_SESSION['email_customer'])."'";
-		$sql .= " OR t.origin_email='".$db->escape($_SESSION['email_customer'])."'))";
+		$sql .= " AND tc.active=1";
+		$sql .= " AND sp.email='".$db->escape($_SESSION['email_customer'])."')";		// email found into an external contact
+		$sql .= " OR s.email='".$db->escape($_SESSION['email_customer'])."'";			// or email of the linked company
+		$sql .= " OR t.origin_email='".$db->escape($_SESSION['email_customer'])."')";	// or email of the requester
 		// Manage filter
 		if (!empty($filter)) {
 			foreach ($filter as $key => $value) {
@@ -710,6 +710,8 @@ if ($action == "view_ticketlist") {
                     }
                 </script>';
 			}
+		} else {
+			dol_print_error($db);
 		}
 	} else {
 		print '<div class="error">Not Allowed<br><a href="'.$_SERVER['PHP_SELF'].'?track_id='.$object->track_id.'">'.$langs->trans('Back').'</a></div>';

From 2c46410675cfa62b3e6516e1ab9c93e97a3c5255 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 1 Sep 2022 11:18:46 +0200
Subject: [PATCH 567/974] FIX list of email in public ticket interface

---
 .../modulebuilder/template/myobject_list.php  |  2 +-
 htdocs/public/ticket/list.php                 | 30 ++++++++++---------
 htdocs/ticket/list.php                        | 11 ++++---
 3 files changed, 24 insertions(+), 19 deletions(-)

diff --git a/htdocs/modulebuilder/template/myobject_list.php b/htdocs/modulebuilder/template/myobject_list.php
index 6f9b266a8c1..5d4ae896134 100644
--- a/htdocs/modulebuilder/template/myobject_list.php
+++ b/htdocs/modulebuilder/template/myobject_list.php
@@ -434,7 +434,7 @@ if ($limit > 0 && $limit != $conf->liste_limit) {
 	$param .= '&limit='.urlencode($limit);
 }
 foreach ($search as $key => $val) {
-	if (is_array($search[$key]) && count($search[$key])) {
+	if (is_array($search[$key])) {
 		foreach ($search[$key] as $skey) {
 			if ($skey != '') {
 				$param .= '&search_'.$key.'[]='.urlencode($skey);
diff --git a/htdocs/public/ticket/list.php b/htdocs/public/ticket/list.php
index 8a353eea881..c43ae59abb4 100644
--- a/htdocs/public/ticket/list.php
+++ b/htdocs/public/ticket/list.php
@@ -345,25 +345,25 @@ if ($action == "view_ticketlist") {
 			}
 		}
 		$sql .= " FROM ".MAIN_DB_PREFIX."ticket as t";
-		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_ticket_type as type ON type.code=t.type_code";
-		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_ticket_category as category ON category.code=t.category_code";
-		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_ticket_severity as severity ON severity.code=t.severity_code";
-		$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";
-		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."element_contact as ec ON ec.element_id=t.rowid";
-		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_type_contact as tc ON ec.fk_c_type_contact=tc.rowid";
-		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."socpeople sp ON ec.fk_socpeople=sp.rowid";
+		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_ticket_type as type ON type.code = t.type_code";
+		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_ticket_category as category ON category.code = t.category_code";
+		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_ticket_severity as severity ON severity.code = t.severity_code";
+		$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";
+		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."element_contact as ec ON ec.element_id = t.rowid";
+		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_type_contact as tc ON ec.fk_c_type_contact = tc.rowid";
+		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."socpeople sp ON ec.fk_socpeople = sp.rowid";
 		if (is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label'])) {
 			$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."ticket_extrafields as ef on (t.rowid = ef.fk_object)";
 		}
 		$sql .= " WHERE t.entity IN (".getEntity('ticket').")";
 		$sql .= " AND ((tc.source = 'external'";
-		$sql .= " AND tc.element='".$db->escape($object->dao->element)."'";
-		$sql .= " AND tc.active=1)";
-		$sql .= " OR (sp.email='".$db->escape($_SESSION['email_customer'])."'";
-		$sql .= " OR s.email='".$db->escape($_SESSION['email_customer'])."'";
-		$sql .= " OR t.origin_email='".$db->escape($_SESSION['email_customer'])."'))";
+		$sql .= " AND tc.element='".$db->escape($object->element)."'";
+		$sql .= " AND tc.active=1";
+		$sql .= " AND sp.email='".$db->escape($_SESSION['email_customer'])."')";		// email found into an external contact
+		$sql .= " OR s.email='".$db->escape($_SESSION['email_customer'])."'";			// or email of the linked company
+		$sql .= " OR t.origin_email='".$db->escape($_SESSION['email_customer'])."')";	// or email of the requester
 		// Manage filter
 		if (!empty($filter)) {
 			foreach ($filter as $key => $value) {
@@ -696,6 +696,8 @@ if ($action == "view_ticketlist") {
                     }
                 </script>';
 			}
+		} else {
+			dol_print_error($db);
 		}
 	} else {
 		print '<div class="error">Not Allowed<br><a href="'.$_SERVER['PHP_SELF'].'?track_id='.$object->dao->track_id.'">'.$langs->trans('Back').'</a></div>';
diff --git a/htdocs/ticket/list.php b/htdocs/ticket/list.php
index f489c9218fc..d80d44813e0 100644
--- a/htdocs/ticket/list.php
+++ b/htdocs/ticket/list.php
@@ -140,7 +140,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'=>($visible != 3 && dol_eval($val['enabled'], 1)),
 			'position'=>$val['position'],
 			'help'=> isset($val['help']) ? $val['help'] : ''
 		);
@@ -621,8 +621,8 @@ if ($limit > 0 && $limit != $conf->liste_limit) {
 	$param .= '&limit='.urlencode($limit);
 }
 foreach ($search as $key => $val) {
-	if (is_array($val) && count($val)) {
-		foreach ($val as $skey) {
+	if (is_array($search[$key])) {
+		foreach ($search[$key] as $skey) {
 			if ($skey != '') {
 				$param .= (!empty($val)) ? '&search_'.$key.'[]='.urlencode($skey) : "";
 			}
@@ -746,10 +746,13 @@ $trackid = 'tic'.$object->id;
 include DOL_DOCUMENT_ROOT.'/core/tpl/massactions_pre.tpl.php';
 
 if ($search_all) {
+	$setupstring = '';
 	foreach ($fieldstosearchall as $key => $val) {
 		$fieldstosearchall[$key] = $langs->trans($val);
+		$setupstring .= $key."=".$val.";";
 	}
-	print '<div class="divsearchfieldfilter">'.$langs->trans("FilterOnInto", $search_all).join(', ', $fieldstosearchall).'</div>';
+	print '<!-- Search done like if PRODUCT_QUICKSEARCH_ON_FIELDS = '.$setupstring.' -->'."\n";
+	print '<div class="divsearchfieldfilter">'.$langs->trans("FilterOnInto", $search_all).join(', ', $fieldstosearchall).'</div>'."\n";
 }
 
 $moreforfilter = '';

From 6c45b13178555adf8f5b32c5e3ae4b8e81569572 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 1 Sep 2022 12:32:27 +0200
Subject: [PATCH 568/974] NEW Add filter "Product subject to lot/Serial" in
 stock per lot/serial

---
 htdocs/core/class/html.formticket.class.php |  2 +-
 htdocs/core/menus/init_menu_auguria.sql     |  2 +-
 htdocs/core/menus/standard/eldy.lib.php     |  2 +-
 htdocs/langs/en_US/stocks.lang              |  1 +
 htdocs/product/reassort.php                 | 12 ++++++------
 htdocs/product/reassortlot.php              | 20 ++++++++++++++------
 6 files changed, 24 insertions(+), 15 deletions(-)

diff --git a/htdocs/core/class/html.formticket.class.php b/htdocs/core/class/html.formticket.class.php
index 83071830ae7..df24aa38327 100644
--- a/htdocs/core/class/html.formticket.class.php
+++ b/htdocs/core/class/html.formticket.class.php
@@ -190,7 +190,7 @@ class FormTicket
 		// TITLE
 		$email = GETPOSTISSET('email') ? GETPOST('email', 'alphanohtml') : '';
 		if ($this->withemail) {
-			print '<tr><td class="titlefield"><label for="email"><span class="fieldrequired">'.$langs->trans("Email").'</span></label></td><td>';
+			print '<tr><td class="titlefield"><label for="email"><span class="fieldrequired">'.img_picto('', 'email', 'class="pictofixedwidth"').$langs->trans("Email").'</span></label></td><td>';
 			print '<input class="text minwidth200" id="email" name="email" value="'.$email.'" autofocus>';
 			print '</td></tr>';
 
diff --git a/htdocs/core/menus/init_menu_auguria.sql b/htdocs/core/menus/init_menu_auguria.sql
index 0580c6c8cc0..8a9186e49c0 100644
--- a/htdocs/core/menus/init_menu_auguria.sql
+++ b/htdocs/core/menus/init_menu_auguria.sql
@@ -119,7 +119,7 @@ insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, left
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->product->enabled', __HANDLER__, 'left', 2801__+MAX_llx_menu__, 'products', '', 2800__+MAX_llx_menu__, '/product/card.php?mainmenu=products&amp;leftmenu=product&amp;action=create&amp;type=0', 'NewProduct', 1, 'products', '$user->rights->produit->creer', '', 2, 0, __ENTITY__);
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->product->enabled', __HANDLER__, 'left', 2802__+MAX_llx_menu__, 'products', '', 2800__+MAX_llx_menu__, '/product/list.php?mainmenu=products&amp;leftmenu=product&amp;type=0', 'List', 1, 'products', '$user->rights->produit->lire', '', 2, 1, __ENTITY__);
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->product->enabled', __HANDLER__, 'left', 2803__+MAX_llx_menu__, 'products', '', 2800__+MAX_llx_menu__, '/product/reassort.php?mainmenu=products&amp;type=0', 'MenuStocks', 1, 'products', '$user->rights->produit->lire && $user->rights->stock->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->productbatch->enabled', __HANDLER__, 'left', 2805__+MAX_llx_menu__, 'products', '', 2800__+MAX_llx_menu__, '/product/reassortlot.php?mainmenu=products&amp;type=0', 'StocksByLotSerial', 1, 'products', '$user->rights->produit->lire && $user->rights->stock->lire', '', 2, 5, __ENTITY__);
+insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->productbatch->enabled', __HANDLER__, 'left', 2805__+MAX_llx_menu__, 'products', '', 2800__+MAX_llx_menu__, '/product/reassortlot.php?mainmenu=products&amp;type=0&amp;search_subjecttolotserial=1', 'StocksByLotSerial', 1, 'products', '$user->rights->produit->lire && $user->rights->stock->lire', '', 2, 5, __ENTITY__);
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->productbatch->enabled', __HANDLER__, 'left', 2806__+MAX_llx_menu__, 'products', '', 2800__+MAX_llx_menu__, '/product/stock/productlot_list.php?mainmenu=products', 'LotSerial', 1, 'products', '$user->rights->produit->lire && $user->rights->stock->lire', '', 2, 6, __ENTITY__);
 
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->variants->enabled', __HANDLER__, 'left', 2807__+MAX_llx_menu__, 'products', '', 2800__+MAX_llx_menu__, '/variants/list.php?mainmenu=products', 'VariantAttributes', 1, 'products', '$user->rights->produit->lire', '', 2, 7, __ENTITY__);
diff --git a/htdocs/core/menus/standard/eldy.lib.php b/htdocs/core/menus/standard/eldy.lib.php
index 4707657d3e3..49aca30d3e0 100644
--- a/htdocs/core/menus/standard/eldy.lib.php
+++ b/htdocs/core/menus/standard/eldy.lib.php
@@ -1998,7 +1998,7 @@ function get_left_menu_products($mainmenu, &$newmenu, $usemenuhider = 1, $leftme
 			}
 			if (isModEnabled('productbatch')) {
 				$langs->load("stocks");
-				$newmenu->add("/product/reassortlot.php?type=0", $langs->trans("StocksByLotSerial"), 1, $user->rights->produit->lire && $user->rights->stock->lire);
+				$newmenu->add("/product/reassortlot.php?type=0&search_subjecttolotserial=1", $langs->trans("StocksByLotSerial"), 1, $user->rights->produit->lire && $user->rights->stock->lire);
 				$newmenu->add("/product/stock/productlot_list.php", $langs->trans("LotSerial"), 1, $user->rights->produit->lire && $user->rights->stock->lire);
 			}
 			if (isModEnabled('variants')) {
diff --git a/htdocs/langs/en_US/stocks.lang b/htdocs/langs/en_US/stocks.lang
index 47483bb8f3b..492cdd48864 100644
--- a/htdocs/langs/en_US/stocks.lang
+++ b/htdocs/langs/en_US/stocks.lang
@@ -24,6 +24,7 @@ StockAtDateInFuture=Date in the future
 StocksByLotSerial=Stocks by lot/serial
 LotSerial=Lots/Serials
 LotSerialList=List of lot/serials
+SubjectToLotSerialOnly=Products subject to lot/serial only
 Movements=Movements
 ErrorWarehouseRefRequired=Warehouse reference name is required
 ListOfWarehouses=List of warehouses
diff --git a/htdocs/product/reassort.php b/htdocs/product/reassort.php
index 10e70545af6..bec2b772d58 100644
--- a/htdocs/product/reassort.php
+++ b/htdocs/product/reassort.php
@@ -41,7 +41,7 @@ $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;
 $search_barcode = GETPOST("search_barcode", 'alpha');
-$toolowstock = GETPOST('toolowstock');
+$search_toolowstock = GETPOST('search_toolowstock');
 $tosell = GETPOST("tosell");
 $tobuy = GETPOST("tobuy");
 $fourn_id = GETPOST("fourn_id", 'int');
@@ -116,7 +116,7 @@ if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x'
 	$tobuy = "";
 	$search_sale = "";
 	$search_categ = "";
-	$toolowstock = '';
+	$search_toolowstock = '';
 	$fourn_id = '';
 	$sbarcode = '';
 	$search_stock_physique = '';
@@ -210,7 +210,7 @@ $parameters = array();
 $reshook = $hookmanager->executeHooks('printFieldSelect', $parameters, $object); // Note that $action and $object may have been modified by hook
 $sql .= $hookmanager->resPrint;
 $sql_having = '';
-if ($toolowstock) {
+if ($search_toolowstock) {
 	$sql_having .= " HAVING SUM(".$db->ifsql('s.reel IS NULL', '0', 's.reel').") < p.seuil_stock_alerte";
 }
 if ($search_stock_physique != '') {
@@ -296,8 +296,8 @@ if ($resql) {
 	if ($search_categ > 0) {
 		$param .= "&search_categ=".urlencode($search_categ);
 	}
-	if ($toolowstock) {
-		$param .= "&toolowstock=".urlencode($toolowstock);
+	if ($search_toolowstock) {
+		$param .= "&search_toolowstock=".urlencode($search_toolowstock);
 	}
 	if ($sbarcode) {
 		$param .= "&sbarcode=".urlencode($sbarcode);
@@ -336,7 +336,7 @@ if ($resql) {
 	}
 
 	$moreforfilter .= '<div class="divsearchfield">';
-	$moreforfilter .= $langs->trans("StockTooLow").' <input type="checkbox" name="toolowstock" value="1"'.($toolowstock ? ' checked' : '').'>';
+	$moreforfilter .= '<label for="search_toolowstock">'.$langs->trans("StockTooLow").' </label><input type="checkbox" id="search_toolowstock" name="search_toolowstock" value="1"'.($search_toolowstock ? ' checked' : '').'>';
 	$moreforfilter .= '</div>';
 
 	if (!empty($moreforfilter)) {
diff --git a/htdocs/product/reassortlot.php b/htdocs/product/reassortlot.php
index a39dc246772..87a49e1bce1 100644
--- a/htdocs/product/reassortlot.php
+++ b/htdocs/product/reassortlot.php
@@ -52,7 +52,8 @@ $type = GETPOSTISSET('type') ? GETPOST('type', 'int') : Product::TYPE_PRODUCT;
 $search_barcode = GETPOST("search_barcode", 'alpha');
 $search_warehouse = GETPOST('search_warehouse', 'alpha');
 $search_batch = GETPOST('search_batch', 'alpha');
-$toolowstock = GETPOST('toolowstock');
+$search_toolowstock = GETPOST('search_toolowstock');
+$search_subjecttolotserial = GETPOST('search_subjecttolotserial');
 $tosell = GETPOST("tosell");
 $tobuy = GETPOST("tobuy");
 $fourn_id = GETPOST("fourn_id", 'int');
@@ -173,7 +174,8 @@ if (empty($reshook)) {
 		$tobuy = "";
 		$search_sale = "";
 		$search_categ = "";
-		$toolowstock = '';
+		$search_toolowstock = '';
+		$search_subjecttolotserial = '';
 		$search_batch = '';
 		$search_warehouse = '';
 		$fourn_id = '';
@@ -252,6 +254,9 @@ if (dol_strlen($type)) {
 		$sql .= " AND p.fk_product_type <> '1'";
 	}
 }
+if ($search_subjecttolotserial) {
+	$sql .= " AND p.tobatch > 0";
+}
 if ($sref) {
 	$sql .= natural_search("p.ref", $sref);
 }
@@ -318,7 +323,7 @@ $sql .= " e.ref, e.lieu, e.fk_parent,";
 $sql .= " pb.batch, pb.eatby, pb.sellby,";
 $sql .= " pl.rowid, pl.eatby, pl.sellby";
 $sql_having = '';
-if ($toolowstock) {
+if ($search_toolowstock) {
 	$sql_having .= " HAVING SUM(".$db->ifsql('ps.reel IS NULL', '0', 'ps.reel').") < p.seuil_stock_alerte"; // Not used yet
 }
 if ($search_stock_physique != '') {
@@ -437,8 +442,11 @@ if ($sbarcode) {
 if ($search_warehouse) {
 	$param .= "&search_warehouse=".urlencode($search_warehouse);
 }
-if ($toolowstock) {
-	$param .= "&toolowstock=".urlencode($toolowstock);
+if ($search_toolowstock) {
+	$param .= "&search_toolowstock=".urlencode($search_toolowstock);
+}
+if ($search_subjecttolotserial) {
+	$param .= "&search_subjecttolotserial=".urlencode($search_subjecttolotserial);
 }
 if ($search_sale) {
 	$param .= "&search_sale=".urlencode($search_sale);
@@ -487,7 +495,7 @@ if (!empty($conf->categorie->enabled)) {
 	$moreforfilter .= $htmlother->select_categories(Categorie::TYPE_PRODUCT, $search_categ, 'search_categ', 1);
 	$moreforfilter .= '</div>';
 }
-//$moreforfilter.=$langs->trans("StockTooLow").' <input type="checkbox" name="toolowstock" value="1"'.($toolowstock?' 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)) {
 	print '<div class="liste_titre liste_titre_bydiv centpercent">';

From 03a39d33b904dcc64c3ee6d0653983e2f0c1545c Mon Sep 17 00:00:00 2001
From: Radarjr2002 <112626442+Radarjr2002@users.noreply.github.com>
Date: Thu, 1 Sep 2022 13:10:25 +0200
Subject: [PATCH 569/974] Warning in php 8

---
 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 9e17d925dbe..11cbcad7b85 100644
--- a/htdocs/core/lib/modulebuilder.lib.php
+++ b/htdocs/core/lib/modulebuilder.lib.php
@@ -123,7 +123,7 @@ function rebuildObjectClass($destdir, $module, $objectname, $newmask, $readdir =
 				$i++;
 				$texttoinsert .= "\t\t'".$key."' => array('type'=>'".$val['type']."',";
 				$texttoinsert .= " 'label'=>'".$val['label']."',";
-				if ($val['picto']) {
+				if (!empty($val['picto'])) {
 					$texttoinsert .= " 'picto'=>'".$val['picto']."',";
 				}
 				$texttoinsert .= " 'enabled'=>'".($val['enabled'] !== '' ? $val['enabled'] : 1)."',";

From e5e59e1de04038d05d7b6cf1fb9915cbad007d4b Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 1 Sep 2022 13:11:11 +0200
Subject: [PATCH 570/974] Look and feel

---
 htdocs/adherents/admin/website.php | 45 ++++++++++++++----------------
 htdocs/admin/ticket_public.php     | 29 +++++++++++++++----
 2 files changed, 45 insertions(+), 29 deletions(-)

diff --git a/htdocs/adherents/admin/website.php b/htdocs/adherents/admin/website.php
index 3c7775dc6b8..41ea43c4cec 100644
--- a/htdocs/adherents/admin/website.php
+++ b/htdocs/adherents/admin/website.php
@@ -167,10 +167,30 @@ if (empty($conf->global->MEMBER_ENABLE_PUBLIC)) {
 print $enabledisablehtml;
 print '<input type="hidden" id="MEMBER_ENABLE_PUBLIC" name="MEMBER_ENABLE_PUBLIC" value="'.(empty($conf->global->MEMBER_ENABLE_PUBLIC) ? 0 : 1).'">';
 
+print '<br><br>';
 
-print '<br>';
 
 if (!empty($conf->global->MEMBER_ENABLE_PUBLIC)) {
+	print '<br>';
+	//print $langs->trans('FollowingLinksArePublic').'<br>';
+	print img_picto('', 'globe').' <span class="opacitymedium">'.$langs->trans('BlankSubscriptionForm').'</span><br>';
+	if (isModEnabled('multicompany')) {
+		$entity_qr = '?entity='.$conf->entity;
+	} else {
+		$entity_qr = '';
+	}
+
+	// Define $urlwithroot
+	$urlwithouturlroot = preg_replace('/'.preg_quote(DOL_URL_ROOT, '/').'$/i', '', trim($dolibarr_main_url_root));
+	$urlwithroot = $urlwithouturlroot.DOL_URL_ROOT; // This is to use external domain name found into config file
+	//$urlwithroot=DOL_MAIN_URL_ROOT;					// This is to use same domain name than current
+
+	print '<div class="urllink">';
+	print '<input type="text" id="publicurlmember" class="quatrevingtpercentminusx" value="'.$urlwithroot.'/public/members/new.php'.$entity_qr.'">';
+	print '<a target="_blank" rel="noopener noreferrer" href="'.$urlwithroot.'/public/members/new.php'.$entity_qr.'">'.img_picto('', 'globe', 'class="paddingleft"').'</a>';
+	print '</div>';
+	print ajax_autoselect('publicurlmember');
+
 	print '<br>';
 
 	print '<div class="div-table-responsive-no-min">';
@@ -248,29 +268,6 @@ print dol_get_fiche_end();
 
 print '</form>';
 
-
-if (!empty($conf->global->MEMBER_ENABLE_PUBLIC)) {
-	print '<br>';
-	//print $langs->trans('FollowingLinksArePublic').'<br>';
-	print img_picto('', 'globe').' <span class="opacitymedium">'.$langs->trans('BlankSubscriptionForm').'</span><br>';
-	if (isModEnabled('multicompany')) {
-		$entity_qr = '?entity='.$conf->entity;
-	} else {
-		$entity_qr = '';
-	}
-
-	// Define $urlwithroot
-	$urlwithouturlroot = preg_replace('/'.preg_quote(DOL_URL_ROOT, '/').'$/i', '', trim($dolibarr_main_url_root));
-	$urlwithroot = $urlwithouturlroot.DOL_URL_ROOT; // This is to use external domain name found into config file
-	//$urlwithroot=DOL_MAIN_URL_ROOT;					// This is to use same domain name than current
-
-	print '<div class="urllink">';
-	print '<input type="text" id="publicurlmember" class="quatrevingtpercentminusx" value="'.$urlwithroot.'/public/members/new.php'.$entity_qr.'">';
-	print '<a target="_blank" rel="noopener noreferrer" href="'.$urlwithroot.'/public/members/new.php'.$entity_qr.'">'.img_picto('', 'globe', 'class="paddingleft"').'</a>';
-	print '</div>';
-	print ajax_autoselect('publicurlmember');
-}
-
 // End of page
 llxFooter();
 $db->close();
diff --git a/htdocs/admin/ticket_public.php b/htdocs/admin/ticket_public.php
index a0df28a8f84..3e4c088620d 100644
--- a/htdocs/admin/ticket_public.php
+++ b/htdocs/admin/ticket_public.php
@@ -235,12 +235,10 @@ $head = ticketAdminPrepareHead();
 
 print dol_get_fiche_head($head, 'public', $langs->trans("Module56000Name"), -1, "ticket");
 
-print '<span class="opacitymedium">'.$langs->trans("TicketPublicAccess").'</span> : <a class="wordbreak" href="'.DOL_URL_ROOT.'/public/ticket/index.php?entity='.$conf->entity.'" target="_blank" rel="noopener noreferrer">'.dol_buildpath('/public/ticket/index.php?entity='.$conf->entity, 2).'</a>';
-
-print dol_get_fiche_end();
-
 $param = '';
 
+print '<br>';
+
 $enabledisablehtml = $langs->trans("TicketsActivatePublicInterface").' ';
 if (empty($conf->global->TICKET_ENABLE_PUBLIC_INTERFACE)) {
 	// Button off, click to enable
@@ -256,9 +254,30 @@ if (empty($conf->global->TICKET_ENABLE_PUBLIC_INTERFACE)) {
 print $enabledisablehtml;
 print '<input type="hidden" id="TICKET_ENABLE_PUBLIC_INTERFACE" name="TICKET_ENABLE_PUBLIC_INTERFACE" value="'.(empty($conf->global->TICKET_ENABLE_PUBLIC_INTERFACE) ? 0 : 1).'">';
 
-print '<br><br>';
+print dol_get_fiche_end();
+
+
 
 if (!empty($conf->global->TICKET_ENABLE_PUBLIC_INTERFACE)) {
+	print '<br>';
+
+
+	// Define $urlwithroot
+	$urlwithouturlroot = preg_replace('/'.preg_quote(DOL_URL_ROOT, '/').'$/i', '', trim($dolibarr_main_url_root));
+	$urlwithroot = $urlwithouturlroot.DOL_URL_ROOT; // This is to use external domain name found into config file
+	//$urlwithroot=DOL_MAIN_URL_ROOT;					// This is to use same domain name than current
+
+	print '<span class="opacitymedium">'.$langs->trans("TicketPublicAccess").'</span> :<br>';
+	print '<div class="urllink">';
+	print '<input type="text" id="publicurlmember" class="quatrevingtpercentminusx" value="'.$urlwithroot.'/public/ticket/index.php?entity='.$conf->entity.'">';
+	print '<a target="_blank" rel="noopener noreferrer" href="'.$urlwithroot.'/public/ticket/index.php?entity='.$conf->entity.'">'.img_picto('', 'globe', 'class="paddingleft"').'</a>';
+	print '</div>';
+	print ajax_autoselect('publicurlmember');
+
+
+	print '<br><br>';
+
+
 	print '<form method="post" action="'.$_SERVER['PHP_SELF'].'" enctype="multipart/form-data" >';
 	print '<input type="hidden" name="token" value="'.newToken().'">';
 	print '<input type="hidden" name="action" value="setvar">';

From a83b42ba8e480f93b5d8e276394e166782e5359a Mon Sep 17 00:00:00 2001
From: Radarjr2002 <112626442+Radarjr2002@users.noreply.github.com>
Date: Thu, 1 Sep 2022 13:21:15 +0200
Subject: [PATCH 571/974] fix php8 warnings

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

diff --git a/htdocs/contact/card.php b/htdocs/contact/card.php
index d7eb7f53d82..6ea90797d43 100644
--- a/htdocs/contact/card.php
+++ b/htdocs/contact/card.php
@@ -1316,7 +1316,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 			$login = dol_buildlogin($object->lastname, $object->firstname);
 
 			$generated_password = '';
-			if (!$ldap_sid) { // TODO ldap_sid ?
+			if (empty($ldap_sid)) { // TODO ldap_sid ?
 				require_once DOL_DOCUMENT_ROOT.'/core/lib/security2.lib.php';
 				$generated_password = getRandomPassword(false);
 			}

From 065c96e1bedfed765b42811ebb22ac8c1491c130 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 1 Sep 2022 13:57:15 +0200
Subject: [PATCH 572/974] Trans

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

diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index 24343c773d5..ced1f23ed39 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -2223,7 +2223,7 @@ NoExternalModuleWithUpdate=No updates found for external modules
 SwaggerDescriptionFile=Swagger API description file (for use with redoc for example)
 YouEnableDeprecatedWSAPIsUseRESTAPIsInstead=You enabled deprecated WS API. You should use REST API instead.
 RandomlySelectedIfSeveral=Randomly selected if several pictures are available
-SalesRepresentativeInfo=For Proposals, Orders, Invoces.
+SalesRepresentativeInfo=For Proposals, Orders, Invoices.
 DatabasePasswordObfuscated=Database password is obfuscated in conf file
 DatabasePasswordNotObfuscated=Database password is NOT obfuscated in conf file
 APIsAreNotEnabled=APIs modules are not enabled

From a10a428bc318ea1ec0a791db1c0f3190098c9ccf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Thu, 1 Sep 2022 14:01:27 +0200
Subject: [PATCH 573/974] add doc

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

diff --git a/htdocs/core/class/extrafields.class.php b/htdocs/core/class/extrafields.class.php
index bbc5e8604ce..d26a1dc8fc1 100644
--- a/htdocs/core/class/extrafields.class.php
+++ b/htdocs/core/class/extrafields.class.php
@@ -9,7 +9,7 @@
  * Copyright (C) 2015       Charles-Fr BENKE        <charles.fr@benke.fr>
  * Copyright (C) 2016       Raphaël Doursenaud      <rdoursenaud@gpcsolutions.fr>
  * Copyright (C) 2017       Nicolas ZABOURI         <info@inovea-conseil.com>
- * Copyright (C) 2018-2021  Frédéric France         <frederic.france@netlogic.fr>
+ * Copyright (C) 2018-2022  Frédéric France         <frederic.france@netlogic.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -91,7 +91,9 @@ class ExtraFields
 	 */
 	public $errno;
 
-
+	/**
+	 * @var array array of type to label
+	 */
 	public static $type2label = array(
 		'varchar'=>'String1Line',
 		'text'=>'TextLongNLines',

From 06fafc9d7b7358684d13e0af768d5269220352ef Mon Sep 17 00:00:00 2001
From: lmarcouiller <lucas.marcouiller@gmail.com>
Date: Thu, 1 Sep 2022 15:04:30 +0200
Subject: [PATCH 574/974] New : Add action to push banque account in Stripe
 account

---
 htdocs/societe/paymentmodes.php      |  42 ++++++++-
 htdocs/stripe/class/stripe.class.php | 123 +++++++++++++++++++++++++++
 2 files changed, 163 insertions(+), 2 deletions(-)

diff --git a/htdocs/societe/paymentmodes.php b/htdocs/societe/paymentmodes.php
index 5b9bd1046ef..7d082440661 100644
--- a/htdocs/societe/paymentmodes.php
+++ b/htdocs/societe/paymentmodes.php
@@ -516,6 +516,40 @@ if (empty($reshook)) {
 				}
 			}
 		}
+		if ($action == 'syncsepatostripe') {
+			$companybankaccount->fetch(GETPOST('bankid'));
+			// print "stripe account = " . json_encode($stripe->getStripeAccount($service));
+			// print json_encode($companybankaccount);
+			// print "fetch id = " . json_encode($socid);
+
+			$companypaymentmode = new CompanyPaymentMode($db);
+			$companypaymentmode->fetch(null, null, $socid);
+			// print json_encode($companypaymentmode);
+
+			if ($companypaymentmode->type != 'ban') {
+				$error++;
+				setEventMessages('ThisPaymentModeIsNotSepa', null, 'errors');
+			} else {
+				// Get the Stripe customer
+				$cu = $stripe->customerStripe($object, $stripeacc, $servicestatus);
+				// print json_encode($cu);
+				if (!$cu) {
+					$error++;
+					setEventMessages($stripe->error, $stripe->errors, 'errors');
+				}
+
+				if (!$error) {
+					// Creation of Stripe SEPA + update of societe_account
+					$card = $stripe->sepaStripe($cu, $companypaymentmode, $stripeacc, $servicestatus, 1);
+					if (!$card) {
+						$error++;
+						setEventMessages($stripe->error, $stripe->errors, 'errors');
+					} else {
+						setEventMessages("", array("SEPA on Stripe", "SEPA IBAN is now linked to customer account !"));
+					}
+				}
+			}
+		}
 
 		if ($action == 'setkey_account') {
 			$error = 0;
@@ -632,7 +666,7 @@ if (empty($reshook)) {
 		} elseif ($action == 'setassourcedefault') {	// Set as default when payment mode defined remotely only
 			try {
 				$cu = $stripe->customerStripe($object, $stripeacc, $servicestatus);
-				if (preg_match('/pm_/', $source)) {
+				if (preg_match('/pm_|src_/', $source)) {
 					$cu->invoice_settings->default_payment_method = (string) $source; // New
 				} else {
 					$cu->default_source = (string) $source; // Old
@@ -660,6 +694,10 @@ if (empty($reshook)) {
 						// $card->detach();  Does not work with card_, only with src_
 						if (method_exists($card, 'detach')) {
 							$card->detach();
+							$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();
 						}
@@ -1465,7 +1503,7 @@ if ($socid && $action != 'edit' && $action != 'create' && $action != 'editcard'
 			// Edit/Delete
 			print '<td class="right nowraponall">';
 			if ($permissiontoaddupdatepaymentinformation) {
-				print '<a class="editfielda marginrightonly marginleftonly" href="'.$_SERVER["PHP_SELF"].'?socid='.$object->id.'&id='.$rib->id.'&action=createbanonstripe">';
+				print '<a class="editfielda marginrightonly marginleftonly" href="'.$_SERVER["PHP_SELF"].'?socid='.$object->id.'&id='.$rib->id.'&action=syncsepatostripe">';
 				print img_picto($langs->trans("CreateBAN"), 'stripe');
 				print '</a>';
 
diff --git a/htdocs/stripe/class/stripe.class.php b/htdocs/stripe/class/stripe.class.php
index 5ec149ba07f..6814dc3757f 100644
--- a/htdocs/stripe/class/stripe.class.php
+++ b/htdocs/stripe/class/stripe.class.php
@@ -588,7 +588,130 @@ class Stripe extends CommonObject
 			return null;
 		}
 	}
+	/**
+		 * Get the Stripe SEPA of a company payment mode
+		 *
+		 * @param	\Stripe\StripeCustomer	$cu								Object stripe customer.
+		 * @param	CompanyPaymentMode		$object							Object companypaymentmode to check, or create on stripe (create on stripe also update the societe_rib table for current entity)
+		 * @param	string					$stripeacc						''=Use common API. If not '', it is the Stripe connect account 'acc_....' to use Stripe connect
+		 * @param	int						$status							Status (0=test, 1=live)
+		 * @param	int						$createifnotlinkedtostripe		1=Create the stripe sepa and the link if the sepa is not yet linked to a stripe sepa. Deprecated with new Stripe API and SCA.
+		 * @return 	\Stripe\PaymentMethod|null 			Stripe SEPA or null if not found
+		 */
+	public function sepaStripe($cu, CompanyPaymentMode $object, $stripeacc = '', $status = 0, $createifnotlinkedtostripe = 0)
+	{
+		global $conf, $user, $langs;
+		$sepa = null;
 
+		$sql = "SELECT sa.stripe_card_ref, sa.proprio, sa.iban_prefix"; // stripe_card_ref is src_ for sepa
+		$sql .= " FROM ".MAIN_DB_PREFIX."societe_rib as sa";
+		$sql .= " WHERE sa.rowid = ".$object->id; // We get record from ID, no need for filter on entity
+		$sql .= " AND sa.type = 'ban'"; //type ban to get normal bank account of customer (prelevement)
+
+		$soc = new Societe($this->db);
+		$soc->fetch($object->fk_soc);
+
+		dol_syslog(get_class($this)."::fetch search stripe sepa(card) id for paymentmode id=".$object->id.", stripeacc=".$stripeacc.", status=".$status.", createifnotlinkedtostripe=".$createifnotlinkedtostripe, LOG_DEBUG);
+		$resql = $this->db->query($sql);
+		if ($resql) {
+			$num = $this->db->num_rows($resql);
+			if ($num) {
+				$obj = $this->db->fetch_object($resql);
+				$cardref = $obj->stripe_card_ref;
+				dol_syslog(get_class($this)."::cardStripe cardref=".$cardref);
+				if ($cardref) {
+					try {
+						if (empty($stripeacc)) {				// If the Stripe connect account not set, we use common API usage
+							if (!preg_match('/^pm_/', $cardref) && !empty($cu->sources)) {
+								$sepa = $cu->sources->retrieve($cardref);
+							} else {
+								$sepa = \Stripe\PaymentMethod::retrieve($cardref);
+							}
+						} else {
+							if (!preg_match('/^pm_/', $cardref) && !empty($cu->sources)) {
+								//$sepa = $cu->sources->retrieve($cardref, array("stripe_account" => $stripeacc));		// this API fails when array stripe_account is provided
+								$sepa = $cu->sources->retrieve($cardref);
+							} else {
+								//$sepa = \Stripe\PaymentMethod::retrieve($cardref, array("stripe_account" => $stripeacc));		// Don't know if this works
+								$sepa = \Stripe\PaymentMethod::retrieve($cardref);
+							}
+						}
+					} catch (Exception $e) {
+						$this->error = $e->getMessage();
+						dol_syslog($this->error, LOG_WARNING);
+					}
+				} elseif ($createifnotlinkedtostripe) {
+					$iban = $obj->iban_prefix; //prefix ?
+					$ipaddress = getUserRemoteIP();
+
+					$dataforcard = array(
+						'type'=>'sepa_debit',
+						"sepa_debit" => array('iban' => $iban),
+						'currency' => 'eur',
+						'usage' => 'reusable',
+						'owner' => array(
+							'name' => $soc->name,
+						),
+						"metadata" => array('dol_id'=>$object->id, 'dol_version'=>DOL_VERSION, 'dol_entity'=>$conf->entity, 'ipaddress'=>$ipaddress)
+					);
+
+					//$a = \Stripe\Stripe::getApiKey();
+					//var_dump($a);var_dump($stripeacc);exit;
+					try {
+						dol_syslog("Try to create sepa_debit 0");
+
+						$service = 'StripeTest';
+						$servicestatus = 0;
+						if (!empty($conf->global->STRIPE_LIVE) && !GETPOST('forcesandbox', 'alpha')) {
+							$service = 'StripeLive';
+							$servicestatus = 1;
+						}
+						// Force to use the correct API key
+						global $stripearrayofkeysbyenv;
+						$stripeacc = $stripearrayofkeysbyenv[$servicestatus]['secret_key'];
+
+						dol_syslog("Try to create sepa_debit with data = ".json_encode($dataforcard));
+						$s = new \Stripe\StripeClient($stripeacc);
+						$sepa = $s->sources->create($dataforcard);
+						if (!$sepa) {
+							$this->error = 'Creation of sepa_debit on Stripe has failed';
+						} else {
+							//association du client avec cette source de paimeent
+							$cs = $cu->createSource(
+								$cu->id,
+								[
+								'source' => $sepa->id,
+								]
+							);
+							if (!$cs) {
+								$this->error = 'Link SEPA <-> Customer failed';
+							} else {
+								dol_syslog("Try to create sepa_debit 3");
+								// print json_encode($sepa);
+
+								$sql = "UPDATE ".MAIN_DB_PREFIX."societe_rib";
+								$sql .= " SET stripe_card_ref = '".$this->db->escape($sepa->id)."', card_type = 'sepa_debit',";
+								$sql .= " stripe_account= '" . $cu->id . '@' . $stripeacc . "'";
+								$sql .= " WHERE rowid = ".$object->id;
+								$sql .= " AND type = 'ban'";
+								$resql = $this->db->query($sql);
+								if (!$resql) {
+									$this->error = $this->db->lasterror();
+								}
+							}
+						}
+					} catch (Exception $e) {
+						$this->error = $e->getMessage();
+						dol_syslog($this->error, LOG_WARNING);
+					}
+				}
+			}
+		} else {
+			dol_print_error($this->db);
+		}
+
+		return $sepa;
+	}
 
 	/**
 	 * Get the Stripe payment intent. Create it with confirmnow=false

From 4ac4f78a997afc2de3ac5c6e5daa68c3c5a0fcc6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Thu, 1 Sep 2022 15:25:19 +0200
Subject: [PATCH 575/974] add extrafield setup

---
 htdocs/admin/bankline_extrafields.php | 118 ++++++++++++++++++++++++++
 htdocs/core/lib/bank.lib.php          |   5 ++
 htdocs/langs/en_US/banks.lang         |   1 +
 3 files changed, 124 insertions(+)
 create mode 100644 htdocs/admin/bankline_extrafields.php

diff --git a/htdocs/admin/bankline_extrafields.php b/htdocs/admin/bankline_extrafields.php
new file mode 100644
index 00000000000..d86733e4e24
--- /dev/null
+++ b/htdocs/admin/bankline_extrafields.php
@@ -0,0 +1,118 @@
+<?php
+/* Copyright (C) 2001-2002	Rodolphe Quiedeville	<rodolphe@quiedeville.org>
+ * Copyright (C) 2003		Jean-Louis Bergamo		<jlb@j1b.org>
+ * Copyright (C) 2004-2011	Laurent Destailleur		<eldy@users.sourceforge.net>
+ * 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) 2022       Frédéric France         <frederic.france@netlogic.fr>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+/**
+ * \file       admin/bankline_extrafields.php
+ * \ingroup    bank
+ * \brief      Page to setup extra fields of bankline
+ */
+
+// Load Dolibarr environment
+require '../main.inc.php';
+
+require_once DOL_DOCUMENT_ROOT.'/core/lib/bank.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
+
+// Load translation files required by the page
+$langs->loadLangs(array("admin", "companies", "bills", "other", "banks"));
+
+$extrafields = new ExtraFields($db);
+$form = new Form($db);
+
+// List of supported format
+$tmptype2label = ExtraFields::$type2label;
+$type2label = [];
+foreach ($tmptype2label as $key => $val) {
+	$type2label[$key] = $langs->transnoentitiesnoconv($val);
+}
+
+$action = GETPOST('action', 'aZ09');
+$attrname = GETPOST('attrname', 'alpha');
+$elementtype = 'bank'; //Must be the $table_element of the class that manage extrafield
+
+if (!$user->admin) {
+	accessforbidden();
+}
+
+
+/*
+ * Actions
+ */
+
+require DOL_DOCUMENT_ROOT.'/core/actions_extrafields.inc.php';
+
+/*
+ * View
+ */
+
+
+$help_url = '';
+$page_name = "BankSetupModule";
+
+llxHeader('', $langs->trans("BankSetupModule"), $help_url);
+
+
+$linkback = '<a href="'.DOL_URL_ROOT.'/admin/modules.php?restore_lastsearch_values=1">'.$langs->trans("BackToModuleList").'</a>';
+print load_fiche_titre($langs->trans($page_name), $linkback, 'title_setup');
+
+
+$head = bank_admin_prepare_head(null);
+
+print dol_get_fiche_head($head, 'bankline_extrafields', $langs->trans($page_name), -1, 'account');
+
+require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_view.tpl.php';
+
+print dol_get_fiche_end();
+
+
+// Buttons
+if ($action != 'create' && $action != 'edit') {
+	print '<div class="tabsAction">';
+	print '<a class="butAction reposition" href="'.$_SERVER["PHP_SELF"].'?action=create">'.$langs->trans("NewAttribute").'</a>';
+	print "</div>";
+}
+
+
+/*
+ * Creation of an optional field
+ */
+if ($action == 'create') {
+	print '<br><div id="newattrib"></div>';
+	print load_fiche_titre($langs->trans('NewAttribute'));
+
+	require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_add.tpl.php';
+}
+
+/*
+ * Edition of an optional field
+ */
+if ($action == 'edit' && !empty($attrname)) {
+	print "<br>";
+	print load_fiche_titre($langs->trans("FieldEdition", $attrname));
+
+	require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_edit.tpl.php';
+}
+
+// End of page
+llxFooter();
+$db->close();
diff --git a/htdocs/core/lib/bank.lib.php b/htdocs/core/lib/bank.lib.php
index 5dde1bc4360..1792de89a60 100644
--- a/htdocs/core/lib/bank.lib.php
+++ b/htdocs/core/lib/bank.lib.php
@@ -157,6 +157,11 @@ function bank_admin_prepare_head($object)
 	$head[$h][2] = 'attributes';
 	$h++;
 
+	$head[$h][0] = DOL_URL_ROOT.'/admin/bankline_extrafields.php';
+	$head[$h][1] = $langs->trans("BanklineExtraFields");
+	$head[$h][2] = 'bankline_extrafields';
+	$h++;
+
 	complete_head_from_modules($conf, $langs, $object, $head, $h, 'bank_admin', 'remove');
 
 
diff --git a/htdocs/langs/en_US/banks.lang b/htdocs/langs/en_US/banks.lang
index 10ba859e71f..71a80406ae4 100644
--- a/htdocs/langs/en_US/banks.lang
+++ b/htdocs/langs/en_US/banks.lang
@@ -185,3 +185,4 @@ AlreadyOneBankAccount=Already one bank account defined
 SEPAXMLPlacePaymentTypeInformationInCreditTransfertransactionInformation=SEPA transfer: 'Payment Type' at 'Credit Transfer' level
 SEPAXMLPlacePaymentTypeInformationInCreditTransfertransactionInformationHelp=When generatin 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=To create missing related bank record
+BanklineExtraFields=Bank Line Extrafields

From 6ce06658400c421e9d8ffbdc640b32b4204c8fa4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Thu, 1 Sep 2022 15:32:48 +0200
Subject: [PATCH 576/974] fix agenda setup

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

diff --git a/htdocs/admin/agenda.php b/htdocs/admin/agenda.php
index 3221738bcd3..e9708d8c005 100644
--- a/htdocs/admin/agenda.php
+++ b/htdocs/admin/agenda.php
@@ -3,6 +3,7 @@
  * Copyright (C) 2011		Regis Houssin		<regis.houssin@inodbox.com>
  * Copyright (C) 2011-2012  Juanjo Menent		<jmenent@2byte.es>
  * Copyright (C) 2015		Jean-François Ferry <jfefe@aternatik.fr>
+ * Copyright (C) 2022       Frédéric France     <frederic.france@netlogic.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -184,7 +185,7 @@ if (!empty($triggers)) {
 		}
 
 		//print 'module='.$module.' code='.$trigger['code'].'<br>';
-		if (isModEnabled('module')) {
+		if (isModEnabled($module)) {
 			// Discard special case: If option FICHINTER_CLASSIFY_BILLED is not set, we discard both trigger FICHINTER_CLASSIFY_BILLED and FICHINTER_CLASSIFY_UNBILLED
 			if ($trigger['code'] == 'FICHINTER_CLASSIFY_BILLED' && empty($conf->global->FICHINTER_CLASSIFY_BILLED)) {
 				continue;

From a865388b9c471be122a813c838c000a53b0c2543 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 1 Sep 2022 15:38:31 +0200
Subject: [PATCH 577/974] FIX fatal error abs on non int

---
 htdocs/public/recruitment/view.php | 6 ++++++
 htdocs/user/class/user.class.php   | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/htdocs/public/recruitment/view.php b/htdocs/public/recruitment/view.php
index b92dcbf9824..2eaa51ac2fe 100644
--- a/htdocs/public/recruitment/view.php
+++ b/htdocs/public/recruitment/view.php
@@ -217,7 +217,13 @@ if (!empty($logosmall) && is_readable($conf->mycompany->dir_output.'/logos/thumb
 if ($urllogo) {
 	print '<div class="backgreypublicpayment">';
 	print '<div class="logopublicpayment">';
+	if (!empty($mysoc->url)) {
+		print '<a href="'.$mysoc->url.'" target="_blank" rel="noopener">';
+	}
 	print '<img id="dolpaymentlogo" src="'.$urllogo.'">';
+	if (!empty($mysoc->url)) {
+		print '</a>';
+	}
 	print '</div>';
 	if (empty($conf->global->MAIN_HIDE_POWERED_BY)) {
 		print '<div class="poweredbypublicpayment opacitymedium right"><a class="poweredbyhref" href="https://www.dolibarr.org?utm_medium=website&utm_source=poweredby" target="dolibarr" rel="noopener">'.$langs->trans("PoweredBy").'<br><img class="poweredbyimg" src="'.DOL_URL_ROOT.'/theme/dolibarr_logo.svg" width="80px"></a></div>';
diff --git a/htdocs/user/class/user.class.php b/htdocs/user/class/user.class.php
index f8558e11a24..5a7a3bc030d 100644
--- a/htdocs/user/class/user.class.php
+++ b/htdocs/user/class/user.class.php
@@ -2827,7 +2827,7 @@ class User extends CommonObject
 		$result .= (($option == 'nolink') ? '' : $linkstart);
 		if ($withpictoimg) {
 			$paddafterimage = '';
-			if (abs($withpictoimg) == 1) {
+			if (abs((int) $withpictoimg) == 1) {
 				$paddafterimage = 'style="margin-'.($langs->trans("DIRECTION") == 'rtl' ? 'left' : 'right').': 3px;"';
 			}
 			// Only picto

From 5ba052019596f38662c9d288cc10029dba120057 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 1 Sep 2022 15:38:31 +0200
Subject: [PATCH 578/974] FIX fatal error abs on non int

---
 htdocs/public/recruitment/view.php | 6 ++++++
 htdocs/user/class/user.class.php   | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/htdocs/public/recruitment/view.php b/htdocs/public/recruitment/view.php
index b92dcbf9824..2eaa51ac2fe 100644
--- a/htdocs/public/recruitment/view.php
+++ b/htdocs/public/recruitment/view.php
@@ -217,7 +217,13 @@ if (!empty($logosmall) && is_readable($conf->mycompany->dir_output.'/logos/thumb
 if ($urllogo) {
 	print '<div class="backgreypublicpayment">';
 	print '<div class="logopublicpayment">';
+	if (!empty($mysoc->url)) {
+		print '<a href="'.$mysoc->url.'" target="_blank" rel="noopener">';
+	}
 	print '<img id="dolpaymentlogo" src="'.$urllogo.'">';
+	if (!empty($mysoc->url)) {
+		print '</a>';
+	}
 	print '</div>';
 	if (empty($conf->global->MAIN_HIDE_POWERED_BY)) {
 		print '<div class="poweredbypublicpayment opacitymedium right"><a class="poweredbyhref" href="https://www.dolibarr.org?utm_medium=website&utm_source=poweredby" target="dolibarr" rel="noopener">'.$langs->trans("PoweredBy").'<br><img class="poweredbyimg" src="'.DOL_URL_ROOT.'/theme/dolibarr_logo.svg" width="80px"></a></div>';
diff --git a/htdocs/user/class/user.class.php b/htdocs/user/class/user.class.php
index 1fc536d10bd..3b71811e7b1 100644
--- a/htdocs/user/class/user.class.php
+++ b/htdocs/user/class/user.class.php
@@ -2822,7 +2822,7 @@ class User extends CommonObject
 		$result .= (($option == 'nolink') ? '' : $linkstart);
 		if ($withpictoimg) {
 			$paddafterimage = '';
-			if (abs($withpictoimg) == 1) {
+			if (abs((int) $withpictoimg) == 1) {
 				$paddafterimage = 'style="margin-'.($langs->trans("DIRECTION") == 'rtl' ? 'left' : 'right').': 3px;"';
 			}
 			// Only picto

From c8ddcf86b61d5618d0cfd6d09fdcb3dd0bb23097 Mon Sep 17 00:00:00 2001
From: lmarcouiller <lucas.marcouiller@gmail.com>
Date: Thu, 1 Sep 2022 16:06:03 +0200
Subject: [PATCH 579/974] fix Ci error

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

diff --git a/htdocs/stripe/class/stripe.class.php b/htdocs/stripe/class/stripe.class.php
index 6814dc3757f..6410050c642 100644
--- a/htdocs/stripe/class/stripe.class.php
+++ b/htdocs/stripe/class/stripe.class.php
@@ -588,6 +588,7 @@ class Stripe extends CommonObject
 			return null;
 		}
 	}
+
 	/**
 		 * Get the Stripe SEPA of a company payment mode
 		 *
@@ -605,7 +606,7 @@ class Stripe extends CommonObject
 
 		$sql = "SELECT sa.stripe_card_ref, sa.proprio, sa.iban_prefix"; // stripe_card_ref is src_ for sepa
 		$sql .= " FROM ".MAIN_DB_PREFIX."societe_rib as sa";
-		$sql .= " WHERE sa.rowid = ".$object->id; // We get record from ID, no need for filter on entity
+		$sql .= " WHERE sa.rowid = '".$this->db->escape($object->id)."'"; // We get record from ID, no need for filter on entity
 		$sql .= " AND sa.type = 'ban'"; //type ban to get normal bank account of customer (prelevement)
 
 		$soc = new Societe($this->db);
@@ -691,8 +692,8 @@ class Stripe extends CommonObject
 
 								$sql = "UPDATE ".MAIN_DB_PREFIX."societe_rib";
 								$sql .= " SET stripe_card_ref = '".$this->db->escape($sepa->id)."', card_type = 'sepa_debit',";
-								$sql .= " stripe_account= '" . $cu->id . '@' . $stripeacc . "'";
-								$sql .= " WHERE rowid = ".$object->id;
+								$sql .= " stripe_account= '" . $this->db->escape($cu->id . "@" . $stripeacc) . "'";
+								$sql .= " WHERE rowid = '".$this->db->escape($object->id)."'";
 								$sql .= " AND type = 'ban'";
 								$resql = $this->db->query($sql);
 								if (!$resql) {

From e589cc7d9b35a1f1135fdc2c2fe0bc01b641eda7 Mon Sep 17 00:00:00 2001
From: lmarcouiller <lucas.marcouiller@gmail.com>
Date: Thu, 1 Sep 2022 16:13:21 +0200
Subject: [PATCH 580/974] fix ci error

---
 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 ef64b2e5a74..46790b9cbc5 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -1605,7 +1605,7 @@ function top_htmlhead($head, $title = '', $disablejs = 0, $disablehead = 0, $arr
 			dolibarr_set_const($db, "MAIN_IHM_PARAMS_REV", ((int) $conf->global->MAIN_IHM_PARAMS_REV) + 1, 'chaine', 0, '', $conf->entity);
 		}
 
-		$themeparam = '?lang='.$langs->defaultlang.'&amp;theme='.$conf->theme.(GETPOST('optioncss', 'aZ09') ? '&amp;optioncss='.GETPOST('optioncss', 'aZ09', 1) : '').(empty($user->id) ? '' : ('&amp;userid='.$user->id) : '').'&amp;entity='.$conf->entity;
+		$themeparam = '?lang='.$langs->defaultlang.'&amp;theme='.$conf->theme.(GETPOST('optioncss', 'aZ09') ? '&amp;optioncss='.GETPOST('optioncss', 'aZ09', 1) : '').(empty($user->id) ? '' : ('&amp;userid='.$user->id)).'&amp;entity='.$conf->entity;
 
 		$themeparam .= ($ext ? '&amp;'.$ext : '').'&amp;revision='.getDolGlobalInt("MAIN_IHM_PARAMS_REV");
 		if (GETPOSTISSET('dol_hide_topmenu')) {

From ffe0420523a39eea19e9b3ad22823271367025fe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Thu, 1 Sep 2022 16:15:36 +0200
Subject: [PATCH 581/974] fix delay setup

---
 htdocs/admin/delais.php | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/htdocs/admin/delais.php b/htdocs/admin/delais.php
index af8fed1c197..ec7874b7db8 100644
--- a/htdocs/admin/delais.php
+++ b/htdocs/admin/delais.php
@@ -4,6 +4,7 @@
  * Copyright (C) 2005       Simon Tosser            <simon@kornog-computing.com>
  * Copyright (C) 2005-2012  Regis Houssin           <regis.houssin@inodbox.com>
  * Copyright (C) 2016       Raphaël Doursenaud      <rdoursenaud@gpcsolutions.fr>
+ * Copyright (C) 2022       Frédéric France         <frederic.france@netlogic.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -172,7 +173,7 @@ if (!isset($conf->global->MAIN_DELAY_ORDERS_TO_PROCESS)) {
 
 if ($action == 'update') {
 	foreach ($modules as $module => $delays) {
-		if (isModEnabled('module')) {
+		if (isModEnabled($module)) {
 			foreach ($delays as $delay) {
 				if (GETPOST($delay['code']) != '') {
 					dolibarr_set_const($db, $delay['code'], GETPOST($delay['code']), 'chaine', 0, '', $conf->entity);
@@ -226,7 +227,7 @@ if ($action == 'edit') {
 	print '<td class="right">'.$langs->trans("LateWarningAfter").'</td></tr>';
 
 	foreach ($modules as $module => $delays) {
-		if (isModEnabled('module')) {
+		if (isModEnabled($module)) {
 			foreach ($delays as $delay) {
 				$value = (!empty($conf->global->{$delay['code']}) ? $conf->global->{$delay['code']} : 0);
 				print '<tr class="oddeven">';
@@ -260,7 +261,7 @@ if ($action == 'edit') {
 	print '<tr class="liste_titre"><td colspan="2">'.$langs->trans("DelaysOfToleranceBeforeWarning").'</td><td class="right">'.$langs->trans("Value").'</td></tr>';
 
 	foreach ($modules as $module => $delays) {
-		if (isModEnabled('module')) {
+		if (isModEnabled($module)) {
 			foreach ($delays as $delay) {
 				$value = (!empty($conf->global->{$delay['code']}) ? $conf->global->{$delay['code']} : 0);
 				print '<tr class="oddeven">';

From 5a924d23e3e1d14212e28a61b80fce0bf7592458 Mon Sep 17 00:00:00 2001
From: lmarcouiller <lucas.marcouiller@gmail.com>
Date: Thu, 1 Sep 2022 16:30:48 +0200
Subject: [PATCH 582/974] fix CI errors

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

diff --git a/htdocs/public/ticket/index.php b/htdocs/public/ticket/index.php
index 2f4bd720219..6332f063541 100644
--- a/htdocs/public/ticket/index.php
+++ b/htdocs/public/ticket/index.php
@@ -81,7 +81,7 @@ llxHeaderTicket($langs->trans("Tickets"), "", 0, 0, $arrayofjs, $arrayofcss);
 
 print '<div class="ticketpublicarea">';
 
-print '<p style="text-align: center">'.(getDolGlobalString("TICKET_PUBLIC_TEXT_HOME", '<span class="opacitymedium">'.$langs->trans("TicketPublicDesc")).'</span></p>')).'</p>';
+print '<p style="text-align: center">'.(getDolGlobalString("TICKET_PUBLIC_TEXT_HOME", '<span class="opacitymedium">'.$langs->trans("TicketPublicDesc")).'</span></p>').'</p>';
 print '<br>';
 
 print '<div class="ticketform">';

From e1bf5a5e6b53e7ac6da8453c916293d1c8d1e619 Mon Sep 17 00:00:00 2001
From: Gauthier PC portable 024 <gauthier.verdol@atm-consulting.fr>
Date: Thu, 1 Sep 2022 17:16:59 +0200
Subject: [PATCH 583/974] FIX : Recursively retrieves all parent bom in the
 tree that leads to the $bom_id bom to check if we're allowed to add bom as
 bomline

---
 htdocs/bom/bom_card.php        | 10 ++++++++++
 htdocs/bom/class/bom.class.php | 28 ++++++++++++++++++++++++++++
 htdocs/langs/en_US/mrp.lang    |  1 +
 htdocs/langs/fr_FR/mrp.lang    |  1 +
 4 files changed, 40 insertions(+)

diff --git a/htdocs/bom/bom_card.php b/htdocs/bom/bom_card.php
index ee619a589e3..11d2b3b4e31 100644
--- a/htdocs/bom/bom_card.php
+++ b/htdocs/bom/bom_card.php
@@ -180,6 +180,16 @@ if (empty($reshook)) {
 			$error++;
 		}
 
+		// We check if we're allowed to add this bom
+		$TParentBom=array();
+		$object->getParentBomTreeRecursive($TParentBom, $object->id);
+		if($bom_child_id > 0 && !empty($TParentBom) && in_array($bom_child_id, $TParentBom)) {
+			$n_child = new BOM($db);
+			$n_child->fetch($bom_child_id);
+			setEventMessages($langs->transnoentities('BomCantAddChildBom', $n_child->getNomUrl(1), $object->getNomUrl(1)), null, 'errors');
+			$error++;
+		}
+
 		if (!$error) {
 			$bomline = new BOMLine($db);
 			$bomline->fk_bom = $id;
diff --git a/htdocs/bom/class/bom.class.php b/htdocs/bom/class/bom.class.php
index 8adcac855c2..e178c76c024 100644
--- a/htdocs/bom/class/bom.class.php
+++ b/htdocs/bom/class/bom.class.php
@@ -1147,6 +1147,34 @@ class BOM extends CommonObject
 			}
 		}
 	}
+
+	/**
+	 * Recursively retrieves all parent bom in the tree that leads to the $bom_id bom
+	 *
+	 * @param 	array	$TParentBom		We put all found parent bom in $TParentBom
+	 * @param 	int		$bom_id			ID of bom from which we want to get parent bom ids
+	 * @return 	void
+	 */
+	public function getParentBomTreeRecursive(&$TParentBom, $bom_id) {
+
+		$sql = 'SELECT l.fk_bom, b.label
+				FROM '.MAIN_DB_PREFIX.'bom_bomline l
+				INNER JOIN '.MAIN_DB_PREFIX.$this->table_element.' b ON b.rowid = l.fk_bom
+				WHERE fk_bom_child = '.$bom_id;
+
+		$resql = $this->db->query($sql);
+		if(!empty($resql)) {
+
+			while($res = $this->db->fetch_object($resql)) {
+
+				$TParentBom[$res->fk_bom] = $res->fk_bom;
+				$this->getParentBomTreeRecursive($TParentBom, $res->fk_bom);
+
+			}
+
+		}
+
+	}
 }
 
 
diff --git a/htdocs/langs/en_US/mrp.lang b/htdocs/langs/en_US/mrp.lang
index 7f29b774b29..9e1c8bb64ce 100644
--- a/htdocs/langs/en_US/mrp.lang
+++ b/htdocs/langs/en_US/mrp.lang
@@ -112,3 +112,4 @@ MOAndLines=Manufacturing Orders and lines
 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
diff --git a/htdocs/langs/fr_FR/mrp.lang b/htdocs/langs/fr_FR/mrp.lang
index e65244b584f..709ff68b963 100644
--- a/htdocs/langs/fr_FR/mrp.lang
+++ b/htdocs/langs/fr_FR/mrp.lang
@@ -112,3 +112,4 @@ MOAndLines=Ordres de fabrication et lignes
 MoChildGenerate=Generate Child Mo
 ParentMo=MO Parent
 MOChild=MO Child
+BomCantAddChildBom=La nomenclature %s est déjà présente dans l'arborescence qui mène à la nomenclature %s

From d4122278bdfe3144a77f16a59cb6fca56285af6a Mon Sep 17 00:00:00 2001
From: stickler-ci <support@stickler-ci.com>
Date: Thu, 1 Sep 2022 15:23:40 +0000
Subject: [PATCH 584/974] Fixing style errors.

---
 htdocs/bom/bom_card.php        |  2 +-
 htdocs/bom/class/bom.class.php | 12 ++++--------
 2 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/htdocs/bom/bom_card.php b/htdocs/bom/bom_card.php
index 11d2b3b4e31..669eb70d069 100644
--- a/htdocs/bom/bom_card.php
+++ b/htdocs/bom/bom_card.php
@@ -183,7 +183,7 @@ if (empty($reshook)) {
 		// We check if we're allowed to add this bom
 		$TParentBom=array();
 		$object->getParentBomTreeRecursive($TParentBom, $object->id);
-		if($bom_child_id > 0 && !empty($TParentBom) && in_array($bom_child_id, $TParentBom)) {
+		if ($bom_child_id > 0 && !empty($TParentBom) && in_array($bom_child_id, $TParentBom)) {
 			$n_child = new BOM($db);
 			$n_child->fetch($bom_child_id);
 			setEventMessages($langs->transnoentities('BomCantAddChildBom', $n_child->getNomUrl(1), $object->getNomUrl(1)), null, 'errors');
diff --git a/htdocs/bom/class/bom.class.php b/htdocs/bom/class/bom.class.php
index e178c76c024..458e51cdf2c 100644
--- a/htdocs/bom/class/bom.class.php
+++ b/htdocs/bom/class/bom.class.php
@@ -1155,7 +1155,8 @@ class BOM extends CommonObject
 	 * @param 	int		$bom_id			ID of bom from which we want to get parent bom ids
 	 * @return 	void
 	 */
-	public function getParentBomTreeRecursive(&$TParentBom, $bom_id) {
+	public function getParentBomTreeRecursive(&$TParentBom, $bom_id)
+	{
 
 		$sql = 'SELECT l.fk_bom, b.label
 				FROM '.MAIN_DB_PREFIX.'bom_bomline l
@@ -1163,17 +1164,12 @@ class BOM extends CommonObject
 				WHERE fk_bom_child = '.$bom_id;
 
 		$resql = $this->db->query($sql);
-		if(!empty($resql)) {
-
-			while($res = $this->db->fetch_object($resql)) {
-
+		if (!empty($resql)) {
+			while ($res = $this->db->fetch_object($resql)) {
 				$TParentBom[$res->fk_bom] = $res->fk_bom;
 				$this->getParentBomTreeRecursive($TParentBom, $res->fk_bom);
-
 			}
-
 		}
-
 	}
 }
 

From 30ce816c0cc3b7cab2d2364bf26a6e576cbfcd17 Mon Sep 17 00:00:00 2001
From: Thomas Negre <tnegre@open-dsi.fr>
Date: Thu, 1 Sep 2022 17:07:20 +0200
Subject: [PATCH 585/974] Fix: On a not configured personalized accounting
 group, the group code would be used in the formula.

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

diff --git a/htdocs/compta/resultat/result.php b/htdocs/compta/resultat/result.php
index 635531ab86b..b6ac4c1b33f 100644
--- a/htdocs/compta/resultat/result.php
+++ b/htdocs/compta/resultat/result.php
@@ -405,6 +405,9 @@ if ($modecompta == 'CREANCES-DETTES') {
 
 				// Set $cpts with array of accounts in the category/group
 				$cpts = $AccCat->getCptsCat($cat['rowid']);
+				// We should loop over empty $cpts array, else the category _code_ is used in the formula, which leads to wrong result if the code is a number.
+				if (empty($cpts)) $cpts[] = array();
+
 
 				$arrayofaccountforfilter = array();
 				foreach ($cpts as $i => $cpt) {    // Loop on each account.
@@ -477,7 +480,7 @@ if ($modecompta == 'CREANCES-DETTES') {
 				// Label of group
 				print '<td>';
 				print dol_escape_htmltag($cat['label']);
-				if (count($cpts) > 0) {    // Show example of 5 first accounting accounts
+				if (count($cpts) > 0 && !empty($cpts[0])) {    // Show example of 5 first accounting accounts
 					$i = 0;
 					foreach ($cpts as $cpt) {
 						if ($i > 5) {

From ce78e0164aeb2ca4dd3a77861ce28c2b5fcd9ec3 Mon Sep 17 00:00:00 2001
From: Thomas Negre <tnegre@open-dsi.fr>
Date: Thu, 1 Sep 2022 17:19:08 +0200
Subject: [PATCH 586/974] Fix: When a custom compta group would be unactive,
 its code would stay in the computed formula. This would lead to wrong totals
 if the code is a number.

---
 htdocs/accountancy/class/accountancycategory.class.php | 7 ++++---
 htdocs/compta/resultat/result.php                      | 6 ++++++
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/htdocs/accountancy/class/accountancycategory.class.php b/htdocs/accountancy/class/accountancycategory.class.php
index 77d10516daa..5aec2d48fa2 100644
--- a/htdocs/accountancy/class/accountancycategory.class.php
+++ b/htdocs/accountancy/class/accountancycategory.class.php
@@ -785,12 +785,13 @@ class AccountancyCategory // extends CommonObject
 	}
 
 	/**
-	 * Return list of custom groups that are active
+	 * Return list of custom groups.
 	 *
 	 * @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
 	 */
-	public function getCats($categorytype = -1)
+	public function getCats($categorytype = -1, $active = 1)
 	{
 		global $conf, $mysoc;
 
@@ -801,7 +802,7 @@ class AccountancyCategory // extends CommonObject
 
 		$sql = "SELECT c.rowid, c.code, c.label, c.formula, c.position, c.category_type, c.sens";
 		$sql .= " FROM ".MAIN_DB_PREFIX."c_accounting_category as c";
-		$sql .= " WHERE c.active = 1";
+		$sql .= " WHERE c.active = " . (int) $active;
 		$sql .= " AND c.entity = ".$conf->entity;
 		if ($categorytype >= 0) {
 			$sql .= " AND c.category_type = 1";
diff --git a/htdocs/compta/resultat/result.php b/htdocs/compta/resultat/result.php
index b6ac4c1b33f..93fc7d57203 100644
--- a/htdocs/compta/resultat/result.php
+++ b/htdocs/compta/resultat/result.php
@@ -274,6 +274,7 @@ if ($modecompta == 'CREANCES-DETTES') {
 } elseif ($modecompta == "BOOKKEEPING") {
 	// Get array of all report groups that are active
 	$cats = $AccCat->getCats(); // WARNING: Computed groups must be after group they include
+	$unactive_cats = $AccCat->getCats(-1, 0);
 
 	/*
 	$sql = 'SELECT DISTINCT t.numero_compte as nb FROM '.MAIN_DB_PREFIX.'accounting_bookkeeping as t, '.MAIN_DB_PREFIX.'accounting_account as aa';
@@ -325,6 +326,11 @@ if ($modecompta == 'CREANCES-DETTES') {
 
 				$vars = array();
 
+				// Unactive categories have a total of 0 to be used in the formula.
+				foreach($unactive_cats as $un_cat) {
+					$vars[$un_cat['code']] = 0;
+				}
+
 				// Previous Fiscal year (N-1)
 				foreach ($sommes as $code => $det) {
 					$vars[$code] = $det['NP'];

From 86b02bc17bc31faf4628f1328acca6d5dc0a0e98 Mon Sep 17 00:00:00 2001
From: UT from dolibit <45215329+dolibit-ut@users.noreply.github.com>
Date: Thu, 1 Sep 2022 18:03:34 +0200
Subject: [PATCH 587/974] Update new.php

---
 htdocs/public/members/new.php | 26 ++++++++++++++++++++++----
 1 file changed, 22 insertions(+), 4 deletions(-)

diff --git a/htdocs/public/members/new.php b/htdocs/public/members/new.php
index c409703862c..6b8616ab777 100644
--- a/htdocs/public/members/new.php
+++ b/htdocs/public/members/new.php
@@ -62,6 +62,8 @@ if (is_numeric($entity)) {
 	define("DOLENTITY", $entity);
 }
 
+
+// Load Dolibarr environment
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/payments.lib.php';
@@ -437,10 +439,11 @@ if (empty($reshook) && $action == 'add') {
 // Action called after a submitted was send and member created successfully
 // If MEMBER_URL_REDIRECT_SUBSCRIPTION is set to url we never go here because a redirect was done to this url.
 // backtopage parameter with an url was set on member submit page, we never go here because a redirect was done to this url.
+
 if (empty($reshook) && $action == 'added') {
 	llxHeaderVierge($langs->trans("NewMemberForm"));
 
-	// Si on a pas ete redirige
+	// If we have not been redirected
 	print '<br><br>';
 	print '<div class="center">';
 	print $langs->trans("NewMemberbyWeb");
@@ -556,42 +559,51 @@ if (!empty($conf->global->MEMBER_SKIP_TABLE) || !empty($conf->global->MEMBER_NEW
 		print '<input type="hidden" id="morphy" name="morphy" value="'.$conf->global->MEMBER_NEWFORM_FORCEMORPHY.'">';
 	}
 
-	// Company
+	// Company   // TODO : optional hide
 	print '<tr id="trcompany" class="trcompany"><td>'.$langs->trans("Company").'</td><td>';
 	print img_picto('', 'company', 'class="pictofixedwidth"');
 	print '<input type="text" name="societe" class="minwidth150 widthcentpercentminusx" value="'.dol_escape_htmltag(GETPOST('societe')).'"></td></tr>'."\n";
+	
 	// Title
 	print '<tr><td class="titlefield">'.$langs->trans('UserTitle').'</td><td>';
 	print $formcompany->select_civility(GETPOST('civility_id'), 'civility_id').'</td></tr>'."\n";
+	
 	// Lastname
 	print '<tr><td>'.$langs->trans("Lastname").' <span style="color: red">*</span></td><td><input type="text" name="lastname" class="minwidth150" value="'.dol_escape_htmltag(GETPOST('lastname')).'"></td></tr>'."\n";
+	
 	// Firstname
 	print '<tr><td>'.$langs->trans("Firstname").' <span style="color: red">*</span></td><td><input type="text" name="firstname" class="minwidth150" value="'.dol_escape_htmltag(GETPOST('firstname')).'"></td></tr>'."\n";
+	
 	// EMail
 	print '<tr><td>'.$langs->trans("Email").($conf->global->ADHERENT_MAIL_REQUIRED ? ' <span style="color:red;">*</span>' : '').'</td><td>';
 	//print img_picto('', 'email', 'class="pictofixedwidth"');
 	print '<input type="text" name="email" maxlength="255" class="minwidth200" value="'.dol_escape_htmltag(GETPOST('email')).'"></td></tr>'."\n";
+	
 	// Login
 	if (empty($conf->global->ADHERENT_LOGIN_NOT_REQUIRED)) {
 		print '<tr><td>'.$langs->trans("Login").' <span style="color: red">*</span></td><td><input type="text" name="login" maxlength="50" class="minwidth100"value="'.dol_escape_htmltag(GETPOST('login')).'"></td></tr>'."\n";
 		print '<tr><td>'.$langs->trans("Password").' <span style="color: red">*</span></td><td><input type="password" maxlength="128" name="pass1" class="minwidth100" value="'.dol_escape_htmltag(GETPOST("pass1", "none", 2)).'"></td></tr>'."\n";
 		print '<tr><td>'.$langs->trans("PasswordRetype").' <span style="color: red">*</span></td><td><input type="password" maxlength="128" name="pass2" class="minwidth100" value="'.dol_escape_htmltag(GETPOST("pass2", "none", 2)).'"></td></tr>'."\n";
 	}
-	// Gender
+	
+	// Gender  // TODO:  add diverse gender
 	print '<tr><td>'.$langs->trans("Gender").'</td>';
 	print '<td>';
 	$arraygender = array('man'=>$langs->trans("Genderman"), 'woman'=>$langs->trans("Genderwoman"));
 	print $form->selectarray('gender', $arraygender, GETPOST('gender') ?GETPOST('gender') : $object->gender, 1);
 	print '</td></tr>';
+	
 	// Address
 	print '<tr><td>'.$langs->trans("Address").'</td><td>'."\n";
 	print '<textarea name="address" id="address" wrap="soft" class="quatrevingtpercent" rows="'.ROWS_3.'">'.dol_escape_htmltag(GETPOST('address', 'restricthtml'), 0, 1).'</textarea></td></tr>'."\n";
+	
 	// Zip / Town
 	print '<tr><td>'.$langs->trans('Zip').' / '.$langs->trans('Town').'</td><td>';
 	print $formcompany->select_ziptown(GETPOST('zipcode'), 'zipcode', array('town', 'selectcountry_id', 'state_id'), 0, 1, '', 'width75');
 	print ' / ';
 	print $formcompany->select_ziptown(GETPOST('town'), 'town', array('zipcode', 'selectcountry_id', 'state_id'), 0, 1);
 	print '</td></tr>';
+	
 	// Country
 	print '<tr><td>'.$langs->trans('Country').'</td><td>';
 	print img_picto('', 'country', 'class="pictofixedwidth"');
@@ -621,17 +633,22 @@ if (!empty($conf->global->MEMBER_SKIP_TABLE) || !empty($conf->global->MEMBER_NEW
 		}
 		print '</td></tr>';
 	}
+	
 	// Birthday
 	print '<tr id="trbirth" class="trbirth"><td>'.$langs->trans("DateOfBirth").'</td><td>';
 	print $form->selectDate($birthday, 'birth', 0, 0, 1, "newmember", 1, 0);
 	print '</td></tr>'."\n";
+	
 	// Photo
 	print '<tr><td>'.$langs->trans("URLPhoto").'</td><td><input type="text" name="photo" class="minwidth150" value="'.dol_escape_htmltag(GETPOST('photo')).'"></td></tr>'."\n";
+	
 	// Public
 	print '<tr><td>'.$langs->trans("Public").'</td><td><input type="checkbox" name="public"></td></tr>'."\n";
+	
 	// Other attributes
 	$tpl_context = 'public'; // define template context to public
 	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_add.tpl.php';
+	
 	// Comments
 	print '<tr>';
 	print '<td class="tdtop">'.$langs->trans("Comments").'</td>';
@@ -733,7 +750,7 @@ if (!empty($conf->global->MEMBER_SKIP_TABLE) || !empty($conf->global->MEMBER_NEW
 
 	print dol_get_fiche_end();
 
-	// Save
+	// Save / Submit
 	print '<div class="center">';
 	print '<input type="submit" value="'.$langs->trans("GetMembershipButtonLabel").'" id="submitsave" class="button">';
 	if (!empty($backtopage)) {
@@ -746,6 +763,7 @@ if (!empty($conf->global->MEMBER_SKIP_TABLE) || !empty($conf->global->MEMBER_NEW
 	print "<br>";
 	print '</div></div>';
 } else {  // Show the table of membership types
+	
 	// Get units
 	$measuringUnits = new CUnits($db);
 	$result = $measuringUnits->fetchAll('',	'',	0,	0, array('t.active' => 1));

From f1ce73263915d5d24197fe956ab9d6164006fb49 Mon Sep 17 00:00:00 2001
From: Thomas Negre <tnegre@open-dsi.fr>
Date: Thu, 1 Sep 2022 18:06:35 +0200
Subject: [PATCH 588/974] empty commit to re-launch stickler


From 3dc6283eb7216ade80bc5cdd74278545817db1c9 Mon Sep 17 00:00:00 2001
From: stickler-ci <support@stickler-ci.com>
Date: Thu, 1 Sep 2022 16:09:05 +0000
Subject: [PATCH 589/974] Fixing style errors.

---
 htdocs/public/members/new.php | 29 ++++++++++++++---------------
 1 file changed, 14 insertions(+), 15 deletions(-)

diff --git a/htdocs/public/members/new.php b/htdocs/public/members/new.php
index 6b8616ab777..ccc229e33bf 100644
--- a/htdocs/public/members/new.php
+++ b/htdocs/public/members/new.php
@@ -563,47 +563,47 @@ if (!empty($conf->global->MEMBER_SKIP_TABLE) || !empty($conf->global->MEMBER_NEW
 	print '<tr id="trcompany" class="trcompany"><td>'.$langs->trans("Company").'</td><td>';
 	print img_picto('', 'company', 'class="pictofixedwidth"');
 	print '<input type="text" name="societe" class="minwidth150 widthcentpercentminusx" value="'.dol_escape_htmltag(GETPOST('societe')).'"></td></tr>'."\n";
-	
+
 	// Title
 	print '<tr><td class="titlefield">'.$langs->trans('UserTitle').'</td><td>';
 	print $formcompany->select_civility(GETPOST('civility_id'), 'civility_id').'</td></tr>'."\n";
-	
+
 	// Lastname
 	print '<tr><td>'.$langs->trans("Lastname").' <span style="color: red">*</span></td><td><input type="text" name="lastname" class="minwidth150" value="'.dol_escape_htmltag(GETPOST('lastname')).'"></td></tr>'."\n";
-	
+
 	// Firstname
 	print '<tr><td>'.$langs->trans("Firstname").' <span style="color: red">*</span></td><td><input type="text" name="firstname" class="minwidth150" value="'.dol_escape_htmltag(GETPOST('firstname')).'"></td></tr>'."\n";
-	
+
 	// EMail
 	print '<tr><td>'.$langs->trans("Email").($conf->global->ADHERENT_MAIL_REQUIRED ? ' <span style="color:red;">*</span>' : '').'</td><td>';
 	//print img_picto('', 'email', 'class="pictofixedwidth"');
 	print '<input type="text" name="email" maxlength="255" class="minwidth200" value="'.dol_escape_htmltag(GETPOST('email')).'"></td></tr>'."\n";
-	
+
 	// Login
 	if (empty($conf->global->ADHERENT_LOGIN_NOT_REQUIRED)) {
 		print '<tr><td>'.$langs->trans("Login").' <span style="color: red">*</span></td><td><input type="text" name="login" maxlength="50" class="minwidth100"value="'.dol_escape_htmltag(GETPOST('login')).'"></td></tr>'."\n";
 		print '<tr><td>'.$langs->trans("Password").' <span style="color: red">*</span></td><td><input type="password" maxlength="128" name="pass1" class="minwidth100" value="'.dol_escape_htmltag(GETPOST("pass1", "none", 2)).'"></td></tr>'."\n";
 		print '<tr><td>'.$langs->trans("PasswordRetype").' <span style="color: red">*</span></td><td><input type="password" maxlength="128" name="pass2" class="minwidth100" value="'.dol_escape_htmltag(GETPOST("pass2", "none", 2)).'"></td></tr>'."\n";
 	}
-	
+
 	// Gender  // TODO:  add diverse gender
 	print '<tr><td>'.$langs->trans("Gender").'</td>';
 	print '<td>';
 	$arraygender = array('man'=>$langs->trans("Genderman"), 'woman'=>$langs->trans("Genderwoman"));
 	print $form->selectarray('gender', $arraygender, GETPOST('gender') ?GETPOST('gender') : $object->gender, 1);
 	print '</td></tr>';
-	
+
 	// Address
 	print '<tr><td>'.$langs->trans("Address").'</td><td>'."\n";
 	print '<textarea name="address" id="address" wrap="soft" class="quatrevingtpercent" rows="'.ROWS_3.'">'.dol_escape_htmltag(GETPOST('address', 'restricthtml'), 0, 1).'</textarea></td></tr>'."\n";
-	
+
 	// Zip / Town
 	print '<tr><td>'.$langs->trans('Zip').' / '.$langs->trans('Town').'</td><td>';
 	print $formcompany->select_ziptown(GETPOST('zipcode'), 'zipcode', array('town', 'selectcountry_id', 'state_id'), 0, 1, '', 'width75');
 	print ' / ';
 	print $formcompany->select_ziptown(GETPOST('town'), 'town', array('zipcode', 'selectcountry_id', 'state_id'), 0, 1);
 	print '</td></tr>';
-	
+
 	// Country
 	print '<tr><td>'.$langs->trans('Country').'</td><td>';
 	print img_picto('', 'country', 'class="pictofixedwidth"');
@@ -633,22 +633,22 @@ if (!empty($conf->global->MEMBER_SKIP_TABLE) || !empty($conf->global->MEMBER_NEW
 		}
 		print '</td></tr>';
 	}
-	
+
 	// Birthday
 	print '<tr id="trbirth" class="trbirth"><td>'.$langs->trans("DateOfBirth").'</td><td>';
 	print $form->selectDate($birthday, 'birth', 0, 0, 1, "newmember", 1, 0);
 	print '</td></tr>'."\n";
-	
+
 	// Photo
 	print '<tr><td>'.$langs->trans("URLPhoto").'</td><td><input type="text" name="photo" class="minwidth150" value="'.dol_escape_htmltag(GETPOST('photo')).'"></td></tr>'."\n";
-	
+
 	// Public
 	print '<tr><td>'.$langs->trans("Public").'</td><td><input type="checkbox" name="public"></td></tr>'."\n";
-	
+
 	// Other attributes
 	$tpl_context = 'public'; // define template context to public
 	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_add.tpl.php';
-	
+
 	// Comments
 	print '<tr>';
 	print '<td class="tdtop">'.$langs->trans("Comments").'</td>';
@@ -763,7 +763,6 @@ if (!empty($conf->global->MEMBER_SKIP_TABLE) || !empty($conf->global->MEMBER_NEW
 	print "<br>";
 	print '</div></div>';
 } else {  // Show the table of membership types
-	
 	// Get units
 	$measuringUnits = new CUnits($db);
 	$result = $measuringUnits->fetchAll('',	'',	0,	0, array('t.active' => 1));

From fce1c1a36aefd0445b2777ab0aea3ef53fb3c7d4 Mon Sep 17 00:00:00 2001
From: UT from dolibit <45215329+dolibit-ut@users.noreply.github.com>
Date: Thu, 1 Sep 2022 19:13:25 +0200
Subject: [PATCH 590/974] Update about.php

---
 htdocs/zapier/admin/about.php | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/htdocs/zapier/admin/about.php b/htdocs/zapier/admin/about.php
index b7e2936fc41..71120a384a2 100644
--- a/htdocs/zapier/admin/about.php
+++ b/htdocs/zapier/admin/about.php
@@ -21,9 +21,9 @@
  */
 
 /**
- * \file    zapier/admin/about.php
- * \ingroup zapier
- * \brief   About page of module Zapier.
+ *    \file       htdocs/zapier/admin/about.php
+ *    \ingroup    zapier
+ *    \brief      About page of module Zapier.
  */
 
 // Load Dolibarr environment
@@ -35,19 +35,21 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 require_once '../lib/zapier.lib.php';
 
 // Translations
-$langs->loadLangs(array("errors", "admin", "zapier"));
+$langs->loadLangs(array('admin', 'errors', 'zapier'));
 
 // Access control
 if (!$user->admin) {
 	accessforbidden();
 }
 
+if (empty($conf->zapier->enabled)) accessforbidden();
+if (empty($user->admin)) accessforbidden();
+
+
 // Parameters
 $action = GETPOST('action', 'aZ09');
 $backtopage = GETPOST('backtopage', 'alpha');
 
-if (empty($conf->zapier->enabled)) accessforbidden();
-if (empty($user->admin)) accessforbidden();
 
 
 /*

From c53658e24ade0b73f09090da7a64f55cbfe0ed48 Mon Sep 17 00:00:00 2001
From: UT from dolibit <45215329+dolibit-ut@users.noreply.github.com>
Date: Thu, 1 Sep 2022 19:16:36 +0200
Subject: [PATCH 591/974] Update webhookindex.php

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

diff --git a/htdocs/webhook/webhookindex.php b/htdocs/webhook/webhookindex.php
index e62c5e3ddae..50a7ec6d9c1 100644
--- a/htdocs/webhook/webhookindex.php
+++ b/htdocs/webhook/webhookindex.php
@@ -58,15 +58,16 @@ if (!$res) {
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
 
 // Load translation files required by the page
-$langs->loadLangs(array("webhook@webhook"));
+$langs->loadLangs(array('webhook'));
 
-$action = GETPOST('action', 'aZ09');
 
 
 // Security check
 // if (! $user->rights->webhook->myobject->read) {
 // 	accessforbidden();
 // }
+
+$action = GETPOST('action', 'aZ09');
 $socid = GETPOST('socid', 'int');
 if (isset($user->socid) && $user->socid > 0) {
 	$action = '';

From f4dda6c11c1002fd60a5e27b8f25cf93bd86e1ad Mon Sep 17 00:00:00 2001
From: UT from dolibit <45215329+dolibit-ut@users.noreply.github.com>
Date: Thu, 1 Sep 2022 19:22:12 +0200
Subject: [PATCH 592/974] Update target_agenda.php

---
 htdocs/webhook/target_agenda.php | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/htdocs/webhook/target_agenda.php b/htdocs/webhook/target_agenda.php
index ccc61d806af..fd3464d3b67 100644
--- a/htdocs/webhook/target_agenda.php
+++ b/htdocs/webhook/target_agenda.php
@@ -16,11 +16,13 @@
  */
 
 /**
- *  \file       target_agenda.php
- *  \ingroup    webhook
- *  \brief      Tab of events on Target
+ *    \file       htdocs/webhook/target_agenda.php
+ *    \ingroup    webhook
+ *    \brief      Tab of events on Target
  */
 
+
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
@@ -30,7 +32,7 @@ dol_include_once('/webhook/lib/webhook_target.lib.php');
 
 
 // Load translation files required by the page
-$langs->loadLangs(array("webhook@webhook", "other"));
+$langs->loadLangs(array('webhook', 'other'));
 
 // Get parameters
 $id = GETPOST('id', 'int');
@@ -47,6 +49,7 @@ if (GETPOST('actioncode', 'array')) {
 } else {
 	$actioncode = GETPOST("actioncode", "alpha", 3) ? GETPOST("actioncode", "alpha", 3) : (GETPOST("actioncode") == '0' ? '0' : (empty($conf->global->AGENDA_DEFAULT_FILTER_TYPE_FOR_OBJECT) ? '' : $conf->global->AGENDA_DEFAULT_FILTER_TYPE_FOR_OBJECT));
 }
+
 $search_agenda_label = GETPOST('search_agenda_label');
 
 $limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
@@ -71,6 +74,7 @@ $object = new Target($db);
 $extrafields = new ExtraFields($db);
 $diroutputmassaction = $conf->webhook->dir_output.'/temp/massgeneration/'.$user->id;
 $hookmanager->initHooks(array('targetagenda', 'globalcard')); // Note that conf->hooks_modules contains array
+
 // Fetch optionals attributes and labels
 $extrafields->fetch_name_optionals_label($object->table_element);
 

From 78eab1a8e89778fea8413d6bf3b2e525603ea77f Mon Sep 17 00:00:00 2001
From: UT from dolibit <45215329+dolibit-ut@users.noreply.github.com>
Date: Thu, 1 Sep 2022 19:27:27 +0200
Subject: [PATCH 593/974] Update target_card.php

---
 htdocs/webhook/target_card.php | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/htdocs/webhook/target_card.php b/htdocs/webhook/target_card.php
index 0777b984d9a..7e4ef4bb265 100644
--- a/htdocs/webhook/target_card.php
+++ b/htdocs/webhook/target_card.php
@@ -16,11 +16,13 @@
  */
 
 /**
- *   	\file       target_card.php
- *		\ingroup    webhook
- *		\brief      Page to create/edit/view target
+ *    \file       target_card.php
+ *    \ingroup    webhook
+ *    \brief      Page to create/edit/view target
  */
 
+
+// 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.formfile.class.php';
@@ -29,7 +31,7 @@ dol_include_once('/webhook/class/target.class.php');
 dol_include_once('/webhook/lib/webhook_target.lib.php');
 
 // Load translation files required by the page
-$langs->loadLangs(array("webhook@webhook", "other"));
+$langs->loadLangs(array('webhook', 'other'));
 
 // Get parameters
 $id = GETPOST('id', 'int');
@@ -69,6 +71,7 @@ if (empty($action) && empty($id) && empty($ref)) {
 // Load object
 include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be include, not include_once.
 
+// Permissions
 // There is several ways to check permission.
 // Set $enablepermissioncheck to 1 to enable a minimum low level of checks
 $enablepermissioncheck = 0;

From 1b78423ab3c0ad8feef69ff36cfd191fc98cfcb0 Mon Sep 17 00:00:00 2001
From: UT from dolibit <45215329+dolibit-ut@users.noreply.github.com>
Date: Thu, 1 Sep 2022 19:30:26 +0200
Subject: [PATCH 594/974] Update target_contact.php

---
 htdocs/webhook/target_contact.php | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/htdocs/webhook/target_contact.php b/htdocs/webhook/target_contact.php
index 76b1a92821f..9aa51b2c44e 100644
--- a/htdocs/webhook/target_contact.php
+++ b/htdocs/webhook/target_contact.php
@@ -16,11 +16,13 @@
  */
 
 /**
- *  \file       target_contact.php
- *  \ingroup    webhook
- *  \brief      Tab for contacts linked to Target
+ *    \file       htdocs/webhook/target_contact.php
+ *    \ingroup    webhook
+ *    \brief      Tab for contacts linked to Target
  */
 
+
+// Load Dolibarr environment
 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';
@@ -28,7 +30,7 @@ dol_include_once('/webhook/class/target.class.php');
 dol_include_once('/webhook/lib/webhook_target.lib.php');
 
 // Load translation files required by the page
-$langs->loadLangs(array("webhook@webhook", "companies", "other", "mails"));
+$langs->loadLangs(array('webhook', 'companies', 'other', 'mails'));
 
 $id     = (GETPOST('id') ?GETPOST('id', 'int') : GETPOST('facid', 'int')); // For backward compatibility
 $ref    = GETPOST('ref', 'alpha');
@@ -41,12 +43,14 @@ $object = new Target($db);
 $extrafields = new ExtraFields($db);
 $diroutputmassaction = $conf->webhook->dir_output.'/temp/massgeneration/'.$user->id;
 $hookmanager->initHooks(array('targetcontact', 'globalcard')); // Note that conf->hooks_modules contains array
+
 // Fetch optionals attributes and labels
 $extrafields->fetch_name_optionals_label($object->table_element);
 
 // Load object
 include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be include, not include_once  // Must be include, not include_once. Include fetch and fetch_thirdparty but not fetch_optionals
 
+// Permissions
 // There is several ways to check permission.
 // Set $enablepermissioncheck to 1 to enable a minimum low level of checks
 $enablepermissioncheck = 0;

From d22120e5f4c581cdcf6b3b1e826f90a86e1f5f09 Mon Sep 17 00:00:00 2001
From: UT from dolibit <45215329+dolibit-ut@users.noreply.github.com>
Date: Thu, 1 Sep 2022 19:35:46 +0200
Subject: [PATCH 595/974] Update target_list.php

---
 htdocs/webhook/target_list.php | 36 ++++++++++++++++++++--------------
 1 file changed, 21 insertions(+), 15 deletions(-)

diff --git a/htdocs/webhook/target_list.php b/htdocs/webhook/target_list.php
index e8a736f5e47..d80661906c0 100644
--- a/htdocs/webhook/target_list.php
+++ b/htdocs/webhook/target_list.php
@@ -17,11 +17,13 @@
  */
 
 /**
- *   	\file       target_list.php
- *		\ingroup    webhook
- *		\brief      List page for target
+ *    \file       htdocs/webhook/target_list.php
+ *    \ingroup    webhook
+ *    \brief      List page for target
  */
 
+
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
@@ -34,20 +36,21 @@ require_once __DIR__.'/class/target.class.php';
 //dol_include_once('/othermodule/class/otherobject.class.php');
 
 // Load translation files required by the page
-$langs->loadLangs(array("webhook@webhook", "other"));
+$langs->loadLangs(array('webhook', '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 ?
-$confirm    = GETPOST('confirm', 'alpha'); // Result of a confirmation
-$cancel     = GETPOST('cancel', 'alpha'); // We click on a Cancel button
-$toselect   = GETPOST('toselect', 'array'); // Array of ids of elements selected into a list
-$contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'targetlist'; // To manage different context of search
-$backtopage = GETPOST('backtopage', 'alpha'); // Go back to a dedicated page
-$optioncss  = GETPOST('optioncss', 'aZ'); // Option for the css output (always '' except when 'print')
-$mode       = GETPOST('mode', 'aZ');
+// Get Parameters
+$id          = GETPOST('id', 'int');
+$action      = GETPOST('action', 'aZ09') ?GETPOST('action', 'aZ09') : 'view';    // The action 'add', 'create', 'edit', 'update', 'view', ...
+$massaction  = GETPOST('massaction', 'alpha');    // The bulk action (combo box choice into lists)
+$show_files  = GETPOST('show_files', 'int');    // Show files area generated by bulk actions ?
+$confirm     = GETPOST('confirm', 'alpha');    // Result of a confirmation
+$cancel      = GETPOST('cancel', 'alpha');    // We click on a Cancel button
+$toselect    = GETPOST('toselect', 'array');    // Array of ids of elements selected into a list
+$contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'targetlist';    // To manage different context of search
+$backtopage  = GETPOST('backtopage', 'alpha');    // Go back to a dedicated page
+$optioncss   = GETPOST('optioncss', 'aZ');    // Option for the css output (always '' except when 'print')
+$mode        = GETPOST('mode', 'aZ');
 
-$id = GETPOST('id', 'int');
 
 // Load variable for pagination
 $limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
@@ -119,6 +122,7 @@ foreach ($object->fields as $key => $val) {
 		);
 	}
 }
+
 // Extra fields
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_array_fields.tpl.php';
 
@@ -126,6 +130,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');
 
+// Permissions
 // There is several ways to check permission.
 // Set $enablepermissioncheck to 1 to enable a minimum low level of checks
 $enablepermissioncheck = 0;
@@ -207,6 +212,7 @@ $now = dol_now();
 //$help_url = "EN:Module_Target|FR:Module_Target_FR|ES:Módulo_Target";
 $help_url = '';
 $title = $langs->trans('ListOf', $langs->transnoentitiesnoconv("Targets"));
+
 $morejs = array();
 $morecss = array();
 

From 77f352610a4c382e849b0b489120d076a06fc50e Mon Sep 17 00:00:00 2001
From: UT from dolibit <45215329+dolibit-ut@users.noreply.github.com>
Date: Thu, 1 Sep 2022 19:38:41 +0200
Subject: [PATCH 596/974] Update target_note.php

---
 htdocs/webhook/target_note.php | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/htdocs/webhook/target_note.php b/htdocs/webhook/target_note.php
index 8ba98fd622d..c9fe74c8758 100644
--- a/htdocs/webhook/target_note.php
+++ b/htdocs/webhook/target_note.php
@@ -17,22 +17,24 @@
  */
 
 /**
- *  \file       target_note.php
- *  \ingroup    webhook
- *  \brief      Tab for notes on Target
+ *    \file       htdocs/webhook/target_note.php
+ *    \ingroup    webhook
+ *    \brief      Tab for notes on Target
  */
 
+
+// Load Dolibarr environment
 require '../main.inc.php';
 dol_include_once('/webhook/class/target.class.php');
 dol_include_once('/webhook/lib/webhook_target.lib.php');
 
 // Load translation files required by the page
-$langs->loadLangs(array("webhook@webhook", "companies"));
+$langs->loadLangs(array('webhook', 'companies'));
 
 // Get parameters
-$id = GETPOST('id', 'int');
+$id         = GETPOST('id', 'int');
 $ref        = GETPOST('ref', 'alpha');
-$action = GETPOST('action', 'aZ09');
+$action     = GETPOST('action', 'aZ09');
 $cancel     = GETPOST('cancel', 'aZ09');
 $backtopage = GETPOST('backtopage', 'alpha');
 
@@ -41,6 +43,7 @@ $object = new Target($db);
 $extrafields = new ExtraFields($db);
 $diroutputmassaction = $conf->webhook->dir_output.'/temp/massgeneration/'.$user->id;
 $hookmanager->initHooks(array('targetnote', 'globalcard')); // Note that conf->hooks_modules contains array
+
 // Fetch optionals attributes and labels
 $extrafields->fetch_name_optionals_label($object->table_element);
 
@@ -50,7 +53,7 @@ if ($id > 0 || !empty($ref)) {
 	$upload_dir = $conf->webhook->multidir_output[!empty($object->entity) ? $object->entity : $conf->entity]."/".$object->id;
 }
 
-
+// Permissions
 // There is several ways to check permission.
 // Set $enablepermissioncheck to 1 to enable a minimum low level of checks
 $enablepermissioncheck = 0;
@@ -93,7 +96,7 @@ if (empty($reshook)) {
 
 $form = new Form($db);
 
-//$help_url='EN:Customers_Orders|FR:Commandes_Clients|ES:Pedidos de clientes';
+//$help_url='EN:Webhooks|FR:Webhooks_FR|ES:Webhooks_ES';
 $help_url = '';
 $title = $langs->trans('Target').' - '.$langs->trans("Notes");
 llxHeader('', $title, $help_url);

From 401493a35931ac421ab5d6a8425322d3c683e1e5 Mon Sep 17 00:00:00 2001
From: UT from dolibit <45215329+dolibit-ut@users.noreply.github.com>
Date: Thu, 1 Sep 2022 19:41:30 +0200
Subject: [PATCH 597/974] Update blockedlog.php

---
 htdocs/blockedlog/admin/blockedlog.php | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/htdocs/blockedlog/admin/blockedlog.php b/htdocs/blockedlog/admin/blockedlog.php
index 8880e6c1e86..0f9034e374a 100644
--- a/htdocs/blockedlog/admin/blockedlog.php
+++ b/htdocs/blockedlog/admin/blockedlog.php
@@ -22,22 +22,25 @@
  *  \brief      Page setup for blockedlog module
  */
 
+
+// Load Dolibarr environment
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/blockedlog/lib/blockedlog.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/blockedlog/class/blockedlog.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
 
 // Load translation files required by the page
-$langs->loadLangs(array("admin", "other", "blockedlog"));
+$langs->loadLangs(array('admin', 'blockedlog', 'other'));
 
+// Access Control
 if (!$user->admin || empty($conf->blockedlog->enabled)) {
 	accessforbidden();
 }
 
-$action = GETPOST('action', 'aZ09');
+// Get Parameters
+$action     = GETPOST('action', 'aZ09');
 $backtopage = GETPOST('backtopage', 'alpha');
-
-$withtab = GETPOST('withtab', 'int');
+$withtab    = GETPOST('withtab', 'int');
 
 
 /*

From ce986e4128859d5923e5de8a51795bfc3801c718 Mon Sep 17 00:00:00 2001
From: UT from dolibit <45215329+dolibit-ut@users.noreply.github.com>
Date: Thu, 1 Sep 2022 19:46:59 +0200
Subject: [PATCH 598/974] Update blockedlog_list.php

---
 htdocs/blockedlog/admin/blockedlog_list.php | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/htdocs/blockedlog/admin/blockedlog_list.php b/htdocs/blockedlog/admin/blockedlog_list.php
index 4490b3897df..934ef9fba7b 100644
--- a/htdocs/blockedlog/admin/blockedlog_list.php
+++ b/htdocs/blockedlog/admin/blockedlog_list.php
@@ -18,11 +18,13 @@
  */
 
 /**
- *	\file       htdocs/blockedlog/admin/blockedlog_list.php
- *  \ingroup    blockedlog
- *  \brief      Page setup for blockedlog module
+ *    \file       htdocs/blockedlog/admin/blockedlog_list.php
+ *    \ingroup    blockedlog
+ *    \brief      Page setup for blockedlog module
  */
 
+
+// Load Dolibarr environment
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/blockedlog/lib/blockedlog.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/blockedlog/class/blockedlog.class.php';
@@ -31,16 +33,18 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
 
 // Load translation files required by the page
-$langs->loadLangs(array("admin", "other", "blockedlog", "bills"));
+$langs->loadLangs(array('admin', 'bills', 'blockedlog', 'other'));
 
+// Access Control
 if ((!$user->admin && empty($user->rights->blockedlog->read)) || empty($conf->blockedlog->enabled)) {
 	accessforbidden();
 }
 
-$action = GETPOST('action', 'aZ09');
+// Get Parameters
+$action      = GETPOST('action', 'aZ09');
 $contextpage = GETPOST('contextpage', 'aZ') ?GETPOST('contextpage', 'aZ') : 'blockedloglist'; // 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')
+$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');
 if ($search_showonlyerrors < 0) {
@@ -95,7 +99,7 @@ $block_static->loadTrackedEvents();
 
 $result = restrictedArea($user, 'blockedlog', 0, '');
 
-
+// Execution Time
 $max_execution_time_for_importexport = (empty($conf->global->EXPORT_MAX_EXECUTION_TIME) ? 300 : $conf->global->EXPORT_MAX_EXECUTION_TIME); // 5mn if not defined
 $max_time = @ini_get("max_execution_time");
 if ($max_time && $max_time < $max_execution_time_for_importexport) {

From e3b5b762032acef9a9c391f01d9e472d4059db3b Mon Sep 17 00:00:00 2001
From: UT from dolibit <45215329+dolibit-ut@users.noreply.github.com>
Date: Thu, 1 Sep 2022 19:54:11 +0200
Subject: [PATCH 599/974] Update blockedlog.class.php

---
 htdocs/blockedlog/class/blockedlog.class.php | 26 +++++++++++++-------
 1 file changed, 17 insertions(+), 9 deletions(-)

diff --git a/htdocs/blockedlog/class/blockedlog.class.php b/htdocs/blockedlog/class/blockedlog.class.php
index 3ab2b63ad3f..fa428e4f17e 100644
--- a/htdocs/blockedlog/class/blockedlog.class.php
+++ b/htdocs/blockedlog/class/blockedlog.class.php
@@ -140,6 +140,7 @@ class BlockedLog
 
 		$this->trackedevents = array();
 
+		// Customer Invoice/Facture / Payment
 		if (isModEnabled('facture')) {
 			$this->trackedevents['BILL_VALIDATE'] = 'logBILL_VALIDATE';
 			$this->trackedevents['BILL_DELETE'] = 'logBILL_DELETE';
@@ -151,18 +152,19 @@ class BlockedLog
 		}
 
 		/* Supplier
+		// Supplier Invoice / Payment
 		if (isModEnabled("fournisseur")) {
-			 $this->trackedevents['BILL_SUPPLIER_VALIDATE']='BlockedLogSupplierBillValidate';
+			$this->trackedevents['BILL_SUPPLIER_VALIDATE']='BlockedLogSupplierBillValidate';
 			$this->trackedevents['BILL_SUPPLIER_DELETE']='BlockedLogSupplierBillDelete';
 			$this->trackedevents['BILL_SUPPLIER_SENTBYMAIL']='BlockedLogSupplierBillSentByEmail'; // Trigger key does not exists, we want just into array to list it as done
-			 $this->trackedevents['SUPPLIER_DOC_DOWNLOAD']='BlockedLogSupplierBillDownload';		// Trigger key does not exists, we want just into array to list it as done
-			 $this->trackedevents['SUPPLIER_DOC_PREVIEW']='BlockedLogSupplierBillPreview';		// Trigger key does not exists, we want just into array to list it as done
-
-			 $this->trackedevents['PAYMENT_SUPPLIER_CREATE']='BlockedLogSupplierBillPaymentCreate';
-			 $this->trackedevents['PAYMENT_SUPPLIER_DELETE']='BlockedLogsupplierBillPaymentCreate';
+			$this->trackedevents['SUPPLIER_DOC_DOWNLOAD']='BlockedLogSupplierBillDownload';		// Trigger key does not exists, we want just into array to list it as done
+			$this->trackedevents['SUPPLIER_DOC_PREVIEW']='BlockedLogSupplierBillPreview';		// Trigger key does not exists, we want just into array to list it as done
+			$this->trackedevents['PAYMENT_SUPPLIER_CREATE']='BlockedLogSupplierBillPaymentCreate';
+			$this->trackedevents['PAYMENT_SUPPLIER_DELETE']='BlockedLogsupplierBillPaymentCreate';
 		}
 		 */
 
+		// Donation
 		if (!empty($conf->don->enabled)) {
 			$this->trackedevents['DON_VALIDATE'] = 'logDON_VALIDATE';
 			$this->trackedevents['DON_DELETE'] = 'logDON_DELETE';
@@ -172,23 +174,29 @@ class BlockedLog
 		}
 
 		/*
+		// Salary
 		if (!empty($conf->salary->enabled)) {
-			 $this->trackedevents['PAYMENT_SALARY_CREATE']='BlockedLogSalaryPaymentCreate';
-			 $this->trackedevents['PAYMENT_SALARY_MODIFY']='BlockedLogSalaryPaymentCreate';
-			 $this->trackedevents['PAYMENT_SALARY_DELETE']='BlockedLogSalaryPaymentCreate';
+			$this->trackedevents['PAYMENT_SALARY_CREATE']='BlockedLogSalaryPaymentCreate';
+			$this->trackedevents['PAYMENT_SALARY_MODIFY']='BlockedLogSalaryPaymentCreate';
+			$this->trackedevents['PAYMENT_SALARY_DELETE']='BlockedLogSalaryPaymentCreate';
 		}
 		 */
 
+		// Members
 		if (!empty($conf->adherent->enabled)) {
 			$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")) {
 			$this->trackedevents['PAYMENT_VARIOUS_CREATE'] = 'logPAYMENT_VARIOUS_CREATE';
 			$this->trackedevents['PAYMENT_VARIOUS_MODIFY'] = 'logPAYMENT_VARIOUS_MODIFY';
 			$this->trackedevents['PAYMENT_VARIOUS_DELETE'] = 'logPAYMENT_VARIOUS_DELETE';
 		}
+		
+		// Cashdesk
 		// $conf->global->BANK_ENABLE_POS_CASHCONTROL must be set to 1 by all external POS modules
 		$moduleposenabled = (!empty($conf->cashdesk->enabled) || !empty($conf->takepos->enabled) || !empty($conf->global->BANK_ENABLE_POS_CASHCONTROL));
 		if ($moduleposenabled) {

From 111b5633370acb1ec58c56bbc3e7e282e5505cc3 Mon Sep 17 00:00:00 2001
From: UT from dolibit <45215329+dolibit-ut@users.noreply.github.com>
Date: Thu, 1 Sep 2022 20:00:26 +0200
Subject: [PATCH 600/974] Update blockedlog.lib.php

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

diff --git a/htdocs/blockedlog/lib/blockedlog.lib.php b/htdocs/blockedlog/lib/blockedlog.lib.php
index 44f7074d582..23a7ec1f62d 100644
--- a/htdocs/blockedlog/lib/blockedlog.lib.php
+++ b/htdocs/blockedlog/lib/blockedlog.lib.php
@@ -16,9 +16,9 @@
  */
 
 /**
- *	\file			htdocs/blockedlog/lib/blockedlog.lib.php
- *	\ingroup		system
- *  \brief			Library for common blockedlog functions
+ *    \file       htdocs/blockedlog/lib/blockedlog.lib.php
+ *    \ingroup    system
+ *    \brief      Library for common blockedlog functions
  */
 
 /**

From f17e0b6de5afdae943a1a974840280b3228b33c7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20France?= <frederic.france@free.fr>
Date: Thu, 1 Sep 2022 20:09:54 +0200
Subject: [PATCH 601/974] use isModEnabled

---
 htdocs/webhook/README.md                  | 86 -----------------------
 htdocs/webhook/lib/webhook_target.lib.php |  2 +-
 htdocs/webhook/target_agenda.php          | 13 ++--
 htdocs/webhook/target_card.php            |  1 +
 htdocs/webhook/target_contact.php         | 16 +++--
 htdocs/webhook/target_list.php            | 15 ++--
 htdocs/webhook/target_note.php            | 16 +++--
 htdocs/webhook/webhookindex.php           | 36 +---------
 8 files changed, 39 insertions(+), 146 deletions(-)
 delete mode 100644 htdocs/webhook/README.md

diff --git a/htdocs/webhook/README.md b/htdocs/webhook/README.md
deleted file mode 100644
index 74fe79e76fd..00000000000
--- a/htdocs/webhook/README.md
+++ /dev/null
@@ -1,86 +0,0 @@
-# WEBHOOK FOR [DOLIBARR ERP CRM](https://www.dolibarr.org)
-
-## Features
-
-Description of the module...
-
-<!--
-![Screenshot webhook](img/screenshot_webhook.png?raw=true "Webhook"){imgmd}
--->
-
-Other external modules are available on [Dolistore.com](https://www.dolistore.com).
-
-## Translations
-
-Translations can be completed manually by editing files into directories *langs*.
-
-<!--
-This module contains also a sample configuration for Transifex, under the hidden directory [.tx](.tx), so it is possible to manage translation using this service.
-
-For more informations, see the [translator's documentation](https://wiki.dolibarr.org/index.php/Translator_documentation).
-
-There is a [Transifex project](https://transifex.com/projects/p/dolibarr-module-template) for this module.
--->
-
-<!--
-
-## Installation
-
-### From the ZIP file and GUI interface
-
-If the module is a ready to deploy zip file, so with a name module_xxx-version.zip (like when downloading it from a market place like [Dolistore](https://www.dolistore.com)),
-go into menu ```Home - Setup - Modules - Deploy external module``` and upload the zip file.
-
-Note: If this screen tell you that there is no "custom" directory, check that your setup is correct:
-
-- In your Dolibarr installation directory, edit the ```htdocs/conf/conf.php``` file and check that following lines are not commented:
-
-    ```php
-    //$dolibarr_main_url_root_alt ...
-    //$dolibarr_main_document_root_alt ...
-    ```
-
-- Uncomment them if necessary (delete the leading ```//```) and assign a sensible value according to your Dolibarr installation
-
-    For example :
-
-    - UNIX:
-        ```php
-        $dolibarr_main_url_root_alt = '/custom';
-        $dolibarr_main_document_root_alt = '/var/www/Dolibarr/htdocs/custom';
-        ```
-
-    - Windows:
-        ```php
-        $dolibarr_main_url_root_alt = '/custom';
-        $dolibarr_main_document_root_alt = 'C:/My Web Sites/Dolibarr/htdocs/custom';
-        ```
-
-### From a GIT repository
-
-Clone the repository in ```$dolibarr_main_document_root_alt/webhook```
-
-```sh
-cd ....../custom
-git clone git@github.com:gitlogin/webhook.git webhook
-```
-
-### <a name="final_steps"></a>Final steps
-
-From your browser:
-
-  - Log into Dolibarr as a super-administrator
-  - Go to "Setup" -> "Modules"
-  - You should now be able to find and enable the module
-
--->
-
-## Licenses
-
-### Main code
-
-GPLv3 or (at your option) any later version. See file COPYING for more information.
-
-### Documentation
-
-All texts and readmes are licensed under GFDL.
diff --git a/htdocs/webhook/lib/webhook_target.lib.php b/htdocs/webhook/lib/webhook_target.lib.php
index fb01a8f95aa..b15252794ea 100644
--- a/htdocs/webhook/lib/webhook_target.lib.php
+++ b/htdocs/webhook/lib/webhook_target.lib.php
@@ -30,7 +30,7 @@ function targetPrepareHead($object)
 {
 	global $db, $langs, $conf;
 
-	$langs->load("webhook@webhook");
+	$langs->load("webhook");
 
 	$h = 0;
 	$head = array();
diff --git a/htdocs/webhook/target_agenda.php b/htdocs/webhook/target_agenda.php
index 5c039f4cc38..12b61187fbe 100644
--- a/htdocs/webhook/target_agenda.php
+++ b/htdocs/webhook/target_agenda.php
@@ -21,12 +21,13 @@
  *  \brief      Tab of events on Target
  */
 
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
-dol_include_once('/webhook/class/target.class.php');
-dol_include_once('/webhook/lib/webhook_target.lib.php');
+require_once DOL_DOCUMENT_ROOT.'/webhook/class/target.class.php';
+require_once DOL_DOCUMENT_ROOT.'/webhook/lib/webhook_target.lib.php';
 
 
 // Load translation files required by the page
@@ -54,8 +55,9 @@ $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (empty($page) || $page == -1) {
+	// If $page is not defined, or '' or -1
 	$page = 0;
-}     // If $page is not defined, or '' or -1
+}
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
@@ -96,8 +98,9 @@ if ($enablepermissioncheck) {
 //if ($user->socid > 0) $socid = $user->socid;
 //$isdraft = (($object->status == $object::STATUS_DRAFT) ? 1 : 0);
 //restrictedArea($user, $object->element, $object->id, $object->table_element, '', 'fk_soc', 'rowid', $isdraft);
-if (empty($conf->webhook->enabled)) accessforbidden();
-if (!$permissiontoread) accessforbidden();
+if (!isModEnabled('webhook') || !$permissiontoread) {
+	accessforbidden();
+}
 
 
 /*
diff --git a/htdocs/webhook/target_card.php b/htdocs/webhook/target_card.php
index 87c079b1b26..69338156da3 100644
--- a/htdocs/webhook/target_card.php
+++ b/htdocs/webhook/target_card.php
@@ -21,6 +21,7 @@
  *		\brief      Page to create/edit/view target
  */
 
+// 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.formfile.class.php';
diff --git a/htdocs/webhook/target_contact.php b/htdocs/webhook/target_contact.php
index 9b7f261cd59..d6523794444 100644
--- a/htdocs/webhook/target_contact.php
+++ b/htdocs/webhook/target_contact.php
@@ -21,19 +21,20 @@
  *  \brief      Tab for contacts linked to Target
  */
 
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php';
-dol_include_once('/webhook/class/target.class.php');
-dol_include_once('/webhook/lib/webhook_target.lib.php');
+require_once DOL_DOCUMENT_ROOT.'/webhook/class/target.class.php';
+require_once DOL_DOCUMENT_ROOT.'/webhook/lib/webhook_target.lib.php';
 
 // Load translation files required by the page
 $langs->loadLangs(array("webhook@webhook", "companies", "other", "mails"));
 
-$id     = (GETPOST('id') ?GETPOST('id', 'int') : GETPOST('facid', 'int')); // For backward compatibility
-$ref    = GETPOST('ref', 'alpha');
+$id = (GETPOST('id') ?GETPOST('id', 'int') : GETPOST('facid', 'int')); // For backward compatibility
+$ref = GETPOST('ref', 'alpha');
 $lineid = GETPOST('lineid', 'int');
-$socid  = GETPOST('socid', 'int');
+$socid = GETPOST('socid', 'int');
 $action = GETPOST('action', 'aZ09');
 
 // Initialize technical objects
@@ -63,8 +64,9 @@ if ($enablepermissioncheck) {
 //if ($user->socid > 0) $socid = $user->socid;
 //$isdraft = (($object->status == $object::STATUS_DRAFT) ? 1 : 0);
 //restrictedArea($user, $object->element, $object->id, $object->table_element, '', 'fk_soc', 'rowid', $isdraft);
-if (empty($conf->webhook->enabled)) accessforbidden();
-if (!$permissiontoread) accessforbidden();
+if (!isModEnabled('webhook') || !$permissiontoread) {
+	accessforbidden();
+}
 
 
 /*
diff --git a/htdocs/webhook/target_list.php b/htdocs/webhook/target_list.php
index e8a736f5e47..5deee22691f 100644
--- a/htdocs/webhook/target_list.php
+++ b/htdocs/webhook/target_list.php
@@ -22,13 +22,14 @@
  *		\brief      List page for target
  */
 
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
 
 // load webhook libraries
-require_once __DIR__.'/class/target.class.php';
+require_once DOL_DOCUMENT_ROOT.'/webhook/class/target.class.php';
 
 // for other modules
 //dol_include_once('/othermodule/class/otherobject.class.php');
@@ -36,16 +37,16 @@ require_once __DIR__.'/class/target.class.php';
 // Load translation files required by the page
 $langs->loadLangs(array("webhook@webhook", "other"));
 
-$action     = GETPOST('action', 'aZ09') ?GETPOST('action', 'aZ09') : 'view'; // The action 'add', 'create', 'edit', 'update', 'view', ...
+$action = GETPOST('action', 'aZ09') ?GETPOST('action', 'aZ09') : 'view'; // The action 'add', 'create', 'edit', 'update', 'view', ...
 $massaction = GETPOST('massaction', 'alpha'); // The bulk action (combo box choice into lists)
 $show_files = GETPOST('show_files', 'int'); // Show files area generated by bulk actions ?
-$confirm    = GETPOST('confirm', 'alpha'); // Result of a confirmation
-$cancel     = GETPOST('cancel', 'alpha'); // We click on a Cancel button
-$toselect   = GETPOST('toselect', 'array'); // Array of ids of elements selected into a list
+$confirm = GETPOST('confirm', 'alpha'); // Result of a confirmation
+$cancel = GETPOST('cancel', 'alpha'); // We click on a Cancel button
+$toselect = GETPOST('toselect', 'array'); // Array of ids of elements selected into a list
 $contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'targetlist'; // To manage different context of search
 $backtopage = GETPOST('backtopage', 'alpha'); // Go back to a dedicated page
-$optioncss  = GETPOST('optioncss', 'aZ'); // Option for the css output (always '' except when 'print')
-$mode       = GETPOST('mode', 'aZ');
+$optioncss = GETPOST('optioncss', 'aZ'); // Option for the css output (always '' except when 'print')
+$mode = GETPOST('mode', 'aZ');
 
 $id = GETPOST('id', 'int');
 
diff --git a/htdocs/webhook/target_note.php b/htdocs/webhook/target_note.php
index ef3805d699d..0ae570b94e1 100644
--- a/htdocs/webhook/target_note.php
+++ b/htdocs/webhook/target_note.php
@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2007-2017 Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) ---Put here your own copyright and developer email---
+ * Copyright (C) 2022      Frédéric France      <frederic.france@netlogic.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -22,18 +22,19 @@
  *  \brief      Tab for notes on Target
  */
 
+// Load Dolibarr environment
 require '../main.inc.php';
-dol_include_once('/webhook/class/target.class.php');
-dol_include_once('/webhook/lib/webhook_target.lib.php');
+require_once DOL_DOCUMENT_ROOT.'/webhook/class/target.class.php';
+require_once DOL_DOCUMENT_ROOT.'/webhook/lib/webhook_target.lib.php';
 
 // Load translation files required by the page
 $langs->loadLangs(array("webhook@webhook", "companies"));
 
 // Get parameters
 $id = GETPOST('id', 'int');
-$ref        = GETPOST('ref', 'alpha');
+$ref = GETPOST('ref', 'alpha');
 $action = GETPOST('action', 'aZ09');
-$cancel     = GETPOST('cancel', 'aZ09');
+$cancel = GETPOST('cancel', 'aZ09');
 $backtopage = GETPOST('backtopage', 'alpha');
 
 // Initialize technical objects
@@ -69,8 +70,9 @@ if ($enablepermissioncheck) {
 //if ($user->socid > 0) $socid = $user->socid;
 //$isdraft = (($object->status == $object::STATUS_DRAFT) ? 1 : 0);
 //restrictedArea($user, $object->element, $object->id, $object->table_element, '', 'fk_soc', 'rowid', $isdraft);
-if (empty($conf->webhook->enabled)) accessforbidden();
-if (!$permissiontoread) accessforbidden();
+if (!isModEnabled('webhook') || !$permissiontoread) {
+	accessforbidden();
+}
 
 
 /*
diff --git a/htdocs/webhook/webhookindex.php b/htdocs/webhook/webhookindex.php
index 3d050499a29..59973021ca2 100644
--- a/htdocs/webhook/webhookindex.php
+++ b/htdocs/webhook/webhookindex.php
@@ -25,40 +25,11 @@
  */
 
 // Load Dolibarr environment
-$res = 0;
-// Try main.inc.php into web root known defined into CONTEXT_DOCUMENT_ROOT (not always defined)
-if (!$res && !empty($_SERVER["CONTEXT_DOCUMENT_ROOT"])) {
-	$res = @include $_SERVER["CONTEXT_DOCUMENT_ROOT"]."/main.inc.php";
-}
-// Try main.inc.php into web root detected using web root calculated from SCRIPT_FILENAME
-$tmp = empty($_SERVER['SCRIPT_FILENAME']) ? '' : $_SERVER['SCRIPT_FILENAME']; $tmp2 = realpath(__FILE__); $i = strlen($tmp) - 1; $j = strlen($tmp2) - 1;
-while ($i > 0 && $j > 0 && isset($tmp[$i]) && isset($tmp2[$j]) && $tmp[$i] == $tmp2[$j]) {
-	$i--; $j--;
-}
-if (!$res && $i > 0 && file_exists(substr($tmp, 0, ($i + 1))."/main.inc.php")) {
-	$res = @include substr($tmp, 0, ($i + 1))."/main.inc.php";
-}
-if (!$res && $i > 0 && file_exists(dirname(substr($tmp, 0, ($i + 1)))."/main.inc.php")) {
-	$res = @include dirname(substr($tmp, 0, ($i + 1)))."/main.inc.php";
-}
-// Try main.inc.php using relative path
-if (!$res && file_exists("../main.inc.php")) {
-	$res = @include "../main.inc.php";
-}
-if (!$res && file_exists("../../main.inc.php")) {
-	$res = @include "../../main.inc.php";
-}
-if (!$res && file_exists("../../../main.inc.php")) {
-	$res = @include "../../../main.inc.php";
-}
-if (!$res) {
-	die("Include of main fails");
-}
-
+require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
 
 // Load translation files required by the page
-$langs->loadLangs(array("webhook@webhook"));
+$langs->loadLangs(array("webhook"));
 
 $action = GETPOST('action', 'aZ09');
 
@@ -100,8 +71,7 @@ print '<div class="fichecenter"><div class="fichethirdleft">';
 
 /* BEGIN MODULEBUILDER DRAFT MYOBJECT
 // Draft MyObject
-if (!empty($conf->webhook->enabled) && $user->rights->webhook->read)
-{
+if (!empty($conf->webhook->enabled) && $user->rights->webhook->read) {
 	$langs->load("orders");
 
 	$sql = "SELECT c.rowid, c.ref, c.ref_client, c.total_ht, c.tva as total_tva, c.total_ttc, s.rowid as socid, s.nom as name, s.client, s.canvas";

From 33e112eda7697766f7fecb81509dfa141f7dae92 Mon Sep 17 00:00:00 2001
From: UT from dolibit <45215329+dolibit-ut@users.noreply.github.com>
Date: Thu, 1 Sep 2022 21:06:30 +0200
Subject: [PATCH 602/974] Update list.php

---
 htdocs/commande/list.php | 78 ++++++++++++++++++++++++++++++----------
 1 file changed, 59 insertions(+), 19 deletions(-)

diff --git a/htdocs/commande/list.php b/htdocs/commande/list.php
index 4ba2f410cc9..1363d9bd953 100644
--- a/htdocs/commande/list.php
+++ b/htdocs/commande/list.php
@@ -33,6 +33,8 @@
  *	\brief      Page to list orders
  */
 
+
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
@@ -51,6 +53,7 @@ require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 // Load translation files required by the page
 $langs->loadLangs(array('orders', 'sendings', 'deliveries', 'companies', 'compta', 'bills', 'stocks', 'products'));
 
+// Get Parameters
 $action = GETPOST('action', 'aZ09');
 $massaction = GETPOST('massaction', 'alpha');
 $show_files = GETPOST('show_files', 'int');
@@ -58,6 +61,7 @@ $confirm = GETPOST('confirm', 'alpha');
 $toselect = GETPOST('toselect', 'array');
 $contextpage = GETPOST('contextpage', 'aZ') ?GETPOST('contextpage', 'aZ') : 'orderlist';
 
+// Search Parameters
 $search_datecloture_start = GETPOST('search_datecloture_start', 'int');
 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'));
@@ -86,7 +90,7 @@ $socid = GETPOST('socid', 'int');
 $search_user = GETPOST('search_user', 'int');
 $search_sale = GETPOST('search_sale', 'int');
 
-$search_total_ht = GETPOST('search_total_ht', 'alpha');
+$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');
@@ -209,6 +213,7 @@ $arrayfields = array(
 	'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
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_array_fields.tpl.php';
 
@@ -724,6 +729,7 @@ if ($action == 'shipped' && $permissiontoadd) {
 		}
 	}
 }
+
 // Closed records
 if (!$error && $massaction === 'setbilled' && $permissiontoclose) {
 	$db->begin();
@@ -760,10 +766,12 @@ if (!$error && $massaction === 'setbilled' && $permissiontoclose) {
 	}
 }
 
+
 /*
  * View
  */
 
+
 $now = dol_now();
 
 $form = new Form($db);
@@ -799,12 +807,14 @@ $sql .= ' c.fk_input_reason, c.import_key';
 if (($search_categ_cus > 0) || ($search_categ_cus == -2)) {
 	$sql .= ", cc.fk_categorie, cc.fk_soc";
 }
+
 // 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); // Note that $action and $object may have been modified by hook
@@ -1065,7 +1075,7 @@ if ($resql) {
 		exit;
 	}
 
-	llxHeader('', $title, $help_url);
+    llxHeader('', $title, $help_url);
 
 	$param = '';
 
@@ -1327,7 +1337,7 @@ if ($resql) {
 
 	$moreforfilter = '';
 
-	// If the user can view prospects other than his'
+	// If the user can view prospects? sales other than his own
 	if ($user->rights->user->user->lire) {
 		$langs->load("commercial");
 		$moreforfilter .= '<div class="divsearchfield">';
@@ -1342,7 +1352,7 @@ if ($resql) {
 		$moreforfilter .= img_picto($tmptitle, 'user', 'class="pictofixedwidth"').$form->select_dolusers($search_user, 'search_user', $tmptitle, '', 0, '', '', 0, 0, 0, '', 0, '', 'maxwidth250 widthcentpercentminusx');
 		$moreforfilter .= '</div>';
 	}
-	// If the user can view prospects other than his'
+	// If the user can view other products/services than his own
 	if (!empty($conf->categorie->enabled) && $user->rights->categorie->lire && ($user->rights->produit->lire || $user->rights->service->lire)) {
 		include_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 		$moreforfilter .= '<div class="divsearchfield">';
@@ -1351,6 +1361,7 @@ if ($resql) {
 		$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 Categories are enabled & user has rights to see 
 	if (!empty($conf->categorie->enabled) && $user->rights->categorie->lire) {
 		require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 		$moreforfilter .= '<div class="divsearchfield">';
@@ -1358,6 +1369,7 @@ if ($resql) {
 		$moreforfilter .= img_picto($tmptitle, 'category', 'class="pictofixedwidth"').$formother->select_categories('customer', $search_categ_cus, 'search_categ_cus', 1, $tmptitle, 'maxwidth300 widthcentpercentminusx');
 		$moreforfilter .= '</div>';
 	}
+	// If Stock is enabled
 	if (!empty($conf->stock->enabled) && !empty($conf->global->WAREHOUSE_ASK_WAREHOUSE_DURING_ORDER)) {
 		require_once DOL_DOCUMENT_ROOT.'/product/class/html.formproduct.class.php';
 		$formproduct = new FormProduct($db);
@@ -1509,60 +1521,63 @@ if ($resql) {
 		$form->selectInputReason($search_fk_input_reason, 'search_fk_input_reason', '', 1, '', 1);
 		print '</td>';
 	}
+	// Amount HT / net
 	if (!empty($arrayfields['c.total_ht']['checked'])) {
-		// Amount
 		print '<td class="liste_titre right">';
 		print '<input class="flat" type="text" size="4" name="search_total_ht" value="'.dol_escape_htmltag($search_total_ht).'">';
 		print '</td>';
 	}
+	// Amount of VAT
 	if (!empty($arrayfields['c.total_vat']['checked'])) {
-		// Amount
 		print '<td class="liste_titre right">';
 		print '<input class="flat" type="text" size="4" name="search_total_vat" value="'.dol_escape_htmltag($search_total_vat).'">';
 		print '</td>';
 	}
+	// Total Amount (TTC / gross)   
 	if (!empty($arrayfields['c.total_ttc']['checked'])) {
-		// Amount
+		
 		print '<td class="liste_titre right">';
 		print '<input class="flat" type="text" size="5" name="search_total_ttc" value="'.$search_total_ttc.'">';
 		print '</td>';
 	}
+	// Currency
 	if (!empty($arrayfields['c.multicurrency_code']['checked'])) {
-		// Currency
 		print '<td class="liste_titre">';
 		print $form->selectMultiCurrency($search_multicurrency_code, 'search_multicurrency_code', 1);
 		print '</td>';
 	}
+	// Currency rate
 	if (!empty($arrayfields['c.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>';
 	}
+	// Amount HT/net in foreign currency
 	if (!empty($arrayfields['c.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>';
 	}
+	// VAT in foreign currency
 	if (!empty($arrayfields['c.multicurrency_total_vat']['checked'])) {
-		// Amount VAT
 		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>';
 	}
+	// Amount/Total (TTC / gross) in foreign currency
 	if (!empty($arrayfields['c.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>';
 	}
+	// Author
 	if (!empty($arrayfields['u.login']['checked'])) {
-		// Author
 		print '<td class="liste_titre" align="center">';
 		print '<input class="flat" size="4" type="text" name="search_login" value="'.dol_escape_htmltag($search_login).'">';
 		print '</td>';
 	}
+	// Sales Representative
 	if (!empty($arrayfields['sale_representative']['checked'])) {
 		print '<td class="liste_titre"></td>';
 	}
@@ -1582,12 +1597,15 @@ if ($resql) {
 		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); // Note that $action and $object may have been modified by hook
 	print $hookmanager->resPrint;
+	
 	// Date creation
 	if (!empty($arrayfields['c.datec']['checked'])) {
 		print '<td class="liste_titre">';
@@ -1775,8 +1793,10 @@ if ($resql) {
 		),
 		'pos' => array(),
 	);
+	
 	// Extra fields
 	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_title.tpl.php';
+	
 	// Hook fields
 	$parameters = array(
 		'arrayfields' => $arrayfields,
@@ -1976,6 +1996,7 @@ if ($resql) {
 				$totalarray['nbfield']++;
 			}
 		}
+		
 		// Alias name
 		if (!empty($arrayfields['s.name_alias']['checked'])) {
 			print '<td class="nocellnopadd">';
@@ -1985,6 +2006,7 @@ if ($resql) {
 				$totalarray['nbfield']++;
 			}
 		}
+		
 		// Town
 		if (!empty($arrayfields['s.town']['checked'])) {
 			print '<td class="nocellnopadd">';
@@ -1994,6 +2016,7 @@ if ($resql) {
 				$totalarray['nbfield']++;
 			}
 		}
+		
 		// Zip
 		if (!empty($arrayfields['s.zip']['checked'])) {
 			print '<td class="nocellnopadd">';
@@ -2003,6 +2026,7 @@ if ($resql) {
 				$totalarray['nbfield']++;
 			}
 		}
+		
 		// State
 		if (!empty($arrayfields['state.nom']['checked'])) {
 			print "<td>".$obj->state_name."</td>\n";
@@ -2010,6 +2034,7 @@ if ($resql) {
 				$totalarray['nbfield']++;
 			}
 		}
+		
 		// Country
 		if (!empty($arrayfields['country.code_iso']['checked'])) {
 			print '<td class="center">';
@@ -2020,6 +2045,7 @@ if ($resql) {
 				$totalarray['nbfield']++;
 			}
 		}
+		
 		// Type ent
 		if (!empty($arrayfields['typent.code']['checked'])) {
 			print '<td class="center">';
@@ -2046,6 +2072,7 @@ if ($resql) {
 				$totalarray['nbfield']++;
 			}
 		}
+		
 		// Plannned date of delivery
 		if (!empty($arrayfields['c.date_delivery']['checked'])) {
 			print '<td class="center">';
@@ -2055,6 +2082,7 @@ if ($resql) {
 				$totalarray['nbfield']++;
 			}
 		}
+		
 		// Shipping Method
 		if (!empty($arrayfields['c.fk_shipping_method']['checked'])) {
 			print '<td>';
@@ -2064,6 +2092,7 @@ if ($resql) {
 				$totalarray['nbfield']++;
 			}
 		}
+		
 		// Payment terms
 		if (!empty($arrayfields['c.fk_cond_reglement']['checked'])) {
 			print '<td>';
@@ -2073,6 +2102,7 @@ if ($resql) {
 				$totalarray['nbfield']++;
 			}
 		}
+		
 		// Payment mode
 		if (!empty($arrayfields['c.fk_mode_reglement']['checked'])) {
 			print '<td>';
@@ -2082,6 +2112,7 @@ if ($resql) {
 				$totalarray['nbfield']++;
 			}
 		}
+		
 		// Channel
 		if (!empty($arrayfields['c.fk_input_reason']['checked'])) {
 			print '<td>';
@@ -2091,7 +2122,8 @@ if ($resql) {
 				$totalarray['nbfield']++;
 			}
 		}
-		// Amount HT
+		
+		// Amount HT/net
 		if (!empty($arrayfields['c.total_ht']['checked'])) {
 			  print '<td class="nowrap right"><span class="amount">'.price($obj->total_ht)."</span></td>\n";
 			if (!$i) {
@@ -2106,6 +2138,7 @@ if ($resql) {
 				$totalarray['val']['c.total_ht'] = $obj->total_ht;
 			}
 		}
+		
 		// Amount VAT
 		if (!empty($arrayfields['c.total_vat']['checked'])) {
 			print '<td class="nowrap right"><span class="amount">'.price($obj->total_tva)."</span></td>\n";
@@ -2117,7 +2150,8 @@ if ($resql) {
 			}
 			$totalarray['val']['c.total_tva'] += $obj->total_tva;
 		}
-		// Amount TTC
+		
+		// Amount TTC / gross
 		if (!empty($arrayfields['c.total_ttc']['checked'])) {
 			print '<td class="nowrap right"><span class="amount">'.price($obj->total_ttc)."</span></td>\n";
 			if (!$i) {
@@ -2146,21 +2180,22 @@ if ($resql) {
 				$totalarray['nbfield']++;
 			}
 		}
-		// Amount HT
+		
+		// Amount HT/net in foreign currency
 		if (!empty($arrayfields['c.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
+		// Amount VAT in foreign currency
 		if (!empty($arrayfields['c.multicurrency_total_vat']['checked'])) {
 			print '<td class="right nowrap"><span class="amount">'.price($obj->multicurrency_total_vat)."</span></td>\n";
 			if (!$i) {
 				$totalarray['nbfield']++;
 			}
 		}
-		// Amount TTC
+		// Amount TTC / gross in foreign currency
 		if (!empty($arrayfields['c.multicurrency_total_ttc']['checked'])) {
 			print '<td class="right nowrap"><span class="amount">'.price($obj->multicurrency_total_ttc)."</span></td>\n";
 			if (!$i) {
@@ -2196,8 +2231,8 @@ if ($resql) {
 			}
 		}
 
+		// Sales representatives
 		if (!empty($arrayfields['sale_representative']['checked'])) {
-			// Sales representatives
 			print '<td>';
 			if ($obj->socid > 0) {
 				$listsalesrepresentatives = $companystatic->getSalesRepresentatives($user);
@@ -2250,6 +2285,7 @@ if ($resql) {
 				$totalarray['nbfield']++;
 			}
 		}
+		
 		// Total margin
 		if (!empty($arrayfields['total_margin']['checked'])) {
 			print '<td class="right nowrap">'.price($marginInfo['total_margin']).'</td>';
@@ -2261,6 +2297,7 @@ if ($resql) {
 			}
 			$totalarray['val']['total_margin'] += $marginInfo['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'], null, null, null, null, 2).'%').'</td>';
@@ -2268,6 +2305,7 @@ if ($resql) {
 				$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>';
@@ -2456,6 +2494,7 @@ if ($resql) {
 				$totalarray['nbfield']++;
 			}
 		}
+		
 		// Import key
 		if (!empty($arrayfields['c.import_key']['checked'])) {
 			print '<td class="nowrap center">'.$obj->import_key.'</td>';
@@ -2463,6 +2502,7 @@ if ($resql) {
 				$totalarray['nbfield']++;
 			}
 		}
+		
 		// Status
 		if (!empty($arrayfields['c.fk_statut']['checked'])) {
 			print '<td class="nowrap center">'.$generic_commande->LibStatut($obj->fk_statut, $obj->billed, 5, 1).'</td>';

From 9a7ad0a7dca6737606ec2beda0d7f2a613017d4c Mon Sep 17 00:00:00 2001
From: stickler-ci <support@stickler-ci.com>
Date: Thu, 1 Sep 2022 19:17:42 +0000
Subject: [PATCH 603/974] Fixing style errors.

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

diff --git a/htdocs/commande/list.php b/htdocs/commande/list.php
index 1363d9bd953..22afe05725f 100644
--- a/htdocs/commande/list.php
+++ b/htdocs/commande/list.php
@@ -1075,7 +1075,7 @@ if ($resql) {
 		exit;
 	}
 
-    llxHeader('', $title, $help_url);
+	llxHeader('', $title, $help_url);
 
 	$param = '';
 
@@ -1361,7 +1361,7 @@ if ($resql) {
 		$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 Categories are enabled & user has rights to see 
+	// If Categories are enabled & user has rights to see
 	if (!empty($conf->categorie->enabled) && $user->rights->categorie->lire) {
 		require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 		$moreforfilter .= '<div class="divsearchfield">';
@@ -1533,9 +1533,8 @@ if ($resql) {
 		print '<input class="flat" type="text" size="4" name="search_total_vat" value="'.dol_escape_htmltag($search_total_vat).'">';
 		print '</td>';
 	}
-	// Total Amount (TTC / gross)   
+	// Total Amount (TTC / gross)
 	if (!empty($arrayfields['c.total_ttc']['checked'])) {
-		
 		print '<td class="liste_titre right">';
 		print '<input class="flat" type="text" size="5" name="search_total_ttc" value="'.$search_total_ttc.'">';
 		print '</td>';
@@ -1554,7 +1553,6 @@ if ($resql) {
 	}
 	// Amount HT/net in foreign currency
 	if (!empty($arrayfields['c.multicurrency_total_ht']['checked'])) {
-		
 		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>';
@@ -1597,15 +1595,15 @@ if ($resql) {
 		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); // Note that $action and $object may have been modified by hook
 	print $hookmanager->resPrint;
-	
+
 	// Date creation
 	if (!empty($arrayfields['c.datec']['checked'])) {
 		print '<td class="liste_titre">';
@@ -1793,10 +1791,10 @@ if ($resql) {
 		),
 		'pos' => array(),
 	);
-	
+
 	// Extra fields
 	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_title.tpl.php';
-	
+
 	// Hook fields
 	$parameters = array(
 		'arrayfields' => $arrayfields,
@@ -1996,7 +1994,7 @@ if ($resql) {
 				$totalarray['nbfield']++;
 			}
 		}
-		
+
 		// Alias name
 		if (!empty($arrayfields['s.name_alias']['checked'])) {
 			print '<td class="nocellnopadd">';
@@ -2006,7 +2004,7 @@ if ($resql) {
 				$totalarray['nbfield']++;
 			}
 		}
-		
+
 		// Town
 		if (!empty($arrayfields['s.town']['checked'])) {
 			print '<td class="nocellnopadd">';
@@ -2016,7 +2014,7 @@ if ($resql) {
 				$totalarray['nbfield']++;
 			}
 		}
-		
+
 		// Zip
 		if (!empty($arrayfields['s.zip']['checked'])) {
 			print '<td class="nocellnopadd">';
@@ -2026,7 +2024,7 @@ if ($resql) {
 				$totalarray['nbfield']++;
 			}
 		}
-		
+
 		// State
 		if (!empty($arrayfields['state.nom']['checked'])) {
 			print "<td>".$obj->state_name."</td>\n";
@@ -2034,7 +2032,7 @@ if ($resql) {
 				$totalarray['nbfield']++;
 			}
 		}
-		
+
 		// Country
 		if (!empty($arrayfields['country.code_iso']['checked'])) {
 			print '<td class="center">';
@@ -2045,7 +2043,7 @@ if ($resql) {
 				$totalarray['nbfield']++;
 			}
 		}
-		
+
 		// Type ent
 		if (!empty($arrayfields['typent.code']['checked'])) {
 			print '<td class="center">';
@@ -2072,7 +2070,7 @@ if ($resql) {
 				$totalarray['nbfield']++;
 			}
 		}
-		
+
 		// Plannned date of delivery
 		if (!empty($arrayfields['c.date_delivery']['checked'])) {
 			print '<td class="center">';
@@ -2082,7 +2080,7 @@ if ($resql) {
 				$totalarray['nbfield']++;
 			}
 		}
-		
+
 		// Shipping Method
 		if (!empty($arrayfields['c.fk_shipping_method']['checked'])) {
 			print '<td>';
@@ -2092,7 +2090,7 @@ if ($resql) {
 				$totalarray['nbfield']++;
 			}
 		}
-		
+
 		// Payment terms
 		if (!empty($arrayfields['c.fk_cond_reglement']['checked'])) {
 			print '<td>';
@@ -2102,7 +2100,7 @@ if ($resql) {
 				$totalarray['nbfield']++;
 			}
 		}
-		
+
 		// Payment mode
 		if (!empty($arrayfields['c.fk_mode_reglement']['checked'])) {
 			print '<td>';
@@ -2112,7 +2110,7 @@ if ($resql) {
 				$totalarray['nbfield']++;
 			}
 		}
-		
+
 		// Channel
 		if (!empty($arrayfields['c.fk_input_reason']['checked'])) {
 			print '<td>';
@@ -2122,7 +2120,7 @@ if ($resql) {
 				$totalarray['nbfield']++;
 			}
 		}
-		
+
 		// Amount HT/net
 		if (!empty($arrayfields['c.total_ht']['checked'])) {
 			  print '<td class="nowrap right"><span class="amount">'.price($obj->total_ht)."</span></td>\n";
@@ -2138,7 +2136,7 @@ if ($resql) {
 				$totalarray['val']['c.total_ht'] = $obj->total_ht;
 			}
 		}
-		
+
 		// Amount VAT
 		if (!empty($arrayfields['c.total_vat']['checked'])) {
 			print '<td class="nowrap right"><span class="amount">'.price($obj->total_tva)."</span></td>\n";
@@ -2150,7 +2148,7 @@ if ($resql) {
 			}
 			$totalarray['val']['c.total_tva'] += $obj->total_tva;
 		}
-		
+
 		// Amount TTC / gross
 		if (!empty($arrayfields['c.total_ttc']['checked'])) {
 			print '<td class="nowrap right"><span class="amount">'.price($obj->total_ttc)."</span></td>\n";
@@ -2180,7 +2178,7 @@ if ($resql) {
 				$totalarray['nbfield']++;
 			}
 		}
-		
+
 		// Amount HT/net in foreign currency
 		if (!empty($arrayfields['c.multicurrency_total_ht']['checked'])) {
 			  print '<td class="right nowrap"><span class="amount">'.price($obj->multicurrency_total_ht)."</span></td>\n";
@@ -2285,7 +2283,7 @@ if ($resql) {
 				$totalarray['nbfield']++;
 			}
 		}
-		
+
 		// Total margin
 		if (!empty($arrayfields['total_margin']['checked'])) {
 			print '<td class="right nowrap">'.price($marginInfo['total_margin']).'</td>';
@@ -2297,7 +2295,7 @@ if ($resql) {
 			}
 			$totalarray['val']['total_margin'] += $marginInfo['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'], null, null, null, null, 2).'%').'</td>';
@@ -2305,7 +2303,7 @@ if ($resql) {
 				$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>';
@@ -2494,7 +2492,7 @@ if ($resql) {
 				$totalarray['nbfield']++;
 			}
 		}
-		
+
 		// Import key
 		if (!empty($arrayfields['c.import_key']['checked'])) {
 			print '<td class="nowrap center">'.$obj->import_key.'</td>';
@@ -2502,7 +2500,7 @@ if ($resql) {
 				$totalarray['nbfield']++;
 			}
 		}
-		
+
 		// Status
 		if (!empty($arrayfields['c.fk_statut']['checked'])) {
 			print '<td class="nowrap center">'.$generic_commande->LibStatut($obj->fk_statut, $obj->billed, 5, 1).'</td>';

From 1269e1b86e23973110ef4f1a933ae4013797f5a5 Mon Sep 17 00:00:00 2001
From: Gauthier PC portable 024 <gauthier.verdol@atm-consulting.fr>
Date: Fri, 2 Sep 2022 08:44:16 +0200
Subject: [PATCH 604/974] FIX : cast

---
 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 e178c76c024..1a21c73baee 100644
--- a/htdocs/bom/class/bom.class.php
+++ b/htdocs/bom/class/bom.class.php
@@ -1160,7 +1160,7 @@ class BOM extends CommonObject
 		$sql = 'SELECT l.fk_bom, b.label
 				FROM '.MAIN_DB_PREFIX.'bom_bomline l
 				INNER JOIN '.MAIN_DB_PREFIX.$this->table_element.' b ON b.rowid = l.fk_bom
-				WHERE fk_bom_child = '.$bom_id;
+				WHERE fk_bom_child = '.((int) $bom_id);
 
 		$resql = $this->db->query($sql);
 		if(!empty($resql)) {

From 3d9b57ac3f59be37ba5f9addb33a3d48fcd170b1 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 2 Sep 2022 08:53:13 +0200
Subject: [PATCH 605/974] Clean code

---
 .../categories/class/api_categories.class.php |   3 -
 .../facture/class/facture-rec.class.php       |  10 +-
 htdocs/core/class/extrafields.class.php       | 111 ++++++------------
 htdocs/cron/class/cronjob.class.php           |  28 +++--
 htdocs/fichinter/class/fichinter.class.php    |  90 ++++++++------
 htdocs/fichinter/class/fichinterrec.class.php |  26 ++--
 .../install/mysql/migration/16.0.0-17.0.0.sql |   3 +
 .../mysql/tables/llx_fichinterdet_rec.sql     |   2 -
 htdocs/website/index.php                      |   3 +-
 9 files changed, 123 insertions(+), 153 deletions(-)

diff --git a/htdocs/categories/class/api_categories.class.php b/htdocs/categories/class/api_categories.class.php
index 0a618974024..d5345106093 100644
--- a/htdocs/categories/class/api_categories.class.php
+++ b/htdocs/categories/class/api_categories.class.php
@@ -682,9 +682,6 @@ class Categories extends DolibarrApi
 		unset($object->total_ttc);
 		unset($object->total_tva);
 		unset($object->lines);
-		unset($object->fk_incoterms);
-		unset($object->label_incoterms);
-		unset($object->location_incoterms);
 		unset($object->civility_id);
 		unset($object->name);
 		unset($object->lastname);
diff --git a/htdocs/compta/facture/class/facture-rec.class.php b/htdocs/compta/facture/class/facture-rec.class.php
index f15f65954cf..3001baca506 100644
--- a/htdocs/compta/facture/class/facture-rec.class.php
+++ b/htdocs/compta/facture/class/facture-rec.class.php
@@ -25,7 +25,7 @@
 /**
  *	\file       htdocs/compta/facture/class/facture-rec.class.php
  *	\ingroup    facture
- *	\brief      Fichier de la classe des factures recurentes
+ *	\brief      File of class to manage recurring invoices
  */
 
 require_once DOL_DOCUMENT_ROOT.'/core/class/notify.class.php';
@@ -462,7 +462,7 @@ class FactureRec extends CommonInvoice
 
 
 	/**
-	 * 	Update a line to invoice_rec.
+	 * 	Update a line invoice_rec.
 	 *
 	 *  @param		User	$user					User
 	 *  @param		int		$notrigger				No trigger
@@ -470,8 +470,6 @@ class FactureRec extends CommonInvoice
 	 */
 	public function update(User $user, $notrigger = 0)
 	{
-		global $conf;
-
 		$error = 0;
 
 		$sql = "UPDATE ".MAIN_DB_PREFIX."facture_rec SET";
@@ -480,8 +478,8 @@ class FactureRec extends CommonInvoice
 		$sql .= " suspended = ".((int) $this->suspended).",";
 		$sql .= " fk_soc = ".((int) $this->socid).",";
 		$sql .= " total_tva = ".((float) $this->total_tva).",";
-		$sql .= " localtax1 = ".((float) $this->localtax1).",";
-		$sql .= " localtax2 = ".((float) $this->localtax2).",";
+		$sql .= " localtax1 = ".((float) $this->total_localtax1).",";
+		$sql .= " localtax2 = ".((float) $this->total_localtax2).",";
 		$sql .= " total_ht = ".((float) $this->total_ht).",";
 		$sql .= " total_ttc = ".((float) $this->total_ttc).",";
 		$sql .= " remise_percent = ".((float) $this->remise_percent);
diff --git a/htdocs/core/class/extrafields.class.php b/htdocs/core/class/extrafields.class.php
index bbc5e8604ce..5b6e00e91da 100644
--- a/htdocs/core/class/extrafields.class.php
+++ b/htdocs/core/class/extrafields.class.php
@@ -42,30 +42,6 @@ class ExtraFields
 	 */
 	public $db;
 
-	/**
-	 * @var array Array with type of the extra field
-	 * @deprecated
-	 */
-	public $attribute_type;
-
-	/**
-	 * @var array Array with label of extra field
-	 * @deprecated
-	 */
-	public $attribute_label;
-
-	/**
-	 * @var array Array with list of possible values for some types of extra fields
-	 * @deprecated
-	 */
-	public $attribute_choice;
-
-	/**
-	 * @var array array to store extrafields definition
-	 * @deprecated
-	 */
-	public $attribute_list;
-
 	/**
 	 * @var array New array to store extrafields definition
 	 */
@@ -128,10 +104,6 @@ class ExtraFields
 		$this->error = '';
 		$this->errors = array();
 		$this->attributes = array();
-
-		// For old usage
-		$this->attribute_type = array();
-		$this->attribute_label = array();
 	}
 
 	/**
@@ -838,7 +810,7 @@ class ExtraFields
 
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
-	 * 	Load array this->attributes (and some old this->attribute_xxx like attribute_label, attribute_type, ...
+	 * 	Load array this->attributes
 	 *
 	 * 	@param	string		$elementtype		Type of element ('' = all or $object->table_element like 'adherent', 'commande', 'thirdparty', 'facture', 'propal', 'product', ...).
 	 * 	@param	boolean		$forceload			Force load of extra fields whatever is status of cache.
@@ -892,11 +864,6 @@ class ExtraFields
 						$array_name_label[$tab->name] = $tab->label;
 					}
 
-					// Old usage
-					$this->attribute_type[$tab->name] = $tab->type;
-					$this->attribute_label[$tab->name] = $tab->label;
-
-					// New usage
 					$this->attributes[$tab->elementtype]['type'][$tab->name] = $tab->type;
 					$this->attributes[$tab->elementtype]['label'][$tab->name] = $tab->label;
 					$this->attributes[$tab->elementtype]['size'][$tab->name] = $tab->size;
@@ -946,7 +913,7 @@ class ExtraFields
 	 * @param  string        $keyprefix      		Suffix string to add before name and id of field (can be used to avoid duplicate names)
 	 * @param  string        $morecss        		More css (to defined size of field. Old behaviour: may also be a numeric)
 	 * @param  int           $objectid       		Current object id
-	 * @param  string        $extrafieldsobjectkey	If defined (for example $object->table_element), use the new method to get extrafields data
+	 * @param  string        $extrafieldsobjectkey	The key to use to store retreived data (for example $object->table_element)
 	 * @param  string        $mode                  1=Used for search filters
 	 * @return string
 	 */
@@ -965,29 +932,26 @@ class ExtraFields
 			$keyprefix = $keyprefix.'options_';
 		}
 
-		if (!empty($extrafieldsobjectkey)) {
-			$label = $this->attributes[$extrafieldsobjectkey]['label'][$key];
-			$type = $this->attributes[$extrafieldsobjectkey]['type'][$key];
-			$size = $this->attributes[$extrafieldsobjectkey]['size'][$key];
-			$default = $this->attributes[$extrafieldsobjectkey]['default'][$key];
-			$computed = $this->attributes[$extrafieldsobjectkey]['computed'][$key];
-			$unique = $this->attributes[$extrafieldsobjectkey]['unique'][$key];
-			$required = $this->attributes[$extrafieldsobjectkey]['required'][$key];
-			$param = $this->attributes[$extrafieldsobjectkey]['param'][$key];
-			$perms = dol_eval($this->attributes[$extrafieldsobjectkey]['perms'][$key], 1, 1, '1');
-			$langfile = $this->attributes[$extrafieldsobjectkey]['langfile'][$key];
-			$list = dol_eval($this->attributes[$extrafieldsobjectkey]['list'][$key], 1, 1, '1');
-			$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)
-		} else {
-			// Old usage
-			$label = $this->attribute_label[$key];
-			$type = $this->attribute_type[$key];
-			$list = $this->attribute_list[$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)
+		if (empty($extrafieldsobjectkey)) {
+			dol_syslog(get_class($this).'::showInputField extrafieldsobjectkey required', LOG_ERR);
+			return 'BadValueForParamExtraFieldsObjectKey';
 		}
 
+		$label = $this->attributes[$extrafieldsobjectkey]['label'][$key];
+		$type = $this->attributes[$extrafieldsobjectkey]['type'][$key];
+		$size = $this->attributes[$extrafieldsobjectkey]['size'][$key];
+		$default = $this->attributes[$extrafieldsobjectkey]['default'][$key];
+		$computed = $this->attributes[$extrafieldsobjectkey]['computed'][$key];
+		$unique = $this->attributes[$extrafieldsobjectkey]['unique'][$key];
+		$required = $this->attributes[$extrafieldsobjectkey]['required'][$key];
+		$param = $this->attributes[$extrafieldsobjectkey]['param'][$key];
+		$perms = dol_eval($this->attributes[$extrafieldsobjectkey]['perms'][$key], 1, 1, '1');
+		$langfile = $this->attributes[$extrafieldsobjectkey]['langfile'][$key];
+		$list = dol_eval($this->attributes[$extrafieldsobjectkey]['list'][$key], 1, 1, '1');
+		$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)
+
 		if ($computed) {
 			if (!preg_match('/^search_/', $keyprefix)) {
 				return '<span class="opacitymedium">'.$langs->trans("AutomaticallyCalculated").'</span>';
@@ -1591,26 +1555,25 @@ class ExtraFields
 	{
 		global $conf, $langs;
 
-		if (!empty($extrafieldsobjectkey)) {
-			$label = $this->attributes[$extrafieldsobjectkey]['label'][$key];
-			$type = $this->attributes[$extrafieldsobjectkey]['type'][$key];
-			$size = $this->attributes[$extrafieldsobjectkey]['size'][$key];			// Can be '255', '24,8'...
-			$default = $this->attributes[$extrafieldsobjectkey]['default'][$key];
-			$computed = $this->attributes[$extrafieldsobjectkey]['computed'][$key];
-			$unique = $this->attributes[$extrafieldsobjectkey]['unique'][$key];
-			$required = $this->attributes[$extrafieldsobjectkey]['required'][$key];
-			$param = $this->attributes[$extrafieldsobjectkey]['param'][$key];
-			$perms = dol_eval($this->attributes[$extrafieldsobjectkey]['perms'][$key], 1, 1, '1');
-			$langfile = $this->attributes[$extrafieldsobjectkey]['langfile'][$key];
-			$list = dol_eval($this->attributes[$extrafieldsobjectkey]['list'][$key], 1, 1, '1');
-			$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)
-		} else {
-			// Old usage not allowed anymore
-			dol_syslog(get_class($this).'::showOutputField extrafieldsobjectkey required', LOG_WARNING);
-			return '';
+		if (empty($extrafieldsobjectkey)) {
+			dol_syslog(get_class($this).'::showOutputField extrafieldsobjectkey required', LOG_ERR);
+			return 'BadValueForParamExtraFieldsObjectKey';
 		}
 
+		$label = $this->attributes[$extrafieldsobjectkey]['label'][$key];
+		$type = $this->attributes[$extrafieldsobjectkey]['type'][$key];
+		$size = $this->attributes[$extrafieldsobjectkey]['size'][$key];			// Can be '255', '24,8'...
+		$default = $this->attributes[$extrafieldsobjectkey]['default'][$key];
+		$computed = $this->attributes[$extrafieldsobjectkey]['computed'][$key];
+		$unique = $this->attributes[$extrafieldsobjectkey]['unique'][$key];
+		$required = $this->attributes[$extrafieldsobjectkey]['required'][$key];
+		$param = $this->attributes[$extrafieldsobjectkey]['param'][$key];
+		$perms = dol_eval($this->attributes[$extrafieldsobjectkey]['perms'][$key], 1, 1, '1');
+		$langfile = $this->attributes[$extrafieldsobjectkey]['langfile'][$key];
+		$list = dol_eval($this->attributes[$extrafieldsobjectkey]['list'][$key], 1, 1, '1');
+		$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)
+
 		if ($hidden) {
 			return ''; // This is a protection. If field is hidden, we should just not call this method.
 		}
diff --git a/htdocs/cron/class/cronjob.class.php b/htdocs/cron/class/cronjob.class.php
index 9bc8400188f..033e6512bd8 100644
--- a/htdocs/cron/class/cronjob.class.php
+++ b/htdocs/cron/class/cronjob.class.php
@@ -108,62 +108,62 @@ class Cronjob extends CommonObject
 	public $datelastresult = '';
 
 	/**
-	 * @var string Last result from end job execution
+	 * @var string 			Last result from end job execution
 	 */
 	public $lastresult;
 
 	/**
-	 * @var string Last output from end job execution
+	 * @var string 			Last output from end job execution
 	 */
 	public $lastoutput;
 
 	/**
-	 * @var string Unit frequency of job execution
+	 * @var string 			Unit frequency of job execution
 	 */
 	public $unitfrequency;
 
 	/**
-	 * @var int Frequency of job execution
+	 * @var int 			Frequency of job execution
 	 */
 	public $frequency;
 
 	/**
-	 * @var int Status
+	 * @var int 			Status
 	 */
 	public $status;
 
 	/**
-	 * @var int Is job processing
+	 * @var int 			Is job running ?
 	 */
 	public $processing;
 
 	/**
-	 * @var int The job current PID
+	 * @var int 			The job current PID
 	 */
 	public $pid;
 
 	/**
-	 * @var int ID
+	 * @var int 			User ID of creation
 	 */
 	public $fk_user_author;
 
 	/**
-	 * @var int ID
+	 * @var int 			User ID of last modification
 	 */
 	public $fk_user_mod;
 
 	/**
-	 * @var int Number of run job execution
+	 * @var int 			Number of run job execution
 	 */
 	public $nbrun;
 
 	/**
-	 * @var int Maximum run job execution
+	 * @var int 			Maximum run job execution
 	 */
 	public $maxrun;
 
 	/**
-	 * @var string Libname
+	 * @var string 			Libname
 	 */
 	public $libname;
 
@@ -1513,10 +1513,12 @@ class Cronjobline
 	public $datenextrun = '';
 	public $dateend = '';
 	public $datestart = '';
+	public $datelastresult = '';
 	public $lastresult = '';
 	public $lastoutput;
 	public $unitfrequency;
 	public $frequency;
+	public $processing;
 
 	/**
 	 * @var int Status
@@ -1534,8 +1536,10 @@ class Cronjobline
 	public $fk_user_mod;
 
 	public $note;
+	public $note_private;
 	public $nbrun;
 	public $libname;
+	public $test;
 
 	/**
 	 *  Constructor
diff --git a/htdocs/fichinter/class/fichinter.class.php b/htdocs/fichinter/class/fichinter.class.php
index 61c127cab9b..dbc14231b41 100644
--- a/htdocs/fichinter/class/fichinter.class.php
+++ b/htdocs/fichinter/class/fichinter.class.php
@@ -36,36 +36,36 @@ 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'=>'$conf->societe->enabled', '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'=>'$conf->project->enabled', '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),
-	'fk_statut' =>array('type'=>'smallint(6)', 'label'=>'Fk statut', 'enabled'=>1, 'visible'=>-1, 'position'=>500),
-	'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'=>'text', 'label'=>'Description', 'enabled'=>1, 'visible'=>-1, 'position'=>105, 'showoncombobox'=>2),
-	'note_private' =>array('type'=>'text', 'label'=>'NotePrivate', 'enabled'=>1, 'visible'=>0, 'position'=>110),
-	'note_public' =>array('type'=>'text', 'label'=>'NotePublic', 'enabled'=>1, 'visible'=>0, 'position'=>115),
-	'model_pdf' =>array('type'=>'varchar(255)', 'label'=>'Model pdf', 'enabled'=>1, 'visible'=>0, 'position'=>120),
-	'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),
+		'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'=>'$conf->societe->enabled', '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'=>'$conf->project->enabled', '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),
+		'fk_statut' =>array('type'=>'smallint(6)', 'label'=>'Fk statut', 'enabled'=>1, 'visible'=>-1, 'position'=>500),
+		'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'=>'text', 'label'=>'Description', 'enabled'=>1, 'visible'=>-1, 'position'=>105, 'showoncombobox'=>2),
+		'note_private' =>array('type'=>'text', 'label'=>'NotePrivate', 'enabled'=>1, 'visible'=>0, 'position'=>110),
+		'note_public' =>array('type'=>'text', 'label'=>'NotePublic', 'enabled'=>1, 'visible'=>0, 'position'=>115),
+		'model_pdf' =>array('type'=>'varchar(255)', 'label'=>'Model pdf', 'enabled'=>1, 'visible'=>0, 'position'=>120),
+		'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),
 	);
+
 	/**
 	 * @var string ID to identify managed object
 	 */
@@ -1267,7 +1267,8 @@ class Fichinter extends CommonObject
 
 			$line->fk_fichinter = $fichinterid;
 			$line->desc         = $desc;
-			$line->datei        = $date_intervention;
+			$line->date         = $date_intervention;
+			$line->datei        = $date_intervention;	// For backward compatibility
 			$line->duration     = $duration;
 
 			if (is_array($array_options) && count($array_options) > 0) {
@@ -1316,7 +1317,8 @@ class Fichinter extends CommonObject
 		while ($xnbp < $nbp) {
 			$line = new FichinterLigne($this->db);
 			$line->desc = $langs->trans("Description")." ".$xnbp;
-			$line->datei = ($now - 3600 * (1 + $xnbp));
+			$line->date = ($now - 3600 * (1 + $xnbp));
+			$line->datei = ($now - 3600 * (1 + $xnbp));	// For backward compatibility
 			$line->duration = 600;
 			$line->fk_fichinter = 0;
 			$this->lines[$xnbp] = $line;
@@ -1359,7 +1361,7 @@ class Fichinter extends CommonObject
 				//For invoicing we calculing hours
 				$line->qty = round($objp->duree / 3600, 2);
 				$line->date	= $this->db->jdate($objp->date);
-				$line->datei = $this->db->jdate($objp->date);
+				$line->datei = $this->db->jdate($objp->date);	// For backward compatibility
 				$line->rang	= $objp->rang;
 				$line->product_type = 1;
 				$line->fetch_optionals();
@@ -1486,6 +1488,8 @@ class FichinterLigne extends CommonObjectLine
 
 	public $duration; 	// Duration of intervention
 	public $rang = 0;
+	public $tva_tx;
+	public $subprice;
 
 	/**
 	 * @var string ID to identify managed object
@@ -1522,8 +1526,7 @@ class FichinterLigne extends CommonObjectLine
 	 */
 	public function fetch($rowid)
 	{
-		$sql = 'SELECT ft.rowid, ft.fk_fichinter, ft.description, ft.duree, ft.rang,';
-		$sql .= ' ft.date as datei';
+		$sql = 'SELECT ft.rowid, ft.fk_fichinter, ft.description, ft.duree, ft.rang, ft.date';
 		$sql .= ' FROM '.MAIN_DB_PREFIX.'fichinterdet as ft';
 		$sql .= ' WHERE ft.rowid = '.((int) $rowid);
 
@@ -1534,7 +1537,8 @@ class FichinterLigne extends CommonObjectLine
 			$this->rowid          	= $objp->rowid;
 			$this->id = $objp->rowid;
 			$this->fk_fichinter   	= $objp->fk_fichinter;
-			$this->datei = $this->db->jdate($objp->datei);
+			$this->date = $this->db->jdate($objp->date);
+			$this->datei = $this->db->jdate($objp->date);	// For backward compatibility
 			$this->desc           	= $objp->description;
 			$this->duration       	= $objp->duree;
 			$this->rang           	= $objp->rang;
@@ -1562,6 +1566,10 @@ class FichinterLigne extends CommonObjectLine
 
 		dol_syslog("FichinterLigne::insert rang=".$this->rang);
 
+		if (empty($this->date) && !empty($this->datei)) {	// For backward compatibility
+			$this->date = $this->datei;
+		}
+
 		$this->db->begin();
 
 		$rangToUse = $this->rang;
@@ -1585,7 +1593,7 @@ class FichinterLigne extends CommonObjectLine
 		$sql .= ' (fk_fichinter, description, date, duree, rang)';
 		$sql .= " VALUES (".((int) $this->fk_fichinter).",";
 		$sql .= " '".$this->db->escape($this->desc)."',";
-		$sql .= " '".$this->db->idate($this->datei)."',";
+		$sql .= " '".$this->db->idate($this->date)."',";
 		$sql .= " ".((int) $this->duration).",";
 		$sql .= ' '.((int) $rangToUse);
 		$sql .= ')';
@@ -1647,14 +1655,18 @@ class FichinterLigne extends CommonObjectLine
 
 		$error = 0;
 
+		if (empty($this->date) && !empty($this->datei)) {	// For backward compatibility
+			$this->date = $this->datei;
+		}
+
 		$this->db->begin();
 
 		// Mise a jour ligne en base
 		$sql = "UPDATE ".MAIN_DB_PREFIX."fichinterdet SET";
-		$sql .= " description='".$this->db->escape($this->desc)."'";
-		$sql .= ",date='".$this->db->idate($this->datei)."'";
-		$sql .= ",duree=".$this->duration;
-		$sql .= ",rang='".$this->db->escape($this->rang)."'";
+		$sql .= " description = '".$this->db->escape($this->desc)."',";
+		$sql .= " date = '".$this->db->idate($this->date)."',";
+		$sql .= " duree = ".((int) $this->duration).",";
+		$sql .= " rang = ".((int) $this->rang);
 		$sql .= " WHERE rowid = ".((int) $this->id);
 
 		dol_syslog("FichinterLigne::update", LOG_DEBUG);
diff --git a/htdocs/fichinter/class/fichinterrec.class.php b/htdocs/fichinter/class/fichinterrec.class.php
index b128bba60f8..bcf89704e55 100644
--- a/htdocs/fichinter/class/fichinterrec.class.php
+++ b/htdocs/fichinter/class/fichinterrec.class.php
@@ -64,7 +64,6 @@ class FichinterRec extends Fichinter
 	public $number;
 	public $date;
 	public $amount;
-	public $remise;
 	public $tva;
 	public $total;
 
@@ -222,7 +221,7 @@ class FichinterRec extends Fichinter
 					$result_insert = $this->addline(
 						$fichintsrc->lines[$i]->desc,
 						$fichintsrc->lines[$i]->duration,
-						$fichintsrc->lines[$i]->datei,
+						$fichintsrc->lines[$i]->date,
 						$fichintsrc->lines[$i]->rang,
 						$fichintsrc->lines[$i]->subprice,
 						$fichintsrc->lines[$i]->qty,
@@ -350,8 +349,8 @@ class FichinterRec extends Fichinter
 		// phpcs:enable
 		$this->lines = array();
 
-		$sql = 'SELECT l.rowid, l.fk_product, l.product_type as product_type, l.label as custom_label, l.description, ';
-		$sql .= ' l.price, l.qty, l.tva_tx, l.remise_percent, l.subprice, l.duree, ';
+		$sql = 'SELECT l.rowid, l.fk_product, l.product_type as product_type, l.label as custom_label, l.description,';
+		$sql .= ' l.price, l.qty, l.tva_tx, l.remise_percent, l.subprice, l.duree, l.date,';
 		$sql .= ' l.total_ht, l.total_tva, l.total_ttc,';
 		$sql .= ' l.rang, l.special_code,';
 		$sql .= ' l.fk_unit, p.ref as product_ref, p.fk_product_type as fk_product_type,';
@@ -381,19 +380,16 @@ class FichinterRec extends Fichinter
 				$line->qty = $objp->qty;
 				$line->duree = $objp->duree;
 				$line->duration = $objp->duree;
-				$line->datei = $objp->date;
+				$line->date = $objp->date;
 				$line->subprice = $objp->subprice;
 				$line->tva_tx = $objp->tva_tx;
 				$line->remise_percent = $objp->remise_percent;
 				$line->fk_remise_except = $objp->fk_remise_except;
 				$line->fk_product = $objp->fk_product;
-				$line->date_start = $objp->date_start;
-				$line->date_end = $objp->date_end;
 				$line->info_bits = $objp->info_bits;
 				$line->total_ht = $objp->total_ht;
 				$line->total_tva = $objp->total_tva;
 				$line->total_ttc = $objp->total_ttc;
-				$line->code_ventilation = $objp->fk_code_ventilation;
 				$line->rang = $objp->rang;
 				$line->special_code = $objp->special_code;
 				$line->fk_unit = $objp->fk_unit;
@@ -460,7 +456,7 @@ class FichinterRec extends Fichinter
 	 *
 	 *  @param		string		$desc               Description de la ligne
 	 *  @param		integer		$duration           Durée
-	 *  @param		string	    $datei				Date
+	 *  @param		string	    $date				Date
 	 *  @param	    int			$rang			    Position of line
 	 *  @param		double		$pu_ht			    Unit price without tax (> 0 even for credit note)
 	 *  @param		double		$qty			 	Quantity
@@ -477,7 +473,7 @@ class FichinterRec extends Fichinter
 	 *  @param		string		$fk_unit			Unit
 	 *  @return		int			 				    <0 if KO, Id of line if OK
 	 */
-	public function addline($desc, $duration, $datei, $rang = -1, $pu_ht = 0, $qty = 0, $txtva = 0, $fk_product = 0, $remise_percent = 0, $price_base_type = 'HT', $info_bits = 0, $fk_remise_except = '', $pu_ttc = 0, $type = 0, $special_code = 0, $label = '', $fk_unit = null)
+	public function addline($desc, $duration, $date, $rang = -1, $pu_ht = 0, $qty = 0, $txtva = 0, $fk_product = 0, $remise_percent = 0, $price_base_type = 'HT', $info_bits = 0, $fk_remise_except = '', $pu_ttc = 0, $type = 0, $special_code = 0, $label = '', $fk_unit = null)
 	{
 		global $mysoc;
 
@@ -520,6 +516,8 @@ class FichinterRec extends Fichinter
 			$total_tva = $tabprice[1];
 			$total_ttc = $tabprice[2];
 
+			$pu_ht = $tabprice[3];
+
 			$product_type = $type;
 			if ($fk_product) {
 				$product = new Product($this->db);
@@ -539,8 +537,7 @@ class FichinterRec extends Fichinter
 			$sql .= ", fk_product";
 			$sql .= ", product_type";
 			$sql .= ", remise_percent";
-			//$sql.= ", subprice";
-			$sql .= ", remise";
+			$sql .= ", subprice";
 			$sql .= ", total_ht";
 			$sql .= ", total_tva";
 			$sql .= ", total_ttc";
@@ -551,7 +548,7 @@ class FichinterRec extends Fichinter
 			$sql .= (int) $this->id;
 			$sql .= ", ".(!empty($label) ? "'".$this->db->escape($label)."'" : "null");
 			$sql .= ", ".(!empty($desc) ? "'".$this->db->escape($desc)."'" : "null");
-			$sql .= ", ".(!empty($datei) ? "'".$this->db->idate($datei)."'" : "null");
+			$sql .= ", ".(!empty($date) ? "'".$this->db->idate($date)."'" : "null");
 			$sql .= ", ".$duration;
 			//$sql.= ", ".price2num($pu_ht);
 			//$sql.= ", ".(!empty($qty)? $qty :(!empty($duration)? $duration :"null"));
@@ -559,8 +556,7 @@ class FichinterRec extends Fichinter
 			$sql .= ", ".(!empty($fk_product) ? $fk_product : "null");
 			$sql .= ", ".$product_type;
 			$sql .= ", ".(!empty($remise_percent) ? $remise_percent : "null");
-			//$sql.= ", '".price2num($pu_ht)."'";
-			$sql .= ", null";
+			$sql.= ", '".price2num($pu_ht)."'";
 			$sql .= ", '".price2num($total_ht)."'";
 			$sql .= ", '".price2num($total_tva)."'";
 			$sql .= ", '".price2num($total_ttc)."'";
diff --git a/htdocs/install/mysql/migration/16.0.0-17.0.0.sql b/htdocs/install/mysql/migration/16.0.0-17.0.0.sql
index 5db36ee955b..c84a80aa72f 100644
--- a/htdocs/install/mysql/migration/16.0.0-17.0.0.sql
+++ b/htdocs/install/mysql/migration/16.0.0-17.0.0.sql
@@ -61,6 +61,9 @@ ALTER TABLE llx_user DROP COLUMN idpers3;
 ALTER TABLE llx_partnership ADD COLUMN ip varchar(250);
 ALTER TABLE llx_adherent ADD COLUMN ip varchar(250);
 
+ALTER TABLE llx_fichinterdet_rec DROP COLUMN remise;
+ALTER TABLE llx_fichinterdet_rec DROP COLUMN fk_export_commpta;
+
 UPDATE llx_const set name = 'ADHERENT_MAILMAN_ADMIN_PASSWORD' WHERE name = 'ADHERENT_MAILMAN_ADMINPW';
 
 ALTER TABLE llx_oauth_token ADD COLUMN state text after tokenstring;
diff --git a/htdocs/install/mysql/tables/llx_fichinterdet_rec.sql b/htdocs/install/mysql/tables/llx_fichinterdet_rec.sql
index ef799ea379a..bdef744df49 100644
--- a/htdocs/install/mysql/tables/llx_fichinterdet_rec.sql
+++ b/htdocs/install/mysql/tables/llx_fichinterdet_rec.sql
@@ -41,7 +41,6 @@ create table llx_fichinterdet_rec
 	localtax2_type		VARCHAR(1) NULL DEFAULT NULL,
 	qty					double NULL DEFAULT NULL,
 	remise_percent		double NULL DEFAULT 0,
-	remise				double NULL DEFAULT 0,
 	fk_remise_except	integer NULL DEFAULT NULL,
 	price				DOUBLE(24, 8) NULL DEFAULT NULL,
 	total_tva			DOUBLE(24, 8) NULL DEFAULT NULL,
@@ -55,7 +54,6 @@ create table llx_fichinterdet_rec
 	buy_price_ht		DOUBLE(24, 8) NULL DEFAULT 0,
 	fk_product_fournisseur_price	integer NULL DEFAULT NULL,
 	fk_code_ventilation	integer NOT NULL DEFAULT 0,
-	fk_export_commpta	integer NOT NULL DEFAULT 0,
 	special_code		integer UNSIGNED NULL DEFAULT 0,
 	fk_unit				integer NULL DEFAULT NULL,	
 	import_key			varchar(14) NULL DEFAULT NULL
diff --git a/htdocs/website/index.php b/htdocs/website/index.php
index 0b599ba640b..f8c6a94c09c 100644
--- a/htdocs/website/index.php
+++ b/htdocs/website/index.php
@@ -751,7 +751,6 @@ if ($action == 'addcontainer' && $usercanedit) {
 				$objectpage->content = preg_replace('/^.*<body(\s[^>]*)*>/ims', '', $objectpage->content);
 				$objectpage->content = preg_replace('/<\/body(\s[^>]*)*>.*$/ims', '', $objectpage->content);
 
-				$absoluteurlinaction = $urltograbdirwithoutslash;
 				// TODO Replace 'action="$urltograbdirwithoutslash' into action="/"
 				// TODO Replace 'action="$urltograbdirwithoutslash..."' into   action="..."
 				// TODO Replace 'a href="$urltograbdirwithoutslash' into a href="/"
@@ -908,7 +907,7 @@ if ($action == 'addcontainer' && $usercanedit) {
 
 						getAllImages($object, $objectpage, $urltograbbis, $tmpgeturl['content'], $action, 1, $grabimages, $grabimagesinto);
 
-						// We try to convert the CSS we got by adding a prefix .bodywebsite with lessc to avoid conflicit with CSS of Dolibarr.
+						// We try to convert the CSS we got by adding a prefix .bodywebsite with lessc to avoid conflict with CSS of Dolibarr.
 						include_once DOL_DOCUMENT_ROOT.'/core/class/lessc.class.php';
 						$lesscobj = new Lessc();
 						try {

From 2d794473a5aefac46d8f2fd03344a75b9e7b5a35 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 2 Sep 2022 09:45:40 +0200
Subject: [PATCH 606/974] Clean code

---
 htdocs/core/modules/modWebhook.class.php  | 2 +-
 htdocs/webhook/class/target.class.php     | 5 +----
 htdocs/webhook/lib/webhook.lib.php        | 4 +---
 htdocs/webhook/lib/webhook_target.lib.php | 4 +---
 htdocs/webhook/target_agenda.php          | 2 +-
 htdocs/webhook/target_card.php            | 2 +-
 htdocs/webhook/target_contact.php         | 2 +-
 htdocs/webhook/target_list.php            | 2 +-
 htdocs/webhook/target_note.php            | 2 +-
 htdocs/webhook/webhookindex.php           | 4 ----
 10 files changed, 9 insertions(+), 20 deletions(-)

diff --git a/htdocs/core/modules/modWebhook.class.php b/htdocs/core/modules/modWebhook.class.php
index fbcb5f81003..fd7f658bd48 100644
--- a/htdocs/core/modules/modWebhook.class.php
+++ b/htdocs/core/modules/modWebhook.class.php
@@ -141,7 +141,7 @@ class modWebhook extends DolibarrModules
 		$this->conflictwith = array(); // List of module class names as string this module is in conflict with. Example: array('modModuleToDisable1', ...)
 
 		// The language file dedicated to your module
-		$this->langfiles = array("webhook");
+		$this->langfiles = array();
 
 		// Prerequisites
 		$this->phpmin = array(5, 6); // Minimum version of PHP required by module
diff --git a/htdocs/webhook/class/target.class.php b/htdocs/webhook/class/target.class.php
index 7eabbe397ab..991201a8d91 100644
--- a/htdocs/webhook/class/target.class.php
+++ b/htdocs/webhook/class/target.class.php
@@ -833,7 +833,7 @@ class Target extends CommonObject
 		// phpcs:enable
 		if (empty($this->labelStatus) || empty($this->labelStatusShort)) {
 			global $langs;
-			//$langs->load("webhook@webhook");
+
 			$this->labelStatus[self::STATUS_DRAFT] = $langs->transnoentitiesnoconv('Draft');
 			$this->labelStatus[self::STATUS_VALIDATED] = $langs->transnoentitiesnoconv('Enabled');
 			$this->labelStatus[self::STATUS_CANCELED] = $langs->transnoentitiesnoconv('Disabled');
@@ -928,7 +928,6 @@ class Target extends CommonObject
 	public function getNextNumRef()
 	{
 		global $langs, $conf;
-		$langs->load("webhook@webhook");
 
 		if (empty($conf->global->WEBHOOK_TARGET_ADDON)) {
 			$conf->global->WEBHOOK_TARGET_ADDON = 'mod_target_standard';
@@ -993,8 +992,6 @@ class Target extends CommonObject
 		$result = 0;
 		$includedocgeneration = 0;
 
-		$langs->load("webhook@webhook");
-
 		if (!dol_strlen($modele)) {
 			$modele = 'standard_target';
 
diff --git a/htdocs/webhook/lib/webhook.lib.php b/htdocs/webhook/lib/webhook.lib.php
index 6c511180b6e..6c48eccfdf8 100644
--- a/htdocs/webhook/lib/webhook.lib.php
+++ b/htdocs/webhook/lib/webhook.lib.php
@@ -1,5 +1,5 @@
 <?php
-/* Copyright (C) 2022 SuperAdmin <test@dolibarr.com>
+/* Copyright (C) 2017 Laurent Destailleur  <eldy@users.sourceforge.net>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -30,8 +30,6 @@ function webhookAdminPrepareHead()
 {
 	global $langs, $conf;
 
-	$langs->load("webhook@webhook");
-
 	$h = 0;
 	$head = array();
 	$head[$h][0] = dol_buildpath("/admin/webhook.php", 1);
diff --git a/htdocs/webhook/lib/webhook_target.lib.php b/htdocs/webhook/lib/webhook_target.lib.php
index fb01a8f95aa..894e3134c0c 100644
--- a/htdocs/webhook/lib/webhook_target.lib.php
+++ b/htdocs/webhook/lib/webhook_target.lib.php
@@ -1,5 +1,5 @@
 <?php
-/* Copyright (C) ---Put here your own copyright and developer email---
+/* Copyright (C) 2022 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
@@ -30,8 +30,6 @@ function targetPrepareHead($object)
 {
 	global $db, $langs, $conf;
 
-	$langs->load("webhook@webhook");
-
 	$h = 0;
 	$head = array();
 
diff --git a/htdocs/webhook/target_agenda.php b/htdocs/webhook/target_agenda.php
index fd3464d3b67..bf4e883411b 100644
--- a/htdocs/webhook/target_agenda.php
+++ b/htdocs/webhook/target_agenda.php
@@ -32,7 +32,7 @@ dol_include_once('/webhook/lib/webhook_target.lib.php');
 
 
 // Load translation files required by the page
-$langs->loadLangs(array('webhook', 'other'));
+$langs->loadLangs(array('other'));
 
 // Get parameters
 $id = GETPOST('id', 'int');
diff --git a/htdocs/webhook/target_card.php b/htdocs/webhook/target_card.php
index 7e4ef4bb265..0b9ff450d44 100644
--- a/htdocs/webhook/target_card.php
+++ b/htdocs/webhook/target_card.php
@@ -31,7 +31,7 @@ dol_include_once('/webhook/class/target.class.php');
 dol_include_once('/webhook/lib/webhook_target.lib.php');
 
 // Load translation files required by the page
-$langs->loadLangs(array('webhook', 'other'));
+$langs->loadLangs(array('other'));
 
 // Get parameters
 $id = GETPOST('id', 'int');
diff --git a/htdocs/webhook/target_contact.php b/htdocs/webhook/target_contact.php
index 9aa51b2c44e..460cc7d8ea7 100644
--- a/htdocs/webhook/target_contact.php
+++ b/htdocs/webhook/target_contact.php
@@ -30,7 +30,7 @@ dol_include_once('/webhook/class/target.class.php');
 dol_include_once('/webhook/lib/webhook_target.lib.php');
 
 // Load translation files required by the page
-$langs->loadLangs(array('webhook', 'companies', 'other', 'mails'));
+$langs->loadLangs(array('companies', 'other', 'mails'));
 
 $id     = (GETPOST('id') ?GETPOST('id', 'int') : GETPOST('facid', 'int')); // For backward compatibility
 $ref    = GETPOST('ref', 'alpha');
diff --git a/htdocs/webhook/target_list.php b/htdocs/webhook/target_list.php
index d80661906c0..2a4f2edfcf1 100644
--- a/htdocs/webhook/target_list.php
+++ b/htdocs/webhook/target_list.php
@@ -36,7 +36,7 @@ require_once __DIR__.'/class/target.class.php';
 //dol_include_once('/othermodule/class/otherobject.class.php');
 
 // Load translation files required by the page
-$langs->loadLangs(array('webhook', 'other'));
+$langs->loadLangs(array('other'));
 
 // Get Parameters
 $id          = GETPOST('id', 'int');
diff --git a/htdocs/webhook/target_note.php b/htdocs/webhook/target_note.php
index c9fe74c8758..4b9be8aaea1 100644
--- a/htdocs/webhook/target_note.php
+++ b/htdocs/webhook/target_note.php
@@ -29,7 +29,7 @@ dol_include_once('/webhook/class/target.class.php');
 dol_include_once('/webhook/lib/webhook_target.lib.php');
 
 // Load translation files required by the page
-$langs->loadLangs(array('webhook', 'companies'));
+$langs->loadLangs(array('companies'));
 
 // Get parameters
 $id         = GETPOST('id', 'int');
diff --git a/htdocs/webhook/webhookindex.php b/htdocs/webhook/webhookindex.php
index 50a7ec6d9c1..77c717b628d 100644
--- a/htdocs/webhook/webhookindex.php
+++ b/htdocs/webhook/webhookindex.php
@@ -57,10 +57,6 @@ if (!$res) {
 
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
 
-// Load translation files required by the page
-$langs->loadLangs(array('webhook'));
-
-
 
 // Security check
 // if (! $user->rights->webhook->myobject->read) {

From 89da4e5bc3127151724fc82eac5dd66046cfd58d Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 2 Sep 2022 10:01:16 +0200
Subject: [PATCH 607/974] Update index.php

---
 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 b76be278a44..2deef52946a 100644
--- a/htdocs/product/index.php
+++ b/htdocs/product/index.php
@@ -417,7 +417,7 @@ if ((isModEnabled("product") || isModEnabled("service")) && ($user->rights->prod
 // TODO Move this into a page that should be available into menu "accountancy - report - turnover - per quarter"
 // Also method used for counting must provide the 2 possible methods like done by all other reports into menu "accountancy - report - turnover":
 // "commitment engagment" method and "cash accounting" method
-if ( isModEnabled("invoice") && $user->hasRight('facture', 'lire') && getDolGlobalString('MAIN_SHOW_PRODUCT_ACTIVITY_TRIM')) {
+if (isModEnabled("invoice") && $user->hasRight('facture', 'lire') && getDolGlobalString('MAIN_SHOW_PRODUCT_ACTIVITY_TRIM')) {
 	if (isModEnabled("product")) {
 		activitytrim(0);
 	}

From a380315056cb0e9372224811a7baa203c2e1fec7 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 2 Sep 2022 10:05:25 +0200
Subject: [PATCH 608/974] Clean code

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

diff --git a/htdocs/societe/paymentmodes.php b/htdocs/societe/paymentmodes.php
index 7d082440661..535c2978877 100644
--- a/htdocs/societe/paymentmodes.php
+++ b/htdocs/societe/paymentmodes.php
@@ -517,7 +517,7 @@ if (empty($reshook)) {
 			}
 		}
 		if ($action == 'syncsepatostripe') {
-			$companybankaccount->fetch(GETPOST('bankid'));
+			$companybankaccount->fetch(GETPOST('bankid', 'int'));
 			// print "stripe account = " . json_encode($stripe->getStripeAccount($service));
 			// print json_encode($companybankaccount);
 			// print "fetch id = " . json_encode($socid);
@@ -545,7 +545,7 @@ if (empty($reshook)) {
 						$error++;
 						setEventMessages($stripe->error, $stripe->errors, 'errors');
 					} else {
-						setEventMessages("", array("SEPA on Stripe", "SEPA IBAN is now linked to customer account !"));
+						setEventMessages("", array("SEPA on Stripe", "SEPA IBAN is now linked to the Stripe customer account !"));
 					}
 				}
 			}

From 16e1c7ea713bbb8bef343b5c784b3722ebc473eb Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Fri, 2 Sep 2022 10:25:12 +0200
Subject: [PATCH 609/974] Update result.php

Fixed Stickler
---
 htdocs/compta/resultat/result.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/compta/resultat/result.php b/htdocs/compta/resultat/result.php
index 93fc7d57203..378e594c9db 100644
--- a/htdocs/compta/resultat/result.php
+++ b/htdocs/compta/resultat/result.php
@@ -327,7 +327,7 @@ if ($modecompta == 'CREANCES-DETTES') {
 				$vars = array();
 
 				// Unactive categories have a total of 0 to be used in the formula.
-				foreach($unactive_cats as $un_cat) {
+				foreach ($unactive_cats as $un_cat) {
 					$vars[$un_cat['code']] = 0;
 				}
 

From e450d464aa0eef77e41b865c77fb058dc9750144 Mon Sep 17 00:00:00 2001
From: UT from dolibit <45215329+dolibit-ut@users.noreply.github.com>
Date: Fri, 2 Sep 2022 10:26:30 +0200
Subject: [PATCH 610/974] Update bom_agenda.php

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

diff --git a/htdocs/bom/bom_agenda.php b/htdocs/bom/bom_agenda.php
index d2c64eea0b6..2e4424bde47 100644
--- a/htdocs/bom/bom_agenda.php
+++ b/htdocs/bom/bom_agenda.php
@@ -17,9 +17,9 @@
  */
 
 /**
- *  \file       htdocs/modulebuilder/template/myobject_agenda.php
- *  \ingroup    bom
- *  \brief      Page of MyObject events
+ *    \file       htdocs/bom/bom_agenda.php
+ *    \ingroup    bom
+ *    \brief      Page of BOM events
  */
 
 // Load Dolibarr environment

From c28407a1c9b0a45de91f34cf3f27ae5c0da591a3 Mon Sep 17 00:00:00 2001
From: Gauthier PC portable 024 <gauthier.verdol@atm-consulting.fr>
Date: Fri, 2 Sep 2022 10:28:19 +0200
Subject: [PATCH 611/974] FIX : default value for bom_id with $this->id and
 protection against infinite loop

---
 htdocs/bom/bom_card.php        |  2 +-
 htdocs/bom/class/bom.class.php | 12 ++++++++++--
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/htdocs/bom/bom_card.php b/htdocs/bom/bom_card.php
index 669eb70d069..573478a6b3d 100644
--- a/htdocs/bom/bom_card.php
+++ b/htdocs/bom/bom_card.php
@@ -182,7 +182,7 @@ if (empty($reshook)) {
 
 		// We check if we're allowed to add this bom
 		$TParentBom=array();
-		$object->getParentBomTreeRecursive($TParentBom, $object->id);
+		$object->getParentBomTreeRecursive($TParentBom);
 		if ($bom_child_id > 0 && !empty($TParentBom) && in_array($bom_child_id, $TParentBom)) {
 			$n_child = new BOM($db);
 			$n_child->fetch($bom_child_id);
diff --git a/htdocs/bom/class/bom.class.php b/htdocs/bom/class/bom.class.php
index 6cd1d1d42d8..374d4af248b 100644
--- a/htdocs/bom/class/bom.class.php
+++ b/htdocs/bom/class/bom.class.php
@@ -1153,11 +1153,19 @@ class BOM extends CommonObject
 	 *
 	 * @param 	array	$TParentBom		We put all found parent bom in $TParentBom
 	 * @param 	int		$bom_id			ID of bom from which we want to get parent bom ids
+	 * @param 	int		$level		Protection against infinite loop
 	 * @return 	void
 	 */
-	public function getParentBomTreeRecursive(&$TParentBom, $bom_id)
+	public function getParentBomTreeRecursive(&$TParentBom, $bom_id='', $level=1)
 	{
 
+		// Protection against infinite loop
+		if ($level > 1000) {
+			return 0;
+		}
+
+		if(empty($bom_id)) $bom_id=$this->id;
+
 		$sql = 'SELECT l.fk_bom, b.label
 				FROM '.MAIN_DB_PREFIX.'bom_bomline l
 				INNER JOIN '.MAIN_DB_PREFIX.$this->table_element.' b ON b.rowid = l.fk_bom
@@ -1167,7 +1175,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);
+				$this->getParentBomTreeRecursive($TParentBom, $res->fk_bom, $level+1);
 			}
 		}
 	}

From db7bb77d03ff51565856aec6dac8f5de99598726 Mon Sep 17 00:00:00 2001
From: UT from dolibit <45215329+dolibit-ut@users.noreply.github.com>
Date: Fri, 2 Sep 2022 10:31:56 +0200
Subject: [PATCH 612/974] Update bom_card.php

---
 htdocs/bom/bom_card.php | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/htdocs/bom/bom_card.php b/htdocs/bom/bom_card.php
index 25b7a8730dd..2801b8e3d66 100644
--- a/htdocs/bom/bom_card.php
+++ b/htdocs/bom/bom_card.php
@@ -17,9 +17,9 @@
  */
 
 /**
- *   	\file       htdocs/bom/bom_card.php
- *		\ingroup    bom
- *		\brief      Page to create/edit/view bom
+ *    \file       htdocs/bom/bom_card.php
+ *    \ingroup    bom
+ *    \brief      Page to create/edit/view BOM
  */
 
 // Load Dolibarr environment
@@ -32,7 +32,7 @@ require_once DOL_DOCUMENT_ROOT.'/mrp/lib/mrp.lib.php';
 
 
 // Load translation files required by the page
-$langs->loadLangs(array("mrp", "other"));
+$langs->loadLangs(array('mrp', 'other'));
 
 // Get parameters
 $id = GETPOST('id', 'int');
@@ -335,7 +335,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 		}
 
 		$text = $langs->trans('ConfirmValidateBom', $numref);
-		/*if (!empty($conf->notification->enabled))
+		/*if (! empty($conf->notification->enabled))
 		{
 			require_once DOL_DOCUMENT_ROOT . '/core/class/notify.class.php';
 			$notify = new Notify($db);
@@ -363,7 +363,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 	// Confirmation of closing
 	if ($action == 'close') {
 		$text = $langs->trans('ConfirmCloseBom', $object->ref);
-		/*if (!empty($conf->notification->enabled))
+		/*if (! empty($conf->notification->enabled))
 		{
 			require_once DOL_DOCUMENT_ROOT . '/core/class/notify.class.php';
 			$notify = new Notify($db);
@@ -391,7 +391,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 	// Confirmation of reopen
 	if ($action == 'reopen') {
 		$text = $langs->trans('ConfirmReopenBom', $object->ref);
-		/*if (!empty($conf->notification->enabled))
+		/*if (! empty($conf->notification->enabled))
 		 {
 		 require_once DOL_DOCUMENT_ROOT . '/core/class/notify.class.php';
 		 $notify = new Notify($db);
@@ -457,7 +457,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 	// Thirdparty
 	$morehtmlref.='<br>'.$langs->trans('ThirdParty') . ' : ' . $soc->getNomUrl(1);
 	// Project
-	if (!empty($conf->project->enabled))
+	if (! empty($conf->project->enabled))
 	{
 		$langs->load("projects");
 		$morehtmlref.='<br>'.$langs->trans('Project') . ' ';
@@ -477,7 +477,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 				$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
 			}
 		} else {
-			if (!empty($object->fk_project)) {
+			if (! empty($object->fk_project)) {
 				$proj = new Project($db);
 				$proj->fetch($object->fk_project);
 				$morehtmlref.=$proj->getNomUrl();

From 21517cf5789de767087a02c5ca99861e3f889aa3 Mon Sep 17 00:00:00 2001
From: stickler-ci <support@stickler-ci.com>
Date: Fri, 2 Sep 2022 08:33:27 +0000
Subject: [PATCH 613/974] Fixing style errors.

---
 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 374d4af248b..5fa2957e663 100644
--- a/htdocs/bom/class/bom.class.php
+++ b/htdocs/bom/class/bom.class.php
@@ -1156,7 +1156,7 @@ class BOM extends CommonObject
 	 * @param 	int		$level		Protection against infinite loop
 	 * @return 	void
 	 */
-	public function getParentBomTreeRecursive(&$TParentBom, $bom_id='', $level=1)
+	public function getParentBomTreeRecursive(&$TParentBom, $bom_id = '', $level = 1)
 	{
 
 		// Protection against infinite loop
@@ -1164,7 +1164,7 @@ class BOM extends CommonObject
 			return 0;
 		}
 
-		if(empty($bom_id)) $bom_id=$this->id;
+		if (empty($bom_id)) $bom_id=$this->id;
 
 		$sql = 'SELECT l.fk_bom, b.label
 				FROM '.MAIN_DB_PREFIX.'bom_bomline l

From c9a2dea3d8b15ff84ef26c780d7ea186a359ddb1 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 2 Sep 2022 10:34:25 +0200
Subject: [PATCH 614/974] Merge branch 'develop' of
 git@github.com:Dolibarr/dolibarr.git into develop


From 831420b8e1bf7ab5445adf76837511110788c364 Mon Sep 17 00:00:00 2001
From: Florian HENRY <florian.henry@open-concept.pro>
Date: Fri, 2 Sep 2022 10:42:27 +0200
Subject: [PATCH 615/974] FIX: bad bookmark save

---
 htdocs/bookmarks/bookmarks.lib.php | 45 +++++++++++++++++++-----------
 1 file changed, 28 insertions(+), 17 deletions(-)

diff --git a/htdocs/bookmarks/bookmarks.lib.php b/htdocs/bookmarks/bookmarks.lib.php
index f8daff1cd14..ca0f1486db1 100644
--- a/htdocs/bookmarks/bookmarks.lib.php
+++ b/htdocs/bookmarks/bookmarks.lib.php
@@ -36,28 +36,39 @@ function printDropdownBookmarksList()
 
 	$langs->load("bookmarks");
 
+	$authorized_var=array('page','limit','optioncss','contextpage');
 	$url = $_SERVER["PHP_SELF"];
-
+	$url_param=array();
 	if (!empty($_SERVER["QUERY_STRING"])) {
-		$url .= (dol_escape_htmltag($_SERVER["QUERY_STRING"]) ? '?'.dol_escape_htmltag($_SERVER["QUERY_STRING"]) : '');
-	} else {
-		global $sortfield, $sortorder;
-		$tmpurl = '';
-		// No urlencode, all param $url will be urlencoded later
-		if ($sortfield) {
-			$tmpurl .= ($tmpurl ? '&' : '').'sortfield='.urlencode($sortfield);
-		}
-		if ($sortorder) {
-			$tmpurl .= ($tmpurl ? '&' : '').'sortorder='.urlencode($sortorder);
-		}
-		if (is_array($_POST)) {
-			foreach ($_POST as $key => $val) {
-				if (preg_match('/^search_/', $key) && $val != '') {
-					$tmpurl .= ($tmpurl ? '&' : '').http_build_query(array($key => $val));
+		if (is_array($_GET)) {
+			foreach ($_GET as $key => $val) {
+				if ($val != '') {
+					$url_param[$key]=http_build_query(array($key => $val));
 				}
 			}
 		}
-		$url .= ($tmpurl ? '?'.$tmpurl : '');
+	}
+	global $sortfield, $sortorder;
+	$tmpurl = '';
+	// No urlencode, all param $url will be urlencoded later
+	if ($sortfield) {
+		$tmpurl .= ($tmpurl ? '&' : '').'sortfield='.urlencode($sortfield);
+	}
+	if ($sortorder) {
+		$tmpurl .= ($tmpurl ? '&' : '').'sortorder='.urlencode($sortorder);
+	}
+	if (is_array($_POST)) {
+		foreach ($_POST as $key => $val) {
+			if ((preg_match('/^search_/', $key) || in_array($key, $authorized_var))
+				&& $val != ''
+				&& !array_key_exists($key, $url_param)) {
+				$url_param[$key]=http_build_query(array($key => $val));
+			}
+		}
+	}
+	$url .= ($tmpurl ? '?'.$tmpurl : '');
+	if (!empty($url_param)) {
+		$url .= '&'.implode('&', $url_param);
 	}
 
 	$searchForm = '<!-- form with POST method by default, will be replaced with GET for external link by js -->'."\n";

From 8a44b1ab2bfd964e2e2e6b00558b4bc394d0ee05 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 2 Sep 2022 10:55:15 +0200
Subject: [PATCH 616/974] Update bookmarks.lib.php

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

diff --git a/htdocs/bookmarks/bookmarks.lib.php b/htdocs/bookmarks/bookmarks.lib.php
index ca0f1486db1..72fc0a9b51e 100644
--- a/htdocs/bookmarks/bookmarks.lib.php
+++ b/htdocs/bookmarks/bookmarks.lib.php
@@ -36,7 +36,7 @@ function printDropdownBookmarksList()
 
 	$langs->load("bookmarks");
 
-	$authorized_var=array('page','limit','optioncss','contextpage');
+	$authorized_var=array('limit','optioncss','contextpage');
 	$url = $_SERVER["PHP_SELF"];
 	$url_param=array();
 	if (!empty($_SERVER["QUERY_STRING"])) {

From 9d85eb1b7f828e682de7fe100ba7135d53a32500 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 2 Sep 2022 10:57:47 +0200
Subject: [PATCH 617/974] Update bookmarks.lib.php

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

diff --git a/htdocs/bookmarks/bookmarks.lib.php b/htdocs/bookmarks/bookmarks.lib.php
index 72fc0a9b51e..8eef3396eaa 100644
--- a/htdocs/bookmarks/bookmarks.lib.php
+++ b/htdocs/bookmarks/bookmarks.lib.php
@@ -43,7 +43,7 @@ function printDropdownBookmarksList()
 		if (is_array($_GET)) {
 			foreach ($_GET as $key => $val) {
 				if ($val != '') {
-					$url_param[$key]=http_build_query(array($key => $val));
+					$url_param[$key]=http_build_query(array(dol_escape_htmltag($key) => dol_escape_htmltag($val)));
 				}
 			}
 		}
@@ -62,7 +62,7 @@ function printDropdownBookmarksList()
 			if ((preg_match('/^search_/', $key) || in_array($key, $authorized_var))
 				&& $val != ''
 				&& !array_key_exists($key, $url_param)) {
-				$url_param[$key]=http_build_query(array($key => $val));
+				$url_param[$key]=http_build_query(array(dol_escape_htmltag($key) => dol_escape_htmltag($val)));
 			}
 		}
 	}

From cf8df1196583af3f86dc714ae99c6843fbb8a678 Mon Sep 17 00:00:00 2001
From: UT from dolibit <45215329+dolibit-ut@users.noreply.github.com>
Date: Fri, 2 Sep 2022 11:01:05 +0200
Subject: [PATCH 618/974] Update new.php

add GenderOther
---
 htdocs/public/members/new.php | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/htdocs/public/members/new.php b/htdocs/public/members/new.php
index ccc229e33bf..d33d469b975 100644
--- a/htdocs/public/members/new.php
+++ b/htdocs/public/members/new.php
@@ -7,6 +7,7 @@
  * Copyright (C) 2018-2019  Frédéric France         <frederic.france@netlogic.fr>
  * Copyright (C) 2018       Alexandre Spangaro      <aspangaro@open-dsi.fr>
  * Copyright (C) 2021       Waël Almoman            <info@almoman.com>
+ * Copyright (C) 2022       Udo Tamm                <dev@dolibit.de>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -586,11 +587,11 @@ if (!empty($conf->global->MEMBER_SKIP_TABLE) || !empty($conf->global->MEMBER_NEW
 		print '<tr><td>'.$langs->trans("PasswordRetype").' <span style="color: red">*</span></td><td><input type="password" maxlength="128" name="pass2" class="minwidth100" value="'.dol_escape_htmltag(GETPOST("pass2", "none", 2)).'"></td></tr>'."\n";
 	}
 
-	// Gender  // TODO:  add diverse gender
+	// Gender
 	print '<tr><td>'.$langs->trans("Gender").'</td>';
 	print '<td>';
-	$arraygender = array('man'=>$langs->trans("Genderman"), 'woman'=>$langs->trans("Genderwoman"));
-	print $form->selectarray('gender', $arraygender, GETPOST('gender') ?GETPOST('gender') : $object->gender, 1);
+	$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>';
 
 	// Address

From d17f0c57e212083563ba81d99791e9a99dbf578f Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 2 Sep 2022 11:27:16 +0200
Subject: [PATCH 619/974] NEW Link "add to bookmark" always on top in the
 bookmark popup

---
 htdocs/bookmarks/bookmarks.lib.php | 33 +++++++++++++++++-------------
 htdocs/langs/en_US/bookmarks.lang  |  1 +
 htdocs/theme/eldy/dropdown.inc.php |  2 +-
 htdocs/theme/md/dropdown.inc.php   |  2 +-
 4 files changed, 22 insertions(+), 16 deletions(-)

diff --git a/htdocs/bookmarks/bookmarks.lib.php b/htdocs/bookmarks/bookmarks.lib.php
index e5781d98561..448a5f085f1 100644
--- a/htdocs/bookmarks/bookmarks.lib.php
+++ b/htdocs/bookmarks/bookmarks.lib.php
@@ -64,11 +64,6 @@ function printDropdownBookmarksList()
 	$searchForm .= '<form id="top-menu-action-bookmark" name="actionbookmark" method="POST" action=""'.(empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER) ? ' onsubmit="return false"' : '').'>';
 	$searchForm .= '<input type="hidden" name="token" value="'.newToken().'">';
 
-
-	// Url to list bookmark
-	$listbtn = '<a class="top-menu-dropdown-link" title="'.dol_escape_htmltag($langs->trans('Bookmarks')).'" href="'.DOL_URL_ROOT.'/bookmarks/list.php">';
-	$listbtn .= img_picto('', 'bookmark', 'class="paddingright"').$langs->trans('Bookmarks').'</a>';
-
 	// Url to go on create new bookmark page
 	$newbtn = '';
 	if (!empty($user->rights->bookmark->creer)) {
@@ -80,6 +75,10 @@ function printDropdownBookmarksList()
 		}
 	}
 
+	// Url to list/edit bookmark
+	$listbtn = '<a class="top-menu-dropdown-link" title="'.dol_escape_htmltag($langs->trans('Bookmarks')).'" href="'.DOL_URL_ROOT.'/bookmarks/list.php">';
+	$listbtn .= img_picto('', 'edit', 'class="paddingright opacitymedium"').$langs->trans('EditBookmarks').'</a>';
+
 	// Menu with list of bookmarks
 	$sql = "SELECT rowid, title, url, target FROM ".MAIN_DB_PREFIX."bookmark";
 	$sql .= " WHERE (fk_user = ".((int) $user->id)." OR fk_user is NULL OR fk_user = 0)";
@@ -171,27 +170,28 @@ function printDropdownBookmarksList()
 			';
 
 		$html .= '
-			<!-- Menu Body -->
-			<div class="bookmark-body dropdown-body">
-			'.$bookmarkList.'
-			</div>
-			';
-
-		$html .= '
-			<!-- Menu Footer-->
+			<!-- Menu bookmark tools-->
 			<div class="bookmark-footer">
 					'.$newbtn.$listbtn.'
 				<div style="clear:both;"></div>
 			</div>
 		';
 
+		$html .= '
+			<!-- Menu Body -->
+			<div class="bookmark-body dropdown-body">
+			'.$bookmarkList.'
+			<span id="top-bookmark-search-nothing-found" class="hidden-search-result opacitymedium">'.dol_escape_htmltag($langs->trans("NoBookmarkFound")).'</span>
+			</div>
+			';
+
 		$html .= '<!-- script to open/close the popup -->
 				<script>
 				$( document ).on("keyup", "#top-bookmark-search-input", function () {
+					console.log("keyup in bookmark search input");
 
 					var filter = $(this).val(), count = 0;
 					$("#dropdown-bookmarks-list .bookmark-item").each(function () {
-
 						if ($(this).text().search(new RegExp(filter, "i")) < 0) {
 							$(this).addClass("hidden-search-result");
 						} else {
@@ -200,6 +200,11 @@ function printDropdownBookmarksList()
 						}
 					});
 					$("#top-bookmark-search-filter-count").text(count);
+					if (count == 0) {
+						jQuery("#top-bookmark-search-nothing-found").removeClass("hidden-search-result");
+					} else {
+						jQuery("#top-bookmark-search-nothing-found").addClass("hidden-search-result");
+					}
 				});
 				</script>';
 	}
diff --git a/htdocs/langs/en_US/bookmarks.lang b/htdocs/langs/en_US/bookmarks.lang
index be0f2f7e25d..26551eee4f0 100644
--- a/htdocs/langs/en_US/bookmarks.lang
+++ b/htdocs/langs/en_US/bookmarks.lang
@@ -20,3 +20,4 @@ ChooseIfANewWindowMustBeOpenedOnClickOnBookmark=Choose if the linked page should
 BookmarksManagement=Bookmarks management
 BookmarksMenuShortCut=Ctrl + shift + m
 NoBookmarks=No bookmarks defined
+NoBookmarkFound=No bookmark found
\ No newline at end of file
diff --git a/htdocs/theme/eldy/dropdown.inc.php b/htdocs/theme/eldy/dropdown.inc.php
index 0ca47fbd2bb..bfde88726e9 100644
--- a/htdocs/theme/eldy/dropdown.inc.php
+++ b/htdocs/theme/eldy/dropdown.inc.php
@@ -257,7 +257,7 @@ a.top-menu-dropdown-link {
 .dropdown-menu > .user-body, .dropdown-body {
 	padding: 15px;
 	border-bottom: 1px solid #f4f4f4;
-	border-top: 1px solid #dddddd;
+	border-top: 1px solid #f0f0f0;
 	white-space: normal;
 }
 
diff --git a/htdocs/theme/md/dropdown.inc.php b/htdocs/theme/md/dropdown.inc.php
index 1f60f0b7c2a..64bebc67f79 100644
--- a/htdocs/theme/md/dropdown.inc.php
+++ b/htdocs/theme/md/dropdown.inc.php
@@ -260,7 +260,7 @@ a.top-menu-dropdown-link {
 .dropdown-menu > .user-body, .dropdown-body{
 	padding: 15px;
 	border-bottom: 1px solid #f4f4f4;
-	border-top: 1px solid #dddddd;
+	border-top: 1px solid #f0f0f0;
 	white-space: normal;
 }
 

From a28eb9296fdcb8d245df9e72d26ef18f2680b174 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 2 Sep 2022 11:51:28 +0200
Subject: [PATCH 620/974] Update userbankaccount.class.php

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

diff --git a/htdocs/user/class/userbankaccount.class.php b/htdocs/user/class/userbankaccount.class.php
index d18f5feae16..271609139b1 100644
--- a/htdocs/user/class/userbankaccount.class.php
+++ b/htdocs/user/class/userbankaccount.class.php
@@ -174,8 +174,8 @@ class UserBankAccount extends Account
 		$sql .= ', c.code as country_code, c.label as country';
 		$sql .= ', d.code_departement as state_code, d.nom as state';
 		$sql .= " FROM ".$this->db->prefix()."user_rib as ur";
-		$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_country as c ON ur.fk_country=c.rowid';
-		$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_departements as d ON ur.state_id=d.rowid';
+		$sql .= ' LEFT JOIN '.$this->db->prefix().'c_country as c ON ur.fk_country=c.rowid';
+		$sql .= ' LEFT JOIN '.$this->db->prefix().'c_departements as d ON ur.state_id=d.rowid';
 
 		if ($id) {
 			$sql .= " WHERE ur.rowid = ".((int) $id);

From 360bfed601f018bf9234aafc9f6d44e3cd282479 Mon Sep 17 00:00:00 2001
From: Gauthier PC portable 024 <gauthier.verdol@atm-consulting.fr>
Date: Fri, 2 Sep 2022 11:57:29 +0200
Subject: [PATCH 621/974] FIX : return void

---
 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 374d4af248b..5ddbf05eca4 100644
--- a/htdocs/bom/class/bom.class.php
+++ b/htdocs/bom/class/bom.class.php
@@ -1161,7 +1161,7 @@ class BOM extends CommonObject
 
 		// Protection against infinite loop
 		if ($level > 1000) {
-			return 0;
+			return;
 		}
 
 		if(empty($bom_id)) $bom_id=$this->id;

From 4b2eb7ed248bac961e0b9b4c4b8ef18bc7ea9755 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 2 Sep 2022 12:34:34 +0200
Subject: [PATCH 622/974] css

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

diff --git a/htdocs/adherents/list.php b/htdocs/adherents/list.php
index 8bf7f7af6a6..8362d311b0a 100644
--- a/htdocs/adherents/list.php
+++ b/htdocs/adherents/list.php
@@ -1094,9 +1094,9 @@ while ($i < min($num, $limit)) {
 	}
 	// Country
 	if (!empty($arrayfields['country.code_iso']['checked'])) {
-		print '<td class="center">';
 		$tmparray = getCountry($obj->country, 'all');
-		print $tmparray['label'];
+		print '<td class="center tdoverflowmax100" title="'.dol_escape_htmltag($tmparray['label']).'">';
+		print dol_escape_htmltag($tmparray['label']);
 		print '</td>';
 		if (!$i) {
 			$totalarray['nbfield']++;

From 84633177dae3d49ccfc6abe800280ab1b68bbad2 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 2 Sep 2022 14:44:55 +0200
Subject: [PATCH 623/974] Trans

---
 htdocs/admin/events.php       | 2 +-
 htdocs/langs/en_US/admin.lang | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/htdocs/admin/events.php b/htdocs/admin/events.php
index b98f3775aad..ceb3c286ac3 100644
--- a/htdocs/admin/events.php
+++ b/htdocs/admin/events.php
@@ -111,7 +111,7 @@ print '<br>';
 
 print '<table class="noborder" width="100%">';
 print "<tr class=\"liste_titre\">";
-print getTitleFieldOfList("LogEvents", 0, $_SERVER["PHP_SELF"], '', '', '', '', $sortfield, $sortorder, '')."\n";
+print getTitleFieldOfList("TrackableSecurityEvents", 0, $_SERVER["PHP_SELF"], '', '', '', '', $sortfield, $sortorder, '')."\n";
 print getTitleFieldOfList($selectedfields, 0, $_SERVER["PHP_SELF"], '', '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ')."\n";
 print "</tr>\n";
 // Loop on each event type
diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index ced1f23ed39..6fe10207247 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -1238,6 +1238,7 @@ BrowserName=Browser name
 BrowserOS=Browser OS
 ListOfSecurityEvents=List of Dolibarr security events
 SecurityEventsPurged=Security events purged
+TrackableSecurityEvents=Trackable security events
 LogEventDesc=Enable logging for specific security events. Administrators the log via menu <b>%s - %s</b>. Warning, this feature can generate a large amount of data in the database.
 AreaForAdminOnly=Setup parameters can be set by <b>administrator users</b> only.
 SystemInfoDesc=System information is miscellaneous technical information you get in read only mode and visible for administrators only.

From 38352d0c28a9505aa5de6edd255171a29a9f45dc Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Fri, 2 Sep 2022 16:22:54 +0200
Subject: [PATCH 624/974] NEW Manage VAT on all lines on purchases cycle

---
 htdocs/core/tpl/objectline_title.tpl.php              |  2 +-
 htdocs/fourn/commande/card.php                        | 11 ++++++++++-
 htdocs/fourn/facture/card.php                         |  9 +++++++++
 htdocs/supplier_proposal/card.php                     | 11 ++++++++++-
 .../class/supplier_proposal.class.php                 |  1 +
 5 files changed, 31 insertions(+), 3 deletions(-)

diff --git a/htdocs/core/tpl/objectline_title.tpl.php b/htdocs/core/tpl/objectline_title.tpl.php
index 762e9b4eefa..6bb64075bd5 100644
--- a/htdocs/core/tpl/objectline_title.tpl.php
+++ b/htdocs/core/tpl/objectline_title.tpl.php
@@ -68,7 +68,7 @@ if (!empty($conf->global->FACTURE_LOCAL_TAX1_OPTION) || !empty($conf->global->FA
 	print $langs->trans('VAT');
 }
 
-if (in_array($object->element, array('propal', 'commande', 'facture')) && $object->status == $object::STATUS_DRAFT) {
+if (in_array($object->element, array('propal', 'commande', 'facture', 'supplier_proposal', 'order_supplier', 'invoice_supplier')) && $object->status == $object::STATUS_DRAFT) {
 	global $mysoc;
 
 	if (empty($disableedit)) {
diff --git a/htdocs/fourn/commande/card.php b/htdocs/fourn/commande/card.php
index 67ec98e3c96..b4c72197608 100644
--- a/htdocs/fourn/commande/card.php
+++ b/htdocs/fourn/commande/card.php
@@ -405,7 +405,16 @@ if (empty($reshook)) {
 	}
 
 	// Add a product line
-	if ($action == 'addline' && $usercancreate) {
+	if ($action == 'addline' && GETPOST('submitforalllines', 'aZ09') && GETPOST('vatforalllines', 'alpha')) {
+		// Define vat_rate
+		$vat_rate = (GETPOST('vatforalllines') ? GETPOST('vatforalllines') : 0);
+		$vat_rate = str_replace('*', '', $vat_rate);
+		$localtax1_rate = get_localtax($vat_rate, 1, $object->thirdparty, $mysoc);
+		$localtax2_rate = get_localtax($vat_rate, 2, $object->thirdparty, $mysoc);
+		foreach($object->lines as $line) {
+			$result = $object->updateline($line->id, $line->desc, $line->subprice, $line->qty, $line->remise_percent, $vat_rate, $localtax1_rate, $localtax2_rate, 'HT', $line->info_bits, $line->product_type, 0, $line->date_start, $line->date_end, $line->array_options, $line->fk_unit, $line->multicurrency_subprice);
+		}
+	} elseif ($action == 'addline' && $usercancreate) {
 		$db->begin();
 
 		$langs->load('errors');
diff --git a/htdocs/fourn/facture/card.php b/htdocs/fourn/facture/card.php
index ddf54ba0727..adcdb892d5c 100644
--- a/htdocs/fourn/facture/card.php
+++ b/htdocs/fourn/facture/card.php
@@ -1383,6 +1383,15 @@ if (empty($reshook)) {
 			$db->rollback();
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
+	} elseif ($action == 'addline' && GETPOST('submitforalllines', 'aZ09') && GETPOST('vatforalllines', 'alpha')) {
+		// Define vat_rate
+		$vat_rate = (GETPOST('vatforalllines') ? GETPOST('vatforalllines') : 0);
+		$vat_rate = str_replace('*', '', $vat_rate);
+		$localtax1_rate = get_localtax($vat_rate, 1, $object->thirdparty, $mysoc);
+		$localtax2_rate = get_localtax($vat_rate, 2, $object->thirdparty, $mysoc);
+		foreach($object->lines as $line) {
+			$result = $object->updateline($line->id, $line->desc, $line->subprice, $vat_rate, $localtax1_rate, $localtax2_rate, $line->qty, $line->fk_product, 'HT', $line->info_bits, $line->product_type, $line->remise_percent, 0, $line->date_start, $line->date_end, $line->array_options, $line->fk_unit, $line->multicurrency_subprice, $line->ref_supplier, $line->rang);
+		}
 	} elseif ($action == 'addline' && $usercancreate) {
 		// Add a product line
 		$db->begin();
diff --git a/htdocs/supplier_proposal/card.php b/htdocs/supplier_proposal/card.php
index e4c2efd2c72..7be61673260 100644
--- a/htdocs/supplier_proposal/card.php
+++ b/htdocs/supplier_proposal/card.php
@@ -546,7 +546,16 @@ if (empty($reshook)) {
 	}
 
 	// Add a product line
-	if ($action == 'addline' && $usercancreate) {
+	if ($action == 'addline' && GETPOST('submitforalllines', 'aZ09') && GETPOST('vatforalllines', 'alpha')) {
+		// Define vat_rate
+		$vat_rate = (GETPOST('vatforalllines') ? GETPOST('vatforalllines') : 0);
+		$vat_rate = str_replace('*', '', $vat_rate);
+		$localtax1_rate = get_localtax($vat_rate, 1, $object->thirdparty, $mysoc);
+		$localtax2_rate = get_localtax($vat_rate, 2, $object->thirdparty, $mysoc);
+		foreach($object->lines as $line) {
+			$result = $object->updateline($line->id, $line->subprice, $line->qty, $line->remise_percent, $vat_rate, $localtax1_rate, $localtax2_rate, $line->desc, 'HT', $line->info_bits, $line->special_code, $line->fk_parent_line, 0, $line->fk_fournprice, $line->pa_ht, $line->label, $line->product_type, $line->array_options, $line->fk_unit, $line->multicurrency_subprice);
+		}
+	} elseif ($action == 'addline' && $usercancreate) {
 		$langs->load('errors');
 		$error = 0;
 
diff --git a/htdocs/supplier_proposal/class/supplier_proposal.class.php b/htdocs/supplier_proposal/class/supplier_proposal.class.php
index 24b45c992eb..7e8c1d1c1b3 100644
--- a/htdocs/supplier_proposal/class/supplier_proposal.class.php
+++ b/htdocs/supplier_proposal/class/supplier_proposal.class.php
@@ -1257,6 +1257,7 @@ class SupplierProposal extends CommonObject
 				$this->note_private         = $obj->note_private;
 				$this->note_public          = $obj->note_public;
 				$this->statut               = (int) $obj->fk_statut;
+				$this->status               = (int) $obj->fk_statut;
 				$this->statut_libelle       = $obj->statut_label;
 				$this->datec                = $this->db->jdate($obj->datec); // TODO deprecated
 				$this->datev                = $this->db->jdate($obj->datev); // TODO deprecated

From 3883e66004eace7b024a6cb92364ff24938a2338 Mon Sep 17 00:00:00 2001
From: stickler-ci <support@stickler-ci.com>
Date: Fri, 2 Sep 2022 14:25:03 +0000
Subject: [PATCH 625/974] Fixing style errors.

---
 htdocs/fourn/commande/card.php    | 2 +-
 htdocs/fourn/facture/card.php     | 2 +-
 htdocs/supplier_proposal/card.php | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/htdocs/fourn/commande/card.php b/htdocs/fourn/commande/card.php
index b4c72197608..f93373a64fa 100644
--- a/htdocs/fourn/commande/card.php
+++ b/htdocs/fourn/commande/card.php
@@ -411,7 +411,7 @@ if (empty($reshook)) {
 		$vat_rate = str_replace('*', '', $vat_rate);
 		$localtax1_rate = get_localtax($vat_rate, 1, $object->thirdparty, $mysoc);
 		$localtax2_rate = get_localtax($vat_rate, 2, $object->thirdparty, $mysoc);
-		foreach($object->lines as $line) {
+		foreach ($object->lines as $line) {
 			$result = $object->updateline($line->id, $line->desc, $line->subprice, $line->qty, $line->remise_percent, $vat_rate, $localtax1_rate, $localtax2_rate, 'HT', $line->info_bits, $line->product_type, 0, $line->date_start, $line->date_end, $line->array_options, $line->fk_unit, $line->multicurrency_subprice);
 		}
 	} elseif ($action == 'addline' && $usercancreate) {
diff --git a/htdocs/fourn/facture/card.php b/htdocs/fourn/facture/card.php
index adcdb892d5c..65ae4e81150 100644
--- a/htdocs/fourn/facture/card.php
+++ b/htdocs/fourn/facture/card.php
@@ -1389,7 +1389,7 @@ if (empty($reshook)) {
 		$vat_rate = str_replace('*', '', $vat_rate);
 		$localtax1_rate = get_localtax($vat_rate, 1, $object->thirdparty, $mysoc);
 		$localtax2_rate = get_localtax($vat_rate, 2, $object->thirdparty, $mysoc);
-		foreach($object->lines as $line) {
+		foreach ($object->lines as $line) {
 			$result = $object->updateline($line->id, $line->desc, $line->subprice, $vat_rate, $localtax1_rate, $localtax2_rate, $line->qty, $line->fk_product, 'HT', $line->info_bits, $line->product_type, $line->remise_percent, 0, $line->date_start, $line->date_end, $line->array_options, $line->fk_unit, $line->multicurrency_subprice, $line->ref_supplier, $line->rang);
 		}
 	} elseif ($action == 'addline' && $usercancreate) {
diff --git a/htdocs/supplier_proposal/card.php b/htdocs/supplier_proposal/card.php
index 7be61673260..9719928ab75 100644
--- a/htdocs/supplier_proposal/card.php
+++ b/htdocs/supplier_proposal/card.php
@@ -552,7 +552,7 @@ if (empty($reshook)) {
 		$vat_rate = str_replace('*', '', $vat_rate);
 		$localtax1_rate = get_localtax($vat_rate, 1, $object->thirdparty, $mysoc);
 		$localtax2_rate = get_localtax($vat_rate, 2, $object->thirdparty, $mysoc);
-		foreach($object->lines as $line) {
+		foreach ($object->lines as $line) {
 			$result = $object->updateline($line->id, $line->subprice, $line->qty, $line->remise_percent, $vat_rate, $localtax1_rate, $localtax2_rate, $line->desc, 'HT', $line->info_bits, $line->special_code, $line->fk_parent_line, 0, $line->fk_fournprice, $line->pa_ht, $line->label, $line->product_type, $line->array_options, $line->fk_unit, $line->multicurrency_subprice);
 		}
 	} elseif ($action == 'addline' && $usercancreate) {

From f52680a7e0d20ad6f528e6f84ad46f604ca78a0b Mon Sep 17 00:00:00 2001
From: Nicolas MANAUD <contact@eurya.net>
Date: Fri, 2 Sep 2022 16:29:02 +0200
Subject: [PATCH 626/974] Force date of movement in MouvementStock propagated
 to subproducts (When using the class MouvementStock, it's possible to force a
 date of movement by specifying a date (parameter). If this MouvementStock is
 affected to a product containing sub-product.s, this date of movement forced
 will also be applied to the MouvementStock of the related sub-products.)

---
 .../stock/class/mouvementstock.class.php      | 25 ++++++++++---------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/htdocs/product/stock/class/mouvementstock.class.php b/htdocs/product/stock/class/mouvementstock.class.php
index 5653a564b9e..c762868aadb 100644
--- a/htdocs/product/stock/class/mouvementstock.class.php
+++ b/htdocs/product/stock/class/mouvementstock.class.php
@@ -586,7 +586,7 @@ class MouvementStock extends CommonObject
 
 		// Add movement for sub products (recursive call)
 		if (!$error && !empty($conf->global->PRODUIT_SOUSPRODUITS) && empty($conf->global->INDEPENDANT_SUBPRODUCT_STOCK) && empty($disablestockchangeforsubproduct)) {
-			$error = $this->_createSubProduct($user, $fk_product, $entrepot_id, $qty, $type, 0, $label, $inventorycode); // we use 0 as price, because AWP must not change for subproduct
+			$error = $this->_createSubProduct($user, $fk_product, $entrepot_id, $qty, $type, 0, $label, $inventorycode, $datem); // we use 0 as price, because AWP must not change for subproduct
 		}
 
 		if ($movestock && !$error) {
@@ -705,17 +705,18 @@ class MouvementStock extends CommonObject
 	/**
 	 *  Create movement in database for all subproducts
 	 *
-	 * 	@param 		User	$user			Object user
-	 * 	@param		int		$idProduct		Id product
-	 * 	@param		int		$entrepot_id	Warehouse id
-	 * 	@param		int		$qty			Quantity
-	 * 	@param		int		$type			Type
-	 * 	@param		int		$price			Price
-	 * 	@param		string	$label			Label of movement
-	 *  @param		string	$inventorycode	Inventory code
-	 * 	@return 	int     				<0 if KO, 0 if OK
+	 * 	@param 		User			$user			Object user
+	 * 	@param		int				$idProduct		Id product
+	 * 	@param		int				$entrepot_id	Warehouse id
+	 * 	@param		int				$qty			Quantity
+	 * 	@param		int				$type			Type
+	 * 	@param		int				$price			Price
+	 * 	@param		string			$label			Label of movement
+	 *  @param		string			$inventorycode	Inventory code
+	 *  @param		integer|string	$datem			Force date of movement
+	 * 	@return 	int     		<0 if KO, 0 if OK
 	 */
-	private function _createSubProduct($user, $idProduct, $entrepot_id, $qty, $type, $price = 0, $label = '', $inventorycode = '')
+	private function _createSubProduct($user, $idProduct, $entrepot_id, $qty, $type, $price = 0, $label = '', $inventorycode = '', $datem = '')
 	{
 		global $langs;
 
@@ -747,7 +748,7 @@ class MouvementStock extends CommonObject
 			if (!$error) {
 				$tmpmove = dol_clone($this, 1);
 
-				$result = $tmpmove->_create($user, $pids[$key], $entrepot_id, ($qty * $pqtys[$key]), $type, 0, $label, $inventorycode); // This will also call _createSubProduct making this recursive
+				$result = $tmpmove->_create($user, $pids[$key], $entrepot_id, ($qty * $pqtys[$key]), $type, 0, $label, $inventorycode, $datem); // This will also call _createSubProduct making this recursive
 				if ($result < 0) {
 					$this->error = $tmpmove->error;
 					$this->errors = array_merge($this->errors, $tmpmove->errors);

From 5bc926815074ecae99e6dcf11ce9c7516f38a75c Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 2 Sep 2022 17:33:24 +0200
Subject: [PATCH 627/974] FIX activate/desactivate entry in dictionary

---
 htdocs/admin/dict.php | 44 +++++++++++++++++++++++++++++++------------
 1 file changed, 32 insertions(+), 12 deletions(-)

diff --git a/htdocs/admin/dict.php b/htdocs/admin/dict.php
index 3503421d7fe..98502c31a25 100644
--- a/htdocs/admin/dict.php
+++ b/htdocs/admin/dict.php
@@ -1028,10 +1028,13 @@ if (empty($reshook)) {
 			$rowidcol = "rowid";
 		}
 
+		$tablename = $tabname[$id];
+		$tablename = preg_replace('/^'.preg_quote(MAIN_DB_PREFIX, '/').'/', '', $tablename);
+
 		if ($rowid) {
-			$sql = "UPDATE ".MAIN_DB_PREFIX.$tabname[$id]." SET active = 1 WHERE ".$rowidcol." = '".$db->escape($rowid)."'".($entity != '' ? " AND entity = ".(int) $entity : '');
+			$sql = "UPDATE ".MAIN_DB_PREFIX.$tablename." SET active = 1 WHERE ".$rowidcol." = '".$db->escape($rowid)."'".($entity != '' ? " AND entity = ".(int) $entity : '');
 		} elseif ($code) {
-			$sql = "UPDATE ".MAIN_DB_PREFIX.$tabname[$id]." SET active = 1 WHERE code = '".$db->escape(dol_escape_htmltag($code))."'".($entity != '' ? " AND entity = ".(int) $entity : '');
+			$sql = "UPDATE ".MAIN_DB_PREFIX.$tablename." SET active = 1 WHERE code = '".$db->escape(dol_escape_htmltag($code))."'".($entity != '' ? " AND entity = ".(int) $entity : '');
 		}
 
 		$result = $db->query($sql);
@@ -1048,10 +1051,13 @@ if (empty($reshook)) {
 			$rowidcol = "rowid";
 		}
 
+		$tablename = $tabname[$id];
+		$tablename = preg_replace('/^'.preg_quote(MAIN_DB_PREFIX, '/').'/', '', $tablename);
+
 		if ($rowid) {
-			$sql = "UPDATE ".MAIN_DB_PREFIX.$tabname[$id]." SET active = 0 WHERE ".$rowidcol." = '".$db->escape($rowid)."'".($entity != '' ? " AND entity = ".(int) $entity : '');
+			$sql = "UPDATE ".MAIN_DB_PREFIX.$tablename." SET active = 0 WHERE ".$rowidcol." = '".$db->escape($rowid)."'".($entity != '' ? " AND entity = ".(int) $entity : '');
 		} elseif ($code) {
-			$sql = "UPDATE ".MAIN_DB_PREFIX.$tabname[$id]." SET active = 0 WHERE code = '".$db->escape(dol_escape_htmltag($code))."'".($entity != '' ? " AND entity = ".(int) $entity : '');
+			$sql = "UPDATE ".MAIN_DB_PREFIX.$tablename." SET active = 0 WHERE code = '".$db->escape(dol_escape_htmltag($code))."'".($entity != '' ? " AND entity = ".(int) $entity : '');
 		}
 
 		$result = $db->query($sql);
@@ -1068,10 +1074,13 @@ if (empty($reshook)) {
 			$rowidcol = "rowid";
 		}
 
+		$tablename = $tabname[$id];
+		$tablename = preg_replace('/^'.preg_quote(MAIN_DB_PREFIX, '/').'/', '', $tablename);
+
 		if ($rowid) {
-			$sql = "UPDATE ".MAIN_DB_PREFIX.$tabname[$id]." SET favorite = 1 WHERE ".$rowidcol." = '".$db->escape($rowid)."'".($entity != '' ? " AND entity = ".(int) $entity : '');
+			$sql = "UPDATE ".MAIN_DB_PREFIX.$tablename." SET favorite = 1 WHERE ".$rowidcol." = '".$db->escape($rowid)."'".($entity != '' ? " AND entity = ".(int) $entity : '');
 		} elseif ($code) {
-			$sql = "UPDATE ".MAIN_DB_PREFIX.$tabname[$id]." SET favorite = 1 WHERE code = '".$db->escape(dol_escape_htmltag($code))."'".($entity != '' ? " AND entity = ".(int) $entity : '');
+			$sql = "UPDATE ".MAIN_DB_PREFIX.$tablename." SET favorite = 1 WHERE code = '".$db->escape(dol_escape_htmltag($code))."'".($entity != '' ? " AND entity = ".(int) $entity : '');
 		}
 
 		$result = $db->query($sql);
@@ -1088,10 +1097,13 @@ if (empty($reshook)) {
 			$rowidcol = "rowid";
 		}
 
+		$tablename = $tabname[$id];
+		$tablename = preg_replace('/^'.preg_quote(MAIN_DB_PREFIX, '/').'/', '', $tablename);
+
 		if ($rowid) {
-			$sql = "UPDATE ".MAIN_DB_PREFIX.$tabname[$id]." SET favorite = 0 WHERE ".$rowidcol." = '".$db->escape($rowid)."'".($entity != '' ? " AND entity = ".(int) $entity : '');
+			$sql = "UPDATE ".MAIN_DB_PREFIX.$tablename." SET favorite = 0 WHERE ".$rowidcol." = '".$db->escape($rowid)."'".($entity != '' ? " AND entity = ".(int) $entity : '');
 		} elseif ($code) {
-			$sql = "UPDATE ".MAIN_DB_PREFIX.$tabname[$id]." SET favorite = 0 WHERE code = '".$db->escape(dol_escape_htmltag($code))."'".($entity != '' ? " AND entity = ".(int) $entity : '');
+			$sql = "UPDATE ".MAIN_DB_PREFIX.$tablename." SET favorite = 0 WHERE code = '".$db->escape(dol_escape_htmltag($code))."'".($entity != '' ? " AND entity = ".(int) $entity : '');
 		}
 
 		$result = $db->query($sql);
@@ -1108,10 +1120,13 @@ if (empty($reshook)) {
 			$rowidcol = "rowid";
 		}
 
+		$tablename = $tabname[$id];
+		$tablename = preg_replace('/^'.preg_quote(MAIN_DB_PREFIX, '/').'/', '', $tablename);
+
 		if ($rowid) {
-			$sql = "UPDATE ".MAIN_DB_PREFIX.$tabname[$id]." SET eec = 1 WHERE ".$rowidcol." = '".$db->escape($rowid)."'".($entity != '' ? " AND entity = ".(int) $entity : '');
+			$sql = "UPDATE ".MAIN_DB_PREFIX.$tablename." SET eec = 1 WHERE ".$rowidcol." = '".$db->escape($rowid)."'".($entity != '' ? " AND entity = ".(int) $entity : '');
 		} elseif ($code) {
-			$sql = "UPDATE ".MAIN_DB_PREFIX.$tabname[$id]." SET eec = 1 WHERE code = '".$db->escape(dol_escape_htmltag($code))."'".($entity != '' ? " AND entity = ".(int) $entity : '');
+			$sql = "UPDATE ".MAIN_DB_PREFIX.$tablename." SET eec = 1 WHERE code = '".$db->escape(dol_escape_htmltag($code))."'".($entity != '' ? " AND entity = ".(int) $entity : '');
 		}
 
 		$result = $db->query($sql);
@@ -1128,10 +1143,13 @@ if (empty($reshook)) {
 			$rowidcol = "rowid";
 		}
 
+		$tablename = $tabname[$id];
+		$tablename = preg_replace('/^'.preg_quote(MAIN_DB_PREFIX, '/').'/', '', $tablename);
+
 		if ($rowid) {
-			$sql = "UPDATE ".MAIN_DB_PREFIX.$tabname[$id]." SET eec = 0 WHERE ".$rowidcol." = '".$db->escape($rowid)."'".($entity != '' ? " AND entity = ".(int) $entity : '');
+			$sql = "UPDATE ".MAIN_DB_PREFIX.$tablename." SET eec = 0 WHERE ".$rowidcol." = '".$db->escape($rowid)."'".($entity != '' ? " AND entity = ".(int) $entity : '');
 		} elseif ($code) {
-			$sql = "UPDATE ".MAIN_DB_PREFIX.$tabname[$id]." SET eec = 0 WHERE code = '".$db->escape(dol_escape_htmltag($code))."'".($entity != '' ? " AND entity = ".(int) $entity : '');
+			$sql = "UPDATE ".MAIN_DB_PREFIX.$tablename." SET eec = 0 WHERE code = '".$db->escape(dol_escape_htmltag($code))."'".($entity != '' ? " AND entity = ".(int) $entity : '');
 		}
 
 		$result = $db->query($sql);
@@ -1140,6 +1158,8 @@ if (empty($reshook)) {
 		}
 	}
 }
+
+
 /*
  * View
  */

From e4dea1829e976f1d918d6cd6637f3c50931d0837 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 2 Sep 2022 17:33:24 +0200
Subject: [PATCH 628/974] FIX activate/desactivate entry in dictionary

---
 htdocs/admin/dict.php | 44 +++++++++++++++++++++++++++++++------------
 1 file changed, 32 insertions(+), 12 deletions(-)

diff --git a/htdocs/admin/dict.php b/htdocs/admin/dict.php
index 3cba1a333ca..3b1896e7ee7 100644
--- a/htdocs/admin/dict.php
+++ b/htdocs/admin/dict.php
@@ -1028,10 +1028,13 @@ if (empty($reshook)) {
 			$rowidcol = "rowid";
 		}
 
+		$tablename = $tabname[$id];
+		$tablename = preg_replace('/^'.preg_quote(MAIN_DB_PREFIX, '/').'/', '', $tablename);
+
 		if ($rowid) {
-			$sql = "UPDATE ".MAIN_DB_PREFIX.$tabname[$id]." SET active = 1 WHERE ".$rowidcol." = '".$db->escape($rowid)."'".($entity != '' ? " AND entity = ".(int) $entity : '');
+			$sql = "UPDATE ".MAIN_DB_PREFIX.$tablename." SET active = 1 WHERE ".$rowidcol." = '".$db->escape($rowid)."'".($entity != '' ? " AND entity = ".(int) $entity : '');
 		} elseif ($code) {
-			$sql = "UPDATE ".MAIN_DB_PREFIX.$tabname[$id]." SET active = 1 WHERE code = '".$db->escape(dol_escape_htmltag($code))."'".($entity != '' ? " AND entity = ".(int) $entity : '');
+			$sql = "UPDATE ".MAIN_DB_PREFIX.$tablename." SET active = 1 WHERE code = '".$db->escape(dol_escape_htmltag($code))."'".($entity != '' ? " AND entity = ".(int) $entity : '');
 		}
 
 		$result = $db->query($sql);
@@ -1048,10 +1051,13 @@ if (empty($reshook)) {
 			$rowidcol = "rowid";
 		}
 
+		$tablename = $tabname[$id];
+		$tablename = preg_replace('/^'.preg_quote(MAIN_DB_PREFIX, '/').'/', '', $tablename);
+
 		if ($rowid) {
-			$sql = "UPDATE ".MAIN_DB_PREFIX.$tabname[$id]." SET active = 0 WHERE ".$rowidcol." = '".$db->escape($rowid)."'".($entity != '' ? " AND entity = ".(int) $entity : '');
+			$sql = "UPDATE ".MAIN_DB_PREFIX.$tablename." SET active = 0 WHERE ".$rowidcol." = '".$db->escape($rowid)."'".($entity != '' ? " AND entity = ".(int) $entity : '');
 		} elseif ($code) {
-			$sql = "UPDATE ".MAIN_DB_PREFIX.$tabname[$id]." SET active = 0 WHERE code = '".$db->escape(dol_escape_htmltag($code))."'".($entity != '' ? " AND entity = ".(int) $entity : '');
+			$sql = "UPDATE ".MAIN_DB_PREFIX.$tablename." SET active = 0 WHERE code = '".$db->escape(dol_escape_htmltag($code))."'".($entity != '' ? " AND entity = ".(int) $entity : '');
 		}
 
 		$result = $db->query($sql);
@@ -1068,10 +1074,13 @@ if (empty($reshook)) {
 			$rowidcol = "rowid";
 		}
 
+		$tablename = $tabname[$id];
+		$tablename = preg_replace('/^'.preg_quote(MAIN_DB_PREFIX, '/').'/', '', $tablename);
+
 		if ($rowid) {
-			$sql = "UPDATE ".MAIN_DB_PREFIX.$tabname[$id]." SET favorite = 1 WHERE ".$rowidcol." = '".$db->escape($rowid)."'".($entity != '' ? " AND entity = ".(int) $entity : '');
+			$sql = "UPDATE ".MAIN_DB_PREFIX.$tablename." SET favorite = 1 WHERE ".$rowidcol." = '".$db->escape($rowid)."'".($entity != '' ? " AND entity = ".(int) $entity : '');
 		} elseif ($code) {
-			$sql = "UPDATE ".MAIN_DB_PREFIX.$tabname[$id]." SET favorite = 1 WHERE code = '".$db->escape(dol_escape_htmltag($code))."'".($entity != '' ? " AND entity = ".(int) $entity : '');
+			$sql = "UPDATE ".MAIN_DB_PREFIX.$tablename." SET favorite = 1 WHERE code = '".$db->escape(dol_escape_htmltag($code))."'".($entity != '' ? " AND entity = ".(int) $entity : '');
 		}
 
 		$result = $db->query($sql);
@@ -1088,10 +1097,13 @@ if (empty($reshook)) {
 			$rowidcol = "rowid";
 		}
 
+		$tablename = $tabname[$id];
+		$tablename = preg_replace('/^'.preg_quote(MAIN_DB_PREFIX, '/').'/', '', $tablename);
+
 		if ($rowid) {
-			$sql = "UPDATE ".MAIN_DB_PREFIX.$tabname[$id]." SET favorite = 0 WHERE ".$rowidcol." = '".$db->escape($rowid)."'".($entity != '' ? " AND entity = ".(int) $entity : '');
+			$sql = "UPDATE ".MAIN_DB_PREFIX.$tablename." SET favorite = 0 WHERE ".$rowidcol." = '".$db->escape($rowid)."'".($entity != '' ? " AND entity = ".(int) $entity : '');
 		} elseif ($code) {
-			$sql = "UPDATE ".MAIN_DB_PREFIX.$tabname[$id]." SET favorite = 0 WHERE code = '".$db->escape(dol_escape_htmltag($code))."'".($entity != '' ? " AND entity = ".(int) $entity : '');
+			$sql = "UPDATE ".MAIN_DB_PREFIX.$tablename." SET favorite = 0 WHERE code = '".$db->escape(dol_escape_htmltag($code))."'".($entity != '' ? " AND entity = ".(int) $entity : '');
 		}
 
 		$result = $db->query($sql);
@@ -1108,10 +1120,13 @@ if (empty($reshook)) {
 			$rowidcol = "rowid";
 		}
 
+		$tablename = $tabname[$id];
+		$tablename = preg_replace('/^'.preg_quote(MAIN_DB_PREFIX, '/').'/', '', $tablename);
+
 		if ($rowid) {
-			$sql = "UPDATE ".MAIN_DB_PREFIX.$tabname[$id]." SET eec = 1 WHERE ".$rowidcol." = '".$db->escape($rowid)."'".($entity != '' ? " AND entity = ".(int) $entity : '');
+			$sql = "UPDATE ".MAIN_DB_PREFIX.$tablename." SET eec = 1 WHERE ".$rowidcol." = '".$db->escape($rowid)."'".($entity != '' ? " AND entity = ".(int) $entity : '');
 		} elseif ($code) {
-			$sql = "UPDATE ".MAIN_DB_PREFIX.$tabname[$id]." SET eec = 1 WHERE code = '".$db->escape(dol_escape_htmltag($code))."'".($entity != '' ? " AND entity = ".(int) $entity : '');
+			$sql = "UPDATE ".MAIN_DB_PREFIX.$tablename." SET eec = 1 WHERE code = '".$db->escape(dol_escape_htmltag($code))."'".($entity != '' ? " AND entity = ".(int) $entity : '');
 		}
 
 		$result = $db->query($sql);
@@ -1128,10 +1143,13 @@ if (empty($reshook)) {
 			$rowidcol = "rowid";
 		}
 
+		$tablename = $tabname[$id];
+		$tablename = preg_replace('/^'.preg_quote(MAIN_DB_PREFIX, '/').'/', '', $tablename);
+
 		if ($rowid) {
-			$sql = "UPDATE ".MAIN_DB_PREFIX.$tabname[$id]." SET eec = 0 WHERE ".$rowidcol." = '".$db->escape($rowid)."'".($entity != '' ? " AND entity = ".(int) $entity : '');
+			$sql = "UPDATE ".MAIN_DB_PREFIX.$tablename." SET eec = 0 WHERE ".$rowidcol." = '".$db->escape($rowid)."'".($entity != '' ? " AND entity = ".(int) $entity : '');
 		} elseif ($code) {
-			$sql = "UPDATE ".MAIN_DB_PREFIX.$tabname[$id]." SET eec = 0 WHERE code = '".$db->escape(dol_escape_htmltag($code))."'".($entity != '' ? " AND entity = ".(int) $entity : '');
+			$sql = "UPDATE ".MAIN_DB_PREFIX.$tablename." SET eec = 0 WHERE code = '".$db->escape(dol_escape_htmltag($code))."'".($entity != '' ? " AND entity = ".(int) $entity : '');
 		}
 
 		$result = $db->query($sql);
@@ -1140,6 +1158,8 @@ if (empty($reshook)) {
 		}
 	}
 }
+
+
 /*
  * View
  */

From 0d9e595f0ef277e7e470f54839e8b1b20c3df477 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 2 Sep 2022 19:43:48 +0200
Subject: [PATCH 629/974] Fix profile to export categories

---
 htdocs/core/modules/modCategorie.class.php | 42 +++++++++++++---------
 htdocs/langs/en_US/categories.lang         |  1 +
 2 files changed, 26 insertions(+), 17 deletions(-)

diff --git a/htdocs/core/modules/modCategorie.class.php b/htdocs/core/modules/modCategorie.class.php
index c3b7f256b4b..905392aa996 100644
--- a/htdocs/core/modules/modCategorie.class.php
+++ b/htdocs/core/modules/modCategorie.class.php
@@ -164,8 +164,9 @@ class modCategorie extends DolibarrModules
 			$typeexample .= ($typeexample ? " / " : "")."11=Website page";
 		}
 
-		$this->export_fields_array[$r] = array('cat.rowid'=>"CategId", 'cat.label'=>"Label", 'cat.type'=>"Type", 'cat.description'=>"Description", 'cat.fk_parent'=>"ParentCategory", 'pcat.label'=>"ParentCategoryLabel");
-		$this->export_TypeFields_array[$r] = array('cat.label'=>"Text", 'cat.type'=>"Numeric", 'cat.description'=>"Text", 'cat.fk_parent'=>'List:categorie:label:rowid', 'pcat.label'=>'Text');
+		// 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");
+		$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);
 
@@ -181,8 +182,8 @@ class modCategorie extends DolibarrModules
 		$this->export_icon[$r] = $this->picto;
 		$this->export_enabled[$r] = '!empty($conf->product->enabled) || !empty($conf->service->abled)';
 		$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'=>"ParentCategory", 'p.rowid'=>'ProductId', 'p.ref'=>'Ref', 'p.label'=>'Label');
-		$this->export_TypeFields_array[$r] = array('cat.label'=>"Text", 'cat.description'=>"Text", 'cat.fk_parent'=>'List:categorie:label:rowid', 'p.ref'=>'Text', 'p.label'=>'Text');
+		$this->export_fields_array[$r] = array('cat.rowid'=>"CategId", 'cat.label'=>"Label", 'cat.description'=>"Description", 'cat.fk_parent'=>"ParentCategoryID", 'pcat.label'=>"ParentCategoryLabel", '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';
@@ -192,6 +193,7 @@ class modCategorie extends DolibarrModules
 
 		$this->export_sql_start[$r] = 'SELECT DISTINCT ';
 		$this->export_sql_end[$r]  = ' FROM '.MAIN_DB_PREFIX.'categorie as cat';
+		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'categorie as pcat ON pcat.rowid = cat.fk_parent';
 		$this->export_sql_end[$r] .= ' INNER JOIN '.MAIN_DB_PREFIX.'categorie_product as cp ON cp.fk_categorie = cat.rowid';
 		$this->export_sql_end[$r] .= ' INNER JOIN '.MAIN_DB_PREFIX.'product as p ON p.rowid = cp.fk_product';
 		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'product_extrafields as extra ON extra.fk_object = p.rowid';
@@ -206,7 +208,7 @@ class modCategorie extends DolibarrModules
 		$this->export_enabled[$r] = '!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD) || !empty($conf->supplier_order->enabled) || !empty($conf->supplier_invoice->enabled)';
 		$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'=>"ParentCategory",
+			'cat.rowid'=>"CategId", 'cat.label'=>"Label", 'cat.description'=>"Description", 'cat.fk_parent'=>"ParentCategoryID", 'pcat.label'=>"ParentCategoryLabel",
 			'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",
@@ -214,7 +216,7 @@ class modCategorie extends DolibarrModules
 			't.libelle'=>'ThirdPartyType'
 		);
 		$this->export_TypeFields_array[$r] = array(
-			'cat.label'=>"Text", 'cat.description'=>"Text", 'cat.fk_parent'=>'List:categorie:label:rowid',
+			'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",
@@ -236,6 +238,7 @@ class modCategorie extends DolibarrModules
 
 		$this->export_sql_start[$r] = 'SELECT DISTINCT ';
 		$this->export_sql_end[$r]  = ' FROM '.MAIN_DB_PREFIX.'categorie as cat';
+		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'categorie as pcat ON pcat.rowid = cat.fk_parent';
 		$this->export_sql_end[$r] .= ' INNER JOIN '.MAIN_DB_PREFIX.'categorie_fournisseur as cf ON cf.fk_categorie = cat.rowid';
 		$this->export_sql_end[$r] .= ' INNER JOIN '.MAIN_DB_PREFIX.'societe as s ON s.rowid = cf.fk_soc';
 		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'societe_extrafields as extra ON s.rowid = extra.fk_object';
@@ -252,7 +255,7 @@ class modCategorie extends DolibarrModules
 		$this->export_enabled[$r] = '!empty($conf->societe->enabled)';
 		$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'=>"ParentCategory",
+			'cat.rowid'=>"CategId", 'cat.label'=>"Label", 'cat.description'=>"Description", 'cat.fk_parent'=>"ParentCategoryID", 'pcat.label'=>"ParentCategoryLabel",
 			'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",
@@ -260,7 +263,7 @@ class modCategorie extends DolibarrModules
 			't.libelle'=>'ThirdPartyType', 'pl.code'=>'ProspectLevel', 'st.code'=>'ProspectStatus'
 		);
 		$this->export_TypeFields_array[$r] = array(
-			'cat.label'=>"Text", 'cat.description'=>"Text", 'cat.fk_parent'=>'List:categorie:label:rowid',
+			'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",
@@ -282,6 +285,7 @@ class modCategorie extends DolibarrModules
 
 		$this->export_sql_start[$r] = 'SELECT DISTINCT ';
 		$this->export_sql_end[$r]  = ' FROM '.MAIN_DB_PREFIX.'categorie as cat';
+		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'categorie as pcat ON pcat.rowid = cat.fk_parent';
 		$this->export_sql_end[$r] .= ' INNER JOIN '.MAIN_DB_PREFIX.'categorie_societe as cs ON cs.fk_categorie = cat.rowid';
 		$this->export_sql_end[$r] .= ' INNER JOIN '.MAIN_DB_PREFIX.'societe as s ON s.rowid = cs.fk_soc';
 		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'societe_extrafields as extra ON s.rowid = extra.fk_object';
@@ -299,8 +303,8 @@ class modCategorie extends DolibarrModules
 		$this->export_icon[$r] = $this->picto;
 		$this->export_enabled[$r] = '!empty($conf->adherent->enabled)';
 		$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'=>"ParentCategory", 'p.rowid'=>'MemberId', 'p.lastname'=>'LastName', 'p.firstname'=>'Firstname');
-		$this->export_TypeFields_array[$r] = array('cat.label'=>"Text", 'cat.description'=>"Text", 'cat.fk_parent'=>'List:categorie:label:rowid', 'p.lastname'=>'Text', 'p.firstname'=>'Text');
+		$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';
@@ -310,6 +314,7 @@ class modCategorie extends DolibarrModules
 
 		$this->export_sql_start[$r] = 'SELECT DISTINCT ';
 		$this->export_sql_end[$r]  = ' FROM '.MAIN_DB_PREFIX.'categorie as cat';
+		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'categorie as pcat ON pcat.rowid = cat.fk_parent';
 		$this->export_sql_end[$r] .= ' INNER JOIN '.MAIN_DB_PREFIX.'categorie_member as cm ON cm.fk_categorie = cat.rowid';
 		$this->export_sql_end[$r] .= ' INNER JOIN '.MAIN_DB_PREFIX.'adherent as p ON p.rowid = cm.fk_member';
 		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'adherent_extrafields as extra ON cat.rowid = extra.fk_object ';
@@ -324,7 +329,7 @@ class modCategorie extends DolibarrModules
 		$this->export_enabled[$r] = '!empty($conf->societe->enabled)';
 		$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'=>"ParentCategory",
+			'cat.rowid'=>"CategId", 'cat.label'=>"Label", 'cat.description'=>"Description", 'cat.fk_parent'=>"ParentCategoryID", 'pcat.label'=>"ParentCategoryLabel",
 			'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',
@@ -335,8 +340,8 @@ class modCategorie extends DolibarrModules
 			's.phone'=>"Phone", 's.fax'=>"Fax", 's.url'=>"Url", 's.email'=>"Email"
 		);
 		$this->export_TypeFields_array[$r] = array(
-			'cat.label'=>"Text", 'cat.description'=>"Text", 'cat.fk_parent'=>'List:categorie:label:rowid',
-			'civ.label' => 'List:c_civility:label:label', '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',
@@ -363,6 +368,7 @@ class modCategorie extends DolibarrModules
 
 		$this->export_sql_start[$r] = 'SELECT DISTINCT ';
 		$this->export_sql_end[$r]  = ' FROM '.MAIN_DB_PREFIX.'categorie as cat';
+		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'categorie as pcat ON pcat.rowid = cat.fk_parent';
 		$this->export_sql_end[$r] .= ' INNER JOIN '.MAIN_DB_PREFIX.'categorie_contact as cc ON cc.fk_categorie = cat.rowid';
 		$this->export_sql_end[$r] .= ' INNER JOIN '.MAIN_DB_PREFIX.'socpeople as p ON p.rowid = cc.fk_socpeople';
 		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'socpeople_extrafields as extra ON extra.fk_object = p.rowid';
@@ -381,8 +387,8 @@ class modCategorie extends DolibarrModules
 		$this->export_icon[$r] = $this->picto;
 		$this->export_enabled[$r] = '!empty($conf->projet->enabled)';
 		$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", 'p.rowid'=>'ProjectId', 'p.ref'=>'Ref', 's.rowid'=>"IdThirdParty", 's.nom'=>"Name");
-		$this->export_TypeFields_array[$r] = array('cat.label'=>"Text", 'cat.description'=>"Text", 'cat.fk_parent'=>'List:categorie:label:rowid', 'p.ref'=>'Text', 's.rowid'=>"List:societe:nom:rowid", 's.nom'=>"Text");
+		$this->export_fields_array[$r] = array('cat.rowid'=>"CategId", 'cat.label'=>"Label", 'cat.description'=>"Description", 'cat.fk_parent'=>"ParentCategory", 'pcat.label'=>"ParentCategoryLabel", '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'=>"List:societe:nom:rowid", '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';
@@ -392,6 +398,7 @@ class modCategorie extends DolibarrModules
 
 		$this->export_sql_start[$r] = 'SELECT DISTINCT ';
 		$this->export_sql_end[$r]  = ' FROM '.MAIN_DB_PREFIX.'categorie as cat';
+		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'categorie as pcat ON pcat.rowid = cat.fk_parent';
 		$this->export_sql_end[$r] .= ' INNER JOIN '.MAIN_DB_PREFIX.'categorie_project as cp ON cp.fk_categorie = cat.rowid';
 		$this->export_sql_end[$r] .= ' INNER JOIN '.MAIN_DB_PREFIX.'projet as p ON p.rowid = cp.fk_project';
 		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'projet_extrafields as extra ON extra.fk_object = p.rowid';
@@ -406,8 +413,8 @@ class modCategorie extends DolibarrModules
 		$this->export_icon[$r] = $this->picto;
 		$this->export_enabled[$r] = '!empty($conf->user->enabled)';
 		$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", 'p.rowid'=>'TechnicalID', 'p.login'=>'Login', 'p.lastname'=>'Lastname', 'p.firstname'=>'Firstname');
-		$this->export_TypeFields_array[$r] = array('cat.label'=>"Text", 'cat.description'=>"Text", 'cat.fk_parent'=>'List:categorie:label:rowid', 'p.login'=>'Text', 'p.lastname'=>'Text', 'p.firstname'=>'Text');
+		$this->export_fields_array[$r] = array('cat.rowid'=>"CategId", 'cat.label'=>"Label", 'cat.description'=>"Description", 'cat.fk_parent'=>"ParentCategory", 'pcat.label'=>"ParentCategoryLabel", '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';
@@ -417,6 +424,7 @@ class modCategorie extends DolibarrModules
 
 		$this->export_sql_start[$r] = 'SELECT DISTINCT ';
 		$this->export_sql_end[$r]  = ' FROM '.MAIN_DB_PREFIX.'categorie as cat';
+		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'categorie as pcat ON pcat.rowid = cat.fk_parent';
 		$this->export_sql_end[$r] .= ' INNER JOIN '.MAIN_DB_PREFIX.'categorie_user as cu ON cu.fk_categorie = cat.rowid';
 		$this->export_sql_end[$r] .= ' INNER JOIN '.MAIN_DB_PREFIX.'user as p ON p.rowid = cu.fk_user';
 		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'user_extrafields as extra ON extra.fk_object = p.rowid';
diff --git a/htdocs/langs/en_US/categories.lang b/htdocs/langs/en_US/categories.lang
index a2d05767cae..5330730ad3a 100644
--- a/htdocs/langs/en_US/categories.lang
+++ b/htdocs/langs/en_US/categories.lang
@@ -67,6 +67,7 @@ StockCategoriesShort=Warehouse tags/categories
 ThisCategoryHasNoItems=This category does not contain any items.
 CategId=Tag/category id
 ParentCategory=Parent tag/category
+ParentCategoryID=ID of parent tag/category
 ParentCategoryLabel=Label of parent tag/category
 CatSupList=List of vendors tags/categories
 CatCusList=List of customers/prospects tags/categories

From 6ff1d5574f07b83c0ff4bd1dbc6280afc0d317b4 Mon Sep 17 00:00:00 2001
From: UT from dolibit <45215329+dolibit-ut@users.noreply.github.com>
Date: Fri, 2 Sep 2022 20:50:45 +0200
Subject: [PATCH 630/974] Update ChangeLog

---
 ChangeLog | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index caec167d380..9a127d4fcee 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -42,6 +42,7 @@ NEW: Accept 'auto' for ref of object on import of purchase order/proposal
 NEW: Accountancy - Add more filters and info on page to bind accounting accounts
 NEW: Accountancy - Add subledger account when generate a transaction with a deposit invoice
 NEW: Accountancy - Add a massaction to preselect an account (customer and supplier list)
+NEW: Accountancy - Add hidden feature for accounting reconciliation
 NEW: ACE Editor is restored at same cursor position after a save.
 NEW: Add "addMoreActionsButtons" hook to subscription form
 NEW: Add an option in GUI to show a Quick add button into top menu bar
@@ -50,9 +51,6 @@ NEW: Add column date of Signature on proposal list
 NEW: Add column template invoice in invoice list
 NEW: Add column "Total HT" to products array on document creation card
 NEW: Add configuration for text color of button action
-NEW: Add constant to hide categories in TakePos
-NEW: Add constant to show category description in TakePos
-NEW: Add constant to show only the products in stock in TakePos
 NEW: Add entity filter in exports
 NEW: Show the event block on recurring invoices #20870
 NEW: Add filter "opportunity status" on statistics of projects.
@@ -116,11 +114,11 @@ NEW: payment conditions enabling semi-automatic deposit creation (Issue #18439)
 NEW: possibility to consume multiple batch
 NEW: Reverse movement product consumption
 NEW: Send email to the supplier order contact
-NEW: New permission to report time on timesheet.
+NEW: add permission to report time on timesheet
 NEW: SEPA XML - option to place payment Type Info at Credit transfer Transaction level
 NEW: Show number of votes into the label of tab "Results" of a survey
 NEW: Some core tables are created only at module activation
-NEW: split consumption line on MO
+NEW: MRP - split consumption line on MO
 NEW: stock filter in reassort lists
 NEW: stock limit in stock export CSV
 NEW: Supplier order - Show ref supplier of reception in linked object block
@@ -128,6 +126,9 @@ NEW: support user_modif in order
 NEW: TakePOS - barcode rule to insert product in TakePOS
 NEW: TakePOS - pagination on search results
 NEW: TakePOS - show product reference
+NEW: TakePOS - add constant to hide categories
+NEW: TakePOS - add constant to show category description
+NEW: TakePOS - add constant to show only the products in stock
 NEW: The backup tools has an "lowmemory" option for mysqldump on large database
 NEW: The 'reposition' class works on ajax constantonoff that make redirects
 NEW: Thirdparty - Add rules "customer accountancy code" is mandatory to validate invoice
@@ -136,7 +137,6 @@ NEW: total mark rate in list
 NEW: uncheck "send message" by default on a ticket when private messages has been checked
 NEW: VAT Report by month - Show detail by rate and also by code
 NEW: Ticket triggers: allow to automatically send messages on new tickets
-NEW: Accountancy - Add hidden feature for accounting reconciliation
 NEW: Can store the session into database (instead of beeing managed by PHP)
 NEW: Added MMK currency (Myanmar Kyat)
 NEW: On a form to send an email, we show all emails of contacts of object
@@ -161,7 +161,7 @@ NEW: Identification of tr is possible with by attribute data-id on some pages
 NEW: Import with select boxes V2
 NEW: Can use current entity filter on 'chkbxlst'
 NEW: Creation of the function select_bom() used to display bom select list
-NEW: add printFieldListWhere hook in product reassort card
+
 NEW: Add trigger and event on completely received status change
 NEW: Add utility function send backup by mail
 NEW: add WordPress OAuth to save a token (not SSO)
@@ -194,6 +194,7 @@ NEW: Add hook before the public ticket list
 NEW: Add hook doaction in takepos invoice
 NEW: Add hook for Notif
 NEW: Add hook for more buttons
+NEW: add hook printFieldListWhere in product ressort card
 NEW: Add hook printFieldListWhere in "show_contacts" function
 NEW: Add hook printFieldWhere in load_state_board function
 NEW: Add hooks contact tab badge and hooks parameter for avoid conflicts

From 7c04468246f9a92cbb16460e7c92960910990916 Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Sat, 3 Sep 2022 10:36:54 +0200
Subject: [PATCH 631/974] fix bug#22057

---
 htdocs/compta/resultat/clientfourn.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/htdocs/compta/resultat/clientfourn.php b/htdocs/compta/resultat/clientfourn.php
index ed4dac6c3f3..a79729453b7 100644
--- a/htdocs/compta/resultat/clientfourn.php
+++ b/htdocs/compta/resultat/clientfourn.php
@@ -39,6 +39,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/report.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/tax.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/accountancy/class/accountancycategory.class.php';
+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'));

From f4a4ecfdf3ac40d8a4650cbe0bf40e279448d6ee Mon Sep 17 00:00:00 2001
From: ptibogxiv <support@ptibogxiv.net>
Date: Sat, 3 Sep 2022 10:52:33 +0200
Subject: [PATCH 632/974] NEW private and public note on user.php

use same code on Dolibarr
---
 htdocs/install/mysql/tables/llx_user.sql | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/install/mysql/tables/llx_user.sql b/htdocs/install/mysql/tables/llx_user.sql
index a47b40cb3d1..7b86b5c3396 100644
--- a/htdocs/install/mysql/tables/llx_user.sql
+++ b/htdocs/install/mysql/tables/llx_user.sql
@@ -76,7 +76,7 @@ create table llx_user
   idpers3			   varchar(128),
   
   note_public		          text,
-  note                    text          DEFAULT NULL,
+  note_private                    text          DEFAULT NULL,
   model_pdf               varchar(255)  DEFAULT NULL,
   datelastlogin           datetime,
   datepreviouslogin       datetime,

From 55f8d722194c7530e7acd1d3f1156d16a7b820c1 Mon Sep 17 00:00:00 2001
From: ptibogxiv <support@ptibogxiv.net>
Date: Sat, 3 Sep 2022 10:56:19 +0200
Subject: [PATCH 633/974] Update 16.0.0-17.0.0.sql

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

diff --git a/htdocs/install/mysql/migration/16.0.0-17.0.0.sql b/htdocs/install/mysql/migration/16.0.0-17.0.0.sql
index 2c093019e72..016dc7283df 100644
--- a/htdocs/install/mysql/migration/16.0.0-17.0.0.sql
+++ b/htdocs/install/mysql/migration/16.0.0-17.0.0.sql
@@ -142,3 +142,5 @@ CREATE TABLE llx_bank_extrafields
 )ENGINE=innodb;
 
 ALTER TABLE llx_bank_extrafields ADD INDEX idx_bank_extrafields (fk_object);
+
+ALTER TABLE llx_user RENAME COLUMN note TO note_private;

From a8465d16fa852e61e369305d39fd9000696fe020 Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Sat, 3 Sep 2022 11:05:03 +0200
Subject: [PATCH 634/974] Update code

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

diff --git a/htdocs/comm/propal/card.php b/htdocs/comm/propal/card.php
index fb75b3f0c6b..553e3e8ea9c 100644
--- a/htdocs/comm/propal/card.php
+++ b/htdocs/comm/propal/card.php
@@ -6,7 +6,7 @@
  * Copyright (C) 2005-2012 Regis Houssin         <regis.houssin@inodbox.com>
  * Copyright (C) 2006      Andre Cianfarani      <acianfa@free.fr>
  * Copyright (C) 2010-2016 Juanjo Menent         <jmenent@2byte.es>
- * Copyright (C) 2010-2021 Philippe Grand        <philippe.grand@atoo-net.com>
+ * Copyright (C) 2010-2022 Philippe Grand        <philippe.grand@atoo-net.com>
  * Copyright (C) 2012-2013 Christophe Battarel   <christophe.battarel@altairis.fr>
  * Copyright (C) 2012      Cedric Salvador       <csalvador@gpcsolutions.fr>
  * Copyright (C) 2013-2014 Florian Henry         <florian.henry@open-concept.pro>
@@ -448,7 +448,7 @@ if (empty($reshook)) {
 				$object->origin_id = GETPOST('originid');
 
 				// Multicurrency
-				if (!empty($conf->multicurrency->enabled)) {
+				if (isModEnabled("multicurrency")) {
 					$object->multicurrency_code = GETPOST('multicurrency_code', 'alpha');
 				}
 
@@ -1653,7 +1653,7 @@ if ($action == 'create') {
 			$objectsrc->fetch_optionals();
 			$object->array_options = $objectsrc->array_options;
 
-			if (!empty($conf->multicurrency->enabled)) {
+			if (isModEnabled("multicurrency")) {
 				if (!empty($objectsrc->multicurrency_code)) {
 					$currency_code = $objectsrc->multicurrency_code;
 				}
@@ -1663,7 +1663,7 @@ if ($action == 'create') {
 			}
 		}
 	} else {
-		if (!empty($conf->multicurrency->enabled) && !empty($soc->multicurrency_code)) {
+		if (isModEnabled("multicurrency") && !empty($soc->multicurrency_code)) {
 			$currency_code = $soc->multicurrency_code;
 		}
 	}
@@ -1865,7 +1865,7 @@ if ($action == 'create') {
 	print "</td></tr>";
 
 	// Multicurrency
-	if (!empty($conf->multicurrency->enabled)) {
+	if (isModEnabled("multicurrency")) {
 		print '<tr class="field_currency">';
 		print '<td class="titlefieldcreate">'.$form->editfieldkey('Currency', 'multicurrency_code', '', $object, 0).'</td>';
 		print '<td class="valuefieldcreate maxwidthonsmartphone">';
@@ -1937,7 +1937,7 @@ if ($action == 'create') {
 		}
 		print '<tr><td>'.$langs->trans('AmountTTC').'</td><td>'.price($objectsrc->total_ttc, 0, $langs, 1, -1, -1, $conf->currency)."</td></tr>";
 
-		if (!empty($conf->multicurrency->enabled)) {
+		if (isModEnabled("multicurrency")) {
 			print '<tr><td>'.$langs->trans('MulticurrencyAmountHT').'</td><td>'.price($objectsrc->multicurrency_total_ht).'</td></tr>';
 			print '<tr><td>'.$langs->trans('MulticurrencyAmountVAT').'</td><td>'.price($objectsrc->multicurrency_total_tva)."</td></tr>";
 			print '<tr><td>'.$langs->trans('MulticurrencyAmountTTC').'</td><td>'.price($objectsrc->multicurrency_total_ttc)."</td></tr>";
@@ -2518,7 +2518,7 @@ if ($action == 'create') {
 	print '</tr>';
 
 	// Multicurrency
-	if (!empty($conf->multicurrency->enabled)) {
+	if (isModEnabled("multicurrency")) {
 		// Multicurrency code
 		print '<tr>';
 		print '<td>';
@@ -2649,7 +2649,7 @@ if ($action == 'create') {
 
 	print '<table class="border tableforfield centpercent">';
 
-	if (!empty($conf->multicurrency->enabled) && ($object->multicurrency_code && $object->multicurrency_code != $conf->currency)) {
+	if (isModEnabled("multicurrency") && ($object->multicurrency_code && $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 right amountcard">'.price($object->multicurrency_total_ht, '', $langs, 0, - 1, - 1, (!empty($object->multicurrency_code) ? $object->multicurrency_code : $conf->currency)).'</td>';

From 98362881a673d3f2d9556254c6dd5e346b820dc4 Mon Sep 17 00:00:00 2001
From: ptibogxiv <support@ptibogxiv.net>
Date: Sat, 3 Sep 2022 11:06:38 +0200
Subject: [PATCH 635/974] Update note.php

---
 htdocs/user/note.php | 84 +++++++++++++-------------------------------
 1 file changed, 24 insertions(+), 60 deletions(-)

diff --git a/htdocs/user/note.php b/htdocs/user/note.php
index e0ac0bd4dcf..c0c93a75d64 100644
--- a/htdocs/user/note.php
+++ b/htdocs/user/note.php
@@ -27,6 +27,7 @@ require '../main.inc.php';
 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');
 $action = GETPOST('action', 'aZ09');
 $contextpage = GETPOST('contextpage', 'aZ') ?GETPOST('contextpage', 'aZ') : 'usernote'; // To manage different context of search
@@ -39,16 +40,19 @@ $object->fetch($id, '', '', 1);
 $object->getrights();
 
 // If user is not user read and no permission to read other users, we stop
-if (($object->id != $user->id) && (!$user->hasRight("user", "user", "read"))) {
+if (($object->id != $user->id) && (!$user->rights->user->user->lire)) {
 	accessforbidden();
 }
 
+// Permissions
+$permissionnote = $user->hasRight("user", "self", "write"); // Used by the include of actions_setnotes.inc.php
+
 // Security check
 $socid = 0;
 if ($user->socid > 0) {
 	$socid = $user->socid;
 }
-$feature2 = (($socid && $user->hasRight("user", "self", "write")) ? '' : 'user');
+$feature2 = (($socid && $user->rights->user->self->creer) ? '' : 'user');
 
 $result = restrictedArea($user, 'user', $id, 'user&user', $feature2);
 
@@ -59,37 +63,23 @@ $hookmanager->initHooks(array('usercard', 'usernote', 'globalcard'));
 /*
  * Actions
  */
-
 $parameters = array('id'=>$socid);
-$reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
+$reshook = $hookmanager->executeHooks('doActions', array(), $object, $action); // Note that $action and $object may have been modified by some hooks
 if ($reshook < 0) {
 	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 }
-
 if (empty($reshook)) {
-	if ($action == 'update' && $user->hasRight("user", "user", "write") && !GETPOST("cancel")) {
-		$db->begin();
-
-		$res = $object->update_note(dol_html_entity_decode(GETPOST('note_private', 'restricthtml'), ENT_QUOTES | ENT_HTML5));
-		if ($res < 0) {
-			$mesg = '<div class="error">'.$adh->error.'</div>';
-			$db->rollback();
-		} else {
-			$db->commit();
-		}
-	}
+	include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be include, not include_once
 }
 
 
 /*
  * View
  */
-$form = new Form($db);
 
-$person_name = !empty($object->firstname) ? $object->lastname.", ".$object->firstname : $object->lastname;
-$title = $person_name." - ".$langs->trans('Notes');
-$help_url = '';
-llxHeader('', $title, $help_url);
+llxHeader();
+
+$form = new Form($db);
 
 if ($id) {
 	$head = user_prepare_head($object);
@@ -99,7 +89,7 @@ if ($id) {
 
 	$linkback = '';
 
-	if ($user->hasRight("user", "user", "read") || $user->admin) {
+	if ($user->rights->user->user->lire || $user->admin) {
 		$linkback = '<a href="'.DOL_URL_ROOT.'/user/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 	}
 
@@ -107,7 +97,7 @@ if ($id) {
 	$morehtmlref .= img_picto($langs->trans("Download").' '.$langs->trans("VCard"), 'vcard.png', 'class="valignmiddle marginleftonly paddingrightonly"');
 	$morehtmlref .= '</a>';
 
-	dol_banner_tab($object, 'id', $linkback, $user->hasRight("user", "user", "read") || $user->admin, 'rowid', 'ref', $morehtmlref);
+	dol_banner_tab($object, 'id', $linkback, $user->rights->user->user->lire || $user->admin, 'rowid', 'ref', $morehtmlref);
 
 	print '<div class="underbanner clearboth"></div>';
 
@@ -127,7 +117,7 @@ if ($id) {
 		print '<td>';
 		$addadmin = '';
 		if (property_exists($object, 'admin')) {
-			if (isModEnabled('multicompany') && !empty($object->admin) && empty($object->entity)) {
+			if (!empty($conf->multicompany->enabled) && !empty($object->admin) && empty($object->entity)) {
 				$addadmin .= img_picto($langs->trans("SuperAdministratorDesc"), "redstar", 'class="paddingleft"');
 			} elseif (!empty($object->admin)) {
 				$addadmin .= img_picto($langs->trans("AdministratorDesc"), "star", 'class="paddingleft"');
@@ -138,46 +128,20 @@ if ($id) {
 	}
 	print '</tr>';
 
-	$editenabled = (($action == 'edit') && $user->hasRight("user", "user", "write"));
-
-	// Note
-	print '<tr><td class="tdtop">'.$langs->trans("Note").'</td>';
-	print '<td class="'.($editenabled ? '' : 'sensiblehtmlcontent').'">';
-	if ($editenabled) {
-		print "<input type=\"hidden\" name=\"action\" value=\"update\">";
-		print "<input type=\"hidden\" name=\"id\" value=\"".$object->id."\">";
-		// Editeur wysiwyg
-		require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
-		$doleditor = new DolEditor('note_private', $object->note_private, '', 280, 'dolibarr_notes', 'In', true, false, getDolGlobalInt('FCKEDITOR_ENABLE_SOCIETE'), ROWS_8, '90%');
-		$doleditor->Create();
-	} else {
-		print dol_string_onlythesehtmltags(dol_htmlentitiesbr($object->note_private));
-	}
-	print "</td></tr>";
-
 	print "</table>";
+
 	print '</div>';
 
+
+	//print '<br>';
+
+	//print '<div class="underbanner clearboth"></div>';
+	include DOL_DOCUMENT_ROOT.'/core/tpl/notes.tpl.php';
+
 	print dol_get_fiche_end();
-
-	if ($action == 'edit') {
-		print $form->buttonsSaveCancel();
-	}
-
-
-	/*
-	 * Actions
-	 */
-
-	print '<div class="tabsAction">';
-
-	if ($user->hasRight("user", "user", "write") && $action != 'edit') {
-		print '<a class="butAction" href="note.php?id='.$object->id.'&action=edit&token='.newToken().'">'.$langs->trans('Modify')."</a>";
-	}
-
-	print "</div>";
-
-	print "</form>\n";
+} else {
+	$langs->load("errors");
+	print $langs->trans("ErrorRecordNotFound");
 }
 
 // End of page

From e10ce6a6a0002cd65bb31942484da026fc82bf29 Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Sat, 3 Sep 2022 11:07:45 +0200
Subject: [PATCH 636/974] Update code

---
 htdocs/comm/propal/list.php | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/htdocs/comm/propal/list.php b/htdocs/comm/propal/list.php
index 31c4489d47f..fb47a3d918a 100644
--- a/htdocs/comm/propal/list.php
+++ b/htdocs/comm/propal/list.php
@@ -6,7 +6,7 @@
  * Copyright (C) 2005-2013 Regis Houssin			<regis.houssin@inodbox.com>
  * Copyright (C) 2006      Andre Cianfarani			<acianfa@free.fr>
  * Copyright (C) 2010-2011 Juanjo Menent			<jmenent@2byte.es>
- * Copyright (C) 2010-2011 Philippe Grand			<philippe.grand@atoo-net.com>
+ * Copyright (C) 2010-2022 Philippe Grand			<philippe.grand@atoo-net.com>
  * Copyright (C) 2012      Christophe Battarel		<christophe.battarel@altairis.fr>
  * Copyright (C) 2013      Cédric Salvador			<csalvador@gpcsolutions.fr>
  * Copyright (C) 2015      Jean-François Ferry		<jfefe@aternatik.fr>
@@ -227,13 +227,13 @@ $arrayfields = array(
 	'p.total_ttc'=>array('label'=>"AmountTTC", 'checked'=>0),
 	'p.total_ht_invoiced'=>array('label'=>"AmountInvoicedHT", 'checked'=>0, 'enabled'=>!empty($conf->global->PROPOSAL_SHOW_INVOICED_AMOUNT)),
 	'p.total_invoiced'=>array('label'=>"AmountInvoicedTTC", 'checked'=>0, 'enabled'=>!empty($conf->global->PROPOSAL_SHOW_INVOICED_AMOUNT)),
-	'p.multicurrency_code'=>array('label'=>'Currency', 'checked'=>0, 'enabled'=>(empty($conf->multicurrency->enabled) ? 0 : 1)),
-	'p.multicurrency_tx'=>array('label'=>'CurrencyRate', 'checked'=>0, 'enabled'=>(empty($conf->multicurrency->enabled) ? 0 : 1)),
-	'p.multicurrency_total_ht'=>array('label'=>'MulticurrencyAmountHT', 'checked'=>0, 'enabled'=>(empty($conf->multicurrency->enabled) ? 0 : 1)),
-	'p.multicurrency_total_tva'=>array('label'=>'MulticurrencyAmountVAT', 'checked'=>0, 'enabled'=>(empty($conf->multicurrency->enabled) ? 0 : 1)),
-	'p.multicurrency_total_ttc'=>array('label'=>'MulticurrencyAmountTTC', 'checked'=>0, 'enabled'=>(empty($conf->multicurrency->enabled) ? 0 : 1)),
-	'p.multicurrency_total_ht_invoiced'=>array('label'=>'MulticurrencyAmountInvoicedHT', 'checked'=>0, 'enabled'=>!empty($conf->multicurrency->enabled) && !empty($conf->global->PROPOSAL_SHOW_INVOICED_AMOUNT)),
-	'p.multicurrency_total_invoiced'=>array('label'=>'MulticurrencyAmountInvoicedTTC', 'checked'=>0, 'enabled'=>!empty($conf->multicurrency->enabled) && !empty($conf->global->PROPOSAL_SHOW_INVOICED_AMOUNT)),
+	'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") && !empty($conf->global->PROPOSAL_SHOW_INVOICED_AMOUNT)),
+	'p.multicurrency_total_invoiced'=>array('label'=>'MulticurrencyAmountInvoicedTTC', 'checked'=>0, 'enabled'=>isModEnabled("multicurrency") && !empty($conf->global->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' => (empty($conf->margin->enabled) || !$user->rights->margins->liretous ? 0 : 1)),

From a0bb17aea90612341608e5b19f0e616358702b9c Mon Sep 17 00:00:00 2001
From: ptibogxiv <support@ptibogxiv.net>
Date: Sat, 3 Sep 2022 11:07:47 +0200
Subject: [PATCH 637/974] wip

---
 htdocs/core/tpl/notes.tpl.php    | 2 ++
 htdocs/user/class/user.class.php | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/htdocs/core/tpl/notes.tpl.php b/htdocs/core/tpl/notes.tpl.php
index 1110e91b019..dfa9b0e4591 100644
--- a/htdocs/core/tpl/notes.tpl.php
+++ b/htdocs/core/tpl/notes.tpl.php
@@ -91,6 +91,8 @@ if ($module == 'propal') {
 	$permission = $user->rights->produit->creer;
 } elseif ($module == 'ecmfiles') {
 	$permission = $user->rights->ecm->setup;
+} elseif ($module == 'user') {
+	$permission = $user->hasRight("user", "self", "write");
 }
 //else dol_print_error('','Bad value '.$module.' for param module');
 
diff --git a/htdocs/user/class/user.class.php b/htdocs/user/class/user.class.php
index df2b6bc0174..a521be145ef 100644
--- a/htdocs/user/class/user.class.php
+++ b/htdocs/user/class/user.class.php
@@ -433,7 +433,7 @@ class User extends CommonObject
 		$sql .= " u.socialnetworks,";
 		$sql .= " u.signature, u.office_phone, u.office_fax, u.user_mobile, u.personal_mobile,";
 		$sql .= " u.address, u.zip, u.town, u.fk_state as state_id, u.fk_country as country_id,";
-		$sql .= " u.admin, u.login, u.note as note_private, u.note_public,";
+		$sql .= " u.admin, u.login, u.note_private, u.note_public,";
 		$sql .= " u.pass, u.pass_crypted, u.pass_temp, u.api_key,";
 		$sql .= " u.fk_soc, u.fk_socpeople, u.fk_member, u.fk_user, u.ldap_sid, u.fk_user_expense_validator, u.fk_user_holiday_validator,";
 		$sql .= " u.statut, u.lang, u.entity,";
@@ -1979,7 +1979,7 @@ class User extends CommonObject
 		$sql .= ", dateemploymentend=".(strval($this->dateemploymentend) != '' ? "'".$this->db->idate($this->dateemploymentend)."'" : 'null');
 		$sql .= ", datestartvalidity=".(strval($this->datestartvalidity) != '' ? "'".$this->db->idate($this->datestartvalidity)."'" : 'null');
 		$sql .= ", dateendvalidity=".(strval($this->dateendvalidity) != '' ? "'".$this->db->idate($this->dateendvalidity)."'" : 'null');
-		$sql .= ", note = '".$this->db->escape($this->note_private)."'";
+		$sql .= ", note_private = '".$this->db->escape($this->note_private)."'";
 		$sql .= ", note_public = '".$this->db->escape($this->note_public)."'";
 		$sql .= ", photo = ".($this->photo ? "'".$this->db->escape($this->photo)."'" : "null");
 		$sql .= ", openid = ".($this->openid ? "'".$this->db->escape($this->openid)."'" : "null");

From f9a404795fbc1b49570d29f429e5434899326592 Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Sat, 3 Sep 2022 11:09:05 +0200
Subject: [PATCH 638/974] Update code

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

diff --git a/htdocs/comm/propal/class/propal.class.php b/htdocs/comm/propal/class/propal.class.php
index 51c07f15269..c91d13d6b9c 100644
--- a/htdocs/comm/propal/class/propal.class.php
+++ b/htdocs/comm/propal/class/propal.class.php
@@ -7,7 +7,7 @@
  * Copyright (C) 2006       Andre Cianfarani        <acianfa@free.fr>
  * Copyright (C) 2008       Raphael Bertrand        <raphael.bertrand@resultic.fr>
  * Copyright (C) 2010-2020  Juanjo Menent           <jmenent@2byte.es>
- * Copyright (C) 2010-2017  Philippe Grand          <philippe.grand@atoo-net.com>
+ * Copyright (C) 2010-2022  Philippe Grand          <philippe.grand@atoo-net.com>
  * Copyright (C) 2012-2014  Christophe Battarel     <christophe.battarel@altairis.fr>
  * Copyright (C) 2012       Cedric Salvador         <csalvador@gpcsolutions.fr>
  * Copyright (C) 2013       Florian Henry           <florian.henry@open-concept.pro>
@@ -335,11 +335,11 @@ class Propal extends CommonObject
 		'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'=>'$conf->multicurrency->enabled', 'visible'=>-1, 'position'=>235),
-		'multicurrency_tx' =>array('type'=>'double(24,8)', 'label'=>'MulticurrencyRate', 'enabled'=>'$conf->multicurrency->enabled', 'visible'=>-1, 'position'=>240, 'isameasure'=>1),
-		'multicurrency_total_ht' =>array('type'=>'double(24,8)', 'label'=>'MulticurrencyAmountHT', 'enabled'=>'$conf->multicurrency->enabled', 'visible'=>-1, 'position'=>245, 'isameasure'=>1),
-		'multicurrency_total_tva' =>array('type'=>'double(24,8)', 'label'=>'MulticurrencyAmountVAT', 'enabled'=>'$conf->multicurrency->enabled', 'visible'=>-1, 'position'=>250, 'isameasure'=>1),
-		'multicurrency_total_ttc' =>array('type'=>'double(24,8)', 'label'=>'MulticurrencyAmountTTC', 'enabled'=>'$conf->multicurrency->enabled', 'visible'=>-1, 'position'=>255, 'isameasure'=>1),
+		'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),

From 120fb10738811fe906f8d8d82c5a02ebbf27ec02 Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Sat, 3 Sep 2022 11:09:59 +0200
Subject: [PATCH 639/974] Update code

---
 htdocs/commande/card.php | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/htdocs/commande/card.php b/htdocs/commande/card.php
index 73bf27c0cfd..3d70261e0da 100644
--- a/htdocs/commande/card.php
+++ b/htdocs/commande/card.php
@@ -5,7 +5,7 @@
  * Copyright (C) 2005-2015	Regis Houssin			<regis.houssin@inodbox.com>
  * Copyright (C) 2006		Andre Cianfarani		<acianfa@free.fr>
  * Copyright (C) 2010-2013	Juanjo Menent			<jmenent@2byte.es>
- * Copyright (C) 2011-2019	Philippe Grand			<philippe.grand@atoo-net.com>
+ * Copyright (C) 2011-2022	Philippe Grand			<philippe.grand@atoo-net.com>
  * Copyright (C) 2012-2013	Christophe Battarel		<christophe.battarel@altairis.fr>
  * Copyright (C) 2012-2016	Marcos García			<marcosgdf@gmail.com>
  * Copyright (C) 2012       Cedric Salvador      	<csalvador@gpcsolutions.fr>
@@ -13,7 +13,7 @@
  * Copyright (C) 2014       Ferran Marcet			<fmarcet@2byte.es>
  * Copyright (C) 2015       Jean-François Ferry		<jfefe@aternatik.fr>
  * Copyright (C) 2018-2021  Frédéric France         <frederic.france@netlogic.fr>
- * Copyright (C) 2022	    Gauthier VERDOL     <gauthier.verdol@atm-consulting.fr>
+ * Copyright (C) 2022	    Gauthier VERDOL     	<gauthier.verdol@atm-consulting.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -1664,7 +1664,7 @@ if ($action == 'create' && $usercancreate) {
 				$date_delivery = (!empty($objectsrc->date_livraison) ? $objectsrc->date_livraison : '');
 			}
 
-			if (!empty($conf->multicurrency->enabled)) {
+			if (isModEnabled("multicurrency")) {
 				if (!empty($objectsrc->multicurrency_code)) {
 					$currency_code = $objectsrc->multicurrency_code;
 				}
@@ -1692,7 +1692,7 @@ if ($action == 'create' && $usercancreate) {
 		$remise_absolue     = 0;
 		$dateorder          = empty($conf->global->MAIN_AUTOFILL_DATE_ORDER) ?-1 : '';
 
-		if (!empty($conf->multicurrency->enabled) && !empty($soc->multicurrency_code)) {
+		if (isModEnabled("multicurrency") && !empty($soc->multicurrency_code)) {
 			$currency_code = $soc->multicurrency_code;
 		}
 
@@ -1913,7 +1913,7 @@ if ($action == 'create' && $usercancreate) {
 	print "</td></tr>";
 
 	// Multicurrency
-	if (!empty($conf->multicurrency->enabled)) {
+	if (isModEnabled("multicurrency")) {
 		print '<tr>';
 		print '<td>'.$form->editfieldkey("Currency", 'multicurrency_code', '', $object, 0).'</td>';
 		print '<td class="maxwidthonsmartphone">';
@@ -1992,7 +1992,7 @@ if ($action == 'create' && $usercancreate) {
 
 		print '<tr><td>'.$langs->trans('AmountTTC').'</td><td>'.price($objectsrc->total_ttc)."</td></tr>";
 
-		if (!empty($conf->multicurrency->enabled)) {
+		if (isModEnabled("multicurrency")) {
 			print '<tr><td>'.$langs->trans('MulticurrencyAmountHT').'</td><td>'.price($objectsrc->multicurrency_total_ht).'</td></tr>';
 			print '<tr><td>'.$langs->trans('MulticurrencyAmountVAT').'</td><td>'.price($objectsrc->multicurrency_total_tva)."</td></tr>";
 			print '<tr><td>'.$langs->trans('MulticurrencyAmountTTC').'</td><td>'.price($objectsrc->multicurrency_total_ttc)."</td></tr>";
@@ -2535,7 +2535,7 @@ if ($action == 'create' && $usercancreate) {
 		print '</td></tr>';
 
 		// Multicurrency
-		if (!empty($conf->multicurrency->enabled)) {
+		if (isModEnabled("multicurrency")) {
 			// Multicurrency code
 			print '<tr>';
 			print '<td>';
@@ -2646,7 +2646,7 @@ if ($action == 'create' && $usercancreate) {
 
 		print '<table class="border tableforfield centpercent">';
 
-		if (!empty($conf->multicurrency->enabled) && ($object->multicurrency_code != $conf->currency)) {
+		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="valuefield nowrap right amountcard">'.price($object->multicurrency_total_ht, '', $langs, 0, -1, -1, (!empty($object->multicurrency_code) ? $object->multicurrency_code : $conf->currency)).'</td>';

From 4a8f61838dea468573b4608c989f06219aa5760f Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Sat, 3 Sep 2022 11:11:38 +0200
Subject: [PATCH 640/974] Update code

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

diff --git a/htdocs/commande/list.php b/htdocs/commande/list.php
index 438a00bbb56..12a85f0bf11 100644
--- a/htdocs/commande/list.php
+++ b/htdocs/commande/list.php
@@ -192,11 +192,11 @@ $arrayfields = array(
 	'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'=>(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.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' => (empty($conf->margin->enabled) || !$user->rights->margins->liretous ? 0 : 1)),

From 98b88fab9b301e1b6913fefed4438f748c264f64 Mon Sep 17 00:00:00 2001
From: ptibogxiv <support@ptibogxiv.net>
Date: Sat, 3 Sep 2022 11:12:45 +0200
Subject: [PATCH 641/974] Update note.php

---
 htdocs/user/note.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/htdocs/user/note.php b/htdocs/user/note.php
index c0c93a75d64..2b9e8388063 100644
--- a/htdocs/user/note.php
+++ b/htdocs/user/note.php
@@ -40,7 +40,7 @@ $object->fetch($id, '', '', 1);
 $object->getrights();
 
 // If user is not user read and no permission to read other users, we stop
-if (($object->id != $user->id) && (!$user->rights->user->user->lire)) {
+if (($object->id != $user->id) && (!$user->hasRight("user", "user", "read"))) {
 	accessforbidden();
 }
 
@@ -52,7 +52,7 @@ $socid = 0;
 if ($user->socid > 0) {
 	$socid = $user->socid;
 }
-$feature2 = (($socid && $user->rights->user->self->creer) ? '' : 'user');
+$feature2 = (($socid && $user->hasRight("user", "self", "write")) ? '' : 'user');
 
 $result = restrictedArea($user, 'user', $id, 'user&user', $feature2);
 
@@ -89,7 +89,7 @@ if ($id) {
 
 	$linkback = '';
 
-	if ($user->rights->user->user->lire || $user->admin) {
+	if ($user->hasRight("user", "user", "read") || $user->admin) {
 		$linkback = '<a href="'.DOL_URL_ROOT.'/user/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 	}
 
@@ -97,7 +97,7 @@ if ($id) {
 	$morehtmlref .= img_picto($langs->trans("Download").' '.$langs->trans("VCard"), 'vcard.png', 'class="valignmiddle marginleftonly paddingrightonly"');
 	$morehtmlref .= '</a>';
 
-	dol_banner_tab($object, 'id', $linkback, $user->rights->user->user->lire || $user->admin, 'rowid', 'ref', $morehtmlref);
+	dol_banner_tab($object, 'id', $linkback, $user->hasRight("user", "user", "read") || $user->admin, 'rowid', 'ref', $morehtmlref);
 
 	print '<div class="underbanner clearboth"></div>';
 
@@ -117,7 +117,7 @@ if ($id) {
 		print '<td>';
 		$addadmin = '';
 		if (property_exists($object, 'admin')) {
-			if (!empty($conf->multicompany->enabled) && !empty($object->admin) && empty($object->entity)) {
+			if (isModEnabled('multicompany') && !empty($object->admin) && empty($object->entity)) {
 				$addadmin .= img_picto($langs->trans("SuperAdministratorDesc"), "redstar", 'class="paddingleft"');
 			} elseif (!empty($object->admin)) {
 				$addadmin .= img_picto($langs->trans("AdministratorDesc"), "star", 'class="paddingleft"');

From 7997776cbbb46105f4e6b54fb5954cb814630069 Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Sat, 3 Sep 2022 11:12:52 +0200
Subject: [PATCH 642/974] Update code

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

diff --git a/htdocs/commande/class/commande.class.php b/htdocs/commande/class/commande.class.php
index ca7d462a432..683074490a8 100644
--- a/htdocs/commande/class/commande.class.php
+++ b/htdocs/commande/class/commande.class.php
@@ -348,12 +348,12 @@ class Commande extends CommonOrder
 		'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'=>'$conf->multicurrency->enabled', 'visible'=>-1, 'position'=>240),
-		'multicurrency_code' =>array('type'=>'varchar(255)', 'label'=>'MulticurrencyCurrency', 'enabled'=>'$conf->multicurrency->enabled', 'visible'=>-1, 'position'=>245),
-		'multicurrency_tx' =>array('type'=>'double(24,8)', 'label'=>'MulticurrencyRate', 'enabled'=>'$conf->multicurrency->enabled', 'visible'=>-1, 'position'=>250, 'isameasure'=>1),
-		'multicurrency_total_ht' =>array('type'=>'double(24,8)', 'label'=>'MulticurrencyAmountHT', 'enabled'=>'$conf->multicurrency->enabled', 'visible'=>-1, 'position'=>255, 'isameasure'=>1),
-		'multicurrency_total_tva' =>array('type'=>'double(24,8)', 'label'=>'MulticurrencyAmountVAT', 'enabled'=>'$conf->multicurrency->enabled', 'visible'=>-1, 'position'=>260, 'isameasure'=>1),
-		'multicurrency_total_ttc' =>array('type'=>'double(24,8)', 'label'=>'MulticurrencyAmountTTC', 'enabled'=>'$conf->multicurrency->enabled', 'visible'=>-1, 'position'=>265, 'isameasure'=>1),
+		'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),

From 5a98b72faff4e08384ccdc3860713313e62a6db1 Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Sat, 3 Sep 2022 11:14:05 +0200
Subject: [PATCH 643/974] Update code

---
 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 594ee548da7..c6281e77e67 100644
--- a/htdocs/compta/facture/class/facture.class.php
+++ b/htdocs/compta/facture/class/facture.class.php
@@ -348,12 +348,12 @@ class Facture extends CommonInvoice
 		'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'=>'$conf->multicurrency->enabled', 'visible'=>-1, 'position'=>275),
-		'multicurrency_code' =>array('type'=>'varchar(255)', 'label'=>'Currency', 'enabled'=>'$conf->multicurrency->enabled', 'visible'=>-1, 'position'=>280),
-		'multicurrency_tx' =>array('type'=>'double(24,8)', 'label'=>'CurrencyRate', 'enabled'=>'$conf->multicurrency->enabled', 'visible'=>-1, 'position'=>285, 'isameasure'=>1),
-		'multicurrency_total_ht' =>array('type'=>'double(24,8)', 'label'=>'MulticurrencyAmountHT', 'enabled'=>'$conf->multicurrency->enabled', 'visible'=>-1, 'position'=>290, 'isameasure'=>1),
-		'multicurrency_total_tva' =>array('type'=>'double(24,8)', 'label'=>'MulticurrencyAmountVAT', 'enabled'=>'$conf->multicurrency->enabled', 'visible'=>-1, 'position'=>291, 'isameasure'=>1),
-		'multicurrency_total_ttc' =>array('type'=>'double(24,8)', 'label'=>'MulticurrencyAmountTTC', 'enabled'=>'$conf->multicurrency->enabled', 'visible'=>-1, 'position'=>292, 'isameasure'=>1),
+		'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'=>1, 'visible'=>-1, 'position'=>315),

From d96c60ec8b0f86227d2e7326ef30a3864422724c Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Sat, 3 Sep 2022 11:16:00 +0200
Subject: [PATCH 644/974] Update code

---
 htdocs/contrat/card.php                       | 6 +++---
 htdocs/core/class/commonobject.class.php      | 4 ++--
 htdocs/core/class/dolreceiptprinter.class.php | 2 +-
 htdocs/core/lib/pdf.lib.php                   | 6 +++---
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/htdocs/contrat/card.php b/htdocs/contrat/card.php
index 564122f3137..30b884d288c 100644
--- a/htdocs/contrat/card.php
+++ b/htdocs/contrat/card.php
@@ -1514,7 +1514,7 @@ if ($action == 'create') {
 				print '<td>'.$langs->trans("ServiceNb", $cursorline).'</td>';
 				print '<td width="80" class="center">'.$langs->trans("VAT").'</td>';
 				print '<td width="80" class="right">'.$langs->trans("PriceUHT").'</td>';
-				//if (!empty($conf->multicurrency->enabled)) {
+				//if (isModEnabled("multicurrency")) {
 				//	print '<td width="80" class="right">'.$langs->trans("PriceUHTCurrency").'</td>';
 				//}
 				print '<td width="30" class="center">'.$langs->trans("Qty").'</td>';
@@ -1575,7 +1575,7 @@ if ($action == 'create') {
 					// Price
 					print '<td class="right">'.($objp->subprice != '' ? price($objp->subprice) : '')."</td>\n";
 					// Price multicurrency
-					/*if (!empty($conf->multicurrency->enabled)) {
+					/*if (isModEnabled("multicurrency")) {
 						print '<td class="linecoluht_currency nowrap right">'.price($objp->multicurrency_subprice).'</td>';
 					}*/
 					// Quantity
@@ -1718,7 +1718,7 @@ if ($action == 'create') {
 					print '<td class="right"><input size="5" type="text" name="elprice" value="'.price($objp->subprice).'"></td>';
 
 					// Price multicurrency
-					/*if (!empty($conf->multicurrency->enabled)) {
+					/*if (isModEnabled("multicurrency")) {
 					 print '<td class="linecoluht_currency nowrap right">'.price($objp->multicurrency_subprice).'</td>';
 					 }*/
 
diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index 4aeed158dc5..8be014b8959 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -3,7 +3,7 @@
  * Copyright (C) 2005-2013 Regis Houssin        <regis.houssin@inodbox.com>
  * Copyright (C) 2010-2020 Juanjo Menent        <jmenent@2byte.es>
  * Copyright (C) 2012-2013 Christophe Battarel  <christophe.battarel@altairis.fr>
- * Copyright (C) 2011-2019 Philippe Grand       <philippe.grand@atoo-net.com>
+ * Copyright (C) 2011-2022 Philippe Grand       <philippe.grand@atoo-net.com>
  * Copyright (C) 2012-2015 Marcos García        <marcosgdf@gmail.com>
  * Copyright (C) 2012-2015 Raphaël Doursenaud   <rdoursenaud@gpcsolutions.fr>
  * Copyright (C) 2012      Cedric Salvador      <csalvador@gpcsolutions.fr>
@@ -5086,7 +5086,7 @@ abstract class CommonObject
 		print '<td class="linecoldescription">'.$langs->trans('Description').'</td>';
 		print '<td class="linecolvat right">'.$langs->trans('VATRate').'</td>';
 		print '<td class="linecoluht right">'.$langs->trans('PriceUHT').'</td>';
-		if (!empty($conf->multicurrency->enabled)) {
+		if (isModEnabled("multicurrency")) {
 			print '<td class="linecoluht_currency right">'.$langs->trans('PriceUHTCurrency').'</td>';
 		}
 		print '<td class="linecolqty right">'.$langs->trans('Qty').'</td>';
diff --git a/htdocs/core/class/dolreceiptprinter.class.php b/htdocs/core/class/dolreceiptprinter.class.php
index 49dccc2d0fa..b76ad8c7a47 100644
--- a/htdocs/core/class/dolreceiptprinter.class.php
+++ b/htdocs/core/class/dolreceiptprinter.class.php
@@ -830,7 +830,7 @@ class dolReceiptPrinter extends Printer
 								$row = $this->db->fetch_object($resql);
 								$spacestoadd = $nbcharactbyline - strlen($langs->transnoentitiesnoconv("PaymentTypeShort".$row->code)) - 12;
 								$spaces = str_repeat(' ', $spacestoadd > 0 ? $spacestoadd : 0);
-								$amount_payment = (!empty($conf->multicurrency->enabled) && $object->multicurrency_tx != 1) ? $row->multicurrency_amount : $row->amount;
+								$amount_payment = (isModEnabled("multicurrency") && $object->multicurrency_tx != 1) ? $row->multicurrency_amount : $row->amount;
 								if ($row->code == "LIQ") {
 									$amount_payment = $amount_payment + $row->pos_change; // Show amount with excess received if is cash payment
 								}
diff --git a/htdocs/core/lib/pdf.lib.php b/htdocs/core/lib/pdf.lib.php
index 4efea43b044..3b0c2250c49 100644
--- a/htdocs/core/lib/pdf.lib.php
+++ b/htdocs/core/lib/pdf.lib.php
@@ -1868,7 +1868,7 @@ function pdf_getlineupexcltax($object, $i, $outputlangs, $hidedetails = 0)
 	}
 	if (empty($reshook)) {
 		if (empty($hidedetails) || $hidedetails > 1) {
-			$subprice = (!empty($conf->multicurrency->enabled) && $object->multicurrency_tx != 1 ? $object->lines[$i]->multicurrency_subprice : $object->lines[$i]->subprice);
+			$subprice = (isModEnabled("multicurrency") && $object->multicurrency_tx != 1 ? $object->lines[$i]->multicurrency_subprice : $object->lines[$i]->subprice);
 			$result .= price($sign * $subprice, 0, $outputlangs);
 		}
 	}
@@ -2253,7 +2253,7 @@ function pdf_getlinetotalexcltax($object, $i, $outputlangs, $hidedetails = 0)
 		if ($object->lines[$i]->special_code == 3) {
 			$result .= $outputlangs->transnoentities("Option");
 		} elseif (empty($hidedetails) || $hidedetails > 1) {
-			$total_ht = (!empty($conf->multicurrency->enabled) && $object->multicurrency_tx != 1 ? $object->lines[$i]->multicurrency_total_ht : $object->lines[$i]->total_ht);
+			$total_ht = (isModEnabled("multicurrency") && $object->multicurrency_tx != 1 ? $object->lines[$i]->multicurrency_total_ht : $object->lines[$i]->total_ht);
 			if (!empty($object->lines[$i]->situation_percent) && $object->lines[$i]->situation_percent > 0) {
 				// TODO Remove this. The total should be saved correctly in database instead of being modified here.
 				$prev_progress = 0;
@@ -2309,7 +2309,7 @@ function pdf_getlinetotalwithtax($object, $i, $outputlangs, $hidedetails = 0)
 		if ($object->lines[$i]->special_code == 3) {
 			$result .= $outputlangs->transnoentities("Option");
 		} elseif (empty($hidedetails) || $hidedetails > 1) {
-			$total_ttc = (!empty($conf->multicurrency->enabled) && $object->multicurrency_tx != 1 ? $object->lines[$i]->multicurrency_total_ttc : $object->lines[$i]->total_ttc);
+			$total_ttc = (isModEnabled("multicurrency") && $object->multicurrency_tx != 1 ? $object->lines[$i]->multicurrency_total_ttc : $object->lines[$i]->total_ttc);
 			if ($object->lines[$i]->situation_percent > 0) {
 				// TODO Remove this. The total should be saved correctly in database instead of being modified here.
 				$prev_progress = 0;

From 53b7540d6037a5e801f276c04d456126416ea1fb Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Sat, 3 Sep 2022 11:17:05 +0200
Subject: [PATCH 645/974] Update code

---
 htdocs/core/modules/modCommande.class.php    |  6 +++---
 htdocs/core/modules/modFacture.class.php     |  8 ++++----
 htdocs/core/modules/modFournisseur.class.php | 14 +++++++-------
 3 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/htdocs/core/modules/modCommande.class.php b/htdocs/core/modules/modCommande.class.php
index 4f2b58ff00d..6a88c14271b 100644
--- a/htdocs/core/modules/modCommande.class.php
+++ b/htdocs/core/modules/modCommande.class.php
@@ -211,7 +211,7 @@ class modCommande extends DolibarrModules
 			'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 (!empty($conf->multicurrency->enabled)) {
+		if (isModEnabled("multicurrency")) {
 			$this->export_fields_array[$r]['c.multicurrency_code'] = 'Currency';
 			$this->export_fields_array[$r]['c.multicurrency_tx'] = 'CurrencyRate';
 			$this->export_fields_array[$r]['c.multicurrency_total_ht'] = 'MulticurrencyAmountHT';
@@ -328,7 +328,7 @@ class modCommande extends DolibarrModules
 			'c.fk_statut'         => 'Status*'
 		);
 
-		if (!empty($conf->multicurrency->enabled)) {
+		if (isModEnabled("multicurrency")) {
 			$this->import_fields_array[$r]['c.multicurrency_code']      = 'Currency';
 			$this->import_fields_array[$r]['c.multicurrency_tx']        = 'CurrencyRate';
 			$this->import_fields_array[$r]['c.multicurrency_total_ht']  = 'MulticurrencyAmountHT';
@@ -405,7 +405,7 @@ class modCommande extends DolibarrModules
 			'cd.rang'           => 'LinePosition'
 		);
 
-		if (!empty($conf->multicurrency->enabled)) {
+		if (isModEnabled("multicurrency")) {
 			$this->import_fields_array[$r]['cd.multicurrency_code'] = 'Currency';
 			$this->import_fields_array[$r]['cd.multicurrency_subprice'] = 'CurrencyRate';
 			$this->import_fields_array[$r]['cd.multicurrency_total_ht'] = 'MulticurrencyAmountHT';
diff --git a/htdocs/core/modules/modFacture.class.php b/htdocs/core/modules/modFacture.class.php
index a819dae666c..f7d902d22f1 100644
--- a/htdocs/core/modules/modFacture.class.php
+++ b/htdocs/core/modules/modFacture.class.php
@@ -267,7 +267,7 @@ class modFacture extends DolibarrModules
 			'f.note_private' => 'NotePrivate',
 			'f.model_pdf' => 'Model'
 		);
-		if (!empty($conf->multicurrency->enabled)) {
+		if (isModEnabled("multicurrency")) {
 			$this->import_fields_array[$r]['f.multicurrency_code'] = 'Currency';
 			$this->import_fields_array[$r]['f.multicurrency_tx'] = 'CurrencyRate';
 			$this->import_fields_array[$r]['f.multicurrency_total_ht'] = 'MulticurrencyAmountHT';
@@ -399,7 +399,7 @@ class modFacture extends DolibarrModules
 			// fk_user_modif
 			// ref_ext
 		);
-		if (!empty($conf->multicurrency->enabled)) {
+		if (isModEnabled("multicurrency")) {
 			$this->import_fields_array[$r]['fd.multicurrency_code'] = 'Currency';
 			$this->import_fields_array[$r]['fd.multicurrency_subprice'] = 'CurrencyRate';
 			$this->import_fields_array[$r]['fd.multicurrency_total_ht'] = 'MulticurrencyAmountHT';
@@ -518,7 +518,7 @@ class modFacture extends DolibarrModules
 			'f.note_private'=>"NotePrivate", 'f.note_public'=>"NotePublic"
 		);
 		// Add multicurrency fields
-		if (!empty($conf->multicurrency->enabled)) {
+		if (isModEnabled("multicurrency")) {
 			$this->export_fields_array[$r]['f.multicurrency_code'] = 'Currency';
 			$this->export_fields_array[$r]['f.multicurrency_tx'] = 'CurrencyRate';
 			$this->export_fields_array[$r]['f.multicurrency_total_ht'] = 'MulticurrencyAmountHT';
@@ -647,7 +647,7 @@ class modFacture extends DolibarrModules
 			'pt.code'=>'CodePaymentMode', 'pt.libelle'=>'LabelPaymentMode', 'p.note'=>'PaymentNote', 'p.fk_bank'=>'IdTransaction', 'ba.ref'=>'AccountRef'
 		);
 		$this->export_help_array[$r] = array('f.paye'=>'InvoicePaidCompletelyHelp');
-		if (!empty($conf->multicurrency->enabled)) {
+		if (isModEnabled("multicurrency")) {
 			$this->export_fields_array[$r]['f.multicurrency_code'] = 'Currency';
 			$this->export_fields_array[$r]['f.multicurrency_tx'] = 'CurrencyRate';
 			$this->export_fields_array[$r]['f.multicurrency_total_ht'] = 'MulticurrencyAmountHT';
diff --git a/htdocs/core/modules/modFournisseur.class.php b/htdocs/core/modules/modFournisseur.class.php
index afc6fec4fc6..e05d7964094 100644
--- a/htdocs/core/modules/modFournisseur.class.php
+++ b/htdocs/core/modules/modFournisseur.class.php
@@ -317,7 +317,7 @@ class modFournisseur extends DolibarrModules
 			'p.ref'=>'ProductRef', 'p.label'=>'ProductLabel', 'p.accountancy_code_buy'=>'ProductAccountancyBuyCode', 'project.rowid'=>'ProjectId',
 			'project.ref'=>'ProjectRef', 'project.title'=>'ProjectLabel'
 		);
-		if (!empty($conf->multicurrency->enabled)) {
+		if (isModEnabled("multicurrency")) {
 			$this->export_fields_array[$r]['f.multicurrency_code'] = 'Currency';
 			$this->export_fields_array[$r]['f.multicurrency_tx'] = 'CurrencyRate';
 			$this->export_fields_array[$r]['f.multicurrency_total_ht'] = 'MulticurrencyAmountHT';
@@ -391,7 +391,7 @@ class modFournisseur extends DolibarrModules
 			'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 (!empty($conf->multicurrency->enabled)) {
+		if (isModEnabled("multicurrency")) {
 			$this->export_fields_array[$r]['f.multicurrency_code'] = 'Currency';
 			$this->export_fields_array[$r]['f.multicurrency_tx'] = 'CurrencyRate';
 			$this->export_fields_array[$r]['f.multicurrency_total_ht'] = 'MulticurrencyAmountHT';
@@ -458,7 +458,7 @@ class modFournisseur extends DolibarrModules
 			'fd.product_type'=>'TypeOfLineServiceOrProduct', 'fd.ref'=>'RefSupplier', 'fd.fk_product'=>'ProductId',
 			'p.ref'=>'ProductRef', 'p.label'=>'ProductLabel', 'project.rowid'=>'ProjectId', 'project.ref'=>'ProjectRef', 'project.title'=>'ProjectLabel'
 		);
-		if (!empty($conf->multicurrency->enabled)) {
+		if (isModEnabled("multicurrency")) {
 			$this->export_fields_array[$r]['f.multicurrency_code'] = 'Currency';
 			$this->export_fields_array[$r]['f.multicurrency_tx'] = 'CurrencyRate';
 			$this->export_fields_array[$r]['f.multicurrency_total_ht'] = 'MulticurrencyAmountHT';
@@ -557,7 +557,7 @@ class modFournisseur extends DolibarrModules
 			'f.model_pdf' => 'Model',
 			'f.date_valid' => 'Validation Date'
 		);
-		if (!empty($conf->multicurrency->enabled)) {
+		if (isModEnabled("multicurrency")) {
 			$this->import_fields_array[$r]['f.multicurrency_code'] = 'Currency';
 			$this->import_fields_array[$r]['f.multicurrency_tx'] = 'CurrencyRate';
 			$this->import_fields_array[$r]['f.multicurrency_total_ht'] = 'MulticurrencyAmountHT';
@@ -649,7 +649,7 @@ class modFournisseur extends DolibarrModules
 			'fd.date_end' => 'End Date',
 			'fd.fk_unit' => 'Unit'
 		);
-		if (!empty($conf->multicurrency->enabled)) {
+		if (isModEnabled("multicurrency")) {
 			$this->import_fields_array[$r]['fd.multicurrency_code'] = 'Currency';
 			$this->import_fields_array[$r]['fd.multicurrency_subprice'] = 'CurrencyRate';
 			$this->import_fields_array[$r]['fd.multicurrency_total_ht'] = 'MulticurrencyAmountHT';
@@ -735,7 +735,7 @@ class modFournisseur extends DolibarrModules
 			'c.model_pdf'         => 'Model'
 		);
 
-		if (!empty($conf->multicurrency->enabled)) {
+		if (isModEnabled("multicurrency")) {
 			$this->import_fields_array[$r]['c.multicurrency_code']      = 'Currency';
 			$this->import_fields_array[$r]['c.multicurrency_tx']        = 'CurrencyRate';
 			$this->import_fields_array[$r]['c.multicurrency_total_ht']  = 'MulticurrencyAmountHT';
@@ -817,7 +817,7 @@ class modFournisseur extends DolibarrModules
 			'cd.fk_unit'        => 'Unit'
 		);
 
-		if (!empty($conf->multicurrency->enabled)) {
+		if (isModEnabled("multicurrency")) {
 			$this->import_fields_array[$r]['cd.multicurrency_code'] = 'Currency';
 			$this->import_fields_array[$r]['cd.multicurrency_subprice'] = 'CurrencyRate';
 			$this->import_fields_array[$r]['cd.multicurrency_total_ht'] = 'MulticurrencyAmountHT';

From 30c58ab74db0d7ee9481ec6f4db880f79b22408f Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Sat, 3 Sep 2022 11:19:18 +0200
Subject: [PATCH 646/974] Update code

---
 .../core/modules/asset/doc/pdf_standard_asset.modules.php   | 4 ++--
 htdocs/core/modules/commande/doc/pdf_einstein.modules.php   | 6 +++---
 .../core/modules/commande/doc/pdf_eratosthene.modules.php   | 6 +++---
 htdocs/core/modules/modProduct.class.php                    | 4 ++--
 htdocs/core/modules/modPropale.class.php                    | 6 +++---
 htdocs/core/modules/modService.class.php                    | 4 ++--
 6 files changed, 15 insertions(+), 15 deletions(-)

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 de378ee79a8..e313c612eb0 100644
--- a/htdocs/core/modules/asset/doc/pdf_standard_asset.modules.php
+++ b/htdocs/core/modules/asset/doc/pdf_standard_asset.modules.php
@@ -669,13 +669,13 @@ class pdf_standard_asset extends ModelePDFAsset
 					// Collecte des totaux par valeur de tva dans $this->tva["taux"]=total_tva
 					$prev_progress = $object->lines[$i]->get_prev_progress($object->id);
 					if ($prev_progress > 0 && !empty($object->lines[$i]->situation_percent)) { // Compute progress from previous situation
-						if (!empty($conf->multicurrency->enabled) && $object->multicurrency_tx != 1) {
+						if (isModEnabled("multicurrency") && $object->multicurrency_tx != 1) {
 							$tvaligne = $sign * $object->lines[$i]->multicurrency_total_tva * ($object->lines[$i]->situation_percent - $prev_progress) / $object->lines[$i]->situation_percent;
 						} else {
 							$tvaligne = $sign * $object->lines[$i]->total_tva * ($object->lines[$i]->situation_percent - $prev_progress) / $object->lines[$i]->situation_percent;
 						}
 					} else {
-						if (!empty($conf->multicurrency->enabled) && $object->multicurrency_tx != 1) {
+						if (isModEnabled("multicurrency") && $object->multicurrency_tx != 1) {
 							$tvaligne = $sign * $object->lines[$i]->multicurrency_total_tva;
 						} else {
 							$tvaligne = $sign * $object->lines[$i]->total_tva;
diff --git a/htdocs/core/modules/commande/doc/pdf_einstein.modules.php b/htdocs/core/modules/commande/doc/pdf_einstein.modules.php
index d34c66c0def..b1476b393d0 100644
--- a/htdocs/core/modules/commande/doc/pdf_einstein.modules.php
+++ b/htdocs/core/modules/commande/doc/pdf_einstein.modules.php
@@ -529,7 +529,7 @@ class pdf_einstein extends ModelePDFCommandes
 					$pdf->MultiCell($this->page_largeur - $this->marge_droite - $this->postotalht, 3, $total_excl_tax, 0, 'R', 0);
 
 					// Collection of totals by value of vat in $this->vat["rate"] = total_tva
-					if (!empty($conf->multicurrency->enabled) && $object->multicurrency_tx != 1) {
+					if (isModEnabled("multicurrency") && $object->multicurrency_tx != 1) {
 						$tvaligne = $object->lines[$i]->multicurrency_total_tva;
 					} else {
 						$tvaligne = $object->lines[$i]->total_tva;
@@ -938,14 +938,14 @@ class pdf_einstein extends ModelePDFCommandes
 		$pdf->SetXY($col1x, $tab2_top + 0);
 		$pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transnoentities("TotalHT").(is_object($outputlangsbis) ? ' / '.$outputlangsbis->transnoentities("TotalHT") : ''), 0, 'L', 1);
 
-		$total_ht = ((!empty($conf->multicurrency->enabled) && isset($object->multicurrency_tx) && $object->multicurrency_tx != 1) ? $object->multicurrency_total_ht : $object->total_ht);
+		$total_ht = ((isModEnabled("multicurrency") && isset($object->multicurrency_tx) && $object->multicurrency_tx != 1) ? $object->multicurrency_total_ht : $object->total_ht);
 		$pdf->SetXY($col2x, $tab2_top + 0);
 		$pdf->MultiCell($largcol2, $tab2_hl, price($total_ht + (!empty($object->remise) ? $object->remise : 0), 0, $outputlangs), 0, 'R', 1);
 
 		// Show VAT by rates and total
 		$pdf->SetFillColor(248, 248, 248);
 
-		$total_ttc = (!empty($conf->multicurrency->enabled) && $object->multicurrency_tx != 1) ? $object->multicurrency_total_ttc : $object->total_ttc;
+		$total_ttc = (isModEnabled("multicurrency") && $object->multicurrency_tx != 1) ? $object->multicurrency_total_ttc : $object->total_ttc;
 
 		$this->atleastoneratenotnull = 0;
 		if (empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT)) {
diff --git a/htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php b/htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php
index 28003fff639..34cdb41e6b8 100644
--- a/htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php
+++ b/htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php
@@ -754,7 +754,7 @@ class pdf_eratosthene extends ModelePDFCommandes
 
 
 					// Collection of totals by value of vat in $this->tva["rate"] = total_tva
-					if (!empty($conf->multicurrency->enabled) && $object->multicurrency_tx != 1) {
+					if (isModEnabled("multicurrency") && $object->multicurrency_tx != 1) {
 						$tvaligne = $object->lines[$i]->multicurrency_total_tva;
 					} else {
 						$tvaligne = $object->lines[$i]->total_tva;
@@ -1152,14 +1152,14 @@ class pdf_eratosthene extends ModelePDFCommandes
 		$pdf->SetFillColor(255, 255, 255);
 		$pdf->SetXY($col1x, $tab2_top + 0);
 		$pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transnoentities("TotalHT").(is_object($outputlangsbis) ? ' / '.$outputlangsbis->transnoentities("TotalHT") : ''), 0, 'L', 1);
-		$total_ht = ((!empty($conf->multicurrency->enabled) && isset($object->multicurrency_tx) && $object->multicurrency_tx != 1) ? $object->multicurrency_total_ht : $object->total_ht);
+		$total_ht = ((isModEnabled("multicurrency") && isset($object->multicurrency_tx) && $object->multicurrency_tx != 1) ? $object->multicurrency_total_ht : $object->total_ht);
 		$pdf->SetXY($col2x, $tab2_top + 0);
 		$pdf->MultiCell($largcol2, $tab2_hl, price($total_ht + (!empty($object->remise) ? $object->remise : 0), 0, $outputlangs), 0, 'R', 1);
 
 		// Show VAT by rates and total
 		$pdf->SetFillColor(248, 248, 248);
 
-		$total_ttc = (!empty($conf->multicurrency->enabled) && $object->multicurrency_tx != 1) ? $object->multicurrency_total_ttc : $object->total_ttc;
+		$total_ttc = (isModEnabled("multicurrency") && $object->multicurrency_tx != 1) ? $object->multicurrency_total_ttc : $object->total_ttc;
 
 		$this->atleastoneratenotnull = 0;
 		if (empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT)) {
diff --git a/htdocs/core/modules/modProduct.class.php b/htdocs/core/modules/modProduct.class.php
index f3c79de5ab8..604d96fd4cd 100644
--- a/htdocs/core/modules/modProduct.class.php
+++ b/htdocs/core/modules/modProduct.class.php
@@ -791,7 +791,7 @@ class modProduct extends DolibarrModules
 					'sp.remise_percent'=>'DiscountQtyMin'
 			));
 
-			if (!empty($conf->multicurrency->enabled)) {
+			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',
@@ -853,7 +853,7 @@ class modProduct extends DolibarrModules
 				// TODO Make this field not required and calculate it from price and qty
 				'sp.remise_percent' => '20'
 			));
-			if (!empty($conf->multicurrency->enabled)) {
+			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',
diff --git a/htdocs/core/modules/modPropale.class.php b/htdocs/core/modules/modPropale.class.php
index 13991cdcafa..524aa0086ea 100644
--- a/htdocs/core/modules/modPropale.class.php
+++ b/htdocs/core/modules/modPropale.class.php
@@ -197,7 +197,7 @@ class modPropale extends DolibarrModules
 			'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 (!empty($conf->multicurrency->enabled)) {
+		if (isModEnabled("multicurrency")) {
 			$this->export_fields_array[$r]['c.multicurrency_code'] = 'Currency';
 			$this->export_fields_array[$r]['c.multicurrency_tx'] = 'CurrencyRate';
 			$this->export_fields_array[$r]['c.multicurrency_total_ht'] = 'MulticurrencyAmountHT';
@@ -300,7 +300,7 @@ class modPropale extends DolibarrModules
 			'c.date_livraison' => 'DeliveryDate',
 			'c.fk_user_valid' => 'ValidatedById'
 		);
-		if (!empty($conf->multicurrency->enabled)) {
+		if (isModEnabled("multicurrency")) {
 			$this->import_fields_array[$r]['c.multicurrency_code'] = 'Currency';
 			$this->import_fields_array[$r]['c.multicurrency_tx'] = 'CurrencyRate';
 			$this->import_fields_array[$r]['c.multicurrency_total_ht'] = 'MulticurrencyAmountHT';
@@ -388,7 +388,7 @@ class modPropale extends DolibarrModules
 			'cd.date_end' => 'End Date',
 			'cd.buy_price_ht' => 'LineBuyPriceHT'
 		);
-		if (!empty($conf->multicurrency->enabled)) {
+		if (isModEnabled("multicurrency")) {
 			$this->import_fields_array[$r]['cd.multicurrency_code'] = 'Currency';
 			$this->import_fields_array[$r]['cd.multicurrency_subprice'] = 'CurrencyRate';
 			$this->import_fields_array[$r]['cd.multicurrency_total_ht'] = 'MulticurrencyAmountHT';
diff --git a/htdocs/core/modules/modService.class.php b/htdocs/core/modules/modService.class.php
index 598c9131efb..d2431d3e22c 100644
--- a/htdocs/core/modules/modService.class.php
+++ b/htdocs/core/modules/modService.class.php
@@ -740,7 +740,7 @@ class modService extends DolibarrModules
 					'sp.remise_percent'=>'DiscountQtyMin'
 				));
 
-				if (!empty($conf->multicurrency->enabled)) {
+				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',
@@ -782,7 +782,7 @@ class modService extends DolibarrModules
 					// TODO Make this field not required and calculate it from price and qty
 					'sp.remise_percent' => '20'
 					));
-				if (!empty($conf->multicurrency->enabled)) {
+				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',

From 7cf367f0cbd997275927890bcaa541a0c398eca0 Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Sat, 3 Sep 2022 11:21:11 +0200
Subject: [PATCH 647/974] Update code

---
 .../modules/facture/doc/pdf_crabe.modules.php | 22 ++++++++---------
 .../facture/doc/pdf_sponge.modules.php        | 24 +++++++++----------
 .../modules/mrp/doc/pdf_vinci.modules.php     |  4 ++--
 .../product/doc/pdf_standard.modules.php      |  2 +-
 .../modules/propale/doc/pdf_azur.modules.php  |  6 ++---
 .../modules/propale/doc/pdf_cyan.modules.php  |  6 ++---
 6 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/htdocs/core/modules/facture/doc/pdf_crabe.modules.php b/htdocs/core/modules/facture/doc/pdf_crabe.modules.php
index 3b82e92f1ab..2a94a94103e 100644
--- a/htdocs/core/modules/facture/doc/pdf_crabe.modules.php
+++ b/htdocs/core/modules/facture/doc/pdf_crabe.modules.php
@@ -298,9 +298,9 @@ class pdf_crabe extends ModelePDFFactures
 		if ($conf->facture->dir_output) {
 			$object->fetch_thirdparty();
 
-			$deja_regle = $object->getSommePaiement((!empty($conf->multicurrency->enabled) && $object->multicurrency_tx != 1) ? 1 : 0);
-			$amount_credit_notes_included = $object->getSumCreditNotesUsed((!empty($conf->multicurrency->enabled) && $object->multicurrency_tx != 1) ? 1 : 0);
-			$amount_deposits_included = $object->getSumDepositsUsed((!empty($conf->multicurrency->enabled) && $object->multicurrency_tx != 1) ? 1 : 0);
+			$deja_regle = $object->getSommePaiement((isModEnabled("multicurrency") && $object->multicurrency_tx != 1) ? 1 : 0);
+			$amount_credit_notes_included = $object->getSumCreditNotesUsed((isModEnabled("multicurrency") && $object->multicurrency_tx != 1) ? 1 : 0);
+			$amount_deposits_included = $object->getSumDepositsUsed((isModEnabled("multicurrency") && $object->multicurrency_tx != 1) ? 1 : 0);
 
 			// Definition of $dir and $file
 			if ($object->specimen) {
@@ -707,13 +707,13 @@ class pdf_crabe extends ModelePDFFactures
 					// Collection of totals by value of VAT in $this->tva["taux"]=total_tva
 					$prev_progress = $object->lines[$i]->get_prev_progress($object->id);
 					if ($prev_progress > 0 && !empty($object->lines[$i]->situation_percent)) { // Compute progress from previous situation
-						if (!empty($conf->multicurrency->enabled) && $object->multicurrency_tx != 1) {
+						if (isModEnabled("multicurrency") && $object->multicurrency_tx != 1) {
 							$tvaligne = $sign * $object->lines[$i]->multicurrency_total_tva * ($object->lines[$i]->situation_percent - $prev_progress) / $object->lines[$i]->situation_percent;
 						} else {
 							$tvaligne = $sign * $object->lines[$i]->total_tva * ($object->lines[$i]->situation_percent - $prev_progress) / $object->lines[$i]->situation_percent;
 						}
 					} else {
-						if (!empty($conf->multicurrency->enabled) && $object->multicurrency_tx != 1) {
+						if (isModEnabled("multicurrency") && $object->multicurrency_tx != 1) {
 							$tvaligne = $sign * $object->lines[$i]->multicurrency_total_tva;
 						} else {
 							$tvaligne = $sign * $object->lines[$i]->total_tva;
@@ -966,7 +966,7 @@ class pdf_crabe extends ModelePDFFactures
 				$pdf->SetXY($tab3_posx, $tab3_top + $y);
 				$pdf->MultiCell(20, 3, dol_print_date($this->db->jdate($obj->datef), 'day', false, $outputlangs, true), 0, 'L', 0);
 				$pdf->SetXY($tab3_posx + 21, $tab3_top + $y);
-				$pdf->MultiCell(20, 3, price((!empty($conf->multicurrency->enabled) && $object->multicurrency_tx != 1) ? $obj->multicurrency_amount_ttc : $obj->amount_ttc, 0, $outputlangs), 0, 'L', 0);
+				$pdf->MultiCell(20, 3, price((isModEnabled("multicurrency") && $object->multicurrency_tx != 1) ? $obj->multicurrency_amount_ttc : $obj->amount_ttc, 0, $outputlangs), 0, 'L', 0);
 				$pdf->SetXY($tab3_posx + 40, $tab3_top + $y);
 				$pdf->MultiCell(20, 3, $text, 0, 'L', 0);
 				$pdf->SetXY($tab3_posx + 58, $tab3_top + $y);
@@ -1016,7 +1016,7 @@ class pdf_crabe extends ModelePDFFactures
 				$pdf->SetXY($tab3_posx, $tab3_top + $y);
 				$pdf->MultiCell(20, 3, dol_print_date($this->db->jdate($row->date), 'day', false, $outputlangs, true), 0, 'L', 0);
 				$pdf->SetXY($tab3_posx + 21, $tab3_top + $y);
-				$pdf->MultiCell(20, 3, price($sign * ((!empty($conf->multicurrency->enabled) && $object->multicurrency_tx != 1) ? $row->multicurrency_amount : $row->amount), 0, $outputlangs), 0, 'L', 0);
+				$pdf->MultiCell(20, 3, price($sign * ((isModEnabled("multicurrency") && $object->multicurrency_tx != 1) ? $row->multicurrency_amount : $row->amount), 0, $outputlangs), 0, 'L', 0);
 				$pdf->SetXY($tab3_posx + 40, $tab3_top + $y);
 				$oper = $outputlangs->transnoentitiesnoconv("PaymentTypeShort".$row->code);
 
@@ -1323,14 +1323,14 @@ class pdf_crabe extends ModelePDFFactures
 		$pdf->SetXY($col1x, $tab2_top + 0);
 		$pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transnoentities(empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT) ? "TotalHT" : "Total").(is_object($outputlangsbis) ? ' / '.$outputlangsbis->transnoentities(empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT) ? "TotalHT" : "Total") : ''), 0, 'L', 1);
 
-		$total_ht = ((!empty($conf->multicurrency->enabled) && isset($object->multicurrency_tx) && $object->multicurrency_tx != 1) ? $object->multicurrency_total_ht : $object->total_ht);
+		$total_ht = ((isModEnabled("multicurrency") && isset($object->multicurrency_tx) && $object->multicurrency_tx != 1) ? $object->multicurrency_total_ht : $object->total_ht);
 		$pdf->SetXY($col2x, $tab2_top + 0);
 		$pdf->MultiCell($largcol2, $tab2_hl, price($sign * ($total_ht + (!empty($object->remise) ? $object->remise : 0)), 0, $outputlangs), 0, 'R', 1);
 
 		// Show VAT by rates and total
 		$pdf->SetFillColor(248, 248, 248);
 
-		$total_ttc = (!empty($conf->multicurrency->enabled) && $object->multicurrency_tx != 1) ? $object->multicurrency_total_ttc : $object->total_ttc;
+		$total_ttc = (isModEnabled("multicurrency") && $object->multicurrency_tx != 1) ? $object->multicurrency_total_ttc : $object->total_ttc;
 
 		$this->atleastoneratenotnull = 0;
 		if (empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT)) {
@@ -1545,8 +1545,8 @@ class pdf_crabe extends ModelePDFFactures
 		}
 
 		$pdf->SetTextColor(0, 0, 0);
-		$creditnoteamount = $object->getSumCreditNotesUsed((!empty($conf->multicurrency->enabled) && $object->multicurrency_tx != 1) ? 1 : 0); // Warning, this also include excess received
-		$depositsamount = $object->getSumDepositsUsed((!empty($conf->multicurrency->enabled) && $object->multicurrency_tx != 1) ? 1 : 0);
+		$creditnoteamount = $object->getSumCreditNotesUsed((isModEnabled("multicurrency") && $object->multicurrency_tx != 1) ? 1 : 0); // Warning, this also include excess received
+		$depositsamount = $object->getSumDepositsUsed((isModEnabled("multicurrency") && $object->multicurrency_tx != 1) ? 1 : 0);
 		//print "x".$creditnoteamount."-".$depositsamount;exit;
 		$resteapayer = price2num($total_ttc - $deja_regle - $creditnoteamount - $depositsamount, 'MT');
 		if (!empty($object->paye)) {
diff --git a/htdocs/core/modules/facture/doc/pdf_sponge.modules.php b/htdocs/core/modules/facture/doc/pdf_sponge.modules.php
index a537e35223f..cb1c2fb64e0 100644
--- a/htdocs/core/modules/facture/doc/pdf_sponge.modules.php
+++ b/htdocs/core/modules/facture/doc/pdf_sponge.modules.php
@@ -331,9 +331,9 @@ class pdf_sponge extends ModelePDFFactures
 		if ($conf->facture->multidir_output[$conf->entity]) {
 			$object->fetch_thirdparty();
 
-			$deja_regle = $object->getSommePaiement((!empty($conf->multicurrency->enabled) && $object->multicurrency_tx != 1) ? 1 : 0);
-			$amount_credit_notes_included = $object->getSumCreditNotesUsed((!empty($conf->multicurrency->enabled) && $object->multicurrency_tx != 1) ? 1 : 0);
-			$amount_deposits_included = $object->getSumDepositsUsed((!empty($conf->multicurrency->enabled) && $object->multicurrency_tx != 1) ? 1 : 0);
+			$deja_regle = $object->getSommePaiement((isModEnabled("multicurrency") && $object->multicurrency_tx != 1) ? 1 : 0);
+			$amount_credit_notes_included = $object->getSumCreditNotesUsed((isModEnabled("multicurrency") && $object->multicurrency_tx != 1) ? 1 : 0);
+			$amount_deposits_included = $object->getSumDepositsUsed((isModEnabled("multicurrency") && $object->multicurrency_tx != 1) ? 1 : 0);
 
 			// Definition of $dir and $file
 			if ($object->specimen) {
@@ -871,13 +871,13 @@ class pdf_sponge extends ModelePDFFactures
 					// Collecte des totaux par valeur de tva dans $this->tva["taux"]=total_tva
 					$prev_progress = $object->lines[$i]->get_prev_progress($object->id);
 					if ($prev_progress > 0 && !empty($object->lines[$i]->situation_percent)) { // Compute progress from previous situation
-						if (!empty($conf->multicurrency->enabled) && $object->multicurrency_tx != 1) {
+						if (isModEnabled("multicurrency") && $object->multicurrency_tx != 1) {
 							$tvaligne = $sign * $object->lines[$i]->multicurrency_total_tva * ($object->lines[$i]->situation_percent - $prev_progress) / $object->lines[$i]->situation_percent;
 						} else {
 							$tvaligne = $sign * $object->lines[$i]->total_tva * ($object->lines[$i]->situation_percent - $prev_progress) / $object->lines[$i]->situation_percent;
 						}
 					} else {
-						if (!empty($conf->multicurrency->enabled) && $object->multicurrency_tx != 1) {
+						if (isModEnabled("multicurrency") && $object->multicurrency_tx != 1) {
 							$tvaligne = $sign * $object->lines[$i]->multicurrency_total_tva;
 						} else {
 							$tvaligne = $sign * $object->lines[$i]->total_tva;
@@ -1128,7 +1128,7 @@ class pdf_sponge extends ModelePDFFactures
 				$pdf->SetXY($tab3_posx, $tab3_top + $y);
 				$pdf->MultiCell(20, 3, dol_print_date($this->db->jdate($obj->datef), 'day', false, $outputlangs, true), 0, 'L', 0);
 				$pdf->SetXY($tab3_posx + 21, $tab3_top + $y);
-				$pdf->MultiCell(20, 3, price((!empty($conf->multicurrency->enabled) && $object->multicurrency_tx != 1) ? $obj->multicurrency_amount_ttc : $obj->amount_ttc, 0, $outputlangs), 0, 'L', 0);
+				$pdf->MultiCell(20, 3, price((isModEnabled("multicurrency") && $object->multicurrency_tx != 1) ? $obj->multicurrency_amount_ttc : $obj->amount_ttc, 0, $outputlangs), 0, 'L', 0);
 				$pdf->SetXY($tab3_posx + 40, $tab3_top + $y);
 				$pdf->MultiCell(20, 3, $text, 0, 'L', 0);
 				$pdf->SetXY($tab3_posx + 58, $tab3_top + $y);
@@ -1164,7 +1164,7 @@ class pdf_sponge extends ModelePDFFactures
 				$pdf->SetXY($tab3_posx, $tab3_top + $y);
 				$pdf->MultiCell(20, 3, dol_print_date($this->db->jdate($row->date), 'day', false, $outputlangs, true), 0, 'L', 0);
 				$pdf->SetXY($tab3_posx + 21, $tab3_top + $y);
-				$pdf->MultiCell(20, 3, price($sign * ((!empty($conf->multicurrency->enabled) && $object->multicurrency_tx != 1) ? $row->multicurrency_amount : $row->amount), 0, $outputlangs), 0, 'L', 0);
+				$pdf->MultiCell(20, 3, price($sign * ((isModEnabled("multicurrency") && $object->multicurrency_tx != 1) ? $row->multicurrency_amount : $row->amount), 0, $outputlangs), 0, 'L', 0);
 				$pdf->SetXY($tab3_posx + 40, $tab3_top + $y);
 				$oper = $outputlangs->transnoentitiesnoconv("PaymentTypeShort".$row->code);
 
@@ -1557,7 +1557,7 @@ class pdf_sponge extends ModelePDFFactures
 
 
 		// Get Total HT
-		$total_ht = (!empty($conf->multicurrency->enabled) && $object->mylticurrency_tx != 1 ? $object->multicurrency_total_ht : $object->total_ht);
+		$total_ht = (isModEnabled("multicurrency") && $object->mylticurrency_tx != 1 ? $object->multicurrency_total_ht : $object->total_ht);
 
 		// Total remise
 		$total_line_remise = 0;
@@ -1595,14 +1595,14 @@ class pdf_sponge extends ModelePDFFactures
 		$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
 		$pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transnoentities(empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT) ? "TotalHT" : "Total").(is_object($outputlangsbis) ? ' / '.$outputlangsbis->transnoentities(empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT) ? "TotalHT" : "Total") : ''), 0, 'L', 1);
 
-		$total_ht = ((!empty($conf->multicurrency->enabled) && isset($object->multicurrency_tx) && $object->multicurrency_tx != 1) ? $object->multicurrency_total_ht : $object->total_ht);
+		$total_ht = ((isModEnabled("multicurrency") && isset($object->multicurrency_tx) && $object->multicurrency_tx != 1) ? $object->multicurrency_total_ht : $object->total_ht);
 		$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
 		$pdf->MultiCell($largcol2, $tab2_hl, price($sign * ($total_ht + (!empty($object->remise) ? $object->remise : 0)), 0, $outputlangs), 0, 'R', 1);
 
 		// Show VAT by rates and total
 		$pdf->SetFillColor(248, 248, 248);
 
-		$total_ttc = (!empty($conf->multicurrency->enabled) && $object->multicurrency_tx != 1) ? $object->multicurrency_total_ttc : $object->total_ttc;
+		$total_ttc = (isModEnabled("multicurrency") && $object->multicurrency_tx != 1) ? $object->multicurrency_total_ttc : $object->total_ttc;
 
 		$this->atleastoneratenotnull = 0;
 		if (empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT)) {
@@ -1847,8 +1847,8 @@ class pdf_sponge extends ModelePDFFactures
 
 		$pdf->SetTextColor(0, 0, 0);
 
-		$creditnoteamount = $object->getSumCreditNotesUsed((!empty($conf->multicurrency->enabled) && $object->multicurrency_tx != 1) ? 1 : 0); // Warning, this also include excess received
-		$depositsamount = $object->getSumDepositsUsed((!empty($conf->multicurrency->enabled) && $object->multicurrency_tx != 1) ? 1 : 0);
+		$creditnoteamount = $object->getSumCreditNotesUsed((isModEnabled("multicurrency") && $object->multicurrency_tx != 1) ? 1 : 0); // Warning, this also include excess received
+		$depositsamount = $object->getSumDepositsUsed((isModEnabled("multicurrency") && $object->multicurrency_tx != 1) ? 1 : 0);
 
 		$resteapayer = price2num($total_ttc - $deja_regle - $creditnoteamount - $depositsamount, 'MT');
 		if (!empty($object->paye)) {
diff --git a/htdocs/core/modules/mrp/doc/pdf_vinci.modules.php b/htdocs/core/modules/mrp/doc/pdf_vinci.modules.php
index ba41c94ab4f..ed10b5ee2bf 100644
--- a/htdocs/core/modules/mrp/doc/pdf_vinci.modules.php
+++ b/htdocs/core/modules/mrp/doc/pdf_vinci.modules.php
@@ -819,7 +819,7 @@ class pdf_vinci extends ModelePDFMo
 		$pdf->SetXY($col1x, $tab2_top + 0);
 		$pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transnoentities("TotalHT"), 0, 'L', 1);
 
-		$total_ht = ((!empty($conf->multicurrency->enabled) && isset($object->multicurrency_tx) && $object->multicurrency_tx != 1) ? $object->multicurrency_total_ht : $object->total_ht);
+		$total_ht = ((isModEnabled("multicurrency") && isset($object->multicurrency_tx) && $object->multicurrency_tx != 1) ? $object->multicurrency_total_ht : $object->total_ht);
 		$pdf->SetXY($col2x, $tab2_top + 0);
 		$pdf->MultiCell($largcol2, $tab2_hl, price($total_ht + (!empty($object->remise) ? $object->remise : 0)), 0, 'R', 1);
 
@@ -943,7 +943,7 @@ class pdf_vinci extends ModelePDFMo
 		$pdf->SetFillColor(224, 224, 224);
 		$pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transnoentities("TotalTTC"), $useborder, 'L', 1);
 
-		$total_ttc = (!empty($conf->multicurrency->enabled) && $object->multicurrency_tx != 1) ? $object->multicurrency_total_ttc : $object->total_ttc;
+		$total_ttc = (isModEnabled("multicurrency") && $object->multicurrency_tx != 1) ? $object->multicurrency_total_ttc : $object->total_ttc;
 		$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
 		$pdf->MultiCell($largcol2, $tab2_hl, price($total_ttc), $useborder, 'R', 1);
 		$pdf->SetFont('', '', $default_font_size - 1);
diff --git a/htdocs/core/modules/product/doc/pdf_standard.modules.php b/htdocs/core/modules/product/doc/pdf_standard.modules.php
index 3f75a87fc73..e4bcc0e4f04 100644
--- a/htdocs/core/modules/product/doc/pdf_standard.modules.php
+++ b/htdocs/core/modules/product/doc/pdf_standard.modules.php
@@ -421,7 +421,7 @@ class pdf_standard extends ModelePDFProduct
 					$pdf->MultiCell($this->page_largeur-$this->marge_droite-$this->postotalht, 3, $total_excl_tax, 0, 'R', 0);
 
 					// Collecte des totaux par valeur de tva dans $this->tva["taux"]=total_tva
-					if (!empty($conf->multicurrency->enabled) && $object->multicurrency_tx != 1) $tvaligne=$object->lines[$i]->multicurrency_total_tva;
+					if (isModEnabled("multicurrency") && $object->multicurrency_tx != 1) $tvaligne=$object->lines[$i]->multicurrency_total_tva;
 					else $tvaligne=$object->lines[$i]->total_tva;
 
 					$localtax1ligne=$object->lines[$i]->total_localtax1;
diff --git a/htdocs/core/modules/propale/doc/pdf_azur.modules.php b/htdocs/core/modules/propale/doc/pdf_azur.modules.php
index 3d209fce798..86d6306a576 100644
--- a/htdocs/core/modules/propale/doc/pdf_azur.modules.php
+++ b/htdocs/core/modules/propale/doc/pdf_azur.modules.php
@@ -640,7 +640,7 @@ class pdf_azur extends ModelePDFPropales
 					$pdf->MultiCell($this->page_largeur - $this->marge_droite - $this->postotalht, 3, $total_excl_tax, 0, 'R', 0);
 
 					// Collecte des totaux par valeur de tva dans $this->tva["taux"]=total_tva
-					if (!empty($conf->multicurrency->enabled) && $object->multicurrency_tx != 1) {
+					if (isModEnabled("multicurrency") && $object->multicurrency_tx != 1) {
 						$tvaligne = $object->lines[$i]->multicurrency_total_tva;
 					} else {
 						$tvaligne = $object->lines[$i]->total_tva;
@@ -1113,14 +1113,14 @@ class pdf_azur extends ModelePDFPropales
 		$pdf->SetXY($col1x, $tab2_top + 0);
 		$pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transnoentities("TotalHT"), 0, 'L', 1);
 
-		$total_ht = ((!empty($conf->multicurrency->enabled) && isset($object->multicurrency_tx) && $object->multicurrency_tx != 1) ? $object->multicurrency_total_ht : $object->total_ht);
+		$total_ht = ((isModEnabled("multicurrency") && isset($object->multicurrency_tx) && $object->multicurrency_tx != 1) ? $object->multicurrency_total_ht : $object->total_ht);
 		$pdf->SetXY($col2x, $tab2_top + 0);
 		$pdf->MultiCell($largcol2, $tab2_hl, price($total_ht + (!empty($object->remise) ? $object->remise : 0), 0, $outputlangs), 0, 'R', 1);
 
 		// Show VAT by rates and total
 		$pdf->SetFillColor(248, 248, 248);
 
-		$total_ttc = (!empty($conf->multicurrency->enabled) && $object->multicurrency_tx != 1) ? $object->multicurrency_total_ttc : $object->total_ttc;
+		$total_ttc = (isModEnabled("multicurrency") && $object->multicurrency_tx != 1) ? $object->multicurrency_total_ttc : $object->total_ttc;
 
 		$this->atleastoneratenotnull = 0;
 		if (empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT)) {
diff --git a/htdocs/core/modules/propale/doc/pdf_cyan.modules.php b/htdocs/core/modules/propale/doc/pdf_cyan.modules.php
index 224e3979f38..ec04a8e8906 100644
--- a/htdocs/core/modules/propale/doc/pdf_cyan.modules.php
+++ b/htdocs/core/modules/propale/doc/pdf_cyan.modules.php
@@ -764,7 +764,7 @@ class pdf_cyan extends ModelePDFPropales
 
 
 					// Collection of totals by value of vat in $this->tva["rate"] = total_tva
-					if (!empty($conf->multicurrency->enabled) && $object->multicurrency_tx != 1) {
+					if (isModEnabled("multicurrency") && $object->multicurrency_tx != 1) {
 						$tvaligne = $object->lines[$i]->multicurrency_total_tva;
 					} else {
 						$tvaligne = $object->lines[$i]->total_tva;
@@ -1238,14 +1238,14 @@ class pdf_cyan extends ModelePDFPropales
 		$pdf->SetXY($col1x, $tab2_top + 0);
 		$pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transnoentities("TotalHT").(is_object($outputlangsbis) ? ' / '.$outputlangsbis->transnoentities("TotalHT") : ''), 0, 'L', 1);
 
-		$total_ht = ((!empty($conf->multicurrency->enabled) && isset($object->multicurrency_tx) && $object->multicurrency_tx != 1) ? $object->multicurrency_total_ht : $object->total_ht);
+		$total_ht = ((isModEnabled("multicurrency") && isset($object->multicurrency_tx) && $object->multicurrency_tx != 1) ? $object->multicurrency_total_ht : $object->total_ht);
 		$pdf->SetXY($col2x, $tab2_top + 0);
 		$pdf->MultiCell($largcol2, $tab2_hl, price($total_ht + (!empty($object->remise) ? $object->remise : 0), 0, $outputlangs), 0, 'R', 1);
 
 		// Show VAT by rates and total
 		$pdf->SetFillColor(248, 248, 248);
 
-		$total_ttc = (!empty($conf->multicurrency->enabled) && $object->multicurrency_tx != 1) ? $object->multicurrency_total_ttc : $object->total_ttc;
+		$total_ttc = (isModEnabled("multicurrency") && $object->multicurrency_tx != 1) ? $object->multicurrency_total_ttc : $object->total_ttc;
 
 		$this->atleastoneratenotnull = 0;
 		if (empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT)) {

From c3cb372f4c5645d0d6b78a3755ad95cdf80a8c45 Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Sat, 3 Sep 2022 11:22:57 +0200
Subject: [PATCH 648/974] Update code

---
 .../doc/pdf_eagle_proforma.modules.php         |  4 ++--
 .../doc/pdf_canelle.modules.php                | 18 +++++++++---------
 .../supplier_order/doc/pdf_cornas.modules.php  |  6 +++---
 .../doc/pdf_muscadet.modules.php               |  6 +++---
 .../doc/pdf_aurore.modules.php                 |  2 +-
 5 files changed, 18 insertions(+), 18 deletions(-)

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 9a6ee3c5f01..fa49b0b6d44 100644
--- a/htdocs/core/modules/stocktransfer/doc/pdf_eagle_proforma.modules.php
+++ b/htdocs/core/modules/stocktransfer/doc/pdf_eagle_proforma.modules.php
@@ -682,7 +682,7 @@ class pdf_eagle_proforma extends ModelePDFCommandes
 
 
 					// Collection of totals by value of vat in $this->tva["rate"] = total_tva
-					if ($conf->multicurrency->enabled && $object->multicurrency_tx != 1) $tvaligne = $object->lines[$i]->multicurrency_total_tva;
+					if (isModEnabled("multicurrency") && $object->multicurrency_tx != 1) $tvaligne = $object->lines[$i]->multicurrency_total_tva;
 					else $tvaligne = $object->lines[$i]->total_tva;
 
 					$localtax1ligne = $object->lines[$i]->total_localtax1;
@@ -1035,7 +1035,7 @@ class pdf_eagle_proforma extends ModelePDFCommandes
 		/*$pdf->SetFillColor(255, 255, 255);
 		$pdf->SetXY($col1x, $tab2_top + 0);
 		$pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transnoentities("TotalHT").(is_object($outputlangsbis) ? ' / '.$outputlangsbis->transnoentities("TotalHT") : ''), 0, 'L', 1);
-		$total_ht = (($conf->multicurrency->enabled && isset($object->multicurrency_tx) && $object->multicurrency_tx != 1) ? $object->multicurrency_total_ht : $object->total_ht);
+		$total_ht = ((isModEnabled("multicurrency") && isset($object->multicurrency_tx) && $object->multicurrency_tx != 1) ? $object->multicurrency_total_ht : $object->total_ht);
 		$pdf->SetXY($col2x, $tab2_top + 0);
 		$pdf->MultiCell($largcol2, $tab2_hl, price($total_ht + (!empty($object->remise) ? $object->remise : 0), 0, $outputlangs), 0, 'R', 1);*/
 
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 5cbdad90b03..39a9aab7e78 100644
--- a/htdocs/core/modules/supplier_invoice/doc/pdf_canelle.modules.php
+++ b/htdocs/core/modules/supplier_invoice/doc/pdf_canelle.modules.php
@@ -232,9 +232,9 @@ class pdf_canelle extends ModelePDFSuppliersInvoices
 		$nblines = count($object->lines);
 
 		if ($conf->fournisseur->facture->dir_output) {
-			$deja_regle = $object->getSommePaiement((!empty($conf->multicurrency->enabled) && $object->multicurrency_tx != 1) ? 1 : 0);
-			$amount_credit_notes_included = $object->getSumCreditNotesUsed((!empty($conf->multicurrency->enabled) && $object->multicurrency_tx != 1) ? 1 : 0);
-			$amount_deposits_included = $object->getSumDepositsUsed((!empty($conf->multicurrency->enabled) && $object->multicurrency_tx != 1) ? 1 : 0);
+			$deja_regle = $object->getSommePaiement((isModEnabled("multicurrency") && $object->multicurrency_tx != 1) ? 1 : 0);
+			$amount_credit_notes_included = $object->getSumCreditNotesUsed((isModEnabled("multicurrency") && $object->multicurrency_tx != 1) ? 1 : 0);
+			$amount_deposits_included = $object->getSumDepositsUsed((isModEnabled("multicurrency") && $object->multicurrency_tx != 1) ? 1 : 0);
 
 			// Definition of $dir and $file
 			if ($object->specimen) {
@@ -499,7 +499,7 @@ class pdf_canelle extends ModelePDFSuppliersInvoices
 					$pdf->MultiCell($this->page_largeur - $this->marge_droite - $this->postotalht, 3, $total_excl_tax, 0, 'R', 0);
 
 					// Collection of totals by VAT value in $this->tva["taux"]=total_tva
-					if (!empty($conf->multicurrency->enabled) && $object->multicurrency_tx != 1) {
+					if (isModEnabled("multicurrency") && $object->multicurrency_tx != 1) {
 						$tvaligne = $object->lines[$i]->multicurrency_total_tva;
 					} else {
 						$tvaligne = $object->lines[$i]->total_tva;
@@ -683,14 +683,14 @@ class pdf_canelle extends ModelePDFSuppliersInvoices
 		$pdf->SetXY($col1x, $tab2_top + 0);
 		$pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transnoentities("TotalHT"), 0, 'L', 1);
 
-		$total_ht = ((!empty($conf->multicurrency->enabled) && isset($object->multicurrency_tx) && $object->multicurrency_tx != 1) ? $object->multicurrency_total_ht : $object->total_ht);
+		$total_ht = ((isModEnabled("multicurrency") && isset($object->multicurrency_tx) && $object->multicurrency_tx != 1) ? $object->multicurrency_total_ht : $object->total_ht);
 		$pdf->SetXY($col2x, $tab2_top + 0);
 		$pdf->MultiCell($largcol2, $tab2_hl, price($sign * ($total_ht + (!empty($object->remise) ? $object->remise : 0)), 0, $outputlangs), 0, 'R', 1);
 
 		// Show VAT by rates and total
 		$pdf->SetFillColor(248, 248, 248);
 
-		$total_ttc = (!empty($conf->multicurrency->enabled) && $object->multicurrency_tx != 1) ? $object->multicurrency_total_ttc : $object->total_ttc;
+		$total_ttc = (isModEnabled("multicurrency") && $object->multicurrency_tx != 1) ? $object->multicurrency_total_ttc : $object->total_ttc;
 
 		$this->atleastoneratenotnull = 0;
 		foreach ($this->tva as $tvakey => $tvaval) {
@@ -802,8 +802,8 @@ class pdf_canelle extends ModelePDFSuppliersInvoices
 		$pdf->MultiCell($largcol2, $tab2_hl, price($sign * $total_ttc, 0, $outputlangs), $useborder, 'R', 1);
 
 		$pdf->SetTextColor(0, 0, 0);
-		$creditnoteamount = $object->getSumCreditNotesUsed((!empty($conf->multicurrency->enabled) && $object->multicurrency_tx != 1) ? 1 : 0); // Warning, this also include excess received
-		$depositsamount = $object->getSumDepositsUsed((!empty($conf->multicurrency->enabled) && $object->multicurrency_tx != 1) ? 1 : 0);
+		$creditnoteamount = $object->getSumCreditNotesUsed((isModEnabled("multicurrency") && $object->multicurrency_tx != 1) ? 1 : 0); // Warning, this also include excess received
+		$depositsamount = $object->getSumDepositsUsed((isModEnabled("multicurrency") && $object->multicurrency_tx != 1) ? 1 : 0);
 		//print "x".$creditnoteamount."-".$depositsamount;exit;
 		$resteapayer = price2num($total_ttc - $deja_regle - $creditnoteamount - $depositsamount, 'MT');
 		if (!empty($object->paye)) {
@@ -1036,7 +1036,7 @@ class pdf_canelle extends ModelePDFSuppliersInvoices
 				$pdf->SetXY($tab3_posx, $tab3_top + $y);
 				$pdf->MultiCell(20, 3, dol_print_date($this->db->jdate($row->date), 'day', false, $outputlangs, true), 0, 'L', 0);
 				$pdf->SetXY($tab3_posx + 21, $tab3_top + $y);
-				$pdf->MultiCell(20, 3, price($sign * ((!empty($conf->multicurrency->enabled) && $object->multicurrency_tx != 1) ? $row->multicurrency_amount : $row->amount)), 0, 'L', 0);
+				$pdf->MultiCell(20, 3, price($sign * ((isModEnabled("multicurrency") && $object->multicurrency_tx != 1) ? $row->multicurrency_amount : $row->amount)), 0, 'L', 0);
 				$pdf->SetXY($tab3_posx + 40, $tab3_top + $y);
 				$oper = $outputlangs->transnoentitiesnoconv("PaymentTypeShort".$row->code);
 
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 a8f671fb528..00d1e2e28e7 100644
--- a/htdocs/core/modules/supplier_order/doc/pdf_cornas.modules.php
+++ b/htdocs/core/modules/supplier_order/doc/pdf_cornas.modules.php
@@ -693,7 +693,7 @@ class pdf_cornas extends ModelePDFSuppliersOrders
 
 
 					// Collecte des totaux par valeur de tva dans $this->tva["taux"]=total_tva
-					if (!empty($conf->multicurrency->enabled) && $object->multicurrency_tx != 1) {
+					if (isModEnabled("multicurrency") && $object->multicurrency_tx != 1) {
 						$tvaligne = $object->lines[$i]->multicurrency_total_tva;
 					} else {
 						$tvaligne = $object->lines[$i]->total_tva;
@@ -975,7 +975,7 @@ class pdf_cornas extends ModelePDFSuppliersOrders
 		$pdf->SetXY($col1x, $tab2_top + 0);
 		$pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transnoentities("TotalHT"), 0, 'L', 1);
 
-		$total_ht = ((!empty($conf->multicurrency->enabled) && isset($object->multicurrency_tx) && $object->multicurrency_tx != 1) ? $object->multicurrency_total_ht : $object->total_ht);
+		$total_ht = ((isModEnabled("multicurrency") && isset($object->multicurrency_tx) && $object->multicurrency_tx != 1) ? $object->multicurrency_total_ht : $object->total_ht);
 		$pdf->SetXY($col2x, $tab2_top + 0);
 		$pdf->MultiCell($largcol2, $tab2_hl, price($total_ht + (!empty($object->remise) ? $object->remise : 0)), 0, 'R', 1);
 
@@ -1099,7 +1099,7 @@ class pdf_cornas extends ModelePDFSuppliersOrders
 		$pdf->SetFillColor(224, 224, 224);
 		$pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transnoentities("TotalTTC"), $useborder, 'L', 1);
 
-		$total_ttc = (!empty($conf->multicurrency->enabled) && $object->multicurrency_tx != 1) ? $object->multicurrency_total_ttc : $object->total_ttc;
+		$total_ttc = (isModEnabled("multicurrency") && $object->multicurrency_tx != 1) ? $object->multicurrency_total_ttc : $object->total_ttc;
 		$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
 		$pdf->MultiCell($largcol2, $tab2_hl, price($total_ttc), $useborder, 'R', 1);
 		$pdf->SetFont('', '', $default_font_size - 1);
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 12b5b990648..410a631fa62 100644
--- a/htdocs/core/modules/supplier_order/doc/pdf_muscadet.modules.php
+++ b/htdocs/core/modules/supplier_order/doc/pdf_muscadet.modules.php
@@ -573,7 +573,7 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
 					}
 
 					// Collecte des totaux par valeur de tva dans $this->tva["taux"]=total_tva
-					if (!empty($conf->multicurrency->enabled) && $object->multicurrency_tx != 1) {
+					if (isModEnabled("multicurrency") && $object->multicurrency_tx != 1) {
 						$tvaligne = $object->lines[$i]->multicurrency_total_tva;
 					} else {
 						$tvaligne = $object->lines[$i]->total_tva;
@@ -856,7 +856,7 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
 		$pdf->SetXY($col1x, $tab2_top + 0);
 		$pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transnoentities("TotalHT"), 0, 'L', 1);
 
-		$total_ht = ((!empty($conf->multicurrency->enabled) && isset($object->multicurrency_tx) && $object->multicurrency_tx != 1) ? $object->multicurrency_total_ht : $object->total_ht);
+		$total_ht = ((isModEnabled("multicurrency") && isset($object->multicurrency_tx) && $object->multicurrency_tx != 1) ? $object->multicurrency_total_ht : $object->total_ht);
 		$pdf->SetXY($col2x, $tab2_top + 0);
 		$pdf->MultiCell($largcol2, $tab2_hl, price($total_ht + (!empty($object->remise) ? $object->remise : 0)), 0, 'R', 1);
 
@@ -980,7 +980,7 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
 		$pdf->SetFillColor(224, 224, 224);
 		$pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transnoentities("TotalTTC"), $useborder, 'L', 1);
 
-		$total_ttc = (!empty($conf->multicurrency->enabled) && $object->multicurrency_tx != 1) ? $object->multicurrency_total_ttc : $object->total_ttc;
+		$total_ttc = (isModEnabled("multicurrency") && $object->multicurrency_tx != 1) ? $object->multicurrency_total_ttc : $object->total_ttc;
 		$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
 		$pdf->MultiCell($largcol2, $tab2_hl, price($total_ttc), $useborder, 'R', 1);
 		$pdf->SetFont('', '', $default_font_size - 1);
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 f5825957845..28c8ed0a3bd 100644
--- a/htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php
+++ b/htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php
@@ -573,7 +573,7 @@ class pdf_aurore extends ModelePDFSupplierProposal
 					*/
 
 					// Collecte des totaux par valeur de tva dans $this->tva["taux"]=total_tva
-					if (!empty($conf->multicurrency->enabled) && $object->multicurrency_tx != 1) {
+					if (isModEnabled("multicurrency") && $object->multicurrency_tx != 1) {
 						$tvaligne = $object->lines[$i]->multicurrency_total_tva;
 					} else {
 						$tvaligne = $object->lines[$i]->total_tva;

From 79fc182201b3523e8aaf6118f2c1f2f71feba78a Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Sat, 3 Sep 2022 11:24:17 +0200
Subject: [PATCH 649/974] Update code

---
 htdocs/core/tpl/objectline_create.tpl.php | 6 +++---
 htdocs/core/tpl/objectline_edit.tpl.php   | 4 ++--
 htdocs/core/tpl/objectline_title.tpl.php  | 4 ++--
 htdocs/core/tpl/objectline_view.tpl.php   | 4 ++--
 htdocs/core/tpl/originproductline.tpl.php | 2 +-
 htdocs/expedition/shipment.php            | 2 +-
 htdocs/fichinter/card.php                 | 2 +-
 7 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/htdocs/core/tpl/objectline_create.tpl.php b/htdocs/core/tpl/objectline_create.tpl.php
index 54e64ccc769..81a1692c6a3 100644
--- a/htdocs/core/tpl/objectline_create.tpl.php
+++ b/htdocs/core/tpl/objectline_create.tpl.php
@@ -65,7 +65,7 @@ if (empty($inputalsopricewithtax)) {
 }
 // Define colspan for the button 'Add'
 $colspan = 3; // Columns: total ht + col edit + col delete
-if (!empty($conf->multicurrency->enabled) && $this->multicurrency_code != $conf->currency) {
+if (isModEnabled("multicurrency") && $this->multicurrency_code != $conf->currency) {
 	$colspan++; //Add column for Total (currency) if required
 }
 if (in_array($object->element, array('propal', 'commande', 'order', 'facture', 'facturerec', 'invoice', 'supplier_proposal', 'order_supplier', 'invoice_supplier', 'invoice_supplier_rec'))) {
@@ -119,7 +119,7 @@ if ($nolinesbefore) {
 		?>
 		<td class="linecolvat right"><span id="title_vat"><?php echo $langs->trans('VAT'); ?></span></td>
 		<td class="linecoluht right"><span id="title_up_ht"><?php echo $langs->trans('PriceUHT'); ?></span></td>
-		<?php if (!empty($conf->multicurrency->enabled) && $this->multicurrency_code != $conf->currency) { ?>
+		<?php if (isModEnabled("multicurrency") && $this->multicurrency_code != $conf->currency) { ?>
 			<td class="linecoluht_currency right"><span id="title_up_ht_currency"><?php echo $langs->trans('PriceUHTCurrency'); ?></span></td>
 		<?php } ?>
 		<?php if (!empty($inputalsopricewithtax)) { ?>
@@ -399,7 +399,7 @@ if ($nolinesbefore) {
 	</td>
 
 	<?php
-	if (!empty($conf->multicurrency->enabled) && $this->multicurrency_code != $conf->currency) {
+	if (isModEnabled("multicurrency") && $this->multicurrency_code != $conf->currency) {
 		$coldisplay++;
 		?>
 		<td class="nobottom linecoluht_currency right">
diff --git a/htdocs/core/tpl/objectline_edit.tpl.php b/htdocs/core/tpl/objectline_edit.tpl.php
index b2974ffbbfc..d755c3996a8 100644
--- a/htdocs/core/tpl/objectline_edit.tpl.php
+++ b/htdocs/core/tpl/objectline_edit.tpl.php
@@ -70,7 +70,7 @@ if (!empty($inputalsopricewithtax)) {
 if (in_array($object->element, array('propal', 'supplier_proposal', 'facture', 'facturerec', 'invoice', 'commande', 'order', 'order_supplier', 'invoice_supplier', 'invoice_supplier_rec'))) {
 	$colspan++; // With this, there is a column move button
 }
-if (!empty($conf->multicurrency->enabled) && $this->multicurrency_code != $conf->currency) {
+if (isModEnabled("multicurrency") && $this->multicurrency_code != $conf->currency) {
 	$colspan += 2;
 }
 if (isModEnabled('asset') && $object->element == 'invoice_supplier') {
@@ -214,7 +214,7 @@ $coldisplay++;
 	}
 	print '></td>';
 
-	if (!empty($conf->multicurrency->enabled) && $this->multicurrency_code != $conf->currency) {
+	if (isModEnabled("multicurrency") && $this->multicurrency_code != $conf->currency) {
 		$coldisplay++;
 		print '<td class="right"><input rel="'.$object->multicurrency_tx.'" type="text" class="flat right" size="5" id="multicurrency_subprice" name="multicurrency_subprice" value="'.(GETPOSTISSET('multicurrency_subprice') ? GETPOST('multicurrency_subprice', 'alpha') : price($line->multicurrency_subprice)).'" /></td>';
 	}
diff --git a/htdocs/core/tpl/objectline_title.tpl.php b/htdocs/core/tpl/objectline_title.tpl.php
index 79d4ebeae11..9646d8ce88f 100644
--- a/htdocs/core/tpl/objectline_title.tpl.php
+++ b/htdocs/core/tpl/objectline_title.tpl.php
@@ -88,7 +88,7 @@ print '</td>';
 print '<td class="linecoluht right nowraponall">'.$langs->trans('PriceUHT').'</td>';
 
 // Multicurrency
-if (!empty($conf->multicurrency->enabled) && $this->multicurrency_code != $conf->currency) {
+if (isModEnabled("multicurrency") && $this->multicurrency_code != $conf->currency) {
 	print '<td class="linecoluht_currency right" style="width: 80px">'.$langs->trans('PriceUHTCurrency', $this->multicurrency_code).'</td>';
 }
 
@@ -152,7 +152,7 @@ if ($usemargins && !empty($conf->margin->enabled) && empty($user->socid)) {
 print '<td class="linecolht right">'.$langs->trans('TotalHTShort').'</td>';
 
 // Multicurrency
-if (!empty($conf->multicurrency->enabled) && $this->multicurrency_code != $conf->currency) {
+if (isModEnabled("multicurrency") && $this->multicurrency_code != $conf->currency) {
 	print '<td class="linecoltotalht_currency right">'.$langs->trans('TotalHTShortCurrency', $this->multicurrency_code).'</td>';
 }
 
diff --git a/htdocs/core/tpl/objectline_view.tpl.php b/htdocs/core/tpl/objectline_view.tpl.php
index b660bd89d93..fc1e74f1ac4 100644
--- a/htdocs/core/tpl/objectline_view.tpl.php
+++ b/htdocs/core/tpl/objectline_view.tpl.php
@@ -282,7 +282,7 @@ print vatrate($positiverates.($line->vat_src_code ? ' ('.$line->vat_src_code.')'
 
 	<td class="linecoluht nowraponall right"><?php $coldisplay++; ?><?php print price($sign * $line->subprice); ?></td>
 
-<?php if (!empty($conf->multicurrency->enabled) && $this->multicurrency_code != $conf->currency) { ?>
+<?php if (isModEnabled("multicurrency") && $this->multicurrency_code != $conf->currency) { ?>
 	<td class="linecoluht_currency nowraponall right"><?php $coldisplay++; ?><?php print price($sign * $line->multicurrency_subprice); ?></td>
 <?php }
 
@@ -378,7 +378,7 @@ if ($line->special_code == 3) { ?>
 		print '</span>';
 	}
 	print '</td>';
-	if (!empty($conf->multicurrency->enabled) && $this->multicurrency_code != $conf->currency) {
+	if (isModEnabled("multicurrency") && $this->multicurrency_code != $conf->currency) {
 		print '<td class="linecolutotalht_currency nowrap right">'.price($sign * $line->multicurrency_total_ht).'</td>';
 		$coldisplay++;
 	}
diff --git a/htdocs/core/tpl/originproductline.tpl.php b/htdocs/core/tpl/originproductline.tpl.php
index 25c799ffbfd..090ba834ba1 100644
--- a/htdocs/core/tpl/originproductline.tpl.php
+++ b/htdocs/core/tpl/originproductline.tpl.php
@@ -32,7 +32,7 @@ print '<td class="linecolref">'.$this->tpl['label'].'</td>';
 print '<td class="linecoldescription">'.$this->tpl['description'].'</td>';
 print '<td class="linecolvat right">'.$this->tpl['vat_rate'].'</td>';
 print '<td class="linecoluht right">'.$this->tpl['price'].'</td>';
-if (!empty($conf->multicurrency->enabled)) {
+if (isModEnabled("multicurrency")) {
 	print '<td class="linecoluht_currency right">'.$this->tpl['multicurrency_price'].'</td>';
 }
 
diff --git a/htdocs/expedition/shipment.php b/htdocs/expedition/shipment.php
index 0be623ab6bf..aef309b90b5 100644
--- a/htdocs/expedition/shipment.php
+++ b/htdocs/expedition/shipment.php
@@ -558,7 +558,7 @@ if ($id > 0 || !empty($ref)) {
 
 		print '<table class="border centpercent tableforfield">';
 
-		if (!empty($conf->multicurrency->enabled) && ($object->multicurrency_code != $conf->currency)) {
+		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>';
diff --git a/htdocs/fichinter/card.php b/htdocs/fichinter/card.php
index 1c83726f7e6..97d3bfaaf7d 100644
--- a/htdocs/fichinter/card.php
+++ b/htdocs/fichinter/card.php
@@ -998,7 +998,7 @@ if ($action == 'create') {
 
 			print '<tr><td>' . $langs->trans('AmountTTC') . '</td><td>' . price($objectsrc->total_ttc) . "</td></tr>";
 
-			if (!empty($conf->multicurrency->enabled))
+			if (isModEnabled("multicurrency"))
 			{
 				print '<tr><td>' . $langs->trans('MulticurrencyAmountHT') . '</td><td>' . price($objectsrc->multicurrency_total_ht) . '</td></tr>';
 				print '<tr><td>' . $langs->trans('MulticurrencyAmountVAT') . '</td><td>' . price($objectsrc->multicurrency_total_tva) . "</td></tr>";

From 3737a854705add1df874f828acc6e61599160be4 Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Sat, 3 Sep 2022 11:25:51 +0200
Subject: [PATCH 650/974] Update code

---
 htdocs/fourn/class/fournisseur.commande.class.php | 14 +++++++-------
 htdocs/fourn/class/fournisseur.facture.class.php  |  2 +-
 htdocs/fourn/class/fournisseur.product.class.php  |  2 +-
 htdocs/fourn/class/paiementfourn.class.php        |  2 +-
 htdocs/fourn/commande/card.php                    | 10 +++++-----
 5 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/htdocs/fourn/class/fournisseur.commande.class.php b/htdocs/fourn/class/fournisseur.commande.class.php
index 8a1dcf682b2..30d95361ca1 100644
--- a/htdocs/fourn/class/fournisseur.commande.class.php
+++ b/htdocs/fourn/class/fournisseur.commande.class.php
@@ -191,7 +191,7 @@ class CommandeFournisseur extends CommonOrder
 	 *         Note: Filter can be a string like "(t.ref:like:'SO-%') or (t.date_creation:<:'20160101') or (t.nature:is:NULL)"
 	 *  'label' the translation key.
 	 *  'picto' is code of a picto to show before value in forms
-	 *  'enabled' is a condition when the field must be managed (Example: 1 or '$conf->global->MY_SETUP_PARAM' or '!empty($conf->multicurrency->enabled)' ...)
+	 *  'enabled' is a condition when the field must be managed (Example: 1 or '$conf->global->MY_SETUP_PARAM' or 'isModEnabled("multicurrency")' ...)
 	 *  'position' is the sort order of field.
 	 *  'notnull' is set to 1 if not null in database. Set to -1 if we must set data to null if empty ('' or 0).
 	 *  'visible' says if field is visible in list (Examples: 0=Not visible, 1=Visible on list and create/update/view forms, 2=Visible on list only, 3=Visible on create/update/view form only (not list), 4=Visible on list and update/view form only (not create). 5=Visible on list and view only (not create/not update). Using a negative value means field is not shown by default on list but can be selected for viewing)
@@ -247,11 +247,11 @@ class CommandeFournisseur extends CommonOrder
 		'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'=>'!empty($conf->multicurrency->enabled)', 'visible'=>-1, 'position'=>220),
-		'multicurrency_tx' =>array('type'=>'double(24,8)', 'label'=>'CurrencyRate', 'enabled'=>'!empty($conf->multicurrency->enabled)', 'visible'=>-1, 'position'=>225),
-		'multicurrency_total_ht' =>array('type'=>'double(24,8)', 'label'=>'MulticurrencyAmountHT', 'enabled'=>'!empty($conf->multicurrency->enabled)', 'visible'=>-1, 'position'=>230),
-		'multicurrency_total_tva' =>array('type'=>'double(24,8)', 'label'=>'MulticurrencyAmountVAT', 'enabled'=>'!empty($conf->multicurrency->enabled)', 'visible'=>-1, 'position'=>235),
-		'multicurrency_total_ttc' =>array('type'=>'double(24,8)', 'label'=>'MulticurrencyAmountTTC', 'enabled'=>'!empty($conf->multicurrency->enabled)', 'visible'=>-1, 'position'=>240),
+		'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'=>'$conf->societe->enabled', 'visible'=>1, 'notnull'=>1, 'position'=>46),
 		'entity' =>array('type'=>'integer', 'label'=>'Entity', 'default'=>1, 'enabled'=>1, 'visible'=>0, 'notnull'=>1, 'position'=>1000, 'index'=>1),
@@ -1888,7 +1888,7 @@ class CommandeFournisseur extends CommonOrder
 				}
 			}
 
-			if (!empty($conf->multicurrency->enabled) && $pu_ht_devise > 0) {
+			if (isModEnabled("multicurrency") && $pu_ht_devise > 0) {
 				$pu = 0;
 			}
 
diff --git a/htdocs/fourn/class/fournisseur.facture.class.php b/htdocs/fourn/class/fournisseur.facture.class.php
index 2103b97d2e1..e3c3ce8ef36 100644
--- a/htdocs/fourn/class/fournisseur.facture.class.php
+++ b/htdocs/fourn/class/fournisseur.facture.class.php
@@ -2125,7 +2125,7 @@ class FactureFournisseur extends CommonInvoice
 				$product_type = $type;
 			}
 
-			if (!empty($conf->multicurrency->enabled) && $pu_devise > 0) {
+			if (isModEnabled("multicurrency") && $pu_devise > 0) {
 				$pu = 0;
 			}
 
diff --git a/htdocs/fourn/class/fournisseur.product.class.php b/htdocs/fourn/class/fournisseur.product.class.php
index 25b26c75852..276c5b20ed9 100644
--- a/htdocs/fourn/class/fournisseur.product.class.php
+++ b/htdocs/fourn/class/fournisseur.product.class.php
@@ -296,7 +296,7 @@ class ProductFournisseur extends Product
 		// Multicurrency
 		$multicurrency_unitBuyPrice = null;
 		$fk_multicurrency = null;
-		if (!empty($conf->multicurrency->enabled)) {
+		if (isModEnabled("multicurrency")) {
 			if (empty($multicurrency_tx)) {
 				$multicurrency_tx = 1;
 			}
diff --git a/htdocs/fourn/class/paiementfourn.class.php b/htdocs/fourn/class/paiementfourn.class.php
index 386c34483de..e0b3fcac0c6 100644
--- a/htdocs/fourn/class/paiementfourn.class.php
+++ b/htdocs/fourn/class/paiementfourn.class.php
@@ -862,7 +862,7 @@ class PaiementFourn extends Paiement
 		global $conf;
 
 		$way = 'dolibarr';
-		if (!empty($conf->multicurrency->enabled)) {
+		if (isModEnabled("multicurrency")) {
 			foreach ($this->multicurrency_amounts as $value) {
 				if (!empty($value)) { // one value found then payment is in invoice currency
 					$way = 'customer';
diff --git a/htdocs/fourn/commande/card.php b/htdocs/fourn/commande/card.php
index 660d555676f..f6263fe1304 100644
--- a/htdocs/fourn/commande/card.php
+++ b/htdocs/fourn/commande/card.php
@@ -1616,7 +1616,7 @@ if ($action == 'create') {
 
 		$datedelivery = (!empty($objectsrc->date_livraison) ? $objectsrc->date_livraison : (!empty($objectsrc->delivery_date) ? $objectsrc->delivery_date : ''));
 
-		if (!empty($conf->multicurrency->enabled)) {
+		if (isModEnabled("multicurrency")) {
 			if (!empty($objectsrc->multicurrency_code)) {
 				$currency_code = $objectsrc->multicurrency_code;
 			}
@@ -1634,7 +1634,7 @@ if ($action == 'create') {
 		$cond_reglement_id 	= !empty($societe->cond_reglement_supplier_id) ? $societe->cond_reglement_supplier_id : 0;
 		$mode_reglement_id 	= !empty($societe->mode_reglement_supplier_id) ? $societe->mode_reglement_supplier_id : 0;
 
-		if (!empty($conf->multicurrency->enabled) && !empty($societe->multicurrency_code)) {
+		if (isModEnabled("multicurrency") && !empty($societe->multicurrency_code)) {
 			$currency_code = $societe->multicurrency_code;
 		}
 
@@ -1772,7 +1772,7 @@ if ($action == 'create') {
 	}
 
 	// Multicurrency
-	if (!empty($conf->multicurrency->enabled)) {
+	if (isModEnabled("multicurrency")) {
 		print '<tr>';
 		print '<td>'.$form->editfieldkey('Currency', 'multicurrency_code', '', $object, 0).'</td>';
 		print '<td class="maxwidthonsmartphone">';
@@ -1819,7 +1819,7 @@ if ($action == 'create') {
 
 		print '<tr><td>'.$langs->trans('AmountTTC').'</td><td>'.price($objectsrc->total_ttc)."</td></tr>";
 
-		if (!empty($conf->multicurrency->enabled)) {
+		if (isModEnabled("multicurrency")) {
 			print '<tr><td>'.$langs->trans('MulticurrencyAmountHT').'</td><td>'.price($objectsrc->multicurrency_total_ht).'</td></tr>';
 			print '<tr><td>'.$langs->trans('MulticurrencyAmountVAT').'</td><td>'.price($objectsrc->multicurrency_total_tva).'</td></tr>';
 			print '<tr><td>'.$langs->trans('MulticurrencyAmountTTC').'</td><td>'.price($objectsrc->multicurrency_total_ttc).'</td></tr>';
@@ -2165,7 +2165,7 @@ if ($action == 'create') {
 	print '</td></tr>';
 
 	// Multicurrency
-	if (!empty($conf->multicurrency->enabled)) {
+	if (isModEnabled("multicurrency")) {
 		// Multicurrency code
 		print '<tr>';
 		print '<td>';

From 62529b10e4949e410215c79caa3a5805f1457f1a Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Sat, 3 Sep 2022 11:28:48 +0200
Subject: [PATCH 651/974] Update code

---
 htdocs/fourn/commande/dispatch.php | 12 ++++++------
 htdocs/fourn/facture/card-rec.php  |  2 +-
 htdocs/fourn/facture/card.php      | 18 +++++++++---------
 htdocs/fourn/facture/list.php      | 14 +++++++-------
 htdocs/fourn/facture/paiement.php  |  8 ++++----
 5 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/htdocs/fourn/commande/dispatch.php b/htdocs/fourn/commande/dispatch.php
index c7baf022d8e..d5f9a9e8e73 100644
--- a/htdocs/fourn/commande/dispatch.php
+++ b/htdocs/fourn/commande/dispatch.php
@@ -243,7 +243,7 @@ if ($action == 'dispatch' && $permissiontoreceive) {
 			$fk_commandefourndet = "fk_commandefourndet_".$reg[1].'_'.$reg[2];
 
 			if (!empty($conf->global->SUPPLIER_ORDER_CAN_UPDATE_BUYINGPRICE_DURING_RECEIPT)) {
-				if (empty($conf->multicurrency->enabled) && empty($conf->dynamicprices->enabled)) {
+				if (!isModEnabled("multicurrency") && empty($conf->dynamicprices->enabled)) {
 					$dto = GETPOST("dto_".$reg[1].'_'.$reg[2], 'int');
 					if (!empty($dto)) {
 						$unit_price = price2num(GETPOST("pu_".$reg[1]) * (100 - $dto) / 100, 'MU');
@@ -269,7 +269,7 @@ if ($action == 'dispatch' && $permissiontoreceive) {
 					}
 
 					if (!$error && !empty($conf->global->SUPPLIER_ORDER_CAN_UPDATE_BUYINGPRICE_DURING_RECEIPT)) {
-						if (empty($conf->multicurrency->enabled) && empty($conf->dynamicprices->enabled)) {
+						if (!isModEnabled("multicurrency") && empty($conf->dynamicprices->enabled)) {
 							$dto = price2num(GETPOST("dto_".$reg[1].'_'.$reg[2], 'int'), '');
 							if (empty($dto)) {
 								$dto = 0;
@@ -311,7 +311,7 @@ if ($action == 'dispatch' && $permissiontoreceive) {
 			$fk_commandefourndet = 'fk_commandefourndet_'.$reg[1].'_'.$reg[2];
 
 			if (!empty($conf->global->SUPPLIER_ORDER_CAN_UPDATE_BUYINGPRICE_DURING_RECEIPT)) {
-				if (empty($conf->multicurrency->enabled) && empty($conf->dynamicprices->enabled)) {
+				if (!isModEnabled("multicurrency") && empty($conf->dynamicprices->enabled)) {
 					$dto = GETPOST("dto_".$reg[1].'_'.$reg[2], 'int');
 					if (!empty($dto)) {
 						$unit_price = price2num(GETPOST("pu_".$reg[1]) * (100 - $dto) / 100, 'MU');
@@ -344,7 +344,7 @@ if ($action == 'dispatch' && $permissiontoreceive) {
 					}
 
 					if (!$error && !empty($conf->global->SUPPLIER_ORDER_CAN_UPDATE_BUYINGPRICE_DURING_RECEIPT)) {
-						if (empty($conf->multicurrency->enabled) && empty($conf->dynamicprices->enabled)) {
+						if (!isModEnabled("multicurrency") && empty($conf->dynamicprices->enabled)) {
 							$dto = GETPOST("dto_".$reg[1].'_'.$reg[2], 'int');
 							//update supplier price
 							if (GETPOSTISSET($saveprice)) {
@@ -742,7 +742,7 @@ if ($id > 0 || !empty($ref)) {
 				print '<td width="32"></td>';
 
 				if (!empty($conf->global->SUPPLIER_ORDER_CAN_UPDATE_BUYINGPRICE_DURING_RECEIPT)) {
-					if (empty($conf->multicurrency->enabled) && empty($conf->dynamicprices->enabled)) {
+					if (!isModEnabled("multicurrency") && empty($conf->dynamicprices->enabled)) {
 						print '<td class="right">'.$langs->trans("Price").'</td>';
 						print '<td class="right">'.$langs->trans("ReductionShort").' (%)</td>';
 						print '<td class="right">'.$langs->trans("UpdatePrice").'</td>';
@@ -991,7 +991,7 @@ if ($id > 0 || !empty($ref)) {
 						print '</td>';
 
 						if (!empty($conf->global->SUPPLIER_ORDER_CAN_UPDATE_BUYINGPRICE_DURING_RECEIPT)) {
-							if (empty($conf->multicurrency->enabled) && empty($conf->dynamicprices->enabled)) {
+							if (!isModEnabled("multicurrency") && empty($conf->dynamicprices->enabled)) {
 								// Price
 								print '<td class="right">';
 								print '<input id="pu'.$suffix.'" name="pu'.$suffix.'" type="text" size="8" value="'.price((GETPOST('pu'.$suffix) != '' ? GETPOST('pu'.$suffix) : $up_ht_disc)).'">';
diff --git a/htdocs/fourn/facture/card-rec.php b/htdocs/fourn/facture/card-rec.php
index 8f8d9ec9e47..be1693b7381 100644
--- a/htdocs/fourn/facture/card-rec.php
+++ b/htdocs/fourn/facture/card-rec.php
@@ -1243,7 +1243,7 @@ if ($action == 'create') {
 		print '</td></tr>';
 
 		// Multicurrency
-		if (!empty($conf->multicurrency->enabled)) {
+		if (isModEnabled("multicurrency")) {
 			// Multicurrency code
 			print '<tr>';
 			print '<td>';
diff --git a/htdocs/fourn/facture/card.php b/htdocs/fourn/facture/card.php
index f0640681e7f..11b7332f587 100644
--- a/htdocs/fourn/facture/card.php
+++ b/htdocs/fourn/facture/card.php
@@ -1915,7 +1915,7 @@ if ($action == 'create') {
 	if (GETPOST('socid', 'int') > 0) {
 		$societe = new Societe($db);
 		$societe->fetch(GETPOST('socid', 'int'));
-		if (!empty($conf->multicurrency->enabled) && !empty($societe->multicurrency_code)) {
+		if (isModEnabled("multicurrency") && !empty($societe->multicurrency_code)) {
 			$currency_code = $societe->multicurrency_code;
 		}
 	}
@@ -1964,7 +1964,7 @@ if ($action == 'create') {
 		$dateinvoice = empty($conf->global->MAIN_AUTOFILL_DATE) ?-1 : '';
 		$transport_mode_id = (!empty($objectsrc->transport_mode_id) ? $objectsrc->transport_mode_id : (!empty($soc->transport_mode_id) ? $soc->transport_mode_id : 0));
 
-		if (!empty($conf->multicurrency->enabled)) {
+		if (isModEnabled("multicurrency")) {
 			if (!empty($objectsrc->multicurrency_code)) {
 				$currency_code = $objectsrc->multicurrency_code;
 			}
@@ -1991,7 +1991,7 @@ if ($action == 'create') {
 		$datetmp = dol_mktime(12, 0, 0, GETPOST('echmonth', 'int'), GETPOST('echday', 'int'), GETPOST('echyear', 'int'));
 		$datedue = ($datetmp == '' ?-1 : $datetmp);
 
-		if (!empty($conf->multicurrency->enabled) && !empty($soc->multicurrency_code)) {
+		if (isModEnabled("multicurrency") && !empty($soc->multicurrency_code)) {
 			$currency_code = $soc->multicurrency_code;
 		}
 	}
@@ -2428,7 +2428,7 @@ if ($action == 'create') {
 	}
 
 	// Multicurrency
-	if (!empty($conf->multicurrency->enabled)) {
+	if (isModEnabled("multicurrency")) {
 		print '<tr>';
 		print '<td>'.$form->editfieldkey('Currency', 'multicurrency_code', '', $object, 0).'</td>';
 		print '<td class="maxwidthonsmartphone">';
@@ -2537,7 +2537,7 @@ if ($action == 'create') {
 		}
 		print '<tr><td>'.$langs->trans('AmountTTC').'</td><td>'.price($objectsrc->total_ttc)."</td></tr>";
 
-		if (!empty($conf->multicurrency->enabled)) {
+		if (isModEnabled("multicurrency")) {
 			print '<tr><td>'.$langs->trans('MulticurrencyAmountHT').'</td><td>'.price($objectsrc->multicurrency_total_ht).'</td></tr>';
 			print '<tr><td>'.$langs->trans('MulticurrencyAmountVAT').'</td><td>'.price($objectsrc->multicurrency_total_tva)."</td></tr>";
 			print '<tr><td>'.$langs->trans('MulticurrencyAmountTTC').'</td><td>'.price($objectsrc->multicurrency_total_ttc)."</td></tr>";
@@ -2613,7 +2613,7 @@ if ($action == 'create') {
 		$resteapayer = price2num($object->total_ttc - $totalpaid - $totalcreditnotes - $totaldeposits, 'MT');
 
 		// Multicurrency
-		if (!empty($conf->multicurrency->enabled)) {
+		if (isModEnabled("multicurrency")) {
 			$multicurrency_totalpaid = $object->getSommePaiement(1);
 			$multicurrency_totalcreditnotes = $object->getSumCreditNotesUsed(1);
 			$multicurrency_totaldeposits = $object->getSumDepositsUsed(1);
@@ -3046,7 +3046,7 @@ if ($action == 'create') {
 		print '</td></tr>';
 
 		// Multicurrency
-		if (!empty($conf->multicurrency->enabled)) {
+		if (isModEnabled("multicurrency")) {
 			// Multicurrency code
 			print '<tr>';
 			print '<td>';
@@ -3169,7 +3169,7 @@ if ($action == 'create') {
 
 		print '<table class="border tableforfield centpercent">';
 
-		if (!empty($conf->multicurrency->enabled) && ($object->multicurrency_code != $conf->currency)) {
+		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 right amountcard">'.price($object->multicurrency_total_ht, '', $langs, 0, - 1, - 1, (!empty($object->multicurrency_code) ? $object->multicurrency_code : $conf->currency)).'</td>';
@@ -3256,7 +3256,7 @@ if ($action == 'create') {
 		if (!empty($conf->incoterm->enabled)) {
 			$nbrows++;
 		}
-		if (!empty($conf->multicurrency->enabled)) {
+		if (isModEnabled("multicurrency")) {
 			$nbrows += 5;
 		}
 
diff --git a/htdocs/fourn/facture/list.php b/htdocs/fourn/facture/list.php
index 0072349c06b..305c50b29d5 100644
--- a/htdocs/fourn/facture/list.php
+++ b/htdocs/fourn/facture/list.php
@@ -195,13 +195,13 @@ $arrayfields = array(
 	'u.login'=>array('label'=>"Author", 'checked'=>1),
 	'dynamount_payed'=>array('label'=>"Paid", 'checked'=>0),
 	'rtp'=>array('label'=>"Rest", 'checked'=>0),
-	'f.multicurrency_code'=>array('label'=>'Currency', 'checked'=>0, 'enabled'=>(empty($conf->multicurrency->enabled) ? 0 : 1)),
-	'f.multicurrency_tx'=>array('label'=>'CurrencyRate', 'checked'=>0, 'enabled'=>(empty($conf->multicurrency->enabled) ? 0 : 1)),
-	'f.multicurrency_total_ht'=>array('label'=>'MulticurrencyAmountHT', 'checked'=>0, 'enabled'=>(empty($conf->multicurrency->enabled) ? 0 : 1)),
-	'f.multicurrency_total_vat'=>array('label'=>'MulticurrencyAmountVAT', 'checked'=>0, 'enabled'=>(empty($conf->multicurrency->enabled) ? 0 : 1)),
-	'f.multicurrency_total_ttc'=>array('label'=>'MulticurrencyAmountTTC', 'checked'=>0, 'enabled'=>(empty($conf->multicurrency->enabled) ? 0 : 1)),
-	'multicurrency_dynamount_payed'=>array('label'=>'MulticurrencyAlreadyPaid', 'checked'=>0, 'enabled'=>(empty($conf->multicurrency->enabled) ? 0 : 1)),
-	'multicurrency_rtp'=>array('label'=>'MulticurrencyRemainderToPay', 'checked'=>0, 'enabled'=>(empty($conf->multicurrency->enabled) ? 0 : 1)), // Not enabled by default because slow
+	'f.multicurrency_code'=>array('label'=>'Currency', 'checked'=>0, 'enabled'=>(!isModEnabled("multicurrency") ? 0 : 1)),
+	'f.multicurrency_tx'=>array('label'=>'CurrencyRate', 'checked'=>0, 'enabled'=>(!isModEnabled("multicurrency") ? 0 : 1)),
+	'f.multicurrency_total_ht'=>array('label'=>'MulticurrencyAmountHT', 'checked'=>0, 'enabled'=>(!isModEnabled("multicurrency") ? 0 : 1)),
+	'f.multicurrency_total_vat'=>array('label'=>'MulticurrencyAmountVAT', 'checked'=>0, 'enabled'=>(!isModEnabled("multicurrency") ? 0 : 1)),
+	'f.multicurrency_total_ttc'=>array('label'=>'MulticurrencyAmountTTC', 'checked'=>0, 'enabled'=>(!isModEnabled("multicurrency") ? 0 : 1)),
+	'multicurrency_dynamount_payed'=>array('label'=>'MulticurrencyAlreadyPaid', 'checked'=>0, 'enabled'=>(!isModEnabled("multicurrency") ? 0 : 1)),
+	'multicurrency_rtp'=>array('label'=>'MulticurrencyRemainderToPay', 'checked'=>0, 'enabled'=>(!isModEnabled("multicurrency") ? 0 : 1)), // Not enabled by default because slow
 	'f.datec'=>array('label'=>"DateCreation", 'checked'=>0, 'position'=>500),
 	'f.tms'=>array('label'=>"DateModificationShort", 'checked'=>0, 'position'=>500),
 	'f.fk_statut'=>array('label'=>"Status", 'checked'=>1, 'position'=>1000),
diff --git a/htdocs/fourn/facture/paiement.php b/htdocs/fourn/facture/paiement.php
index 09507929daf..d9b755fdf4e 100644
--- a/htdocs/fourn/facture/paiement.php
+++ b/htdocs/fourn/facture/paiement.php
@@ -575,7 +575,7 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
 						print '<td>'.$langs->trans('RefSupplier').'</td>';
 						print '<td class="center">'.$langs->trans('Date').'</td>';
 						print '<td class="center">'.$langs->trans('DateMaxPayment').'</td>';
-						if (!empty($conf->multicurrency->enabled)) {
+						if (isModEnabled("multicurrency")) {
 							print '<td>'.$langs->trans('Currency').'</td>';
 							print '<td class="right">'.$langs->trans('MulticurrencyAmountTTC').'</td>';
 							print '<td class="right">'.$langs->trans('MulticurrencyAlreadyPaid').'</td>';
@@ -612,7 +612,7 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
 							$remaintopay = price2num($invoice->total_ttc - $paiement - $creditnotes - $deposits, 'MT');
 
 							// Multicurrency Price
-							if (!empty($conf->multicurrency->enabled)) {
+							if (isModEnabled("multicurrency")) {
 								$multicurrency_payment = $invoice->getSommePaiement(1);
 								$multicurrency_creditnotes = $invoice->getSumCreditNotesUsed(1);
 								$multicurrency_deposits = $invoice->getSumDepositsUsed(1);
@@ -653,7 +653,7 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
 							}
 
 							// Multicurrency
-							if (!empty($conf->multicurrency->enabled)) {
+							if (isModEnabled("multicurrency")) {
 								// Currency
 								print '<td class="center">'.$objp->multicurrency_code."</td>\n";
 
@@ -767,7 +767,7 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
 							// Print total
 							print '<tr class="liste_total">';
 							print '<td colspan="4" class="left">'.$langs->trans('TotalTTC').':</td>';
-							if (!empty($conf->multicurrency->enabled)) {
+							if (isModEnabled("multicurrency")) {
 								print '<td>&nbsp;</td>';
 								print '<td>&nbsp;</td>';
 								print '<td>&nbsp;</td>';

From 371f5ee581d3413325c385932ac96f9f0c78f057 Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Sat, 3 Sep 2022 11:30:24 +0200
Subject: [PATCH 652/974] Update code

---
 htdocs/modulebuilder/index.php                     |  2 +-
 .../template/class/myobject.class.php              |  2 +-
 .../mymodule/doc/pdf_standard_myobject.modules.php |  4 ++--
 htdocs/multicurrency/multicurrency_rate.php        |  2 +-
 htdocs/product/fournisseurs.php                    | 14 +++++++-------
 5 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/htdocs/modulebuilder/index.php b/htdocs/modulebuilder/index.php
index 0762d95d154..81da2909779 100644
--- a/htdocs/modulebuilder/index.php
+++ b/htdocs/modulebuilder/index.php
@@ -907,7 +907,7 @@ if ($dirins && $action == 'initobject' && $module && GETPOST('createtablearray',
 		 *         Note: Filter can be a string like "(t.ref:like:'SO-%') or (t.date_creation:<:'20160101') or (t.nature:is:NULL)"
 		 *  'label' the translation key.
 		 *  'picto' is code of a picto to show before value in forms
-		 *  'enabled' is a condition when the field must be managed (Example: 1 or '$conf->global->MY_SETUP_PARAM' or '!empty($conf->multicurrency->enabled)' ...)
+		 *  'enabled' is a condition when the field must be managed (Example: 1 or '$conf->global->MY_SETUP_PARAM' or 'isModEnabled("multicurrency")' ...)
 		 *  'position' is the sort order of field.
 		 *  'notnull' is set to 1 if not null in database. Set to -1 if we must set data to null if empty ('' or 0).
 		 *  'visible' says if field is visible in list (Examples: 0=Not visible, 1=Visible on list and create/update/view forms, 2=Visible on list only, 3=Visible on create/update/view form only (not list), 4=Visible on list and update/view form only (not create). 5=Visible on list and view only (not create/not update). Using a negative value means field is not shown by default on list but can be selected for viewing)
diff --git a/htdocs/modulebuilder/template/class/myobject.class.php b/htdocs/modulebuilder/template/class/myobject.class.php
index 1d6b6650d27..8265bbadaf8 100644
--- a/htdocs/modulebuilder/template/class/myobject.class.php
+++ b/htdocs/modulebuilder/template/class/myobject.class.php
@@ -84,7 +84,7 @@ class MyObject extends CommonObject
 	 *		Note: Filter can be a string like "(t.ref:like:'SO-%') or (t.date_creation:<:'20160101') or (t.nature:is:NULL)"
 	 *  'label' the translation key.
 	 *  'picto' is code of a picto to show before value in forms
-	 *  'enabled' is a condition when the field must be managed (Example: 1 or '$conf->global->MY_SETUP_PARAM' or '!empty($conf->multicurrency->enabled)' ...)
+	 *  'enabled' is a condition when the field must be managed (Example: 1 or '$conf->global->MY_SETUP_PARAM' or 'isModEnabled("multicurrency")' ...)
 	 *  'position' is the sort order of field.
 	 *  'notnull' is set to 1 if not null in database. Set to -1 if we must set data to null if empty ('' or 0).
 	 *  'visible' says if field is visible in list (Examples: 0=Not visible, 1=Visible on list and create/update/view forms, 2=Visible on list only, 3=Visible on create/update/view form only (not list), 4=Visible on list and update/view form only (not create). 5=Visible on list and view only (not create/not update). Using a negative value means field is not shown by default on list but can be selected for viewing)
diff --git a/htdocs/modulebuilder/template/core/modules/mymodule/doc/pdf_standard_myobject.modules.php b/htdocs/modulebuilder/template/core/modules/mymodule/doc/pdf_standard_myobject.modules.php
index 561c09f88d6..3990d49fa6d 100644
--- a/htdocs/modulebuilder/template/core/modules/mymodule/doc/pdf_standard_myobject.modules.php
+++ b/htdocs/modulebuilder/template/core/modules/mymodule/doc/pdf_standard_myobject.modules.php
@@ -634,13 +634,13 @@ class pdf_standard_myobject extends ModelePDFMyObject
 					// Collecte des totaux par valeur de tva dans $this->tva["taux"]=total_tva
 					$prev_progress = $object->lines[$i]->get_prev_progress($object->id);
 					if ($prev_progress > 0 && !empty($object->lines[$i]->situation_percent)) { // Compute progress from previous situation
-						if (!empty($conf->multicurrency->enabled) && $object->multicurrency_tx != 1) {
+						if (isModEnabled("multicurrency") && $object->multicurrency_tx != 1) {
 							$tvaligne = $sign * $object->lines[$i]->multicurrency_total_tva * ($object->lines[$i]->situation_percent - $prev_progress) / $object->lines[$i]->situation_percent;
 						} else {
 							$tvaligne = $sign * $object->lines[$i]->total_tva * ($object->lines[$i]->situation_percent - $prev_progress) / $object->lines[$i]->situation_percent;
 						}
 					} else {
-						if (!empty($conf->multicurrency->enabled) && $object->multicurrency_tx != 1) {
+						if (isModEnabled("multicurrency") && $object->multicurrency_tx != 1) {
 							$tvaligne = $sign * $object->lines[$i]->multicurrency_total_tva;
 						} else {
 							$tvaligne = $sign * $object->lines[$i]->total_tva;
diff --git a/htdocs/multicurrency/multicurrency_rate.php b/htdocs/multicurrency/multicurrency_rate.php
index 06fe91c120d..3f20476f72a 100644
--- a/htdocs/multicurrency/multicurrency_rate.php
+++ b/htdocs/multicurrency/multicurrency_rate.php
@@ -102,7 +102,7 @@ $arrayfields = dol_sort_array($arrayfields, 'position');
 // Access control
 // TODO Open this page to a given permission so a sale representative can modify change rates. Permission should be added into module multicurrency.
 // One permission to read rates (history) and one to add/edit rates.
-if (!$user->admin || empty($conf->multicurrency->enabled)) {
+if (!$user->admin || !isModEnabled("multicurrency")) {
 	accessforbidden();
 }
 
diff --git a/htdocs/product/fournisseurs.php b/htdocs/product/fournisseurs.php
index 164dac7d185..03e7881dffb 100644
--- a/htdocs/product/fournisseurs.php
+++ b/htdocs/product/fournisseurs.php
@@ -243,7 +243,7 @@ if (empty($reshook)) {
 				$_POST["price"] = 0;
 			}
 		}
-		if (!empty($conf->multicurrency->enabled)) {
+		if (isModEnabled("multicurrency")) {
 			if (!GETPOST("multicurrency_code")) {
 				$error++;
 				$langs->load("errors");
@@ -299,7 +299,7 @@ if (empty($reshook)) {
 				}*/
 				$object->packaging = $packaging;
 
-				if (!empty($conf->multicurrency->enabled)) {
+				if (isModEnabled("multicurrency")) {
 					$multicurrency_tx = price2num(GETPOST("multicurrency_tx", 'alpha'));
 					$multicurrency_price = price2num(GETPOST("multicurrency_price", 'alpha'));
 					$multicurrency_code = GETPOST("multicurrency_code", 'alpha');
@@ -630,7 +630,7 @@ if ($id > 0 || $ref) {
 					</script>';
 				}
 
-				if (!empty($conf->multicurrency->enabled)) {
+				if (isModEnabled("multicurrency")) {
 					// Currency
 					print '<tr><td class="fieldrequired">'.$langs->trans("Currency").'</td>';
 					print '<td>';
@@ -973,7 +973,7 @@ END;
 				}
 				print_liste_field_titre("VATRate", $_SERVER["PHP_SELF"], '', '', $param, '', $sortfield, $sortorder, 'right ');
 				print_liste_field_titre("PriceQtyMinHT", $_SERVER["PHP_SELF"], '', '', $param, '', $sortfield, $sortorder, 'right ');
-				if (!empty($conf->multicurrency->enabled)) {
+				if (isModEnabled("multicurrency")) {
 					print_liste_field_titre("PriceQtyMinHTCurrency", $_SERVER["PHP_SELF"], '', '', $param, '', $sortfield, $sortorder, 'right ');
 				}
 				if (!empty($arrayfields['pfp.unitprice']['checked'])) {
@@ -982,7 +982,7 @@ END;
 				if (!empty($arrayfields['pfp.multicurrency_unitprice']['checked'])) {
 					print_liste_field_titre("UnitPriceHTCurrency", $_SERVER["PHP_SELF"], "pfp.multicurrency_unitprice", "", $param, '', $sortfield, $sortorder, 'right ');
 				}
-				if (!empty($conf->multicurrency->enabled)) {
+				if (isModEnabled("multicurrency")) {
 					print_liste_field_titre("Currency", $_SERVER["PHP_SELF"], "", "", $param, '', $sortfield, $sortorder, 'right ');
 				}
 				print_liste_field_titre("DiscountQtyMin", $_SERVER["PHP_SELF"], '', '', $param, '', $sortfield, $sortorder, 'right ');
@@ -1089,7 +1089,7 @@ END;
 						print $productfourn->fourn_price ? '<span class="amount">'.price($productfourn->fourn_price).'</span>' : "";
 						print '</td>';
 
-						if (!empty($conf->multicurrency->enabled)) {
+						if (isModEnabled("multicurrency")) {
 							// Price for the quantity in currency
 							print '<td class="right">';
 							print $productfourn->fourn_multicurrency_price ? '<span class="amount">'.price($productfourn->fourn_multicurrency_price).'</span>' : "";
@@ -1112,7 +1112,7 @@ END;
 						}
 
 						// Currency
-						if (!empty($conf->multicurrency->enabled)) {
+						if (isModEnabled("multicurrency")) {
 							print '<td class="right nowraponall">';
 							print $productfourn->fourn_multicurrency_code ? currency_name($productfourn->fourn_multicurrency_code) : '';
 							print '</td>';

From 8108a60aacf7a388b60449e3d98416e4867d770a Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Sat, 3 Sep 2022 11:32:24 +0200
Subject: [PATCH 653/974] Update code

---
 htdocs/societe/card.php                        | 18 +++++++++---------
 htdocs/supplier_proposal/card.php              | 14 +++++++-------
 .../class/supplier_proposal.class.php          | 10 +++++-----
 htdocs/supplier_proposal/list.php              | 10 +++++-----
 htdocs/webhook/class/target.class.php          |  2 +-
 5 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/htdocs/societe/card.php b/htdocs/societe/card.php
index f8beacdbb2e..c6ee771472f 100644
--- a/htdocs/societe/card.php
+++ b/htdocs/societe/card.php
@@ -540,7 +540,7 @@ if (empty($reshook)) {
 			}
 
 			// Multicurrency
-			if (!empty($conf->multicurrency->enabled)) {
+			if (isModEnabled("multicurrency")) {
 				$object->multicurrency_code = GETPOST('multicurrency_code', 'alpha');
 			}
 
@@ -1174,7 +1174,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 		$object->forme_juridique_code = GETPOST('forme_juridique_code');
 
 		// We set multicurrency_code if enabled
-		if (!empty($conf->multicurrency->enabled)) {
+		if (isModEnabled("multicurrency")) {
 			$object->multicurrency_code = GETPOST('multicurrency_code') ? GETPOST('multicurrency_code') : $conf->currency;
 		}
 		/* Show create form */
@@ -1740,7 +1740,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 		// Capital
 		print '<tr><td>'.$form->editfieldkey('Capital', 'capital', '', $object, 0).'</td>';
 		print '<td colspan="3"><input type="text" name="capital" id="capital" class="maxwidth100" value="'.$object->capital.'"> ';
-		if (!empty($conf->multicurrency->enabled)) {
+		if (isModEnabled("multicurrency")) {
 			print '<span class="hideonsmartphone">'.$langs->trans("Currency".$object->multicurrency_code).'</span></td></tr>';
 		} else {
 			print '<span class="hideonsmartphone">'.$langs->trans("Currency".$conf->currency).'</span></td></tr>';
@@ -1788,7 +1788,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 		}
 
 		// Multicurrency
-		if (!empty($conf->multicurrency->enabled)) {
+		if (isModEnabled("multicurrency")) {
 			print '<tr>';
 			print '<td>'.$form->editfieldkey('Currency', 'multicurrency_code', '', $object, 0).'</td>';
 			print '<td colspan="3" class="maxwidthonsmartphone">';
@@ -2002,7 +2002,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 				}
 
 				// We set multicurrency_code if enabled
-				if (!empty($conf->multicurrency->enabled)) {
+				if (isModEnabled("multicurrency")) {
 					$object->multicurrency_code = GETPOST('multicurrency_code') ? GETPOST('multicurrency_code') : $object->multicurrency_code;
 				}
 			}
@@ -2439,7 +2439,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 			print '<tr><td>'.$form->editfieldkey('Capital', 'capital', '', $object, 0).'</td>';
 			print '<td colspan="3"><input type="text" name="capital" id="capital" size="10" value="';
 			print $object->capital != '' ? dol_escape_htmltag(price($object->capital)) : '';
-			if (!empty($conf->multicurrency->enabled)) {
+			if (isModEnabled("multicurrency")) {
 				print '"> <span class="hideonsmartphone">'.$langs->trans("Currency".$object->multicurrency_code).'</span></td></tr>';
 			} else {
 				print '"> <span class="hideonsmartphone">'.$langs->trans("Currency".$conf->currency).'</span></td></tr>';
@@ -2494,7 +2494,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 			}
 
 			// Multicurrency
-			if (!empty($conf->multicurrency->enabled)) {
+			if (isModEnabled("multicurrency")) {
 				print '<tr>';
 				print '<td>'.$form->editfieldkey('Currency', 'multicurrency_code', '', $object, 0).'</td>';
 				print '<td colspan="3" class="maxwidthonsmartphone">';
@@ -2930,7 +2930,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 		// Capital
 		print '<tr><td>'.$langs->trans('Capital').'</td><td>';
 		if ($object->capital) {
-			if (!empty($conf->multicurrency->enabled) && !empty($object->multicurrency_code)) {
+			if (isModEnabled("multicurrency") && !empty($object->multicurrency_code)) {
 				print price($object->capital, '', $langs, 0, -1, -1, $object->multicurrency_code);
 			} else {
 				print price($object->capital, '', $langs, 0, -1, -1, $conf->currency);
@@ -2971,7 +2971,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 		}
 
 		// Multicurrency
-		if (!empty($conf->multicurrency->enabled)) {
+		if (isModEnabled("multicurrency")) {
 			print '<tr>';
 			print '<td>'.$form->editfieldkey('Currency', 'multicurrency_code', '', $object, 0).'</td>';
 			print '<td>';
diff --git a/htdocs/supplier_proposal/card.php b/htdocs/supplier_proposal/card.php
index 5228f0ccac2..b7270037a09 100644
--- a/htdocs/supplier_proposal/card.php
+++ b/htdocs/supplier_proposal/card.php
@@ -307,7 +307,7 @@ if (empty($reshook)) {
 				$object->origin_id = GETPOST('originid');
 
 				// Multicurrency
-				if (!empty($conf->multicurrency->enabled)) {
+				if (isModEnabled("multicurrency")) {
 					$object->multicurrency_code = GETPOST('multicurrency_code', 'alpha');
 				}
 
@@ -1190,7 +1190,7 @@ if ($action == 'create') {
 		$objectsrc->fetch_optionals();
 		$object->array_options = $objectsrc->array_options;
 
-		if (!empty($conf->multicurrency->enabled)) {
+		if (isModEnabled("multicurrency")) {
 			if (!empty($objectsrc->multicurrency_code)) {
 				$currency_code = $objectsrc->multicurrency_code;
 			}
@@ -1201,7 +1201,7 @@ if ($action == 'create') {
 	} else {
 		$cond_reglement_id 	= $soc->cond_reglement_supplier_id;
 		$mode_reglement_id 	= $soc->mode_reglement_supplier_id;
-		if (!empty($conf->multicurrency->enabled) && !empty($soc->multicurrency_code)) {
+		if (isModEnabled("multicurrency") && !empty($soc->multicurrency_code)) {
 			$currency_code = $soc->multicurrency_code;
 		}
 	}
@@ -1334,7 +1334,7 @@ if ($action == 'create') {
 	}
 
 	// Multicurrency
-	if (!empty($conf->multicurrency->enabled)) {
+	if (isModEnabled("multicurrency")) {
 		print '<tr>';
 		print '<td>'.$form->editfieldkey('Currency', 'multicurrency_code', '', $object, 0).'</td>';
 		print '<td colspan="3" class="maxwidthonsmartphone">';
@@ -1381,7 +1381,7 @@ if ($action == 'create') {
 		}
 		print '<tr><td>'.$langs->trans('AmountTTC').'</td><td colspan="2">'.price($objectsrc->total_ttc)."</td></tr>";
 
-		if (!empty($conf->multicurrency->enabled)) {
+		if (isModEnabled("multicurrency")) {
 			print '<tr><td>'.$langs->trans('MulticurrencyAmountHT').'</td><td colspan="2">'.price($objectsrc->multicurrency_total_ht).'</td></tr>';
 			print '<tr><td>'.$langs->trans('MulticurrencyAmountVAT').'</td><td colspan="2">'.price($objectsrc->multicurrency_total_tva)."</td></tr>";
 			print '<tr><td>'.$langs->trans('MulticurrencyAmountTTC').'</td><td colspan="2">'.price($objectsrc->multicurrency_total_ttc)."</td></tr>";
@@ -1685,7 +1685,7 @@ if ($action == 'create') {
 	print '</td></tr>';
 
 	// Multicurrency
-	if (!empty($conf->multicurrency->enabled)) {
+	if (isModEnabled("multicurrency")) {
 		// Multicurrency code
 		print '<tr>';
 		print '<td>';
@@ -1778,7 +1778,7 @@ if ($action == 'create') {
 
 	print '<table class="border tableforfield centpercent">';
 
-	if (!empty($conf->multicurrency->enabled) && ($object->multicurrency_code != $conf->currency)) {
+	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="valuefield nowrap right amountcard">'.price($object->multicurrency_total_ht, '', $langs, 0, - 1, - 1, (!empty($object->multicurrency_code) ? $object->multicurrency_code : $conf->currency)).'</td>';
diff --git a/htdocs/supplier_proposal/class/supplier_proposal.class.php b/htdocs/supplier_proposal/class/supplier_proposal.class.php
index 24b45c992eb..276178fa2d8 100644
--- a/htdocs/supplier_proposal/class/supplier_proposal.class.php
+++ b/htdocs/supplier_proposal/class/supplier_proposal.class.php
@@ -518,7 +518,7 @@ class SupplierProposal extends CommonObject
 				$txtva = preg_replace('/\s*\(.*\)/', '', $txtva); // Remove code into vatrate.
 			}
 
-			if (!empty($conf->multicurrency->enabled) && $pu_ht_devise > 0) {
+			if (isModEnabled("multicurrency") && $pu_ht_devise > 0) {
 				$pu = 0;
 			}
 
@@ -720,7 +720,7 @@ class SupplierProposal extends CommonObject
 				$txtva = preg_replace('/\s*\(.*\)/', '', $txtva); // Remove code into vatrate.
 			}
 
-			if (!empty($conf->multicurrency->enabled) && $pu_ht_devise > 0) {
+			if (isModEnabled("multicurrency") && $pu_ht_devise > 0) {
 				$pu = 0;
 			}
 
@@ -1779,7 +1779,7 @@ class SupplierProposal extends CommonObject
 			if (empty($ref_fourn)) {
 				$ref_fourn = $product->ref_supplier;
 			}
-			if (!empty($conf->multicurrency->enabled) && !empty($product->multicurrency_code)) {
+			if (isModEnabled("multicurrency") && !empty($product->multicurrency_code)) {
 				list($fk_multicurrency, $multicurrency_tx) = MultiCurrency::getIdAndTxFromCode($this->db, $product->multicurrency_code);
 			}
 			$productsupplier->id = $product->fk_product;
@@ -1842,7 +1842,7 @@ class SupplierProposal extends CommonObject
 			$product->tva_tx,
 			$user->id
 		);
-		if (!empty($conf->multicurrency->enabled)) {
+		if (isModEnabled("multicurrency")) {
 			if (!empty($product->multicurrency_code)) {
 				include_once DOL_DOCUMENT_ROOT.'/multicurrency/class/multicurrency.class.php';
 				$multicurrency = new MultiCurrency($this->db); //need to fetch because empty fk_multicurrency and rate
@@ -1863,7 +1863,7 @@ class SupplierProposal extends CommonObject
 
 		$sql = 'INSERT INTO '.MAIN_DB_PREFIX.'product_fournisseur_price ';
 		$sql .= '(datec, fk_product, fk_soc, ref_fourn, price, quantity, unitprice, tva_tx, fk_user';
-		if (!empty($conf->multicurrency->enabled) && !empty($product->multicurrency_code)) {
+		if (isModEnabled("multicurrency") && !empty($product->multicurrency_code)) {
 			$sql .= ',fk_multicurrency, multicurrency_code, multicurrency_unitprice, multicurrency_price, multicurrency_tx';
 		}
 		$sql .= ')  VALUES ('.implode(',', $values).')';
diff --git a/htdocs/supplier_proposal/list.php b/htdocs/supplier_proposal/list.php
index 6a8ad41dbd2..3b04695da20 100644
--- a/htdocs/supplier_proposal/list.php
+++ b/htdocs/supplier_proposal/list.php
@@ -180,11 +180,11 @@ $arrayfields = array(
 	'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'=>(empty($conf->multicurrency->enabled) ? 0 : 1)),
-	'sp.multicurrency_tx'=>array('label'=>'CurrencyRate', 'checked'=>0, 'enabled'=>(empty($conf->multicurrency->enabled) ? 0 : 1)),
-	'sp.multicurrency_total_ht'=>array('label'=>'MulticurrencyAmountHT', 'checked'=>0, 'enabled'=>(empty($conf->multicurrency->enabled) ? 0 : 1)),
-	'sp.multicurrency_total_vat'=>array('label'=>'MulticurrencyAmountVAT', 'checked'=>0, 'enabled'=>(empty($conf->multicurrency->enabled) ? 0 : 1)),
-	'sp.multicurrency_total_ttc'=>array('label'=>'MulticurrencyAmountTTC', 'checked'=>0, 'enabled'=>(empty($conf->multicurrency->enabled) ? 0 : 1)),
+	'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),
diff --git a/htdocs/webhook/class/target.class.php b/htdocs/webhook/class/target.class.php
index 1e82580fac9..30d541f33af 100644
--- a/htdocs/webhook/class/target.class.php
+++ b/htdocs/webhook/class/target.class.php
@@ -74,7 +74,7 @@ class Target extends CommonObject
 	 *         Note: Filter can be a string like "(t.ref:like:'SO-%') or (t.date_creation:<:'20160101') or (t.nature:is:NULL)"
 	 *  'label' the translation key.
 	 *  'picto' is code of a picto to show before value in forms
-	 *  'enabled' is a condition when the field must be managed (Example: 1 or '$conf->global->MY_SETUP_PARAM' or '!empty($conf->multicurrency->enabled)' ...)
+	 *  'enabled' is a condition when the field must be managed (Example: 1 or '$conf->global->MY_SETUP_PARAM' or 'isModEnabled("multicurrency")' ...)
 	 *  'position' is the sort order of field.
 	 *  'notnull' is set to 1 if not null in database. Set to -1 if we must set data to null if empty ('' or 0).
 	 *  'visible' says if field is visible in list (Examples: 0=Not visible, 1=Visible on list and create/update/view forms, 2=Visible on list only, 3=Visible on create/update/view form only (not list), 4=Visible on list and update/view form only (not create). 5=Visible on list and view only (not create/not update). Using a negative value means field is not shown by default on list but can be selected for viewing)

From 013bdc5c5f6a9ca59ca8d9d2717c4130f3e66581 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 3 Sep 2022 11:51:28 +0200
Subject: [PATCH 654/974] Update 16.0.0-17.0.0.sql

---
 htdocs/install/mysql/migration/16.0.0-17.0.0.sql | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/install/mysql/migration/16.0.0-17.0.0.sql b/htdocs/install/mysql/migration/16.0.0-17.0.0.sql
index 016dc7283df..f1b18c740c5 100644
--- a/htdocs/install/mysql/migration/16.0.0-17.0.0.sql
+++ b/htdocs/install/mysql/migration/16.0.0-17.0.0.sql
@@ -143,4 +143,4 @@ CREATE TABLE llx_bank_extrafields
 
 ALTER TABLE llx_bank_extrafields ADD INDEX idx_bank_extrafields (fk_object);
 
-ALTER TABLE llx_user RENAME COLUMN note TO note_private;
+ALTER TABLE llx_user CHANGE COLUMN note note_private text;

From cacad721234e0450cada25709628a257d817c94a Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 3 Sep 2022 11:53:14 +0200
Subject: [PATCH 655/974] Update note.php

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

diff --git a/htdocs/user/note.php b/htdocs/user/note.php
index 2b9e8388063..2b5a05dcd68 100644
--- a/htdocs/user/note.php
+++ b/htdocs/user/note.php
@@ -64,7 +64,7 @@ $hookmanager->initHooks(array('usercard', 'usernote', 'globalcard'));
  * Actions
  */
 $parameters = array('id'=>$socid);
-$reshook = $hookmanager->executeHooks('doActions', array(), $object, $action); // Note that $action and $object may have been modified by some hooks
+$reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
 if ($reshook < 0) {
 	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 }

From b2131f80dbebb4c0a7e95b20c53b301978af7ebc Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 3 Sep 2022 12:42:52 +0200
Subject: [PATCH 656/974] Doc

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

diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index bb82b0ac7e3..f189c90da72 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -504,6 +504,8 @@ if (!defined('NOTOKENRENEWAL') && !defined('NOSESSION')) {
 			$token = dol_hash(uniqid(mt_rand(), false), 'md5'); // Generates a hash of a random number. We don't need a secured hash, just a changing random value.
 			$_SESSION['newtoken'] = $token;
 			dol_syslog("NEW TOKEN generated by : ".$_SERVER['PHP_SELF'], LOG_DEBUG);
+			// TODO Warning, if a user succeed in entering a data from a public page, he can enter a link that make a token regeneration making
+			// the use of the backoffice no more possible !
 		}
 	}
 }

From 7fe9784ddb184d8c7a4438fe5e2291ca5ded2273 Mon Sep 17 00:00:00 2001
From: Florian HENRY <florian.henry@open-concept.pro>
Date: Sat, 3 Sep 2022 12:55:54 +0200
Subject: [PATCH 657/974] fix: better global declaration

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

diff --git a/htdocs/bookmarks/bookmarks.lib.php b/htdocs/bookmarks/bookmarks.lib.php
index 8eef3396eaa..696545f324c 100644
--- a/htdocs/bookmarks/bookmarks.lib.php
+++ b/htdocs/bookmarks/bookmarks.lib.php
@@ -29,9 +29,9 @@
  */
 function printDropdownBookmarksList()
 {
-	global $conf, $user, $db, $langs;
+	global $conf, $user, $db, $langs, $sortfield, $sortorder;
 
-	require_once DOL_DOCUMENT_ROOT.'/bookmarks/class/bookmark.class.php';
+	require_once DOL_DOCUMENT_ROOT.'/boo, kmarks/class/bookmark.class.php';
 	require_once DOL_DOCUMENT_ROOT.'/core/lib/functions.lib.php';
 
 	$langs->load("bookmarks");
@@ -48,7 +48,6 @@ function printDropdownBookmarksList()
 			}
 		}
 	}
-	global $sortfield, $sortorder;
 	$tmpurl = '';
 	// No urlencode, all param $url will be urlencoded later
 	if ($sortfield) {

From d5665e220e3ed88874fce45921513ba2e57c8112 Mon Sep 17 00:00:00 2001
From: Florian HENRY <florian.henry@open-concept.pro>
Date: Sat, 3 Sep 2022 13:00:24 +0200
Subject: [PATCH 658/974] fix: better global declaration

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

diff --git a/htdocs/bookmarks/bookmarks.lib.php b/htdocs/bookmarks/bookmarks.lib.php
index 696545f324c..f983e25f1da 100644
--- a/htdocs/bookmarks/bookmarks.lib.php
+++ b/htdocs/bookmarks/bookmarks.lib.php
@@ -31,7 +31,7 @@ function printDropdownBookmarksList()
 {
 	global $conf, $user, $db, $langs, $sortfield, $sortorder;
 
-	require_once DOL_DOCUMENT_ROOT.'/boo, kmarks/class/bookmark.class.php';
+	require_once DOL_DOCUMENT_ROOT.'/bookmarks/class/bookmark.class.php';
 	require_once DOL_DOCUMENT_ROOT.'/core/lib/functions.lib.php';
 
 	$langs->load("bookmarks");

From db966495b1b9f28a6e7c1710ec18e793106ebe86 Mon Sep 17 00:00:00 2001
From: Eric Seigne <eric.seigne@cap-rel.fr>
Date: Mon, 29 Aug 2022 15:57:13 +0200
Subject: [PATCH 659/974] fix #21941 call_trigger

better fix #21941 : trigger nearest the code that justify its execution
---
 htdocs/core/ajax/onlineSign.php            |  9 +++++++++
 htdocs/public/onlinesign/newonlinesign.php | 10 ++++++++++
 2 files changed, 19 insertions(+)

diff --git a/htdocs/core/ajax/onlineSign.php b/htdocs/core/ajax/onlineSign.php
index 67c3c989a3a..3ec4cfa0f20 100644
--- a/htdocs/core/ajax/onlineSign.php
+++ b/htdocs/core/ajax/onlineSign.php
@@ -212,6 +212,15 @@ if ($action == "importSignature") {
 					$db->commit();
 					$response = "success";
 					setEventMessages("PropalSigned", null, 'warnings');
+					if (method_exists($object, 'call_trigger')) {
+						//customer is not a user !?! so could we use same user as validation ?
+						$user = new User($db);
+						$user->fetch($object->user_valid_id);
+						$result = $object->call_trigger('PROPAL_CLOSE_SIGNED', $user);
+						if ($result < 0) {
+							$error++;
+						}
+					}
 				} else {
 					$db->rollback();
 					$error++;
diff --git a/htdocs/public/onlinesign/newonlinesign.php b/htdocs/public/onlinesign/newonlinesign.php
index a3ad1eaf645..1d90339a0ac 100644
--- a/htdocs/public/onlinesign/newonlinesign.php
+++ b/htdocs/public/onlinesign/newonlinesign.php
@@ -168,6 +168,15 @@ if ($action == 'confirm_refusepropal' && $confirm == 'yes') {
 
 		$message = 'refused';
 		setEventMessages("PropalRefused", null, 'warnings');
+		if (method_exists($object, 'call_trigger')) {
+			//customer is not a user !?! so could we use same user as validation ?
+			$user = new User($db);
+			$user->fetch($object->user_valid_id);
+			$result = $object->call_trigger('PROPAL_CLOSE_REFUSED', $user);
+			if ($result < 0) {
+				$error++;
+			}
+		}
 	} else {
 		$db->rollback();
 	}
@@ -459,6 +468,7 @@ if ($action == "dosign" && empty($cancel)) {
 			print '<br>';
 			if ($message == 'refused') {
 				print '<span class="ok">'.$langs->trans("PropalRefused").'</span>';
+
 			} else {
 				print '<span class="warning">'.$langs->trans("PropalAlreadyRefused").'</span>';
 			}

From 8e06c988878aa83d10f8f1ad0b47f7afa3cedffc Mon Sep 17 00:00:00 2001
From: stickler-ci <support@stickler-ci.com>
Date: Sat, 3 Sep 2022 12:02:29 +0000
Subject: [PATCH 660/974] Fixing style errors.

---
 htdocs/public/onlinesign/newonlinesign.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/htdocs/public/onlinesign/newonlinesign.php b/htdocs/public/onlinesign/newonlinesign.php
index 1d90339a0ac..e379853ed91 100644
--- a/htdocs/public/onlinesign/newonlinesign.php
+++ b/htdocs/public/onlinesign/newonlinesign.php
@@ -468,7 +468,6 @@ if ($action == "dosign" && empty($cancel)) {
 			print '<br>';
 			if ($message == 'refused') {
 				print '<span class="ok">'.$langs->trans("PropalRefused").'</span>';
-
 			} else {
 				print '<span class="warning">'.$langs->trans("PropalAlreadyRefused").'</span>';
 			}

From 6c947c9f9e3bacb796edcb1a0cf77d609303366e Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 3 Sep 2022 18:00:31 +0200
Subject: [PATCH 661/974] Doc

---
 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 f189c90da72..06ff00e474f 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -500,12 +500,12 @@ if (!defined('NOTOKENRENEWAL') && !defined('NOSESSION')) {
 		}
 
 		if (!isset($_SESSION['newtoken']) || getDolGlobalInt('MAIN_SECURITY_CSRF_TOKEN_RENEWAL_ON_EACH_CALL')) {
+			// Note: Using MAIN_SECURITY_CSRF_TOKEN_RENEWAL_ON_EACH_CALL is not recommended: if a user succeed in entering a data from
+			// a public page with a link that make a token regeneration, it can make use of the backoffice no more possible !
 			// Save in $_SESSION['newtoken'] what will be next token. Into forms, we will add param token = $_SESSION['newtoken']
 			$token = dol_hash(uniqid(mt_rand(), false), 'md5'); // Generates a hash of a random number. We don't need a secured hash, just a changing random value.
 			$_SESSION['newtoken'] = $token;
 			dol_syslog("NEW TOKEN generated by : ".$_SERVER['PHP_SELF'], LOG_DEBUG);
-			// TODO Warning, if a user succeed in entering a data from a public page, he can enter a link that make a token regeneration making
-			// the use of the backoffice no more possible !
 		}
 	}
 }

From 6406fbdc7ebe9c310eff0229b973bc6f3680febf Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 3 Sep 2022 19:02:42 +0200
Subject: [PATCH 662/974] NEW Add a way to enter LICENSE file content in
 property of website

---
 htdocs/core/lib/website2.lib.php       | 21 ++++++++
 htdocs/langs/en_US/website.lang        |  4 +-
 htdocs/website/class/website.class.php |  3 ++
 htdocs/website/index.php               | 70 +++++++++++++++++++++++++-
 4 files changed, 94 insertions(+), 4 deletions(-)

diff --git a/htdocs/core/lib/website2.lib.php b/htdocs/core/lib/website2.lib.php
index 58a0c6a64dd..6f532e078b3 100644
--- a/htdocs/core/lib/website2.lib.php
+++ b/htdocs/core/lib/website2.lib.php
@@ -533,6 +533,27 @@ function dolSaveReadme($file, $content)
 	return $result;
 }
 
+/**
+ * Save content of a page on disk
+ *
+ * @param	string		$file				Full path of filename to generate
+ * @param	string		$content			Content of file
+ * @return	boolean							True if OK
+ */
+function dolSaveLicense($file, $content)
+{
+	global $conf, $pathofwebsite;
+
+	dol_syslog("Save LICENSE file into ".$file);
+
+	dol_mkdir($pathofwebsite);
+	$result = file_put_contents($file, $content);
+	if (!empty($conf->global->MAIN_UMASK)) {
+		@chmod($file, octdec($conf->global->MAIN_UMASK));
+	}
+
+	return $result;
+}
 
 /**
  * 	Show list of themes. Show all thumbs of themes/skins
diff --git a/htdocs/langs/en_US/website.lang b/htdocs/langs/en_US/website.lang
index 3d5a57e91d3..379eadef08f 100644
--- a/htdocs/langs/en_US/website.lang
+++ b/htdocs/langs/en_US/website.lang
@@ -16,9 +16,9 @@ WEBSITE_HTML_HEADER=Addition at bottom of HTML Header (common to all pages)
 WEBSITE_ROBOT=Robot file (robots.txt)
 WEBSITE_HTACCESS=Website .htaccess file
 WEBSITE_MANIFEST_JSON=Website manifest.json file
-WEBSITE_README=README.md file
 WEBSITE_KEYWORDSDesc=Use a comma to separate values
-EnterHereLicenseInformation=Enter here meta data or license information to fille a README.md file. if you distribute your website as a template, the file will be included into the temptate package.
+EnterHereReadmeInformation=Enter here a description of the website. If you distribute your website as a template, the file will be included into the temptate package.
+EnterHereLicenseInformation=Enter here the LICENSE of the code of the website. If you distribute your website as a template, the file will be included into the temptate package.
 HtmlHeaderPage=HTML header (specific to this page only)
 PageNameAliasHelp=Name or alias of the page.<br>This alias is also used to forge a SEO URL when website is ran from a Virtual host of a Web server (like Apacke, Nginx, ...). Use the button "<strong>%s</strong>" to edit this alias.
 EditTheWebSiteForACommonHeader=Note: If you want to define a personalized header for all pages, edit the header on the site level instead of on the page/container.
diff --git a/htdocs/website/class/website.class.php b/htdocs/website/class/website.class.php
index 811c0e9c7cc..b18daba1031 100644
--- a/htdocs/website/class/website.class.php
+++ b/htdocs/website/class/website.class.php
@@ -979,6 +979,9 @@ class Website extends CommonObject
 		dol_syslog("Copy pages from ".$srcdir." into ".$destdir);
 		dolCopyDir($srcdir, $destdir, 0, 1, $arrayreplacementinfilename, 2, array('old', 'back'));
 
+		// Copy file README.md from containers to root
+		dol_copy($conf->website->dir_temp.'/'.$website->ref.'/containers/README.md', $conf->website->dir_temp.'/'.$website->ref.'/README.md');
+
 		// Copy files into medias/image
 		$srcdir = DOL_DATA_ROOT.'/medias/image/'.$website->ref;
 		$destdir = $conf->website->dir_temp.'/'.$website->ref.'/medias/image/websitekey';
diff --git a/htdocs/website/index.php b/htdocs/website/index.php
index f92642556d0..ac92d6166e7 100644
--- a/htdocs/website/index.php
+++ b/htdocs/website/index.php
@@ -243,6 +243,7 @@ $fileindex = $pathofwebsite.'/index.php';
 $filewrapper = $pathofwebsite.'/wrapper.php';
 $filemanifestjson = $pathofwebsite.'/manifest.json.php';
 $filereadme = $pathofwebsite.'/README.md';
+$filelicense = $pathofwebsite.'/LICENSE';
 $filemaster = $pathofwebsite.'/master.inc.php';
 
 // Define $urlwithroot
@@ -1191,6 +1192,11 @@ if ($action == 'addcontainer' && $usercanedit) {
 			$result = dolSaveReadme($filereadme, $readmecontent);
 		}
 
+		if (!dol_is_file($filelicense)) {
+			$licensecontent = "MIT License";
+			$result = dolSaveLicense($filelicense, $licensecontent);
+		}
+
 		$action = 'preview';
 	}
 }
@@ -1669,6 +1675,43 @@ if ($action == 'updatecss' && $usercanedit) {
 				$error++;
 			}
 
+			$dataposted = trim(GETPOST('WEBSITE_LICENSE', 'restricthtml'));
+			$dataposted = str_replace('<?=', '<?php', $dataposted);
+
+			// LICENSE file
+			$phpfullcodestringold = '';
+			$phpfullcodestring = dolKeepOnlyPhpCode($dataposted);
+
+			// Security analysis
+			$errorphpcheck = checkPHPCode($phpfullcodestringold, $phpfullcodestring);	// Contains the setEventMessages
+
+			if (!$errorphpcheck) {
+				$licensecontent = '';
+
+				/*$readmecontent.= "<?php // BEGIN PHP\n";
+				 $readmecontent.= '$websitekey=basename(__DIR__);'."\n";
+				 $readmecontent.= "if (! defined('USEDOLIBARRSERVER') && ! defined('USEDOLIBARREDITOR')) { require_once __DIR__.'/master.inc.php'; } // Load env if not already loaded"."\n";	// For the css, we need to set path of master using the dirname of css file.
+				 $readmecontent.= "require_once DOL_DOCUMENT_ROOT.'/core/lib/website.lib.php';\n";
+				 $readmecontent.= "require_once DOL_DOCUMENT_ROOT.'/core/website.inc.php';\n";
+				 $readmecontent.= "ob_start();\n";
+				 $readmecontent.= "header('Cache-Control: max-age=3600, public, must-revalidate');\n";
+				 $readmecontent.= "header('Content-type: application/manifest+json');\n";
+				 $readmecontent.= "// END PHP ?>\n";*/
+
+				$licensecontent .= $dataposted."\n";
+
+				/*$readmecontent.= '<?php // BEGIN PHP'."\n";
+				 $readmecontent.= '$tmp = ob_get_contents(); ob_end_clean(); dolWebsiteOutput($tmp, "manifest");'."\n";
+				 $readmecontent.= "// END PHP ?>"."\n";*/
+
+				$result = dolSaveLicense($filelicense, $licensecontent);
+				if (!$result) {
+					$error++;
+					setEventMessages('Failed to write file '.$filelicense, null, 'errors');
+				}
+			} else {
+				$error++;
+			}
 
 			// Save wrapper.php
 			$result = dolSaveIndexPage($pathofwebsite, '', '', $filewrapper, $object);
@@ -3365,6 +3408,17 @@ if ($action == 'editcss') {
 		//$readmecontent.="";
 	}
 
+	if (!GETPOSTISSET('WEBSITE_LICENSE')) {
+		$licensecontent = @file_get_contents($filelicense);
+		// Clean the readme file to remove php code and get only html part
+		$licensecontent = preg_replace('/<\?php \/\/ BEGIN PHP[^\?]*END PHP \?>\n*/ims', '', $licensecontent);
+	} else {
+		$licensecontent = GETPOST('WEBSITE_LICENSE', 'none');
+	}
+	if (!trim($licensecontent)) {
+		//$readmecontent.="";
+	}
+
 	print dol_get_fiche_head();
 
 	print '<!-- Edit Website properties -->'."\n";
@@ -3507,8 +3561,8 @@ if ($action == 'editcss') {
 
 	// README.md
 	print '<tr><td class="tdtop">';
-	$htmlhelp = $langs->trans("EnterHereLicenseInformation");
-	print $form->textwithpicto($langs->trans('WEBSITE_README'), $htmlhelp, 1, 'help', '', 0, 2, 'readmetooltip');
+	$htmlhelp = $langs->trans("EnterHereReadmeInformation");
+	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'));
@@ -3517,6 +3571,18 @@ if ($action == 'editcss') {
 
 	print '</td></tr>';
 
+	// LICENSE
+	print '<tr><td class="tdtop">';
+	$htmlhelp = $langs->trans("EnterHereLicenseInformation");
+	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'));
+	$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');
+
+	print '</td></tr>';
+
 	// RSS
 	print '<tr><td class="tdtop">';
 	$htmlhelp = $langs->trans('RSSFeedDesc');

From 6b38b89c3b568bb4d77efb3850e4793cf747853f Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 3 Sep 2022 19:05:25 +0200
Subject: [PATCH 663/974] NEW Add a way to enter LICENSE file content in
 property of website

---
 htdocs/website/class/website.class.php | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/htdocs/website/class/website.class.php b/htdocs/website/class/website.class.php
index b18daba1031..bddb8b43c24 100644
--- a/htdocs/website/class/website.class.php
+++ b/htdocs/website/class/website.class.php
@@ -979,8 +979,13 @@ class Website extends CommonObject
 		dol_syslog("Copy pages from ".$srcdir." into ".$destdir);
 		dolCopyDir($srcdir, $destdir, 0, 1, $arrayreplacementinfilename, 2, array('old', 'back'));
 
-		// Copy file README.md from containers to root
-		dol_copy($conf->website->dir_temp.'/'.$website->ref.'/containers/README.md', $conf->website->dir_temp.'/'.$website->ref.'/README.md');
+		// Copy file README.md and LICENSE from directory containers into directory root
+		if (dol_is_file($conf->website->dir_temp.'/'.$website->ref.'/containers/README.md')) {
+			dol_copy($conf->website->dir_temp.'/'.$website->ref.'/containers/README.md', $conf->website->dir_temp.'/'.$website->ref.'/README.md');
+		}
+		if (dol_is_file($conf->website->dir_temp.'/'.$website->ref.'/containers/LICENSE')) {
+			dol_copy($conf->website->dir_temp.'/'.$website->ref.'/containers/LICENSE', $conf->website->dir_temp.'/'.$website->ref.'/LICENSE');
+		}
 
 		// Copy files into medias/image
 		$srcdir = DOL_DATA_ROOT.'/medias/image/'.$website->ref;

From a7c17f59b9a280976538c380f1f9123843637e71 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 3 Sep 2022 19:16:28 +0200
Subject: [PATCH 664/974] Clean code

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

diff --git a/htdocs/adherents/note.php b/htdocs/adherents/note.php
index 0d05bb85523..532dd6e4c59 100644
--- a/htdocs/adherents/note.php
+++ b/htdocs/adherents/note.php
@@ -129,7 +129,7 @@ if ($id) {
 
 	// Login
 	if (empty($conf->global->ADHERENT_LOGIN_NOT_REQUIRED)) {
-		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).'</td></tr>';
 	}
 
 	// Type
@@ -143,7 +143,7 @@ if ($id) {
 	print '</tr>';
 
 	// Company
-	print '<tr><td>'.$langs->trans("Company").'</td><td class="valeur">'.$object->company.'</td></tr>';
+	print '<tr><td>'.$langs->trans("Company").'</td><td class="valeur">'.dol_escape_htmltag($object->company).'</td></tr>';
 
 	// Civility
 	print '<tr><td>'.$langs->trans("UserTitle").'</td><td class="valeur">'.$object->getCivilityLabel().'&nbsp;</td>';

From cfd3eeb2451af364035645c15091cd21fd15f51c Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 3 Sep 2022 20:08:13 +0200
Subject: [PATCH 665/974] NEW All ajax pages have now a top_httphead()

---
 htdocs/adherents/note.php                     |   2 +-
 htdocs/admin/dolistore/ajax/image.php         |  17 +-
 htdocs/blockedlog/ajax/authority.php          |   7 +
 htdocs/blockedlog/ajax/block-add.php          |   7 +
 htdocs/blockedlog/ajax/block-info.php         |   2 +
 htdocs/blockedlog/ajax/check_signature.php    |   6 +
 htdocs/comm/action/rapport/index.php          |   2 +-
 htdocs/core/ajax/fetchKnowledgeRecord.php     |   2 +
 htdocs/core/ajax/fileupload.php               |   7 +
 htdocs/core/ajax/onlineSign.php               |   2 +
 htdocs/core/ajax/selectsearchbox.php          |   2 +
 htdocs/core/class/html.form.class.php         |   2 +-
 htdocs/core/class/html.formfile.class.php     |  36 +----
 .../{rapport.pdf.php => rapport.class.php}    |   2 +-
 htdocs/core/tpl/ajax/fileupload_main.tpl.php  |  96 ------------
 htdocs/core/tpl/ajax/fileupload_view.tpl.php  | 147 ------------------
 .../objectlinked_lineimport.tpl.php           |   0
 htdocs/mrp/ajax/ajax_bom.php                  |   4 +-
 htdocs/product/ajax/products.php              |   2 +
 .../inventory/ajax/searchfrombarcode.php      |   7 +
 htdocs/salaries/ajax/ajaxsalaries.php         |   2 +
 htdocs/stripe/ajax/ajax.php                   |   2 +
 test/phpunit/CodingPhpTest.php                |  18 ++-
 23 files changed, 84 insertions(+), 290 deletions(-)
 rename htdocs/core/modules/action/{rapport.pdf.php => rapport.class.php} (99%)
 delete mode 100644 htdocs/core/tpl/ajax/fileupload_main.tpl.php
 delete mode 100644 htdocs/core/tpl/ajax/fileupload_view.tpl.php
 rename htdocs/core/tpl/{ajax => }/objectlinked_lineimport.tpl.php (100%)

diff --git a/htdocs/adherents/note.php b/htdocs/adherents/note.php
index 532dd6e4c59..7e445e41a37 100644
--- a/htdocs/adherents/note.php
+++ b/htdocs/adherents/note.php
@@ -146,7 +146,7 @@ if ($id) {
 	print '<tr><td>'.$langs->trans("Company").'</td><td class="valeur">'.dol_escape_htmltag($object->company).'</td></tr>';
 
 	// Civility
-	print '<tr><td>'.$langs->trans("UserTitle").'</td><td class="valeur">'.$object->getCivilityLabel().'&nbsp;</td>';
+	print '<tr><td>'.$langs->trans("UserTitle").'</td><td class="valeur">'.$object->getCivilityLabel().'</td>';
 	print '</tr>';
 
 	print "</table>";
diff --git a/htdocs/admin/dolistore/ajax/image.php b/htdocs/admin/dolistore/ajax/image.php
index e601da43e06..6beb96a9e66 100644
--- a/htdocs/admin/dolistore/ajax/image.php
+++ b/htdocs/admin/dolistore/ajax/image.php
@@ -27,14 +27,17 @@ if (!defined('NOTOKENRENEWAL')) {
  *      \ingroup    admin
  *      \brief      Page des informations dolistore
  */
+
 require "../../../main.inc.php";
-
-// CORE
-
-global $lang, $user, $conf;
-
-
 require_once DOL_DOCUMENT_ROOT.'/admin/dolistore/class/dolistore.class.php';
+
+
+/*
+ * View
+ */
+
+top_httphead('image');
+
 $dolistore = new Dolistore();
 
 $id_product = GETPOST('id_product', 'int');
@@ -51,7 +54,7 @@ try {
 	);
 	//echo $url;
 	$request = $api->executeRequest($url, array(CURLOPT_CUSTOMREQUEST => 'GET'));
-	header('Content-type:image');
+
 	print $request['response'];
 } catch (PrestaShopWebserviceException $e) {
 	// Here we are dealing with errors
diff --git a/htdocs/blockedlog/ajax/authority.php b/htdocs/blockedlog/ajax/authority.php
index 78f944f692a..2da0544e0a7 100644
--- a/htdocs/blockedlog/ajax/authority.php
+++ b/htdocs/blockedlog/ajax/authority.php
@@ -44,6 +44,13 @@ require_once DOL_DOCUMENT_ROOT.'/blockedlog/class/authority.class.php';
 $user = new User($db);
 $user->fetch(1); //TODO conf user authority
 
+
+/*
+ * View
+ */
+
+top_httphead();
+
 $auth = new BlockedLogAuthority($db);
 
 $signature = GETPOST('s');
diff --git a/htdocs/blockedlog/ajax/block-add.php b/htdocs/blockedlog/ajax/block-add.php
index 53093f02d18..e2009a01da1 100644
--- a/htdocs/blockedlog/ajax/block-add.php
+++ b/htdocs/blockedlog/ajax/block-add.php
@@ -42,6 +42,13 @@ $id = GETPOST('id', 'int');
 $element = GETPOST('element', 'alpha');
 $action = GETPOST('action', 'aZ09');
 
+
+/*
+ * View
+ */
+
+top_httphead();
+
 if ($element === 'facture') {
 	require_once DOL_DOCUMENT_ROOT.'/blockedlog/class/blockedlog.class.php';
 	require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
diff --git a/htdocs/blockedlog/ajax/block-info.php b/htdocs/blockedlog/ajax/block-info.php
index e6f9ea0de15..da27b8fc50e 100644
--- a/htdocs/blockedlog/ajax/block-info.php
+++ b/htdocs/blockedlog/ajax/block-info.php
@@ -54,6 +54,8 @@ $langs->loadLangs(array("admin"));
  * View
  */
 
+top_httphead();
+
 print '<div id="pop-info"><table width="100%" height="80%" class="border"><thead><th width="50%" class="left">'.$langs->trans('Field').'</th><th class="left">'.$langs->trans('Value').'</th></thead>';
 print '<tbody>';
 
diff --git a/htdocs/blockedlog/ajax/check_signature.php b/htdocs/blockedlog/ajax/check_signature.php
index 4d59b56a981..60a763635c0 100644
--- a/htdocs/blockedlog/ajax/check_signature.php
+++ b/htdocs/blockedlog/ajax/check_signature.php
@@ -48,6 +48,12 @@ if (empty($conf->global->BLOCKEDLOG_AUTHORITY_URL)) {
 }
 
 
+/*
+ * View
+ */
+
+top_httphead();
+
 $auth = new BlockedLogAuthority($db);
 $auth->syncSignatureWithAuthority();
 
diff --git a/htdocs/comm/action/rapport/index.php b/htdocs/comm/action/rapport/index.php
index 9b3f9a27140..4414981b6fb 100644
--- a/htdocs/comm/action/rapport/index.php
+++ b/htdocs/comm/action/rapport/index.php
@@ -29,7 +29,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
 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/modules/action/rapport.pdf.php';
+require_once DOL_DOCUMENT_ROOT.'/core/modules/action/rapport.class.php';
 
 // Load translation files required by the page
 $langs->loadLangs(array("agenda", "commercial"));
diff --git a/htdocs/core/ajax/fetchKnowledgeRecord.php b/htdocs/core/ajax/fetchKnowledgeRecord.php
index 0182887c225..179d8169465 100644
--- a/htdocs/core/ajax/fetchKnowledgeRecord.php
+++ b/htdocs/core/ajax/fetchKnowledgeRecord.php
@@ -66,6 +66,8 @@ $lang = GETPOST('lang', 'aZ09');
  * View
  */
 
+top_httphead('application/json');
+
 if ($action == "getKnowledgeRecord") {
 	$response = '';
 	$sql = "SELECT kr.rowid, kr.ref, kr.question, kr.answer,kr.url,ctc.code";
diff --git a/htdocs/core/ajax/fileupload.php b/htdocs/core/ajax/fileupload.php
index 0e05036de02..53d65e4ab75 100644
--- a/htdocs/core/ajax/fileupload.php
+++ b/htdocs/core/ajax/fileupload.php
@@ -50,6 +50,13 @@ $element = GETPOST('element', 'alpha');
 
 $upload_handler = new FileUpload(null, $fk_element, $element);
 
+
+/*
+ * View
+ */
+
+top_httphead();
+
 header('Pragma: no-cache');
 header('Cache-Control: no-store, no-cache, must-revalidate');
 header('Content-Disposition: inline; filename="files.json"');
diff --git a/htdocs/core/ajax/onlineSign.php b/htdocs/core/ajax/onlineSign.php
index 5f59abea0b5..8f3cb23b396 100644
--- a/htdocs/core/ajax/onlineSign.php
+++ b/htdocs/core/ajax/onlineSign.php
@@ -91,6 +91,8 @@ if (empty($SECUREKEY) || !dol_verifyHash($securekeyseed.$type.$ref.(!isModEnable
  * View
  */
 
+top_httphead();
+
 if ($action == "importSignature") {
 	if (!empty($signature) && $signature[0] == "image/png;base64") {
 		$signature = $signature[1];
diff --git a/htdocs/core/ajax/selectsearchbox.php b/htdocs/core/ajax/selectsearchbox.php
index 54e3e1e4470..201a4b89991 100644
--- a/htdocs/core/ajax/selectsearchbox.php
+++ b/htdocs/core/ajax/selectsearchbox.php
@@ -25,6 +25,8 @@
 // This script is called with a POST method or as an include.
 
 if (!isset($usedbyinclude) || empty($usedbyinclude)) {
+	top_httphead('application/json');
+
 	if (!defined('NOTOKENRENEWAL')) {
 		define('NOTOKENRENEWAL', 1); // Disables token renewal
 	}
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 838aea25f53..a738bce9004 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -8635,7 +8635,7 @@ class Form
 			print '</table>';
 
 			if (!empty($compatibleImportElementsList)) {
-				$res = @include dol_buildpath('core/tpl/ajax/objectlinked_lineimport.tpl.php');
+				$res = @include dol_buildpath('core/tpl/objectlinked_lineimport.tpl.php');
 			}
 
 
diff --git a/htdocs/core/class/html.formfile.class.php b/htdocs/core/class/html.formfile.class.php
index 612e555a6b0..441ddb60255 100644
--- a/htdocs/core/class/html.formfile.class.php
+++ b/htdocs/core/class/html.formfile.class.php
@@ -71,7 +71,7 @@ class FormFile
 	 *  @param	Object		$object			Object to use (when attachment is done on an element)
 	 *  @param	string		$options		Add an option column
 	 *  @param  integer     $useajax        Use fileupload ajax (0=never, 1=if enabled, 2=always whatever is option).
-	 *                                      Deprecated 2 should never be used and if 1 is used, option should no be enabled.
+	 *                                      Deprecated 2 should never be used and if 1 is used, option should not be enabled.
 	 *  @param	string		$savingdocmask	Mask to use to define output filename. For example 'XXXXX-__YYYYMMDD__-__file__'
 	 *  @param	integer		$linkfiles		1=Also add form to link files, 0=Do not show form to link files
 	 *  @param	string		$htmlname		Name and id of HTML form ('formuserfile' by default, 'formuserfileecm' when used to upload a file in ECM)
@@ -104,7 +104,8 @@ class FormFile
 			// TODO: This does not support option savingdocmask
 			// TODO: This break feature to upload links too
 			// TODO: Thisdoes not work when param nooutput=1
-			return $this->_formAjaxFileUpload($object);
+			//return $this->_formAjaxFileUpload($object);
+			return 'Feature too bugged so removed';
 		} else {
 			//If there is no permission and the option to hide unauthorized actions is enabled, then nothing is printed
 			if (!$perm && !empty($conf->global->MAIN_BUTTON_HIDE_UNAUTHORIZED)) {
@@ -1919,37 +1920,6 @@ class FormFile
 		// Fin de zone
 	}
 
-	/**
-	 *    Show form to upload a new file with jquery fileupload.
-	 *    This form use the fileupload.php file.
-	 *
-	 *    @param	Object	$object		Object to use
-	 *    @return	void
-	 */
-	private function _formAjaxFileUpload($object)
-	{
-		global $langs, $conf;
-
-		// PHP post_max_size
-		$post_max_size				= ini_get('post_max_size');
-		$mul_post_max_size			= substr($post_max_size, -1);
-		$mul_post_max_size			= ($mul_post_max_size == 'M' ? 1048576 : ($mul_post_max_size == 'K' ? 1024 : ($mul_post_max_size == 'G' ? 1073741824 : 1)));
-		$post_max_size				= $mul_post_max_size * (int) $post_max_size;
-		// PHP upload_max_filesize
-		$upload_max_filesize		= ini_get('upload_max_filesize');
-		$mul_upload_max_filesize	= substr($upload_max_filesize, -1);
-		$mul_upload_max_filesize	= ($mul_upload_max_filesize == 'M' ? 1048576 : ($mul_upload_max_filesize == 'K' ? 1024 : ($mul_upload_max_filesize == 'G' ? 1073741824 : 1)));
-		$upload_max_filesize		= $mul_upload_max_filesize * (int) $upload_max_filesize;
-		// Max file size
-		$max_file_size = (($post_max_size < $upload_max_filesize) ? $post_max_size : $upload_max_filesize);
-
-		// Include main
-		include DOL_DOCUMENT_ROOT.'/core/tpl/ajax/fileupload_main.tpl.php';
-
-		// Include template
-		include DOL_DOCUMENT_ROOT.'/core/tpl/ajax/fileupload_view.tpl.php';
-	}
-
 	/**
 	 * Show array with linked files
 	 *
diff --git a/htdocs/core/modules/action/rapport.pdf.php b/htdocs/core/modules/action/rapport.class.php
similarity index 99%
rename from htdocs/core/modules/action/rapport.pdf.php
rename to htdocs/core/modules/action/rapport.class.php
index 2b4ec29c880..61579399247 100644
--- a/htdocs/core/modules/action/rapport.pdf.php
+++ b/htdocs/core/modules/action/rapport.class.php
@@ -19,7 +19,7 @@
  */
 
 /**
- *	\file       htdocs/core/modules/action/rapport.pdf.php
+ *	\file       htdocs/core/modules/action/rapport.class.php
  *	\ingroup    commercial
  *	\brief      File to build PDF with events
  */
diff --git a/htdocs/core/tpl/ajax/fileupload_main.tpl.php b/htdocs/core/tpl/ajax/fileupload_main.tpl.php
deleted file mode 100644
index 8be24f7450f..00000000000
--- a/htdocs/core/tpl/ajax/fileupload_main.tpl.php
+++ /dev/null
@@ -1,96 +0,0 @@
-<?php
-/* Copyright (C) 2011-2013 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/>.
- */
-
-// Protection to avoid direct call of template
-if (empty($conf) || !is_object($conf)) {
-	print "Error, template page can't be called as URL";
-	exit;
-}
-
-?>
-
-<!-- START TEMPLATE FILE UPLOAD MAIN -->
-<script>
-window.locale = {
-	"fileupload": {
-		"errors": {
-			"maxFileSize": "<?php echo $langs->trans('FileIsTooBig'); ?>",
-			"minFileSize": "<?php echo $langs->trans('FileIsTooSmall'); ?>",
-			"acceptFileTypes": "<?php echo $langs->trans('FileTypeNotAllowed'); ?>",
-			"maxNumberOfFiles": "<?php echo $langs->trans('MaxNumberOfFilesExceeded'); ?>",
-			"uploadedBytes": "<?php echo $langs->trans('UploadedBytesExceedFileSize'); ?>",
-			"emptyResult": "<?php echo $langs->trans('EmptyFileUploadResult'); ?>"
-		},
-		"error": "<?php echo $langs->trans('Error'); ?>",
-		"start": "<?php echo $langs->trans('Start'); ?>",
-		"cancel": "<?php echo $langs->trans("Cancel"); ?>",
-		"destroy": "<?php echo $langs->trans('Delete'); ?>"
-	}
-};
-
-$(function () {
-	'use strict';
-
-	// Initialize the jQuery File Upload widget:
-	$('#fileupload').fileupload();
-
-	// Events
-	$('#fileupload').fileupload({
-		stop: function (e, data) {
-			location.href='<?php echo dol_escape_htmltag($_SERVER["PHP_SELF"]).'?'.dol_escape_htmltag($_SERVER["QUERY_STRING"]); ?>';
-		},
-		destroy: function (e, data) {
-			var that = $(this).data('fileupload');
-			$( "#confirm-delete" ).dialog({
-				resizable: false,
-				width: 400,
-				modal: true,
-				buttons: {
-					"<?php echo $langs->trans('Ok'); ?>": function() {
-						$( "#confirm-delete" ).dialog( "close" );
-						if (data.url) {
-							$.ajax({
-								method: "POST",
-								data: { token: '<?php echo currentToken(); ?>' },
-								url: data.url
-							}).success(function (data) {
-									if (data) {
-										that._adjustMaxNumberOfFiles(1);
-										$(this).fadeOut(function () {
-											$(this).remove();
-											$.jnotify("<?php echo $langs->trans('FileIsDelete'); ?>");
-										});
-									} else {
-										$.jnotify("<?php echo $langs->trans('ErrorFileNotDeleted'); ?>", "error", true);
-									}
-								});
-						} else {
-							data.context.fadeOut(function () {
-								$(this).remove();
-							});
-						}
-					},
-					"<?php echo $langs->trans("Cancel"); ?>": function() {
-						$( "#confirm-delete" ).dialog( "close" );
-					}
-				}
-			});
-		}
-	});
-});
-</script>
-<!-- END TEMPLATE FILE UPLOAD MAIN -->
diff --git a/htdocs/core/tpl/ajax/fileupload_view.tpl.php b/htdocs/core/tpl/ajax/fileupload_view.tpl.php
deleted file mode 100644
index 22f8d687db0..00000000000
--- a/htdocs/core/tpl/ajax/fileupload_view.tpl.php
+++ /dev/null
@@ -1,147 +0,0 @@
-<?php
-/* Copyright (C) 2011-2012 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/>.
- */
-
-// Protection to avoid direct call of template
-if (empty($conf) || !is_object($conf)) {
-	print "Error, template page can't be called as URL";
-	exit;
-}
-
-?>
-
-<!-- START TEMPLATE FILE UPLOAD -->
-
-<!-- The file upload form used as target for the file upload widget -->
-<form id="fileupload" action="<?php echo DOL_URL_ROOT; ?>/core/ajax/fileupload.php" method="POST" enctype="multipart/form-data">
-<input type="hidden" name="fk_element" value="<?php echo $object->id; ?>">
-<input type="hidden" name="element" value="<?php echo $object->element; ?>">
-<input type="hidden" name="redirect" value="<?php echo $_SERVER['PHP_SELF'].'?id='.$object->id; ?>">
-<!-- The fileupload-buttonbar contains buttons to add/delete files and start/cancel the upload -->
-<div class="row fileupload-buttonbar">
-	<div class="span7">
-		<!-- The fileinput-button span is used to style the file input field as button -->
-		<span class="btn btn-success fileinput-button">
-			<i class="icon-plus icon-white"></i>
-			<span><?php echo $langs->trans('AddFiles'); ?></span>
-			<?php
-			$maxfilesizearray = getMaxFileSizeArray();
-			$maxmin = $maxfilesizearray['maxmin'];
-			if ($maxmin > 0) {
-				print '<input type="hidden" name="MAX_FILE_SIZE" value="'.($maxmin * 1024).'">';	// MAX_FILE_SIZE must precede the field type=file
-			}
-			?>
-			<input type="file" name="files[]" multiple>
-		</span>
-		<button type="submit" class="btn btn-primary start">
-			<i class="icon-upload icon-white"></i>
-			<span><?php echo $langs->trans('StartUpload'); ?></span>
-		</button>
-		<button type="reset" class="btn btn-warning cancel">
-			<i class="icon-ban-circle icon-white"></i>
-			<span><?php echo $langs->trans('CancelUpload'); ?></span>
-		</button>
-		<!--
-		<button type="button" class="btn btn-danger delete">
-			<i class="icon-trash icon-white"></i>
-			<span><?php echo $langs->trans('Delete'); ?></span>
-		</button>
-		<input type="checkbox" class="toggle">
-		-->
-	</div>
-	<!-- The global progress information -->
-	<div class="span5 fileupload-progress fade">
-		<!-- The global progress bar -->
-		<!--
-		<div class="progress progress-success progress-striped active" role="progressbar" aria-valuemin="0" aria-valuemax="100">
-			<div class="bar" style="width:0%;"></div>
-		</div>
-		-->
-		<!-- The extended global progress information -->
-		<div class="progress-extended">&nbsp;</div>
-	</div>
-</div>
-<!-- The loading indicator is shown during file processing -->
-<div class="fileupload-loading"></div>
-<br>
-<!-- The table listing the files available for upload/download -->
-<table role="presentation" class="table table-striped"><tbody class="files" data-toggle="modal-gallery" data-target="#modal-gallery"></tbody></table>
-</form>
-
-<!-- The template to display files available for upload -->
-<!-- Warning id on script is not W3C compliant and is reported as error by phpcs but it is required by fileupload plugin -->
-<script id="template-upload" type="text/x-tmpl">
-{% for (var i=0, file; file=o.files[i]; i++) { %}
-	<tr class="template-upload fade">
-		<td class="preview"><span class="fade"></span></td>
-		<td class="name"><span>{%=file.name%}</span></td>
-		<td class="size"><span>{%=o.formatFileSize(file.size)%}</span></td>
-		{% if (file.error) { %}
-			<td class="error" colspan="2"><span class="label label-important">{%=locale.fileupload.error%}</span> {%=locale.fileupload.errors[file.error] || file.error%}</td>
-		{% } else if (o.files.valid && !i) { %}
-			<td>
-				<div class="progress progress-success progress-striped active" role="progressbar" aria-valuemin="0" aria-valuemax="100" aria-valuenow="0"><div class="bar" style="width:0%;"></div></div>
-			</td>
-			<td class="start">{% if (!o.options.autoUpload) { %}
-				<button class="btn btn-primary">
-					<i class="icon-upload icon-white"></i>
-					<span>{%=locale.fileupload.start%}</span>
-				</button>
-			{% } %}</td>
-		{% } else { %}
-			<td colspan="2"></td>
-		{% } %}
-		<td class="cancel">{% if (!i) { %}
-			<button class="btn btn-warning">
-				<i class="icon-ban-circle icon-white"></i>
-				<span>{%=locale.fileupload.cancel%}</span>
-			</button>
-		{% } %}</td>
-	</tr>
-{% } %}
-</script>
-<!-- The template to display files available for download -->
-<!-- Warning id on script is not W3C compliant and is reported as error by phpcs but it is required by jfilepload plugin -->
-<script id="template-download" type="text/x-tmpl">
-{% for (var i=0, file; file=o.files[i]; i++) { %}
-	<tr class="template-download fade">
-		{% if (file.error) { %}
-			<td></td>
-			<td class="name"><span>{%=file.name%}</span></td>
-			<td class="size"><span>{%=o.formatFileSize(file.size)%}</span></td>
-			<td class="error" colspan="2"><span class="label label-important">{%=locale.fileupload.error%}</span> {%=locale.fileupload.errors[file.error] || file.error%}</td>
-		{% } else { %}
-			<td class="preview">{% if (file.thumbnail_url) { %}
-				<a href="{%=file.url%}" title="{%=file.name%}" rel="gallery" download="{%=file.name%}"><img src="{%=file.thumbnail_url%}"></a>
-			{% } %}</td>
-			<td class="name">
-				<a href="{%=file.url%}" title="{%=file.name%}" rel="{%=file.thumbnail_url&&'gallery'%}" download="{%=file.name%}">{%=file.name%}</a>
-			</td>
-			<td class="size"><span>{%=o.formatFileSize(file.size)%}</span></td>
-			<td colspan="2"></td>
-		{% } %}
-		<td class="delete">
-			<button class="btn btn-danger" data-type="{%=file.delete_type%}" data-url="{%=file.delete_url%}">
-				<i class="icon-trash icon-white"></i>
-				<span>{%=locale.fileupload.destroy%}</span>
-			</button>
-			<input type="checkbox" name="delete" value="1">
-		</td>
-	</tr>
-{% } %}
-</script>
-<br>
-<!-- END PHP TEMPLATE -->
diff --git a/htdocs/core/tpl/ajax/objectlinked_lineimport.tpl.php b/htdocs/core/tpl/objectlinked_lineimport.tpl.php
similarity index 100%
rename from htdocs/core/tpl/ajax/objectlinked_lineimport.tpl.php
rename to htdocs/core/tpl/objectlinked_lineimport.tpl.php
diff --git a/htdocs/mrp/ajax/ajax_bom.php b/htdocs/mrp/ajax/ajax_bom.php
index 280a0c98cdd..54bfaf893ab 100644
--- a/htdocs/mrp/ajax/ajax_bom.php
+++ b/htdocs/mrp/ajax/ajax_bom.php
@@ -46,13 +46,15 @@ require '../../main.inc.php'; // Load $user and permissions
 require_once DOL_DOCUMENT_ROOT.'/bom/class/bom.class.php';
 
 $idbom = GETPOST('idbom', 'alpha');
-$action = GETPOST('action', 'aZ09');
+//$action = GETPOST('action', 'aZ09');
 
 
 /*
  * View
  */
 
+top_httphead('application/json');
+
 $object = new BOM($db);
 $result = $object->fetch($idbom);
 if ($result > 0) {
diff --git a/htdocs/product/ajax/products.php b/htdocs/product/ajax/products.php
index 74fa53dccb8..0e606932ce2 100644
--- a/htdocs/product/ajax/products.php
+++ b/htdocs/product/ajax/products.php
@@ -79,6 +79,8 @@ if ($action == 'fetch' && !empty($id)) {
 	require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
 	require_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
 
+	top_httphead('application/json');
+
 	$outjson = array();
 
 	$object = new Product($db);
diff --git a/htdocs/product/inventory/ajax/searchfrombarcode.php b/htdocs/product/inventory/ajax/searchfrombarcode.php
index 68ffee43c23..2d29e1d9d2e 100644
--- a/htdocs/product/inventory/ajax/searchfrombarcode.php
+++ b/htdocs/product/inventory/ajax/searchfrombarcode.php
@@ -58,6 +58,13 @@ $warehousefound = 0;
 $warehouseid = 0;
 $objectreturn = array();
 
+
+/*
+ * View
+ */
+
+top_httphead('application/json');
+
 if ($action == "existbarcode" && !empty($barcode)) {
 	if (!empty($mode) && $mode == "lotserial") {
 		$sql = "SELECT ps.fk_entrepot, ps.fk_product, p.barcode, ps.reel, pb.batch";
diff --git a/htdocs/salaries/ajax/ajaxsalaries.php b/htdocs/salaries/ajax/ajaxsalaries.php
index adea28ee8ce..0e0428b9074 100644
--- a/htdocs/salaries/ajax/ajaxsalaries.php
+++ b/htdocs/salaries/ajax/ajaxsalaries.php
@@ -52,6 +52,8 @@ restrictedArea($user, 'salaries');
  * View
  */
 
+top_httphead('application/json');
+
 $fk_user = GETPOST('fk_user', 'int');
 $return_arr = array();
 
diff --git a/htdocs/stripe/ajax/ajax.php b/htdocs/stripe/ajax/ajax.php
index cf6ec53d580..fa5392349eb 100644
--- a/htdocs/stripe/ajax/ajax.php
+++ b/htdocs/stripe/ajax/ajax.php
@@ -59,6 +59,8 @@ if (empty($user->rights->takepos->run)) {
  * View
  */
 
+top_httphead('application/json');
+
 if ($action == 'getConnexionToken') {
 	try {
 		// Be sure to authenticate the endpoint for creating connection tokens.
diff --git a/test/phpunit/CodingPhpTest.php b/test/phpunit/CodingPhpTest.php
index dd0e6827ec1..e8631c5b28b 100644
--- a/test/phpunit/CodingPhpTest.php
+++ b/test/phpunit/CodingPhpTest.php
@@ -198,7 +198,7 @@ class CodingPhpTest extends PHPUnit\Framework\TestCase
 				|| 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', 'rapport.pdf.php', 'TraceableDB.php'))) {
+				|| in_array($file['name'], array('modules_boxes.php', 'TraceableDB.php'))) {
 				// Check into Class files
 				if (! in_array($file['name'], array(
 					'api.class.php',
@@ -247,6 +247,20 @@ class CodingPhpTest extends PHPUnit\Framework\TestCase
 				}
 			}
 
+			// 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'])) {
 				$ok=true;
@@ -463,7 +477,7 @@ class CodingPhpTest extends PHPUnit\Framework\TestCase
 			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'",
+					"'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"'))) {

From b81bde20f3027afd2f15faf2cf7fe6358b82b9d9 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 3 Sep 2022 20:20:39 +0200
Subject: [PATCH 666/974] css

---
 htdocs/blockedlog/admin/blockedlog_list.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/htdocs/blockedlog/admin/blockedlog_list.php b/htdocs/blockedlog/admin/blockedlog_list.php
index 934ef9fba7b..9bb4456e840 100644
--- a/htdocs/blockedlog/admin/blockedlog_list.php
+++ b/htdocs/blockedlog/admin/blockedlog_list.php
@@ -527,7 +527,7 @@ if (is_array($blocks)) {
 			print '<tr class="oddeven">';
 
 			// ID
-			print '<td>'.$block->id.'</td>';
+			print '<td>'.dol_escape_htmltag($block->id).'</td>';
 
 			// Date
 			print '<td>'.dol_print_date($block->date_creation, 'dayhour').'</td>';
@@ -535,11 +535,11 @@ if (is_array($blocks)) {
 			// User
 			print '<td>';
 			//print $block->getUser()
-			print $block->user_fullname;
+			print dol_escape_htmltag($block->user_fullname);
 			print '</td>';
 
 			// Action
-			print '<td>'.$langs->trans('log'.$block->action).'</td>';
+			print '<td class="tdoverflowmax250" title="'.dol_escape_htmltag($langs->trans('log'.$block->action)).'">'.$langs->trans('log'.$block->action).'</td>';
 
 			// Ref
 			print '<td class="nowraponall">';

From c5b3df23baa79aeae32831ae2adb7446b9666aab Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Sun, 4 Sep 2022 04:49:09 +0200
Subject: [PATCH 667/974] FIX Dictionary - Display error on >cache_vatrates

---
 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 eab0942ee4e..8ea30ef3b93 100644
--- a/htdocs/admin/dict.php
+++ b/htdocs/admin/dict.php
@@ -1963,7 +1963,7 @@ if ($id) {
 							} elseif ($value == 'fk_tva') {
 								foreach ($form->cache_vatrates as $key => $Tab) {
 									if ($form->cache_vatrates[$key]['rowid'] == $valuetoshow) {
-										$valuetoshow = $form->cache_vatrates[$key]['libtva'];
+										$valuetoshow = $form->cache_vatrates[$key]['label'];
 										break;
 									}
 								}

From a542c86bcda2af394670e3bca49b3f0d9f1b8fe2 Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Sun, 4 Sep 2022 04:59:31 +0200
Subject: [PATCH 668/974] FIX Project - on global view, missing display of ref
 customer

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

diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php
index b1eb8656645..d646da3b413 100644
--- a/htdocs/compta/facture/class/facture.class.php
+++ b/htdocs/compta/facture/class/facture.class.php
@@ -15,7 +15,7 @@
  * Copyright (C) 2013       Cedric Gross            <c.gross@kreiz-it.fr>
  * Copyright (C) 2013       Florian Henry           <florian.henry@open-concept.pro>
  * Copyright (C) 2016       Ferran Marcet           <fmarcet@2byte.es>
- * Copyright (C) 2018       Alexandre Spangaro		<aspangaro@open-dsi.fr>
+ * Copyright (C) 2018-2022  Alexandre Spangaro		<aspangaro@open-dsi.fr>
  * Copyright (C) 2018       Nicolas ZABOURI         <info@inovea-conseil.com>
  * Copyright (C) 2022       Sylvain Legrand         <contact@infras.fr>
  *
@@ -1671,8 +1671,9 @@ class Facture extends CommonInvoice
 				$this->id = $obj->rowid;
 				$this->entity = $obj->entity;
 
-				$this->ref = $obj->ref;
-				$this->ref_client = $obj->ref_client;
+				$this->ref					= $obj->ref;
+				$this->ref_client			= $obj->ref_client;
+				$this->ref_customer			= $obj->ref_client;
 				$this->ref_ext				= $obj->ref_ext;
 				$this->type					= $obj->type;
 				$this->date					= $this->db->jdate($obj->df);

From 975d3ecf99f4330b31855b7efee87f99a9ac2291 Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Sun, 4 Sep 2022 12:11:45 +0200
Subject: [PATCH 669/974] update code

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

diff --git a/htdocs/admin/fckeditor.php b/htdocs/admin/fckeditor.php
index 3c3cd731a7d..60d0f52b036 100644
--- a/htdocs/admin/fckeditor.php
+++ b/htdocs/admin/fckeditor.php
@@ -65,7 +65,7 @@ $conditions = array(
 	'PRODUCTDESC' => (isModEnabled("product") || isModEnabled("service")),
 	'DETAILS' => (isModEnabled('facture') || isModEnabled("propal") || isModEnabled('commande') || isModEnabled('supplier_proposal') || (isModEnabled("fournisseur") && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD)) || isModEnabled("supplier_order") || isModEnabled("supplier_invoice")),
 	'USERSIGN' => 1,
-	'MAILING' => !empty($conf->mailing->enabled),
+	'MAILING' => isModEnabled('mailing'),
 	'MAIL' => (isModEnabled('facture') || isModEnabled("propal") || isModEnabled('commande')),
 	'TICKET' => !empty($conf->ticket->enabled),
 );

From 34b4ba7f33dd52c139461f4f237b0f799afe3b85 Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Sun, 4 Sep 2022 13:24:12 +0200
Subject: [PATCH 670/974] update code

---
 .../canvas/actions_contactcard_common.class.php  |  2 +-
 htdocs/contact/card.php                          | 16 ++++++++--------
 htdocs/contact/list.php                          |  6 +++---
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/htdocs/contact/canvas/actions_contactcard_common.class.php b/htdocs/contact/canvas/actions_contactcard_common.class.php
index d1cc70b4927..4a3fc28c9de 100644
--- a/htdocs/contact/canvas/actions_contactcard_common.class.php
+++ b/htdocs/contact/canvas/actions_contactcard_common.class.php
@@ -180,7 +180,7 @@ abstract class ActionsContactCardCommon
 
 		if ($action == 'view' || $action == 'edit' || $action == 'delete') {
 			// Emailing
-			if (!empty($conf->mailing->enabled)) {
+			if (isModEnabled('mailing')) {
 				$langs->load("mails");
 				$this->tpl['nb_emailing'] = $this->object->getNbOfEMailings();
 			}
diff --git a/htdocs/contact/card.php b/htdocs/contact/card.php
index 4712b673ad1..d751cbef511 100644
--- a/htdocs/contact/card.php
+++ b/htdocs/contact/card.php
@@ -249,7 +249,7 @@ if (empty($reshook)) {
 			$action = 'create';
 		}
 
-		if (!empty($conf->mailing->enabled) && $conf->global->MAILING_CONTACT_DEFAULT_BULK_STATUS == 2 && $object->no_email == -1 && !empty($object->email)) {
+		if (isModEnabled('mailing') && $conf->global->MAILING_CONTACT_DEFAULT_BULK_STATUS == 2 && $object->no_email == -1 && !empty($object->email)) {
 			$error++;
 			$errors[] = $langs->trans("ErrorFieldRequired", $langs->transnoentities("No_Email"));
 			$action = 'create';
@@ -290,7 +290,7 @@ if (empty($reshook)) {
 			}
 		}
 
-		if (empty($error) && !empty($conf->mailing->enabled) && !empty($object->email)) {
+		if (empty($error) && isModEnabled('mailing') && !empty($object->email)) {
 			// Add mass emailing flag into table mailing_unsubscribe
 			$result = $object->setNoEmail($object->no_email);
 			if ($result < 0) {
@@ -342,7 +342,7 @@ if (empty($reshook)) {
 			$action = 'edit';
 		}
 
-		if (!empty($conf->mailing->enabled) && $conf->global->MAILING_CONTACT_DEFAULT_BULK_STATUS == 2 && GETPOST("no_email", "int") == -1 && !empty(GETPOST('email', 'custom', 0, FILTER_SANITIZE_EMAIL))) {
+		if (isModEnabled('mailing') && $conf->global->MAILING_CONTACT_DEFAULT_BULK_STATUS == 2 && GETPOST("no_email", "int") == -1 && !empty(GETPOST('email', 'custom', 0, FILTER_SANITIZE_EMAIL))) {
 			$error++;
 			$errors[] = $langs->trans("ErrorFieldRequired", $langs->transnoentities("No_Email"));
 			$action = 'edit';
@@ -830,7 +830,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 			print '</tr>';
 
 			// Unsubscribe
-			if (!empty($conf->mailing->enabled)) {
+			if (isModEnabled('mailing')) {
 				if ($conf->use_javascript_ajax && $conf->global->MAILING_CONTACT_DEFAULT_BULK_STATUS == 2) {
 					print "\n".'<script type="text/javascript">'."\n";
 					print '$(document).ready(function () {
@@ -1101,7 +1101,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 			print '<td>';
 			print img_picto('', 'object_email');
 			print '<input type="text" name="email" id="email" class="maxwidth100onsmartphone quatrevingtpercent" value="'.(GETPOSTISSET('email') ?GETPOST('email', 'alpha') : $object->email).'"></td>';
-			if (!empty($conf->mailing->enabled)) {
+			if (isModEnabled('mailing')) {
 				$langs->load("mails");
 				print '<td class="nowrap">'.$langs->trans("NbOfEMailingsSend").'</td>';
 				print '<td>'.$object->getNbOfEMailings().'</td>';
@@ -1111,7 +1111,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 			print '</tr>';
 
 			// Unsubscribe
-			if (!empty($conf->mailing->enabled)) {
+			if (isModEnabled('mailing')) {
 				if ($conf->use_javascript_ajax && isset($conf->global->MAILING_CONTACT_DEFAULT_BULK_STATUS) && $conf->global->MAILING_CONTACT_DEFAULT_BULK_STATUS == 2) {
 					print "\n".'<script type="text/javascript">'."\n";
 
@@ -1376,14 +1376,14 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 		print '<tr><td>'.$langs->trans("PostOrFunction").'</td><td>'.$object->poste.'</td></tr>';
 
 		// Email
-		if (!empty($conf->mailing->enabled)) {
+		if (isModEnabled('mailing')) {
 			$langs->load("mails");
 			print '<tr><td>'.$langs->trans("NbOfEMailingsSend").'</td>';
 			print '<td><a href="'.DOL_URL_ROOT.'/comm/mailing/list.php?filteremail='.urlencode($object->email).'">'.$object->getNbOfEMailings().'</a></td></tr>';
 		}
 
 		// Unsubscribe opt-out
-		if (!empty($conf->mailing->enabled)) {
+		if (isModEnabled('mailing')) {
 			$result = $object->getNoEmail();
 			if ($result < 0) {
 				setEventMessages($object->error, $object->errors, 'errors');
diff --git a/htdocs/contact/list.php b/htdocs/contact/list.php
index a247e9b1302..1070c9e0b9d 100644
--- a/htdocs/contact/list.php
+++ b/htdocs/contact/list.php
@@ -78,7 +78,7 @@ $search_phone_pro = GETPOST("search_phone_pro", 'alpha');
 $search_phone_mobile = GETPOST("search_phone_mobile", 'alpha');
 $search_fax = GETPOST("search_fax", 'alpha');
 $search_email = GETPOST("search_email", 'alpha');
-if (!empty($conf->mailing->enabled)) {
+if (isModEnabled('mailing')) {
 	$search_no_email = GETPOSTISSET("search_no_email") ? GETPOST("search_no_email", 'int') : -1;
 } else {
 	$search_no_email = -1;
@@ -218,7 +218,7 @@ if (empty($conf->global->SOCIETE_DISABLE_CONTACTS)) {
 $arrayfields['unsubscribed'] = array(
 		'label'=>'No_Email',
 		'checked'=>0,
-		'enabled'=>(!empty($conf->mailing->enabled)),
+		'enabled'=>(isModEnabled('mailing')),
 		'position'=>111);
 
 if (isModEnabled('socialnetworks')) {
@@ -385,7 +385,7 @@ if (!empty($extrafields->attributes[$object->table_element]['label'])) {
 		$sql .= ($extrafields->attributes[$object->table_element]['type'][$key] != 'separate' ? ", ef.".$key." as options_".$key : '');
 	}
 }
-if (!empty($conf->mailing->enabled)) {
+if (isModEnabled('mailing')) {
 	$sql .= ", (SELECT count(*) FROM ".MAIN_DB_PREFIX."mailing_unsubscribe WHERE email = p.email) as unsubscribed";
 }
 // Add fields from hooks

From 66d42049bea250f7a90bad7ac4bfb83749ddfa49 Mon Sep 17 00:00:00 2001
From: mikygee <mikydevel@yahoo.fr>
Date: Sun, 4 Sep 2022 13:24:23 +0200
Subject: [PATCH 671/974] Bug #22064 effectif should be 51-100 and 101-500 (not
 100-500)

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

diff --git a/htdocs/install/mysql/migration/16.0.0-17.0.0.sql b/htdocs/install/mysql/migration/16.0.0-17.0.0.sql
index f1b18c740c5..9b52b09ba2a 100644
--- a/htdocs/install/mysql/migration/16.0.0-17.0.0.sql
+++ b/htdocs/install/mysql/migration/16.0.0-17.0.0.sql
@@ -144,3 +144,5 @@ CREATE TABLE llx_bank_extrafields
 ALTER TABLE llx_bank_extrafields ADD INDEX idx_bank_extrafields (fk_object);
 
 ALTER TABLE llx_user CHANGE COLUMN note note_private text;
+
+UPDATE llx_c_effectif SET code='EF101-500', libelle='101 - 500' WHERE code='EF100-500';

From 402d52e160f7e6987a053c896c6d3dfb16fd3978 Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Sun, 4 Sep 2022 13:25:54 +0200
Subject: [PATCH 672/974] update code

---
 htdocs/contact/class/contact.class.php | 2 +-
 htdocs/core/lib/ticket.lib.php         | 4 ++--
 htdocs/societe/card.php                | 6 +++---
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/htdocs/contact/class/contact.class.php b/htdocs/contact/class/contact.class.php
index 799b53cdad0..0a38c1294d4 100644
--- a/htdocs/contact/class/contact.class.php
+++ b/htdocs/contact/class/contact.class.php
@@ -344,7 +344,7 @@ class Contact extends CommonObject
 		if (empty($conf->global->MAIN_SHOW_TECHNICAL_ID)) {
 			$this->fields['rowid']['visible'] = 0;
 		}
-		if (empty($conf->mailing->enabled)) {
+		if (!isModEnabled('mailing')) {
 			$this->fields['no_email']['enabled'] = 0;
 		}
 		// typical ['s.nom'] is used for third-parties
diff --git a/htdocs/core/lib/ticket.lib.php b/htdocs/core/lib/ticket.lib.php
index 28a443f2034..5fd2682d175 100644
--- a/htdocs/core/lib/ticket.lib.php
+++ b/htdocs/core/lib/ticket.lib.php
@@ -440,7 +440,7 @@ function show_ticket_messaging($conf, $langs, $db, $filterobj, $objcon = '', $no
 	}
 
 	// Add also event from emailings. TODO This should be replaced by an automatic event ? May be it's too much for very large emailing.
-	if (!empty($conf->mailing->enabled) && !empty($objcon->email)
+	if (isModEnabled('mailing') && !empty($objcon->email)
 		&& (empty($actioncode) || $actioncode == 'AC_OTH_AUTO' || $actioncode == 'AC_EMAILING')) {
 		$langs->load("mails");
 
@@ -565,7 +565,7 @@ function show_ticket_messaging($conf, $langs, $db, $filterobj, $objcon = '', $no
 		$out = info_admin($langs->trans("WarningModuleXDisabledSoYouMayMissEventHere", $langs->transnoentitiesnoconv("Module2400Name")), 0, 0, 'warning');
 	}
 
-	if (isModEnabled('agenda') || (!empty($conf->mailing->enabled) && !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/societe/card.php b/htdocs/societe/card.php
index c6ee771472f..800a9c811ef 100644
--- a/htdocs/societe/card.php
+++ b/htdocs/societe/card.php
@@ -424,12 +424,12 @@ if (empty($reshook)) {
 			$error++;
 		}
 
-		if (!empty($conf->mailing->enabled) && !empty($conf->global->MAILING_CONTACT_DEFAULT_BULK_STATUS) && $conf->global->MAILING_CONTACT_DEFAULT_BULK_STATUS == 2 && GETPOST('contact_no_email', 'int')==-1 && !empty(GETPOST('email', 'custom', 0, FILTER_SANITIZE_EMAIL))) {
+		if (isModEnabled('mailing') && !empty($conf->global->MAILING_CONTACT_DEFAULT_BULK_STATUS) && $conf->global->MAILING_CONTACT_DEFAULT_BULK_STATUS == 2 && GETPOST('contact_no_email', 'int')==-1 && !empty(GETPOST('email', 'custom', 0, FILTER_SANITIZE_EMAIL))) {
 			$error++;
 			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("No_Email")), null, 'errors');
 		}
 
-		if (!empty($conf->mailing->enabled) && GETPOST("private", 'int') == 1 && !empty($conf->global->MAILING_CONTACT_DEFAULT_BULK_STATUS) && $conf->global->MAILING_CONTACT_DEFAULT_BULK_STATUS == 2 && GETPOST('contact_no_email', 'int')==-1 && !empty(GETPOST('email', 'custom', 0, FILTER_SANITIZE_EMAIL))) {
+		if (isModEnabled('mailing') && GETPOST("private", 'int') == 1 && !empty($conf->global->MAILING_CONTACT_DEFAULT_BULK_STATUS) && $conf->global->MAILING_CONTACT_DEFAULT_BULK_STATUS == 2 && GETPOST('contact_no_email', 'int')==-1 && !empty(GETPOST('email', 'custom', 0, FILTER_SANITIZE_EMAIL))) {
 			$error++;
 			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("No_Email")), null, 'errors');
 		}
@@ -1588,7 +1588,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 		// Email / Web
 		print '<tr><td>'.$form->editfieldkey('EMail', 'email', '', $object, 0, 'string', '', empty($conf->global->SOCIETE_EMAIL_MANDATORY) ? '' : $conf->global->SOCIETE_EMAIL_MANDATORY).'</td>';
 		print '<td'.(($conf->browser->layout == 'phone') || empty($conf->mailing->enabled) ? ' colspan="3"' : '').'>'.img_picto('', 'object_email', 'class="pictofixedwidth"').' <input type="text" class="maxwidth200 widthcentpercentminusx" name="email" id="email" value="'.$object->email.'"></td>';
-		if (!empty($conf->mailing->enabled) && !empty($conf->global->THIRDPARTY_SUGGEST_ALSO_ADDRESS_CREATION)) {
+		if (isModEnabled('mailing') && !empty($conf->global->THIRDPARTY_SUGGEST_ALSO_ADDRESS_CREATION)) {
 			if ($conf->browser->layout == 'phone') {
 				print '</tr><tr>';
 			}

From a8531a4afdd101a3f230039f1fe6306ee487429f Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Sun, 4 Sep 2022 13:26:49 +0200
Subject: [PATCH 673/974] update code

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

diff --git a/htdocs/societe/card.php b/htdocs/societe/card.php
index 800a9c811ef..7080ade778e 100644
--- a/htdocs/societe/card.php
+++ b/htdocs/societe/card.php
@@ -1587,13 +1587,13 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 
 		// Email / Web
 		print '<tr><td>'.$form->editfieldkey('EMail', 'email', '', $object, 0, 'string', '', empty($conf->global->SOCIETE_EMAIL_MANDATORY) ? '' : $conf->global->SOCIETE_EMAIL_MANDATORY).'</td>';
-		print '<td'.(($conf->browser->layout == 'phone') || empty($conf->mailing->enabled) ? ' colspan="3"' : '').'>'.img_picto('', 'object_email', 'class="pictofixedwidth"').' <input type="text" class="maxwidth200 widthcentpercentminusx" name="email" id="email" value="'.$object->email.'"></td>';
+		print '<td'.(($conf->browser->layout == 'phone') || !isModEnabled('mailing') ? ' colspan="3"' : '').'>'.img_picto('', 'object_email', 'class="pictofixedwidth"').' <input type="text" class="maxwidth200 widthcentpercentminusx" name="email" id="email" value="'.$object->email.'"></td>';
 		if (isModEnabled('mailing') && !empty($conf->global->THIRDPARTY_SUGGEST_ALSO_ADDRESS_CREATION)) {
 			if ($conf->browser->layout == 'phone') {
 				print '</tr><tr>';
 			}
 			print '<td class="individualline noemail">'.$form->editfieldkey($langs->trans('No_Email') .' ('.$langs->trans('Contact').')', 'contact_no_email', '', $object, 0).'</td>';
-			print '<td class="individualline" '.(($conf->browser->layout == 'phone') || empty($conf->mailing->enabled) ? ' colspan="3"' : '').'>'.$form->selectyesno('contact_no_email', (GETPOSTISSET("contact_no_email") ? GETPOST("contact_no_email", 'alpha') : (empty($object->no_email) ? 0 : 1)), 1, false, 1).'</td>';
+			print '<td class="individualline" '.(($conf->browser->layout == 'phone') || !isModEnabled('mailing') ? ' colspan="3"' : '').'>'.$form->selectyesno('contact_no_email', (GETPOSTISSET("contact_no_email") ? GETPOST("contact_no_email", 'alpha') : (empty($object->no_email) ? 0 : 1)), 1, false, 1).'</td>';
 		}
 		print '</tr>';
 		print '<tr><td>'.$form->editfieldkey('Web', 'url', '', $object, 0).'</td>';
diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php
index 6f735af6d37..58a8d973fe6 100644
--- a/htdocs/societe/class/societe.class.php
+++ b/htdocs/societe/class/societe.class.php
@@ -1097,7 +1097,7 @@ class Societe extends CommonObject
 			}
 		}
 
-		if (empty($error) && !empty($conf->mailing->enabled) && !empty($contact->email) && isset($no_email)) {
+		if (empty($error) && isModEnabled('mailing') && !empty($contact->email) && isset($no_email)) {
 			$result = $contact->setNoEmail($no_email);
 			if ($result < 0) {
 				$this->error = $contact->error;

From 2cd48587ed17259ddf02428d064a330df740b6a4 Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Sun, 4 Sep 2022 13:29:29 +0200
Subject: [PATCH 674/974] update code

---
 htdocs/admin/dict.php                           | 6 +++---
 htdocs/asset/admin/setup.php                    | 6 +++---
 htdocs/asset/tpl/accountancy_codes_edit.tpl.php | 4 ++--
 htdocs/asset/tpl/accountancy_codes_view.tpl.php | 4 ++--
 htdocs/core/lib/functions.lib.php               | 2 +-
 5 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/htdocs/admin/dict.php b/htdocs/admin/dict.php
index ff74273d744..1ee9cc3f7c0 100644
--- a/htdocs/admin/dict.php
+++ b/htdocs/admin/dict.php
@@ -513,7 +513,7 @@ $tabcond[27] = isModEnabled("societe");
 $tabcond[28] = isModEnabled('holiday');
 $tabcond[29] = isModEnabled('project');
 $tabcond[30] = isModEnabled('label');
-//$tabcond[31]= !empty($conf->accounting->enabled);
+//$tabcond[31]= isModEnabled('accounting');
 $tabcond[32] = (isModEnabled('holiday') || isModEnabled('hrm'));
 $tabcond[33] = isModEnabled('hrm');
 $tabcond[34] = isModEnabled('hrm');
@@ -2076,7 +2076,7 @@ if ($id > 0) {
 							} elseif (in_array($value, array('recuperableonly'))) {
 								$class = "center";
 							} elseif ($value == 'accountancy_code' || $value == 'accountancy_code_sell' || $value == 'accountancy_code_buy') {
-								if (!empty($conf->accounting->enabled)) {
+								if (isModEnabled('accounting')) {
 									require_once DOL_DOCUMENT_ROOT.'/accountancy/class/accountingaccount.class.php';
 									$tmpaccountingaccount = new AccountingAccount($db);
 									$tmpaccountingaccount->fetch(0, $valuetoshow, 1);
@@ -2485,7 +2485,7 @@ function fieldList($fieldlist, $obj = '', $tabname = '', $context = '')
 			print '</td>';
 		} elseif ($value == 'accountancy_code' || $value == 'accountancy_code_sell' || $value == 'accountancy_code_buy') {
 			print '<td>';
-			if (!empty($conf->accounting->enabled)) {
+			if (isModEnabled('accounting')) {
 				$fieldname = $value;
 				$accountancy_account = (!empty($obj->$fieldname) ? $obj->$fieldname : 0);
 				print $formaccounting->select_account($accountancy_account, '.'. $value, 1, '', 1, 1, 'maxwidth200 maxwidthonsmartphone');
diff --git a/htdocs/asset/admin/setup.php b/htdocs/asset/admin/setup.php
index 4f8f06ca160..e42da4169b8 100644
--- a/htdocs/asset/admin/setup.php
+++ b/htdocs/asset/admin/setup.php
@@ -530,7 +530,7 @@ if ($action == 'edit') {
 				}
 			} elseif ($val['type'] == 'accountancy_code') {
 				$selected = (empty($conf->global->$constname) ? '' : $conf->global->$constname);
-				if (!empty($conf->accounting->enabled)) {
+				if (isModEnabled('accounting')) {
 					require_once DOL_DOCUMENT_ROOT . '/core/class/html.formaccounting.class.php';
 					$formaccounting = new FormAccounting($db);
 					print $formaccounting->select_account($selected, $constname, 1, null, 1, 1, 'minwidth150 maxwidth300', 1);
@@ -539,7 +539,7 @@ if ($action == 'edit') {
 				}
 			} elseif ($val['type'] == 'accountancy_category') {
 				$selected = (empty($conf->global->$constname) ? '' : $conf->global->$constname);
-				if (!empty($conf->accounting->enabled)) {
+				if (isModEnabled('accounting')) {
 					print '<input type="text" name="' . $constname . '" list="pcg_type_datalist" value="' . $selected . '">';
 					// autosuggest from existing account types if found
 					print '<datalist id="pcg_type_datalist">';
@@ -636,7 +636,7 @@ if ($action == 'edit') {
 						setEventMessages(null, $object->errors, "errors");
 					}
 				} elseif ($val['type'] == 'accountancy_code') {
-					if (!empty($conf->accounting->enabled)) {
+					if (isModEnabled('accounting')) {
 						require_once DOL_DOCUMENT_ROOT . '/accountancy/class/accountingaccount.class.php';
 						$accountingaccount = new AccountingAccount($db);
 						$accountingaccount->fetch('', $conf->global->{$constname}, 1);
diff --git a/htdocs/asset/tpl/accountancy_codes_edit.tpl.php b/htdocs/asset/tpl/accountancy_codes_edit.tpl.php
index bbd2b3d797c..fa01cbd59bc 100644
--- a/htdocs/asset/tpl/accountancy_codes_edit.tpl.php
+++ b/htdocs/asset/tpl/accountancy_codes_edit.tpl.php
@@ -34,7 +34,7 @@ if (!is_object($form)) {
 	$form = new Form($db);
 }
 
-if (!empty($conf->accounting->enabled) && !is_object($formaccounting)) {
+if (isModEnabled('accounting') && !is_object($formaccounting)) {
 	require_once DOL_DOCUMENT_ROOT . '/core/class/html.formaccounting.class.php';
 	$formaccounting = new FormAccounting($db);
 }
@@ -66,7 +66,7 @@ if (empty($reshook)) {
 			$html_name = $mode_key . '_' . $field_key;
 			print '<tr><td class="titlefieldcreate">' . $langs->trans($field_info['label']) . '</td><td colspan="3">';
 			$accountancy_code = GETPOSTISSET($html_name) ? GETPOST($html_name, 'aZ09') : (!empty($assetaccountancycodes->accountancy_codes[$mode_key][$field_key]) ? $assetaccountancycodes->accountancy_codes[$mode_key][$field_key] : '');
-			if (!empty($conf->accounting->enabled)) {
+			if (isModEnabled('accounting')) {
 				print $formaccounting->select_account($accountancy_code, $html_name, 1, null, 1, 1, 'minwidth150 maxwidth300', 1);
 			} else {
 				print '<input name="' . $html_name . '" class="maxwidth200" value="' . dol_escape_htmltag($accountancy_code) . '">';
diff --git a/htdocs/asset/tpl/accountancy_codes_view.tpl.php b/htdocs/asset/tpl/accountancy_codes_view.tpl.php
index 0d92ad8eb37..67993291359 100644
--- a/htdocs/asset/tpl/accountancy_codes_view.tpl.php
+++ b/htdocs/asset/tpl/accountancy_codes_view.tpl.php
@@ -50,7 +50,7 @@ if ($reshook < 0) {
 }
 
 if (empty($reshook)) {
-	if (!empty($conf->accounting->enabled)) require_once DOL_DOCUMENT_ROOT . '/accountancy/class/accountingaccount.class.php';
+	if (isModEnabled('accounting')) require_once DOL_DOCUMENT_ROOT . '/accountancy/class/accountingaccount.class.php';
 
 	foreach ($assetaccountancycodes->accountancy_codes_fields as $mode_key => $mode_info) {
 		//if (empty($object->enabled_modes[$mode_key])) continue;
@@ -63,7 +63,7 @@ if (empty($reshook)) {
 			print '<tr><td class="titlefieldcreate">' . $langs->trans($field_info['label']) . '</td><td colspan="3">';
 			if (!empty($assetaccountancycodes->accountancy_codes[$mode_key][$field_key])) {
 				$accountancy_code = $assetaccountancycodes->accountancy_codes[$mode_key][$field_key];
-				if (!empty($conf->accounting->enabled)) {
+				if (isModEnabled('accounting')) {
 					$accountingaccount = new AccountingAccount($db);
 					$accountingaccount->fetch('', $accountancy_code, 1);
 
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index a5461f3b666..57d240769aa 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -2272,7 +2272,7 @@ function dol_banner_tab($object, $paramid, $morehtml = '', $shownav = 1, $fieldi
 	}
 
 	// Add if object was dispatched "into accountancy"
-	if (!empty($conf->accounting->enabled) && in_array($object->element, array('bank', 'paiementcharge', 'facture', 'invoice', 'invoice_supplier', 'expensereport', 'payment_various'))) {
+	if (isModEnabled('accounting') && in_array($object->element, array('bank', 'paiementcharge', 'facture', 'invoice', 'invoice_supplier', 'expensereport', 'payment_various'))) {
 		// Note: For 'chargesociales', 'salaries'... this is the payments that are dispatched (so element = 'bank')
 		if (method_exists($object, 'getVentilExportCompta')) {
 			$accounted = $object->getVentilExportCompta();

From 4ecceb1fd078b5fae6a31742882976563268dd6a Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Sun, 4 Sep 2022 13:30:34 +0200
Subject: [PATCH 675/974] update code

---
 htdocs/core/tpl/objectline_view.tpl.php          | 2 +-
 htdocs/don/admin/donation.php                    | 6 +++---
 htdocs/expensereport/card.php                    | 6 +++---
 htdocs/fourn/class/fournisseur.facture.class.php | 4 ++--
 htdocs/fourn/class/fournisseur.product.class.php | 4 ++--
 5 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/htdocs/core/tpl/objectline_view.tpl.php b/htdocs/core/tpl/objectline_view.tpl.php
index fc1e74f1ac4..6adb3f97f5e 100644
--- a/htdocs/core/tpl/objectline_view.tpl.php
+++ b/htdocs/core/tpl/objectline_view.tpl.php
@@ -248,7 +248,7 @@ if ($user->rights->fournisseur->lire && $line->fk_fournprice > 0 && empty($conf-
 	}
 }
 
-if (!empty($conf->accounting->enabled) && $line->fk_accounting_account > 0) {
+if (isModEnabled('accounting') && $line->fk_accounting_account > 0) {
 	$accountingaccount = new AccountingAccount($this->db);
 	$accountingaccount->fetch($line->fk_accounting_account);
 	print '<div class="clearboth"></div><br><span class="opacitymedium">'.$langs->trans('AccountingAffectation').' : </span>'.$accountingaccount->getNomUrl(0, 1, 1);
diff --git a/htdocs/don/admin/donation.php b/htdocs/don/admin/donation.php
index 9a360f69882..a78935c74fd 100644
--- a/htdocs/don/admin/donation.php
+++ b/htdocs/don/admin/donation.php
@@ -30,7 +30,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/donation.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/don/class/don.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
-if (!empty($conf->accounting->enabled)) {
+if (isModEnabled('accounting')) {
 	require_once DOL_DOCUMENT_ROOT.'/core/class/html.formaccounting.class.php';
 }
 
@@ -169,7 +169,7 @@ if (preg_match('/del_([a-z0-9_\-]+)/i', $action, $reg)) {
 
 $dir = "../../core/modules/dons/";
 $form = new Form($db);
-if (!empty($conf->accounting->enabled)) {
+if (isModEnabled('accounting')) {
 	$formaccounting = new FormAccounting($db);
 }
 
@@ -335,7 +335,7 @@ print '<td>';
 $label = $langs->trans("AccountAccounting");
 print '<label for="DONATION_ACCOUNTINGACCOUNT">'.$label.'</label></td>';
 print '<td class="center">';
-if (!empty($conf->accounting->enabled)) {
+if (isModEnabled('accounting')) {
 	print $formaccounting->select_account($conf->global->DONATION_ACCOUNTINGACCOUNT, 'DONATION_ACCOUNTINGACCOUNT', 1, '', 1, 1);
 } else {
 	print '<input type="text" size="10" id="DONATION_ACCOUNTINGACCOUNT" name="DONATION_ACCOUNTINGACCOUNT" value="'.$conf->global->DONATION_ACCOUNTINGACCOUNT.'">';
diff --git a/htdocs/expensereport/card.php b/htdocs/expensereport/card.php
index 680f1861fe3..8f929ee13cf 100644
--- a/htdocs/expensereport/card.php
+++ b/htdocs/expensereport/card.php
@@ -44,7 +44,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/class/doleditor.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
-if (!empty($conf->accounting->enabled)) {
+if (isModEnabled('accounting')) {
 	require_once DOL_DOCUMENT_ROOT.'/accountancy/class/accountingjournal.class.php';
 }
 
@@ -1989,7 +1989,7 @@ if ($action == 'create') {
 						$bankaccountstatic->label = $objp->baref;
 						$bankaccountstatic->number = $objp->banumber;
 
-						if (!empty($conf->accounting->enabled)) {
+						if (isModEnabled('accounting')) {
 							$bankaccountstatic->account_number = $objp->account_number;
 
 							$accountingjournal = new AccountingJournal($db);
@@ -2121,7 +2121,7 @@ if ($action == 'create') {
 						}
 
 						$titlealt = '';
-						if (!empty($conf->accounting->enabled)) {
+						if (isModEnabled('accounting')) {
 							require_once DOL_DOCUMENT_ROOT.'/accountancy/class/accountingaccount.class.php';
 							$accountingaccount = new AccountingAccount($db);
 							$resaccountingaccount = $accountingaccount->fetch(0, $line->type_fees_accountancy_code, 1);
diff --git a/htdocs/fourn/class/fournisseur.facture.class.php b/htdocs/fourn/class/fournisseur.facture.class.php
index c4e034dd7a1..1a08e780484 100644
--- a/htdocs/fourn/class/fournisseur.facture.class.php
+++ b/htdocs/fourn/class/fournisseur.facture.class.php
@@ -40,10 +40,10 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/commonobjectline.class.php';
 require_once DOL_DOCUMENT_ROOT.'/multicurrency/class/multicurrency.class.php';
 require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
 
-if (!empty($conf->accounting->enabled)) {
+if (isModEnabled('accounting')) {
 	require_once DOL_DOCUMENT_ROOT.'/core/class/html.formaccounting.class.php';
 }
-if (!empty($conf->accounting->enabled)) {
+if (isModEnabled('accounting')) {
 	require_once DOL_DOCUMENT_ROOT.'/accountancy/class/accountingaccount.class.php';
 }
 
diff --git a/htdocs/fourn/class/fournisseur.product.class.php b/htdocs/fourn/class/fournisseur.product.class.php
index 276c5b20ed9..1fdc1816544 100644
--- a/htdocs/fourn/class/fournisseur.product.class.php
+++ b/htdocs/fourn/class/fournisseur.product.class.php
@@ -1212,13 +1212,13 @@ class ProductFournisseur extends Product
 			}
 		}
 
-		if (!empty($conf->accounting->enabled) && $this->status) {
+		if (isModEnabled('accounting') && $this->status) {
 			include_once DOL_DOCUMENT_ROOT.'/core/lib/accounting.lib.php';
 			$label .= '<br><b>'.$langs->trans('ProductAccountancySellCode').':</b> '.length_accountg($this->accountancy_code_sell);
 			$label .= '<br><b>'.$langs->trans('ProductAccountancySellIntraCode').':</b> '.length_accountg($this->accountancy_code_sell_intra);
 			$label .= '<br><b>'.$langs->trans('ProductAccountancySellExportCode').':</b> '.length_accountg($this->accountancy_code_sell_export);
 		}
-		if (!empty($conf->accounting->enabled) && $this->status_buy) {
+		if (isModEnabled('accounting') && $this->status_buy) {
 			include_once DOL_DOCUMENT_ROOT.'/core/lib/accounting.lib.php';
 			$label .= '<br><b>'.$langs->trans('ProductAccountancyBuyCode').':</b> '.length_accountg($this->accountancy_code_buy);
 			$label .= '<br><b>'.$langs->trans('ProductAccountancyBuyIntraCode').':</b> '.length_accountg($this->accountancy_code_buy_intra);

From 94a646103d4597fcf764ef622b83a31716f75a46 Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Sun, 4 Sep 2022 13:32:12 +0200
Subject: [PATCH 676/974] update code

---
 htdocs/fourn/facture/card.php          |  4 ++--
 htdocs/loan/card.php                   | 20 ++++++++++----------
 htdocs/product/card.php                | 20 ++++++++++----------
 htdocs/product/class/product.class.php |  2 +-
 htdocs/projet/card.php                 |  2 +-
 5 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/htdocs/fourn/facture/card.php b/htdocs/fourn/facture/card.php
index 2f8f3f2adae..f09621f89d0 100644
--- a/htdocs/fourn/facture/card.php
+++ b/htdocs/fourn/facture/card.php
@@ -57,7 +57,7 @@ if (isModEnabled('project')) {
 if (!empty($conf->variants->enabled)) {
 	require_once DOL_DOCUMENT_ROOT.'/variants/class/ProductCombination.class.php';
 }
-if (!empty($conf->accounting->enabled)) {
+if (isModEnabled('accounting')) {
 	require_once DOL_DOCUMENT_ROOT.'/accountancy/class/accountingjournal.class.php';
 }
 
@@ -3322,7 +3322,7 @@ if ($action == 'create') {
 						$bankaccountstatic->label = $objp->baref;
 						$bankaccountstatic->number = $objp->banumber;
 
-						if (!empty($conf->accounting->enabled)) {
+						if (isModEnabled('accounting')) {
 							$bankaccountstatic->account_number = $objp->account_number;
 
 							$accountingjournal = new AccountingJournal($db);
diff --git a/htdocs/loan/card.php b/htdocs/loan/card.php
index 7ec8e7894fc..dd7b623a4b9 100644
--- a/htdocs/loan/card.php
+++ b/htdocs/loan/card.php
@@ -28,10 +28,10 @@ require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/loan/class/loan.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/loan.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
-if (!empty($conf->accounting->enabled)) {
+if (isModEnabled('accounting')) {
 	require_once DOL_DOCUMENT_ROOT.'/core/class/html.formaccounting.class.php';
 }
-if (!empty($conf->accounting->enabled)) {
+if (isModEnabled('accounting')) {
 	require_once DOL_DOCUMENT_ROOT.'/accountancy/class/accountingaccount.class.php';
 }
 require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
@@ -244,7 +244,7 @@ if (empty($reshook)) {
 
 $form = new Form($db);
 $formproject = new FormProjets($db);
-if (!empty($conf->accounting->enabled)) {
+if (isModEnabled('accounting')) {
 	$formaccounting = new FormAccounting($db);
 }
 
@@ -341,7 +341,7 @@ if ($action == 'create') {
 	print '</td></tr>';
 
 	// Accountancy
-	if (!empty($conf->accounting->enabled)) {
+	if (isModEnabled('accounting')) {
 		// Accountancy_account_capital
 		print '<tr><td class="titlefieldcreate fieldrequired">'.$langs->trans("LoanAccountancyCapitalCode").'</td>';
 		print '<td>';
@@ -532,7 +532,7 @@ if ($id > 0) {
 			print $langs->trans("LoanAccountancyCapitalCode");
 			print '</td><td>';
 
-			if (!empty($conf->accounting->enabled)) {
+			if (isModEnabled('accounting')) {
 				print $formaccounting->select_account($object->account_capital, 'accountancy_account_capital', 1, '', 1, 1);
 			} else {
 				print '<input name="accountancy_account_capital" size="16" value="'.$object->account_capital.'">';
@@ -543,7 +543,7 @@ if ($id > 0) {
 			print $langs->trans("LoanAccountancyCapitalCode");
 			print '</td><td>';
 
-			if (!empty($conf->accounting->enabled)) {
+			if (isModEnabled('accounting')) {
 				$accountingaccount = new AccountingAccount($db);
 				$accountingaccount->fetch('', $object->account_capital, 1);
 
@@ -563,7 +563,7 @@ if ($id > 0) {
 			print $langs->trans("LoanAccountancyInsuranceCode");
 			print '</td><td>';
 
-			if (!empty($conf->accounting->enabled)) {
+			if (isModEnabled('accounting')) {
 				print $formaccounting->select_account($object->account_insurance, 'accountancy_account_insurance', 1, '', 1, 1);
 			} else {
 				print '<input name="accountancy_account_insurance" size="16" value="'.$object->account_insurance.'">';
@@ -574,7 +574,7 @@ if ($id > 0) {
 			print $langs->trans("LoanAccountancyInsuranceCode");
 			print '</td><td>';
 
-			if (!empty($conf->accounting->enabled)) {
+			if (isModEnabled('accounting')) {
 				$accountingaccount = new AccountingAccount($db);
 				$accountingaccount->fetch('', $object->account_insurance, 1);
 
@@ -594,7 +594,7 @@ if ($id > 0) {
 			print $langs->trans("LoanAccountancyInterestCode");
 			print '</td><td>';
 
-			if (!empty($conf->accounting->enabled)) {
+			if (isModEnabled('accounting')) {
 				print $formaccounting->select_account($object->account_interest, 'accountancy_account_interest', 1, '', 1, 1);
 			} else {
 				print '<input name="accountancy_account_interest" size="16" value="'.$object->account_interest.'">';
@@ -605,7 +605,7 @@ if ($id > 0) {
 			print $langs->trans("LoanAccountancyInterestCode");
 			print '</td><td>';
 
-			if (!empty($conf->accounting->enabled)) {
+			if (isModEnabled('accounting')) {
 				$accountingaccount = new AccountingAccount($db);
 				$accountingaccount->fetch('', $object->account_interest, 1);
 
diff --git a/htdocs/product/card.php b/htdocs/product/card.php
index 17387e3948d..714ad55ab50 100644
--- a/htdocs/product/card.php
+++ b/htdocs/product/card.php
@@ -65,7 +65,7 @@ if (isModEnabled('facture')) {
 if (isModEnabled('commande')) {
 	require_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
 }
-if (!empty($conf->accounting->enabled)) {
+if (isModEnabled('accounting')) {
 	require_once DOL_DOCUMENT_ROOT.'/core/lib/accounting.lib.php';
 	require_once DOL_DOCUMENT_ROOT.'/core/class/html.formaccounting.class.php';
 	require_once DOL_DOCUMENT_ROOT.'/accountancy/class/accountingaccount.class.php';
@@ -1202,7 +1202,7 @@ $form = new Form($db);
 $formfile = new FormFile($db);
 $formproduct = new FormProduct($db);
 $formcompany = new FormCompany($db);
-if (!empty($conf->accounting->enabled)) {
+if (isModEnabled('accounting')) {
 	$formaccounting = new FormAccounting($db);
 }
 
@@ -1672,7 +1672,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 		print '<table class="border centpercent">';
 
 		if (empty($conf->global->PRODUCT_DISABLE_ACCOUNTING)) {
-			if (!empty($conf->accounting->enabled)) {
+			if (isModEnabled('accounting')) {
 				// Accountancy_code_sell
 				print '<tr><td class="titlefieldcreate">'.$langs->trans("ProductAccountancySellCode").'</td>';
 				print '<td>';
@@ -2186,7 +2186,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 			print '<table class="border centpercent">';
 
 			if (empty($conf->global->PRODUCT_DISABLE_ACCOUNTING)) {
-				if (!empty($conf->accounting->enabled)) {
+				if (isModEnabled('accounting')) {
 					// Accountancy_code_sell
 					print '<tr><td class="titlefieldcreate">'.$langs->trans("ProductAccountancySellCode").'</td>';
 					print '<td>';
@@ -2387,7 +2387,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 				print '<tr><td class="nowrap">';
 				print $langs->trans("ProductAccountancySellCode");
 				print '</td><td>';
-				if (!empty($conf->accounting->enabled)) {
+				if (isModEnabled('accounting')) {
 					if (!empty($object->accountancy_code_sell)) {
 						$accountingaccount = new AccountingAccount($db);
 						$accountingaccount->fetch('', $object->accountancy_code_sell, 1);
@@ -2404,7 +2404,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 					print '<tr><td class="nowrap">';
 					print $langs->trans("ProductAccountancySellIntraCode");
 					print '</td><td>';
-					if (!empty($conf->accounting->enabled)) {
+					if (isModEnabled('accounting')) {
 						if (!empty($object->accountancy_code_sell_intra)) {
 							$accountingaccount2 = new AccountingAccount($db);
 							$accountingaccount2->fetch('', $object->accountancy_code_sell_intra, 1);
@@ -2421,7 +2421,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 				print '<tr><td class="nowrap">';
 				print $langs->trans("ProductAccountancySellExportCode");
 				print '</td><td>';
-				if (!empty($conf->accounting->enabled)) {
+				if (isModEnabled('accounting')) {
 					if (!empty($object->accountancy_code_sell_export)) {
 						$accountingaccount3 = new AccountingAccount($db);
 						$accountingaccount3->fetch('', $object->accountancy_code_sell_export, 1);
@@ -2437,7 +2437,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 				print '<tr><td class="nowrap">';
 				print $langs->trans("ProductAccountancyBuyCode");
 				print '</td><td>';
-				if (!empty($conf->accounting->enabled)) {
+				if (isModEnabled('accounting')) {
 					if (!empty($object->accountancy_code_buy)) {
 						$accountingaccount4 = new AccountingAccount($db);
 						$accountingaccount4->fetch('', $object->accountancy_code_buy, 1);
@@ -2454,7 +2454,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 					print '<tr><td class="nowrap">';
 					print $langs->trans("ProductAccountancyBuyIntraCode");
 					print '</td><td>';
-					if (!empty($conf->accounting->enabled)) {
+					if (isModEnabled('accounting')) {
 						if (!empty($object->accountancy_code_buy_intra)) {
 							$accountingaccount5 = new AccountingAccount($db);
 							$accountingaccount5->fetch('', $object->accountancy_code_buy_intra, 1);
@@ -2471,7 +2471,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 				print '<tr><td class="nowrap">';
 				print $langs->trans("ProductAccountancyBuyExportCode");
 				print '</td><td>';
-				if (!empty($conf->accounting->enabled)) {
+				if (isModEnabled('accounting')) {
 					if (!empty($object->accountancy_code_buy_export)) {
 						$accountingaccount6 = new AccountingAccount($db);
 						$accountingaccount6->fetch('', $object->accountancy_code_buy_export, 1);
diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php
index 360709dc5a0..c8cef2abe34 100644
--- a/htdocs/product/class/product.class.php
+++ b/htdocs/product/class/product.class.php
@@ -4985,7 +4985,7 @@ class Product extends CommonObject
 			$label .= "<br><b>".$langs->trans("PMPValue").'</b>: '.price($this->pmp, 0, '', 1, -1, -1, $conf->currency);
 		}
 
-		if (!empty($conf->accounting->enabled)) {
+		if (isModEnabled('accounting')) {
 			if ($this->status && isset($this->accountancy_code_sell)) {
 				include_once DOL_DOCUMENT_ROOT.'/core/lib/accounting.lib.php';
 				$label .= '<br>';
diff --git a/htdocs/projet/card.php b/htdocs/projet/card.php
index 451334c5d77..20783de274e 100644
--- a/htdocs/projet/card.php
+++ b/htdocs/projet/card.php
@@ -1291,7 +1291,7 @@ if ($action == 'create' && $user->rights->projet->creer) {
 
 			// Accounting Report
 			/*
-			$accouting_module_activated = !empty($conf->comptabilite->enabled) || !empty($conf->accounting->enabled);
+			$accouting_module_activated = !empty($conf->comptabilite->enabled) || isModEnabled('accounting');
 			if ($accouting_module_activated && $object->statut != Project::STATUS_DRAFT) {
 				$start = dol_getdate((int) $object->date_start);
 				$end = dol_getdate((int) $object->date_end);

From 36f2c139e585eb00099299aa8a9761d4192a3645 Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Sun, 4 Sep 2022 13:33:11 +0200
Subject: [PATCH 677/974] update code

---
 htdocs/societe/admin/societe.php       |  2 +-
 htdocs/societe/card.php                | 18 +++++++++---------
 htdocs/societe/class/societe.class.php |  4 ++--
 htdocs/stripe/charge.php               |  2 +-
 htdocs/stripe/payout.php               |  2 +-
 5 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/htdocs/societe/admin/societe.php b/htdocs/societe/admin/societe.php
index f9f5f800a04..24647fd0975 100644
--- a/htdocs/societe/admin/societe.php
+++ b/htdocs/societe/admin/societe.php
@@ -713,7 +713,7 @@ foreach ($profid as $key => $val) {
 	$i++;
 }
 
-if (!empty($conf->accounting->enabled)) {
+if (isModEnabled('accounting')) {
 	print '<tr class="oddeven">';
 	print '<td colspan="2">'.$langs->trans('CustomerAccountancyCodeShort')."</td>\n";
 	print '<td colspan="2"></td>';
diff --git a/htdocs/societe/card.php b/htdocs/societe/card.php
index 7080ade778e..19d3a2be91e 100644
--- a/htdocs/societe/card.php
+++ b/htdocs/societe/card.php
@@ -50,13 +50,13 @@ require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 if (isModEnabled('adherent')) {
 	require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
 }
-if (!empty($conf->accounting->enabled)) {
+if (isModEnabled('accounting')) {
 	require_once DOL_DOCUMENT_ROOT.'/core/lib/accounting.lib.php';
 }
-if (!empty($conf->accounting->enabled)) {
+if (isModEnabled('accounting')) {
 	require_once DOL_DOCUMENT_ROOT.'/core/class/html.formaccounting.class.php';
 }
-if (!empty($conf->accounting->enabled)) {
+if (isModEnabled('accounting')) {
 	require_once DOL_DOCUMENT_ROOT.'/accountancy/class/accountingaccount.class.php';
 }
 if (isModEnabled('eventorganization')) {
@@ -80,7 +80,7 @@ if (!empty($conf->incoterm->enabled)) {
 if (!empty($conf->notification->enabled)) {
 	$langs->load("mails");
 }
-if (!empty($conf->accounting->enabled)) {
+if (isModEnabled('accounting')) {
 	$langs->load("products");
 }
 
@@ -961,7 +961,7 @@ $form = new Form($db);
 $formfile = new FormFile($db);
 $formadmin = new FormAdmin($db);
 $formcompany = new FormCompany($db);
-if (!empty($conf->accounting->enabled)) {
+if (isModEnabled('accounting')) {
 	$formaccounting = new FormAccounting($db);
 }
 
@@ -1834,7 +1834,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 		if (!empty($conf->global->ACCOUNTANCY_USE_PRODUCT_ACCOUNT_ON_THIRDPARTY)) {
 			print '<table class="border" width="100%">';
 
-			if (!empty($conf->accounting->enabled)) {
+			if (isModEnabled('accounting')) {
 				// Accountancy_code_sell
 				print '<tr><td class="titlefieldcreate">'.$langs->trans("ProductAccountancySellCode").'</td>';
 				print '<td>';
@@ -2562,7 +2562,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 				print '<br>';
 				print '<table class="border centpercent">';
 
-				if (!empty($conf->accounting->enabled)) {
+				if (isModEnabled('accounting')) {
 					// Accountancy_code_sell
 					print '<tr><td class="titlefield">'.$langs->trans("ProductAccountancySellCode").'</td>';
 					print '<td>';
@@ -2984,7 +2984,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 			print '<tr><td class="nowrap">';
 			print $langs->trans("ProductAccountancySellCode");
 			print '</td><td colspan="2">';
-			if (!empty($conf->accounting->enabled)) {
+			if (isModEnabled('accounting')) {
 				if (!empty($object->accountancy_code_sell)) {
 					$accountingaccount = new AccountingAccount($db);
 					$accountingaccount->fetch('', $object->accountancy_code_sell, 1);
@@ -3000,7 +3000,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 			print '<tr><td class="nowrap">';
 			print $langs->trans("ProductAccountancyBuyCode");
 			print '</td><td colspan="2">';
-			if (!empty($conf->accounting->enabled)) {
+			if (isModEnabled('accounting')) {
 				if (!empty($object->accountancy_code_buy)) {
 					$accountingaccount2 = new AccountingAccount($db);
 					$accountingaccount2->fetch('', $object->accountancy_code_buy, 1);
diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php
index 58a8d973fe6..54decc3f8ea 100644
--- a/htdocs/societe/class/societe.class.php
+++ b/htdocs/societe/class/societe.class.php
@@ -2711,10 +2711,10 @@ class Societe extends CommonObject
 		if (!empty($this->code_fournisseur) && $this->fournisseur) {
 			$label2 .= '<br><b>'.$langs->trans('SupplierCode').':</b> '.$this->code_fournisseur;
 		}
-		if (!empty($conf->accounting->enabled) && ($this->client == 1 || $this->client == 3)) {
+		if (isModEnabled('accounting') && ($this->client == 1 || $this->client == 3)) {
 			$label2 .= '<br><b>'.$langs->trans('CustomerAccountancyCode').':</b> '.($this->code_compta ? $this->code_compta : $this->code_compta_client);
 		}
-		if (!empty($conf->accounting->enabled) && $this->fournisseur) {
+		if (isModEnabled('accounting') && $this->fournisseur) {
 			$label2 .= '<br><b>'.$langs->trans('SupplierAccountancyCode').':</b> '.$this->code_compta_fournisseur;
 		}
 		$label .= ($label2 ? '<br>'.$label2 : '').'</div>';
diff --git a/htdocs/stripe/charge.php b/htdocs/stripe/charge.php
index eb30537438c..747644edbf5 100644
--- a/htdocs/stripe/charge.php
+++ b/htdocs/stripe/charge.php
@@ -26,7 +26,7 @@ require_once DOL_DOCUMENT_ROOT.'/stripe/class/stripe.class.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
 require_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
-if (!empty($conf->accounting->enabled)) {
+if (isModEnabled('accounting')) {
 	require_once DOL_DOCUMENT_ROOT.'/accountancy/class/accountingjournal.class.php';
 }
 
diff --git a/htdocs/stripe/payout.php b/htdocs/stripe/payout.php
index a33c183a1e7..5d456856f79 100644
--- a/htdocs/stripe/payout.php
+++ b/htdocs/stripe/payout.php
@@ -26,7 +26,7 @@ require_once DOL_DOCUMENT_ROOT.'/stripe/class/stripe.class.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
 require_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
-if (!empty($conf->accounting->enabled)) {
+if (isModEnabled('accounting')) {
 	require_once DOL_DOCUMENT_ROOT.'/accountancy/class/accountingjournal.class.php';
 }
 

From d5df85fd3e450739d6e0871364f9d574579d140c Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Sun, 4 Sep 2022 13:34:19 +0200
Subject: [PATCH 678/974] update code

---
 htdocs/stripe/transaction.php          | 2 +-
 htdocs/user/bank.php                   | 2 +-
 htdocs/user/card.php                   | 4 ++--
 htdocs/user/param_ihm.php              | 2 +-
 test/phpunit/AccountingAccountTest.php | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/htdocs/stripe/transaction.php b/htdocs/stripe/transaction.php
index f04833ff107..6265ed2af69 100644
--- a/htdocs/stripe/transaction.php
+++ b/htdocs/stripe/transaction.php
@@ -26,7 +26,7 @@ require_once DOL_DOCUMENT_ROOT.'/stripe/class/stripe.class.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
 require_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
-if (!empty($conf->accounting->enabled)) {
+if (isModEnabled('accounting')) {
 	require_once DOL_DOCUMENT_ROOT.'/accountancy/class/accountingjournal.class.php';
 }
 
diff --git a/htdocs/user/bank.php b/htdocs/user/bank.php
index 4f3ee5c32c8..36b3da25c7a 100644
--- a/htdocs/user/bank.php
+++ b/htdocs/user/bank.php
@@ -573,7 +573,7 @@ if ($action != 'edit' && $action != 'create') {		// If not bank account yet, $ac
 	}
 
 	// Accountancy code
-	if (!empty($conf->accounting->enabled)) {
+	if (isModEnabled('accounting')) {
 		print '<tr><td>'.$langs->trans("AccountancyCode").'</td>';
 		print '<td>'.$object->accountancy_code.'</td></tr>';
 	}
diff --git a/htdocs/user/card.php b/htdocs/user/card.php
index b1038b3a4cd..11aa6f01148 100644
--- a/htdocs/user/card.php
+++ b/htdocs/user/card.php
@@ -1155,7 +1155,7 @@ if ($action == 'create' || $action == 'adduserldap') {
 	}
 
 	// Accountancy code
-	if (!empty($conf->accounting->enabled)) {
+	if (isModEnabled('accounting')) {
 		print '<tr><td>'.$langs->trans("AccountancyCode").'</td>';
 		print '<td>';
 		print '<input type="text" class="maxwidthonsmartphone" name="accountancy_code" value="'.dol_escape_htmltag(GETPOST('accountancy_code', 'alphanohtml')).'">';
@@ -2540,7 +2540,7 @@ if ($action == 'create' || $action == 'adduserldap') {
 			}
 
 			// Accountancy code
-			if (!empty($conf->accounting->enabled)) {
+			if (isModEnabled('accounting')) {
 				print "<tr>";
 				print '<td class="titlefieldcreate">'.$langs->trans("AccountancyCode").'</td>';
 				print '<td>';
diff --git a/htdocs/user/param_ihm.php b/htdocs/user/param_ihm.php
index 6124b77e95f..0e36db8c405 100644
--- a/htdocs/user/param_ihm.php
+++ b/htdocs/user/param_ihm.php
@@ -201,7 +201,7 @@ if (isModEnabled("product") || isModEnabled("service")) {
 if (isModEnabled("propal") || isModEnabled('commande') || !empty($conf->ficheinter->enabled) || isModEnabled('contrat')) {
 	$tmparray['comm/index.php?mainmenu=commercial&leftmenu='] = 'CommercialArea';
 }
-if (!empty($conf->comptabilite->enabled) || !empty($conf->accounting->enabled)) {
+if (!empty($conf->comptabilite->enabled) || isModEnabled('accounting')) {
 	$tmparray['compta/index.php?mainmenu=compta&leftmenu='] = 'AccountancyTreasuryArea';
 }
 if (isModEnabled('adherent')) {
diff --git a/test/phpunit/AccountingAccountTest.php b/test/phpunit/AccountingAccountTest.php
index 52efe3a0147..7bee4dd3b00 100644
--- a/test/phpunit/AccountingAccountTest.php
+++ b/test/phpunit/AccountingAccountTest.php
@@ -83,7 +83,7 @@ class AccountingAccountTest extends PHPUnit\Framework\TestCase
 		global $conf,$user,$langs,$db;
 		$db->begin(); // This is to have all actions inside a transaction even if test launched without suite.
 
-		if (empty($conf->accounting->enabled)) {
+		if (!isModEnabled('accounting')) {
 			print __METHOD__." module accouting must be enabled.\n"; exit(-1);
 		}
 

From 6c8f088cc2b32412cbafeefd0dc519727a41743f Mon Sep 17 00:00:00 2001
From: mikygee <mikydevel@yahoo.fr>
Date: Sun, 4 Sep 2022 13:46:19 +0200
Subject: [PATCH 679/974] Bug #22064 effectif should be 51-100 and 101-500 (not
 100-500)

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

diff --git a/htdocs/install/mysql/data/llx_c_effectif.sql b/htdocs/install/mysql/data/llx_c_effectif.sql
index cb67da5d73c..f3c5b0cd03f 100644
--- a/htdocs/install/mysql/data/llx_c_effectif.sql
+++ b/htdocs/install/mysql/data/llx_c_effectif.sql
@@ -36,5 +36,5 @@ insert into llx_c_effectif (id,code,libelle) values (1, 'EF1-5',     '1 - 5');
 insert into llx_c_effectif (id,code,libelle) values (2, 'EF6-10',    '6 - 10');
 insert into llx_c_effectif (id,code,libelle) values (3, 'EF11-50',   '11 - 50');
 insert into llx_c_effectif (id,code,libelle) values (4, 'EF51-100',  '51 - 100');
-insert into llx_c_effectif (id,code,libelle) values (5, 'EF100-500', '100 - 500');
+insert into llx_c_effectif (id,code,libelle) values (5, 'EF101-500', '101 - 500');
 insert into llx_c_effectif (id,code,libelle) values (6, 'EF500-',    '> 500');

From b194af39e8a1835958a35d21109990e7772cb0ca Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Sun, 4 Sep 2022 14:48:05 +0200
Subject: [PATCH 680/974] fix : extrafields of line where missing when cloning
 a fichinter

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

diff --git a/htdocs/fichinter/class/fichinter.class.php b/htdocs/fichinter/class/fichinter.class.php
index 029c5651a32..b1f99d40456 100644
--- a/htdocs/fichinter/class/fichinter.class.php
+++ b/htdocs/fichinter/class/fichinter.class.php
@@ -1219,7 +1219,7 @@ class Fichinter extends CommonObject
 		if (!$error) {
 			// Add lines because it is not included into create function
 			foreach ($this->lines as $line) {
-				$this->addline($user, $this->id, $line->desc, $line->datei, $line->duration);
+				$this->addline($user, $this->id, $line->desc, $line->datei, $line->duration, $line->array_options);
 			}
 
 			// Hook of thirdparty module

From ab1cef6dd01f797252d875534429b4a5ceab6e81 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 4 Sep 2022 18:59:11 +0200
Subject: [PATCH 681/974] Can show all y serie value on a point in dolgraph

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

diff --git a/htdocs/core/class/dolgraph.class.php b/htdocs/core/class/dolgraph.class.php
index e24afd73879..57f0bca4e36 100644
--- a/htdocs/core/class/dolgraph.class.php
+++ b/htdocs/core/class/dolgraph.class.php
@@ -515,7 +515,7 @@ class DolGraph
 	/**
 	 * Show pointvalue or not
 	 *
-	 * @param	int		$showpointvalue		1=Show value for each point, as tooltip or inline (default), 0=Hide value
+	 * @param	int		$showpointvalue		1=Show value for each point, as tooltip or inline (default), 0=Hide value, 2=Show values for each serie on same point
 	 * @return	void
 	 */
 	public function setShowPointValue($showpointvalue)
@@ -1299,8 +1299,12 @@ class DolGraph
 				$type = 'line';
 			}
 
+			// Set options
 			$this->stringtoshow .= 'var options = { maintainAspectRatio: false, aspectRatio: 2.5, ';
 			$this->stringtoshow .= $xaxis;
+			if ($this->showpointvalue == 2) {
+				$this->stringtoshow .= 'interaction: { intersect: true, mode: \'index\'}, ';
+			}
 
 			/* For Chartjs v2.9 */
 			/*

From 61419fac68e140854cea39ec7b189bd564702067 Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Sun, 4 Sep 2022 21:58:21 +0200
Subject: [PATCH 682/974] Add permissions

---
 htdocs/fourn/commande/card.php    | 2 +-
 htdocs/fourn/facture/card.php     | 2 +-
 htdocs/supplier_proposal/card.php | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/htdocs/fourn/commande/card.php b/htdocs/fourn/commande/card.php
index f93373a64fa..5cc07ecdca0 100644
--- a/htdocs/fourn/commande/card.php
+++ b/htdocs/fourn/commande/card.php
@@ -405,7 +405,7 @@ if (empty($reshook)) {
 	}
 
 	// Add a product line
-	if ($action == 'addline' && GETPOST('submitforalllines', 'aZ09') && GETPOST('vatforalllines', 'alpha')) {
+	if ($action == 'addline' && GETPOST('submitforalllines', 'aZ09') && GETPOST('vatforalllines', 'alpha') && $usercancreate) {
 		// Define vat_rate
 		$vat_rate = (GETPOST('vatforalllines') ? GETPOST('vatforalllines') : 0);
 		$vat_rate = str_replace('*', '', $vat_rate);
diff --git a/htdocs/fourn/facture/card.php b/htdocs/fourn/facture/card.php
index 65ae4e81150..6959bc828a1 100644
--- a/htdocs/fourn/facture/card.php
+++ b/htdocs/fourn/facture/card.php
@@ -1383,7 +1383,7 @@ if (empty($reshook)) {
 			$db->rollback();
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
-	} elseif ($action == 'addline' && GETPOST('submitforalllines', 'aZ09') && GETPOST('vatforalllines', 'alpha')) {
+	} elseif ($action == 'addline' && GETPOST('submitforalllines', 'aZ09') && GETPOST('vatforalllines', 'alpha') && $usercancreate) {
 		// Define vat_rate
 		$vat_rate = (GETPOST('vatforalllines') ? GETPOST('vatforalllines') : 0);
 		$vat_rate = str_replace('*', '', $vat_rate);
diff --git a/htdocs/supplier_proposal/card.php b/htdocs/supplier_proposal/card.php
index 9719928ab75..c4fa9b9a3e7 100644
--- a/htdocs/supplier_proposal/card.php
+++ b/htdocs/supplier_proposal/card.php
@@ -546,7 +546,7 @@ if (empty($reshook)) {
 	}
 
 	// Add a product line
-	if ($action == 'addline' && GETPOST('submitforalllines', 'aZ09') && GETPOST('vatforalllines', 'alpha')) {
+	if ($action == 'addline' && GETPOST('submitforalllines', 'aZ09') && GETPOST('vatforalllines', 'alpha') && $usercancreate) {
 		// Define vat_rate
 		$vat_rate = (GETPOST('vatforalllines') ? GETPOST('vatforalllines') : 0);
 		$vat_rate = str_replace('*', '', $vat_rate);

From 3e9df092f480b93260a2214546d9fce3944fb509 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 5 Sep 2022 09:15:45 +0200
Subject: [PATCH 683/974] css

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

diff --git a/htdocs/compta/facture/list.php b/htdocs/compta/facture/list.php
index 8c6092d68c4..44dd7225dad 100644
--- a/htdocs/compta/facture/list.php
+++ b/htdocs/compta/facture/list.php
@@ -2323,7 +2323,7 @@ if ($resql) {
 			print $hookmanager->resPrint;
 			// Date creation
 			if (!empty($arrayfields['f.datec']['checked'])) {
-				print '<td class="nowrap center">';
+				print '<td class="nowraponall center">';
 				print dol_print_date($db->jdate($obj->date_creation), 'dayhour', 'tzuser');
 				print '</td>';
 				if (!$i) {
@@ -2332,7 +2332,7 @@ if ($resql) {
 			}
 			// Date modification
 			if (!empty($arrayfields['f.tms']['checked'])) {
-				print '<td class="nowrap center">';
+				print '<td class="nowraponall center">';
 				print dol_print_date($db->jdate($obj->date_update), 'dayhour', 'tzuser');
 				print '</td>';
 				if (!$i) {
@@ -2341,7 +2341,7 @@ if ($resql) {
 			}
 			// Date closing
 			if (!empty($arrayfields['f.date_closing']['checked'])) {
-				print '<td class="nowrap center">';
+				print '<td class="nowraponall center">';
 				print dol_print_date($db->jdate($obj->date_closing), 'dayhour', 'tzuser');
 				print '</td>';
 				if (!$i) {

From 81865ec55bd4b69753c619ddd5910fab0664e570 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 5 Sep 2022 09:39:54 +0200
Subject: [PATCH 684/974] NEW Support IP type in extrafields

---
 htdocs/core/tpl/admin_extrafields_edit.tpl.php | 12 ++++++------
 htdocs/langs/en_US/admin.lang                  |  1 +
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/htdocs/core/tpl/admin_extrafields_edit.tpl.php b/htdocs/core/tpl/admin_extrafields_edit.tpl.php
index 8dcc1edf017..7814560be9b 100644
--- a/htdocs/core/tpl/admin_extrafields_edit.tpl.php
+++ b/htdocs/core/tpl/admin_extrafields_edit.tpl.php
@@ -191,17 +191,17 @@ if ((($type == 'select') || ($type == 'checkbox') || ($type == 'radio')) && is_a
 <?php
 // Define list of possible type transition
 $typewecanchangeinto = array(
-	'varchar'=>array('varchar', 'phone', 'mail', 'url', 'select', 'password', 'text', 'html'),
+	'varchar'=>array('varchar', 'phone', 'mail', 'url', 'ip', 'select', 'password', 'text', 'html'),
 	'double'=>array('double', 'price'),
 	'price'=>array('double', 'price'),
 	'text'=>array('text', 'html'),
 	'html'=>array('text', 'html'),
 	'password'=>array('password', 'varchar'),
-	'mail'=>array('ip', 'varchar', 'phone', 'mail', 'url', 'select'),
-	'url'=>array('ip', 'varchar', 'phone', 'mail', 'url', 'select'),
-	'phone'=>array('ip', 'varchar', 'phone', 'mail', 'url', 'select'),
-	'ip'=>array('ip', 'varchar', 'phone', 'mail', 'url', 'select'),
-	'select'=>array('varchar', 'phone', 'mail', 'url', 'select'),
+	'mail'=>array('varchar', 'phone', 'mail', 'url', 'ip', 'select'),
+	'url'=>array('varchar', 'phone', 'mail', 'url', 'ip', 'select'),
+	'phone'=>array('varchar', 'phone', 'mail', 'url', 'ip', 'select'),
+	'ip'=>array('varchar', 'phone', 'mail', 'url', 'ip', 'select'),
+	'select'=>array('varchar', 'phone', 'mail', 'url', 'ip', 'select'),
 	'date'=>array('date', 'datetime')
 );
 /* Disabled because text is text on several lines, when varchar is text on 1 line, we should not be able to convert
diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index 6fe10207247..cc3e1252b31 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -441,6 +441,7 @@ ExtrafieldPhone = Phone
 ExtrafieldPrice = Price
 ExtrafieldMail = Email
 ExtrafieldUrl = Url
+ExtrafieldIP = IP
 ExtrafieldSelect = Select list
 ExtrafieldSelectList = Select from table
 ExtrafieldSeparator=Separator (not a field)

From 9a4a740d4b5efb9964bb5fa313be1b9e4eaa3c05 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 5 Sep 2022 11:13:30 +0200
Subject: [PATCH 685/974] 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 a5461f3b666..8a5751d72b3 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -1577,7 +1577,7 @@ function dol_ucwords($string, $encoding = "UTF-8")
  *  @param  int			$level					Log level
  *												On Windows LOG_ERR=4, LOG_WARNING=5, LOG_NOTICE=LOG_INFO=6, LOG_DEBUG=6 si define_syslog_variables ou PHP 5.3+, 7 si dolibarr
  *												On Linux   LOG_ERR=3, LOG_WARNING=4, LOG_NOTICE=5, LOG_INFO=6, LOG_DEBUG=7
- *  @param	int			$ident					1=Increase ident of 1, -1=Decrease ident of 1
+ *  @param	int			$ident					1=Increase ident of 1 (after log), -1=Decrease ident of 1 (before log)
  *  @param	string		$suffixinfilename		When output is a file, append this suffix into default log filename.
  *  @param	string		$restricttologhandler	Force output of log only to this log handler
  *  @param	array|null	$logcontext				If defined, an array with extra informations (can be used by some log handlers)

From 33ad0de37e50d4c01314f2ebdcbec03e2000cf71 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 5 Sep 2022 12:27:06 +0200
Subject: [PATCH 686/974] NEW Show also shceduled task never finished in
 scheduled task widget

---
 htdocs/core/boxes/box_scheduled_jobs.php | 20 ++++++++++++++++--
 htdocs/core/lib/admin.lib.php            | 26 ++++++++++++++----------
 htdocs/cron/list.php                     |  4 ++++
 htdocs/langs/en_US/admin.lang            |  4 +++-
 htdocs/langs/en_US/cron.lang             |  1 +
 htdocs/theme/eldy/global.inc.php         |  4 ++++
 htdocs/theme/md/style.css.php            |  4 ++++
 7 files changed, 49 insertions(+), 14 deletions(-)

diff --git a/htdocs/core/boxes/box_scheduled_jobs.php b/htdocs/core/boxes/box_scheduled_jobs.php
index cd610543e47..915884d6f43 100644
--- a/htdocs/core/boxes/box_scheduled_jobs.php
+++ b/htdocs/core/boxes/box_scheduled_jobs.php
@@ -86,7 +86,7 @@ class box_scheduled_jobs extends ModeleBoxes
 
 			$result = 0;
 			$sql = "SELECT t.rowid, t.datelastrun, t.datenextrun, t.datestart,";
-			$sql .= " t.label, t.status, t.test, t.lastresult";
+			$sql .= " t.label, t.status, t.test, t.lastresult, t.processing";
 			$sql .= " FROM " . MAIN_DB_PREFIX . "cronjob as t";
 			$sql .= " WHERE status <> ".$cronstatic::STATUS_DISABLED;
 			$sql .= " AND entity IN (0, ".$conf->entity.")";
@@ -95,6 +95,7 @@ class box_scheduled_jobs extends ModeleBoxes
 			$result = $this->db->query($sql);
 			$line = 0;
 			$nbjobsinerror = 0;
+			$nbjobsnotfinished = 0;
 			if ($result) {
 				$num = $this->db->num_rows($result);
 
@@ -109,6 +110,7 @@ class box_scheduled_jobs extends ModeleBoxes
 						}
 
 						if ($line == 0 || ($nextrun < $cronstatic->datenextrun && (empty($objp->nbrun) || empty($objp->maxrun) || $objp->nbrun < $objp->maxrun))) {
+							// Save in cronstatic the job if it is a job to run in future
 							$cronstatic->id = $objp->rowid;
 							$cronstatic->ref = $objp->rowid;
 							$cronstatic->label = $langs->trans($objp->label);
@@ -117,6 +119,7 @@ class box_scheduled_jobs extends ModeleBoxes
 							$cronstatic->datelastrun = $this->db->jdate($objp->datelastrun);
 						}
 						if ($line == 0) {
+							// Save the first line in loop that is the most recent executed job (due to the sort on datelastrun DESC)
 							$resultarray[$line] = array(
 								$langs->trans("LastExecutedScheduledJob"),
 								$cronstatic->getNomUrl(1),
@@ -127,6 +130,9 @@ class box_scheduled_jobs extends ModeleBoxes
 							$line++;
 						}
 
+						if ($objp->processing && $this->db->jdate($objp->datelastrun) < (dol_now() - 3600 * 24)) {
+							$nbjobsnotfinished++;
+						}
 						if (!empty($objp->lastresult)) {
 							$nbjobsinerror++;
 						}
@@ -168,9 +174,19 @@ class box_scheduled_jobs extends ModeleBoxes
 					'td' => 'class="tdoverflowmax300" colspan="3"',
 					'text' => $langs->trans("NumberScheduledJobError")
 				);
+				$textnoformat = '';
+				if ($nbjobsnotfinished) {
+					$textnoformat .= '<a class="inline-block paddingleft paddingright marginleftonly marginrightonly minwidth25 nounderlineimp" href="'.DOL_URL_ROOT.'/cron/list.php" title="'.$langs->trans("NumberScheduledJobNeverFinished").'"><div class="center badge badge-warning nounderlineimp"><i class="fa fa-exclamation-triangle"></i> '.$nbjobsnotfinished.'</div></a>';
+				}
+				if ($nbjobsinerror) {
+					$textnoformat .= '<a class="inline-block paddingleft paddingright marginleftonly marginrightonly minwidth25 nounderlineimp" href="'.DOL_URL_ROOT.'/cron/list.php?search_lastresult='.urlencode('<>0').'" title="'.$langs->trans("NumberScheduledJobError").'"><div class="badge badge-danger nounderlineimp"><i class="fa fa-exclamation-triangle"></i> '.$nbjobsinerror.'</div></a>';
+				}
+				if (empty($nbjobsnotfinished) && empty($nbjobsinerror)) {
+					$textnoformat .= '<a class="inline-block paddingleft paddingright marginleftonly marginrightonly minwidth25 nounderlineimp" href="'.DOL_URL_ROOT.'/cron/list.php"><div class="center badge badge-status4 nounderline">0</div></a>';
+				}
 				$this->info_box_contents[$line][] = array(
 					'td' => 'class="center"',
-					'textnoformat' => ($nbjobsinerror ? '<a href="'.DOL_URL_ROOT.'/cron/list.php?search_lastresult='.urlencode('<>0').'"><div class="badge badge-danger"><i class="fa fa-exclamation-triangle"></i> '.$nbjobsinerror.'</div></a>' : '<a href="'.DOL_URL_ROOT.'/cron/list.php"><div class="center badge-status4">0</div></a>')
+					'textnoformat' => $textnoformat
 				);
 			} else {
 				$this->info_box_contents[0][0] = array(
diff --git a/htdocs/core/lib/admin.lib.php b/htdocs/core/lib/admin.lib.php
index 53193db176c..0ea8b49d04a 100644
--- a/htdocs/core/lib/admin.lib.php
+++ b/htdocs/core/lib/admin.lib.php
@@ -151,18 +151,18 @@ function versiondolibarrarray()
  *  Install process however does not use it.
  *  Note that Sql files must have all comments at start of line. Also this function take ';' as the char to detect end of sql request
  *
- *	@param		string	$sqlfile			Full path to sql file
- * 	@param		int		$silent				1=Do not output anything, 0=Output line for update page
- * 	@param		int		$entity				Entity targeted for multicompany module
- *	@param		int		$usesavepoint		1=Run a savepoint before each request and a rollback to savepoint if error (this allow to have some request with errors inside global transactions).
- *	@param		string	$handler			Handler targeted for menu (replace __HANDLER__ with this value)
- *	@param 		string	$okerror			Family of errors we accept ('default', 'none')
- *  @param		int		$linelengthlimit	Limit for length of each line (Use 0 if unknown, may be faster if defined)
- *  @param		int		$nocommentremoval	Do no try to remove comments (in such a case, we consider that each line is a request, so use also $linelengthlimit=0)
+ *	@param		string	$sqlfile					Full path to sql file
+ * 	@param		int		$silent						1=Do not output anything, 0=Output line for update page
+ * 	@param		int		$entity						Entity targeted for multicompany module
+ *	@param		int		$usesavepoint				1=Run a savepoint before each request and a rollback to savepoint if error (this allow to have some request with errors inside global transactions).
+ *	@param		string	$handler					Handler targeted for menu (replace __HANDLER__ with this value)
+ *	@param 		string	$okerror					Family of errors we accept ('default', 'none')
+ *  @param		int		$linelengthlimit			Limit for length of each line (Use 0 if unknown, may be faster if defined)
+ *  @param		int		$nocommentremoval			Do no try to remove comments (in such a case, we consider that each line is a request, so use also $linelengthlimit=0)
  *  @param		int		$offsetforchartofaccount	Offset to use to load chart of account table to update sql on the fly to add offset to rowid and account_parent value
- *  @param		int		$colspan			2=Add a colspan=2 on td
+ *  @param		int		$colspan					2=Add a colspan=2 on td
  *  @param		int		$onlysqltoimportwebsite		Only sql resquests used to import a website template is allowed
- * 	@return		int							<=0 if KO, >0 if OK
+ * 	@return		int									<=0 if KO, >0 if OK
  */
 function run_sql($sqlfile, $silent = 1, $entity = '', $usesavepoint = 1, $handler = '', $okerror = 'default', $linelengthlimit = 32768, $nocommentremoval = 0, $offsetforchartofaccount = 0, $colspan = 0, $onlysqltoimportwebsite = 0)
 {
@@ -523,7 +523,11 @@ function run_sql($sqlfile, $silent = 1, $entity = '', $usesavepoint = 1, $handle
 			});
 		});
 		</script>';
-		print ' - <a class="trforrunsqlshowhide'.$keyforsql.'" href="#">'.$langs->trans("ShowHideDetails").'</a>';
+		if (count($arraysql)) {
+			print ' - <a class="trforrunsqlshowhide'.$keyforsql.'" href="#" title="'.($langs->trans("ShowHideTheNRequests", count($arraysql))).'">'.$langs->trans("ShowHideDetails").'</a>';
+		} else {
+			print ' - <span class="opacitymedium">'.$langs->trans("ScriptIsEmpty").'</span>';
+		}
 		//}
 
 		print '</td></tr>'."\n";
diff --git a/htdocs/cron/list.php b/htdocs/cron/list.php
index 2732e41dc14..41082fa79cd 100644
--- a/htdocs/cron/list.php
+++ b/htdocs/cron/list.php
@@ -64,6 +64,7 @@ $search_status = (GETPOSTISSET('search_status') ?GETPOST('search_status', 'int')
 $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");
 $securitykey = GETPOST('securitykey', 'alpha');
 
 $outputdir = $conf->cron->dir_output;
@@ -277,6 +278,9 @@ if ($search_status >= 0 && $search_status < 2 && $search_status != '') {
 if ($search_lastresult != '') {
 	$sql .= natural_search("t.lastresult", $search_lastresult, 1);
 }
+if (GETPOSTISSET('search_processing')) {
+	$sql .= " AND t.processing = ".((int) $search_processing);
+}
 //Manage filter
 if (is_array($filter) && count($filter) > 0) {
 	foreach ($filter as $key => $value) {
diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index cc3e1252b31..cbec6cfc5ea 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -2307,4 +2307,6 @@ MAIN_MAIL_SMTPS_AUTH_TYPE=Authentification method
 UsePassword=Use a password
 UseOauth=Use a OAUTH token
 Images=Images
-MaxNumberOfImagesInGetPost=Max number of images allowed in a HTML field submitted in a form
\ No newline at end of file
+MaxNumberOfImagesInGetPost=Max number of images allowed in a HTML field submitted in a form
+ScriptIsEmpty=The script is empty
+ShowHideTheNRequests=Show/hide the %s SQL request(s)
\ No newline at end of file
diff --git a/htdocs/langs/en_US/cron.lang b/htdocs/langs/en_US/cron.lang
index d5f784248be..d9bdd2691eb 100644
--- a/htdocs/langs/en_US/cron.lang
+++ b/htdocs/langs/en_US/cron.lang
@@ -93,3 +93,4 @@ JobXMustBeEnabled=Job %s must be enabled
 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
diff --git a/htdocs/theme/eldy/global.inc.php b/htdocs/theme/eldy/global.inc.php
index 51599816c37..dcff3c4b7a1 100644
--- a/htdocs/theme/eldy/global.inc.php
+++ b/htdocs/theme/eldy/global.inc.php
@@ -821,6 +821,9 @@ textarea.centpercent {
 .nounderline {
 	text-decoration: none;
 }
+.nounderlineimp {
+	text-decoration: none !important;
+}
 .nopadding {
 	padding: 0;
 }
@@ -1532,6 +1535,7 @@ table[summary="list_of_modules"] .fa-cog {
 .clearboth  { clear:both; }
 
 .hideobject { display: none; }
+.minwidth25  { min-width: 25px; }
 .minwidth50  { min-width: 50px; }
 .minwidth75  { min-width: 75px; }
 /* rule for not too small screen only */
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index db65e797f95..1eb0fa7d71f 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -973,6 +973,9 @@ textarea.centpercent {
 .nounderline {
 	text-decoration: none;
 }
+.nounderlineimp {
+	text-decoration: none !important;
+}
 .nopadding {
 	padding: 0;
 }
@@ -1623,6 +1626,7 @@ tr.nobottom td {
 
 .clearboth  { clear:both; }
 .hideobject { display: none; }
+.minwidth25  { min-width: 25px; }
 .minwidth50  { min-width: 50px; }
 .minwidth75  { min-width: 75px; }
 /* rule for not too small screen only */

From aff9a423abfef3c223ba236417ba155fababb031 Mon Sep 17 00:00:00 2001
From: Gauthier PC portable 024 <gauthier.verdol@atm-consulting.fr>
Date: Mon, 5 Sep 2022 12:28:59 +0200
Subject: [PATCH 687/974] FIX : fk_expedition in $line can be usefull for
 triggers

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

diff --git a/htdocs/expedition/card.php b/htdocs/expedition/card.php
index e8bfb0249b1..42214d1165e 100644
--- a/htdocs/expedition/card.php
+++ b/htdocs/expedition/card.php
@@ -581,6 +581,7 @@ if (empty($reshook)) {
 		for ($i = 0; $i < $num_prod; $i++) {
 			if ($lines[$i]->id == $line_id) {		// we have found line to update
 				$line = new ExpeditionLigne($db);
+				$line->fk_expedition = $object->id;
 
 				// Extrafields Lines
 				$line->array_options = $extrafields->getOptionalsFromPost($object->table_element_line);

From 7344b1946a35a35e7b0eb3700f0ef976a07ccad0 Mon Sep 17 00:00:00 2001
From: Radarjr2002 <112626442+Radarjr2002@users.noreply.github.com>
Date: Mon, 5 Sep 2022 13:40:39 +0200
Subject: [PATCH 688/974] Update card_presend.tpl.php

TODO Get also the main_lastdoc field of $object
---
 htdocs/core/tpl/card_presend.tpl.php | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/htdocs/core/tpl/card_presend.tpl.php b/htdocs/core/tpl/card_presend.tpl.php
index 596feae69d1..18668e7fae2 100644
--- a/htdocs/core/tpl/card_presend.tpl.php
+++ b/htdocs/core/tpl/card_presend.tpl.php
@@ -43,14 +43,18 @@ if ($action == 'presend') {
 
 	$ref = dol_sanitizeFileName($object->ref);
 	if (!in_array($object->element, array('user', 'member'))) {
-		// TODO get also the main_lastdoc field of $object. If not found, try to guess with following code
-
-		include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
-		// Special case
-		if ($object->element == 'invoice_supplier') {
-			$fileparams = dol_most_recent_file($diroutput.'/'.get_exdir($object->id, 2, 0, 0, $object, $object->element).$ref, preg_quote($ref, '/').'([^\-])+');
-		} else {
-			$fileparams = dol_most_recent_file($diroutput.'/'.$ref, preg_quote($ref, '/').'[^\-]+');
+		//$fileparams['fullname'] can be filled from the card
+		//Get also the main_lastdoc field of $object. If not found, try to guess with following code
+	    if(!empty($object->last_main_doc) && is_readable(DOL_DATA_ROOT.'/'.$object->last_main_doc) && is_file ( DOL_DATA_ROOT.'/'.$object->last_main_doc )){
+	        $fileparams['fullname'] = DOL_DATA_ROOT.'/'.$object->last_main_doc;
+	    } else {
+			include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+			// Special case
+			if ($object->element == 'invoice_supplier') {
+				$fileparams = dol_most_recent_file($diroutput.'/'.get_exdir($object->id, 2, 0, 0, $object, $object->element).$ref, preg_quote($ref, '/').'([^\-])+');
+			} else {
+				$fileparams = dol_most_recent_file($diroutput.'/'.$ref, preg_quote($ref, '/').'[^\-]+');
+			}
 		}
 
 		$file = $fileparams['fullname'];

From c2a7741607bed10d2e9995b5c287a535d2b71c20 Mon Sep 17 00:00:00 2001
From: stickler-ci <support@stickler-ci.com>
Date: Mon, 5 Sep 2022 11:50:10 +0000
Subject: [PATCH 689/974] Fixing style errors.

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

diff --git a/htdocs/core/tpl/card_presend.tpl.php b/htdocs/core/tpl/card_presend.tpl.php
index 18668e7fae2..826a8e0a12a 100644
--- a/htdocs/core/tpl/card_presend.tpl.php
+++ b/htdocs/core/tpl/card_presend.tpl.php
@@ -45,9 +45,9 @@ if ($action == 'presend') {
 	if (!in_array($object->element, array('user', 'member'))) {
 		//$fileparams['fullname'] can be filled from the card
 		//Get also the main_lastdoc field of $object. If not found, try to guess with following code
-	    if(!empty($object->last_main_doc) && is_readable(DOL_DATA_ROOT.'/'.$object->last_main_doc) && is_file ( DOL_DATA_ROOT.'/'.$object->last_main_doc )){
-	        $fileparams['fullname'] = DOL_DATA_ROOT.'/'.$object->last_main_doc;
-	    } else {
+		if (!empty($object->last_main_doc) && is_readable(DOL_DATA_ROOT.'/'.$object->last_main_doc) && is_file(DOL_DATA_ROOT.'/'.$object->last_main_doc)) {
+			$fileparams['fullname'] = DOL_DATA_ROOT.'/'.$object->last_main_doc;
+		} else {
 			include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 			// Special case
 			if ($object->element == 'invoice_supplier') {

From 3e1e37211b90d5b4645ddf919944b4b4b6f0f866 Mon Sep 17 00:00:00 2001
From: ksar <35605507+ksar-ksar@users.noreply.github.com>
Date: Mon, 5 Sep 2022 15:48:40 +0200
Subject: [PATCH 690/974] Update mod_codeclient_elephant.php

---
 .../societe/mod_codeclient_elephant.php       | 22 ++++++++++++++-----
 1 file changed, 17 insertions(+), 5 deletions(-)

diff --git a/htdocs/core/modules/societe/mod_codeclient_elephant.php b/htdocs/core/modules/societe/mod_codeclient_elephant.php
index 6079120a305..4186905f9f6 100644
--- a/htdocs/core/modules/societe/mod_codeclient_elephant.php
+++ b/htdocs/core/modules/societe/mod_codeclient_elephant.php
@@ -161,31 +161,39 @@ class mod_codeclient_elephant extends ModeleThirdPartyCode
 	 */
 	public function getExample($langs, $objsoc = 0, $type = -1)
 	{
+		$error = 0;
 		$examplecust = '';
 		$examplesup = '';
 		$errmsg = array(
 			"ErrorBadMask",
 			"ErrorCantUseRazIfNoYearInMask",
 			"ErrorCantUseRazInStartedYearIfNoYearMonthInMask",
+			"ErrorCounterMustHaveMoreThan3Digits",
+			"ErrorBadMaskBadRazMonth",
+			"ErrorCantUseRazWithYearOnOneDigit",			
 		);
 		if ($type != 1) {
 			$examplecust = $this->getNextValue($objsoc, 0);
 			if (!$examplecust) {
-				$examplecust = $langs->trans('NotConfigured');
+				$examplecust = '<div class="error">'.$langs->trans('NotConfigured').'</div>';
+				$error = 1;
 			}
 			if (in_array($examplecust, $errmsg)) {
 				$langs->load("errors");
-				$examplecust = $langs->trans($examplecust);
+				$examplecust = '<div class="error">'.$langs->trans($examplecust).'</div>';
+				$error = 1;
 			}
 		}
 		if ($type != 0) {
 			$examplesup = $this->getNextValue($objsoc, 1);
 			if (!$examplesup) {
-				$examplesup = $langs->trans('NotConfigured');
+				$examplesup = '<div class="error">'.$langs->trans('NotConfigured').'</div>';
+				$error = 1;
 			}
 			if (in_array($examplesup, $errmsg)) {
 				$langs->load("errors");
-				$examplesup = $langs->trans($examplesup);
+				$examplesup = '<div class="error">'.$langs->trans($examplesup).'</div>';
+				$error = 1;
 			}
 		}
 
@@ -194,7 +202,11 @@ class mod_codeclient_elephant extends ModeleThirdPartyCode
 		} elseif ($type == 1) {
 			return $examplesup;
 		} else {
-			return $examplecust.'<br>'.$examplesup;
+			if ($error == 1) {
+				return $examplecust.' '.$examplesup;
+			}else{
+				return $examplecust.'<br>'.$examplesup;
+			}
 		}
 	}
 

From 46dab68dd0bf9d276defd33ecff5376b475625af Mon Sep 17 00:00:00 2001
From: stickler-ci <support@stickler-ci.com>
Date: Mon, 5 Sep 2022 13:56:41 +0000
Subject: [PATCH 691/974] Fixing style errors.

---
 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 4186905f9f6..e779504edd6 100644
--- a/htdocs/core/modules/societe/mod_codeclient_elephant.php
+++ b/htdocs/core/modules/societe/mod_codeclient_elephant.php
@@ -170,7 +170,7 @@ class mod_codeclient_elephant extends ModeleThirdPartyCode
 			"ErrorCantUseRazInStartedYearIfNoYearMonthInMask",
 			"ErrorCounterMustHaveMoreThan3Digits",
 			"ErrorBadMaskBadRazMonth",
-			"ErrorCantUseRazWithYearOnOneDigit",			
+			"ErrorCantUseRazWithYearOnOneDigit",
 		);
 		if ($type != 1) {
 			$examplecust = $this->getNextValue($objsoc, 0);
@@ -204,7 +204,7 @@ class mod_codeclient_elephant extends ModeleThirdPartyCode
 		} else {
 			if ($error == 1) {
 				return $examplecust.' '.$examplesup;
-			}else{
+			} else {
 				return $examplecust.'<br>'.$examplesup;
 			}
 		}

From 4262d666cab9708e1c45588ceebb3ac2074fcfd8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?This=20Charl=C3=A8ne?=
 <1179011+defrance@users.noreply.github.com>
Date: Mon, 5 Sep 2022 16:15:13 +0200
Subject: [PATCH 692/974] PHP V8 warning

and $objectidnext = $object->getIdReplacingInvoice(); not present
---
 htdocs/fourn/facture/card.php | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/htdocs/fourn/facture/card.php b/htdocs/fourn/facture/card.php
index c2fc4e8511a..b928cc5bdf9 100644
--- a/htdocs/fourn/facture/card.php
+++ b/htdocs/fourn/facture/card.php
@@ -2642,6 +2642,8 @@ if ($action == 'create') {
 		/*
 		 *	View card
 		 */
+		$objectidnext = $object->getIdReplacingInvoice();
+		
 		$head = facturefourn_prepare_head($object);
 		$titre = $langs->trans('SupplierInvoice');
 
@@ -2934,7 +2936,7 @@ if ($action == 'create') {
 			}
 			print ' ('.$langs->transnoentities("InvoiceHasAvoir") . (count($invoicecredits) ? ' ' : '') . implode(',', $invoicecredits) . ')';
 		}
-		if (isset($facidnext) && $facidnext > 0) {
+		if (isset($objectidnext) && $objectidnext > 0) {
 			$facthatreplace = new FactureFournisseur($db);
 			$facthatreplace->fetch($facidnext);
 			print ' ('.$langs->transnoentities("ReplacedByInvoice", $facthatreplace->getNomUrl(1)).')';
@@ -3266,7 +3268,7 @@ if ($action == 'create') {
 		}
 
 		$sql = 'SELECT p.datep as dp, p.ref, p.num_paiement as num_payment, p.rowid, p.fk_bank,';
-		$sql .= ' c.id as paiement_type,';
+		$sql .= ' c.id as paiement_type, c.code as payment_code,';
 		$sql .= ' pf.amount,';
 		$sql .= ' ba.rowid as baid, ba.ref as baref, ba.label, ba.number as banumber, ba.account_number, ba.fk_accountancy_journal';
 		$sql .= ' FROM '.MAIN_DB_PREFIX.'paiementfourn as p';
@@ -3303,7 +3305,7 @@ if ($action == 'create') {
 					$paymentstatic->datepaye = $db->jdate($objp->dp);
 					$paymentstatic->ref = ($objp->ref ? $objp->ref : $objp->rowid);
 					$paymentstatic->num_payment = $objp->num_payment;
-					$paymentstatic->payment_code = $objp->payment_code;
+					$paymentstatic->paiementcode = $objp->payment_code;
 
 					print '<tr class="oddeven">';
 					print '<td>';
@@ -3648,7 +3650,7 @@ if ($action == 'create') {
 					|| ($object->type == FactureFournisseur::TYPE_CREDIT_NOTE && empty($discount->id))
 					|| ($object->type == FactureFournisseur::TYPE_DEPOSIT && empty($discount->id)))
 					&& ($object->statut == FactureFournisseur::STATUS_CLOSED || $object->statut == FactureFournisseur::STATUS_ABANDONED)) {				// A paid invoice (partially or completely)
-					if (!$facidnext && $object->close_code != 'replaced' && $usercancreate) {	// Not replaced by another invoice
+					if (!$objectidnext && $object->close_code != 'replaced' && $usercancreate) {	// Not replaced by another invoice
 						print '<a class="butAction'.($conf->use_javascript_ajax ? ' reposition' : '').'" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&action=reopen&token='.newToken().'">'.$langs->trans('ReOpen').'</a>';
 					} else {
 						if ($usercancreate) {

From e1a1ce55517ce522e1749d76ce5764543ea3b829 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?This=20Charl=C3=A8ne?=
 <1179011+defrance@users.noreply.github.com>
Date: Mon, 5 Sep 2022 17:31:30 +0200
Subject: [PATCH 693/974] php V8 warning

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

diff --git a/htdocs/fourn/facture/note.php b/htdocs/fourn/facture/note.php
index 682d92b4515..eebd40e5b95 100644
--- a/htdocs/fourn/facture/note.php
+++ b/htdocs/fourn/facture/note.php
@@ -179,11 +179,13 @@ if ($object->id > 0) {
 		}
 		print ' ('.$langs->transnoentities("InvoiceHasAvoir") . implode(',', $invoicecredits) . ')';
 	}
+	/*
 	if ($facidnext > 0) {
 		$facthatreplace = new FactureFournisseur($db);
 		$facthatreplace->fetch($facidnext);
 		print ' ('.$langs->transnoentities("ReplacedByInvoice", $facthatreplace->getNomUrl(1)).')';
 	}
+	*/
 	print '</td></tr>';
 
 	// Label
@@ -197,13 +199,13 @@ if ($object->id > 0) {
 
 	// Amount Local Taxes
 	//TODO: Place into a function to control showing by country or study better option
-	if ($societe->localtax1_assuj == "1") { //Localtax1
-		print '<tr><td>'.$langs->transcountry("AmountLT1", $societe->country_code).'</td>';
+	if ($mysoc->localtax1_assuj == "1") { //Localtax1
+		print '<tr><td>'.$langs->transcountry("AmountLT1", $mysoc->country_code).'</td>';
 		print '<td>'.price($object->total_localtax1, 1, $langs, 0, -1, -1, $conf->currency).'</td>';
 		print '</tr>';
 	}
-	if ($societe->localtax2_assuj == "1") { //Localtax2
-		print '<tr><td>'.$langs->transcountry("AmountLT2", $societe->country_code).'</td>';
+	if ($mysoc->localtax2_assuj == "1") { //Localtax2
+		print '<tr><td>'.$langs->transcountry("AmountLT2", $mysoc->country_code).'</td>';
 		print '<td>'.price($object->total_localtax2, 1, $langs, 0, -1, -1, $conf->currency).'</td>';
 		print '</tr>';
 	}

From c6d03b694cdd986cd9b354f460fada1e1bc19fa3 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 5 Sep 2022 18:31:48 +0200
Subject: [PATCH 694/974] Fix css for ip exrafield type

---
 htdocs/core/class/extrafields.class.php | 25 ++++++++-----------------
 1 file changed, 8 insertions(+), 17 deletions(-)

diff --git a/htdocs/core/class/extrafields.class.php b/htdocs/core/class/extrafields.class.php
index 004a0cbe5e8..a3925c9160a 100644
--- a/htdocs/core/class/extrafields.class.php
+++ b/htdocs/core/class/extrafields.class.php
@@ -1881,36 +1881,27 @@ class ExtraFields
 	{
 		global $conf, $langs;
 
+		$type = 'varchar';
 		if (!empty($extrafieldsobjectkey)) {
 			$type = $this->attributes[$extrafieldsobjectkey]['type'][$key];
-		} else {
-			$type = $this->attribute_type[$key];
 		}
 
 		$cssstring = '';
 
-		if ($type == 'date') {
+		if (in_array($type, array('date', 'datetime'))) {
 			$cssstring = "center";
-		} elseif ($type == 'datetime') {
-			$cssstring = "center";
-		} elseif ($type == 'int') {
+		} elseif (in_array($type, array('int', 'price', 'double'))) {
 			$cssstring = "right";
-		} elseif ($type == 'price') {
-			$cssstring = "right";
-		} elseif ($type == 'double') {
-			$cssstring = "right";
-		} elseif ($type == 'boolean') {
+		} elseif (in_array($type, array('boolean', 'radio', 'checkbox', 'ip'))) {
 			$cssstring = "center";
-		} elseif ($type == 'radio') {
-			$cssstring = "center";
-		} elseif ($type == 'checkbox') {
-			$cssstring = "center";
-		} elseif ($type == 'price') {
-			$cssstring = "right";
 		}
 
 		if (!empty($this->attributes[$extrafieldsobjectkey]['csslist'][$key])) {
 			$cssstring .= ($cssstring ? ' ' : '').$this->attributes[$extrafieldsobjectkey]['csslist'][$key];
+		} else {
+			if (in_array($type, array('ip'))) {
+				$cssstring .= ($cssstring ? ' ' : '').'tdoverflowmax150';
+			}
 		}
 
 		return $cssstring;

From f61ef2948889c07d5b58d56331a5932f5db9ea85 Mon Sep 17 00:00:00 2001
From: daraelmin <daraelmin@gmail.com>
Date: Tue, 6 Sep 2022 00:00:11 +0200
Subject: [PATCH 695/974] FIX #21416 - Filter tag no-categorie in members

---
 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 441ce85ec86..607ef8117f6 100644
--- a/htdocs/adherents/list.php
+++ b/htdocs/adherents/list.php
@@ -336,7 +336,7 @@ $sql .= " FROM ".MAIN_DB_PREFIX."adherent as d";
 if (!empty($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label'])) {
 	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX.$object->table_element."_extrafields as ef on (d.rowid = ef.fk_object)";
 }
-if ((!empty($search_categ) && $search_categ > 0) || !empty($catid)) {
+if ((!empty($search_categ) && ($search_categ > 0 || $search_categ == -2)) || !empty($catid)) {
 	// We need this table joined to the select in order to filter by categ
 	$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX."categorie_member as cm ON d.rowid = cm.fk_member";
 }

From c28966864b7b5b74bf1f7c3a7121f6c659317d20 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 6 Sep 2022 01:42:48 +0200
Subject: [PATCH 696/974] FIX data integrity for llx_delivery table

---
 htdocs/delivery/card.php                  | 7 ++++---
 htdocs/expedition/card.php                | 6 ++++++
 htdocs/install/mysql/migration/repair.sql | 2 ++
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/htdocs/delivery/card.php b/htdocs/delivery/card.php
index 00975946f6b..8082c654a55 100644
--- a/htdocs/delivery/card.php
+++ b/htdocs/delivery/card.php
@@ -256,9 +256,10 @@ llxHeader('', $title, 'Livraison');
 $form = new Form($db);
 $formfile = new FormFile($db);
 
-if ($action == 'create') {    // Create. Seems to no be used
-} else // View
-{
+if ($action == 'create') {
+	// Create. Seems to no be used
+} else {
+	// View
 	if ($object->id > 0) {
 		// Origin of a 'livraison' (delivery receipt) is ALWAYS 'expedition' (shipment).
 		// However, origin of shipment in future may differs (commande, proposal, ...)
diff --git a/htdocs/expedition/card.php b/htdocs/expedition/card.php
index d16885faa0f..29336772269 100644
--- a/htdocs/expedition/card.php
+++ b/htdocs/expedition/card.php
@@ -405,11 +405,17 @@ if (empty($reshook)) {
 		}
 	} elseif ($action == 'create_delivery' && $conf->delivery_note->enabled && $user->rights->expedition->delivery->creer) {
 		// Build a receiving receipt
+		$db->begin();
+
 		$result = $object->create_delivery($user);
 		if ($result > 0) {
+			$db->commit();
+
 			header("Location: ".DOL_URL_ROOT.'/delivery/card.php?action=create_delivery&id='.$result);
 			exit;
 		} else {
+			$db->rollback();
+
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
 	} elseif ($action == 'confirm_valid' && $confirm == 'yes' &&
diff --git a/htdocs/install/mysql/migration/repair.sql b/htdocs/install/mysql/migration/repair.sql
index 4add688b880..86b3da418a0 100644
--- a/htdocs/install/mysql/migration/repair.sql
+++ b/htdocs/install/mysql/migration/repair.sql
@@ -194,11 +194,13 @@ delete from llx_delivery    where rowid not in (select fk_target from llx_elemen
 
 -- Fix delete element_element orphelins (right side)
 delete from llx_element_element where targettype='shipping' and fk_target not in (select rowid from llx_expedition);
+delete from llx_element_element where targettype='delivery' and fk_target not in (select rowid from llx_delivery);
 delete from llx_element_element where targettype='propal' and fk_target not in (select rowid from llx_propal);
 delete from llx_element_element where targettype='facture' and fk_target not in (select rowid from llx_facture);
 delete from llx_element_element where targettype='commande' and fk_target not in (select rowid from llx_commande);
 -- Fix delete element_element orphelins (left side)
 delete from llx_element_element where sourcetype='shipping' and fk_source not in (select rowid from llx_expedition);
+delete from llx_element_element where sourcetype='delivery' and fk_source not in (select rowid from llx_delivery);
 delete from llx_element_element where sourcetype='propal' and fk_source not in (select rowid from llx_propal);
 delete from llx_element_element where sourcetype='facture' and fk_source not in (select rowid from llx_facture);
 delete from llx_element_element where sourcetype='commande' and fk_source not in (select rowid from llx_commande);

From c3afd7ab4f950aaafca33e00e7b9420a3935be71 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 6 Sep 2022 01:44:52 +0200
Subject: [PATCH 697/974] Menu position

---
 htdocs/core/modules/modCron.class.php           | 2 +-
 htdocs/core/modules/modEmailCollector.class.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/core/modules/modCron.class.php b/htdocs/core/modules/modCron.class.php
index 00d73dd7d14..3a84b28eef3 100644
--- a/htdocs/core/modules/modCron.class.php
+++ b/htdocs/core/modules/modCron.class.php
@@ -141,7 +141,7 @@ class modCron extends DolibarrModules
 								'titre'=>'CronList',
 								'url'=>'/cron/list.php?leftmenu=admintools',
 								'langs'=>'cron', // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
-								'position'=>200,
+								'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
 								'target'=>'',
diff --git a/htdocs/core/modules/modEmailCollector.class.php b/htdocs/core/modules/modEmailCollector.class.php
index 145dd966044..ef823856a57 100644
--- a/htdocs/core/modules/modEmailCollector.class.php
+++ b/htdocs/core/modules/modEmailCollector.class.php
@@ -175,7 +175,7 @@ class modEmailCollector extends DolibarrModules
 			'titre'=>'EmailCollectors',
 			'url'=>'/admin/emailcollector_list.php?leftmenu=admintools',
 			'langs'=>'admin', // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
-			'position'=>201,
+			'position'=>400,
 			'enabled'=>'$conf->emailcollector->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->admin', // Use 'perms'=>'$user->rights->mymodule->level1->level2' if you want your menu with a permission rules
 			'target'=>'',

From faee162b916a3f83c875b48eb028f2447e797965 Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Tue, 6 Sep 2022 04:48:26 +0200
Subject: [PATCH 698/974] FIX Travis - Complete WIP #22059

---
 htdocs/core/modules/modUser.class.php | 10 +++++-----
 htdocs/user/list.php                  |  3 ++-
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/htdocs/core/modules/modUser.class.php b/htdocs/core/modules/modUser.class.php
index 719c90c6dab..dc0da3e0ac3 100644
--- a/htdocs/core/modules/modUser.class.php
+++ b/htdocs/core/modules/modUser.class.php
@@ -225,7 +225,7 @@ class modUser extends DolibarrModules
 			'u.accountancy_code'=>"UserAccountancyCode",
 			'u.address'=>"Address", 'u.zip'=>"Zip", 'u.town'=>"Town",
 			'u.office_phone'=>'Phone', 'u.user_mobile'=>"Mobile", 'u.office_fax'=>'Fax',
-			'u.email'=>"Email", 'u.note'=>"Note", 'u.signature'=>'Signature',
+			'u.email'=>"Email", 'u.note_public'=>"NotePublic", 'u.note_private'=>"NotePrivate", 'u.signature'=>'Signature',
 			'u.fk_user'=>'HierarchicalResponsible', 'u.thm'=>'THM', 'u.tjm'=>'TJM', 'u.weeklyhours'=>'WeeklyHours',
 			'u.dateemployment'=>'DateEmploymentStart', 'u.dateemploymentend'=>'DateEmploymentEnd', 'u.salary'=>'Salary', 'u.color'=>'Color', 'u.api_key'=>'ApiKey',
 			'u.birth'=>'DateOfBirth',
@@ -242,7 +242,7 @@ class modUser extends DolibarrModules
 			'u.accountancy_code'=>'Text',
 			'u.address'=>"Text", 'u.zip'=>"Text", 'u.town'=>"Text",
 			'u.office_phone'=>'Text', 'u.user_mobile'=>'Text', 'u.office_fax'=>'Text',
-			'u.email'=>'Text', 'u.datec'=>"Date", 'u.tms'=>"Date", 'u.admin'=>"Boolean", 'u.statut'=>'Status', 'u.note'=>"Text", 'u.signature'=>"Text", 'u.datelastlogin'=>'Date',
+			'u.email'=>'Text', 'u.datec'=>"Date", 'u.tms'=>"Date", 'u.admin'=>"Boolean", 'u.statut'=>'Status', 'u.note_public'=>"Text", 'u.note_private'=>"Text", 'u.signature'=>"Text", 'u.datelastlogin'=>'Date',
 			'u.fk_user'=>"FormSelect:select_dolusers",
 			'u.birth'=>'Date',
 			'u.datepreviouslogin'=>'Date',
@@ -261,7 +261,7 @@ class modUser extends DolibarrModules
 			'u.accountancy_code'=>'user',
 			'u.address'=>"user", 'u.zip'=>"user", 'u.town'=>"user",
 			'u.office_phone'=>'user', 'u.user_mobile'=>'user', 'u.office_fax'=>'user',
-			'u.email'=>'user', 'u.note'=>"user", 'u.signature'=>'user',
+			'u.email'=>'user', 'u.note_public'=>"user", 'u.note_private'=>"user", 'u.signature'=>'user',
 			'u.fk_user'=>'user', 'u.thm'=>'user', 'u.tjm'=>'user', 'u.weeklyhours'=>'user',
 			'u.dateemployment'=>'user', 'u.dateemploymentend'=>'user', 'u.salary'=>'user', 'u.color'=>'user', 'u.api_key'=>'user',
 			'u.birth'=>'user',
@@ -303,7 +303,7 @@ class modUser extends DolibarrModules
 			'u.pass_crypted'=>"Password", 'u.admin'=>"Administrator", 'u.fk_soc'=>"Company*", 'u.address'=>"Address", 'u.zip'=>"Zip", 'u.town'=>"Town",
 			'u.fk_state'=>"StateId", 'u.fk_country'=>"CountryCode",
 			'u.office_phone'=>"Phone", 'u.user_mobile'=>"Mobile", 'u.office_fax'=>"Fax",
-			'u.email'=>"Email", 'u.note'=>"Note", 'u.signature'=>'Signature',
+			'u.email'=>"Email", 'u.note_public'=>"NotePublic", 'u.note_private'=>"NotePrivate", 'u.signature'=>'Signature',
 			'u.fk_user'=>'HierarchicalResponsible', 'u.thm'=>'THM', 'u.tjm'=>'TJM', 'u.weeklyhours'=>'WeeklyHours',
 			'u.dateemployment'=>'DateEmploymentStart', 'u.dateemploymentend'=>'DateEmploymentEnd', 'u.salary'=>'Salary', 'u.color'=>'Color', 'u.api_key'=>'ApiKey',
 			'u.birth'=>'DateOfBirth',
@@ -339,7 +339,7 @@ class modUser extends DolibarrModules
 			'u.pass_crypted'=>'Encrypted password',
 			'u.fk_soc'=>'0 (internal user) or company name (external user)', 'u.datec'=>dol_print_date(dol_now(), '%Y-%m-%d'), 'u.address'=>"61 jump street",
 			'u.zip'=>"123456", 'u.town'=>"Big town", 'u.fk_country'=>'US, FR, DE...', 'u.office_phone'=>"0101010101", 'u.office_fax'=>"0101010102",
-			'u.email'=>"test@mycompany.com", 'u.salary'=>"10000", 'u.note'=>"This is an example of note for record", 'u.datec'=>"2015-01-01 or 2015-01-01 12:30:00",
+			'u.email'=>"test@mycompany.com", 'u.salary'=>"10000", 'u.note_public'=>"This is an example of public note for record", 'u.note_private'=>"This is an example of private note for record", 'u.datec'=>"2015-01-01 or 2015-01-01 12:30:00",
 			'u.statut'=>"0 (closed) or 1 (active)",
 		);
 		$this->import_updatekeys_array[$r] = array('u.lastname'=>'Lastname', 'u.firstname'=>'Firstname', 'u.login'=>'Login');
diff --git a/htdocs/user/list.php b/htdocs/user/list.php
index 858a46887ba..416e913d6c9 100644
--- a/htdocs/user/list.php
+++ b/htdocs/user/list.php
@@ -110,7 +110,8 @@ $fieldstosearchall = array(
 	'u.office_phone'=>"PhonePro",
 	'u.user_mobile'=>"PhoneMobile",
 	'u.email'=>"EMail",
-	'u.note'=>"Note",
+	'u.note_public'=>"NotePublic",
+	'u.note_private'=>"NotePrivate",
 );
 if (!empty($conf->api->enabled)) {
 	$fieldstosearchall['u.api_key'] = "ApiKey";

From 9a5927d833bf17fdac2a9bbf982d815ba8c50c13 Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Tue, 6 Sep 2022 05:30:35 +0200
Subject: [PATCH 699/974] FIX Column label

---
 htdocs/adherents/class/adherent.class.php         | 4 ++--
 htdocs/comm/propal/class/propal.class.php         | 4 ++--
 htdocs/commande/class/commande.class.php          | 4 ++--
 htdocs/compta/bank/class/account.class.php        | 2 +-
 htdocs/compta/facture/class/facture-rec.class.php | 4 ++--
 htdocs/compta/facture/class/facture.class.php     | 4 ++--
 htdocs/contrat/class/contrat.class.php            | 4 ++--
 htdocs/fourn/class/fournisseur.commande.class.php | 4 ++--
 htdocs/fourn/class/fournisseur.facture.class.php  | 4 ++--
 htdocs/societe/class/societe.class.php            | 4 ++--
 10 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/htdocs/adherents/class/adherent.class.php b/htdocs/adherents/class/adherent.class.php
index b7f2810912b..abc002b4e89 100644
--- a/htdocs/adherents/class/adherent.class.php
+++ b/htdocs/adherents/class/adherent.class.php
@@ -327,8 +327,8 @@ class Adherent extends CommonObject
 		'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),
-		'note_private' => array('type' => 'text', 'label' => 'NotePublic', 'enabled' => 1, 'visible' => 0, 'position' => 155),
-		'note_public' => array('type' => 'text', 'label' => 'NotePrivate', 'enabled' => 1, 'visible' => 0, 'position' => 160),
+		'note_private' => array('type' => 'text', 'label' => 'NotePrivate', 'enabled' => 1, 'visible' => 0, 'position' => 155),
+		'note_public' => array('type' => 'text', 'label' => 'NotePublic', 'enabled' => 1, 'visible' => 0, 'position' => 160),
 		'datevalid' => array('type' => 'datetime', 'label' => 'DateValidation', 'enabled' => 1, 'visible' => -1, 'position' => 165),
 		'datec' => 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),
diff --git a/htdocs/comm/propal/class/propal.class.php b/htdocs/comm/propal/class/propal.class.php
index 65a2e60777f..f36b8027461 100644
--- a/htdocs/comm/propal/class/propal.class.php
+++ b/htdocs/comm/propal/class/propal.class.php
@@ -310,8 +310,8 @@ class Propal extends CommonObject
 		'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),
 		'fk_mode_reglement' =>array('type'=>'integer', 'label'=>'PaymentMode', 'enabled'=>1, 'visible'=>-1, 'position'=>165),
-		'note_private' =>array('type'=>'text', 'label'=>'NotePublic', 'enabled'=>1, 'visible'=>0, 'position'=>170),
-		'note_public' =>array('type'=>'text', 'label'=>'NotePrivate', 'enabled'=>1, 'visible'=>0, 'position'=>175),
+		'note_private' =>array('type'=>'text', 'label'=>'NotePrivate', 'enabled'=>1, 'visible'=>0, 'position'=>170),
+		'note_public' =>array('type'=>'text', '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),
diff --git a/htdocs/commande/class/commande.class.php b/htdocs/commande/class/commande.class.php
index f02e74687af..54e50baa9f7 100644
--- a/htdocs/commande/class/commande.class.php
+++ b/htdocs/commande/class/commande.class.php
@@ -314,8 +314,8 @@ class Commande extends CommonOrder
 		'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'=>'text', 'label'=>'NotePublic', 'enabled'=>1, 'visible'=>0, 'position'=>150),
-		'note_public' =>array('type'=>'text', 'label'=>'NotePrivate', 'enabled'=>1, 'visible'=>0, 'position'=>155),
+		'note_private' =>array('type'=>'text', 'label'=>'NotePrivate', 'enabled'=>1, 'visible'=>0, 'position'=>150),
+		'note_public' =>array('type'=>'text', 'label'=>'NotePublic', 'enabled'=>1, 'visible'=>0, 'position'=>155),
 		'model_pdf' =>array('type'=>'varchar(255)', 'label'=>'PDFTemplate', 'enabled'=>1, 'visible'=>0, 'position'=>160),
 		//'facture' =>array('type'=>'tinyint(4)', 'label'=>'ParentInvoice', 'enabled'=>1, 'visible'=>-1, 'position'=>165),
 		'fk_account' =>array('type'=>'integer', 'label'=>'BankAccount', 'enabled'=>1, 'visible'=>-1, 'position'=>170),
diff --git a/htdocs/compta/bank/class/account.class.php b/htdocs/compta/bank/class/account.class.php
index c3628e12b7c..70f03bc21c8 100644
--- a/htdocs/compta/bank/class/account.class.php
+++ b/htdocs/compta/bank/class/account.class.php
@@ -295,7 +295,7 @@ class Account extends CommonObject
 		'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'=>'text', 'label'=>'NotePrivate', 'enabled'=>1, 'visible'=>0, 'position'=>170),
+		'note_public' =>array('type'=>'text', '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),
diff --git a/htdocs/compta/facture/class/facture-rec.class.php b/htdocs/compta/facture/class/facture-rec.class.php
index 6b9837e77bd..8306a5c9c0d 100644
--- a/htdocs/compta/facture/class/facture-rec.class.php
+++ b/htdocs/compta/facture/class/facture-rec.class.php
@@ -184,8 +184,8 @@ class FactureRec extends CommonInvoice
 		'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'=>'text', 'label'=>'NotePublic', 'enabled'=>1, 'visible'=>0, 'position'=>105),
-		'note_public' =>array('type'=>'text', 'label'=>'NotePrivate', 'enabled'=>1, 'visible'=>0, 'position'=>110),
+		'note_private' =>array('type'=>'text', 'label'=>'NotePrivate', 'enabled'=>1, 'visible'=>0, 'position'=>105),
+		'note_public' =>array('type'=>'text', 'label'=>'NotePublic', 'enabled'=>1, 'visible'=>0, 'position'=>110),
 		'modelpdf' =>array('type'=>'varchar(255)', 'label'=>'Modelpdf', 'enabled'=>1, 'visible'=>-1, 'position'=>115),
 		'date_last_gen' =>array('type'=>'varchar(7)', 'label'=>'Last gen', 'enabled'=>1, 'visible'=>-1, 'position'=>120),
 		'unit_frequency' =>array('type'=>'varchar(2)', 'label'=>'Unit frequency', 'enabled'=>1, 'visible'=>-1, 'position'=>125),
diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php
index d646da3b413..4e5f1923297 100644
--- a/htdocs/compta/facture/class/facture.class.php
+++ b/htdocs/compta/facture/class/facture.class.php
@@ -327,8 +327,8 @@ class Facture extends CommonInvoice
 		'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'=>'text', 'label'=>'NotePublic', 'enabled'=>1, 'visible'=>0, 'position'=>205),
-		'note_public' =>array('type'=>'text', 'label'=>'NotePrivate', 'enabled'=>1, 'visible'=>0, 'position'=>210),
+		'note_private' =>array('type'=>'text', 'label'=>'NotePrivate', 'enabled'=>1, 'visible'=>0, 'position'=>205),
+		'note_public' =>array('type'=>'text', '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),
diff --git a/htdocs/contrat/class/contrat.class.php b/htdocs/contrat/class/contrat.class.php
index f364e82dd68..309df80605e 100644
--- a/htdocs/contrat/class/contrat.class.php
+++ b/htdocs/contrat/class/contrat.class.php
@@ -237,8 +237,8 @@ class Contrat extends CommonObject
 		'fk_commercial_signature' =>array('type'=>'integer:User:user/class/user.class.php', 'label'=>'Fk commercial signature', 'enabled'=>1, 'visible'=>-1, 'position'=>80),
 		'fk_commercial_suivi' =>array('type'=>'integer:User:user/class/user.class.php', 'label'=>'Fk commercial suivi', 'enabled'=>1, 'visible'=>-1, 'position'=>85),
 		'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'=>'text', 'label'=>'NotePublic', 'enabled'=>1, 'visible'=>0, 'position'=>105),
-		'note_public' =>array('type'=>'text', 'label'=>'NotePrivate', 'enabled'=>1, 'visible'=>0, 'position'=>110),
+		'note_private' =>array('type'=>'text', 'label'=>'NotePrivate', 'enabled'=>1, 'visible'=>0, 'position'=>105),
+		'note_public' =>array('type'=>'text', 'label'=>'NotePublic', '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),
diff --git a/htdocs/fourn/class/fournisseur.commande.class.php b/htdocs/fourn/class/fournisseur.commande.class.php
index 5f671599c50..e78dd9dd02a 100644
--- a/htdocs/fourn/class/fournisseur.commande.class.php
+++ b/htdocs/fourn/class/fournisseur.commande.class.php
@@ -213,8 +213,8 @@ class CommandeFournisseur extends CommonOrder
 		'localtax2' =>array('type'=>'double(24,8)', 'label'=>'Localtax2', 'enabled'=>1, 'visible'=>-1, 'position'=>140, 'isameasure'=>1),
 		'total_ht' =>array('type'=>'double(24,8)', 'label'=>'TotalHT', 'enabled'=>1, 'visible'=>-1, 'position'=>145, 'isameasure'=>1),
 		'total_ttc' =>array('type'=>'double(24,8)', 'label'=>'TotalTTC', 'enabled'=>1, 'visible'=>-1, 'position'=>150, 'isameasure'=>1),
-		'note_private' =>array('type'=>'text', 'label'=>'NotePublic', 'enabled'=>1, 'visible'=>0, 'position'=>155),
-		'note_public' =>array('type'=>'text', 'label'=>'NotePrivate', 'enabled'=>1, 'visible'=>0, 'position'=>160),
+		'note_private' =>array('type'=>'text', 'label'=>'NotePrivate', 'enabled'=>1, 'visible'=>0, 'position'=>155),
+		'note_public' =>array('type'=>'text', 'label'=>'NotePublic', 'enabled'=>1, 'visible'=>0, 'position'=>160),
 		'model_pdf' =>array('type'=>'varchar(255)', 'label'=>'ModelPDF', 'enabled'=>1, 'visible'=>0, 'position'=>165),
 		'fk_input_method' =>array('type'=>'integer', 'label'=>'InputMethod', 'enabled'=>1, 'visible'=>-1, 'position'=>170),
 		'fk_cond_reglement' =>array('type'=>'integer', 'label'=>'PaymentTerm', 'enabled'=>1, 'visible'=>-1, 'position'=>175),
diff --git a/htdocs/fourn/class/fournisseur.facture.class.php b/htdocs/fourn/class/fournisseur.facture.class.php
index 66c441841d1..c4635962368 100644
--- a/htdocs/fourn/class/fournisseur.facture.class.php
+++ b/htdocs/fourn/class/fournisseur.facture.class.php
@@ -282,8 +282,8 @@ class FactureFournisseur extends CommonInvoice
 		'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'=>'text', 'label'=>'NotePublic', 'enabled'=>1, 'visible'=>0, 'position'=>170),
-		'note_public' =>array('type'=>'text', 'label'=>'NotePrivate', 'enabled'=>1, 'visible'=>0, 'position'=>175),
+		'note_private' =>array('type'=>'text', 'label'=>'NotePrivate', 'enabled'=>1, 'visible'=>0, 'position'=>170),
+		'note_public' =>array('type'=>'text', '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),
diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php
index 7c5773363c4..fe72e99e76f 100644
--- a/htdocs/societe/class/societe.class.php
+++ b/htdocs/societe/class/societe.class.php
@@ -192,8 +192,8 @@ class Societe extends CommonObject
 		'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_private' =>array('type'=>'text', 'label'=>'NotePublic', 'enabled'=>1, 'visible'=>0, 'position'=>225),
-		'note_public' =>array('type'=>'text', 'label'=>'NotePrivate', 'enabled'=>1, 'visible'=>0, 'position'=>230),
+		'note_private' =>array('type'=>'text', 'label'=>'NotePrivate', 'enabled'=>1, 'visible'=>0, 'position'=>225),
+		'note_public' =>array('type'=>'text', 'label'=>'NotePublic', 'enabled'=>1, 'visible'=>0, 'position'=>230),
 		'prefix_comm' =>array('type'=>'varchar(5)', 'label'=>'Prefix comm', 'enabled'=>'$conf->global->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),

From a13f232d2d577859ddc2df9319a815a34cbecf16 Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Tue, 6 Sep 2022 05:42:04 +0200
Subject: [PATCH 700/974] FIX #22057

---
 htdocs/compta/resultat/clientfourn.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/htdocs/compta/resultat/clientfourn.php b/htdocs/compta/resultat/clientfourn.php
index ed4dac6c3f3..3658fdbda6b 100644
--- a/htdocs/compta/resultat/clientfourn.php
+++ b/htdocs/compta/resultat/clientfourn.php
@@ -38,6 +38,7 @@ require_once DOL_DOCUMENT_ROOT.'/user/class/user.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/report.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/tax.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/accountancy/class/accountingaccount.class.php';
 require_once DOL_DOCUMENT_ROOT.'/accountancy/class/accountancycategory.class.php';
 
 // Load translation files required by the page

From 2c58aeafed1b21632a9155f5eba0ed2c23a570e1 Mon Sep 17 00:00:00 2001
From: Anthony Berton <bertonanthony@gmail.com>
Date: Tue, 6 Sep 2022 08:31:05 +0200
Subject: [PATCH 701/974] FIX - php V8 html form documents

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

diff --git a/htdocs/core/class/html.formfile.class.php b/htdocs/core/class/html.formfile.class.php
index 441ddb60255..05489c3dc50 100644
--- a/htdocs/core/class/html.formfile.class.php
+++ b/htdocs/core/class/html.formfile.class.php
@@ -1471,10 +1471,10 @@ class FormFile
 							if ($nboffiles > 1 && $conf->browser->layout != 'phone') {
 								print '<td class="linecolmove tdlineupdown center">';
 								if ($i > 0) {
-									print '<a class="lineupdown" href="'.$_SERVER["PHP_SELF"].'?id='.$this->id.'&action=up&rowid='.$line->id.'">'.img_up('default', 0, 'imgupforline').'</a>';
+									print '<a class="lineupdown" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=up&rowid='.$object->id.'">'.img_up('default', 0, 'imgupforline').'</a>';
 								}
 								if ($i < ($nboffiles - 1)) {
-									print '<a class="lineupdown" href="'.$_SERVER["PHP_SELF"].'?id='.$this->id.'&action=down&rowid='.$line->id.'">'.img_down('default', 0, 'imgdownforline').'</a>';
+									print '<a class="lineupdown" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=down&rowid='.$object->id.'">'.img_down('default', 0, 'imgdownforline').'</a>';
 								}
 								print '</td>';
 							} else {

From 4d396bbf50b3149daba7310bb23368bfe36cd54c Mon Sep 17 00:00:00 2001
From: Gauthier PC portable 024 <gauthier.verdol@atm-consulting.fr>
Date: Tue, 6 Sep 2022 09:48:10 +0200
Subject: [PATCH 702/974] FIX : same thing in deleteline

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

diff --git a/htdocs/expedition/card.php b/htdocs/expedition/card.php
index 42214d1165e..8aa54ca8904 100644
--- a/htdocs/expedition/card.php
+++ b/htdocs/expedition/card.php
@@ -540,6 +540,7 @@ if (empty($reshook)) {
 		$object->fetch($id);
 		$lines = $object->lines;
 		$line = new ExpeditionLigne($db);
+		$line->fk_expedition = $object->id;
 
 		$num_prod = count($lines);
 		for ($i = 0; $i < $num_prod; $i++) {

From c6349ce51a137cf6c91e9118c4d0bc1e75758052 Mon Sep 17 00:00:00 2001
From: lmarcouiller <lucas.marcouiller@gmail.com>
Date: Tue, 6 Sep 2022 11:06:48 +0200
Subject: [PATCH 703/974] Fix : Yogosha report 12245 bad field verification

---
 htdocs/holiday/card.php         | 6 ++++++
 htdocs/langs/en_US/holiday.lang | 1 +
 2 files changed, 7 insertions(+)

diff --git a/htdocs/holiday/card.php b/htdocs/holiday/card.php
index 96a6b40f71b..f1faf827b34 100644
--- a/htdocs/holiday/card.php
+++ b/htdocs/holiday/card.php
@@ -254,6 +254,12 @@ if (empty($reshook)) {
 				$error++;
 			}
 
+			$approverslist = $object->fetch_users_approver_holiday();
+			if (!in_array($approverid, $approverslist)) {
+				setEventMessages($langs->transnoentitiesnoconv('InvalidValidator'), null, 'errors');
+				$error++;
+			}
+
 			$result = 0;
 
 			if (!$error) {
diff --git a/htdocs/langs/en_US/holiday.lang b/htdocs/langs/en_US/holiday.lang
index 04f47c8428d..95c8f54d211 100644
--- a/htdocs/langs/en_US/holiday.lang
+++ b/htdocs/langs/en_US/holiday.lang
@@ -58,6 +58,7 @@ ConfirmDeleteCP=Confirm the deletion of this leave request?
 ErrorCantDeleteCP=Error you don't have the right to delete this leave request.
 CantCreateCP=You don't have the right to make leave requests.
 InvalidValidatorCP=You must choose the approver for your leave request.
+InvalidValidator=The user chosen isn't an approver.
 NoDateDebut=You must select a start date.
 NoDateFin=You must select an end date.
 ErrorDureeCP=Your leave request does not contain working day.

From e40d925a572cf8c7942d17b3202504fcbde99d99 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 6 Sep 2022 12:43:07 +0200
Subject: [PATCH 704/974] css

---
 htdocs/societe/paymentmodes.php  | 2 +-
 htdocs/theme/eldy/global.inc.php | 8 ++++++++
 htdocs/theme/md/style.css.php    | 8 ++++++++
 3 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/htdocs/societe/paymentmodes.php b/htdocs/societe/paymentmodes.php
index b8a0d4e11f2..20cce294586 100644
--- a/htdocs/societe/paymentmodes.php
+++ b/htdocs/societe/paymentmodes.php
@@ -863,7 +863,7 @@ if ($socid && $action != 'edit' && $action != 'create' && $action != 'editcard'
 				print '<input type="hidden" name="token" value="'.newToken().'">';
 				print '<input type="hidden" name="socid" value="'.$object->id.'">';
 				print img_picto($langs->trans("CreateCustomerOnStripe"), 'stripe');
-				print '<input type="submit" class="buttonreset nomargintop nomarginbottom noborderbottom nopaddingtopimp nopaddingbottomimp" name="syncstripecustomer" value="'.$langs->trans("CreateCustomerOnStripe").'">';
+				print '<input type="submit" class="buttonlink nomargintop nomarginbottom noborderbottom nopaddingtopimp nopaddingbottomimp" name="syncstripecustomer" value="'.$langs->trans("CreateCustomerOnStripe").'">';
 				print '</form>';
 			}
 			print '</td></tr>';
diff --git a/htdocs/theme/eldy/global.inc.php b/htdocs/theme/eldy/global.inc.php
index dcff3c4b7a1..b8326171eb4 100644
--- a/htdocs/theme/eldy/global.inc.php
+++ b/htdocs/theme/eldy/global.inc.php
@@ -3545,6 +3545,14 @@ input.button[name="upload"] {
 input.button.smallpaddingimp, input.buttonreset.smallpaddingimp {
 	font-size: 0.8em;
 }
+input.buttonlink {
+	color: var(--colortextlink);
+	background-color: transparent;
+	cursor: pointer;
+}
+input.buttonlink:hover {
+	text-decoration: underline;
+}
 input.buttonreset {
 	margin-top: 3px;
 	margin-bottom: 3px;
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index 1eb0fa7d71f..47892574efb 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -3511,6 +3511,14 @@ tr.nocellnopadd td.nobordernopadding, tr.nocellnopadd td.nocellnopadd
 .smallpaddingimp {
 	padding: 4px !important;
 }
+input.buttonlink {
+	color: var(--colortextlink);
+	background-color: transparent;
+	cursor: pointer;
+}
+input.buttonlink:hover {
+	text-decoration: underline;
+}
 input.buttonreset {
 	margin-top: 3px;
 	margin-bottom: 3px;

From c06963f2ff49994ef5240b8376c4271f4564741e Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 6 Sep 2022 14:21:32 +0200
Subject: [PATCH 705/974] Trans

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

diff --git a/htdocs/langs/en_US/withdrawals.lang b/htdocs/langs/en_US/withdrawals.lang
index 75cee952bcd..c7820a965aa 100644
--- a/htdocs/langs/en_US/withdrawals.lang
+++ b/htdocs/langs/en_US/withdrawals.lang
@@ -118,7 +118,7 @@ WithdrawRequestErrorNilAmount=Unable to create direct debit request for empty am
 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.
+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.
 CreditorIdentifier=Creditor Identifier
 CreditorName=Creditor Name
 SEPAFillForm=(B) Please complete all the fields marked *

From 3df3bd8c4af3bb8e341ca37661221a771174d1b5 Mon Sep 17 00:00:00 2001
From: lmarcouiller <lucas.marcouiller@gmail.com>
Date: Tue, 6 Sep 2022 15:37:00 +0200
Subject: [PATCH 706/974] Fix ; permission check code

---
 htdocs/core/boxes/box_activity.php            |   6 +-
 htdocs/core/boxes/box_birthdays.php           |   2 +-
 htdocs/core/boxes/box_clients.php             |   2 +-
 ...box_customers_outstanding_bill_reached.php |   2 +-
 htdocs/core/boxes/box_fournisseurs.php        |   2 +-
 htdocs/core/boxes/box_last_ticket.php         |   2 +-
 htdocs/core/boxes/box_prospect.php            |   2 +-
 htdocs/core/menus/standard/eldy.lib.php       | 864 +++++++++---------
 htdocs/holiday/list.php                       |   8 +-
 htdocs/hrm/index.php                          |   4 +-
 htdocs/user/class/user.class.php              |   2 +-
 11 files changed, 448 insertions(+), 448 deletions(-)

diff --git a/htdocs/core/boxes/box_activity.php b/htdocs/core/boxes/box_activity.php
index 20c2e814d82..017c5fe3d02 100644
--- a/htdocs/core/boxes/box_activity.php
+++ b/htdocs/core/boxes/box_activity.php
@@ -62,9 +62,9 @@ class box_activity extends ModeleBoxes
 		// FIXME: Pb into some status
 		$this->enabled = ($conf->global->MAIN_FEATURES_LEVEL); // Not enabled by default due to bugs (see previous comments)
 
-		$this->hidden = !((isModEnabled('facture') && $user->rights->facture->lire)
-			|| (isModEnabled('commande') && $user->rights->commande->lire)
-			|| (isModEnabled('propal') && $user->rights->propale->lire)
+		$this->hidden = !((isModEnabled('facture') && $user->hasRight('facture', 'read'))
+			|| (isModEnabled('commande') && $user->hasRight('commande', 'read'))
+			|| (isModEnabled('propal') && $user->hasRight('propale', 'read'))
 			);
 	}
 
diff --git a/htdocs/core/boxes/box_birthdays.php b/htdocs/core/boxes/box_birthdays.php
index 6aec6f4064a..945552753ea 100644
--- a/htdocs/core/boxes/box_birthdays.php
+++ b/htdocs/core/boxes/box_birthdays.php
@@ -60,7 +60,7 @@ class box_birthdays extends ModeleBoxes
 
 		$this->db = $db;
 
-		$this->hidden = !($user->rights->user->user->lire && empty($user->socid));
+		$this->hidden = !($user->hasRight('user', 'user', 'read') && empty($user->socid));
 	}
 
 	/**
diff --git a/htdocs/core/boxes/box_clients.php b/htdocs/core/boxes/box_clients.php
index 4a7ea965006..364b79932ef 100644
--- a/htdocs/core/boxes/box_clients.php
+++ b/htdocs/core/boxes/box_clients.php
@@ -65,7 +65,7 @@ class box_clients extends ModeleBoxes
 			$this->enabled = 0; // disabled by this option
 		}
 
-		$this->hidden = !($user->rights->societe->lire && empty($user->socid));
+		$this->hidden = !($user->hasRight('societe', 'read') && empty($user->socid));
 	}
 
 	/**
diff --git a/htdocs/core/boxes/box_customers_outstanding_bill_reached.php b/htdocs/core/boxes/box_customers_outstanding_bill_reached.php
index 0f1fe97dfee..2bf5a2c0693 100644
--- a/htdocs/core/boxes/box_customers_outstanding_bill_reached.php
+++ b/htdocs/core/boxes/box_customers_outstanding_bill_reached.php
@@ -65,7 +65,7 @@ class box_customers_outstanding_bill_reached extends ModeleBoxes
 			$this->enabled = 0; // disabled by this option
 		}
 
-		$this->hidden = !($user->rights->societe->lire && empty($user->socid));
+		$this->hidden = !($user->hasRight('societe', 'read') && empty($user->socid));
 	}
 
 	/**
diff --git a/htdocs/core/boxes/box_fournisseurs.php b/htdocs/core/boxes/box_fournisseurs.php
index 2dceee98dda..59280aeec62 100644
--- a/htdocs/core/boxes/box_fournisseurs.php
+++ b/htdocs/core/boxes/box_fournisseurs.php
@@ -60,7 +60,7 @@ class box_fournisseurs extends ModeleBoxes
 
 		$this->db = $db;
 
-		$this->hidden = !($user->rights->societe->lire && empty($user->socid));
+		$this->hidden = !($user->hasRight('societe', 'read') && empty($user->socid));
 	}
 
 	/**
diff --git a/htdocs/core/boxes/box_last_ticket.php b/htdocs/core/boxes/box_last_ticket.php
index f73566fe972..32efe7293fa 100644
--- a/htdocs/core/boxes/box_last_ticket.php
+++ b/htdocs/core/boxes/box_last_ticket.php
@@ -84,7 +84,7 @@ class box_last_ticket extends ModeleBoxes
 			'text' => $langs->trans("BoxLastTicketContent"),
 		);
 
-		if ($user->rights->ticket->read) {
+		if ($user->hasRight('ticket', 'read')) {
 			$sql = "SELECT t.rowid as id, t.ref, t.track_id, t.fk_soc, t.fk_user_create, t.fk_user_assign, t.subject, t.message, t.fk_statut as status, t.type_code, t.category_code, t.severity_code, t.datec, t.date_read, t.date_close, t.origin_email,";
 			$sql .= " type.label as type_label, category.label as category_label, severity.label as severity_label,";
 			$sql .= " s.nom as company_name, s.email as socemail, s.client, s.fournisseur";
diff --git a/htdocs/core/boxes/box_prospect.php b/htdocs/core/boxes/box_prospect.php
index e9824339f1e..205cf09419c 100644
--- a/htdocs/core/boxes/box_prospect.php
+++ b/htdocs/core/boxes/box_prospect.php
@@ -67,7 +67,7 @@ class box_prospect extends ModeleBoxes
 			$this->enabled = 0; // disabled by this option
 		}
 
-		$this->hidden = !($user->rights->societe->lire && empty($user->socid));
+		$this->hidden = !($user->hasRight('societe', 'read') && empty($user->socid));
 	}
 
 	/**
diff --git a/htdocs/core/menus/standard/eldy.lib.php b/htdocs/core/menus/standard/eldy.lib.php
index 5c6a9e64c4d..01bc426458e 100644
--- a/htdocs/core/menus/standard/eldy.lib.php
+++ b/htdocs/core/menus/standard/eldy.lib.php
@@ -96,7 +96,7 @@ function print_eldy_menu($db, $atarget, $type_user, &$tabMenu, &$menu, $noout =
 	// Members
 	$tmpentry = array(
 		'enabled' => (isModEnabled('adherent')),
-		'perms' => (!empty($user->rights->adherent->lire)),
+		'perms' => (!empty($user->hasRight('adherent',  'lire'))),
 		'module' => 'adherent'
 	);
 	$menu_arr[] = array(
@@ -125,7 +125,7 @@ function print_eldy_menu($db, $atarget, $type_user, &$tabMenu, &$menu, $noout =
 			)
 			|| ((isModEnabled('fournisseur') && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD)) || isModEnabled('supplier_order') || isModEnabled('supplier_invoice'))
 			),
-		'perms'=> (!empty($user->rights->societe->lire) || !empty($user->rights->fournisseur->lire) || !empty($user->rights->supplier_order->lire) || !empty($user->rights->supplier_invoice->lire) || !empty($user->rights->supplier_proposal->lire)),
+		'perms'=> (!empty($user->hasRight('societe',  'lire')) || !empty($user->hasRight('fournisseur',  'lire')) || !empty($user->hasRight('supplier_order',  'lire')) || !empty($user->hasRight('supplier_invoice',  'lire')) || !empty($user->hasRight('supplier_proposal',  'lire'))),
 		'module'=>'societe|fournisseur'
 	);
 	$menu_arr[] = array(
@@ -150,7 +150,7 @@ function print_eldy_menu($db, $atarget, $type_user, &$tabMenu, &$menu, $noout =
 	// Products-Services
 	$tmpentry = array(
 		'enabled'=> (isModEnabled('product') || isModEnabled('service') || isModEnabled('expedition')),
-		'perms'=> (!empty($user->rights->produit->lire) || !empty($user->rights->service->lire) || !empty($user->rights->expedition->lire)),
+		'perms'=> (!empty($user->hasRight('produit',  'lire')) || !empty($user->hasRight('service',  'lire')) || !empty($user->hasRight('expedition',  'lire'))),
 		'module'=>'product|service'
 	);
 	$menu_arr[] = array(
@@ -177,7 +177,7 @@ function print_eldy_menu($db, $atarget, $type_user, &$tabMenu, &$menu, $noout =
 	// MRP - GPAO
 	$tmpentry = array(
 		'enabled'=>(isModEnabled('bom') || isModEnabled('mrp')),
-		'perms'=>(!empty($user->rights->bom->read) || !empty($user->rights->mrp->read)),
+		'perms'=>(!empty($user->hasRight('bom',  'read')) || !empty($user->hasRight('mrp',  'read'))),
 		'module'=>'bom|mrp'
 	);
 	$menu_arr[] = array(
@@ -202,7 +202,7 @@ function print_eldy_menu($db, $atarget, $type_user, &$tabMenu, &$menu, $noout =
 	// Projects
 	$tmpentry = array(
 		'enabled'=> (isModEnabled('projet') ? 1 : 0),
-		'perms'=> (!empty($user->rights->projet->lire) ? 1 : 0),
+		'perms'=> (!empty($user->hasRight('projet',  'lire')) ? 1 : 0),
 		'module'=>'projet'
 	);
 	$menu_arr[] = array(
@@ -234,25 +234,25 @@ function print_eldy_menu($db, $atarget, $type_user, &$tabMenu, &$menu, $noout =
 			|| isModEnabled('contrat')
 			|| isModEnabled('ficheinter')
 			) ? 1 : 0,
-		'perms'=>(!empty($user->rights->propal->lire)
-			|| !empty($user->rights->commande->lire)
-			|| !empty($user->rights->supplier_proposal->lire)
-			|| !empty($user->rights->fournisseur->lire)
-			|| !empty($user->rights->fournisseur->commande->lire)
-			|| !empty($user->rights->supplier_order->lire)
-			|| !empty($user->rights->contrat->lire)
-			|| !empty($user->rights->ficheinter->lire)
+		'perms'=>(!empty($user->hasRight('propal',  'lire'))
+			|| !empty($user->hasRight('commande',  'lire'))
+			|| !empty($user->hasRight('supplier_proposal',  'lire'))
+			|| !empty($user->hasRight('fournisseur',  'lire'))
+			|| !empty($user->hasRight('fournisseur',  'commande', 'lire'))
+			|| !empty($user->hasRight('supplier_order',  'lire'))
+			|| !empty($user->hasRight('contrat',  'lire'))
+			|| !empty($user->hasRight('ficheinter',  'lire'))
 			),
 		'module'=>'propal|commande|supplier_proposal|supplier_order|contrat|ficheinter'
 	);
 
-	$onlysupplierorder = !empty($user->rights->fournisseur->commande->lire) &&
-	empty($user->rights->propal->lire) &&
-	empty($user->rights->commande->lire) &&
-	empty($user->rights->supplier_order->lire) &&
-	empty($user->rights->supplier_proposal->lire) &&
-	empty($user->rights->contrat->lire) &&
-	empty($user->rights->ficheinter->lire);
+	$onlysupplierorder = !empty($user->hasRight('fournisseur',  'commande', 'lire')) &&
+	empty($user->hasRight('propal',  'lire')) &&
+	empty($user->hasRight('commande',  'lire')) &&
+	empty($user->hasRight('supplier_order',  'lire')) &&
+	empty($user->hasRight('supplier_proposal',  'lire')) &&
+	empty($user->hasRight('contrat',  'lire')) &&
+	empty($user->hasRight('ficheinter',  'lire'));
 
 	$menu_arr[] = array(
 		'name' => 'Commercial',
@@ -283,9 +283,9 @@ function print_eldy_menu($db, $atarget, $type_user, &$tabMenu, &$menu, $noout =
 			isModEnabled('loan') ||
 			isModEnabled('margins')
 			) ? 1 : 0,
-		'perms'=>(!empty($user->rights->facture->lire) || !empty($user->rights->don->contact->lire)
-			|| !empty($user->rights->tax->charges->lire) || !empty($user->rights->salaries->read)
-			|| !empty($user->rights->fournisseur->facture->lire) || !empty($user->rights->loan->read) || !empty($user->rights->margins->liretous)),
+		'perms'=>(!empty($user->hasRight('facture',  'lire')) || !empty($user->hasRight('don',  'contact', 'lire'))
+			|| !empty($user->hasRight('tax',  'charges', 'lire')) || !empty($user->hasRight('salaries',  'read'))
+			|| !empty($user->hasRight('fournisseur',  'facture', 'lire')) || !empty($user->hasRight('loan',  'read')) || !empty($user->hasRight('margins',  'liretous'))),
 		'module'=>'facture|supplier_invoice|don|tax|salaries|loan'
 	);
 	$menu_arr[] = array(
@@ -310,7 +310,7 @@ function print_eldy_menu($db, $atarget, $type_user, &$tabMenu, &$menu, $noout =
 	// Bank
 	$tmpentry = array(
 		'enabled'=>(isModEnabled('banque') || isModEnabled('prelevement')),
-		'perms'=>(!empty($user->rights->banque->lire) || !empty($user->rights->prelevement->lire) || !empty($user->rights->paymentbybanktransfer->read)),
+		'perms'=>(!empty($user->hasRight('banque',  'lire')) || !empty($user->hasRight('prelevement',  'lire')) || !empty($user->hasRight('paymentbybanktransfer',  'read'))),
 		'module'=>'banque|prelevement|paymentbybanktransfer'
 	);
 	$menu_arr[] = array(
@@ -335,7 +335,7 @@ function print_eldy_menu($db, $atarget, $type_user, &$tabMenu, &$menu, $noout =
 	// Accounting
 	$tmpentry = array(
 		'enabled'=>(isModEnabled('comptabilite') || isModEnabled('accounting') || isModEnabled('asset') || isModEnabled('intracommreport')),
-		'perms'=>(!empty($user->rights->compta->resultat->lire) || !empty($user->rights->accounting->comptarapport->lire) || !empty($user->rights->accounting->mouvements->lire) || !empty($user->rights->asset->read) || !empty($user->rights->intracommreport->read)),
+		'perms'=>(!empty($user->hasRight('compta',  'resultat', 'lire')) || !empty($user->hasRight('accounting',  'comptarapport', 'lire')) || !empty($user->hasRight('accounting',  'mouvements', 'lire')) || !empty($user->hasRight('asset',  'read')) || !empty($user->hasRight('intracommreport',  'read'))),
 		'module'=>'comptabilite|accounting|asset|intracommreport'
 	);
 	$menu_arr[] = array(
@@ -360,7 +360,7 @@ 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'=>(!empty($user->rights->user->user->lire) || !empty($user->rights->holiday->read) || !empty($user->rights->deplacement->lire) || !empty($user->rights->expensereport->lire) || !empty($user->rights->recruitment->recruitmentjobposition->read)),
+		'perms'=>(!empty($user->hasRight('user',  'user', 'lire')) || !empty($user->hasRight('holiday',  'read')) || !empty($user->hasRight('deplacement',  'lire')) || !empty($user->hasRight('expensereport',  'lire')) || !empty($user->hasRight('recruitment',  'recruitmentjobposition', 'read'))),
 		'module'=>'hrm|holiday|deplacement|expensereport|recruitment'
 	);
 
@@ -386,7 +386,7 @@ function print_eldy_menu($db, $atarget, $type_user, &$tabMenu, &$menu, $noout =
 	// Tickets and knowledge base
 	$tmpentry = array(
 		'enabled'=>(isModEnabled('ticket') || isModEnabled('knowledgemanagement')),
-		'perms'=>(!empty($user->rights->ticket->read) || !empty($user->rights->knowledgemanagement->knowledgerecord->read)),
+		'perms'=>(!empty($user->hasRight('ticket',  'read')) || !empty($user->hasRight('knowledgemanagement',  'knowledgerecord', 'read'))),
 		'module'=>'ticket|knowledgemanagement'
 	);
 	$link = '';
@@ -1150,20 +1150,20 @@ function get_left_menu_home($mainmenu, &$newmenu, $usemenuhider = 1, $leftmenu =
 			}
 		}
 
-		$newmenu->add("/user/home.php?leftmenu=users", $langs->trans("MenuUsersAndGroups"), 0, $user->rights->user->user->lire, '', $mainmenu, 'users', 0, '', '', '', img_picto('', 'user', 'class="paddingright pictofixedwidth"'));
-		if ($user->rights->user->user->lire) {
+		$newmenu->add("/user/home.php?leftmenu=users", $langs->trans("MenuUsersAndGroups"), 0, $user->hasRight('user', 'user', 'read'), '', $mainmenu, 'users', 0, '', '', '', img_picto('', 'user', 'class="paddingright pictofixedwidth"'));
+		if ($user->hasRight('user', 'user', 'read')) {
 			if ($usemenuhider || empty($leftmenu) || $leftmenu == "users") {
-				$newmenu->add("", $langs->trans("Users"), 1, $user->rights->user->user->lire || $user->admin);
+				$newmenu->add("", $langs->trans("Users"), 1, $user->hasRight('user',  'user', 'lire') || $user->admin);
 				$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 && $conf->global->MULTICOMPANY_TRANSVERSE_MODE), '', 'home');
-				$newmenu->add("/user/list.php?leftmenu=users", $langs->trans("ListOfUsers"), 2, $user->rights->user->user->lire || $user->admin);
-				$newmenu->add("/user/hierarchy.php?leftmenu=users", $langs->trans("HierarchicView"), 2, $user->rights->user->user->lire || $user->admin);
+				$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')) {
 					$langs->load("categories");
-					$newmenu->add("/categories/index.php?leftmenu=users&type=7", $langs->trans("UsersCategoriesShort"), 2, $user->rights->categorie->lire, '', $mainmenu, 'cat');
+					$newmenu->add("/categories/index.php?leftmenu=users&type=7", $langs->trans("UsersCategoriesShort"), 2, $user->hasRight('categorie',  'lire'), '', $mainmenu, 'cat');
 				}
-				$newmenu->add("", $langs->trans("Groups"), 1, ($user->rights->user->user->lire || $user->admin) && !(isModEnabled('multicompany') && $conf->entity > 1 && $conf->global->MULTICOMPANY_TRANSVERSE_MODE));
+				$newmenu->add("", $langs->trans("Groups"), 1, ($user->hasRight('user',  'user', 'lire') || $user->admin) && !(isModEnabled('multicompany') && $conf->entity > 1 && $conf->global->MULTICOMPANY_TRANSVERSE_MODE));
 				$newmenu->add("/user/group/card.php?leftmenu=users&action=create", $langs->trans("NewGroup"), 2, ((!empty($conf->global->MAIN_USE_ADVANCED_PERMS) ? $user->hasRight("user", "group_advance", "create") : $user->hasRight("user", "user", "create")) || $user->admin) && !(isModEnabled('multicompany') && $conf->entity > 1 && $conf->global->MULTICOMPANY_TRANSVERSE_MODE));
-				$newmenu->add("/user/group/list.php?leftmenu=users", $langs->trans("ListOfGroups"), 2, ((!empty($conf->global->MAIN_USE_ADVANCED_PERMS) ? $user->rights->user->group_advance->read : $user->rights->user->user->lire) || $user->admin) && !(isModEnabled('multicompany') && $conf->entity > 1 && $conf->global->MULTICOMPANY_TRANSVERSE_MODE));
+				$newmenu->add("/user/group/list.php?leftmenu=users", $langs->trans("ListOfGroups"), 2, ((!empty($conf->global->MAIN_USE_ADVANCED_PERMS) ? $user->hasRight('user',  'group_advance', 'read') : $user->hasRight('user',  'user', 'lire')) || $user->admin) && !(isModEnabled('multicompany') && $conf->entity > 1 && $conf->global->MULTICOMPANY_TRANSVERSE_MODE));
 			}
 		}
 	}
@@ -1187,9 +1187,9 @@ function get_left_menu_thridparties($mainmenu, &$newmenu, $usemenuhider = 1, $le
 		// Societes
 		if (isModEnabled('societe')) {
 			$langs->load("companies");
-			$newmenu->add("/societe/index.php?leftmenu=thirdparties", $langs->trans("ThirdParty"), 0, $user->rights->societe->lire, '', $mainmenu, 'thirdparties', 0, '', '', '', img_picto('', 'company', 'class="paddingright pictofixedwidth"'));
+			$newmenu->add("/societe/index.php?leftmenu=thirdparties", $langs->trans("ThirdParty"), 0, $user->hasRight('societe',  'lire'), '', $mainmenu, 'thirdparties', 0, '', '', '', img_picto('', 'company', 'class="paddingright pictofixedwidth"'));
 
-			if ($user->rights->societe->creer) {
+			if ($user->hasRight('societe',  'creer')) {
 				$newmenu->add("/societe/card.php?action=create", $langs->trans("MenuNewThirdParty"), 1);
 				if (!$conf->use_javascript_ajax) {
 					$newmenu->add("/societe/card.php?action=create&amp;private=1", $langs->trans("MenuNewPrivateIndividual"), 1);
@@ -1202,30 +1202,30 @@ function get_left_menu_thridparties($mainmenu, &$newmenu, $usemenuhider = 1, $le
 		// Prospects
 		if (isModEnabled('societe') && empty($conf->global->SOCIETE_DISABLE_PROSPECTS)) {
 			$langs->load("commercial");
-			$newmenu->add("/societe/list.php?type=p&amp;leftmenu=prospects", $langs->trans("ListProspectsShort"), 2, $user->rights->societe->lire, '', $mainmenu, 'prospects');
+			$newmenu->add("/societe/list.php?type=p&amp;leftmenu=prospects", $langs->trans("ListProspectsShort"), 2, $user->hasRight('societe',  'lire'), '', $mainmenu, 'prospects');
 			/* no more required, there is a filter that can do more
-			 if ($usemenuhider || empty($leftmenu) || $leftmenu=="prospects") $newmenu->add("/societe/list.php?type=p&amp;sortfield=s.datec&amp;sortorder=desc&amp;begin=&amp;search_stcomm=-1", $langs->trans("LastProspectDoNotContact"), 2, $user->rights->societe->lire);
-			 if ($usemenuhider || empty($leftmenu) || $leftmenu=="prospects") $newmenu->add("/societe/list.php?type=p&amp;sortfield=s.datec&amp;sortorder=desc&amp;begin=&amp;search_stcomm=0", $langs->trans("LastProspectNeverContacted"), 2, $user->rights->societe->lire);
-			 if ($usemenuhider || empty($leftmenu) || $leftmenu=="prospects") $newmenu->add("/societe/list.php?type=p&amp;sortfield=s.datec&amp;sortorder=desc&amp;begin=&amp;search_stcomm=1", $langs->trans("LastProspectToContact"), 2, $user->rights->societe->lire);
-			 if ($usemenuhider || empty($leftmenu) || $leftmenu=="prospects") $newmenu->add("/societe/list.php?type=p&amp;sortfield=s.datec&amp;sortorder=desc&amp;begin=&amp;search_stcomm=2", $langs->trans("LastProspectContactInProcess"), 2, $user->rights->societe->lire);
-			 if ($usemenuhider || empty($leftmenu) || $leftmenu=="prospects") $newmenu->add("/societe/list.php?type=p&amp;sortfield=s.datec&amp;sortorder=desc&amp;begin=&amp;search_stcomm=3", $langs->trans("LastProspectContactDone"), 2, $user->rights->societe->lire);
+			 if ($usemenuhider || empty($leftmenu) || $leftmenu=="prospects") $newmenu->add("/societe/list.php?type=p&amp;sortfield=s.datec&amp;sortorder=desc&amp;begin=&amp;search_stcomm=-1", $langs->trans("LastProspectDoNotContact"), 2, $user->hasRight('societe',  'lire'));
+			 if ($usemenuhider || empty($leftmenu) || $leftmenu=="prospects") $newmenu->add("/societe/list.php?type=p&amp;sortfield=s.datec&amp;sortorder=desc&amp;begin=&amp;search_stcomm=0", $langs->trans("LastProspectNeverContacted"), 2, $user->hasRight('societe',  'lire'));
+			 if ($usemenuhider || empty($leftmenu) || $leftmenu=="prospects") $newmenu->add("/societe/list.php?type=p&amp;sortfield=s.datec&amp;sortorder=desc&amp;begin=&amp;search_stcomm=1", $langs->trans("LastProspectToContact"), 2, $user->hasRight('societe',  'lire'));
+			 if ($usemenuhider || empty($leftmenu) || $leftmenu=="prospects") $newmenu->add("/societe/list.php?type=p&amp;sortfield=s.datec&amp;sortorder=desc&amp;begin=&amp;search_stcomm=2", $langs->trans("LastProspectContactInProcess"), 2, $user->hasRight('societe',  'lire'));
+			 if ($usemenuhider || empty($leftmenu) || $leftmenu=="prospects") $newmenu->add("/societe/list.php?type=p&amp;sortfield=s.datec&amp;sortorder=desc&amp;begin=&amp;search_stcomm=3", $langs->trans("LastProspectContactDone"), 2, $user->hasRight('societe',  'lire'));
 			 */
-			$newmenu->add("/societe/card.php?leftmenu=prospects&amp;action=create&amp;type=p", $langs->trans("MenuNewProspect"), 3, $user->rights->societe->creer);
+			$newmenu->add("/societe/card.php?leftmenu=prospects&amp;action=create&amp;type=p", $langs->trans("MenuNewProspect"), 3, $user->hasRight('societe',  'creer'));
 		}
 
 		// Customers/Prospects
 		if (isModEnabled('societe') && empty($conf->global->SOCIETE_DISABLE_CUSTOMERS)) {
 			$langs->load("commercial");
-			$newmenu->add("/societe/list.php?type=c&amp;leftmenu=customers", $langs->trans("ListCustomersShort"), 2, $user->rights->societe->lire, '', $mainmenu, 'customers');
+			$newmenu->add("/societe/list.php?type=c&amp;leftmenu=customers", $langs->trans("ListCustomersShort"), 2, $user->hasRight('societe',  'lire'), '', $mainmenu, 'customers');
 
-			$newmenu->add("/societe/card.php?leftmenu=customers&amp;action=create&amp;type=c", $langs->trans("MenuNewCustomer"), 3, $user->rights->societe->creer);
+			$newmenu->add("/societe/card.php?leftmenu=customers&amp;action=create&amp;type=c", $langs->trans("MenuNewCustomer"), 3, $user->hasRight('societe',  'creer'));
 		}
 
 		// Suppliers
 		if (isModEnabled('societe') && (((isModEnabled('fournisseur') && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD)) || isModEnabled('supplier_order') || isModEnabled('supplier_invoice')) || isModEnabled('supplier_proposal'))) {
 			$langs->load("suppliers");
-			$newmenu->add("/societe/list.php?type=f&amp;leftmenu=suppliers", $langs->trans("ListSuppliersShort"), 2, ($user->rights->fournisseur->lire || $user->rights->supplier_order->lire || $user->rights->supplier_invoice->lire || $user->rights->supplier_proposal->lire), '', $mainmenu, 'suppliers');
-			$newmenu->add("/societe/card.php?leftmenu=suppliers&amp;action=create&amp;type=f", $langs->trans("MenuNewSupplier"), 3, $user->rights->societe->creer && ($user->rights->fournisseur->lire || $user->rights->supplier_order->lire || $user->rights->supplier_invoice->lire || $user->rights->supplier_proposal->lire));
+			$newmenu->add("/societe/list.php?type=f&amp;leftmenu=suppliers", $langs->trans("ListSuppliersShort"), 2, ($user->hasRight('fournisseur',  'lire') || $user->hasRight('supplier_order',  'lire') || $user->hasRight('supplier_invoice',  'lire') || $user->hasRight('supplier_proposal',  'lire')), '', $mainmenu, 'suppliers');
+			$newmenu->add("/societe/card.php?leftmenu=suppliers&amp;action=create&amp;type=f", $langs->trans("MenuNewSupplier"), 3, $user->hasRight('societe',  'creer') && ($user->hasRight('fournisseur',  'lire') || $user->hasRight('supplier_order',  'lire') || $user->hasRight('supplier_invoice',  'lire') || $user->hasRight('supplier_proposal',  'lire')));
 		}
 
 		// Categories
@@ -1240,36 +1240,36 @@ function get_left_menu_thridparties($mainmenu, &$newmenu, $usemenuhider = 1, $le
 				if (!empty($conf->global->SOCIETE_DISABLE_CUSTOMERS)) {
 					$menutoshow = $langs->trans("ProspectsCategoriesShort");
 				}
-				$newmenu->add("/categories/index.php?leftmenu=cat&amp;type=2", $menutoshow, 1, $user->rights->categorie->lire, '', $mainmenu, 'cat');
+				$newmenu->add("/categories/index.php?leftmenu=cat&amp;type=2", $menutoshow, 1, $user->hasRight('categorie',  'lire'), '', $mainmenu, 'cat');
 			}
 			// Categories suppliers
 			if ((isModEnabled('fournisseur') && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD)) || isModEnabled('supplier_order') || isModEnabled('supplier_invoice')) {
-				$newmenu->add("/categories/index.php?leftmenu=catfournish&amp;type=1", $langs->trans("SuppliersCategoriesShort"), 1, $user->rights->categorie->lire);
+				$newmenu->add("/categories/index.php?leftmenu=catfournish&amp;type=1", $langs->trans("SuppliersCategoriesShort"), 1, $user->hasRight('categorie',  'lire'));
 			}
 		}
 
 		// Contacts
-		$newmenu->add("/societe/index.php?leftmenu=thirdparties", (!empty($conf->global->SOCIETE_ADDRESSES_MANAGEMENT) ? $langs->trans("Contacts") : $langs->trans("ContactsAddresses")), 0, $user->rights->societe->contact->lire, '', $mainmenu, 'contacts', 0, '', '', '', img_picto('', 'contact', 'class="paddingright pictofixedwidth"'));
+		$newmenu->add("/societe/index.php?leftmenu=thirdparties", (!empty($conf->global->SOCIETE_ADDRESSES_MANAGEMENT) ? $langs->trans("Contacts") : $langs->trans("ContactsAddresses")), 0, $user->hasRight('societe',  'contact', 'lire'), '', $mainmenu, 'contacts', 0, '', '', '', img_picto('', 'contact', 'class="paddingright pictofixedwidth"'));
 
-		$newmenu->add("/contact/card.php?leftmenu=contacts&amp;action=create", (!empty($conf->global->SOCIETE_ADDRESSES_MANAGEMENT) ? $langs->trans("NewContact") : $langs->trans("NewContactAddress")), 1, $user->rights->societe->contact->creer);
-		$newmenu->add("/contact/list.php?leftmenu=contacts", $langs->trans("List"), 1, $user->rights->societe->contact->lire);
+		$newmenu->add("/contact/card.php?leftmenu=contacts&amp;action=create", (!empty($conf->global->SOCIETE_ADDRESSES_MANAGEMENT) ? $langs->trans("NewContact") : $langs->trans("NewContactAddress")), 1, $user->hasRight('societe',  'contact', 'creer'));
+		$newmenu->add("/contact/list.php?leftmenu=contacts", $langs->trans("List"), 1, $user->hasRight('societe',  'contact', 'lire'));
 		if (empty($conf->global->SOCIETE_DISABLE_PROSPECTS)) {
-			$newmenu->add("/contact/list.php?leftmenu=contacts&type=p", $langs->trans("Prospects"), 2, $user->rights->societe->contact->lire);
+			$newmenu->add("/contact/list.php?leftmenu=contacts&type=p", $langs->trans("Prospects"), 2, $user->hasRight('societe',  'contact', 'lire'));
 		}
 		if (empty($conf->global->SOCIETE_DISABLE_CUSTOMERS)) {
-			$newmenu->add("/contact/list.php?leftmenu=contacts&type=c", $langs->trans("Customers"), 2, $user->rights->societe->contact->lire);
+			$newmenu->add("/contact/list.php?leftmenu=contacts&type=c", $langs->trans("Customers"), 2, $user->hasRight('societe',  'contact', 'lire'));
 		}
 		if ((isModEnabled('fournisseur') && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD)) || isModEnabled('supplier_order') || isModEnabled('supplier_invoice')) {
-			$newmenu->add("/contact/list.php?leftmenu=contacts&type=f", $langs->trans("Suppliers"), 2, $user->rights->societe->contact->lire);
+			$newmenu->add("/contact/list.php?leftmenu=contacts&type=f", $langs->trans("Suppliers"), 2, $user->hasRight('societe',  'contact', 'lire'));
 		}
-		$newmenu->add("/contact/list.php?leftmenu=contacts&type=o", $langs->trans("ContactOthers"), 2, $user->rights->societe->contact->lire);
-		//$newmenu->add("/contact/list.php?userid=$user->id", $langs->trans("MyContacts"), 1, $user->rights->societe->contact->lire);
+		$newmenu->add("/contact/list.php?leftmenu=contacts&type=o", $langs->trans("ContactOthers"), 2, $user->hasRight('societe',  'contact', 'lire'));
+		//$newmenu->add("/contact/list.php?userid=$user->id", $langs->trans("MyContacts"), 1, $user->hasRight('societe',  'contact', 'lire'));
 
 		// Categories
 		if (isModEnabled('categorie')) {
 			$langs->load("categories");
 			// Categories Contact
-			$newmenu->add("/categories/index.php?leftmenu=catcontact&amp;type=4", $langs->trans("ContactCategoriesShort"), 1, $user->rights->categorie->lire, '', $mainmenu, 'cat');
+			$newmenu->add("/categories/index.php?leftmenu=catcontact&amp;type=4", $langs->trans("ContactCategoriesShort"), 1, $user->hasRight('categorie',  'lire'), '', $mainmenu, 'cat');
 		}
 	}
 }
@@ -1294,98 +1294,98 @@ function get_left_menu_commercial($mainmenu, &$newmenu, $usemenuhider = 1, $left
 		// Customer proposal
 		if (isModEnabled('propal')) {
 			$langs->load("propal");
-			$newmenu->add("/comm/propal/index.php?leftmenu=propals", $langs->trans("Proposals"), 0, $user->rights->propale->lire, '', $mainmenu, 'propals', 100, '', '', '', img_picto('', 'propal', 'class="paddingright pictofixedwidth"'));
-			$newmenu->add("/comm/propal/card.php?action=create&amp;leftmenu=propals", $langs->trans("NewPropal"), 1, $user->rights->propale->creer);
-			$newmenu->add("/comm/propal/list.php?leftmenu=propals", $langs->trans("List"), 1, $user->rights->propale->lire);
+			$newmenu->add("/comm/propal/index.php?leftmenu=propals", $langs->trans("Proposals"), 0, $user->hasRight('propale',  'lire'), '', $mainmenu, 'propals', 100, '', '', '', img_picto('', 'propal', 'class="paddingright pictofixedwidth"'));
+			$newmenu->add("/comm/propal/card.php?action=create&amp;leftmenu=propals", $langs->trans("NewPropal"), 1, $user->hasRight('propale',  'creer'));
+			$newmenu->add("/comm/propal/list.php?leftmenu=propals", $langs->trans("List"), 1, $user->hasRight('propale',  'lire'));
 			if ($usemenuhider || empty($leftmenu) || $leftmenu == "propals") {
-				$newmenu->add("/comm/propal/list.php?leftmenu=propals&search_status=0", $langs->trans("PropalsDraft"), 2, $user->rights->propale->lire);
-				$newmenu->add("/comm/propal/list.php?leftmenu=propals&search_status=1", $langs->trans("PropalsOpened"), 2, $user->rights->propale->lire);
-				$newmenu->add("/comm/propal/list.php?leftmenu=propals&search_status=2", $langs->trans("PropalStatusSigned"), 2, $user->rights->propale->lire);
-				$newmenu->add("/comm/propal/list.php?leftmenu=propals&search_status=3", $langs->trans("PropalStatusNotSigned"), 2, $user->rights->propale->lire);
-				$newmenu->add("/comm/propal/list.php?leftmenu=propals&search_status=4", $langs->trans("PropalStatusBilled"), 2, $user->rights->propale->lire);
-				//$newmenu->add("/comm/propal/list.php?leftmenu=propals&search_status=2,3,4", $langs->trans("PropalStatusClosedShort"), 2, $user->rights->propale->lire);
+				$newmenu->add("/comm/propal/list.php?leftmenu=propals&search_status=0", $langs->trans("PropalsDraft"), 2, $user->hasRight('propale',  'lire'));
+				$newmenu->add("/comm/propal/list.php?leftmenu=propals&search_status=1", $langs->trans("PropalsOpened"), 2, $user->hasRight('propale',  'lire'));
+				$newmenu->add("/comm/propal/list.php?leftmenu=propals&search_status=2", $langs->trans("PropalStatusSigned"), 2, $user->hasRight('propale',  'lire'));
+				$newmenu->add("/comm/propal/list.php?leftmenu=propals&search_status=3", $langs->trans("PropalStatusNotSigned"), 2, $user->hasRight('propale',  'lire'));
+				$newmenu->add("/comm/propal/list.php?leftmenu=propals&search_status=4", $langs->trans("PropalStatusBilled"), 2, $user->hasRight('propale',  'lire'));
+				//$newmenu->add("/comm/propal/list.php?leftmenu=propals&search_status=2,3,4", $langs->trans("PropalStatusClosedShort"), 2, $user->hasRight('propale',  'lire'));
 			}
-			$newmenu->add("/comm/propal/stats/index.php?leftmenu=propals", $langs->trans("Statistics"), 1, $user->rights->propale->lire);
+			$newmenu->add("/comm/propal/stats/index.php?leftmenu=propals", $langs->trans("Statistics"), 1, $user->hasRight('propale',  'lire'));
 		}
 
 		// Customers orders
 		if (isModEnabled('commande')) {
 			$langs->load("orders");
-			$newmenu->add("/commande/index.php?leftmenu=orders", $langs->trans("CustomersOrders"), 0, $user->rights->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->rights->commande->creer);
-			$newmenu->add("/commande/list.php?leftmenu=orders", $langs->trans("List"), 1, $user->rights->commande->lire);
+			$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'));
+			$newmenu->add("/commande/list.php?leftmenu=orders", $langs->trans("List"), 1, $user->hasRight('commande',  'lire'));
 			if ($usemenuhider || empty($leftmenu) || $leftmenu == "orders") {
-				$newmenu->add("/commande/list.php?leftmenu=orders&search_status=0", $langs->trans("StatusOrderDraftShort"), 2, $user->rights->commande->lire);
-				$newmenu->add("/commande/list.php?leftmenu=orders&search_status=1", $langs->trans("StatusOrderValidated"), 2, $user->rights->commande->lire);
+				$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')) {
-					$newmenu->add("/commande/list.php?leftmenu=orders&search_status=2", $langs->trans("StatusOrderSentShort"), 2, $user->rights->commande->lire);
+					$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->rights->commande->lire);
-				//$newmenu->add("/commande/list.php?leftmenu=orders&search_status=4", $langs->trans("StatusOrderProcessed"), 2, $user->rights->commande->lire);
-				$newmenu->add("/commande/list.php?leftmenu=orders&search_status=-1", $langs->trans("StatusOrderCanceledShort"), 2, $user->rights->commande->lire);
+				$newmenu->add("/commande/list.php?leftmenu=orders&search_status=3", $langs->trans("StatusOrderDelivered"), 2, $user->hasRight('commande',  'lire'));
+				//$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'));
 			}
-			$newmenu->add("/commande/stats/index.php?leftmenu=orders", $langs->trans("Statistics"), 1, $user->rights->commande->lire);
+			$newmenu->add("/commande/stats/index.php?leftmenu=orders", $langs->trans("Statistics"), 1, $user->hasRight('commande',  'lire'));
 		}
 
 		// Supplier proposal
 		if (isModEnabled('supplier_proposal')) {
 			$langs->load("supplier_proposal");
-			$newmenu->add("/supplier_proposal/index.php?leftmenu=propals_supplier", $langs->trans("SupplierProposalsShort"), 0, $user->rights->supplier_proposal->lire, '', $mainmenu, 'propals_supplier', 300, '', '', '', img_picto('', 'supplier_proposal', 'class="paddingright pictofixedwidth"'));
-			$newmenu->add("/supplier_proposal/card.php?action=create&amp;leftmenu=supplier_proposals", $langs->trans("SupplierProposalNew"), 1, $user->rights->supplier_proposal->creer);
-			$newmenu->add("/supplier_proposal/list.php?leftmenu=supplier_proposals", $langs->trans("List"), 1, $user->rights->supplier_proposal->lire);
-			$newmenu->add("/comm/propal/stats/index.php?leftmenu=supplier_proposals&amp;mode=supplier", $langs->trans("Statistics"), 1, $user->rights->supplier_proposal->lire);
+			$newmenu->add("/supplier_proposal/index.php?leftmenu=propals_supplier", $langs->trans("SupplierProposalsShort"), 0, $user->hasRight('supplier_proposal',  'lire'), '', $mainmenu, 'propals_supplier', 300, '', '', '', img_picto('', 'supplier_proposal', 'class="paddingright pictofixedwidth"'));
+			$newmenu->add("/supplier_proposal/card.php?action=create&amp;leftmenu=supplier_proposals", $langs->trans("SupplierProposalNew"), 1, $user->hasRight('supplier_proposal',  'creer'));
+			$newmenu->add("/supplier_proposal/list.php?leftmenu=supplier_proposals", $langs->trans("List"), 1, $user->hasRight('supplier_proposal',  'lire'));
+			$newmenu->add("/comm/propal/stats/index.php?leftmenu=supplier_proposals&amp;mode=supplier", $langs->trans("Statistics"), 1, $user->hasRight('supplier_proposal',  'lire'));
 		}
 
 		// Suppliers orders
 		if (isModEnabled('supplier_order')) {
 			$langs->load("orders");
-			$newmenu->add("/fourn/commande/index.php?leftmenu=orders_suppliers", $langs->trans("SuppliersOrders"), 0, $user->rights->fournisseur->commande->lire, '', $mainmenu, 'orders_suppliers', 400, '', '', '', img_picto('', 'supplier_order', 'class="paddingright pictofixedwidth"'));
-			$newmenu->add("/fourn/commande/card.php?action=create&amp;leftmenu=orders_suppliers", $langs->trans("NewSupplierOrderShort"), 1, $user->rights->fournisseur->commande->creer);
-			$newmenu->add("/fourn/commande/list.php?leftmenu=orders_suppliers", $langs->trans("List"), 1, $user->rights->fournisseur->commande->lire);
+			$newmenu->add("/fourn/commande/index.php?leftmenu=orders_suppliers", $langs->trans("SuppliersOrders"), 0, $user->hasRight('fournisseur',  'commande', 'lire'), '', $mainmenu, 'orders_suppliers', 400, '', '', '', img_picto('', 'supplier_order', 'class="paddingright pictofixedwidth"'));
+			$newmenu->add("/fourn/commande/card.php?action=create&amp;leftmenu=orders_suppliers", $langs->trans("NewSupplierOrderShort"), 1, $user->hasRight('fournisseur',  'commande', 'creer'));
+			$newmenu->add("/fourn/commande/list.php?leftmenu=orders_suppliers", $langs->trans("List"), 1, $user->hasRight('fournisseur',  'commande', 'lire'));
 
 			if ($usemenuhider || empty($leftmenu) || $leftmenu == "orders_suppliers") {
-				$newmenu->add("/fourn/commande/list.php?leftmenu=orders_suppliers&statut=0", $langs->trans("StatusSupplierOrderDraftShort"), 2, $user->rights->fournisseur->commande->lire);
+				$newmenu->add("/fourn/commande/list.php?leftmenu=orders_suppliers&statut=0", $langs->trans("StatusSupplierOrderDraftShort"), 2, $user->hasRight('fournisseur',  'commande', 'lire'));
 				if (empty($conf->global->SUPPLIER_ORDER_HIDE_VALIDATED)) {
-					$newmenu->add("/fourn/commande/list.php?leftmenu=orders_suppliers&statut=1", $langs->trans("StatusSupplierOrderValidated"), 2, $user->rights->fournisseur->commande->lire);
+					$newmenu->add("/fourn/commande/list.php?leftmenu=orders_suppliers&statut=1", $langs->trans("StatusSupplierOrderValidated"), 2, $user->hasRight('fournisseur',  'commande', 'lire'));
 				}
-				$newmenu->add("/fourn/commande/list.php?leftmenu=orders_suppliers&statut=2", $langs->trans("StatusSupplierOrderApprovedShort"), 2, $user->rights->fournisseur->commande->lire);
-				$newmenu->add("/fourn/commande/list.php?leftmenu=orders_suppliers&statut=3", $langs->trans("StatusSupplierOrderOnProcessShort"), 2, $user->rights->fournisseur->commande->lire);
-				$newmenu->add("/fourn/commande/list.php?leftmenu=orders_suppliers&statut=4", $langs->trans("StatusSupplierOrderReceivedPartiallyShort"), 2, $user->rights->fournisseur->commande->lire);
-				$newmenu->add("/fourn/commande/list.php?leftmenu=orders_suppliers&statut=5", $langs->trans("StatusSupplierOrderReceivedAll"), 2, $user->rights->fournisseur->commande->lire);
-				$newmenu->add("/fourn/commande/list.php?leftmenu=orders_suppliers&statut=6,7", $langs->trans("StatusSupplierOrderCanceled"), 2, $user->rights->fournisseur->commande->lire);
-				$newmenu->add("/fourn/commande/list.php?leftmenu=orders_suppliers&statut=9", $langs->trans("StatusSupplierOrderRefused"), 2, $user->rights->fournisseur->commande->lire);
+				$newmenu->add("/fourn/commande/list.php?leftmenu=orders_suppliers&statut=2", $langs->trans("StatusSupplierOrderApprovedShort"), 2, $user->hasRight('fournisseur',  'commande', 'lire'));
+				$newmenu->add("/fourn/commande/list.php?leftmenu=orders_suppliers&statut=3", $langs->trans("StatusSupplierOrderOnProcessShort"), 2, $user->hasRight('fournisseur',  'commande', 'lire'));
+				$newmenu->add("/fourn/commande/list.php?leftmenu=orders_suppliers&statut=4", $langs->trans("StatusSupplierOrderReceivedPartiallyShort"), 2, $user->hasRight('fournisseur',  'commande', 'lire'));
+				$newmenu->add("/fourn/commande/list.php?leftmenu=orders_suppliers&statut=5", $langs->trans("StatusSupplierOrderReceivedAll"), 2, $user->hasRight('fournisseur',  'commande', 'lire'));
+				$newmenu->add("/fourn/commande/list.php?leftmenu=orders_suppliers&statut=6,7", $langs->trans("StatusSupplierOrderCanceled"), 2, $user->hasRight('fournisseur',  'commande', 'lire'));
+				$newmenu->add("/fourn/commande/list.php?leftmenu=orders_suppliers&statut=9", $langs->trans("StatusSupplierOrderRefused"), 2, $user->hasRight('fournisseur',  'commande', 'lire'));
 			}
-			// Billed is another field. We should add instead a dedicated filter on list. if ($usemenuhider || empty($leftmenu) || $leftmenu=="orders_suppliers") $newmenu->add("/fourn/commande/list.php?leftmenu=orders_suppliers&billed=1", $langs->trans("Billed"), 2, $user->rights->fournisseur->commande->lire);
+			// Billed is another field. We should add instead a dedicated filter on list. if ($usemenuhider || empty($leftmenu) || $leftmenu=="orders_suppliers") $newmenu->add("/fourn/commande/list.php?leftmenu=orders_suppliers&billed=1", $langs->trans("Billed"), 2, $user->hasRight('fournisseur',  'commande', 'lire'));
 
 
-			$newmenu->add("/commande/stats/index.php?leftmenu=orders_suppliers&amp;mode=supplier", $langs->trans("Statistics"), 1, $user->rights->fournisseur->commande->lire);
+			$newmenu->add("/commande/stats/index.php?leftmenu=orders_suppliers&amp;mode=supplier", $langs->trans("Statistics"), 1, $user->hasRight('fournisseur',  'commande', 'lire'));
 		}
 
 		// Contrat
 		if (isModEnabled('contrat')) {
 			$langs->load("contracts");
-			$newmenu->add("/contrat/index.php?leftmenu=contracts", $langs->trans("ContractsSubscriptions"), 0, $user->rights->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->rights->contrat->creer);
-			$newmenu->add("/contrat/list.php?leftmenu=contracts", $langs->trans("List"), 1, $user->rights->contrat->lire);
-			$newmenu->add("/contrat/services_list.php?leftmenu=contracts", $langs->trans("MenuServices"), 1, $user->rights->contrat->lire);
+			$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'));
+			$newmenu->add("/contrat/list.php?leftmenu=contracts", $langs->trans("List"), 1, $user->hasRight('contrat',  'lire'));
+			$newmenu->add("/contrat/services_list.php?leftmenu=contracts", $langs->trans("MenuServices"), 1, $user->hasRight('contrat',  'lire'));
 			if ($usemenuhider || empty($leftmenu) || $leftmenu == "contracts") {
-				$newmenu->add("/contrat/services_list.php?leftmenu=contracts&amp;mode=0", $langs->trans("MenuInactiveServices"), 2, $user->rights->contrat->lire);
-				$newmenu->add("/contrat/services_list.php?leftmenu=contracts&amp;mode=4", $langs->trans("MenuRunningServices"), 2, $user->rights->contrat->lire);
-				$newmenu->add("/contrat/services_list.php?leftmenu=contracts&amp;mode=4&amp;filter=expired", $langs->trans("MenuExpiredServices"), 2, $user->rights->contrat->lire);
-				$newmenu->add("/contrat/services_list.php?leftmenu=contracts&amp;mode=5", $langs->trans("MenuClosedServices"), 2, $user->rights->contrat->lire);
+				$newmenu->add("/contrat/services_list.php?leftmenu=contracts&amp;mode=0", $langs->trans("MenuInactiveServices"), 2, $user->hasRight('contrat',  'lire'));
+				$newmenu->add("/contrat/services_list.php?leftmenu=contracts&amp;mode=4", $langs->trans("MenuRunningServices"), 2, $user->hasRight('contrat',  'lire'));
+				$newmenu->add("/contrat/services_list.php?leftmenu=contracts&amp;mode=4&amp;filter=expired", $langs->trans("MenuExpiredServices"), 2, $user->hasRight('contrat',  'lire'));
+				$newmenu->add("/contrat/services_list.php?leftmenu=contracts&amp;mode=5", $langs->trans("MenuClosedServices"), 2, $user->hasRight('contrat',  'lire'));
 			}
 		}
 
 		// Interventions
 		if (isModEnabled('ficheinter')) {
 			$langs->load("interventions");
-			$newmenu->add("/fichinter/index.php?leftmenu=ficheinter", $langs->trans("Interventions"), 0, $user->rights->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->rights->ficheinter->creer, '', '', '', 201);
-			$newmenu->add("/fichinter/list.php?leftmenu=ficheinter", $langs->trans("List"), 1, $user->rights->ficheinter->lire, '', '', '', 202);
+			$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);
+			$newmenu->add("/fichinter/list.php?leftmenu=ficheinter", $langs->trans("List"), 1, $user->hasRight('ficheinter',  'lire'), '', '', '', 202);
 			if ($conf->global->MAIN_FEATURES_LEVEL >= 2) {
-				$newmenu->add("/fichinter/card-rec.php?leftmenu=ficheinter", $langs->trans("ListOfTemplates"), 1, $user->rights->ficheinter->lire, '', '', '', 203);
+				$newmenu->add("/fichinter/card-rec.php?leftmenu=ficheinter", $langs->trans("ListOfTemplates"), 1, $user->hasRight('ficheinter',  'lire'), '', '', '', 203);
 			}
-			$newmenu->add("/fichinter/stats/index.php?leftmenu=ficheinter", $langs->trans("Statistics"), 1, $user->rights->ficheinter->lire);
+			$newmenu->add("/fichinter/stats/index.php?leftmenu=ficheinter", $langs->trans("Statistics"), 1, $user->hasRight('ficheinter',  'lire'));
 		}
 	}
 }
@@ -1410,69 +1410,69 @@ function get_left_menu_billing($mainmenu, &$newmenu, $usemenuhider = 1, $leftmen
 		// Customers invoices
 		if (isModEnabled('facture')) {
 			$langs->load("bills");
-			$newmenu->add("/compta/facture/index.php?leftmenu=customers_bills", $langs->trans("BillsCustomers"), 0, $user->rights->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->rights->facture->creer);
-			$newmenu->add("/compta/facture/list.php?leftmenu=customers_bills", $langs->trans("List"), 1, $user->rights->facture->lire, '', $mainmenu, 'customers_bills_list');
+			$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'));
+			$newmenu->add("/compta/facture/list.php?leftmenu=customers_bills", $langs->trans("List"), 1, $user->hasRight('facture',  'lire'), '', $mainmenu, 'customers_bills_list');
 
 			if ($usemenuhider || empty($leftmenu) || preg_match('/customers_bills(|_draft|_notpaid|_paid|_canceled)$/', $leftmenu)) {
-				$newmenu->add("/compta/facture/list.php?leftmenu=customers_bills_draft&amp;search_status=0", $langs->trans("BillShortStatusDraft"), 2, $user->rights->facture->lire);
-				$newmenu->add("/compta/facture/list.php?leftmenu=customers_bills_notpaid&amp;search_status=1", $langs->trans("BillShortStatusNotPaid"), 2, $user->rights->facture->lire);
-				$newmenu->add("/compta/facture/list.php?leftmenu=customers_bills_paid&amp;search_status=2", $langs->trans("BillShortStatusPaid"), 2, $user->rights->facture->lire);
-				$newmenu->add("/compta/facture/list.php?leftmenu=customers_bills_canceled&amp;search_status=3", $langs->trans("BillShortStatusCanceled"), 2, $user->rights->facture->lire);
+				$newmenu->add("/compta/facture/list.php?leftmenu=customers_bills_draft&amp;search_status=0", $langs->trans("BillShortStatusDraft"), 2, $user->hasRight('facture',  'lire'));
+				$newmenu->add("/compta/facture/list.php?leftmenu=customers_bills_notpaid&amp;search_status=1", $langs->trans("BillShortStatusNotPaid"), 2, $user->hasRight('facture',  'lire'));
+				$newmenu->add("/compta/facture/list.php?leftmenu=customers_bills_paid&amp;search_status=2", $langs->trans("BillShortStatusPaid"), 2, $user->hasRight('facture',  'lire'));
+				$newmenu->add("/compta/facture/list.php?leftmenu=customers_bills_canceled&amp;search_status=3", $langs->trans("BillShortStatusCanceled"), 2, $user->hasRight('facture',  'lire'));
 			}
-			$newmenu->add("/compta/facture/invoicetemplate_list.php?leftmenu=customers_bills_templates", $langs->trans("ListOfTemplates"), 1, $user->rights->facture->creer, '', $mainmenu, 'customers_bills_templates'); // No need to see recurring invoices, if user has no permission to create invoice.
+			$newmenu->add("/compta/facture/invoicetemplate_list.php?leftmenu=customers_bills_templates", $langs->trans("ListOfTemplates"), 1, $user->hasRight('facture',  'creer'), '', $mainmenu, 'customers_bills_templates'); // No need to see recurring invoices, if user has no permission to create invoice.
 
-			$newmenu->add("/compta/paiement/list.php?leftmenu=customers_bills_payment", $langs->trans("Payments"), 1, $user->rights->facture->lire, '', $mainmenu, 'customers_bills_payment');
+			$newmenu->add("/compta/paiement/list.php?leftmenu=customers_bills_payment", $langs->trans("Payments"), 1, $user->hasRight('facture',  'lire'), '', $mainmenu, 'customers_bills_payment');
 
 			if (!empty($conf->global->BILL_ADD_PAYMENT_VALIDATION)) {
-				$newmenu->add("/compta/paiement/tovalidate.php?leftmenu=customers_bills_tovalid", $langs->trans("MenuToValid"), 2, $user->rights->facture->lire, '', $mainmenu, 'customer_bills_tovalid');
+				$newmenu->add("/compta/paiement/tovalidate.php?leftmenu=customers_bills_tovalid", $langs->trans("MenuToValid"), 2, $user->hasRight('facture',  'lire'), '', $mainmenu, 'customer_bills_tovalid');
 			}
 			if ($usemenuhider || empty($leftmenu) || preg_match('/customers_bills/', $leftmenu)) {
-				$newmenu->add("/compta/paiement/rapport.php?leftmenu=customers_bills_payment_report", $langs->trans("Reportings"), 2, $user->rights->facture->lire, '', $mainmenu, 'customers_bills_payment_report');
+				$newmenu->add("/compta/paiement/rapport.php?leftmenu=customers_bills_payment_report", $langs->trans("Reportings"), 2, $user->hasRight('facture',  'lire'), '', $mainmenu, 'customers_bills_payment_report');
 			}
 
-			$newmenu->add("/compta/facture/stats/index.php?leftmenu=customers_bills_stats", $langs->trans("Statistics"), 1, $user->rights->facture->lire, '', $mainmenu, 'customers_bills_stats');
+			$newmenu->add("/compta/facture/stats/index.php?leftmenu=customers_bills_stats", $langs->trans("Statistics"), 1, $user->hasRight('facture',  'lire'), '', $mainmenu, 'customers_bills_stats');
 		}
 
 		// Suppliers invoices
 		if (isModEnabled('societe') && isModEnabled('supplier_invoice')) {
 			$langs->load("bills");
-			$newmenu->add("/fourn/facture/index.php?leftmenu=suppliers_bills", $langs->trans("BillsSuppliers"), 0, $user->rights->fournisseur->facture->lire, '', $mainmenu, 'suppliers_bills', 0, '', '', '', img_picto('', 'supplier_invoice', 'class="paddingright pictofixedwidth"'));
-			$newmenu->add("/fourn/facture/card.php?leftmenu=suppliers_bills&amp;action=create", $langs->trans("NewBill"), 1, ($user->rights->fournisseur->facture->creer || $user->rights->supplier_invoice->creer), '', $mainmenu, 'suppliers_bills_create');
-			$newmenu->add("/fourn/facture/list.php?leftmenu=suppliers_bills", $langs->trans("List"), 1, $user->rights->fournisseur->facture->lire, '', $mainmenu, 'suppliers_bills_list');
+			$newmenu->add("/fourn/facture/index.php?leftmenu=suppliers_bills", $langs->trans("BillsSuppliers"), 0, $user->hasRight('fournisseur',  'facture', 'lire'), '', $mainmenu, 'suppliers_bills', 0, '', '', '', img_picto('', 'supplier_invoice', 'class="paddingright pictofixedwidth"'));
+			$newmenu->add("/fourn/facture/card.php?leftmenu=suppliers_bills&amp;action=create", $langs->trans("NewBill"), 1, ($user->hasRight('fournisseur',  'facture', 'creer') || $user->hasRight('supplier_invoice',  'creer')), '', $mainmenu, 'suppliers_bills_create');
+			$newmenu->add("/fourn/facture/list.php?leftmenu=suppliers_bills", $langs->trans("List"), 1, $user->hasRight('fournisseur',  'facture', 'lire'), '', $mainmenu, 'suppliers_bills_list');
 
 			if ($usemenuhider || empty($leftmenu) || preg_match('/suppliers_bills/', $leftmenu)) {
-				$newmenu->add("/fourn/facture/list.php?leftmenu=suppliers_bills_draft&amp;search_status=0", $langs->trans("BillShortStatusDraft"), 2, $user->rights->fournisseur->facture->lire, '', $mainmenu, 'suppliers_bills_draft');
-				$newmenu->add("/fourn/facture/list.php?leftmenu=suppliers_bills_notpaid&amp;search_status=1", $langs->trans("BillShortStatusNotPaid"), 2, $user->rights->fournisseur->facture->lire, '', $mainmenu, 'suppliers_bills_notpaid');
-				$newmenu->add("/fourn/facture/list.php?leftmenu=suppliers_bills_paid&amp;search_status=2", $langs->trans("BillShortStatusPaid"), 2, $user->rights->fournisseur->facture->lire, '', $mainmenu, 'suppliers_bills_paid');
+				$newmenu->add("/fourn/facture/list.php?leftmenu=suppliers_bills_draft&amp;search_status=0", $langs->trans("BillShortStatusDraft"), 2, $user->hasRight('fournisseur',  'facture', 'lire'), '', $mainmenu, 'suppliers_bills_draft');
+				$newmenu->add("/fourn/facture/list.php?leftmenu=suppliers_bills_notpaid&amp;search_status=1", $langs->trans("BillShortStatusNotPaid"), 2, $user->hasRight('fournisseur',  'facture', 'lire'), '', $mainmenu, 'suppliers_bills_notpaid');
+				$newmenu->add("/fourn/facture/list.php?leftmenu=suppliers_bills_paid&amp;search_status=2", $langs->trans("BillShortStatusPaid"), 2, $user->hasRight('fournisseur',  'facture', 'lire'), '', $mainmenu, 'suppliers_bills_paid');
 			}
 
-			$newmenu->add("/fourn/facture/list-rec.php?leftmenu=supplierinvoicestemplate_list", $langs->trans("ListOfTemplates"), 1, $user->rights->fournisseur->facture->lire, '', $mainmenu, 'supplierinvoicestemplate_list');
+			$newmenu->add("/fourn/facture/list-rec.php?leftmenu=supplierinvoicestemplate_list", $langs->trans("ListOfTemplates"), 1, $user->hasRight('fournisseur',  'facture', 'lire'), '', $mainmenu, 'supplierinvoicestemplate_list');
 
-			$newmenu->add("/fourn/paiement/list.php?leftmenu=suppliers_bills_payment", $langs->trans("Payments"), 1, $user->rights->fournisseur->facture->lire, '', $mainmenu, 'suppliers_bills_payment');
+			$newmenu->add("/fourn/paiement/list.php?leftmenu=suppliers_bills_payment", $langs->trans("Payments"), 1, $user->hasRight('fournisseur',  'facture', 'lire'), '', $mainmenu, 'suppliers_bills_payment');
 
 			if ($usemenuhider || empty($leftmenu) || preg_match('/suppliers_bills/', $leftmenu)) {
-				$newmenu->add("/fourn/facture/rapport.php?leftmenu=suppliers_bills_payment_report", $langs->trans("Reportings"), 2, $user->rights->fournisseur->facture->lire, '', $mainmenu, 'suppliers_bills_payment_report');
+				$newmenu->add("/fourn/facture/rapport.php?leftmenu=suppliers_bills_payment_report", $langs->trans("Reportings"), 2, $user->hasRight('fournisseur',  'facture', 'lire'), '', $mainmenu, 'suppliers_bills_payment_report');
 			}
 
-			$newmenu->add("/compta/facture/stats/index.php?mode=supplier&amp;leftmenu=suppliers_bills_stats", $langs->trans("Statistics"), 1, $user->rights->fournisseur->facture->lire, '', $mainmenu, 'suppliers_bills_stats');
+			$newmenu->add("/compta/facture/stats/index.php?mode=supplier&amp;leftmenu=suppliers_bills_stats", $langs->trans("Statistics"), 1, $user->hasRight('fournisseur',  'facture', 'lire'), '', $mainmenu, 'suppliers_bills_stats');
 		}
 
 		// Orders
 		if (isModEnabled('commande')) {
 			$langs->load("orders");
 			if (isModEnabled('facture')) {
-				$newmenu->add("/commande/list.php?leftmenu=orders&amp;search_status=-3&amp;billed=0&amp;contextpage=billableorders", $langs->trans("MenuOrdersToBill2"), 0, $user->rights->commande->lire, '', $mainmenu, 'orders', 0, '', '', '', img_picto('', 'order', 'class="paddingright pictofixedwidth"'));
+				$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->rights->commande->lire);
+			//if ($usemenuhider || empty($leftmenu) || $leftmenu=="orders") $newmenu->add("/commande/", $langs->trans("StatusOrderToBill"), 1, $user->hasRight('commande',  'lire'));
 		}
 
 		// Supplier Orders to bill
 		if (isModEnabled('supplier_invoice')) {
 			if (!empty($conf->global->SUPPLIER_MENU_ORDER_RECEIVED_INTO_INVOICE)) {
 				$langs->load("supplier");
-				$newmenu->add("/fourn/commande/list.php?leftmenu=orders&amp;search_status=5&amp;billed=0", $langs->trans("MenuOrdersSupplierToBill"), 0, $user->rights->commande->lire, '', $mainmenu, 'orders', 0, '', '', '', img_picto('', 'supplier_order', 'class="paddingright pictofixedwidth"'));
-				//if ($usemenuhider || empty($leftmenu) || $leftmenu=="orders") $newmenu->add("/commande/", $langs->trans("StatusOrderToBill"), 1, $user->rights->commande->lire);
+				$newmenu->add("/fourn/commande/list.php?leftmenu=orders&amp;search_status=5&amp;billed=0", $langs->trans("MenuOrdersSupplierToBill"), 0, $user->hasRight('commande',  'lire'), '', $mainmenu, 'orders', 0, '', '', '', img_picto('', 'supplier_order', 'class="paddingright pictofixedwidth"'));
+				//if ($usemenuhider || empty($leftmenu) || $leftmenu=="orders") $newmenu->add("/commande/", $langs->trans("StatusOrderToBill"), 1, $user->hasRight('commande',  'lire'));
 			}
 		}
 
@@ -1480,58 +1480,58 @@ function get_left_menu_billing($mainmenu, &$newmenu, $usemenuhider = 1, $leftmen
 		// Donations
 		if (isModEnabled('don')) {
 			$langs->load("donations");
-			$newmenu->add("/don/index.php?leftmenu=donations&amp;mainmenu=billing", $langs->trans("Donations"), 0, $user->rights->don->lire, '', $mainmenu, 'donations', 0, '', '', '', img_picto('', 'donation', 'class="paddingright pictofixedwidth"'));
+			$newmenu->add("/don/index.php?leftmenu=donations&amp;mainmenu=billing", $langs->trans("Donations"), 0, $user->hasRight('don',  'lire'), '', $mainmenu, 'donations', 0, '', '', '', img_picto('', 'donation', 'class="paddingright pictofixedwidth"'));
 			if ($usemenuhider || empty($leftmenu) || $leftmenu == "donations") {
-				$newmenu->add("/don/card.php?leftmenu=donations&amp;action=create", $langs->trans("NewDonation"), 1, $user->rights->don->creer);
-				$newmenu->add("/don/list.php?leftmenu=donations", $langs->trans("List"), 1, $user->rights->don->lire);
+				$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'));
 			}
-			// if ($leftmenu=="donations") $newmenu->add("/don/stats/index.php",$langs->trans("Statistics"), 1, $user->rights->don->lire);
+			// if ($leftmenu=="donations") $newmenu->add("/don/stats/index.php",$langs->trans("Statistics"), 1, $user->hasRight('don',  'lire'));
 		}
 
 		// Taxes and social contributions
 		if (isModEnabled('tax')) {
-			$newmenu->add("/compta/charges/index.php?leftmenu=tax&amp;mainmenu=billing", $langs->trans("MenuTaxesAndSpecialExpenses"), 0, $user->rights->tax->charges->lire, '', $mainmenu, 'tax', 0, '', '', '', img_picto('', 'payment', 'class="paddingright pictofixedwidth"'));
+			$newmenu->add("/compta/charges/index.php?leftmenu=tax&amp;mainmenu=billing", $langs->trans("MenuTaxesAndSpecialExpenses"), 0, $user->hasRight('tax',  'charges', 'lire'), '', $mainmenu, 'tax', 0, '', '', '', img_picto('', 'payment', 'class="paddingright pictofixedwidth"'));
 
-			$newmenu->add("/compta/sociales/list.php?leftmenu=tax_social", $langs->trans("MenuSocialContributions"), 1, $user->rights->tax->charges->lire);
+			$newmenu->add("/compta/sociales/list.php?leftmenu=tax_social", $langs->trans("MenuSocialContributions"), 1, $user->hasRight('tax',  'charges', 'lire'));
 			if ($usemenuhider || empty($leftmenu) || preg_match('/^tax_social/i', $leftmenu)) {
-				$newmenu->add("/compta/sociales/card.php?leftmenu=tax_social&action=create", $langs->trans("MenuNewSocialContribution"), 2, $user->rights->tax->charges->creer);
-				$newmenu->add("/compta/sociales/list.php?leftmenu=tax_social", $langs->trans("List"), 2, $user->rights->tax->charges->lire);
-				$newmenu->add("/compta/sociales/payments.php?leftmenu=tax_social&amp;mainmenu=billing", $langs->trans("Payments"), 2, $user->rights->tax->charges->lire);
+				$newmenu->add("/compta/sociales/card.php?leftmenu=tax_social&action=create", $langs->trans("MenuNewSocialContribution"), 2, $user->hasRight('tax',  'charges', 'creer'));
+				$newmenu->add("/compta/sociales/list.php?leftmenu=tax_social", $langs->trans("List"), 2, $user->hasRight('tax',  'charges', 'lire'));
+				$newmenu->add("/compta/sociales/payments.php?leftmenu=tax_social&amp;mainmenu=billing", $langs->trans("Payments"), 2, $user->hasRight('tax',  'charges', 'lire'));
 			}
 			// VAT
 			if (empty($conf->global->TAX_DISABLE_VAT_MENUS)) {
 				global $mysoc;
 
-				$newmenu->add("/compta/tva/list.php?leftmenu=tax_vat&amp;mainmenu=billing", $langs->transcountry("VAT", $mysoc->country_code), 1, $user->rights->tax->charges->lire, '', $mainmenu, 'tax_vat');
+				$newmenu->add("/compta/tva/list.php?leftmenu=tax_vat&amp;mainmenu=billing", $langs->transcountry("VAT", $mysoc->country_code), 1, $user->hasRight('tax',  'charges', 'lire'), '', $mainmenu, 'tax_vat');
 				if ($usemenuhider || empty($leftmenu) || preg_match('/^tax_vat/i', $leftmenu)) {
-					$newmenu->add("/compta/tva/card.php?leftmenu=tax_vat&action=create", $langs->trans("New"), 2, $user->rights->tax->charges->creer);
-					$newmenu->add("/compta/tva/list.php?leftmenu=tax_vat", $langs->trans("List"), 2, $user->rights->tax->charges->lire);
-					$newmenu->add("/compta/tva/payments.php?mode=tvaonly&amp;leftmenu=tax_vat", $langs->trans("Payments"), 2, $user->rights->tax->charges->lire);
-					$newmenu->add("/compta/tva/index.php?leftmenu=tax_vat", $langs->trans("ReportByMonth"), 2, $user->rights->tax->charges->lire);
-					$newmenu->add("/compta/tva/clients.php?leftmenu=tax_vat", $langs->trans("ReportByThirdparties"), 2, $user->rights->tax->charges->lire);
-					$newmenu->add("/compta/tva/quadri_detail.php?leftmenu=tax_vat", $langs->trans("ReportByQuarter"), 2, $user->rights->tax->charges->lire);
+					$newmenu->add("/compta/tva/card.php?leftmenu=tax_vat&action=create", $langs->trans("New"), 2, $user->hasRight('tax',  'charges', 'creer'));
+					$newmenu->add("/compta/tva/list.php?leftmenu=tax_vat", $langs->trans("List"), 2, $user->hasRight('tax',  'charges', 'lire'));
+					$newmenu->add("/compta/tva/payments.php?mode=tvaonly&amp;leftmenu=tax_vat", $langs->trans("Payments"), 2, $user->hasRight('tax',  'charges', 'lire'));
+					$newmenu->add("/compta/tva/index.php?leftmenu=tax_vat", $langs->trans("ReportByMonth"), 2, $user->hasRight('tax',  'charges', 'lire'));
+					$newmenu->add("/compta/tva/clients.php?leftmenu=tax_vat", $langs->trans("ReportByThirdparties"), 2, $user->hasRight('tax',  'charges', 'lire'));
+					$newmenu->add("/compta/tva/quadri_detail.php?leftmenu=tax_vat", $langs->trans("ReportByQuarter"), 2, $user->hasRight('tax',  'charges', 'lire'));
 				}
 
 				//Local Taxes 1
 				if ($mysoc->useLocalTax(1) && (isset($mysoc->localtax1_assuj) && $mysoc->localtax1_assuj == "1")) {
-					$newmenu->add("/compta/localtax/list.php?leftmenu=tax_1_vat&amp;mainmenu=billing&amp;localTaxType=1", $langs->transcountry("LT1", $mysoc->country_code), 1, $user->rights->tax->charges->lire);
+					$newmenu->add("/compta/localtax/list.php?leftmenu=tax_1_vat&amp;mainmenu=billing&amp;localTaxType=1", $langs->transcountry("LT1", $mysoc->country_code), 1, $user->hasRight('tax',  'charges', 'lire'));
 					if ($usemenuhider || empty($leftmenu) || preg_match('/^tax_1_vat/i', $leftmenu)) {
-						$newmenu->add("/compta/localtax/card.php?leftmenu=tax_1_vat&action=create&amp;localTaxType=1", $langs->trans("New"), 2, $user->rights->tax->charges->creer);
-						$newmenu->add("/compta/localtax/list.php?leftmenu=tax_1_vat&amp;localTaxType=1", $langs->trans("List"), 2, $user->rights->tax->charges->lire);
-						$newmenu->add("/compta/localtax/index.php?leftmenu=tax_1_vat&amp;localTaxType=1", $langs->trans("ReportByMonth"), 2, $user->rights->tax->charges->lire);
-						$newmenu->add("/compta/localtax/clients.php?leftmenu=tax_1_vat&amp;localTaxType=1", $langs->trans("ReportByThirdparties"), 2, $user->rights->tax->charges->lire);
-						$newmenu->add("/compta/localtax/quadri_detail.php?leftmenu=tax_1_vat&amp;localTaxType=1", $langs->trans("ReportByQuarter"), 2, $user->rights->tax->charges->lire);
+						$newmenu->add("/compta/localtax/card.php?leftmenu=tax_1_vat&action=create&amp;localTaxType=1", $langs->trans("New"), 2, $user->hasRight('tax',  'charges', 'creer'));
+						$newmenu->add("/compta/localtax/list.php?leftmenu=tax_1_vat&amp;localTaxType=1", $langs->trans("List"), 2, $user->hasRight('tax',  'charges', 'lire'));
+						$newmenu->add("/compta/localtax/index.php?leftmenu=tax_1_vat&amp;localTaxType=1", $langs->trans("ReportByMonth"), 2, $user->hasRight('tax',  'charges', 'lire'));
+						$newmenu->add("/compta/localtax/clients.php?leftmenu=tax_1_vat&amp;localTaxType=1", $langs->trans("ReportByThirdparties"), 2, $user->hasRight('tax',  'charges', 'lire'));
+						$newmenu->add("/compta/localtax/quadri_detail.php?leftmenu=tax_1_vat&amp;localTaxType=1", $langs->trans("ReportByQuarter"), 2, $user->hasRight('tax',  'charges', 'lire'));
 					}
 				}
 				//Local Taxes 2
 				if ($mysoc->useLocalTax(2) && (isset($mysoc->localtax2_assuj) && $mysoc->localtax2_assuj == "1")) {
-					$newmenu->add("/compta/localtax/list.php?leftmenu=tax_2_vat&amp;mainmenu=billing&amp;localTaxType=2", $langs->transcountry("LT2", $mysoc->country_code), 1, $user->rights->tax->charges->lire);
+					$newmenu->add("/compta/localtax/list.php?leftmenu=tax_2_vat&amp;mainmenu=billing&amp;localTaxType=2", $langs->transcountry("LT2", $mysoc->country_code), 1, $user->hasRight('tax',  'charges', 'lire'));
 					if ($usemenuhider || empty($leftmenu) || preg_match('/^tax_2_vat/i', $leftmenu)) {
-						$newmenu->add("/compta/localtax/card.php?leftmenu=tax_2_vat&action=create&amp;localTaxType=2", $langs->trans("New"), 2, $user->rights->tax->charges->creer);
-						$newmenu->add("/compta/localtax/list.php?leftmenu=tax_2_vat&amp;localTaxType=2", $langs->trans("List"), 2, $user->rights->tax->charges->lire);
-						$newmenu->add("/compta/localtax/index.php?leftmenu=tax_2_vat&amp;localTaxType=2", $langs->trans("ReportByMonth"), 2, $user->rights->tax->charges->lire);
-						$newmenu->add("/compta/localtax/clients.php?leftmenu=tax_2_vat&amp;localTaxType=2", $langs->trans("ReportByThirdparties"), 2, $user->rights->tax->charges->lire);
-						$newmenu->add("/compta/localtax/quadri_detail.php?leftmenu=tax_2_vat&amp;localTaxType=2", $langs->trans("ReportByQuarter"), 2, $user->rights->tax->charges->lire);
+						$newmenu->add("/compta/localtax/card.php?leftmenu=tax_2_vat&action=create&amp;localTaxType=2", $langs->trans("New"), 2, $user->hasRight('tax',  'charges', 'creer'));
+						$newmenu->add("/compta/localtax/list.php?leftmenu=tax_2_vat&amp;localTaxType=2", $langs->trans("List"), 2, $user->hasRight('tax',  'charges', 'lire'));
+						$newmenu->add("/compta/localtax/index.php?leftmenu=tax_2_vat&amp;localTaxType=2", $langs->trans("ReportByMonth"), 2, $user->hasRight('tax',  'charges', 'lire'));
+						$newmenu->add("/compta/localtax/clients.php?leftmenu=tax_2_vat&amp;localTaxType=2", $langs->trans("ReportByThirdparties"), 2, $user->hasRight('tax',  'charges', 'lire'));
+						$newmenu->add("/compta/localtax/quadri_detail.php?leftmenu=tax_2_vat&amp;localTaxType=2", $langs->trans("ReportByQuarter"), 2, $user->hasRight('tax',  'charges', 'lire'));
 					}
 				}
 			}
@@ -1540,32 +1540,32 @@ function get_left_menu_billing($mainmenu, &$newmenu, $usemenuhider = 1, $leftmen
 		// Salaries
 		if (isModEnabled('salaries')) {
 			$langs->load("salaries");
-			$newmenu->add("/salaries/list.php?leftmenu=tax_salary&amp;mainmenu=billing", $langs->trans("Salaries"), 0, $user->rights->salaries->read, '', $mainmenu, 'tax_salary', 0, '', '', '', img_picto('', 'salary', 'class="paddingright pictofixedwidth"'));
+			$newmenu->add("/salaries/list.php?leftmenu=tax_salary&amp;mainmenu=billing", $langs->trans("Salaries"), 0, $user->hasRight('salaries',  'read'), '', $mainmenu, 'tax_salary', 0, '', '', '', img_picto('', 'salary', 'class="paddingright pictofixedwidth"'));
 			if ($usemenuhider || empty($leftmenu) || preg_match('/^tax_salary/i', $leftmenu)) {
-				$newmenu->add("/salaries/card.php?leftmenu=tax_salary&action=create", $langs->trans("New"), 1, $user->rights->salaries->write);
-				$newmenu->add("/salaries/list.php?leftmenu=tax_salary", $langs->trans("List"), 1, $user->rights->salaries->read);
-				$newmenu->add("/salaries/payments.php?leftmenu=tax_salary", $langs->trans("Payments"), 1, $user->rights->salaries->read);
-				$newmenu->add("/salaries/stats/index.php?leftmenu=tax_salary", $langs->trans("Statistics"), 1, $user->rights->salaries->read);
+				$newmenu->add("/salaries/card.php?leftmenu=tax_salary&action=create", $langs->trans("New"), 1, $user->hasRight('salaries',  'write'));
+				$newmenu->add("/salaries/list.php?leftmenu=tax_salary", $langs->trans("List"), 1, $user->hasRight('salaries',  'read'));
+				$newmenu->add("/salaries/payments.php?leftmenu=tax_salary", $langs->trans("Payments"), 1, $user->hasRight('salaries',  'read'));
+				$newmenu->add("/salaries/stats/index.php?leftmenu=tax_salary", $langs->trans("Statistics"), 1, $user->hasRight('salaries',  'read'));
 			}
 		}
 
 		// Loan
 		if (isModEnabled('loan')) {
 			$langs->load("loan");
-			$newmenu->add("/loan/list.php?leftmenu=tax_loan&amp;mainmenu=billing", $langs->trans("Loans"), 0, $user->rights->loan->read, '', $mainmenu, 'tax_loan', 0, '', '', '', img_picto('', 'loan', 'class="paddingright pictofixedwidth"'));
+			$newmenu->add("/loan/list.php?leftmenu=tax_loan&amp;mainmenu=billing", $langs->trans("Loans"), 0, $user->hasRight('loan',  'read'), '', $mainmenu, 'tax_loan', 0, '', '', '', img_picto('', 'loan', 'class="paddingright pictofixedwidth"'));
 			if ($usemenuhider || empty($leftmenu) || preg_match('/^tax_loan/i', $leftmenu)) {
-				$newmenu->add("/loan/card.php?leftmenu=tax_loan&action=create", $langs->trans("NewLoan"), 1, $user->rights->loan->write);
-				//$newmenu->add("/loan/payment/list.php?leftmenu=tax_loan",$langs->trans("Payments"),2,$user->rights->loan->read);
+				$newmenu->add("/loan/card.php?leftmenu=tax_loan&action=create", $langs->trans("NewLoan"), 1, $user->hasRight('loan',  'write'));
+				//$newmenu->add("/loan/payment/list.php?leftmenu=tax_loan",$langs->trans("Payments"),2,$user->hasRight('loan',  'read'));
 			}
 		}
 
 		// Various payment
 		if (isModEnabled('banque') && empty($conf->global->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->rights->banque->lire, '', $mainmenu, 'tax_various', 0, '', '', '', img_picto('', 'payment', 'class="paddingright pictofixedwidth"'));
+			$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)) {
-				$newmenu->add("/compta/bank/various_payment/card.php?leftmenu=tax_various&action=create", $langs->trans("New"), 1, $user->rights->banque->modifier);
-				$newmenu->add("/compta/bank/various_payment/list.php?leftmenu=tax_various", $langs->trans("List"), 1, $user->rights->banque->lire);
+				$newmenu->add("/compta/bank/various_payment/card.php?leftmenu=tax_various&action=create", $langs->trans("New"), 1, $user->hasRight('banque',  'modifier'));
+				$newmenu->add("/compta/bank/various_payment/list.php?leftmenu=tax_various", $langs->trans("List"), 1, $user->hasRight('banque',  'lire'));
 			}
 		}
 	}
@@ -1591,75 +1591,75 @@ function get_left_menu_accountancy($mainmenu, &$newmenu, $usemenuhider = 1, $lef
 
 		// Accounting (Double entries)
 		if (isModEnabled('accounting')) {
-			//$permtoshowmenu = (isModEnabled('accounting') || $user->rights->accounting->bind->write || $user->rights->compta->resultat->lire);
+			//$permtoshowmenu = (isModEnabled('accounting') || $user->hasRight('accounting',  'bind', 'write') || $user->hasRight('compta',  'resultat', 'lire'));
 			//$newmenu->add("/accountancy/index.php?leftmenu=accountancy", $langs->trans("MenuAccountancy"), 0, $permtoshowmenu, '', $mainmenu, 'accountancy');
 
 			// Configuration
-			$newmenu->add("/accountancy/index.php?leftmenu=accountancy_admin", $langs->trans("Setup"), 0, $user->rights->accounting->chartofaccount, '', $mainmenu, 'accountancy_admin', 1, '', '', '', img_picto('', 'technic', 'class="paddingright pictofixedwidth"'));
+			$newmenu->add("/accountancy/index.php?leftmenu=accountancy_admin", $langs->trans("Setup"), 0, $user->hasRight('accounting',  'chartofaccount'), '', $mainmenu, 'accountancy_admin', 1, '', '', '', img_picto('', 'technic', 'class="paddingright pictofixedwidth"'));
 			if ($usemenuhider || empty($leftmenu) || preg_match('/accountancy_admin/', $leftmenu)) {
 				global $mysoc;
-				$newmenu->add("/accountancy/admin/index.php?mainmenu=accountancy&leftmenu=accountancy_admin", $langs->trans("General"), 1, $user->rights->accounting->chartofaccount, '', $mainmenu, 'accountancy_admin_general', 10);
+				$newmenu->add("/accountancy/admin/index.php?mainmenu=accountancy&leftmenu=accountancy_admin", $langs->trans("General"), 1, $user->hasRight('accounting',  'chartofaccount'), '', $mainmenu, 'accountancy_admin_general', 10);
 
 				// Fiscal year - Not really yet used. In a future will lock some periods.
 				if ($conf->global->MAIN_FEATURES_LEVEL > 1) {
-					$newmenu->add("/accountancy/admin/fiscalyear.php?mainmenu=accountancy&leftmenu=accountancy_admin", $langs->trans("FiscalPeriod"), 1, $user->rights->accounting->fiscalyear->write, '', $mainmenu, 'fiscalyear', 20);
+					$newmenu->add("/accountancy/admin/fiscalyear.php?mainmenu=accountancy&leftmenu=accountancy_admin", $langs->trans("FiscalPeriod"), 1, $user->hasRight('accounting',  'fiscalyear', 'write'), '', $mainmenu, 'fiscalyear', 20);
 				}
 
-				$newmenu->add("/accountancy/admin/journals_list.php?id=35&mainmenu=accountancy&leftmenu=accountancy_admin", $langs->trans("AccountingJournals"), 1, $user->rights->accounting->chartofaccount, '', $mainmenu, 'accountancy_admin_journal', 30);
-				$newmenu->add("/accountancy/admin/accountmodel.php?id=31&mainmenu=accountancy&leftmenu=accountancy_admin", $langs->trans("Pcg_version"), 1, $user->rights->accounting->chartofaccount, '', $mainmenu, 'accountancy_admin_chartmodel', 40);
-				$newmenu->add("/accountancy/admin/account.php?mainmenu=accountancy&leftmenu=accountancy_admin", $langs->trans("Chartofaccounts"), 1, $user->rights->accounting->chartofaccount, '', $mainmenu, 'accountancy_admin_chart', 41);
-				$newmenu->add("/accountancy/admin/subaccount.php?mainmenu=accountancy&leftmenu=accountancy_admin", $langs->trans("ChartOfSubaccounts"), 1, $user->rights->accounting->chartofaccount, '', $mainmenu, 'accountancy_admin_chart', 41);
-				$newmenu->add("/accountancy/admin/categories_list.php?id=32&search_country_id=".$mysoc->country_id."&mainmenu=accountancy&leftmenu=accountancy_admin", $langs->trans("AccountingCategory"), 1, $user->rights->accounting->chartofaccount, '', $mainmenu, 'accountancy_admin_chart', 50);
-				$newmenu->add("/accountancy/admin/defaultaccounts.php?mainmenu=accountancy&leftmenu=accountancy_admin", $langs->trans("MenuDefaultAccounts"), 1, $user->rights->accounting->chartofaccount, '', $mainmenu, 'accountancy_admin_default', 60);
+				$newmenu->add("/accountancy/admin/journals_list.php?id=35&mainmenu=accountancy&leftmenu=accountancy_admin", $langs->trans("AccountingJournals"), 1, $user->hasRight('accounting',  'chartofaccount'), '', $mainmenu, 'accountancy_admin_journal', 30);
+				$newmenu->add("/accountancy/admin/accountmodel.php?id=31&mainmenu=accountancy&leftmenu=accountancy_admin", $langs->trans("Pcg_version"), 1, $user->hasRight('accounting',  'chartofaccount'), '', $mainmenu, 'accountancy_admin_chartmodel', 40);
+				$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/categories_list.php?id=32&search_country_id=".$mysoc->country_id."&mainmenu=accountancy&leftmenu=accountancy_admin", $langs->trans("AccountingCategory"), 1, $user->hasRight('accounting',  'chartofaccount'), '', $mainmenu, 'accountancy_admin_chart', 50);
+				$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')) {
-					$newmenu->add("/compta/bank/list.php?mainmenu=accountancy&leftmenu=accountancy_admin&search_status=-1", $langs->trans("MenuBankAccounts"), 1, $user->rights->accounting->chartofaccount, '', $mainmenu, 'accountancy_admin_bank', 70);
+					$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('fournisseur') && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD)) || 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->rights->accounting->chartofaccount, '', $mainmenu, 'accountancy_admin_default', 80);
+					$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')) {
-					$newmenu->add("/admin/dict.php?id=7&from=accountancy&search_country_id=".$mysoc->country_id."&mainmenu=accountancy&leftmenu=accountancy_admin", $langs->trans("MenuTaxAccounts"), 1, $user->rights->accounting->chartofaccount, '', $mainmenu, 'accountancy_admin_default', 90);
+					$newmenu->add("/admin/dict.php?id=7&from=accountancy&search_country_id=".$mysoc->country_id."&mainmenu=accountancy&leftmenu=accountancy_admin", $langs->trans("MenuTaxAccounts"), 1, $user->hasRight('accounting',  'chartofaccount'), '', $mainmenu, 'accountancy_admin_default', 90);
 				}
 				if (isModEnabled('expensereport')) {
-					$newmenu->add("/admin/dict.php?id=17&from=accountancy&mainmenu=accountancy&leftmenu=accountancy_admin", $langs->trans("MenuExpenseReportAccounts"), 1, $user->rights->accounting->chartofaccount, '', $mainmenu, 'accountancy_admin_default', 100);
+					$newmenu->add("/admin/dict.php?id=17&from=accountancy&mainmenu=accountancy&leftmenu=accountancy_admin", $langs->trans("MenuExpenseReportAccounts"), 1, $user->hasRight('accounting',  'chartofaccount'), '', $mainmenu, 'accountancy_admin_default', 100);
 				}
-				$newmenu->add("/accountancy/admin/productaccount.php?mainmenu=accountancy&leftmenu=accountancy_admin", $langs->trans("MenuProductsAccounts"), 1, $user->rights->accounting->chartofaccount, '', $mainmenu, 'accountancy_admin_product', 110);
+				$newmenu->add("/accountancy/admin/productaccount.php?mainmenu=accountancy&leftmenu=accountancy_admin", $langs->trans("MenuProductsAccounts"), 1, $user->hasRight('accounting',  'chartofaccount'), '', $mainmenu, 'accountancy_admin_product', 110);
 				if ($conf->global->MAIN_FEATURES_LEVEL > 1) {
-					$newmenu->add("/accountancy/admin/closure.php?mainmenu=accountancy&leftmenu=accountancy_admin", $langs->trans("MenuClosureAccounts"), 1, $user->rights->accounting->chartofaccount, '', $mainmenu, 'accountancy_admin_closure', 120);
+					$newmenu->add("/accountancy/admin/closure.php?mainmenu=accountancy&leftmenu=accountancy_admin", $langs->trans("MenuClosureAccounts"), 1, $user->hasRight('accounting',  'chartofaccount'), '', $mainmenu, 'accountancy_admin_closure', 120);
 				}
-				$newmenu->add("/accountancy/admin/export.php?mainmenu=accountancy&leftmenu=accountancy_admin", $langs->trans("ExportOptions"), 1, $user->rights->accounting->chartofaccount, '', $mainmenu, 'accountancy_admin_export', 130);
+				$newmenu->add("/accountancy/admin/export.php?mainmenu=accountancy&leftmenu=accountancy_admin", $langs->trans("ExportOptions"), 1, $user->hasRight('accounting',  'chartofaccount'), '', $mainmenu, 'accountancy_admin_export', 130);
 			}
 
 			// Transfer in accounting
-			$newmenu->add("/accountancy/index.php?leftmenu=accountancy_transfer", $langs->trans("TransferInAccounting"), 0, $user->rights->accounting->bind->write, '', $mainmenu, 'transfer', 1, '', '', '', img_picto('', 'long-arrow-alt-right', 'class="paddingright pictofixedwidth"'));
+			$newmenu->add("/accountancy/index.php?leftmenu=accountancy_transfer", $langs->trans("TransferInAccounting"), 0, $user->hasRight('accounting',  'bind', 'write'), '', $mainmenu, 'transfer', 1, '', '', '', img_picto('', 'long-arrow-alt-right', 'class="paddingright pictofixedwidth"'));
 
 			// Binding
-			// $newmenu->add("", $langs->trans("Binding"), 0, $user->rights->accounting->bind->write, '', $mainmenu, 'dispatch');
+			// $newmenu->add("", $langs->trans("Binding"), 0, $user->hasRight('accounting',  'bind', 'write'), '', $mainmenu, 'dispatch');
 			if (isModEnabled('facture') && empty($conf->global->ACCOUNTING_DISABLE_BINDING_ON_SALES)) {
-				$newmenu->add("/accountancy/customer/index.php?leftmenu=accountancy_dispatch_customer&amp;mainmenu=accountancy", $langs->trans("CustomersVentilation"), 1, $user->rights->accounting->bind->write, '', $mainmenu, 'dispatch_customer');
+				$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->rights->accounting->bind->write);
-					$newmenu->add("/accountancy/customer/lines.php?mainmenu=accountancy&amp;leftmenu=accountancy_dispatch_customer", $langs->trans("Binded"), 2, $user->rights->accounting->bind->write);
+					$newmenu->add("/accountancy/customer/list.php?mainmenu=accountancy&amp;leftmenu=accountancy_dispatch_customer", $langs->trans("ToBind"), 2, $user->hasRight('accounting',  'bind', 'write'));
+					$newmenu->add("/accountancy/customer/lines.php?mainmenu=accountancy&amp;leftmenu=accountancy_dispatch_customer", $langs->trans("Binded"), 2, $user->hasRight('accounting',  'bind', 'write'));
 				}
 			}
 			if (isModEnabled('supplier_invoice') && empty($conf->global->ACCOUNTING_DISABLE_BINDING_ON_PURCHASES)) {
-				$newmenu->add("/accountancy/supplier/index.php?leftmenu=accountancy_dispatch_supplier&amp;mainmenu=accountancy", $langs->trans("SuppliersVentilation"), 1, $user->rights->accounting->bind->write, '', $mainmenu, 'dispatch_supplier');
+				$newmenu->add("/accountancy/supplier/index.php?leftmenu=accountancy_dispatch_supplier&amp;mainmenu=accountancy", $langs->trans("SuppliersVentilation"), 1, $user->hasRight('accounting',  'bind', 'write'), '', $mainmenu, 'dispatch_supplier');
 				if ($usemenuhider || empty($leftmenu) || preg_match('/accountancy_dispatch_supplier/', $leftmenu)) {
-					$newmenu->add("/accountancy/supplier/list.php?mainmenu=accountancy&amp;leftmenu=accountancy_dispatch_supplier", $langs->trans("ToBind"), 2, $user->rights->accounting->bind->write);
-					$newmenu->add("/accountancy/supplier/lines.php?mainmenu=accountancy&amp;leftmenu=accountancy_dispatch_supplier", $langs->trans("Binded"), 2, $user->rights->accounting->bind->write);
+					$newmenu->add("/accountancy/supplier/list.php?mainmenu=accountancy&amp;leftmenu=accountancy_dispatch_supplier", $langs->trans("ToBind"), 2, $user->hasRight('accounting',  'bind', 'write'));
+					$newmenu->add("/accountancy/supplier/lines.php?mainmenu=accountancy&amp;leftmenu=accountancy_dispatch_supplier", $langs->trans("Binded"), 2, $user->hasRight('accounting',  'bind', 'write'));
 				}
 			}
 			if (isModEnabled('expensereport') && empty($conf->global->ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS)) {
-				$newmenu->add("/accountancy/expensereport/index.php?leftmenu=accountancy_dispatch_expensereport&amp;mainmenu=accountancy", $langs->trans("ExpenseReportsVentilation"), 1, $user->rights->accounting->bind->write, '', $mainmenu, 'dispatch_expensereport');
+				$newmenu->add("/accountancy/expensereport/index.php?leftmenu=accountancy_dispatch_expensereport&amp;mainmenu=accountancy", $langs->trans("ExpenseReportsVentilation"), 1, $user->hasRight('accounting',  'bind', 'write'), '', $mainmenu, 'dispatch_expensereport');
 				if ($usemenuhider || empty($leftmenu) || preg_match('/accountancy_dispatch_expensereport/', $leftmenu)) {
-					$newmenu->add("/accountancy/expensereport/list.php?mainmenu=accountancy&amp;leftmenu=accountancy_dispatch_expensereport", $langs->trans("ToBind"), 2, $user->rights->accounting->bind->write);
-					$newmenu->add("/accountancy/expensereport/lines.php?mainmenu=accountancy&amp;leftmenu=accountancy_dispatch_expensereport", $langs->trans("Binded"), 2, $user->rights->accounting->bind->write);
+					$newmenu->add("/accountancy/expensereport/list.php?mainmenu=accountancy&amp;leftmenu=accountancy_dispatch_expensereport", $langs->trans("ToBind"), 2, $user->hasRight('accounting',  'bind', 'write'));
+					$newmenu->add("/accountancy/expensereport/lines.php?mainmenu=accountancy&amp;leftmenu=accountancy_dispatch_expensereport", $langs->trans("Binded"), 2, $user->hasRight('accounting',  'bind', 'write'));
 				}
 			}
 
 			// Journals
-			if (isModEnabled('accounting') && !empty($user->rights->accounting->comptarapport->lire) && $mainmenu == 'accountancy') {
-				$newmenu->add('', $langs->trans("RegistrationInAccounting"), 1, $user->rights->accounting->comptarapport->lire, '', '', '');
+			if (isModEnabled('accounting') && !empty($user->hasRight('accounting',  'comptarapport', 'lire')) && $mainmenu == 'accountancy') {
+				$newmenu->add('', $langs->trans("RegistrationInAccounting"), 1, $user->hasRight('accounting',  'comptarapport', 'lire'), '', '', '');
 
 				// Multi journal
 				$sql = "SELECT rowid, code, label, nature";
@@ -1714,13 +1714,13 @@ function get_left_menu_accountancy($mainmenu, &$newmenu, $usemenuhider = 1, $lef
 							if ($nature) {
 								$langs->load('accountancy');
 								$journallabel = $langs->transnoentities($objp->label); // Labels in this table are set by loading llx_accounting_abc.sql. Label can be 'ACCOUNTING_SELL_JOURNAL', 'InventoryJournal', ...
-								$newmenu->add('/accountancy/journal/'.$nature.'journal.php?mainmenu=accountancy&leftmenu=accountancy_journal&id_journal='.$objp->rowid, $journallabel, 2, $user->rights->accounting->comptarapport->lire);
+								$newmenu->add('/accountancy/journal/'.$nature.'journal.php?mainmenu=accountancy&leftmenu=accountancy_journal&id_journal='.$objp->rowid, $journallabel, 2, $user->hasRight('accounting',  'comptarapport', 'lire'));
 							}
 								$i++;
 						}
 					} else {
 						// Should not happend. Entries are added
-						$newmenu->add('', $langs->trans("NoJournalDefined"), 2, $user->rights->accounting->comptarapport->lire);
+						$newmenu->add('', $langs->trans("NoJournalDefined"), 2, $user->hasRight('accounting',  'comptarapport', 'lire'));
 					}
 				} else {
 					dol_print_error($db);
@@ -1730,80 +1730,80 @@ function get_left_menu_accountancy($mainmenu, &$newmenu, $usemenuhider = 1, $lef
 
 			// Files
 			if (empty($conf->global->ACCOUNTANCY_HIDE_EXPORT_FILES_MENU)) {
-				$newmenu->add("/compta/accounting-files.php?mainmenu=accountancy&amp;leftmenu=accountancy_files", $langs->trans("AccountantFiles"), 1, $user->rights->accounting->mouvements->lire);
+				$newmenu->add("/compta/accounting-files.php?mainmenu=accountancy&amp;leftmenu=accountancy_files", $langs->trans("AccountantFiles"), 1, $user->hasRight('accounting',  'mouvements', 'lire'));
 			}
 
 
 			// Accounting
-			$newmenu->add("/accountancy/index.php?leftmenu=accountancy_accountancy", $langs->trans("MenuAccountancy"), 0, $user->rights->accounting->mouvements->lire || $user->rights->accounting->comptarapport->lire, '', $mainmenu, 'accountancy', 1, '', '', '', img_picto('', 'accountancy', 'class="paddingright pictofixedwidth"'));
+			$newmenu->add("/accountancy/index.php?leftmenu=accountancy_accountancy", $langs->trans("MenuAccountancy"), 0, $user->hasRight('accounting',  'mouvements', 'lire') || $user->hasRight('accounting',  'comptarapport', 'lire'), '', $mainmenu, 'accountancy', 1, '', '', '', img_picto('', 'accountancy', 'class="paddingright pictofixedwidth"'));
 
 			// General Ledger
-			$newmenu->add("/accountancy/bookkeeping/listbyaccount.php?mainmenu=accountancy&amp;leftmenu=accountancy_accountancy", $langs->trans("Bookkeeping"), 1, $user->rights->accounting->mouvements->lire);
+			$newmenu->add("/accountancy/bookkeeping/listbyaccount.php?mainmenu=accountancy&amp;leftmenu=accountancy_accountancy", $langs->trans("Bookkeeping"), 1, $user->hasRight('accounting',  'mouvements', 'lire'));
 
 			// Journals
-			$newmenu->add("/accountancy/bookkeeping/list.php?mainmenu=accountancy&amp;leftmenu=accountancy_accountancy", $langs->trans("Journals"), 1, $user->rights->accounting->mouvements->lire);
+			$newmenu->add("/accountancy/bookkeeping/list.php?mainmenu=accountancy&amp;leftmenu=accountancy_accountancy", $langs->trans("Journals"), 1, $user->hasRight('accounting',  'mouvements', 'lire'));
 
 			// Account Balance
-			$newmenu->add("/accountancy/bookkeeping/balance.php?mainmenu=accountancy&amp;leftmenu=accountancy_accountancy", $langs->trans("AccountBalance"), 1, $user->rights->accounting->mouvements->lire);
+			$newmenu->add("/accountancy/bookkeeping/balance.php?mainmenu=accountancy&amp;leftmenu=accountancy_accountancy", $langs->trans("AccountBalance"), 1, $user->hasRight('accounting',  'mouvements', 'lire'));
 
 			// Closure
-			$newmenu->add("/accountancy/closure/index.php?mainmenu=accountancy&amp;leftmenu=accountancy_closure", $langs->trans("MenuAccountancyClosure"), 1, $user->rights->accounting->fiscalyear->write, '', $mainmenu, 'closure');
+			$newmenu->add("/accountancy/closure/index.php?mainmenu=accountancy&amp;leftmenu=accountancy_closure", $langs->trans("MenuAccountancyClosure"), 1, $user->hasRight('accounting',  'fiscalyear', 'write'), '', $mainmenu, 'closure');
 
 			// Reports
-			$newmenu->add("/accountancy/index.php?leftmenu=accountancy_report", $langs->trans("Reportings"), 1, $user->rights->accounting->comptarapport->lire, '', $mainmenu, 'ca');
+			$newmenu->add("/accountancy/index.php?leftmenu=accountancy_report", $langs->trans("Reportings"), 1, $user->hasRight('accounting',  'comptarapport', 'lire'), '', $mainmenu, 'ca');
 
 			if ($usemenuhider || empty($leftmenu) || preg_match('/accountancy_report/', $leftmenu)) {
-				$newmenu->add("/compta/resultat/index.php?leftmenu=accountancy_report", $langs->trans("MenuReportInOut"), 2, $user->rights->accounting->comptarapport->lire);
-				$newmenu->add("/compta/resultat/clientfourn.php?leftmenu=accountancy_report", $langs->trans("ByPredefinedAccountGroups"), 3, $user->rights->accounting->comptarapport->lire);
-				$newmenu->add("/compta/resultat/result.php?leftmenu=accountancy_report", $langs->trans("ByPersonalizedAccountGroups"), 3, $user->rights->accounting->comptarapport->lire);
+				$newmenu->add("/compta/resultat/index.php?leftmenu=accountancy_report", $langs->trans("MenuReportInOut"), 2, $user->hasRight('accounting',  'comptarapport', 'lire'));
+				$newmenu->add("/compta/resultat/clientfourn.php?leftmenu=accountancy_report", $langs->trans("ByPredefinedAccountGroups"), 3, $user->hasRight('accounting',  'comptarapport', 'lire'));
+				$newmenu->add("/compta/resultat/result.php?leftmenu=accountancy_report", $langs->trans("ByPersonalizedAccountGroups"), 3, $user->hasRight('accounting',  'comptarapport', 'lire'));
 			}
 
 			$modecompta = 'CREANCES-DETTES';
-			if (isModEnabled('accounting') && !empty($user->rights->accounting->comptarapport->lire) && $mainmenu == 'accountancy') {
+			if (isModEnabled('accounting') && !empty($user->hasRight('accounting',  'comptarapport', 'lire')) && $mainmenu == 'accountancy') {
 				$modecompta = 'BOOKKEEPING'; // Not yet implemented. Should be BOOKKEEPINGCOLLECTED
 			}
 			if ($modecompta) {
 				if ($usemenuhider || empty($leftmenu) || preg_match('/accountancy_report/', $leftmenu)) {
-					$newmenu->add("/compta/stats/index.php?leftmenu=accountancy_report&modecompta=".$modecompta, $langs->trans("ReportTurnover"), 2, $user->rights->accounting->comptarapport->lire);
-					$newmenu->add("/compta/stats/casoc.php?leftmenu=accountancy_report&modecompta=".$modecompta, $langs->trans("ByCompanies"), 3, $user->rights->accounting->comptarapport->lire);
-					$newmenu->add("/compta/stats/cabyuser.php?leftmenu=accountancy_report&modecompta=".$modecompta, $langs->trans("ByUsers"), 3, $user->rights->accounting->comptarapport->lire);
-					$newmenu->add("/compta/stats/cabyprodserv.php?leftmenu=accountancy_report&modecompta=".$modecompta, $langs->trans("ByProductsAndServices"), 3, $user->rights->accounting->comptarapport->lire);
-					$newmenu->add("/compta/stats/byratecountry.php?leftmenu=accountancy_report&modecompta=".$modecompta, $langs->trans("ByVatRate"), 3, $user->rights->accounting->comptarapport->lire);
+					$newmenu->add("/compta/stats/index.php?leftmenu=accountancy_report&modecompta=".$modecompta, $langs->trans("ReportTurnover"), 2, $user->hasRight('accounting',  'comptarapport', 'lire'));
+					$newmenu->add("/compta/stats/casoc.php?leftmenu=accountancy_report&modecompta=".$modecompta, $langs->trans("ByCompanies"), 3, $user->hasRight('accounting',  'comptarapport', 'lire'));
+					$newmenu->add("/compta/stats/cabyuser.php?leftmenu=accountancy_report&modecompta=".$modecompta, $langs->trans("ByUsers"), 3, $user->hasRight('accounting',  'comptarapport', 'lire'));
+					$newmenu->add("/compta/stats/cabyprodserv.php?leftmenu=accountancy_report&modecompta=".$modecompta, $langs->trans("ByProductsAndServices"), 3, $user->hasRight('accounting',  'comptarapport', 'lire'));
+					$newmenu->add("/compta/stats/byratecountry.php?leftmenu=accountancy_report&modecompta=".$modecompta, $langs->trans("ByVatRate"), 3, $user->hasRight('accounting',  'comptarapport', 'lire'));
 				}
 			}
 
 			$modecompta = 'RECETTES-DEPENSES';
-			//if (isModEnabled('accounting') && !empty($user->rights->accounting->comptarapport->lire) && $mainmenu == 'accountancy') $modecompta='';	// Not yet implemented. Should be BOOKKEEPINGCOLLECTED
+			//if (isModEnabled('accounting') && !empty($user->hasRight('accounting',  'comptarapport', 'lire')) && $mainmenu == 'accountancy') $modecompta='';	// Not yet implemented. Should be BOOKKEEPINGCOLLECTED
 			if ($modecompta) {
 				if ($usemenuhider || empty($leftmenu) || preg_match('/accountancy_report/', $leftmenu)) {
-					$newmenu->add("/compta/stats/index.php?leftmenu=accountancy_report&modecompta=".$modecompta, $langs->trans("ReportTurnoverCollected"), 2, $user->rights->accounting->comptarapport->lire);
-					$newmenu->add("/compta/stats/casoc.php?leftmenu=accountancy_report&modecompta=".$modecompta, $langs->trans("ByCompanies"), 3, $user->rights->accounting->comptarapport->lire);
-					$newmenu->add("/compta/stats/cabyuser.php?leftmenu=accountancy_report&modecompta=".$modecompta, $langs->trans("ByUsers"), 3, $user->rights->accounting->comptarapport->lire);
-					//$newmenu->add("/compta/stats/cabyprodserv.php?leftmenu=accountancy_report&modecompta=".$modecompta, $langs->trans("ByProductsAndServices"),3,$user->rights->accounting->comptarapport->lire);
-					//$newmenu->add("/compta/stats/byratecountry.php?leftmenu=accountancy_report&modecompta=".$modecompta, $langs->trans("ByVatRate"),3,$user->rights->accounting->comptarapport->lire);
+					$newmenu->add("/compta/stats/index.php?leftmenu=accountancy_report&modecompta=".$modecompta, $langs->trans("ReportTurnoverCollected"), 2, $user->hasRight('accounting',  'comptarapport', 'lire'));
+					$newmenu->add("/compta/stats/casoc.php?leftmenu=accountancy_report&modecompta=".$modecompta, $langs->trans("ByCompanies"), 3, $user->hasRight('accounting',  'comptarapport', 'lire'));
+					$newmenu->add("/compta/stats/cabyuser.php?leftmenu=accountancy_report&modecompta=".$modecompta, $langs->trans("ByUsers"), 3, $user->hasRight('accounting',  'comptarapport', 'lire'));
+					//$newmenu->add("/compta/stats/cabyprodserv.php?leftmenu=accountancy_report&modecompta=".$modecompta, $langs->trans("ByProductsAndServices"),3,$user->hasRight('accounting',  'comptarapport', 'lire'));
+					//$newmenu->add("/compta/stats/byratecountry.php?leftmenu=accountancy_report&modecompta=".$modecompta, $langs->trans("ByVatRate"),3,$user->hasRight('accounting',  'comptarapport', 'lire'));
 				}
 			}
 
 			$modecompta = 'CREANCES-DETTES';
-			if (isModEnabled('accounting') && !empty($user->rights->accounting->comptarapport->lire) && $mainmenu == 'accountancy') {
+			if (isModEnabled('accounting') && !empty($user->hasRight('accounting',  'comptarapport', 'lire')) && $mainmenu == 'accountancy') {
 				$modecompta = 'BOOKKEEPING'; // Not yet implemented.
 			}
 			if ($modecompta && ((isModEnabled('fournisseur') && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD)) || isModEnabled('supplier_invoice'))) {
 				if ($usemenuhider || empty($leftmenu) || preg_match('/accountancy_report/', $leftmenu)) {
-					$newmenu->add("/compta/stats/supplier_turnover.php?leftmenu=accountancy_report&modecompta=".$modecompta, $langs->trans("ReportPurchaseTurnover"), 2, $user->rights->accounting->comptarapport->lire);
-					$newmenu->add("/compta/stats/supplier_turnover_by_thirdparty.php?leftmenu=accountancy_report&modecompta=".$modecompta, $langs->trans("ByCompanies"), 3, $user->rights->accounting->comptarapport->lire);
-					$newmenu->add("/compta/stats/supplier_turnover_by_prodserv.php?leftmenu=accountancy_report&modecompta=".$modecompta, $langs->trans("ByProductsAndServices"), 3, $user->rights->accounting->comptarapport->lire);
+					$newmenu->add("/compta/stats/supplier_turnover.php?leftmenu=accountancy_report&modecompta=".$modecompta, $langs->trans("ReportPurchaseTurnover"), 2, $user->hasRight('accounting',  'comptarapport', 'lire'));
+					$newmenu->add("/compta/stats/supplier_turnover_by_thirdparty.php?leftmenu=accountancy_report&modecompta=".$modecompta, $langs->trans("ByCompanies"), 3, $user->hasRight('accounting',  'comptarapport', 'lire'));
+					$newmenu->add("/compta/stats/supplier_turnover_by_prodserv.php?leftmenu=accountancy_report&modecompta=".$modecompta, $langs->trans("ByProductsAndServices"), 3, $user->hasRight('accounting',  'comptarapport', 'lire'));
 				}
 			}
 
 			$modecompta = 'RECETTES-DEPENSES';
-			if (isModEnabled('accounting') && !empty($user->rights->accounting->comptarapport->lire) && $mainmenu == 'accountancy') {
+			if (isModEnabled('accounting') && !empty($user->hasRight('accounting',  'comptarapport', 'lire')) && $mainmenu == 'accountancy') {
 				$modecompta = 'BOOKKEEPINGCOLLECTED'; // Not yet implemented.
 			}
 			if ($modecompta && ((isModEnabled('fournisseur') && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD)) || isModEnabled('supplier_invoice'))) {
 				if ($usemenuhider || empty($leftmenu) || preg_match('/accountancy_report/', $leftmenu)) {
-					$newmenu->add("/compta/stats/supplier_turnover.php?leftmenu=accountancy_report&modecompta=".$modecompta, $langs->trans("ReportPurchaseTurnoverCollected"), 2, $user->rights->accounting->comptarapport->lire);
-					$newmenu->add("/compta/stats/supplier_turnover_by_thirdparty.php?leftmenu=accountancy_report&modecompta=".$modecompta, $langs->trans("ByCompanies"), 3, $user->rights->accounting->comptarapport->lire);
+					$newmenu->add("/compta/stats/supplier_turnover.php?leftmenu=accountancy_report&modecompta=".$modecompta, $langs->trans("ReportPurchaseTurnoverCollected"), 2, $user->hasRight('accounting',  'comptarapport', 'lire'));
+					$newmenu->add("/compta/stats/supplier_turnover_by_thirdparty.php?leftmenu=accountancy_report&modecompta=".$modecompta, $langs->trans("ByCompanies"), 3, $user->hasRight('accounting',  'comptarapport', 'lire'));
 				}
 			}
 		}
@@ -1812,79 +1812,79 @@ function get_left_menu_accountancy($mainmenu, &$newmenu, $usemenuhider = 1, $lef
 		if (isModEnabled('comptabilite')) {
 			// Files
 			if (empty($conf->global->ACCOUNTANCY_HIDE_EXPORT_FILES_MENU)) {
-				$newmenu->add("/compta/accounting-files.php?mainmenu=accountancy&leftmenu=accountancy_files", $langs->trans("AccountantFiles"), 0, $user->rights->compta->resultat->lire, '', $mainmenu, 'files', 0, '', '', '', img_picto('', 'accountancy', 'class="paddingright pictofixedwidth"'));
+				$newmenu->add("/compta/accounting-files.php?mainmenu=accountancy&leftmenu=accountancy_files", $langs->trans("AccountantFiles"), 0, $user->hasRight('compta',  'resultat', 'lire'), '', $mainmenu, 'files', 0, '', '', '', img_picto('', 'accountancy', 'class="paddingright pictofixedwidth"'));
 			}
 
 			// Bilan, resultats
-			$newmenu->add("/compta/resultat/index.php?leftmenu=report&mainmenu=accountancy", $langs->trans("Reportings"), 0, $user->rights->compta->resultat->lire, '', $mainmenu, 'ca', 0, '', '', '', img_picto('', 'accountancy', 'class="paddingright pictofixedwidth"'));
+			$newmenu->add("/compta/resultat/index.php?leftmenu=report&mainmenu=accountancy", $langs->trans("Reportings"), 0, $user->hasRight('compta',  'resultat', 'lire'), '', $mainmenu, 'ca', 0, '', '', '', img_picto('', 'accountancy', 'class="paddingright pictofixedwidth"'));
 
 			if ($usemenuhider || empty($leftmenu) || preg_match('/report/', $leftmenu)) {
-				$newmenu->add("/compta/resultat/index.php?leftmenu=report", $langs->trans("MenuReportInOut"), 1, $user->rights->compta->resultat->lire);
-				$newmenu->add("/compta/resultat/clientfourn.php?leftmenu=report", $langs->trans("ByCompanies"), 2, $user->rights->compta->resultat->lire);
+				$newmenu->add("/compta/resultat/index.php?leftmenu=report", $langs->trans("MenuReportInOut"), 1, $user->hasRight('compta',  'resultat', 'lire'));
+				$newmenu->add("/compta/resultat/clientfourn.php?leftmenu=report", $langs->trans("ByCompanies"), 2, $user->hasRight('compta',  'resultat', 'lire'));
 				/* On verra ca avec module compabilite expert
-				 $newmenu->add("/compta/resultat/compteres.php?leftmenu=report","Compte de resultat",2,$user->rights->compta->resultat->lire);
-				 $newmenu->add("/compta/resultat/bilan.php?leftmenu=report","Bilan",2,$user->rights->compta->resultat->lire);
+				 $newmenu->add("/compta/resultat/compteres.php?leftmenu=report","Compte de resultat",2,$user->hasRight('compta',  'resultat', 'lire'));
+				 $newmenu->add("/compta/resultat/bilan.php?leftmenu=report","Bilan",2,$user->hasRight('compta',  'resultat', 'lire'));
 				 */
 
 				/*
-				 $newmenu->add("/compta/stats/cumul.php?leftmenu=report","Cumule",2,$user->rights->compta->resultat->lire);
+				 $newmenu->add("/compta/stats/cumul.php?leftmenu=report","Cumule",2,$user->hasRight('compta',  'resultat', 'lire'));
 				 if (isModEnabled('propal')) {
-				 $newmenu->add("/compta/stats/prev.php?leftmenu=report","Previsionnel",2,$user->rights->compta->resultat->lire);
-				 $newmenu->add("/compta/stats/comp.php?leftmenu=report","Transforme",2,$user->rights->compta->resultat->lire);
+				 $newmenu->add("/compta/stats/prev.php?leftmenu=report","Previsionnel",2,$user->hasRight('compta',  'resultat', 'lire'));
+				 $newmenu->add("/compta/stats/comp.php?leftmenu=report","Transforme",2,$user->hasRight('compta',  'resultat', 'lire'));
 				 }
 				 */
 
 				$modecompta = 'CREANCES-DETTES';
-				$newmenu->add("/compta/stats/index.php?leftmenu=report&modecompta=".$modecompta, $langs->trans("ReportTurnover"), 1, $user->rights->compta->resultat->lire);
-				$newmenu->add("/compta/stats/casoc.php?leftmenu=report&modecompta=".$modecompta, $langs->trans("ByCompanies"), 2, $user->rights->compta->resultat->lire);
-				$newmenu->add("/compta/stats/cabyuser.php?leftmenu=report&modecompta=".$modecompta, $langs->trans("ByUsers"), 2, $user->rights->compta->resultat->lire);
-				$newmenu->add("/compta/stats/cabyprodserv.php?leftmenu=report&modecompta=".$modecompta, $langs->trans("ByProductsAndServices"), 2, $user->rights->compta->resultat->lire);
-				$newmenu->add("/compta/stats/byratecountry.php?leftmenu=report&modecompta=".$modecompta, $langs->trans("ByVatRate"), 2, $user->rights->compta->resultat->lire);
+				$newmenu->add("/compta/stats/index.php?leftmenu=report&modecompta=".$modecompta, $langs->trans("ReportTurnover"), 1, $user->hasRight('compta',  'resultat', 'lire'));
+				$newmenu->add("/compta/stats/casoc.php?leftmenu=report&modecompta=".$modecompta, $langs->trans("ByCompanies"), 2, $user->hasRight('compta',  'resultat', 'lire'));
+				$newmenu->add("/compta/stats/cabyuser.php?leftmenu=report&modecompta=".$modecompta, $langs->trans("ByUsers"), 2, $user->hasRight('compta',  'resultat', 'lire'));
+				$newmenu->add("/compta/stats/cabyprodserv.php?leftmenu=report&modecompta=".$modecompta, $langs->trans("ByProductsAndServices"), 2, $user->hasRight('compta',  'resultat', 'lire'));
+				$newmenu->add("/compta/stats/byratecountry.php?leftmenu=report&modecompta=".$modecompta, $langs->trans("ByVatRate"), 2, $user->hasRight('compta',  'resultat', 'lire'));
 
 				$modecompta = 'RECETTES-DEPENSES';
-				$newmenu->add("/compta/stats/index.php?leftmenu=accountancy_report&modecompta=".$modecompta, $langs->trans("ReportTurnoverCollected"), 1, $user->rights->compta->resultat->lire);
-				$newmenu->add("/compta/stats/casoc.php?leftmenu=accountancy_report&modecompta=".$modecompta, $langs->trans("ByCompanies"), 2, $user->rights->compta->resultat->lire);
-				$newmenu->add("/compta/stats/cabyuser.php?leftmenu=accountancy_report&modecompta=".$modecompta, $langs->trans("ByUsers"), 2, $user->rights->compta->resultat->lire);
+				$newmenu->add("/compta/stats/index.php?leftmenu=accountancy_report&modecompta=".$modecompta, $langs->trans("ReportTurnoverCollected"), 1, $user->hasRight('compta',  'resultat', 'lire'));
+				$newmenu->add("/compta/stats/casoc.php?leftmenu=accountancy_report&modecompta=".$modecompta, $langs->trans("ByCompanies"), 2, $user->hasRight('compta',  'resultat', 'lire'));
+				$newmenu->add("/compta/stats/cabyuser.php?leftmenu=accountancy_report&modecompta=".$modecompta, $langs->trans("ByUsers"), 2, $user->hasRight('compta',  'resultat', 'lire'));
 
 				//Achats
 				$modecompta = 'CREANCES-DETTES';
-				$newmenu->add("/compta/stats/supplier_turnover.php?leftmenu=accountancy_report&modecompta=".$modecompta, $langs->trans("ReportPurchaseTurnover"), 1, $user->rights->compta->resultat->lire);
-				$newmenu->add("/compta/stats/supplier_turnover_by_thirdparty.php?leftmenu=accountancy_report&modecompta=".$modecompta, $langs->trans("ByCompanies"), 2, $user->rights->compta->resultat->lire);
-				$newmenu->add("/compta/stats/supplier_turnover_by_prodserv.php?leftmenu=accountancy_report&modecompta=".$modecompta, $langs->trans("ByProductsAndServices"), 2, $user->rights->compta->resultat->lire);
+				$newmenu->add("/compta/stats/supplier_turnover.php?leftmenu=accountancy_report&modecompta=".$modecompta, $langs->trans("ReportPurchaseTurnover"), 1, $user->hasRight('compta',  'resultat', 'lire'));
+				$newmenu->add("/compta/stats/supplier_turnover_by_thirdparty.php?leftmenu=accountancy_report&modecompta=".$modecompta, $langs->trans("ByCompanies"), 2, $user->hasRight('compta',  'resultat', 'lire'));
+				$newmenu->add("/compta/stats/supplier_turnover_by_prodserv.php?leftmenu=accountancy_report&modecompta=".$modecompta, $langs->trans("ByProductsAndServices"), 2, $user->hasRight('compta',  'resultat', 'lire'));
 
 				/*
 				 $modecompta = 'RECETTES-DEPENSES';
-				 $newmenu->add("/compta/stats/index.php?leftmenu=accountancy_report&modecompta=".$modecompta, $langs->trans("ReportPurchaseTurnoverCollected"), 1, $user->rights->compta->resultat->lire);
-				 $newmenu->add("/compta/stats/casoc.php?leftmenu=accountancy_report&modecompta=".$modecompta, $langs->trans("ByCompanies"), 2, $user->rights->compta->resultat->lire);
-				 $newmenu->add("/compta/stats/cabyuser.php?leftmenu=accountancy_report&modecompta=".$modecompta, $langs->trans("ByUsers"), 2, $user->rights->compta->resultat->lire);
+				 $newmenu->add("/compta/stats/index.php?leftmenu=accountancy_report&modecompta=".$modecompta, $langs->trans("ReportPurchaseTurnoverCollected"), 1, $user->hasRight('compta',  'resultat', 'lire'));
+				 $newmenu->add("/compta/stats/casoc.php?leftmenu=accountancy_report&modecompta=".$modecompta, $langs->trans("ByCompanies"), 2, $user->hasRight('compta',  'resultat', 'lire'));
+				 $newmenu->add("/compta/stats/cabyuser.php?leftmenu=accountancy_report&modecompta=".$modecompta, $langs->trans("ByUsers"), 2, $user->hasRight('compta',  'resultat', 'lire'));
 				 */
 
 				// Journals
-				$newmenu->add("/compta/journal/sellsjournal.php?leftmenu=report", $langs->trans("SellsJournal"), 1, $user->rights->compta->resultat->lire, '', '', '', 50);
-				$newmenu->add("/compta/journal/purchasesjournal.php?leftmenu=report", $langs->trans("PurchasesJournal"), 1, $user->rights->compta->resultat->lire, '', '', '', 51);
+				$newmenu->add("/compta/journal/sellsjournal.php?leftmenu=report", $langs->trans("SellsJournal"), 1, $user->hasRight('compta',  'resultat', 'lire'), '', '', '', 50);
+				$newmenu->add("/compta/journal/purchasesjournal.php?leftmenu=report", $langs->trans("PurchasesJournal"), 1, $user->hasRight('compta',  'resultat', 'lire'), '', '', '', 51);
 			}
-			//if ($leftmenu=="ca") $newmenu->add("/compta/journaux/index.php?leftmenu=ca",$langs->trans("Journals"),1,$user->rights->compta->resultat->lire||$user->rights->accounting->comptarapport->lire);
+			//if ($leftmenu=="ca") $newmenu->add("/compta/journaux/index.php?leftmenu=ca",$langs->trans("Journals"),1,$user->hasRight('compta',  'resultat', 'lire')||$user->hasRight('accounting',  'comptarapport', 'lire'));
 		}
 
 		// Intracomm report
 		if (isModEnabled('intracommreport')) {
-			$newmenu->add("/intracommreport/list.php?leftmenu=intracommreport", $langs->trans("MenuIntracommReport"), 0, $user->rights->intracommreport->read, '', $mainmenu, 'intracommreport', 60, '', '', '', img_picto('', 'intracommreport', 'class="paddingright pictofixedwidth"'));
+			$newmenu->add("/intracommreport/list.php?leftmenu=intracommreport", $langs->trans("MenuIntracommReport"), 0, $user->hasRight('intracommreport',  'read'), '', $mainmenu, 'intracommreport', 60, '', '', '', img_picto('', 'intracommreport', 'class="paddingright pictofixedwidth"'));
 			if ($usemenuhider || empty($leftmenu) || preg_match('/intracommreport/', $leftmenu)) {
 				// DEB / DES
-				$newmenu->add("/intracommreport/card.php?action=create&leftmenu=intracommreport", $langs->trans("MenuIntracommReportNew"), 1, $user->rights->intracommreport->write, '', $mainmenu, 'intracommreport', 1);
-				$newmenu->add("/intracommreport/list.php?leftmenu=intracommreport", $langs->trans("MenuIntracommReportList"), 1, $user->rights->intracommreport->read, '', $mainmenu, 'intracommreport', 1);
+				$newmenu->add("/intracommreport/card.php?action=create&leftmenu=intracommreport", $langs->trans("MenuIntracommReportNew"), 1, $user->hasRight('intracommreport',  'write'), '', $mainmenu, 'intracommreport', 1);
+				$newmenu->add("/intracommreport/list.php?leftmenu=intracommreport", $langs->trans("MenuIntracommReportList"), 1, $user->hasRight('intracommreport',  'read'), '', $mainmenu, 'intracommreport', 1);
 			}
 		}
 
 		// Assets
 		if (isModEnabled('asset')) {
-			$newmenu->add("/asset/list.php?leftmenu=asset&amp;mainmenu=accountancy", $langs->trans("MenuAssets"), 0, $user->rights->asset->read, '', $mainmenu, 'asset', 100, '', '', '', img_picto('', 'payment', 'class="paddingright pictofixedwidth"'));
-			$newmenu->add("/asset/card.php?leftmenu=asset&amp;action=create", $langs->trans("MenuNewAsset"), 1, $user->rights->asset->write);
-			$newmenu->add("/asset/list.php?leftmenu=asset&amp;mainmenu=accountancy", $langs->trans("MenuListAssets"), 1, $user->rights->asset->read);
-			$newmenu->add("/asset/model/list.php?leftmenu=asset_model", $langs->trans("MenuAssetModels"), 1, (empty($conf->global->MAIN_USE_ADVANCED_PERMS) && $user->rights->asset->read) || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->asset->model_advance->read)), '', $mainmenu, 'asset_model');
+			$newmenu->add("/asset/list.php?leftmenu=asset&amp;mainmenu=accountancy", $langs->trans("MenuAssets"), 0, $user->hasRight('asset',  'read'), '', $mainmenu, 'asset', 100, '', '', '', img_picto('', 'payment', 'class="paddingright pictofixedwidth"'));
+			$newmenu->add("/asset/card.php?leftmenu=asset&amp;action=create", $langs->trans("MenuNewAsset"), 1, $user->hasRight('asset',  'write'));
+			$newmenu->add("/asset/list.php?leftmenu=asset&amp;mainmenu=accountancy", $langs->trans("MenuListAssets"), 1, $user->hasRight('asset',  'read'));
+			$newmenu->add("/asset/model/list.php?leftmenu=asset_model", $langs->trans("MenuAssetModels"), 1, (empty($conf->global->MAIN_USE_ADVANCED_PERMS) && $user->hasRight('asset',  'read')) || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->hasRight('asset',  'model_advance', 'read'))), '', $mainmenu, 'asset_model');
 			if ($usemenuhider || empty($leftmenu) || preg_match('/asset_model/', $leftmenu)) {
-				$newmenu->add("/asset/model/card.php?leftmenu=asset_model&amp;action=create", $langs->trans("MenuNewAssetModel"), 2, (empty($conf->global->MAIN_USE_ADVANCED_PERMS) && $user->rights->asset->write) || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->asset->model_advance->write)));
-				$newmenu->add("/asset/model/list.php?leftmenu=asset_model", $langs->trans("MenuListAssetModels"), 2, (empty($conf->global->MAIN_USE_ADVANCED_PERMS) && $user->rights->asset->read) || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->asset->model_advance->read)));
+				$newmenu->add("/asset/model/card.php?leftmenu=asset_model&amp;action=create", $langs->trans("MenuNewAssetModel"), 2, (empty($conf->global->MAIN_USE_ADVANCED_PERMS) && $user->hasRight('asset',  'write')) || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->hasRight('asset',  'model_advance', 'write'))));
+				$newmenu->add("/asset/model/list.php?leftmenu=asset_model", $langs->trans("MenuListAssetModels"), 2, (empty($conf->global->MAIN_USE_ADVANCED_PERMS) && $user->hasRight('asset',  'read')) || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->hasRight('asset',  'model_advance', 'read'))));
 			}
 		}
 	}
@@ -1910,56 +1910,56 @@ function get_left_menu_bank($mainmenu, &$newmenu, $usemenuhider = 1, $leftmenu =
 
 		// Bank-Cash account
 		if (isModEnabled('banque')) {
-			$newmenu->add("/compta/bank/list.php?leftmenu=bank&amp;mainmenu=bank", $langs->trans("MenuBankCash"), 0, $user->rights->banque->lire, '', $mainmenu, 'bank', 0, '', '', '', img_picto('', 'bank_account', 'class="paddingright pictofixedwidth"'));
+			$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->rights->banque->configurer);
-			$newmenu->add("/compta/bank/list.php?leftmenu=bank&amp;mainmenu=bank", $langs->trans("List"), 1, $user->rights->banque->lire, '', $mainmenu, 'bank');
-			$newmenu->add("/compta/bank/bankentries_list.php", $langs->trans("ListTransactions"), 1, $user->rights->banque->lire);
-			$newmenu->add("/compta/bank/budget.php", $langs->trans("ListTransactionsByCategory"), 1, $user->rights->banque->lire);
+			$newmenu->add("/compta/bank/card.php?action=create", $langs->trans("MenuNewFinancialAccount"), 1, $user->hasRight('banque',  'configurer'));
+			$newmenu->add("/compta/bank/list.php?leftmenu=bank&amp;mainmenu=bank", $langs->trans("List"), 1, $user->hasRight('banque',  'lire'), '', $mainmenu, 'bank');
+			$newmenu->add("/compta/bank/bankentries_list.php", $langs->trans("ListTransactions"), 1, $user->hasRight('banque',  'lire'));
+			$newmenu->add("/compta/bank/budget.php", $langs->trans("ListTransactionsByCategory"), 1, $user->hasRight('banque',  'lire'));
 
-			$newmenu->add("/compta/bank/transfer.php", $langs->trans("MenuBankInternalTransfer"), 1, $user->rights->banque->transfer);
+			$newmenu->add("/compta/bank/transfer.php", $langs->trans("MenuBankInternalTransfer"), 1, $user->hasRight('banque',  'transfer'));
 		}
 
 		if (isModEnabled('categorie')) {
 			$langs->load("categories");
-			$newmenu->add("/categories/index.php?type=5", $langs->trans("Rubriques"), 1, $user->rights->categorie->creer, '', $mainmenu, 'tags');
-			$newmenu->add("/compta/bank/categ.php", $langs->trans("RubriquesTransactions"), 1, $user->rights->banque->configurer, '', $mainmenu, 'tags');
+			$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');
 		}
 
 		// Direct debit order
 		if (isModEnabled('prelevement')) {
-			$newmenu->add("/compta/prelevement/index.php?leftmenu=withdraw&amp;mainmenu=bank", $langs->trans("PaymentByDirectDebit"), 0, $user->rights->prelevement->bons->lire, '', $mainmenu, 'withdraw', 0, '', '', '', img_picto('', 'payment', 'class="paddingright pictofixedwidth"'));
+			$newmenu->add("/compta/prelevement/index.php?leftmenu=withdraw&amp;mainmenu=bank", $langs->trans("PaymentByDirectDebit"), 0, $user->hasRight('prelevement',  'bons', 'lire'), '', $mainmenu, 'withdraw', 0, '', '', '', img_picto('', 'payment', 'class="paddingright pictofixedwidth"'));
 
 			if ($usemenuhider || empty($leftmenu) || $leftmenu == "withdraw") {
-				$newmenu->add("/compta/prelevement/create.php?mainmenu=bank", $langs->trans("NewStandingOrder"), 1, $user->rights->prelevement->bons->creer);
+				$newmenu->add("/compta/prelevement/create.php?mainmenu=bank", $langs->trans("NewStandingOrder"), 1, $user->hasRight('prelevement',  'bons', 'creer'));
 
-				$newmenu->add("/compta/prelevement/orders_list.php?mainmenu=bank", $langs->trans("WithdrawalsReceipts"), 1, $user->rights->prelevement->bons->lire);
-				$newmenu->add("/compta/prelevement/list.php?mainmenu=bank", $langs->trans("WithdrawalsLines"), 1, $user->rights->prelevement->bons->lire);
-				$newmenu->add("/compta/prelevement/rejets.php?mainmenu=bank", $langs->trans("Rejects"), 1, $user->rights->prelevement->bons->lire);
-				$newmenu->add("/compta/prelevement/stats.php?mainmenu=bank", $langs->trans("Statistics"), 1, $user->rights->prelevement->bons->lire);
+				$newmenu->add("/compta/prelevement/orders_list.php?mainmenu=bank", $langs->trans("WithdrawalsReceipts"), 1, $user->hasRight('prelevement',  'bons', 'lire'));
+				$newmenu->add("/compta/prelevement/list.php?mainmenu=bank", $langs->trans("WithdrawalsLines"), 1, $user->hasRight('prelevement',  'bons', 'lire'));
+				$newmenu->add("/compta/prelevement/rejets.php?mainmenu=bank", $langs->trans("Rejects"), 1, $user->hasRight('prelevement',  'bons', 'lire'));
+				$newmenu->add("/compta/prelevement/stats.php?mainmenu=bank", $langs->trans("Statistics"), 1, $user->hasRight('prelevement',  'bons', 'lire'));
 			}
 		}
 
 		// Bank transfer order
 		if (isModEnabled('paymentbybanktransfer')) {
-			$newmenu->add("/compta/paymentbybanktransfer/index.php?leftmenu=banktransfer&amp;mainmenu=bank", $langs->trans("PaymentByBankTransfer"), 0, $user->rights->paymentbybanktransfer->read, '', $mainmenu, 'banktransfer', 0, '', '', '', img_picto('', 'payment', 'class="paddingright pictofixedwidth"'));
+			$newmenu->add("/compta/paymentbybanktransfer/index.php?leftmenu=banktransfer&amp;mainmenu=bank", $langs->trans("PaymentByBankTransfer"), 0, $user->hasRight('paymentbybanktransfer',  'read'), '', $mainmenu, 'banktransfer', 0, '', '', '', img_picto('', 'payment', 'class="paddingright pictofixedwidth"'));
 
 			if ($usemenuhider || empty($leftmenu) || $leftmenu == "banktransfer") {
-				$newmenu->add("/compta/prelevement/create.php?type=bank-transfer&mainmenu=bank", $langs->trans("NewPaymentByBankTransfer"), 1, $user->rights->paymentbybanktransfer->create);
+				$newmenu->add("/compta/prelevement/create.php?type=bank-transfer&mainmenu=bank", $langs->trans("NewPaymentByBankTransfer"), 1, $user->hasRight('paymentbybanktransfer',  'create'));
 
-				$newmenu->add("/compta/prelevement/orders_list.php?type=bank-transfer&mainmenu=bank", $langs->trans("PaymentByBankTransferReceipts"), 1, $user->rights->paymentbybanktransfer->read);
-				$newmenu->add("/compta/prelevement/list.php?type=bank-transfer&mainmenu=bank", $langs->trans("PaymentByBankTransferLines"), 1, $user->rights->paymentbybanktransfer->read);
-				$newmenu->add("/compta/prelevement/rejets.php?type=bank-transfer&mainmenu=bank", $langs->trans("Rejects"), 1, $user->rights->paymentbybanktransfer->read);
-				$newmenu->add("/compta/prelevement/stats.php?type=bank-transfer&mainmenu=bank", $langs->trans("Statistics"), 1, $user->rights->paymentbybanktransfer->read);
+				$newmenu->add("/compta/prelevement/orders_list.php?type=bank-transfer&mainmenu=bank", $langs->trans("PaymentByBankTransferReceipts"), 1, $user->hasRight('paymentbybanktransfer',  'read'));
+				$newmenu->add("/compta/prelevement/list.php?type=bank-transfer&mainmenu=bank", $langs->trans("PaymentByBankTransferLines"), 1, $user->hasRight('paymentbybanktransfer',  'read'));
+				$newmenu->add("/compta/prelevement/rejets.php?type=bank-transfer&mainmenu=bank", $langs->trans("Rejects"), 1, $user->hasRight('paymentbybanktransfer',  'read'));
+				$newmenu->add("/compta/prelevement/stats.php?type=bank-transfer&mainmenu=bank", $langs->trans("Statistics"), 1, $user->hasRight('paymentbybanktransfer',  'read'));
 			}
 		}
 
 		// Management of checks
 		if (empty($conf->global->BANK_DISABLE_CHECK_DEPOSIT) && isModEnabled('banque') && (isModEnabled('facture') || !empty($conf->global->MAIN_MENU_CHEQUE_DEPOSIT_ON))) {
-			$newmenu->add("/compta/paiement/cheque/index.php?leftmenu=checks&amp;mainmenu=bank", $langs->trans("MenuChequeDeposits"), 0, $user->rights->banque->cheque, '', $mainmenu, 'checks', 0, '', '', '', img_picto('', 'payment', 'class="paddingright pictofixedwidth"'));
+			$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->rights->banque->cheque);
-				$newmenu->add("/compta/paiement/cheque/list.php?leftmenu=checks_bis&amp;mainmenu=bank", $langs->trans("List"), 1, $user->rights->banque->cheque);
+				$newmenu->add("/compta/paiement/cheque/card.php?leftmenu=checks_bis&amp;action=new&amp;mainmenu=bank", $langs->trans("NewChequeDeposit"), 1, $user->hasRight('banque',  'cheque'));
+				$newmenu->add("/compta/paiement/cheque/list.php?leftmenu=checks_bis&amp;mainmenu=bank", $langs->trans("List"), 1, $user->hasRight('banque',  'cheque'));
 			}
 		}
 
@@ -1990,88 +1990,88 @@ function get_left_menu_products($mainmenu, &$newmenu, $usemenuhider = 1, $leftme
 	if ($mainmenu == 'products') {
 		// Products
 		if (isModEnabled('product')) {
-			$newmenu->add("/product/index.php?leftmenu=product&amp;type=0", $langs->trans("Products"), 0, $user->rights->produit->lire, '', $mainmenu, 'product', 0, '', '', '', img_picto('', 'product', 'class="pictofixedwidth"'));
-			$newmenu->add("/product/card.php?leftmenu=product&amp;action=create&amp;type=0", $langs->trans("NewProduct"), 1, $user->rights->produit->creer);
-			$newmenu->add("/product/list.php?leftmenu=product&amp;type=0", $langs->trans("List"), 1, $user->rights->produit->lire);
+			$newmenu->add("/product/index.php?leftmenu=product&amp;type=0", $langs->trans("Products"), 0, $user->hasRight('produit',  'lire'), '', $mainmenu, 'product', 0, '', '', '', img_picto('', 'product', 'class="pictofixedwidth"'));
+			$newmenu->add("/product/card.php?leftmenu=product&amp;action=create&amp;type=0", $langs->trans("NewProduct"), 1, $user->hasRight('produit',  'creer'));
+			$newmenu->add("/product/list.php?leftmenu=product&amp;type=0", $langs->trans("List"), 1, $user->hasRight('produit',  'lire'));
 			if (isModEnabled('stock')) {
-				$newmenu->add("/product/reassort.php?type=0", $langs->trans("MenuStocks"), 1, $user->rights->produit->lire && $user->rights->stock->lire);
+				$newmenu->add("/product/reassort.php?type=0", $langs->trans("MenuStocks"), 1, $user->hasRight('produit',  'lire') && $user->hasRight('stock',  'lire'));
 			}
 			if (isModEnabled('productbatch')) {
 				$langs->load("stocks");
-				$newmenu->add("/product/reassortlot.php?type=0&search_subjecttolotserial=1", $langs->trans("StocksByLotSerial"), 1, $user->rights->produit->lire && $user->rights->stock->lire);
-				$newmenu->add("/product/stock/productlot_list.php", $langs->trans("LotSerial"), 1, $user->rights->produit->lire && $user->rights->stock->lire);
+				$newmenu->add("/product/reassortlot.php?type=0&search_subjecttolotserial=1", $langs->trans("StocksByLotSerial"), 1, $user->hasRight('produit',  'lire') && $user->hasRight('stock',  'lire'));
+				$newmenu->add("/product/stock/productlot_list.php", $langs->trans("LotSerial"), 1, $user->hasRight('produit',  'lire') && $user->hasRight('stock',  'lire'));
 			}
 			if (isModEnabled('variants')) {
-				$newmenu->add("/variants/list.php", $langs->trans("VariantAttributes"), 1, $user->rights->produit->lire);
+				$newmenu->add("/variants/list.php", $langs->trans("VariantAttributes"), 1, $user->hasRight('produit',  'lire'));
 			}
 			if (isModEnabled('propal') || (isModEnabled('commande') && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD)) || isModEnabled('facture') || isModEnabled('fournisseur') || 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->rights->produit->lire);
+				$newmenu->add("/product/stats/card.php?id=all&leftmenu=stats&type=0", $langs->trans("Statistics"), 1, $user->hasRight('produit',  'lire'));
 			}
 
 			// Categories
 			if (isModEnabled('categorie')) {
 				$langs->load("categories");
-				$newmenu->add("/categories/index.php?leftmenu=cat&amp;type=0", $langs->trans("Categories"), 1, $user->rights->categorie->lire, '', $mainmenu, 'cat');
-				//if ($usemenuhider || empty($leftmenu) || $leftmenu=="cat") $newmenu->add("/categories/list.php", $langs->trans("List"), 1, $user->rights->categorie->lire);
+				$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'));
 			}
 		}
 
 		// Services
 		if (isModEnabled('service')) {
-			$newmenu->add("/product/index.php?leftmenu=service&amp;type=1", $langs->trans("Services"), 0, $user->rights->service->lire, '', $mainmenu, 'service', 0, '', '', '', img_picto('', 'service', 'class="pictofixedwidth"'));
-			$newmenu->add("/product/card.php?leftmenu=service&amp;action=create&amp;type=1", $langs->trans("NewService"), 1, $user->rights->service->creer);
-			$newmenu->add("/product/list.php?leftmenu=service&amp;type=1", $langs->trans("List"), 1, $user->rights->service->lire);
+			$newmenu->add("/product/index.php?leftmenu=service&amp;type=1", $langs->trans("Services"), 0, $user->hasRight('service',  'lire'), '', $mainmenu, 'service', 0, '', '', '', img_picto('', 'service', 'class="pictofixedwidth"'));
+			$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',  'lire'));
 			if (isModEnabled('propal') || isModEnabled('commande') || isModEnabled('facture') || (isModEnabled('fournisseur') && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD)) || 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->rights->service->lire);
+				$newmenu->add("/product/stats/card.php?id=all&leftmenu=stats&type=1", $langs->trans("Statistics"), 1, $user->hasRight('service',  'lire'));
 			}
 			// Categories
 			if (isModEnabled('categorie')) {
 				$langs->load("categories");
-				$newmenu->add("/categories/index.php?leftmenu=cat&amp;type=0", $langs->trans("Categories"), 1, $user->rights->categorie->lire, '', $mainmenu, 'cat');
-				//if ($usemenuhider || empty($leftmenu) || $leftmenu=="cat") $newmenu->add("/categories/list.php", $langs->trans("List"), 1, $user->rights->categorie->lire);
+				$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'));
 			}
 		}
 
 		// Warehouse
 		if (isModEnabled('stock')) {
 			$langs->load("stocks");
-			$newmenu->add("/product/stock/index.php?leftmenu=stock", $langs->trans("Warehouses"), 0, $user->rights->stock->lire, '', $mainmenu, 'stock', 0, '', '', '', img_picto('', 'stock', 'class="pictofixedwidth"'));
-			$newmenu->add("/product/stock/card.php?action=create", $langs->trans("MenuNewWarehouse"), 1, $user->rights->stock->creer);
-			$newmenu->add("/product/stock/list.php", $langs->trans("List"), 1, $user->rights->stock->lire);
-			$newmenu->add("/product/stock/movement_list.php", $langs->trans("Movements"), 1, $user->rights->stock->mouvement->lire);
+			$newmenu->add("/product/stock/index.php?leftmenu=stock", $langs->trans("Warehouses"), 0, $user->hasRight('stock',  'lire'), '', $mainmenu, 'stock', 0, '', '', '', img_picto('', 'stock', 'class="pictofixedwidth"'));
+			$newmenu->add("/product/stock/card.php?action=create", $langs->trans("MenuNewWarehouse"), 1, $user->hasRight('stock',  'creer'));
+			$newmenu->add("/product/stock/list.php", $langs->trans("List"), 1, $user->hasRight('stock',  'lire'));
+			$newmenu->add("/product/stock/movement_list.php", $langs->trans("Movements"), 1, $user->hasRight('stock',  'mouvement', 'lire'));
 
-			$newmenu->add("/product/stock/massstockmove.php", $langs->trans("MassStockTransferShort"), 1, $user->rights->stock->mouvement->creer);
+			$newmenu->add("/product/stock/massstockmove.php", $langs->trans("MassStockTransferShort"), 1, $user->hasRight('stock',  'mouvement', 'creer'));
 			if (isModEnabled('supplier_order')) {
-				$newmenu->add("/product/stock/replenish.php", $langs->trans("Replenishment"), 1, $user->rights->stock->mouvement->creer && $user->rights->fournisseur->lire);
+				$newmenu->add("/product/stock/replenish.php", $langs->trans("Replenishment"), 1, $user->hasRight('stock',  'mouvement', 'creer') && $user->hasRight('fournisseur',  'lire'));
 			}
-			$newmenu->add("/product/stock/stockatdate.php", $langs->trans("StockAtDate"), 1, $user->rights->produit->lire && $user->rights->stock->lire);
+			$newmenu->add("/product/stock/stockatdate.php", $langs->trans("StockAtDate"), 1, $user->hasRight('produit',  'lire') && $user->hasRight('stock',  'lire'));
 
 			// Categories for warehouses
 			if (isModEnabled('categorie')) {
-				$newmenu->add("/categories/index.php?leftmenu=stock&amp;type=9", $langs->trans("Categories"), 1, $user->rights->categorie->lire, '', $mainmenu, 'cat');
+				$newmenu->add("/categories/index.php?leftmenu=stock&amp;type=9", $langs->trans("Categories"), 1, $user->hasRight('categorie',  'lire'), '', $mainmenu, 'cat');
 			}
 		}
 
 		if (isModEnabled('stocktransfer')) {
-			$newmenu->add('/product/stock/stocktransfer/stocktransfer_list.php', $langs->trans("ModuleStockTransferName"), 0, $user->rights->stocktransfer->stocktransfer->read, '', $mainmenu, 'stocktransfer', 0, '', '', '', img_picto('', 'stock', 'class="pictofixedwidth"'));
-			$newmenu->add('/product/stock/stocktransfer/stocktransfer_card.php?action=create', $langs->trans('StockTransferNew'), 1, $user->rights->stocktransfer->stocktransfer->write);
-			$newmenu->add('/product/stock/stocktransfer/stocktransfer_list.php', $langs->trans('List'), 1, $user->rights->stocktransfer->stocktransfer->read);
+			$newmenu->add('/product/stock/stocktransfer/stocktransfer_list.php', $langs->trans("ModuleStockTransferName"), 0, $user->hasRight('stocktransfer',  'stocktransfer', 'read'), '', $mainmenu, 'stocktransfer', 0, '', '', '', img_picto('', 'stock', 'class="pictofixedwidth"'));
+			$newmenu->add('/product/stock/stocktransfer/stocktransfer_card.php?action=create', $langs->trans('StockTransferNew'), 1, $user->hasRight('stocktransfer',  'stocktransfer', 'write'));
+			$newmenu->add('/product/stock/stocktransfer/stocktransfer_list.php', $langs->trans('List'), 1, $user->hasRight('stocktransfer',  'stocktransfer', 'read'));
 		}
 
 		// Inventory
 		if (isModEnabled('stock')) {
 			$langs->load("stocks");
 			if (empty($conf->global->MAIN_USE_ADVANCED_PERMS)) {
-				$newmenu->add("/product/inventory/list.php?leftmenu=stock_inventories", $langs->trans("Inventories"), 0, $user->rights->stock->lire, '', $mainmenu, 'stock', 0, '', '', '', img_picto('', 'inventory', 'class="pictofixedwidth"'));
+				$newmenu->add("/product/inventory/list.php?leftmenu=stock_inventories", $langs->trans("Inventories"), 0, $user->hasRight('stock',  'lire'), '', $mainmenu, 'stock', 0, '', '', '', img_picto('', 'inventory', 'class="pictofixedwidth"'));
 				if ($usemenuhider || empty($leftmenu) || $leftmenu == "stock_inventories") {
-					$newmenu->add("/product/inventory/card.php?action=create&leftmenu=stock_inventories", $langs->trans("NewInventory"), 1, $user->rights->stock->creer);
-					$newmenu->add("/product/inventory/list.php?leftmenu=stock_inventories", $langs->trans("List"), 1, $user->rights->stock->lire);
+					$newmenu->add("/product/inventory/card.php?action=create&leftmenu=stock_inventories", $langs->trans("NewInventory"), 1, $user->hasRight('stock',  'creer'));
+					$newmenu->add("/product/inventory/list.php?leftmenu=stock_inventories", $langs->trans("List"), 1, $user->hasRight('stock',  'lire'));
 				}
 			} else {
-				$newmenu->add("/product/inventory/list.php?leftmenu=stock_inventories", $langs->trans("Inventories"), 0, $user->rights->stock->inventory_advance->read, '', $mainmenu, 'stock', 0, '', '', '', img_picto('', 'inventory', 'class="pictofixedwidth"'));
+				$newmenu->add("/product/inventory/list.php?leftmenu=stock_inventories", $langs->trans("Inventories"), 0, $user->hasRight('stock',  'inventory_advance', 'read'), '', $mainmenu, 'stock', 0, '', '', '', img_picto('', 'inventory', 'class="pictofixedwidth"'));
 				if ($usemenuhider || empty($leftmenu) || $leftmenu == "stock_inventories") {
-					$newmenu->add("/product/inventory/card.php?action=create&leftmenu=stock_inventories", $langs->trans("NewInventory"), 1, $user->rights->stock->inventory_advance->write);
-					$newmenu->add("/product/inventory/list.php?leftmenu=stock_inventories", $langs->trans("List"), 1, $user->rights->stock->inventory_advance->read);
+					$newmenu->add("/product/inventory/card.php?action=create&leftmenu=stock_inventories", $langs->trans("NewInventory"), 1, $user->hasRight('stock',  'inventory_advance', 'write'));
+					$newmenu->add("/product/inventory/list.php?leftmenu=stock_inventories", $langs->trans("List"), 1, $user->hasRight('stock',  'inventory_advance', 'read'));
 				}
 			}
 		}
@@ -2079,33 +2079,33 @@ function get_left_menu_products($mainmenu, &$newmenu, $usemenuhider = 1, $leftme
 		// Shipments
 		if (isModEnabled('expedition')) {
 			$langs->load("sendings");
-			$newmenu->add("/expedition/index.php?leftmenu=sendings", $langs->trans("Shipments"), 0, $user->rights->expedition->lire, '', $mainmenu, 'sendings', 0, '', '', '', img_picto('', 'shipment', 'class="pictofixedwidth"'));
-			$newmenu->add("/expedition/card.php?action=create2&amp;leftmenu=sendings", $langs->trans("NewSending"), 1, $user->rights->expedition->creer);
-			$newmenu->add("/expedition/list.php?leftmenu=sendings", $langs->trans("List"), 1, $user->rights->expedition->lire);
+			$newmenu->add("/expedition/index.php?leftmenu=sendings", $langs->trans("Shipments"), 0, $user->hasRight('expedition',  'lire'), '', $mainmenu, 'sendings', 0, '', '', '', img_picto('', 'shipment', 'class="pictofixedwidth"'));
+			$newmenu->add("/expedition/card.php?action=create2&amp;leftmenu=sendings", $langs->trans("NewSending"), 1, $user->hasRight('expedition',  'creer'));
+			$newmenu->add("/expedition/list.php?leftmenu=sendings", $langs->trans("List"), 1, $user->hasRight('expedition',  'lire'));
 			if ($usemenuhider || empty($leftmenu) || $leftmenu == "sendings") {
-				$newmenu->add("/expedition/list.php?leftmenu=sendings&search_status=0", $langs->trans("StatusSendingDraftShort"), 2, $user->rights->expedition->lire);
-				$newmenu->add("/expedition/list.php?leftmenu=sendings&search_status=1", $langs->trans("StatusSendingValidatedShort"), 2, $user->rights->expedition->lire);
-				$newmenu->add("/expedition/list.php?leftmenu=sendings&search_status=2", $langs->trans("StatusSendingProcessedShort"), 2, $user->rights->expedition->lire);
+				$newmenu->add("/expedition/list.php?leftmenu=sendings&search_status=0", $langs->trans("StatusSendingDraftShort"), 2, $user->hasRight('expedition',  'lire'));
+				$newmenu->add("/expedition/list.php?leftmenu=sendings&search_status=1", $langs->trans("StatusSendingValidatedShort"), 2, $user->hasRight('expedition',  'lire'));
+				$newmenu->add("/expedition/list.php?leftmenu=sendings&search_status=2", $langs->trans("StatusSendingProcessedShort"), 2, $user->hasRight('expedition',  'lire'));
 			}
-			$newmenu->add("/expedition/stats/index.php?leftmenu=sendings", $langs->trans("Statistics"), 1, $user->rights->expedition->lire);
+			$newmenu->add("/expedition/stats/index.php?leftmenu=sendings", $langs->trans("Statistics"), 1, $user->hasRight('expedition',  'lire'));
 		}
 
 		// Receptions
 		if (isModEnabled('reception')) {
 			$langs->load("receptions");
-			$newmenu->add("/reception/index.php?leftmenu=receptions", $langs->trans("Receptions"), 0, $user->rights->reception->lire, '', $mainmenu, 'receptions', 0, '', '', '', img_picto('', 'dollyrevert', 'class="pictofixedwidth"'));
-			$newmenu->add("/reception/card.php?action=create2&amp;leftmenu=receptions", $langs->trans("NewReception"), 1, $user->rights->reception->creer);
-			$newmenu->add("/reception/list.php?leftmenu=receptions", $langs->trans("List"), 1, $user->rights->reception->lire);
+			$newmenu->add("/reception/index.php?leftmenu=receptions", $langs->trans("Receptions"), 0, $user->hasRight('reception',  'lire'), '', $mainmenu, 'receptions', 0, '', '', '', img_picto('', 'dollyrevert', 'class="pictofixedwidth"'));
+			$newmenu->add("/reception/card.php?action=create2&amp;leftmenu=receptions", $langs->trans("NewReception"), 1, $user->hasRight('reception',  'creer'));
+			$newmenu->add("/reception/list.php?leftmenu=receptions", $langs->trans("List"), 1, $user->hasRight('reception',  'lire'));
 			if ($usemenuhider || empty($leftmenu) || $leftmenu == "receptions") {
-				$newmenu->add("/reception/list.php?leftmenu=receptions&search_status=0", $langs->trans("StatusReceptionDraftShort"), 2, $user->rights->reception->lire);
+				$newmenu->add("/reception/list.php?leftmenu=receptions&search_status=0", $langs->trans("StatusReceptionDraftShort"), 2, $user->hasRight('reception',  'lire'));
 			}
 			if ($usemenuhider || empty($leftmenu) || $leftmenu == "receptions") {
-				$newmenu->add("/reception/list.php?leftmenu=receptions&search_status=1", $langs->trans("StatusReceptionValidatedShort"), 2, $user->rights->reception->lire);
+				$newmenu->add("/reception/list.php?leftmenu=receptions&search_status=1", $langs->trans("StatusReceptionValidatedShort"), 2, $user->hasRight('reception',  'lire'));
 			}
 			if ($usemenuhider || empty($leftmenu) || $leftmenu == "receptions") {
-				$newmenu->add("/reception/list.php?leftmenu=receptions&search_status=2", $langs->trans("StatusReceptionProcessedShort"), 2, $user->rights->reception->lire);
+				$newmenu->add("/reception/list.php?leftmenu=receptions&search_status=2", $langs->trans("StatusReceptionProcessedShort"), 2, $user->hasRight('reception',  'lire'));
 			}
-			$newmenu->add("/reception/stats/index.php?leftmenu=receptions", $langs->trans("Statistics"), 1, $user->rights->reception->lire);
+			$newmenu->add("/reception/stats/index.php?leftmenu=receptions", $langs->trans("Statistics"), 1, $user->hasRight('reception',  'lire'));
 		}
 	}
 }
@@ -2129,17 +2129,17 @@ function get_left_menu_mrp($mainmenu, &$newmenu, $usemenuhider = 1, $leftmenu =
 		if (isModEnabled('bom') || isModEnabled('mrp')) {
 			$langs->load("mrp");
 
-			$newmenu->add("", $langs->trans("MenuBOM"), 0, $user->rights->bom->read, '', $mainmenu, 'bom', 0, '', '', '', img_picto('', 'bom', 'class="paddingright pictofixedwidth"'));
-			$newmenu->add("/bom/bom_card.php?leftmenu=bom&amp;action=create", $langs->trans("NewBOM"), 1, $user->rights->bom->write, '', $mainmenu, 'bom');
-			$newmenu->add("/bom/bom_list.php?leftmenu=bom", $langs->trans("List"), 1, $user->rights->bom->read, '', $mainmenu, 'bom');
+			$newmenu->add("", $langs->trans("MenuBOM"), 0, $user->hasRight('bom',  'read'), '', $mainmenu, 'bom', 0, '', '', '', img_picto('', 'bom', 'class="paddingright pictofixedwidth"'));
+			$newmenu->add("/bom/bom_card.php?leftmenu=bom&amp;action=create", $langs->trans("NewBOM"), 1, $user->hasRight('bom',  'write'), '', $mainmenu, 'bom');
+			$newmenu->add("/bom/bom_list.php?leftmenu=bom", $langs->trans("List"), 1, $user->hasRight('bom',  'read'), '', $mainmenu, 'bom');
 		}
 
 		if (isModEnabled('mrp')) {
 			$langs->load("mrp");
 
-			$newmenu->add("", $langs->trans("MenuMRP"), 0, $user->rights->mrp->read, '', $mainmenu, 'mo', 0, '', '', '', img_picto('', 'mrp', 'class="paddingright pictofixedwidth"'));
-			$newmenu->add("/mrp/mo_card.php?leftmenu=mo&amp;action=create", $langs->trans("NewMO"), 1, $user->rights->mrp->write, '', $mainmenu, 'mo');
-			$newmenu->add("/mrp/mo_list.php?leftmenu=mo", $langs->trans("List"), 1, $user->rights->mrp->read, '', $mainmenu, 'mo');
+			$newmenu->add("", $langs->trans("MenuMRP"), 0, $user->hasRight('mrp',  'read'), '', $mainmenu, 'mo', 0, '', '', '', img_picto('', 'mrp', 'class="paddingright pictofixedwidth"'));
+			$newmenu->add("/mrp/mo_card.php?leftmenu=mo&amp;action=create", $langs->trans("NewMO"), 1, $user->hasRight('mrp',  'write'), '', $mainmenu, 'mo');
+			$newmenu->add("/mrp/mo_list.php?leftmenu=mo", $langs->trans("List"), 1, $user->hasRight('mrp',  'read'), '', $mainmenu, 'mo');
 		}
 	}
 }
@@ -2166,7 +2166,7 @@ function get_left_menu_projects($mainmenu, &$newmenu, $usemenuhider = 1, $leftme
 
 			$tmpentry = array(
 				'enabled'=>(isModEnabled('projet')),
-				'perms'=>(!empty($user->rights->projet->lire)),
+				'perms'=>(!empty($user->hasRight('projet',  'lire'))),
 				'module'=>'projet'
 			);
 			$listofmodulesforexternal = explode(',', $conf->global->MAIN_MODULES_FOR_EXTERNAL);
@@ -2184,8 +2184,8 @@ function get_left_menu_projects($mainmenu, &$newmenu, $usemenuhider = 1, $leftme
 			}
 
 			// Project assigned to user
-			$newmenu->add("/projet/index.php?leftmenu=projects".($search_project_user ? '&search_project_user='.$search_project_user : ''), $titleboth, 0, $user->rights->projet->lire, '', $mainmenu, 'projects', 0, '', '', '', img_picto('', 'project', 'class="paddingright pictofixedwidth"'));
-			$newmenu->add("/projet/card.php?leftmenu=projects&action=create".($search_project_user ? '&search_project_user='.$search_project_user : ''), $titlenew, 1, $user->rights->projet->creer);
+			$newmenu->add("/projet/index.php?leftmenu=projects".($search_project_user ? '&search_project_user='.$search_project_user : ''), $titleboth, 0, $user->hasRight('projet',  'lire'), '', $mainmenu, 'projects', 0, '', '', '', img_picto('', 'project', 'class="paddingright pictofixedwidth"'));
+			$newmenu->add("/projet/card.php?leftmenu=projects&action=create".($search_project_user ? '&search_project_user='.$search_project_user : ''), $titlenew, 1, $user->hasRight('projet',  'creer'));
 
 			if (empty($conf->global->PROJECT_USE_OPPORTUNITIES)) {
 				$newmenu->add("/projet/list.php?leftmenu=projets".($search_project_user ? '&search_project_user='.$search_project_user : '').'&search_status=99', $langs->trans("List"), 1, $showmode, '', 'project', 'list');
@@ -2197,23 +2197,23 @@ function get_left_menu_projects($mainmenu, &$newmenu, $usemenuhider = 1, $leftme
 				$newmenu->add('/projet/list.php?mainmenu=project&amp;leftmenu=list&search_usage_opportunity=1&search_status=99', $langs->trans("List"), 2, $showmode);
 			}
 
-			$newmenu->add("/projet/stats/index.php?leftmenu=projects", $langs->trans("Statistics"), 1, $user->rights->projet->lire);
+			$newmenu->add("/projet/stats/index.php?leftmenu=projects", $langs->trans("Statistics"), 1, $user->hasRight('projet',  'lire'));
 
 			// Categories
 			if (isModEnabled('categorie')) {
 				$langs->load("categories");
-				$newmenu->add("/categories/index.php?leftmenu=cat&amp;type=6", $langs->trans("Categories"), 1, $user->rights->categorie->lire, '', $mainmenu, 'cat');
+				$newmenu->add("/categories/index.php?leftmenu=cat&amp;type=6", $langs->trans("Categories"), 1, $user->hasRight('categorie',  'lire'), '', $mainmenu, 'cat');
 			}
 
 			if (empty($conf->global->PROJECT_HIDE_TASKS)) {
 				// Project affected to user
-				$newmenu->add("/projet/activity/index.php?leftmenu=tasks".($search_project_user ? '&search_project_user='.$search_project_user : ''), $langs->trans("Activities"), 0, $user->rights->projet->lire, '', 'project', 'tasks', 0, '', '', '', img_picto('', 'projecttask', 'class="paddingright pictofixedwidth"'));
-				$newmenu->add("/projet/tasks.php?leftmenu=tasks&action=create", $langs->trans("NewTask"), 1, $user->rights->projet->creer);
-				$newmenu->add("/projet/tasks/list.php?leftmenu=tasks".($search_project_user ? '&search_project_user='.$search_project_user : ''), $langs->trans("List"), 1, $user->rights->projet->lire);
-				$newmenu->add("/projet/tasks/stats/index.php?leftmenu=projects", $langs->trans("Statistics"), 1, $user->rights->projet->lire);
+				$newmenu->add("/projet/activity/index.php?leftmenu=tasks".($search_project_user ? '&search_project_user='.$search_project_user : ''), $langs->trans("Activities"), 0, $user->hasRight('projet',  'lire'), '', 'project', 'tasks', 0, '', '', '', img_picto('', 'projecttask', 'class="paddingright pictofixedwidth"'));
+				$newmenu->add("/projet/tasks.php?leftmenu=tasks&action=create", $langs->trans("NewTask"), 1, $user->hasRight('projet',  'creer'));
+				$newmenu->add("/projet/tasks/list.php?leftmenu=tasks".($search_project_user ? '&search_project_user='.$search_project_user : ''), $langs->trans("List"), 1, $user->hasRight('projet',  'lire'));
+				$newmenu->add("/projet/tasks/stats/index.php?leftmenu=projects", $langs->trans("Statistics"), 1, $user->hasRight('projet',  'lire'));
 
-				$newmenu->add("/projet/activity/perweek.php?leftmenu=tasks".($search_project_user ? '&search_project_user='.$search_project_user : ''), $langs->trans("NewTimeSpent"), 0, $user->rights->projet->lire, '', 'project', 'timespent', 0, '', '', '', img_picto('', 'timespent', 'class="paddingright pictofixedwidth"'));
-				$newmenu->add("/projet/tasks/time.php?leftmenu=tasks".($search_project_user ? '&search_project_user='.$search_project_user : ''), $langs->trans("List"), 1, $user->rights->projet->lire);
+				$newmenu->add("/projet/activity/perweek.php?leftmenu=tasks".($search_project_user ? '&search_project_user='.$search_project_user : ''), $langs->trans("NewTimeSpent"), 0, $user->hasRight('projet',  'lire'), '', 'project', 'timespent', 0, '', '', '', img_picto('', 'timespent', 'class="paddingright pictofixedwidth"'));
+				$newmenu->add("/projet/tasks/time.php?leftmenu=tasks".($search_project_user ? '&search_project_user='.$search_project_user : ''), $langs->trans("List"), 1, $user->hasRight('projet',  'lire'));
 			}
 		}
 	}
@@ -2238,32 +2238,32 @@ function get_left_menu_hrm($mainmenu, &$newmenu, $usemenuhider = 1, $leftmenu =
 		if (isModEnabled('hrm')) {
 			$langs->load("hrm");
 
-			$newmenu->add("/user/list.php?mainmenu=hrm&leftmenu=hrm&mode=employee", $langs->trans("Employees"), 0, $user->rights->user->user->lire, '', $mainmenu, 'hrm', 0, '', '', '', img_picto('', 'user', 'class="paddingright pictofixedwidth"'));
-			$newmenu->add("/user/card.php?mainmenu=hrm&leftmenu=hrm&action=create&employee=1", $langs->trans("NewEmployee"), 1, $user->rights->user->user->creer);
-			$newmenu->add("/user/list.php?mainmenu=hrm&leftmenu=hrm&mode=employee&contextpage=employeelist", $langs->trans("List"), 1, $user->rights->user->user->lire);
+			$newmenu->add("/user/list.php?mainmenu=hrm&leftmenu=hrm&mode=employee", $langs->trans("Employees"), 0, $user->hasRight('user', 'user', 'read'), '', $mainmenu, 'hrm', 0, '', '', '', img_picto('', 'user', 'class="paddingright pictofixedwidth"'));
+			$newmenu->add("/user/card.php?mainmenu=hrm&leftmenu=hrm&action=create&employee=1", $langs->trans("NewEmployee"), 1, $user->hasRight('user', 'user', 'write'));
+			$newmenu->add("/user/list.php?mainmenu=hrm&leftmenu=hrm&mode=employee&contextpage=employeelist", $langs->trans("List"), 1, $user->hasRight('user', 'user', 'read'));
 
-			$newmenu->add("/hrm/skill_list.php?mainmenu=hrm&leftmenu=hrm_sm", $langs->trans("SkillsManagement"), 0, $user->rights->hrm->all->read, '', $mainmenu, 'hrm_sm', 0, '', '', '', img_picto('', 'shapes', 'class="paddingright pictofixedwidth"'));
+			$newmenu->add("/hrm/skill_list.php?mainmenu=hrm&leftmenu=hrm_sm", $langs->trans("SkillsManagement"), 0, $user->hasRight('hrm', 'all', 'read'), '', $mainmenu, 'hrm_sm', 0, '', '', '', img_picto('', 'shapes', 'class="paddingright pictofixedwidth"'));
 
 			// Skills
-			$newmenu->add("/hrm/skill_list.php?mainmenu=hrm&leftmenu=hrm_sm", $langs->trans("Skills"), 1, $user->rights->hrm->all->read, '', $mainmenu, 'hrm_sm', 0, '', '', '', img_picto('', 'shapes', 'class="paddingright pictofixedwidth"'));
-			//$newmenu->add("/hrm/skill_card.php?mainmenu=hrm&leftmenu=hrm_sm&action=create", $langs->trans("NewSkill"), 1, $user->rights->hrm->all->write);
-			//$newmenu->add("/hrm/skill_list.php?mainmenu=hrm&leftmenu=hrm_sm", $langs->trans("List"), 1, $user->rights->hrm->all->read);
+			$newmenu->add("/hrm/skill_list.php?mainmenu=hrm&leftmenu=hrm_sm", $langs->trans("Skills"), 1, $user->hasRight('hrm', 'all', 'read'), '', $mainmenu, 'hrm_sm', 0, '', '', '', img_picto('', 'shapes', 'class="paddingright pictofixedwidth"'));
+			//$newmenu->add("/hrm/skill_card.php?mainmenu=hrm&leftmenu=hrm_sm&action=create", $langs->trans("NewSkill"), 1, $user->hasRight('hrm',  'all', 'write'));
+			//$newmenu->add("/hrm/skill_list.php?mainmenu=hrm&leftmenu=hrm_sm", $langs->trans("List"), 1, $user->hasRight('hrm',  'all', 'read'));
 
 			// Job (Description of work to do and skills required)
-			$newmenu->add("/hrm/job_list.php?mainmenu=hrm&leftmenu=hrm_sm", $langs->trans("JobsPosition"), 1, $user->rights->hrm->all->read, '', $mainmenu, 'hrm_sm', 0, '', '', '', img_picto('', 'technic', 'class="paddingright pictofixedwidth"'));
-			//$newmenu->add("/hrm/job_card.php?mainmenu=hrm&leftmenu=hrm_sm&action=create", $langs->transnoentities("NewObject", $langs->trans("Job")), 1, $user->rights->hrm->all->write);
-			//$newmenu->add("/hrm/job_list.php?mainmenu=hrm&leftmenu=hrm_sm", $langs->trans("List"), 1, $user->rights->hrm->all->read);
+			$newmenu->add("/hrm/job_list.php?mainmenu=hrm&leftmenu=hrm_sm", $langs->trans("JobsPosition"), 1, $user->hasRight('hrm', 'all', 'read'), '', $mainmenu, 'hrm_sm', 0, '', '', '', img_picto('', 'technic', 'class="paddingright pictofixedwidth"'));
+			//$newmenu->add("/hrm/job_card.php?mainmenu=hrm&leftmenu=hrm_sm&action=create", $langs->transnoentities("NewObject", $langs->trans("Job")), 1, $user->hasRight('hrm',  'all', 'write'));
+			//$newmenu->add("/hrm/job_list.php?mainmenu=hrm&leftmenu=hrm_sm", $langs->trans("List"), 1, $user->hasRight('hrm',  'all', 'read'));
 
 			// Position = Link job - user
-			$newmenu->add("/hrm/position_list.php?mainmenu=hrm&leftmenu=hrm_sm", $langs->trans("EmployeePositions"), 1, $user->rights->hrm->all->read, '', $mainmenu, 'hrm_sm', 0, '', '', '', img_picto('', 'user-cog', 'class="paddingright pictofixedwidth"'));
-			//$newmenu->add("/hrm/position.php?mainmenu=hrm&leftmenu=hrm_sm&action=create", $langs->transnoentities("NewObject", $langs->trans("Position")), 1, $user->rights->hrm->all->write);
-			//$newmenu->add("/hrm/position_list.php?mainmenu=hrm&leftmenu=hrm_sm", $langs->trans("List"), 1, $user->rights->hrm->all->read);
+			$newmenu->add("/hrm/position_list.php?mainmenu=hrm&leftmenu=hrm_sm", $langs->trans("EmployeePositions"), 1, $user->hasRight('hrm', 'all', 'read'), '', $mainmenu, 'hrm_sm', 0, '', '', '', img_picto('', 'user-cog', 'class="paddingright pictofixedwidth"'));
+			//$newmenu->add("/hrm/position.php?mainmenu=hrm&leftmenu=hrm_sm&action=create", $langs->transnoentities("NewObject", $langs->trans("Position")), 1, $user->hasRight('hrm',  'all', 'write'));
+			//$newmenu->add("/hrm/position_list.php?mainmenu=hrm&leftmenu=hrm_sm", $langs->trans("List"), 1, $user->hasRight('hrm',  'all', 'read'));
 
 			// Evaluation
-			$newmenu->add("/hrm/evaluation_list.php?mainmenu=hrm&leftmenu=hrm_sm", $langs->trans("Evals"), 1, $user->rights->hrm->evaluation->read, '', $mainmenu, 'hrm_sm', 0, '', '', '', img_picto('', 'user', 'class="paddingright pictofixedwidth"'));
-			//$newmenu->add("/hrm/evaluation_card.php?mainmenu=hrm&leftmenu=hrm_sm&action=create", $langs->trans("NewEval"), 1, $user->rights->hrm->evaluation->write);
-			//$newmenu->add("/hrm/evaluation_list.php?mainmenu=hrm&leftmenu=hrm_sm", $langs->trans("List"), 1, $user->rights->hrm->evaluation->read);
-			$newmenu->add("/hrm/compare.php?mainmenu=hrm&leftmenu=hrm_sm", $langs->trans("SkillComparison"), 1, $user->rights->hrm->evaluation->read || $user->rights->hrm->compare_advance->read);
+			$newmenu->add("/hrm/evaluation_list.php?mainmenu=hrm&leftmenu=hrm_sm", $langs->trans("Evals"), 1, $user->hasRight('hrm', 'evaluation', 'read'), '', $mainmenu, 'hrm_sm', 0, '', '', '', img_picto('', 'user', 'class="paddingright pictofixedwidth"'));
+			//$newmenu->add("/hrm/evaluation_card.php?mainmenu=hrm&leftmenu=hrm_sm&action=create", $langs->trans("NewEval"), 1, $user->hasRight('hrm',  'evaluation', 'write'));
+			//$newmenu->add("/hrm/evaluation_list.php?mainmenu=hrm&leftmenu=hrm_sm", $langs->trans("List"), 1, $user->hasRight('hrm', 'evaluation', 'read'));
+			$newmenu->add("/hrm/compare.php?mainmenu=hrm&leftmenu=hrm_sm", $langs->trans("SkillComparison"), 1, $user->hasRight('hrm', 'evaluation', 'read') || $user->hasRight('hrm', 'compare_advance', 'read'));
 		}
 
 		// Leave/Holiday/Vacation module
@@ -2271,47 +2271,47 @@ function get_left_menu_hrm($mainmenu, &$newmenu, $usemenuhider = 1, $leftmenu =
 			// Load translation files required by the page
 			$langs->loadLangs(array("holiday", "trips"));
 
-			$newmenu->add("/holiday/list.php?mainmenu=hrm&leftmenu=holiday", $langs->trans("CPTitreMenu"), 0, $user->rights->holiday->read, '', $mainmenu, 'holiday', 0, '', '', '', img_picto('', 'holiday', 'class="paddingright pictofixedwidth"'));
-			$newmenu->add("/holiday/card.php?mainmenu=hrm&leftmenu=holiday&action=create", $langs->trans("New"), 1, $user->rights->holiday->write, '', $mainmenu);
-			$newmenu->add("/holiday/card_group.php?mainmenu=hrm&leftmenu=holiday&action=request", $langs->trans("NewHolidayForGroup"), 1, ($user->rights->holiday->writeall && $user->rights->holiday->readall), '', $mainmenu, 'holiday_sm');
-			$newmenu->add("/holiday/list.php?mainmenu=hrm&leftmenu=holiday", $langs->trans("List"), 1, $user->rights->holiday->read, '', $mainmenu);
+			$newmenu->add("/holiday/list.php?mainmenu=hrm&leftmenu=holiday", $langs->trans("CPTitreMenu"), 0, $user->hasRight('holiday',  'read'), '', $mainmenu, 'holiday', 0, '', '', '', img_picto('', 'holiday', 'class="paddingright pictofixedwidth"'));
+			$newmenu->add("/holiday/card.php?mainmenu=hrm&leftmenu=holiday&action=create", $langs->trans("New"), 1, $user->hasRight('holiday',  'write'), '', $mainmenu);
+			$newmenu->add("/holiday/card_group.php?mainmenu=hrm&leftmenu=holiday&action=request", $langs->trans("NewHolidayForGroup"), 1, ($user->hasRight('holiday',  'writeall') && $user->hasRight('holiday',  'readall')), '', $mainmenu, 'holiday_sm');
+			$newmenu->add("/holiday/list.php?mainmenu=hrm&leftmenu=holiday", $langs->trans("List"), 1, $user->hasRight('holiday',  'read'), '', $mainmenu);
 			if ($usemenuhider || empty($leftmenu) || $leftmenu == "holiday") {
-				$newmenu->add("/holiday/list.php?search_status=1&mainmenu=hrm&leftmenu=holiday", $langs->trans("DraftCP"), 2, $user->rights->holiday->read, '', $mainmenu, 'holiday_sm');
-				$newmenu->add("/holiday/list.php?search_status=2&mainmenu=hrm&leftmenu=holiday", $langs->trans("ToReviewCP"), 2, $user->rights->holiday->read, '', $mainmenu, 'holiday_sm');
-				$newmenu->add("/holiday/list.php?search_status=3&mainmenu=hrm&leftmenu=holiday", $langs->trans("ApprovedCP"), 2, $user->rights->holiday->read, '', $mainmenu, 'holiday_sm');
-				$newmenu->add("/holiday/list.php?search_status=4&mainmenu=hrm&leftmenu=holiday", $langs->trans("CancelCP"), 2, $user->rights->holiday->read, '', $mainmenu, 'holiday_sm');
-				$newmenu->add("/holiday/list.php?search_status=5&mainmenu=hrm&leftmenu=holiday", $langs->trans("RefuseCP"), 2, $user->rights->holiday->read, '', $mainmenu, 'holiday_sm');
+				$newmenu->add("/holiday/list.php?search_status=1&mainmenu=hrm&leftmenu=holiday", $langs->trans("DraftCP"), 2, $user->hasRight('holiday',  'read'), '', $mainmenu, 'holiday_sm');
+				$newmenu->add("/holiday/list.php?search_status=2&mainmenu=hrm&leftmenu=holiday", $langs->trans("ToReviewCP"), 2, $user->hasRight('holiday',  'read'), '', $mainmenu, 'holiday_sm');
+				$newmenu->add("/holiday/list.php?search_status=3&mainmenu=hrm&leftmenu=holiday", $langs->trans("ApprovedCP"), 2, $user->hasRight('holiday',  'read'), '', $mainmenu, 'holiday_sm');
+				$newmenu->add("/holiday/list.php?search_status=4&mainmenu=hrm&leftmenu=holiday", $langs->trans("CancelCP"), 2, $user->hasRight('holiday',  'read'), '', $mainmenu, 'holiday_sm');
+				$newmenu->add("/holiday/list.php?search_status=5&mainmenu=hrm&leftmenu=holiday", $langs->trans("RefuseCP"), 2, $user->hasRight('holiday',  'read'), '', $mainmenu, 'holiday_sm');
 			}
-			$newmenu->add("/holiday/define_holiday.php?mainmenu=hrm&action=request", $langs->trans("MenuConfCP"), 1, $user->rights->holiday->read, '', $mainmenu, 'holiday_sm');
-			$newmenu->add("/holiday/month_report.php?mainmenu=hrm&leftmenu=holiday", $langs->trans("MenuReportMonth"), 1, $user->rights->holiday->readall, '', $mainmenu, 'holiday_sm');
-			$newmenu->add("/holiday/view_log.php?mainmenu=hrm&leftmenu=holiday&action=request", $langs->trans("MenuLogCP"), 1, $user->rights->holiday->define_holiday, '', $mainmenu, 'holiday_sm');
+			$newmenu->add("/holiday/define_holiday.php?mainmenu=hrm&action=request", $langs->trans("MenuConfCP"), 1, $user->hasRight('holiday',  'read'), '', $mainmenu, 'holiday_sm');
+			$newmenu->add("/holiday/month_report.php?mainmenu=hrm&leftmenu=holiday", $langs->trans("MenuReportMonth"), 1, $user->hasRight('holiday',  'readall'), '', $mainmenu, 'holiday_sm');
+			$newmenu->add("/holiday/view_log.php?mainmenu=hrm&leftmenu=holiday&action=request", $langs->trans("MenuLogCP"), 1, $user->hasRight('holiday',  'define_holiday'), '', $mainmenu, 'holiday_sm');
 		}
 
 		// Trips and expenses (old module)
 		if (isModEnabled('deplacement')) {
 			$langs->load("trips");
-			$newmenu->add("/compta/deplacement/index.php?leftmenu=tripsandexpenses&amp;mainmenu=hrm", $langs->trans("TripsAndExpenses"), 0, $user->rights->deplacement->lire, '', $mainmenu, 'tripsandexpenses', 0, '', '', '', img_picto('', 'trip', 'class="paddingright pictofixedwidth"'));
-			$newmenu->add("/compta/deplacement/card.php?action=create&amp;leftmenu=tripsandexpenses&amp;mainmenu=hrm", $langs->trans("New"), 1, $user->rights->deplacement->creer);
-			$newmenu->add("/compta/deplacement/list.php?leftmenu=tripsandexpenses&amp;mainmenu=hrm", $langs->trans("List"), 1, $user->rights->deplacement->lire);
-			$newmenu->add("/compta/deplacement/stats/index.php?leftmenu=tripsandexpenses&amp;mainmenu=hrm", $langs->trans("Statistics"), 1, $user->rights->deplacement->lire);
+			$newmenu->add("/compta/deplacement/index.php?leftmenu=tripsandexpenses&amp;mainmenu=hrm", $langs->trans("TripsAndExpenses"), 0, $user->hasRight('deplacement',  'lire'), '', $mainmenu, 'tripsandexpenses', 0, '', '', '', img_picto('', 'trip', 'class="paddingright pictofixedwidth"'));
+			$newmenu->add("/compta/deplacement/card.php?action=create&amp;leftmenu=tripsandexpenses&amp;mainmenu=hrm", $langs->trans("New"), 1, $user->hasRight('deplacement',  'creer'));
+			$newmenu->add("/compta/deplacement/list.php?leftmenu=tripsandexpenses&amp;mainmenu=hrm", $langs->trans("List"), 1, $user->hasRight('deplacement',  'lire'));
+			$newmenu->add("/compta/deplacement/stats/index.php?leftmenu=tripsandexpenses&amp;mainmenu=hrm", $langs->trans("Statistics"), 1, $user->hasRight('deplacement',  'lire'));
 		}
 
 		// Expense report
 		if (isModEnabled('expensereport')) {
 			$langs->loadLangs(array("trips", "bills"));
-			$newmenu->add("/expensereport/index.php?leftmenu=expensereport&amp;mainmenu=hrm", $langs->trans("TripsAndExpenses"), 0, $user->rights->expensereport->lire, '', $mainmenu, 'expensereport', 0, '', '', '', img_picto('', 'trip', 'class="paddingright pictofixedwidth"'));
-			$newmenu->add("/expensereport/card.php?action=create&amp;leftmenu=expensereport&amp;mainmenu=hrm", $langs->trans("New"), 1, $user->rights->expensereport->creer);
-			$newmenu->add("/expensereport/list.php?leftmenu=expensereport&amp;mainmenu=hrm", $langs->trans("List"), 1, $user->rights->expensereport->lire);
+			$newmenu->add("/expensereport/index.php?leftmenu=expensereport&amp;mainmenu=hrm", $langs->trans("TripsAndExpenses"), 0, $user->hasRight('expensereport',  'lire'), '', $mainmenu, 'expensereport', 0, '', '', '', img_picto('', 'trip', 'class="paddingright pictofixedwidth"'));
+			$newmenu->add("/expensereport/card.php?action=create&amp;leftmenu=expensereport&amp;mainmenu=hrm", $langs->trans("New"), 1, $user->hasRight('expensereport',  'creer'));
+			$newmenu->add("/expensereport/list.php?leftmenu=expensereport&amp;mainmenu=hrm", $langs->trans("List"), 1, $user->hasRight('expensereport',  'lire'));
 			if ($usemenuhider || empty($leftmenu) || $leftmenu == "expensereport") {
-				$newmenu->add("/expensereport/list.php?search_status=0&amp;leftmenu=expensereport&amp;mainmenu=hrm", $langs->trans("Draft"), 2, $user->rights->expensereport->lire);
-				$newmenu->add("/expensereport/list.php?search_status=2&amp;leftmenu=expensereport&amp;mainmenu=hrm", $langs->trans("Validated"), 2, $user->rights->expensereport->lire);
-				$newmenu->add("/expensereport/list.php?search_status=5&amp;leftmenu=expensereport&amp;mainmenu=hrm", $langs->trans("Approved"), 2, $user->rights->expensereport->lire);
-				$newmenu->add("/expensereport/list.php?search_status=6&amp;leftmenu=expensereport&amp;mainmenu=hrm", $langs->trans("Paid"), 2, $user->rights->expensereport->lire);
-				$newmenu->add("/expensereport/list.php?search_status=4&amp;leftmenu=expensereport&amp;mainmenu=hrm", $langs->trans("Canceled"), 2, $user->rights->expensereport->lire);
-				$newmenu->add("/expensereport/list.php?search_status=99&amp;leftmenu=expensereport&amp;mainmenu=hrm", $langs->trans("Refused"), 2, $user->rights->expensereport->lire);
+				$newmenu->add("/expensereport/list.php?search_status=0&amp;leftmenu=expensereport&amp;mainmenu=hrm", $langs->trans("Draft"), 2, $user->hasRight('expensereport',  'lire'));
+				$newmenu->add("/expensereport/list.php?search_status=2&amp;leftmenu=expensereport&amp;mainmenu=hrm", $langs->trans("Validated"), 2, $user->hasRight('expensereport',  'lire'));
+				$newmenu->add("/expensereport/list.php?search_status=5&amp;leftmenu=expensereport&amp;mainmenu=hrm", $langs->trans("Approved"), 2, $user->hasRight('expensereport',  'lire'));
+				$newmenu->add("/expensereport/list.php?search_status=6&amp;leftmenu=expensereport&amp;mainmenu=hrm", $langs->trans("Paid"), 2, $user->hasRight('expensereport',  'lire'));
+				$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->rights->expensereport->lire);
-			$newmenu->add("/expensereport/stats/index.php?leftmenu=expensereport&amp;mainmenu=hrm", $langs->trans("Statistics"), 1, $user->rights->expensereport->lire);
+			$newmenu->add("/expensereport/payment/list.php?leftmenu=expensereport_payments&amp;mainmenu=hrm", $langs->trans("Payments"), 1, $user->hasRight('expensereport',  'lire'));
+			$newmenu->add("/expensereport/stats/index.php?leftmenu=expensereport&amp;mainmenu=hrm", $langs->trans("Statistics"), 1, $user->hasRight('expensereport',  'lire'));
 		}
 
 		if (isModEnabled('projet')) {
@@ -2320,7 +2320,7 @@ function get_left_menu_hrm($mainmenu, &$newmenu, $usemenuhider = 1, $leftmenu =
 
 				$search_project_user = GETPOST('search_project_user', 'int');
 
-				$newmenu->add("/projet/activity/perweek.php?leftmenu=tasks".($search_project_user ? '&search_project_user='.$search_project_user : ''), $langs->trans("NewTimeSpent"), 0, $user->rights->projet->lire, '', $mainmenu, 'timespent', 0, '', '', '', img_picto('', 'timespent', 'class="paddingright pictofixedwidth"'));
+				$newmenu->add("/projet/activity/perweek.php?leftmenu=tasks".($search_project_user ? '&search_project_user='.$search_project_user : ''), $langs->trans("NewTimeSpent"), 0, $user->hasRight('projet',  'lire'), '', $mainmenu, 'timespent', 0, '', '', '', img_picto('', 'timespent', 'class="paddingright pictofixedwidth"'));
 			}
 		}
 	}
@@ -2348,22 +2348,22 @@ function get_left_menu_tools($mainmenu, &$newmenu, $usemenuhider = 1, $leftmenu
 		}
 
 		if (isModEnabled('mailing')) {
-			$newmenu->add("/comm/mailing/index.php?leftmenu=mailing", $langs->trans("EMailings"), 0, $user->rights->mailing->lire, '', $mainmenu, 'mailing', 0, '', '', '', img_picto('', 'email', 'class="paddingright pictofixedwidth"'));
-			$newmenu->add("/comm/mailing/card.php?leftmenu=mailing&amp;action=create", $langs->trans("NewMailing"), 1, $user->rights->mailing->creer);
-			$newmenu->add("/comm/mailing/list.php?leftmenu=mailing", $langs->trans("List"), 1, $user->rights->mailing->lire);
+			$newmenu->add("/comm/mailing/index.php?leftmenu=mailing", $langs->trans("EMailings"), 0, $user->hasRight('mailing',  'lire'), '', $mainmenu, 'mailing', 0, '', '', '', img_picto('', 'email', 'class="paddingright pictofixedwidth"'));
+			$newmenu->add("/comm/mailing/card.php?leftmenu=mailing&amp;action=create", $langs->trans("NewMailing"), 1, $user->hasRight('mailing',  'creer'));
+			$newmenu->add("/comm/mailing/list.php?leftmenu=mailing", $langs->trans("List"), 1, $user->hasRight('mailing',  'lire'));
 		}
 
 		if (isModEnabled('export')) {
 			$langs->load("exports");
-			$newmenu->add("/exports/index.php?leftmenu=export", $langs->trans("FormatedExport"), 0, $user->rights->export->lire, '', $mainmenu, 'export', 0, '', '', '', img_picto('', 'technic', 'class="paddingright pictofixedwidth"'));
-			$newmenu->add("/exports/export.php?leftmenu=export", $langs->trans("NewExport"), 1, $user->rights->export->creer);
-			//$newmenu->add("/exports/export.php?leftmenu=export",$langs->trans("List"),1, $user->rights->export->lire);
+			$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->rights->import->run, '', $mainmenu, 'import', 0, '', '', '', img_picto('', 'technic', 'class="paddingright pictofixedwidth"'));
-			$newmenu->add("/imports/import.php?leftmenu=import", $langs->trans("NewImport"), 1, $user->rights->import->run);
+			$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'));
 		}
 	}
 }
@@ -2387,39 +2387,39 @@ function get_left_menu_members($mainmenu, &$newmenu, $usemenuhider = 1, $leftmen
 			// Load translation files required by the page
 			$langs->loadLangs(array("members", "compta"));
 
-			$newmenu->add("/adherents/index.php?leftmenu=members&amp;mainmenu=members", $langs->trans("Members"), 0, $user->rights->adherent->lire, '', $mainmenu, 'members', 0, '', '', '', img_picto('', 'member', 'class="paddingright pictofixedwidth"'));
-			$newmenu->add("/adherents/card.php?leftmenu=members&amp;action=create", $langs->trans("NewMember"), 1, $user->rights->adherent->creer);
-			$newmenu->add("/adherents/list.php?leftmenu=members", $langs->trans("List"), 1, $user->rights->adherent->lire);
-			$newmenu->add("/adherents/list.php?leftmenu=members&amp;statut=-1", $langs->trans("MenuMembersToValidate"), 2, $user->rights->adherent->lire);
-			$newmenu->add("/adherents/list.php?leftmenu=members&amp;statut=1", $langs->trans("MenuMembersValidated"), 2, $user->rights->adherent->lire);
-			$newmenu->add("/adherents/list.php?leftmenu=members&amp;statut=1&amp;filter=withoutsubscription", $langs->trans("WithoutSubscription"), 3, $user->rights->adherent->lire);
-			$newmenu->add("/adherents/list.php?leftmenu=members&amp;statut=1&amp;filter=uptodate", $langs->trans("UpToDate"), 3, $user->rights->adherent->lire);
-			$newmenu->add("/adherents/list.php?leftmenu=members&amp;statut=1&amp;filter=outofdate", $langs->trans("OutOfDate"), 3, $user->rights->adherent->lire);
-			$newmenu->add("/adherents/list.php?leftmenu=members&amp;statut=0", $langs->trans("MenuMembersResiliated"), 2, $user->rights->adherent->lire);
-			$newmenu->add("/adherents/stats/index.php?leftmenu=members", $langs->trans("MenuMembersStats"), 1, $user->rights->adherent->lire);
+			$newmenu->add("/adherents/index.php?leftmenu=members&amp;mainmenu=members", $langs->trans("Members"), 0, $user->hasRight('adherent', 'read'), '', $mainmenu, 'members', 0, '', '', '', img_picto('', 'member', 'class="paddingright pictofixedwidth"'));
+			$newmenu->add("/adherents/card.php?leftmenu=members&amp;action=create", $langs->trans("NewMember"), 1, $user->hasRight('adherent', 'write'));
+			$newmenu->add("/adherents/list.php?leftmenu=members", $langs->trans("List"), 1, $user->hasRight('adherent', 'read'));
+			$newmenu->add("/adherents/list.php?leftmenu=members&amp;statut=-1", $langs->trans("MenuMembersToValidate"), 2, $user->hasRight('adherent', 'read'));
+			$newmenu->add("/adherents/list.php?leftmenu=members&amp;statut=1", $langs->trans("MenuMembersValidated"), 2, $user->hasRight('adherent', 'read'));
+			$newmenu->add("/adherents/list.php?leftmenu=members&amp;statut=1&amp;filter=withoutsubscription", $langs->trans("WithoutSubscription"), 3, $user->hasRight('adherent', 'read'));
+			$newmenu->add("/adherents/list.php?leftmenu=members&amp;statut=1&amp;filter=uptodate", $langs->trans("UpToDate"), 3, $user->hasRight('adherent', 'read'));
+			$newmenu->add("/adherents/list.php?leftmenu=members&amp;statut=1&amp;filter=outofdate", $langs->trans("OutOfDate"), 3, $user->hasRight('adherent', 'read'));
+			$newmenu->add("/adherents/list.php?leftmenu=members&amp;statut=0", $langs->trans("MenuMembersResiliated"), 2, $user->hasRight('adherent', 'read'));
+			$newmenu->add("/adherents/stats/index.php?leftmenu=members", $langs->trans("MenuMembersStats"), 1, $user->hasRight('adherent', 'read'));
 
-			$newmenu->add("/adherents/cartes/carte.php?leftmenu=export", $langs->trans("MembersCards"), 1, $user->rights->adherent->export);
+			$newmenu->add("/adherents/cartes/carte.php?leftmenu=export", $langs->trans("MembersCards"), 1, $user->hasRight('adherent', 'export'));
 			if (!empty($conf->global->MEMBER_LINK_TO_HTPASSWDFILE) && ($usemenuhider || empty($leftmenu) || $leftmenu == 'none' || $leftmenu == "members" || $leftmenu == "export")) {
-				$newmenu->add("/adherents/htpasswd.php?leftmenu=export", $langs->trans("Filehtpasswd"), 1, $user->rights->adherent->export);
+				$newmenu->add("/adherents/htpasswd.php?leftmenu=export", $langs->trans("Filehtpasswd"), 1, $user->hasRight('adherent',  'export'));
 			}
 
 			if (isModEnabled('categorie')) {
 				$langs->load("categories");
-				$newmenu->add("/categories/index.php?leftmenu=cat&amp;type=3", $langs->trans("Categories"), 1, $user->rights->categorie->lire, '', $mainmenu, 'cat');
+				$newmenu->add("/categories/index.php?leftmenu=cat&amp;type=3", $langs->trans("Categories"), 1, $user->hasRight('categorie', 'read'), '', $mainmenu, 'cat');
 			}
 
-			$newmenu->add("/adherents/index.php?leftmenu=members&amp;mainmenu=members", $langs->trans("Subscriptions"), 0, $user->rights->adherent->cotisation->lire, '', $mainmenu, 'members', 0, '', '', '', img_picto('', 'payment', 'class="paddingright pictofixedwidth"'));
-			$newmenu->add("/adherents/list.php?leftmenu=members&amp;statut=-1,1&amp;mainmenu=members", $langs->trans("NewSubscription"), 1, $user->rights->adherent->cotisation->creer);
-			$newmenu->add("/adherents/subscription/list.php?leftmenu=members", $langs->trans("List"), 1, $user->rights->adherent->cotisation->lire);
-			$newmenu->add("/adherents/stats/index.php?leftmenu=members", $langs->trans("MenuMembersStats"), 1, $user->rights->adherent->lire);
+			$newmenu->add("/adherents/index.php?leftmenu=members&amp;mainmenu=members", $langs->trans("Subscriptions"), 0, $user->hasRight('adherent', 'cotisation', 'read'), '', $mainmenu, 'members', 0, '', '', '', img_picto('', 'payment', 'class="paddingright pictofixedwidth"'));
+			$newmenu->add("/adherents/list.php?leftmenu=members&amp;statut=-1,1&amp;mainmenu=members", $langs->trans("NewSubscription"), 1, $user->hasRight('adherent', 'cotisation', 'write'));
+			$newmenu->add("/adherents/subscription/list.php?leftmenu=members", $langs->trans("List"), 1, $user->hasRight('adherent', 'cotisation', 'read'));
+			$newmenu->add("/adherents/stats/index.php?leftmenu=members", $langs->trans("MenuMembersStats"), 1, $user->hasRight('adherent', 'read'));
 
-			//$newmenu->add("/adherents/index.php?leftmenu=export&amp;mainmenu=members",$langs->trans("Tools"),0,$user->rights->adherent->export, '', $mainmenu, 'export');
-			//if (isModEnabled('export') && ($usemenuhider || empty($leftmenu) || $leftmenu=="export")) $newmenu->add("/exports/index.php?leftmenu=export",$langs->trans("Datas"),1,$user->rights->adherent->export);
+			//$newmenu->add("/adherents/index.php?leftmenu=export&amp;mainmenu=members",$langs->trans("Tools"),0,$user->hasRight('adherent',  'export'), '', $mainmenu, 'export');
+			//if (isModEnabled('export') && ($usemenuhider || empty($leftmenu) || $leftmenu=="export")) $newmenu->add("/exports/index.php?leftmenu=export",$langs->trans("Datas"),1,$user->hasRight('adherent',  'export'));
 
 			// Type
-			$newmenu->add("/adherents/type.php?leftmenu=setup&amp;mainmenu=members", $langs->trans("MembersTypes"), 0, $user->rights->adherent->configurer, '', $mainmenu, 'setup', 0, '', '', '', img_picto('', 'members', 'class="paddingright pictofixedwidth"'));
-			$newmenu->add("/adherents/type.php?leftmenu=setup&amp;mainmenu=members&amp;action=create", $langs->trans("New"), 1, $user->rights->adherent->configurer);
-			$newmenu->add("/adherents/type.php?leftmenu=setup&amp;mainmenu=members", $langs->trans("List"), 1, $user->rights->adherent->configurer);
+			$newmenu->add("/adherents/type.php?leftmenu=setup&amp;mainmenu=members", $langs->trans("MembersTypes"), 0, $user->hasRight('adherent', 'configurer'), '', $mainmenu, 'setup', 0, '', '', '', img_picto('', 'members', 'class="paddingright pictofixedwidth"'));
+			$newmenu->add("/adherents/type.php?leftmenu=setup&amp;mainmenu=members&amp;action=create", $langs->trans("New"), 1, $user->hasRight('adherent', 'configurer'));
+			$newmenu->add("/adherents/type.php?leftmenu=setup&amp;mainmenu=members", $langs->trans("List"), 1, $user->hasRight('adherent', 'configurer'));
 		}
 	}
 }
diff --git a/htdocs/holiday/list.php b/htdocs/holiday/list.php
index d4d2c3fff36..521695b45f2 100644
--- a/htdocs/holiday/list.php
+++ b/htdocs/holiday/list.php
@@ -209,9 +209,9 @@ if (empty($reshook)) {
 	// Mass actions
 	$objectclass = 'Holiday';
 	$objectlabel = 'Holiday';
-	$permissiontoread = $user->rights->holiday->read;
-	$permissiontodelete = $user->rights->holiday->delete;
-	$permissiontoapprove = $user->rights->holiday->approve;
+	$permissiontoread = $user->hasRight('holiday', 'read');
+	$permissiontodelete = $user->hasRight('holiday', 'delete');
+	$permissiontoapprove = $user->hasRight('holiday', 'approve');
 	$uploaddir = $conf->holiday->dir_output;
 	include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php';
 }
@@ -580,7 +580,7 @@ if ($resql) {
 
 	// Approver
 	if (!empty($arrayfields['cp.fk_validator']['checked'])) {
-		if ($user->rights->holiday->readall) {
+		if ($user->hasRight('holiday', 'readall')) {
 			print '<td class="liste_titre maxwidthonsmartphone left">';
 			$validator = new UserGroup($db);
 			$excludefilter = $user->admin ? '' : 'u.rowid <> '.$user->id;
diff --git a/htdocs/hrm/index.php b/htdocs/hrm/index.php
index cbbd66cec47..e8554c9da3d 100644
--- a/htdocs/hrm/index.php
+++ b/htdocs/hrm/index.php
@@ -270,7 +270,7 @@ if (isModEnabled('holiday') && $user->rights->holiday->read) {
 
 
 // Latest expense report
-if (isModEnabled('expensereport') && $user->rights->expensereport->lire) {
+if (isModEnabled('expensereport') && $user->hasRight('expensereport', 'read')) {
 	$sql = "SELECT u.rowid as uid, u.lastname, u.firstname, u.login, u.email, u.statut as user_status, u.photo,";
 	$sql .= " x.rowid, x.ref, x.date_debut as date, x.tms as dm, x.total_ttc, x.fk_statut as status";
 	$sql .= " FROM ".MAIN_DB_PREFIX."expensereport as x, ".MAIN_DB_PREFIX."user as u";
@@ -342,7 +342,7 @@ if (isModEnabled('expensereport') && $user->rights->expensereport->lire) {
 
 
 // Last modified job position
-if (isModEnabled('recruitment') && $user->rights->recruitment->recruitmentjobposition->read) {
+if (isModEnabled('recruitment') && $user->hasRight('recruitment', 'recruitmentjobposition', 'read')) {
 	$staticrecruitmentcandidature = new RecruitmentCandidature($db);
 	$staticrecruitmentjobposition = new RecruitmentJobPosition($db);
 	$sql = "SELECT rc.rowid, rc.ref, rc.email, rc.lastname, rc.firstname, rc.date_creation, rc.tms, rc.status,";
diff --git a/htdocs/user/class/user.class.php b/htdocs/user/class/user.class.php
index a521be145ef..54f1cbe4fc9 100644
--- a/htdocs/user/class/user.class.php
+++ b/htdocs/user/class/user.class.php
@@ -2703,7 +2703,7 @@ class User extends CommonObject
 		global $dolibarr_main_authentication, $dolibarr_main_demo;
 		global $menumanager;
 
-		if (!$user->rights->user->user->lire && $user->id != $this->id) {
+		if (!$user->hasRight('user', 'user', 'read') && $user->id != $this->id) {
 			$option = 'nolink';
 		}
 

From eccd46c5c54602e4a48620a9b5cff9de5d613cb3 Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Tue, 6 Sep 2022 16:35:35 +0200
Subject: [PATCH 707/974] update code

---
 htdocs/accountancy/admin/accountmodel.php    | 2 +-
 htdocs/accountancy/admin/categories_list.php | 2 +-
 htdocs/accountancy/index.php                 | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/htdocs/accountancy/admin/accountmodel.php b/htdocs/accountancy/admin/accountmodel.php
index c1bc435145f..7f90ae4594c 100644
--- a/htdocs/accountancy/admin/accountmodel.php
+++ b/htdocs/accountancy/admin/accountmodel.php
@@ -78,7 +78,7 @@ $search_country_id = GETPOST('search_country_id', 'int');
 if ($user->socid > 0) {
 	accessforbidden();
 }
-if (empty($user->rights->accounting->chartofaccount)) {
+if (!$user->hasRight('accounting', 'chartofaccount')) {
 	accessforbidden();
 }
 
diff --git a/htdocs/accountancy/admin/categories_list.php b/htdocs/accountancy/admin/categories_list.php
index ea613ea38cd..a32c7a28682 100644
--- a/htdocs/accountancy/admin/categories_list.php
+++ b/htdocs/accountancy/admin/categories_list.php
@@ -42,7 +42,7 @@ $rowid = GETPOST('rowid', 'alpha');
 $code = GETPOST('code', 'alpha');
 
 // Security access
-if (empty($user->rights->accounting->chartofaccount)) {
+if (!$user->hasRight('accounting', 'chartofaccount')) {
 	accessforbidden();
 }
 
diff --git a/htdocs/accountancy/index.php b/htdocs/accountancy/index.php
index 2745ab4784a..21c736900aa 100644
--- a/htdocs/accountancy/index.php
+++ b/htdocs/accountancy/index.php
@@ -44,7 +44,7 @@ if ($user->socid > 0) {
 if (!isModEnabled('accounting')) {
 	accessforbidden();
 }
-if (empty($user->rights->accounting->mouvements->lire)) {
+if (!$user->hasRight('accounting', 'mouvements', 'lire')) {
 	accessforbidden();
 }
 */

From e04b7333b1f68c3358beb233fdb78556d6fd892c Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Tue, 6 Sep 2022 16:37:06 +0200
Subject: [PATCH 708/974] update code

---
 htdocs/accountancy/admin/account.php    | 2 +-
 htdocs/accountancy/admin/card.php       | 2 +-
 htdocs/accountancy/admin/categories.php | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/htdocs/accountancy/admin/account.php b/htdocs/accountancy/admin/account.php
index 423a32cf9c1..2e0c4ad8930 100644
--- a/htdocs/accountancy/admin/account.php
+++ b/htdocs/accountancy/admin/account.php
@@ -59,7 +59,7 @@ $permissiontodelete = $user->hasRight('accounting', 'chartofaccount');
 if ($user->socid > 0) {
 	accessforbidden();
 }
-if (empty($user->rights->accounting->chartofaccount)) {
+if (!$user->hasRight('accounting', 'chartofaccount')) {
 	accessforbidden();
 }
 
diff --git a/htdocs/accountancy/admin/card.php b/htdocs/accountancy/admin/card.php
index 7876712fe51..0764bcd78d1 100644
--- a/htdocs/accountancy/admin/card.php
+++ b/htdocs/accountancy/admin/card.php
@@ -48,7 +48,7 @@ $label = GETPOST('label', 'alpha');
 if ($user->socid > 0) {
 	accessforbidden();
 }
-if (empty($user->rights->accounting->chartofaccount)) {
+if (!$user->hasRight('accounting', 'chartofaccount')) {
 	accessforbidden();
 }
 
diff --git a/htdocs/accountancy/admin/categories.php b/htdocs/accountancy/admin/categories.php
index e65572eafd3..c2f4d604061 100644
--- a/htdocs/accountancy/admin/categories.php
+++ b/htdocs/accountancy/admin/categories.php
@@ -44,7 +44,7 @@ if ($cat_id == 0) {
 }
 
 // Security check
-if (empty($user->rights->accounting->chartofaccount)) {
+if (!$user->hasRight('accounting', 'chartofaccount')) {
 	accessforbidden();
 }
 

From 644a23a0acceb0d5562a0fdaf740ff9f7390dd61 Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Tue, 6 Sep 2022 16:38:08 +0200
Subject: [PATCH 709/974] update code

---
 htdocs/accountancy/admin/closure.php         | 2 +-
 htdocs/accountancy/admin/defaultaccounts.php | 2 +-
 htdocs/accountancy/admin/export.php          | 2 +-
 htdocs/accountancy/admin/index.php           | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/htdocs/accountancy/admin/closure.php b/htdocs/accountancy/admin/closure.php
index 437ff1b7116..be2699223fd 100644
--- a/htdocs/accountancy/admin/closure.php
+++ b/htdocs/accountancy/admin/closure.php
@@ -31,7 +31,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/html.formaccounting.class.php';
 $langs->loadLangs(array("compta", "admin", "accountancy"));
 
 // Security check
-if (empty($user->rights->accounting->chartofaccount)) {
+if (!$user->hasRight('accounting', 'chartofaccount')) {
 	accessforbidden();
 }
 
diff --git a/htdocs/accountancy/admin/defaultaccounts.php b/htdocs/accountancy/admin/defaultaccounts.php
index bfc1fd29316..9a3b63adcc3 100644
--- a/htdocs/accountancy/admin/defaultaccounts.php
+++ b/htdocs/accountancy/admin/defaultaccounts.php
@@ -38,7 +38,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/html.formaccounting.class.php';
 $langs->loadLangs(array("compta", "bills", "admin", "accountancy", "salaries", "loan"));
 
 // Security check
-if (empty($user->rights->accounting->chartofaccount)) {
+if (!$user->hasRight('accounting', 'chartofaccount')) {
 	accessforbidden();
 }
 
diff --git a/htdocs/accountancy/admin/export.php b/htdocs/accountancy/admin/export.php
index d0a0ab671d4..23a16340c0b 100644
--- a/htdocs/accountancy/admin/export.php
+++ b/htdocs/accountancy/admin/export.php
@@ -36,7 +36,7 @@ require_once DOL_DOCUMENT_ROOT.'/accountancy/class/accountancyexport.class.php';
 $langs->loadLangs(array("compta", "bills", "admin", "accountancy"));
 
 // Security access
-if (empty($user->rights->accounting->chartofaccount)) {
+if (!$user->hasRight('accounting', 'chartofaccount')) {
 	accessforbidden();
 }
 
diff --git a/htdocs/accountancy/admin/index.php b/htdocs/accountancy/admin/index.php
index af569e08ae3..605b5d2d396 100644
--- a/htdocs/accountancy/admin/index.php
+++ b/htdocs/accountancy/admin/index.php
@@ -38,7 +38,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
 $langs->loadLangs(array("compta", "bills", "admin", "accountancy", "other"));
 
 // Security access
-if (empty($user->rights->accounting->chartofaccount)) {
+if (!$user->hasRight('accounting', 'chartofaccount')) {
 	accessforbidden();
 }
 

From 3a5abf12bc2d88c00e74888c90d47c4feba888fc Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Tue, 6 Sep 2022 16:40:07 +0200
Subject: [PATCH 710/974] update code

---
 htdocs/accountancy/admin/journals_list.php | 2 +-
 htdocs/accountancy/admin/subaccount.php    | 2 +-
 htdocs/admin/dict.php                      | 6 +++---
 htdocs/compta/bank/list.php                | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/htdocs/accountancy/admin/journals_list.php b/htdocs/accountancy/admin/journals_list.php
index 3ea90e283ce..e9a6e222686 100644
--- a/htdocs/accountancy/admin/journals_list.php
+++ b/htdocs/accountancy/admin/journals_list.php
@@ -45,7 +45,7 @@ $rowid = GETPOST('rowid', 'alpha');
 $code = GETPOST('code', 'alpha');
 
 // Security access
-if (empty($user->rights->accounting->chartofaccount)) {
+if (!$user->hasRight('accounting', 'chartofaccount')) {
 	accessforbidden();
 }
 
diff --git a/htdocs/accountancy/admin/subaccount.php b/htdocs/accountancy/admin/subaccount.php
index cc0d4de9f31..d42de7990f7 100644
--- a/htdocs/accountancy/admin/subaccount.php
+++ b/htdocs/accountancy/admin/subaccount.php
@@ -47,7 +47,7 @@ $search_type = GETPOST('search_type', 'int');
 if ($user->socid > 0) {
 	accessforbidden();
 }
-if (empty($user->rights->accounting->chartofaccount)) {
+if (!$user->hasRight('accounting', 'chartofaccount')) {
 	accessforbidden();
 }
 
diff --git a/htdocs/admin/dict.php b/htdocs/admin/dict.php
index ff74273d744..5363bbf3062 100644
--- a/htdocs/admin/dict.php
+++ b/htdocs/admin/dict.php
@@ -54,13 +54,13 @@ $entity = GETPOST('entity', 'int');
 $code = GETPOST('code', 'alpha');
 
 $allowed = $user->admin;
-if ($id == 7 && !empty($user->rights->accounting->chartofaccount)) {
+if ($id == 7 && $user->hasRight('accounting', 'chartofaccount')) {
 	$allowed = 1; // Tax page allowed to manager of chart account
 }
-if ($id == 10 && !empty($user->rights->accounting->chartofaccount)) {
+if ($id == 10 && $user->hasRight('accounting', 'chartofaccount')) {
 	$allowed = 1; // Vat page allowed to manager of chart account
 }
-if ($id == 17 && !empty($user->rights->accounting->chartofaccount)) {
+if ($id == 17 && $user->hasRight('accounting', 'chartofaccount')) {
 	$allowed = 1; // Dictionary with type of expense report and accounting account allowed to manager of chart account
 }
 if (!$allowed) {
diff --git a/htdocs/compta/bank/list.php b/htdocs/compta/bank/list.php
index 362ca3d488f..065786d7402 100644
--- a/htdocs/compta/bank/list.php
+++ b/htdocs/compta/bank/list.php
@@ -69,7 +69,7 @@ if ($user->socid) {
 }
 
 $allowed = 0;
-if (!empty($user->rights->accounting->chartofaccount)) {
+if ($user->hasRight('accounting', 'chartofaccount')) {
 	$allowed = 1; // Dictionary with list of banks accounting account allowed to manager of chart account
 }
 if (!$allowed) {

From f41f1199343acb9411a595524fe375be25502c3a Mon Sep 17 00:00:00 2001
From: UT from dolibit <45215329+dolibit-ut@users.noreply.github.com>
Date: Tue, 6 Sep 2022 17:51:04 +0200
Subject: [PATCH 711/974] Update conferenceorbooth_card.php

---
 .../conferenceorbooth_card.php                 | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/htdocs/eventorganization/conferenceorbooth_card.php b/htdocs/eventorganization/conferenceorbooth_card.php
index 368da1c889a..1e71af81492 100644
--- a/htdocs/eventorganization/conferenceorbooth_card.php
+++ b/htdocs/eventorganization/conferenceorbooth_card.php
@@ -17,27 +17,29 @@
  */
 
 /**
- *   	\file       htdocs/eventorganization/conferenceorbooth_card.php
- *		\ingroup    eventorganization
- *		\brief      Page to create/edit/view conferenceorbooth
+ *    \file       htdocs/eventorganization/conferenceorbooth_card.php
+ *    \ingroup    eventorganization
+ *    \brief      Page to create/edit/view conferenceorbooth
  */
 
-require '../main.inc.php';
 
+// 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.formfile.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php';
-require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/project.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 require_once DOL_DOCUMENT_ROOT.'/eventorganization/class/conferenceorbooth.class.php';
 require_once DOL_DOCUMENT_ROOT.'/eventorganization/lib/eventorganization_conferenceorbooth.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
+require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 
 global $dolibarr_main_url_root;
 
 // Load translation files required by the page
-$langs->loadLangs(array("eventorganization", "projects"));
+$langs->loadLangs(array('eventorganization', 'projects'));
 
+// Get parameters
 $action = GETPOST('action', 'aZ09');
 $confirm = GETPOST('confirm', 'alpha');
 $cancel = GETPOST('cancel', 'aZ09');
@@ -45,7 +47,6 @@ $contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'co
 $backtopage = GETPOST('backtopage', 'alpha');
 $backtopageforcancel = GETPOST('backtopageforcancel', 'alpha');
 
-// Get parameters
 $id = GETPOST('id', 'int');
 $ref = GETPOST('ref', 'alpha');
 $withproject = GETPOST('withproject', 'int');
@@ -79,6 +80,7 @@ if (empty($action) && empty($id) && empty($ref)) {
 // Load object
 include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be include, not include_once.
 
+// Permissions
 $permissiontoread = $user->rights->eventorganization->read;
 $permissiontoadd = $user->rights->eventorganization->write; // Used by the include of actions_addupdatedelete.inc.php and actions_lineupdown.inc.php
 $permissiontodelete = $user->rights->eventorganization->delete || ($permissiontoadd && isset($object->status) && $object->status == $object::STATUS_DRAFT);

From a3e56e38db141d8951aaa5a64341e5e53aed57cb Mon Sep 17 00:00:00 2001
From: UT from dolibit <45215329+dolibit-ut@users.noreply.github.com>
Date: Tue, 6 Sep 2022 17:53:54 +0200
Subject: [PATCH 712/974] Update conferenceorbooth_contact.php

// Load Dolibarr environment  - clean double entries
---
 .../eventorganization/conferenceorbooth_contact.php   | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/htdocs/eventorganization/conferenceorbooth_contact.php b/htdocs/eventorganization/conferenceorbooth_contact.php
index 62bd64441b5..2c304bd8562 100644
--- a/htdocs/eventorganization/conferenceorbooth_contact.php
+++ b/htdocs/eventorganization/conferenceorbooth_contact.php
@@ -22,17 +22,18 @@
  *  \brief      Tab for contacts linked to ConferenceOrBooth
  */
 
+
+// Load Dolibarr environment
 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';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/project.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
+require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
 require_once DOL_DOCUMENT_ROOT.'/eventorganization/class/conferenceorbooth.class.php';
 require_once DOL_DOCUMENT_ROOT.'/eventorganization/lib/eventorganization_conferenceorbooth.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/project.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/eventorganization/class/conferenceorbooth.class.php';
-require_once DOL_DOCUMENT_ROOT.'/eventorganization/lib/eventorganization_conferenceorbooth.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
+
 
 // Load translation files required by the page
 $langs->loadLangs(array('companies', 'eventorganization', 'mails', 'others', 'projects'));

From 635142020efde50913796d009b356dcb18dea309 Mon Sep 17 00:00:00 2001
From: UT from dolibit <45215329+dolibit-ut@users.noreply.github.com>
Date: Tue, 6 Sep 2022 17:55:58 +0200
Subject: [PATCH 713/974] Update conferenceorbooth_document.php

---
 .../conferenceorbooth_document.php                  | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/htdocs/eventorganization/conferenceorbooth_document.php b/htdocs/eventorganization/conferenceorbooth_document.php
index d056a5b900c..56b34f68b03 100644
--- a/htdocs/eventorganization/conferenceorbooth_document.php
+++ b/htdocs/eventorganization/conferenceorbooth_document.php
@@ -22,21 +22,25 @@
  *  \brief      Tab for documents linked to ConferenceOrBooth
  */
 
+// Load Dolibarr environment
 require '../main.inc.php';
 
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.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';
-require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/project.lib.php';
+
+require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 require_once DOL_DOCUMENT_ROOT.'/eventorganization/class/conferenceorbooth.class.php';
 require_once DOL_DOCUMENT_ROOT.'/eventorganization/lib/eventorganization_conferenceorbooth.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
+require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
+
 
 // Load translation files required by the page
 $langs->loadLangs(array("eventorganization", "projects", "companies", "other", "mails"));
 
+// Get Parameters
 $action = GETPOST('action', 'aZ09');
 $confirm = GETPOST('confirm');
 $cancel = GETPOST('cancel', 'aZ09');
@@ -49,8 +53,6 @@ $ref = GETPOST('ref', 'alpha');
 $withproject = GETPOST('withproject', 'int');
 $project_ref = GETPOST('project_ref', 'alpha');
 
-
-// Get parameters
 $limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
@@ -88,6 +90,7 @@ if ($id > 0 || !empty($ref)) {
 	$upload_dir = $conf->eventorganization->multidir_output[$object->entity ? $object->entity : $conf->entity]."/conferenceorbooth/".get_exdir(0, 0, 0, 1, $object);
 }
 
+// Permissions
 $permissiontoread = $user->rights->eventorganization->read;
 $permissiontoadd = $user->rights->eventorganization->write; // Used by the include of actions_addupdatedelete.inc.php and actions_lineupdown.inc.php
 $permissiontodelete = $user->rights->eventorganization->delete || ($permissiontoadd && isset($object->status) && $object->status == $object::STATUS_DRAFT);

From 700da1492f8bfe437ba89e24e71624c9f2f03d64 Mon Sep 17 00:00:00 2001
From: UT from dolibit <45215329+dolibit-ut@users.noreply.github.com>
Date: Tue, 6 Sep 2022 18:02:11 +0200
Subject: [PATCH 714/974] Update conferenceorbooth_list.php

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

diff --git a/htdocs/eventorganization/conferenceorbooth_list.php b/htdocs/eventorganization/conferenceorbooth_list.php
index 7866a83a024..520435c9cdc 100644
--- a/htdocs/eventorganization/conferenceorbooth_list.php
+++ b/htdocs/eventorganization/conferenceorbooth_list.php
@@ -17,21 +17,26 @@
  */
 
 /**
- *   	\file       conferenceorbooth_list.php
- *		\ingroup    eventorganization
- *		\brief      List page for conferenceorbooth
+ *    \file       htdocs/eventorganization/conferenceorbooth_list.php
+ *    \ingroup    eventorganization
+ *    \brief      List page for conferenceorbooth
  */
 
+
+// Load Dolibarr environment
 require '../main.inc.php';
+
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/project.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
-require_once DOL_DOCUMENT_ROOT.'/eventorganization/class/conferenceorbooth.class.php';
-require_once DOL_DOCUMENT_ROOT.'/eventorganization/lib/eventorganization_conferenceorbooth.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/eventorganization/class/conferenceorboothattendee.class.php';
+
 require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
+require_once DOL_DOCUMENT_ROOT.'/eventorganization/class/conferenceorbooth.class.php';
+require_once DOL_DOCUMENT_ROOT.'/eventorganization/class/conferenceorboothattendee.class.php';
+require_once DOL_DOCUMENT_ROOT.'/eventorganization/lib/eventorganization_conferenceorbooth.lib.php';
+
+require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 
 global $dolibarr_main_url_root;
 
@@ -41,6 +46,7 @@ global $dolibarr_main_url_root;
 // Load translation files required by the page
 $langs->loadLangs(array("eventorganization", "other", "projects", "companies"));
 
+// 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 ?

From 9392e889b4ef1bc22af60fc5e10067d3e978c67a Mon Sep 17 00:00:00 2001
From: UT from dolibit <45215329+dolibit-ut@users.noreply.github.com>
Date: Tue, 6 Sep 2022 18:07:40 +0200
Subject: [PATCH 715/974] Update conferenceorboothattendee_card.php

---
 .../conferenceorboothattendee_card.php               | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/htdocs/eventorganization/conferenceorboothattendee_card.php b/htdocs/eventorganization/conferenceorboothattendee_card.php
index 79b7b1aaa55..14a8c871232 100644
--- a/htdocs/eventorganization/conferenceorboothattendee_card.php
+++ b/htdocs/eventorganization/conferenceorboothattendee_card.php
@@ -16,20 +16,23 @@
  */
 
 /**
- *   	\file       conferenceorboothattendee_card.php
- *		\ingroup    eventorganization
- *		\brief      Page to create/edit/view conferenceorboothattendee
+ *    \file       htdocs/eventorganization/conferenceorboothattendee_card.php
+ *    \ingroup    eventorganization
+ *    \brief      Page to create/edit/view conferenceorboothattendee
  */
 
+
+// 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.formfile.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/project.lib.php';
+
 require_once DOL_DOCUMENT_ROOT.'/eventorganization/class/conferenceorbooth.class.php';
 require_once DOL_DOCUMENT_ROOT.'/eventorganization/class/conferenceorboothattendee.class.php';
 require_once DOL_DOCUMENT_ROOT.'/eventorganization/lib/eventorganization_conferenceorbooth.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/project.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 
 // Load translation files required by the page
@@ -108,6 +111,7 @@ if ($object->fk_project > 0) {
 	$fk_project = $object->fk_project;
 }
 
+// Permissions
 $permissiontoread = $user->rights->eventorganization->read;
 $permissiontoadd = $user->rights->eventorganization->write; // Used by the include of actions_addupdatedelete.inc.php and actions_lineupdown.inc.php
 $permissiontodelete = $user->rights->eventorganization->delete || ($permissiontoadd && isset($object->status) && $object->status == $object::STATUS_DRAFT);

From 98b7cf13dda5738516c0371f5a766ab59eadc25d Mon Sep 17 00:00:00 2001
From: UT from dolibit <45215329+dolibit-ut@users.noreply.github.com>
Date: Tue, 6 Sep 2022 18:11:43 +0200
Subject: [PATCH 716/974] Update conferenceorboothattendee_list.php

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

diff --git a/htdocs/eventorganization/conferenceorboothattendee_list.php b/htdocs/eventorganization/conferenceorboothattendee_list.php
index 7b8b6258e5e..1ec6a9efe96 100644
--- a/htdocs/eventorganization/conferenceorboothattendee_list.php
+++ b/htdocs/eventorganization/conferenceorboothattendee_list.php
@@ -17,21 +17,24 @@
  */
 
 /**
- *   	\file       conferenceorboothattendee_list.php
- *		\ingroup    eventorganization
- *		\brief      List page for conferenceorboothattendee
+ *    \file       htdocs/eventorganization/conferenceorboothattendee_list.php
+ *    \ingroup    eventorganization
+ *    \brief      List page for conferenceorboothattendee
  */
 
+
+// Load Dolibarr environment
 require '../main.inc.php';
 
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/project.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
+
 require_once DOL_DOCUMENT_ROOT.'/eventorganization/class/conferenceorbooth.class.php';
-require_once DOL_DOCUMENT_ROOT.'/eventorganization/lib/eventorganization_conferenceorbooth.lib.php';
 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')) {
 	require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 }
@@ -44,15 +47,16 @@ global $dolibarr_main_url_root;
 // Load translation files required by the page
 $langs->loadLangs(array("eventorganization", "other", "projects"));
 
-$action     = GETPOST('action', 'aZ09') ?GETPOST('action', 'aZ09') : 'view'; // The action 'add', 'create', 'edit', 'update', 'view', ...
-$massaction = GETPOST('massaction', 'alpha'); // The bulk action (combo box choice into lists)
-$show_files = GETPOST('show_files', 'int'); // Show files area generated by bulk actions ?
-$confirm    = GETPOST('confirm', 'alpha'); // Result of a confirmation
-$cancel     = GETPOST('cancel', 'alpha'); // We click on a Cancel button
-$toselect   = GETPOST('toselect', 'array'); // Array of ids of elements selected into a list
-$contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'conferenceorboothattendeelist'; // 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')
+// Get Paramters
+$action      = GETPOST('action', 'aZ09') ?GETPOST('action', 'aZ09') : 'view';   // The action 'add', 'create', 'edit', 'update', 'view', ...
+$massaction  = GETPOST('massaction', 'alpha');   // The bulk action (combo box choice into lists)
+$show_files  = GETPOST('show_files', 'int');   // Show files area generated by bulk actions ?
+$confirm     = GETPOST('confirm', 'alpha');   // Result of a confirmation
+$cancel      = GETPOST('cancel', 'alpha');   // We click on a Cancel button
+$toselect    = GETPOST('toselect', 'array');   // Array of ids of elements selected into a list
+$contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'conferenceorboothattendeelist';   // 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')
 
 $id = GETPOST('id', 'int');
 $conf_or_booth_id = GETPOST('conforboothid', 'int');
@@ -139,6 +143,7 @@ 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');
 
+// Permissions 
 $permissiontoread = $user->rights->eventorganization->read;
 $permissiontoadd = $user->rights->eventorganization->write;
 $permissiontodelete = $user->rights->eventorganization->delete;

From a3d7627bb6725f4d4d71bd376b8876a519bdf337 Mon Sep 17 00:00:00 2001
From: UT from dolibit <45215329+dolibit-ut@users.noreply.github.com>
Date: Tue, 6 Sep 2022 18:15:41 +0200
Subject: [PATCH 717/974] Update conferenceorboothattendee_note.php

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

diff --git a/htdocs/eventorganization/conferenceorboothattendee_note.php b/htdocs/eventorganization/conferenceorboothattendee_note.php
index 5739e19f0cc..b6e343e4496 100644
--- a/htdocs/eventorganization/conferenceorboothattendee_note.php
+++ b/htdocs/eventorganization/conferenceorboothattendee_note.php
@@ -17,9 +17,9 @@
  */
 
 /**
- *  \file       conferenceorboothattendee_note.php
- *  \ingroup    eventorganization
- *  \brief      Tab for notes on ConferenceOrBoothAttendee
+ *    \file       htdocs/eventorganization/conferenceorboothattendee_note.php
+ *    \ingroup    eventorganization
+ *    \brief      Tab for notes on ConferenceOrBoothAttendee
  */
 
 //if (! defined('NOREQUIREDB'))              define('NOREQUIREDB', '1');				// Do not create database handler $db
@@ -42,6 +42,7 @@
 //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)
@@ -77,7 +78,7 @@ dol_include_once('/eventorganization/class/conferenceorboothattendee.class.php')
 dol_include_once('/eventorganization/lib/eventorganization_conferenceorboothattendee.lib.php');
 
 // Load translation files required by the page
-$langs->loadLangs(array("eventorganization@eventorganization", "companies"));
+$langs->loadLangs(array('eventorganization', 'companies'));
 
 // Get parameters
 $id = GETPOST('id', 'int');
@@ -105,6 +106,7 @@ if ($id > 0 || !empty($ref)) {
 	$upload_dir = $conf->eventorganization->multidir_output[$object->entity]."/".$object->id;
 }
 
+// Permissions
 $permissionnote = $user->rights->eventorganization->conferenceorboothattendee->write; // Used by the include of actions_setnotes.inc.php
 $permissiontoadd = $user->rights->eventorganization->conferenceorboothattendee->write; // Used by the include of actions_addupdatedelete.inc.php
 

From c4322c5edcc195a4e9d475ec4eaab5b760651032 Mon Sep 17 00:00:00 2001
From: stickler-ci <support@stickler-ci.com>
Date: Tue, 6 Sep 2022 16:17:03 +0000
Subject: [PATCH 718/974] Fixing style errors.

---
 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 1ec6a9efe96..167a79959f5 100644
--- a/htdocs/eventorganization/conferenceorboothattendee_list.php
+++ b/htdocs/eventorganization/conferenceorboothattendee_list.php
@@ -143,7 +143,7 @@ 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');
 
-// Permissions 
+// Permissions
 $permissiontoread = $user->rights->eventorganization->read;
 $permissiontoadd = $user->rights->eventorganization->write;
 $permissiontodelete = $user->rights->eventorganization->delete;

From 3cebf6767ed741469d0b7227ec42b9c8ed69b2aa Mon Sep 17 00:00:00 2001
From: UT from dolibit <45215329+dolibit-ut@users.noreply.github.com>
Date: Tue, 6 Sep 2022 18:24:26 +0200
Subject: [PATCH 719/974] Update info.php

---
 htdocs/compta/bank/info.php | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/htdocs/compta/bank/info.php b/htdocs/compta/bank/info.php
index 1bbab933e7b..729ccc53fdc 100644
--- a/htdocs/compta/bank/info.php
+++ b/htdocs/compta/bank/info.php
@@ -16,23 +16,29 @@
  */
 
 /**
- *     \file       htdocs/compta/bank/info.php
- *     \ingroup    banque
- *     \brief      Onglet info d'une ecriture bancaire
+ *    \file       htdocs/compta/bank/info.php
+ *    \ingroup    compta/bank
+ *    \brief      Info tab of bank statement
  */
 
+
+// Load Dolibarr environment
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/compta/paiement/class/paiement.class.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
+require_once DOL_DOCUMENT_ROOT.'/compta/paiement/class/paiement.class.php';
+
 
 // Load translation files required by the page
 $langs->loadLangs(array('banks', 'categories', 'companies'));
 
+
+// Get Parameters
 $id = GETPOST("rowid", 'int');
 $accountid = (GETPOST('id', 'int') ? GETPOST('id', 'int') : GETPOST('account', 'int'));
 $ref = GETPOST('ref', 'alpha');
 
+
 // Security check
 $fieldvalue = (!empty($id) ? $id : (!empty($ref) ? $ref : ''));
 

From ee799693b144a7c8b31a76fdcff05111f0dd450a Mon Sep 17 00:00:00 2001
From: UT from dolibit <45215329+dolibit-ut@users.noreply.github.com>
Date: Tue, 6 Sep 2022 18:27:07 +0200
Subject: [PATCH 720/974] Update bilan.php

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

diff --git a/htdocs/compta/bank/bilan.php b/htdocs/compta/bank/bilan.php
index 6edee79f86b..c2e93b27e59 100644
--- a/htdocs/compta/bank/bilan.php
+++ b/htdocs/compta/bank/bilan.php
@@ -17,17 +17,20 @@
  */
 
 /**
- *	    \file       htdocs/compta/bank/bilan.php
- *      \ingroup    banque
- *		\brief      Page de bilan
+ *    \file       htdocs/compta/bank/bilan.php
+ *    \ingroup    compta/bank
+ *    \brief      Page of Balance sheet
  */
 
+
+// Load Dolibarr environment
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
 
 // Load translation files required by the page
 $langs->loadLangs(array('banks', 'categories'));
 
+// Security Check Access Control
 if (empty($user->rights->banque->lire)) {
 	accessforbidden();
 }

From 86377a337e0fc6a9689a19717b70efe385505268 Mon Sep 17 00:00:00 2001
From: UT from dolibit <45215329+dolibit-ut@users.noreply.github.com>
Date: Tue, 6 Sep 2022 18:30:10 +0200
Subject: [PATCH 721/974] Update categ.php

---
 htdocs/compta/bank/categ.php | 23 ++++++++++++++++-------
 1 file changed, 16 insertions(+), 7 deletions(-)

diff --git a/htdocs/compta/bank/categ.php b/htdocs/compta/bank/categ.php
index aa60c1ddf41..fbb52fe4a58 100644
--- a/htdocs/compta/bank/categ.php
+++ b/htdocs/compta/bank/categ.php
@@ -21,29 +21,38 @@
  */
 
 /**
- *      \file       htdocs/compta/bank/categ.php
- *      \ingroup    compta
- *      \brief      Page ajout de categories bancaires
+ *    \file       htdocs/compta/bank/categ.php
+ *    \ingroup    compta/bank
+ *    \brief      Page to manage Bank Categories
  */
 
+
+// Load Dolibarr environment
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/bankcateg.class.php';
 
+
 // Load translation files required by the page
 $langs->loadLangs(array('banks', 'categories'));
 
+
+// Get Parameters
 $action = GETPOST('action', 'aZ09');
 $optioncss = GETPOST('optioncss', 'aZ'); // Option for the css output (always '' except when 'print')
+$categid = GETPOST('categid');
+$label = GETPOST("label");
 
+
+// Initialize technical objects
+$bankcateg = new BankCateg($db);
+
+
+// Security Check  Access Control
 if (!$user->rights->banque->configurer) {
 	accessforbidden();
 }
 
-$bankcateg = new BankCateg($db);
-$categid = GETPOST('categid');
-$label = GETPOST("label");
-
 
 
 /*

From 079dab3a2cc6199feb0feb5aaab6677c94317ba2 Mon Sep 17 00:00:00 2001
From: UT from dolibit <45215329+dolibit-ut@users.noreply.github.com>
Date: Tue, 6 Sep 2022 18:37:03 +0200
Subject: [PATCH 722/974] Update supplier_turnover_by_thirdparty.php

---
 .../stats/supplier_turnover_by_thirdparty.php | 26 ++++++++++++-------
 1 file changed, 17 insertions(+), 9 deletions(-)

diff --git a/htdocs/compta/stats/supplier_turnover_by_thirdparty.php b/htdocs/compta/stats/supplier_turnover_by_thirdparty.php
index 28e932dcb4a..494ad591766 100644
--- a/htdocs/compta/stats/supplier_turnover_by_thirdparty.php
+++ b/htdocs/compta/stats/supplier_turnover_by_thirdparty.php
@@ -16,17 +16,19 @@
  */
 
 /**
- *       \file        htdocs/compta/stats/supplier_turnover_by_thirdparty.php
- *       \brief       Page reporting purchase turnover by thirdparty
+ *    \file        htdocs/compta/stats/supplier_turnover_by_thirdparty.php
+ *    \brief       Page reporting purchase turnover by thirdparty
  */
 
+
+// Load Dolibarr environment
 require '../../main.inc.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/report.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/tax.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.form.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.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/report.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/tax.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 
 // Load translation files required by the page
@@ -38,6 +40,7 @@ if (GETPOST("modecompta")) {
 	$modecompta = GETPOST("modecompta");
 }
 
+// Sort Order
 $sortorder = GETPOST("sortorder", 'aZ09comma');
 $sortfield = GETPOST("sortfield", 'aZ09comma');
 if (!$sortorder) {
@@ -47,6 +50,7 @@ if (!$sortfield) {
 	$sortfield = "nom";
 }
 
+
 $socid = GETPOST('socid', 'int');
 
 // Category
@@ -59,13 +63,17 @@ if (GETPOST('subcat', 'alpha') === 'yes') {
 // Hook
 $hookmanager->initHooks(array('supplierturnoverbythirdpartylist'));
 
-// Date range
-$year = GETPOST("year", 'int');
-$month = GETPOST("month", 'int');
+
+// Search Parameters
 $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 range
+$year = GETPOST("year", 'int');
+$month = GETPOST("month", 'int');
 $date_startyear = GETPOST("date_startyear", 'alpha');
 $date_startmonth = GETPOST("date_startmonth", 'alpha');
 $date_startday = GETPOST("date_startday", 'alpha');

From fb4620baf3d6b07b7fcb110b98e64ce13f258d18 Mon Sep 17 00:00:00 2001
From: UT from dolibit <45215329+dolibit-ut@users.noreply.github.com>
Date: Tue, 6 Sep 2022 18:55:42 +0200
Subject: [PATCH 723/974] Update ChangeLog

---
 ChangeLog | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 9a127d4fcee..9a5513031e9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -103,32 +103,33 @@ NEW: Module BOM - Add tabs for nets Bom
 NEW: Module BOM - Add the possibility to add sub-BOMs to BOM
 NEW: Module Recruitment - Add a public page with all list of open job positions.
 NEW: Module Recruitment - Add a tab with list of application on the jobposition file.
-NEW: Module website now supports the multicompany module
+NEW: Module Website - supports now the multicompany module
 NEW: More mode for THEME_TOPMENU_DISABLE_IMAGE (2, 3, ...)
 NEW: Add option to move checkbox column as first column on Thirdparty list (only few screens)
 NEW: on redirect of page in website module, GET parameters are kept.
 NEW: optional display warning icons on ticket list
-NEW: option to default check "notify tier at creation" in ticket module
-NEW: option update prices on proposal cloning
 NEW: payment conditions enabling semi-automatic deposit creation (Issue #18439)
 NEW: possibility to consume multiple batch
 NEW: Reverse movement product consumption
 NEW: Send email to the supplier order contact
 NEW: add permission to report time on timesheet
 NEW: SEPA XML - option to place payment Type Info at Credit transfer Transaction level
-NEW: Show number of votes into the label of tab "Results" of a survey
 NEW: Some core tables are created only at module activation
 NEW: MRP - split consumption line on MO
+NEW: Proposals - option update prices on proposal cloning
 NEW: stock filter in reassort lists
 NEW: stock limit in stock export CSV
 NEW: Supplier order - Show ref supplier of reception in linked object block
 NEW: support user_modif in order
+NEW: Surveys - Show number of votes into the label of tab "Results" of a survey
 NEW: TakePOS - barcode rule to insert product in TakePOS
 NEW: TakePOS - pagination on search results
 NEW: TakePOS - show product reference
 NEW: TakePOS - add constant to hide categories
 NEW: TakePOS - add constant to show category description
 NEW: TakePOS - add constant to show only the products in stock
+NEW: Tickets - option to default check "notify tier at creation"
+NEW: Tickets - Trigger: allow to automatically send messages on new tickets
 NEW: The backup tools has an "lowmemory" option for mysqldump on large database
 NEW: The 'reposition' class works on ajax constantonoff that make redirects
 NEW: Thirdparty - Add rules "customer accountancy code" is mandatory to validate invoice
@@ -136,7 +137,6 @@ NEW: thumbnail field in product list
 NEW: total mark rate in list
 NEW: uncheck "send message" by default on a ticket when private messages has been checked
 NEW: VAT Report by month - Show detail by rate and also by code
-NEW: Ticket triggers: allow to automatically send messages on new tickets
 NEW: Can store the session into database (instead of beeing managed by PHP)
 NEW: Added MMK currency (Myanmar Kyat)
 NEW: On a form to send an email, we show all emails of contacts of object
@@ -161,20 +161,17 @@ NEW: Identification of tr is possible with by attribute data-id on some pages
 NEW: Import with select boxes V2
 NEW: Can use current entity filter on 'chkbxlst'
 NEW: Creation of the function select_bom() used to display bom select list
-
 NEW: Add trigger and event on completely received status change
 NEW: Add utility function send backup by mail
 NEW: add WordPress OAuth to save a token (not SSO)
 NEW: A module can embed a sql script run at each Dolibarr upgrade
-NEW: Add option INVOICEREC_SET_AUTOFILL_DATE_START/END
 NEW: Add param to keep the robot=index meta tag on public pages
 NEW: Add method hintindex() in database handlers.
 NEW: add modifications for new function "$db->prefix()"
 NEW: addMoreActionsButtonsList hook for button in list
 NEW: Standardize a lot of code.
 NEW: Add a protection into PHPunit to avoid to forget a var_dump
-NEW: Add hidden option on contract PDF line to hide qty and price
-NEW: Option MAIL_MASS_ACTION_ADD_LAST_IF_MAIN_DOC_NOT_FOUND to send last document in mass mailing action
+
 
 API:
 NEW: API Proposals - Add POST lines
@@ -191,7 +188,6 @@ Hooks:
 NEW: Hook getNomUrl available everywhere in tooltip of ref links
 NEW: Add hooks: selectContactListWhere hook, selectThirdpartyListWhere hook 
 NEW: Add hook before the public ticket list
-NEW: Add hook doaction in takepos invoice
 NEW: Add hook for Notif
 NEW: Add hook for more buttons
 NEW: add hook printFieldListWhere in product ressort card
@@ -209,6 +205,12 @@ NEW: Add hook to getSellPrice function
 NEW: TakePos - add hooks complete product display
 NEW: TakePos - add hooks for cart display
 NEW: TakePos - add hooks to complete ajax return array
+NEW: TakePOS - add hook doaction in TakePOS invoice
+
+Config Options:
+NEW: Add hidden option on contract PDF line to hide qty and price
+NEW: Option INVOICEREC_SET_AUTOFILL_DATE_START/END
+NEW: Option MAIL_MASS_ACTION_ADD_LAST_IF_MAIN_DOC_NOT_FOUND to send last document in mass mailing action
 
 
 WARNING:

From 8ee927f593b30dc3274fa5d01a40fbb34e1c1505 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 6 Sep 2022 20:53:51 +0200
Subject: [PATCH 724/974] Fix search

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

diff --git a/htdocs/user/list.php b/htdocs/user/list.php
index 858a46887ba..3a0714ab540 100644
--- a/htdocs/user/list.php
+++ b/htdocs/user/list.php
@@ -110,7 +110,8 @@ $fieldstosearchall = array(
 	'u.office_phone'=>"PhonePro",
 	'u.user_mobile'=>"PhoneMobile",
 	'u.email'=>"EMail",
-	'u.note'=>"Note",
+	'u.note_public'=>"PublicNote",
+	'u.note_private'=>"PrivateNote"
 );
 if (!empty($conf->api->enabled)) {
 	$fieldstosearchall['u.api_key'] = "ApiKey";

From 17a4e20abb96a48b86f1cbb6ac8989d84196513c Mon Sep 17 00:00:00 2001
From: UT from dolibit <45215329+dolibit-ut@users.noreply.github.com>
Date: Tue, 6 Sep 2022 21:22:52 +0200
Subject: [PATCH 725/974] Update list.php

---
 htdocs/fourn/product/list.php | 22 +++++++++++++++-------
 1 file changed, 15 insertions(+), 7 deletions(-)

diff --git a/htdocs/fourn/product/list.php b/htdocs/fourn/product/list.php
index a89b25c2201..4bd64a60fc8 100644
--- a/htdocs/fourn/product/list.php
+++ b/htdocs/fourn/product/list.php
@@ -21,18 +21,24 @@
  */
 
 /**
- *		\file       htdocs/fourn/product/list.php
- *		\ingroup    produit
- *		\brief      Page to list supplier products and services
+ *    \file       htdocs/fourn/product/list.php
+ *    \ingroup    product
+ *    \brief      Page to list supplier products and services
  */
 
+
+// Load Dolibarr environment
 require '../../main.inc.php';
-require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
-require_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
-require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.class.php';
+require_once DOL_DOCUMENT_ROOT .'/product/class/product.class.php';
+require_once DOL_DOCUMENT_ROOT .'/societe/class/societe.class.php';
+require_once DOL_DOCUMENT_ROOT .'/fourn/class/fournisseur.class.php';
 
-$langs->loadLangs(array("products", "suppliers"));
 
+// Load translation files required by the page
+$langs->loadLangs(array('products', 'suppliers'));
+
+
+// Get Parameters
 $sref = GETPOST('sref', 'alphanohtml');
 $sRefSupplier = GETPOST('srefsupplier');
 $snom = GETPOST('snom', 'alphanohtml');
@@ -72,6 +78,7 @@ if (empty($user->rights->produit->lire) && empty($user->rights->service->lire))
 	accessforbidden();
 }
 
+// Permissions
 $permissiontoadd = ($user->hasRight('produit', 'lire') || $user->hasRight('service', 'lire'));
 
 
@@ -111,6 +118,7 @@ if (empty($reshook)) {
 	}
 }
 
+
 /*
  * View
  */

From 8973d7b2b51fe4abc077b12493a7e6355ed42e84 Mon Sep 17 00:00:00 2001
From: UT from dolibit <45215329+dolibit-ut@users.noreply.github.com>
Date: Tue, 6 Sep 2022 21:27:14 +0200
Subject: [PATCH 726/974] Update card.php

---
 htdocs/fourn/paiement/card.php | 26 +++++++++++++++++---------
 1 file changed, 17 insertions(+), 9 deletions(-)

diff --git a/htdocs/fourn/paiement/card.php b/htdocs/fourn/paiement/card.php
index d9144b3a83f..c7c1297e0e8 100644
--- a/htdocs/fourn/paiement/card.php
+++ b/htdocs/fourn/paiement/card.php
@@ -19,26 +19,34 @@
  */
 
 /**
- *	\file       htdocs/fourn/paiement/card.php
- *	\ingroup    facture, fournisseur
- *	\brief      Tab to show a payment of a supplier invoice
- *	\remarks	Fichier presque identique a compta/paiement/card.php
+ *    \file       htdocs/fourn/paiement/card.php
+ *    \ingroup    facture, fournisseur
+ *    \brief      Tab to show a payment of a supplier invoice
+ *    \remarks    Fichier presque identique a compta/paiement/card.php
  */
 
+
+// Load Dolibarr environment
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
-require_once DOL_DOCUMENT_ROOT.'/fourn/class/paiementfourn.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/payments.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.class.php';
 require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/payments.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/fourn/class/paiementfourn.class.php';
 
-$langs->loadLangs(array('bills', 'banks', 'companies', 'suppliers'));
 
-$id = GETPOST('id', 'int');
+// Load translation files required by the page
+$langs->loadLangs(array('banks', 'bills', 'companies', 'suppliers'));
+
+
+// Get Parameters
+$id 		= GETPOST('id', 'int');
 $action		= GETPOST('action', 'alpha');
-$confirm	= GETPOST('confirm', 'alpha');
+$confirm 	= GETPOST('confirm', 'alpha');
 
+// Initialize objects
 $object = new PaiementFourn($db);
+
 // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $hookmanager->initHooks(array('supplierpaymentcard', 'globalcard'));
 

From b4034c0a210b1f20ce26a0abe7eca4a4a6880b70 Mon Sep 17 00:00:00 2001
From: UT from dolibit <45215329+dolibit-ut@users.noreply.github.com>
Date: Tue, 6 Sep 2022 21:30:09 +0200
Subject: [PATCH 727/974] Update document.php

---
 htdocs/fourn/paiement/document.php | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/htdocs/fourn/paiement/document.php b/htdocs/fourn/paiement/document.php
index b69e081cf16..e26734ed9c6 100644
--- a/htdocs/fourn/paiement/document.php
+++ b/htdocs/fourn/paiement/document.php
@@ -23,30 +23,36 @@
  */
 
 /**
- *	\file       htdocs/fourn/paiement/document.php
- *	\ingroup    facture, fournisseur
- *	\brief      Management page of attached documents to a payment
+ *    \file       htdocs/fourn/paiement/document.php
+ *    \ingroup    facture, fournisseur
+ *    \brief      Management page of attached documents to a payment
  */
 
+
+// Load Dolibarr environment
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
-require_once DOL_DOCUMENT_ROOT.'/fourn/class/paiementfourn.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/payments.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/lib/fourn.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/fourn/class/paiementfourn.class.php';
 if (isModEnabled('project')) {
 	require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 }
 
-// Load translation files required by the page
-$langs->loadLangs(array('bills', 'banks', 'companies', 'suppliers', 'other'));
 
+// Load translation files required by the page
+$langs->loadLangs(array('banks', 'bills', 'companies', 'suppliers', 'other'));
+
+
+// Get Parameters
 $id = GETPOST('id', 'int');
 $ref = GETPOST('ref', 'alpha');
 $action = GETPOST('action', 'aZ09');
 $confirm = GETPOST('confirm', 'alpha');
 
+
 // Security check
 if ($user->socid) {
 	$socid = $user->socid;

From da61cb5b868b8f8b608946fefe0dd99ae2773d30 Mon Sep 17 00:00:00 2001
From: UT from dolibit <45215329+dolibit-ut@users.noreply.github.com>
Date: Tue, 6 Sep 2022 21:34:30 +0200
Subject: [PATCH 728/974] Update info.php

---
 htdocs/fourn/paiement/info.php | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/htdocs/fourn/paiement/info.php b/htdocs/fourn/paiement/info.php
index 8032b2b418f..5979c2ff1ee 100644
--- a/htdocs/fourn/paiement/info.php
+++ b/htdocs/fourn/paiement/info.php
@@ -18,20 +18,26 @@
  */
 
 /**
- *   	\file       htdocs/fourn/paiement/info.php
- *		\ingroup    facture
- *		\brief      Onglet info d'un paiement fournisseur
+ *    \file       htdocs/fourn/paiement/info.php
+ *    \ingroup    facture, fournisseur
+ *    \brief      Tab for Supplier Payment Information
  */
 
+
+// Load Dolibarr environment
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/fourn/class/paiementfourn.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/payments.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/fourn/class/paiementfourn.class.php';
 
+
+// Load translation files required by the page
 $langs->loadLangs(array("bills", "suppliers", "companies"));
 
+// Get Parameters
 $id = GETPOST('id', 'int');
 
+// Initialize Objects
 $object = new PaiementFourn($db);
 
 // Load object

From cdf90a0004a32580b09f1d8eb1ce5e1f673a4614 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 6 Sep 2022 22:31:20 +0200
Subject: [PATCH 729/974] Fix missign error message

---
 htdocs/core/actions_massactions.inc.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/htdocs/core/actions_massactions.inc.php b/htdocs/core/actions_massactions.inc.php
index c2d1f7344c4..ddee2ad5fb4 100644
--- a/htdocs/core/actions_massactions.inc.php
+++ b/htdocs/core/actions_massactions.inc.php
@@ -815,6 +815,7 @@ if ($massaction == 'confirm_createbills') {   // Create bills from orders.
 							$lineid = $result;
 						} else {
 							$lineid = 0;
+							$errors[] = $objecttmp->error;
 							$error++;
 							break;
 						}
@@ -959,7 +960,7 @@ if ($massaction == 'confirm_createbills') {   // Create bills from orders.
 		$action = 'create';
 		$_GET["origin"] = $_POST["origin"];
 		$_GET["originid"] = $_POST["originid"];
-		setEventMessages("Error", null, 'errors');
+		setEventMessages("Error", $errors, 'errors');
 		$error++;
 	}
 }

From 8666e193a2bc7172a87e28e94ccc7694f8dcf854 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 6 Sep 2022 22:56:09 +0200
Subject: [PATCH 730/974] Fix td balance

---
 htdocs/product/stock/stockatdate.php | 24 ++++++++++++++++++++++--
 1 file changed, 22 insertions(+), 2 deletions(-)

diff --git a/htdocs/product/stock/stockatdate.php b/htdocs/product/stock/stockatdate.php
index d4f1bbf4861..0b7baf643ff 100644
--- a/htdocs/product/stock/stockatdate.php
+++ b/htdocs/product/stock/stockatdate.php
@@ -476,6 +476,8 @@ print $hookmanager->resPrint;
 print "</tr>\n";
 
 $totalbuyingprice = 0;
+$totalcurrentstock = 0;
+$totalvirtualstock = 0;
 
 $i = 0;
 while ($i < ($limit ? min($num, $limit) : $num)) {
@@ -550,6 +552,7 @@ while ($i < ($limit ? min($num, $limit) : $num)) {
 		if ($mode == 'future') {
 			// Current stock
 			print '<td class="right">'.$currentstock.'</td>';
+			$totalcurrentstock += $currentstock;
 
 			print '<td class="right"></td>';
 
@@ -558,6 +561,7 @@ while ($i < ($limit ? min($num, $limit) : $num)) {
 
 			// Final virtual stock
 			print '<td class="right">'.$virtualstock.'</td>';
+			$totalvirtualstock += $virtualstock;
 		} else {
 			// Stock at date
 			print '<td class="right">'.($stock ? $stock : '<span class="opacitymedium">'.$stock.'</span>').'</td>';
@@ -591,6 +595,7 @@ while ($i < ($limit ? min($num, $limit) : $num)) {
 
 			// Current stock
 			print '<td class="right">'.($currentstock ? $currentstock : '<span class="opacitymedium">0</span>').'</td>';
+			$totalcurrentstock += $currentstock;
 		}
 
 		// Action
@@ -619,8 +624,23 @@ if ($mode == 'future') {
 if (empty($date) || !$dateIsValid) {
 	print '<tr><td colspan="'.$colspan.'"><span class="opacitymedium">'.$langs->trans("EnterADateCriteria").'</span></td></tr>';
 } else {
-	print '<tr class="liste_total"><td>'.$langs->trans("Totalforthispage").'</td>';
-	print '<td></td><td></td><td class="right">'.price(price2num($totalbuyingprice, 'MT')).'</td><td></td><td></td><td></td><td></td></tr>';
+	print '<tr class="liste_total">';
+	print '<td>'.$langs->trans("Totalforthispage").'</td>';
+	print '<td></td>';
+	if ($mode == 'future') {
+		print '<td class="right">'.price(price2num($totalcurrentstock, 'MS')).'</td>';
+		print '<td></td>';
+		print '<td></td>';
+		print '<td class="right">'.price(price2num($totalvirtualstock, 'MS')).'</td>';
+	} else {
+		print '<td></td>';
+		print '<td class="right">'.price(price2num($totalbuyingprice, 'MT')).'</td>';
+		print '<td></td>';
+		print '<td></td>';
+		print '<td class="right">'.($productid > 0 ? price(price2num($totalcurrentstock, 'MS')) : '').'</td>';
+	}
+	print '<td></td>';
+	print '</tr>';
 }
 
 print '</table>';

From bfb93609dd0a1d5ce7546db1bcb0da8efe1a18a0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?This=20Charl=C3=A8ne?=
 <1179011+defrance@users.noreply.github.com>
Date: Wed, 7 Sep 2022 08:56:02 +0200
Subject: [PATCH 731/974] php V8 Warning

---
 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 d8db9191c32..27ad83d35d4 100644
--- a/htdocs/compta/facture/card.php
+++ b/htdocs/compta/facture/card.php
@@ -2237,8 +2237,9 @@ if (empty($reshook)) {
 				$desc = $product_desc;
 				$type = GETPOST('type');
 				$fk_unit = GETPOST('units', 'alpha');
-				$pu_ht_devise = price2num($price_ht_devise, 'MU');
 			}
+			
+			$pu_ht_devise = price2num($price_ht_devise, 'MU');
 
 			// Margin
 			$fournprice = price2num(GETPOST('fournprice'.$predef) ? GETPOST('fournprice'.$predef) : '');
@@ -2286,10 +2287,10 @@ if (empty($reshook)) {
 					if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) {
 						$outputlangs = $langs;
 						$newlang = '';
-						if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id', 'aZ09')) {
+						if (!empty-$conf->global->MAIN_MULTILANGS) && empty($newlang) && GETPOST('lang_id', 'aZ09')) {
 							$newlang = GETPOST('lang_id', 'aZ09');
 						}
-						if ($conf->global->MAIN_MULTILANGS && empty($newlang)) {
+						if (!empty($conf->global->MAIN_MULTILANGS) && empty($newlang)) {
 							$newlang = $object->thirdparty->default_lang;
 						}
 						if (!empty($newlang)) {

From 0886f8557967071952693d7c3fe1067032d66cdf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?This=20Charl=C3=A8ne?=
 <1179011+defrance@users.noreply.github.com>
Date: Wed, 7 Sep 2022 08:57:51 +0200
Subject: [PATCH 732/974] Update card.php

---
 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 27ad83d35d4..f60f1da089d 100644
--- a/htdocs/compta/facture/card.php
+++ b/htdocs/compta/facture/card.php
@@ -659,10 +659,10 @@ if (empty($reshook)) {
 				if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) {
 					$outputlangs = $langs;
 					$newlang = '';
-					if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id', 'aZ09')) {
+					if (!empty($conf->global->MAIN_MULTILANGS) && empty($newlang) && GETPOST('lang_id', 'aZ09')) {
 						$newlang = GETPOST('lang_id', 'aZ09');
 					}
-					if ($conf->global->MAIN_MULTILANGS && empty($newlang)) {
+					if (!empty($conf->global->MAIN_MULTILANGS) && empty($newlang)) {
 						$newlang = $object->thirdparty->default_lang;
 					}
 					if (!empty($newlang)) {

From 3144362c6ca337528bdff4ddcb5c4a8d30b98318 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?This=20Charl=C3=A8ne?=
 <1179011+defrance@users.noreply.github.com>
Date: Wed, 7 Sep 2022 09:38:20 +0200
Subject: [PATCH 733/974] php V8 warning

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

diff --git a/htdocs/fourn/facture/list.php b/htdocs/fourn/facture/list.php
index 305c50b29d5..09dbd4c84ac 100644
--- a/htdocs/fourn/facture/list.php
+++ b/htdocs/fourn/facture/list.php
@@ -10,7 +10,7 @@
  * Copyright (C) 2015		Abbes Bahfir			<bafbes@gmail.com>
  * Copyright (C) 2015-2016	Ferran Marcet			<fmarcet@2byte.es>
  * Copyright (C) 2017		Josep Lluís Amador		<joseplluis@lliuretic.cat>
- * Copyright (C) 2018		Charlene Benke			<charlie@patas-monkey.com>
+ * Copyright (C) 2018-2022	Charlene Benke			<charlene@patas-monkey.com>
  * Copyright (C) 2018-2020	Frédéric France			<frederic.france@netlogic.fr>
  * Copyright (C) 2019-2021	Alexandre Spangaro		<aspangaro@open-dsi.fr>
  *
@@ -649,7 +649,7 @@ if (!$search_all) {
 		}
 	}
 	// Add GroupBy from hooks
-	$parameters = array('all' => $all, 'fieldstosearchall' => $fieldstosearchall);
+	$parameters = array('all' => $search_all, 'fieldstosearchall' => $fieldstosearchall);
 	$reshook = $hookmanager->executeHooks('printFieldListGroupBy', $parameters, $object); // Note that $action and $object may have been modified by hook
 	$sql .= $hookmanager->resPrint;
 } else {
@@ -682,7 +682,7 @@ if ($resql) {
 
 	$arrayofselected = is_array($toselect) ? $toselect : array();
 
-	if ($num == 1 && !empty($conf->global->MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE) && $sall) {
+	if ($num == 1 && !empty($conf->global->MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE) && $search_all) {
 		$obj = $db->fetch_object($resql);
 		$id = $obj->facid;
 

From 7a3b94a1e90243b4af1b1c91b21fb6e174d29ee0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?This=20Charl=C3=A8ne?=
 <1179011+defrance@users.noreply.github.com>
Date: Wed, 7 Sep 2022 09:53:43 +0200
Subject: [PATCH 734/974] Update list.php

---
 htdocs/fourn/facture/list.php | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/htdocs/fourn/facture/list.php b/htdocs/fourn/facture/list.php
index 09dbd4c84ac..4c5b84ea4ee 100644
--- a/htdocs/fourn/facture/list.php
+++ b/htdocs/fourn/facture/list.php
@@ -1291,6 +1291,14 @@ if ($resql) {
 	if ($num > 0) {
 		$i = 0;
 		$totalarray = array();
+		$totalarray['nbfield']=0;
+		$totalarray['val'] = array();
+		$totalarray['val']['f.total_ht']=0;
+		$totalarray['val']['f.total_vat']=0;
+		$totalarray['val']['f.total_localtax1']=0;
+		$totalarray['val']['f.total_localtax1']=0;
+		$totalarray['val']['f.total_ttc']=0;
+
 		while ($i < min($num, $limit)) {
 			$obj = $db->fetch_object($resql);
 

From fbbdcd1d4c2b37afc5b25025212e3590041c3844 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20France?= <frederic.france@free.fr>
Date: Wed, 7 Sep 2022 10:28:23 +0200
Subject: [PATCH 735/974] fix php8 warnings

---
 htdocs/comm/propal/card.php                        |  2 +-
 .../core/modules/propale/doc/pdf_azur.modules.php  |  2 +-
 .../core/modules/propale/doc/pdf_cyan.modules.php  |  2 +-
 htdocs/datapolicy/admin/setupmail.php              |  2 +-
 .../product/class/propalmergepdfproduct.class.php  |  8 ++++----
 htdocs/product/document.php                        | 14 +++++++-------
 htdocs/societe/paymentmodes.php                    |  2 +-
 7 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/htdocs/comm/propal/card.php b/htdocs/comm/propal/card.php
index 53ba07ba441..388a4f97d4b 100644
--- a/htdocs/comm/propal/card.php
+++ b/htdocs/comm/propal/card.php
@@ -722,7 +722,7 @@ if (empty($reshook)) {
 						$ret = $deposit->fetch($deposit->id); // Reload to get new records
 						$outputlangs = $langs;
 
-						if ($conf->global->MAIN_MULTILANGS) {
+						if (!empty($conf->global->MAIN_MULTILANGS)) {
 							$outputlangs = new Translate('', $conf);
 							$outputlangs->setDefaultLang($deposit->thirdparty->default_lang);
 							$outputlangs->load('products');
diff --git a/htdocs/core/modules/propale/doc/pdf_azur.modules.php b/htdocs/core/modules/propale/doc/pdf_azur.modules.php
index 86d6306a576..c2971c9344e 100644
--- a/htdocs/core/modules/propale/doc/pdf_azur.modules.php
+++ b/htdocs/core/modules/propale/doc/pdf_azur.modules.php
@@ -793,7 +793,7 @@ class pdf_azur extends ModelePDFPropales
 							// Find the desire PDF
 							$filetomerge = new Propalmergepdfproduct($this->db);
 
-							if ($conf->global->MAIN_MULTILANGS) {
+							if (!empty($conf->global->MAIN_MULTILANGS)) {
 								$filetomerge->fetch_by_product($line->fk_product, $outputlangs->defaultlang);
 							} else {
 								$filetomerge->fetch_by_product($line->fk_product);
diff --git a/htdocs/core/modules/propale/doc/pdf_cyan.modules.php b/htdocs/core/modules/propale/doc/pdf_cyan.modules.php
index ec04a8e8906..9d52132db56 100644
--- a/htdocs/core/modules/propale/doc/pdf_cyan.modules.php
+++ b/htdocs/core/modules/propale/doc/pdf_cyan.modules.php
@@ -918,7 +918,7 @@ class pdf_cyan extends ModelePDFPropales
 							// Find the desire PDF
 							$filetomerge = new Propalmergepdfproduct($this->db);
 
-							if ($conf->global->MAIN_MULTILANGS) {
+							if (!empty($conf->global->MAIN_MULTILANGS)) {
 								$filetomerge->fetch_by_product($line->fk_product, $outputlangs->defaultlang);
 							} else {
 								$filetomerge->fetch_by_product($line->fk_product);
diff --git a/htdocs/datapolicy/admin/setupmail.php b/htdocs/datapolicy/admin/setupmail.php
index e2f562ee79b..825bd13b142 100644
--- a/htdocs/datapolicy/admin/setupmail.php
+++ b/htdocs/datapolicy/admin/setupmail.php
@@ -106,7 +106,7 @@ print '<form method="post" action="'.$_SERVER["PHP_SELF"].'?l='.$l.'">';
 print '<input type="hidden" name="token" value="'.newToken().'">';
 print '<input type="hidden" name="action" value="setvalue">';
 print '<table>';
-if ($conf->global->MAIN_MULTILANGS) {
+if (!empty($conf->global->MAIN_MULTILANGS)) {
 	print '<tr><td>'.$form->editfieldkey('DefaultLang', 'default_lang', '', null, 0).'</td><td colspan="3" class="maxwidthonsmartphone">'."\n";
 	print $formadmin->select_language((GETPOST('l') ? GETPOST('l') : $langs->defaultlang), 'default_lang', 0, 0, 1, 0, 0, 'maxwidth200onsmartphone');
 	print '</tr>';
diff --git a/htdocs/product/class/propalmergepdfproduct.class.php b/htdocs/product/class/propalmergepdfproduct.class.php
index e69c75c7336..b4b85c3852a 100644
--- a/htdocs/product/class/propalmergepdfproduct.class.php
+++ b/htdocs/product/class/propalmergepdfproduct.class.php
@@ -107,7 +107,7 @@ class Propalmergepdfproduct extends CommonObject
 		$sql = "INSERT INTO ".$this->db->prefix()."propal_merge_pdf_product(";
 		$sql .= "fk_product,";
 		$sql .= "file_name,";
-		if ($conf->global->MAIN_MULTILANGS) {
+		if (!empty($conf->global->MAIN_MULTILANGS)) {
 			$sql .= "lang,";
 		}
 		$sql .= "fk_user_author,";
@@ -116,7 +116,7 @@ class Propalmergepdfproduct extends CommonObject
 		$sql .= ") VALUES (";
 		$sql .= " ".(!isset($this->fk_product) ? 'NULL' : ((int) $this->fk_product)).",";
 		$sql .= " ".(!isset($this->file_name) ? 'NULL' : "'".$this->db->escape($this->file_name)."'").",";
-		if ($conf->global->MAIN_MULTILANGS) {
+		if (!empty($conf->global->MAIN_MULTILANGS)) {
 			$sql .= " ".(!isset($this->lang) ? 'NULL' : "'".$this->db->escape($this->lang)."'").",";
 		}
 		$sql .= " ".((int) $user->id).",";
@@ -186,7 +186,7 @@ class Propalmergepdfproduct extends CommonObject
 
 				$this->fk_product = $obj->fk_product;
 				$this->file_name = $obj->file_name;
-				if ($conf->global->MAIN_MULTILANGS) {
+				if (!empty($conf->global->MAIN_MULTILANGS)) {
 					$this->lang = $obj->lang;
 				}
 				$this->fk_user_author = $obj->fk_user_author;
@@ -311,7 +311,7 @@ class Propalmergepdfproduct extends CommonObject
 
 		$sql .= " fk_product=".(isset($this->fk_product) ? $this->fk_product : "null").",";
 		$sql .= " file_name=".(isset($this->file_name) ? "'".$this->db->escape($this->file_name)."'" : "null").",";
-		if ($conf->global->MAIN_MULTILANGS) {
+		if (!empty($conf->global->MAIN_MULTILANGS)) {
 			$sql .= " lang=".(isset($this->lang) ? "'".$this->db->escape($this->lang)."'" : "null").",";
 		}
 		$sql .= " fk_user_mod=".$user->id;
diff --git a/htdocs/product/document.php b/htdocs/product/document.php
index 2aaa2356879..ee5ba79a284 100644
--- a/htdocs/product/document.php
+++ b/htdocs/product/document.php
@@ -154,14 +154,14 @@ if ($action == 'filemerge' && $permissiontoadd) {
 
 		$filetomerge_file_array = GETPOST('filetoadd');
 
-		if ($conf->global->MAIN_MULTILANGS) {
+		if (!empty($conf->global->MAIN_MULTILANGS)) {
 			$lang_id = GETPOST('lang_id', 'aZ09');
 		}
 
 		// Delete all file already associated
 		$filetomerge = new Propalmergepdfproduct($db);
 
-		if ($conf->global->MAIN_MULTILANGS) {
+		if (!empty($conf->global->MAIN_MULTILANGS)) {
 			$result = $filetomerge->delete_by_product($user, $object->id, $lang_id);
 		} else {
 			$result = $filetomerge->delete_by_product($user, $object->id);
@@ -176,7 +176,7 @@ if ($action == 'filemerge' && $permissiontoadd) {
 				$filetomerge->fk_product = $object->id;
 				$filetomerge->file_name = $filetomerge_file;
 
-				if ($conf->global->MAIN_MULTILANGS) {
+				if (!empty($conf->global->MAIN_MULTILANGS)) {
 					$filetomerge->lang = $lang_id;
 				}
 
@@ -271,7 +271,7 @@ if ($object->id) {
 	if (!empty($conf->global->PRODUIT_PDF_MERGE_PROPAL)) {
 		$filetomerge = new Propalmergepdfproduct($db);
 
-		if ($conf->global->MAIN_MULTILANGS) {
+		if (!empty($conf->global->MAIN_MULTILANGS)) {
 			$lang_id = GETPOST('lang_id', 'aZ09');
 			$result = $filetomerge->fetch_by_product($object->id, $lang_id);
 		} else {
@@ -305,7 +305,7 @@ if ($object->id) {
 			print  '<table class="noborder">';
 
 			// Get language
-			if ($conf->global->MAIN_MULTILANGS) {
+			if (!empty($conf->global->MAIN_MULTILANGS)) {
 				$langs->load("languages");
 
 				print  '<tr class="liste_titre"><td>';
@@ -316,7 +316,7 @@ if ($object->id) {
 
 				print Form::selectarray('lang_id', $langs_available, $default_lang, 0, 0, 0, '', 0, 0, 0, 'ASC');
 
-				if ($conf->global->MAIN_MULTILANGS) {
+				if (!empty($conf->global->MAIN_MULTILANGS)) {
 					print  '<input type="submit" class="button" name="refresh" value="'.$langs->trans('Refresh').'">';
 				}
 
@@ -328,7 +328,7 @@ if ($object->id) {
 					$checked = '';
 					$filename = $filetoadd['name'];
 
-					if ($conf->global->MAIN_MULTILANGS) {
+					if (!empty($conf->global->MAIN_MULTILANGS)) {
 						if (array_key_exists($filetoadd['name'].'_'.$default_lang, $filetomerge->lines)) {
 							$filename = $filetoadd['name'].' - '.$langs->trans('Language_'.$default_lang);
 							$checked = ' checked ';
diff --git a/htdocs/societe/paymentmodes.php b/htdocs/societe/paymentmodes.php
index 20cce294586..e7899db813e 100644
--- a/htdocs/societe/paymentmodes.php
+++ b/htdocs/societe/paymentmodes.php
@@ -1467,7 +1467,7 @@ if ($socid && $action != 'edit' && $action != 'create' && $action != 'editcard'
 				$allowgenifempty = 0;
 
 				// Language code (if multilang)
-				if ($conf->global->MAIN_MULTILANGS) {
+				if (!empty($conf->global->MAIN_MULTILANGS)) {
 					include_once DOL_DOCUMENT_ROOT.'/core/class/html.formadmin.class.php';
 					$formadmin = new FormAdmin($db);
 					$defaultlang = $langs->getDefaultLang();

From f27a49d30c3aa56663fb99233c8bca82292ae4b3 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 7 Sep 2022 12:45:43 +0200
Subject: [PATCH 736/974] Fix missing var

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

diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php
index d646da3b413..f6ed3468f9c 100644
--- a/htdocs/compta/facture/class/facture.class.php
+++ b/htdocs/compta/facture/class/facture.class.php
@@ -137,7 +137,8 @@ class Facture extends CommonInvoice
 	/**
 	 * @var string customer ref
 	 */
-	public $ref_client;
+	public $ref_client;		// deprecated; use ref_customer instead
+	public $ref_customer;
 
 	/**
 	 * @var int Ref Int

From 445da580c6d3fd533a4d123cc50bfe473aaabd04 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 7 Sep 2022 13:42:31 +0200
Subject: [PATCH 737/974] Fix regression

---
 htdocs/core/menus/standard/eldy.lib.php | 76 ++++++++++++-------------
 1 file changed, 38 insertions(+), 38 deletions(-)

diff --git a/htdocs/core/menus/standard/eldy.lib.php b/htdocs/core/menus/standard/eldy.lib.php
index 01bc426458e..66f85c3739c 100644
--- a/htdocs/core/menus/standard/eldy.lib.php
+++ b/htdocs/core/menus/standard/eldy.lib.php
@@ -95,8 +95,8 @@ function print_eldy_menu($db, $atarget, $type_user, &$tabMenu, &$menu, $noout =
 
 	// Members
 	$tmpentry = array(
-		'enabled' => (isModEnabled('adherent')),
-		'perms' => (!empty($user->hasRight('adherent',  'lire'))),
+		'enabled' => isModEnabled('adherent'),
+		'perms' => $user->hasRight('adherent',  'lire'),
 		'module' => 'adherent'
 	);
 	$menu_arr[] = array(
@@ -125,7 +125,7 @@ function print_eldy_menu($db, $atarget, $type_user, &$tabMenu, &$menu, $noout =
 			)
 			|| ((isModEnabled('fournisseur') && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD)) || isModEnabled('supplier_order') || isModEnabled('supplier_invoice'))
 			),
-		'perms'=> (!empty($user->hasRight('societe',  'lire')) || !empty($user->hasRight('fournisseur',  'lire')) || !empty($user->hasRight('supplier_order',  'lire')) || !empty($user->hasRight('supplier_invoice',  'lire')) || !empty($user->hasRight('supplier_proposal',  'lire'))),
+		'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(
@@ -150,7 +150,7 @@ function print_eldy_menu($db, $atarget, $type_user, &$tabMenu, &$menu, $noout =
 	// Products-Services
 	$tmpentry = array(
 		'enabled'=> (isModEnabled('product') || isModEnabled('service') || isModEnabled('expedition')),
-		'perms'=> (!empty($user->hasRight('produit',  'lire')) || !empty($user->hasRight('service',  'lire')) || !empty($user->hasRight('expedition',  'lire'))),
+		'perms'=> ($user->hasRight('produit',  'lire') || $user->hasRight('service',  'lire') || $user->hasRight('expedition',  'lire')),
 		'module'=>'product|service'
 	);
 	$menu_arr[] = array(
@@ -177,7 +177,7 @@ function print_eldy_menu($db, $atarget, $type_user, &$tabMenu, &$menu, $noout =
 	// MRP - GPAO
 	$tmpentry = array(
 		'enabled'=>(isModEnabled('bom') || isModEnabled('mrp')),
-		'perms'=>(!empty($user->hasRight('bom',  'read')) || !empty($user->hasRight('mrp',  'read'))),
+		'perms'=>($user->hasRight('bom',  'read') || $user->hasRight('mrp',  'read')),
 		'module'=>'bom|mrp'
 	);
 	$menu_arr[] = array(
@@ -202,7 +202,7 @@ function print_eldy_menu($db, $atarget, $type_user, &$tabMenu, &$menu, $noout =
 	// Projects
 	$tmpentry = array(
 		'enabled'=> (isModEnabled('projet') ? 1 : 0),
-		'perms'=> (!empty($user->hasRight('projet',  'lire')) ? 1 : 0),
+		'perms'=> ($user->hasRight('projet',  'lire') ? 1 : 0),
 		'module'=>'projet'
 	);
 	$menu_arr[] = array(
@@ -234,25 +234,25 @@ function print_eldy_menu($db, $atarget, $type_user, &$tabMenu, &$menu, $noout =
 			|| isModEnabled('contrat')
 			|| isModEnabled('ficheinter')
 			) ? 1 : 0,
-		'perms'=>(!empty($user->hasRight('propal',  'lire'))
-			|| !empty($user->hasRight('commande',  'lire'))
-			|| !empty($user->hasRight('supplier_proposal',  'lire'))
-			|| !empty($user->hasRight('fournisseur',  'lire'))
-			|| !empty($user->hasRight('fournisseur',  'commande', 'lire'))
-			|| !empty($user->hasRight('supplier_order',  'lire'))
-			|| !empty($user->hasRight('contrat',  'lire'))
-			|| !empty($user->hasRight('ficheinter',  'lire'))
+		'perms'=>($user->hasRight('propal',  'lire')
+			|| $user->hasRight('commande',  'lire')
+			|| $user->hasRight('supplier_proposal',  'lire')
+			|| $user->hasRight('fournisseur',  'lire')
+			|| $user->hasRight('fournisseur',  'commande', 'lire')
+			|| $user->hasRight('supplier_order',  'lire')
+			|| $user->hasRight('contrat',  'lire')
+			|| $user->hasRight('ficheinter',  'lire')
 			),
 		'module'=>'propal|commande|supplier_proposal|supplier_order|contrat|ficheinter'
 	);
 
-	$onlysupplierorder = !empty($user->hasRight('fournisseur',  'commande', 'lire')) &&
-	empty($user->hasRight('propal',  'lire')) &&
-	empty($user->hasRight('commande',  'lire')) &&
-	empty($user->hasRight('supplier_order',  'lire')) &&
-	empty($user->hasRight('supplier_proposal',  'lire')) &&
-	empty($user->hasRight('contrat',  'lire')) &&
-	empty($user->hasRight('ficheinter',  'lire'));
+	$onlysupplierorder = $user->hasRight('fournisseur',  'commande', 'lire') &&
+	!$user->hasRight('propal',  'lire') &&
+	!$user->hasRight('commande',  'lire') &&
+	!$user->hasRight('supplier_order',  'lire') &&
+	!$user->hasRight('supplier_proposal',  'lire') &&
+	!$user->hasRight('contrat',  'lire') &&
+	!$user->hasRight('ficheinter',  'lire');
 
 	$menu_arr[] = array(
 		'name' => 'Commercial',
@@ -283,9 +283,9 @@ function print_eldy_menu($db, $atarget, $type_user, &$tabMenu, &$menu, $noout =
 			isModEnabled('loan') ||
 			isModEnabled('margins')
 			) ? 1 : 0,
-		'perms'=>(!empty($user->hasRight('facture',  'lire')) || !empty($user->hasRight('don',  'contact', 'lire'))
-			|| !empty($user->hasRight('tax',  'charges', 'lire')) || !empty($user->hasRight('salaries',  'read'))
-			|| !empty($user->hasRight('fournisseur',  'facture', 'lire')) || !empty($user->hasRight('loan',  'read')) || !empty($user->hasRight('margins',  'liretous'))),
+		'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'
 	);
 	$menu_arr[] = array(
@@ -310,7 +310,7 @@ function print_eldy_menu($db, $atarget, $type_user, &$tabMenu, &$menu, $noout =
 	// Bank
 	$tmpentry = array(
 		'enabled'=>(isModEnabled('banque') || isModEnabled('prelevement')),
-		'perms'=>(!empty($user->hasRight('banque',  'lire')) || !empty($user->hasRight('prelevement',  'lire')) || !empty($user->hasRight('paymentbybanktransfer',  'read'))),
+		'perms'=>($user->hasRight('banque',  'lire') || $user->hasRight('prelevement',  'lire') || $user->hasRight('paymentbybanktransfer',  'read')),
 		'module'=>'banque|prelevement|paymentbybanktransfer'
 	);
 	$menu_arr[] = array(
@@ -335,7 +335,7 @@ function print_eldy_menu($db, $atarget, $type_user, &$tabMenu, &$menu, $noout =
 	// Accounting
 	$tmpentry = array(
 		'enabled'=>(isModEnabled('comptabilite') || isModEnabled('accounting') || isModEnabled('asset') || isModEnabled('intracommreport')),
-		'perms'=>(!empty($user->hasRight('compta',  'resultat', 'lire')) || !empty($user->hasRight('accounting',  'comptarapport', 'lire')) || !empty($user->hasRight('accounting',  'mouvements', 'lire')) || !empty($user->hasRight('asset',  'read')) || !empty($user->hasRight('intracommreport',  'read'))),
+		'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(
@@ -360,7 +360,7 @@ 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'=>(!empty($user->hasRight('user',  'user', 'lire')) || !empty($user->hasRight('holiday',  'read')) || !empty($user->hasRight('deplacement',  'lire')) || !empty($user->hasRight('expensereport',  'lire')) || !empty($user->hasRight('recruitment',  'recruitmentjobposition', 'read'))),
+		'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'
 	);
 
@@ -386,7 +386,7 @@ function print_eldy_menu($db, $atarget, $type_user, &$tabMenu, &$menu, $noout =
 	// Tickets and knowledge base
 	$tmpentry = array(
 		'enabled'=>(isModEnabled('ticket') || isModEnabled('knowledgemanagement')),
-		'perms'=>(!empty($user->hasRight('ticket',  'read')) || !empty($user->hasRight('knowledgemanagement',  'knowledgerecord', 'read'))),
+		'perms'=>($user->hasRight('ticket',  'read') || $user->hasRight('knowledgemanagement',  'knowledgerecord', 'read')),
 		'module'=>'ticket|knowledgemanagement'
 	);
 	$link = '';
@@ -1658,7 +1658,7 @@ function get_left_menu_accountancy($mainmenu, &$newmenu, $usemenuhider = 1, $lef
 			}
 
 			// Journals
-			if (isModEnabled('accounting') && !empty($user->hasRight('accounting',  'comptarapport', 'lire')) && $mainmenu == 'accountancy') {
+			if (isModEnabled('accounting') && $user->hasRight('accounting',  'comptarapport', 'lire') && $mainmenu == 'accountancy') {
 				$newmenu->add('', $langs->trans("RegistrationInAccounting"), 1, $user->hasRight('accounting',  'comptarapport', 'lire'), '', '', '');
 
 				// Multi journal
@@ -1759,7 +1759,7 @@ function get_left_menu_accountancy($mainmenu, &$newmenu, $usemenuhider = 1, $lef
 			}
 
 			$modecompta = 'CREANCES-DETTES';
-			if (isModEnabled('accounting') && !empty($user->hasRight('accounting',  'comptarapport', 'lire')) && $mainmenu == 'accountancy') {
+			if (isModEnabled('accounting') && $user->hasRight('accounting',  'comptarapport', 'lire') && $mainmenu == 'accountancy') {
 				$modecompta = 'BOOKKEEPING'; // Not yet implemented. Should be BOOKKEEPINGCOLLECTED
 			}
 			if ($modecompta) {
@@ -1773,7 +1773,7 @@ function get_left_menu_accountancy($mainmenu, &$newmenu, $usemenuhider = 1, $lef
 			}
 
 			$modecompta = 'RECETTES-DEPENSES';
-			//if (isModEnabled('accounting') && !empty($user->hasRight('accounting',  'comptarapport', 'lire')) && $mainmenu == 'accountancy') $modecompta='';	// Not yet implemented. Should be BOOKKEEPINGCOLLECTED
+			//if (isModEnabled('accounting') && $user->hasRight('accounting',  'comptarapport', 'lire') && $mainmenu == 'accountancy') $modecompta='';	// Not yet implemented. Should be BOOKKEEPINGCOLLECTED
 			if ($modecompta) {
 				if ($usemenuhider || empty($leftmenu) || preg_match('/accountancy_report/', $leftmenu)) {
 					$newmenu->add("/compta/stats/index.php?leftmenu=accountancy_report&modecompta=".$modecompta, $langs->trans("ReportTurnoverCollected"), 2, $user->hasRight('accounting',  'comptarapport', 'lire'));
@@ -1785,7 +1785,7 @@ function get_left_menu_accountancy($mainmenu, &$newmenu, $usemenuhider = 1, $lef
 			}
 
 			$modecompta = 'CREANCES-DETTES';
-			if (isModEnabled('accounting') && !empty($user->hasRight('accounting',  'comptarapport', 'lire')) && $mainmenu == 'accountancy') {
+			if (isModEnabled('accounting') && $user->hasRight('accounting',  'comptarapport', 'lire') && $mainmenu == 'accountancy') {
 				$modecompta = 'BOOKKEEPING'; // Not yet implemented.
 			}
 			if ($modecompta && ((isModEnabled('fournisseur') && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD)) || isModEnabled('supplier_invoice'))) {
@@ -1797,7 +1797,7 @@ function get_left_menu_accountancy($mainmenu, &$newmenu, $usemenuhider = 1, $lef
 			}
 
 			$modecompta = 'RECETTES-DEPENSES';
-			if (isModEnabled('accounting') && !empty($user->hasRight('accounting',  'comptarapport', 'lire')) && $mainmenu == 'accountancy') {
+			if (isModEnabled('accounting') && $user->hasRight('accounting',  'comptarapport', 'lire') && $mainmenu == 'accountancy') {
 				$modecompta = 'BOOKKEEPINGCOLLECTED'; // Not yet implemented.
 			}
 			if ($modecompta && ((isModEnabled('fournisseur') && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD)) || isModEnabled('supplier_invoice'))) {
@@ -1881,10 +1881,10 @@ function get_left_menu_accountancy($mainmenu, &$newmenu, $usemenuhider = 1, $lef
 			$newmenu->add("/asset/list.php?leftmenu=asset&amp;mainmenu=accountancy", $langs->trans("MenuAssets"), 0, $user->hasRight('asset',  'read'), '', $mainmenu, 'asset', 100, '', '', '', img_picto('', 'payment', 'class="paddingright pictofixedwidth"'));
 			$newmenu->add("/asset/card.php?leftmenu=asset&amp;action=create", $langs->trans("MenuNewAsset"), 1, $user->hasRight('asset',  'write'));
 			$newmenu->add("/asset/list.php?leftmenu=asset&amp;mainmenu=accountancy", $langs->trans("MenuListAssets"), 1, $user->hasRight('asset',  'read'));
-			$newmenu->add("/asset/model/list.php?leftmenu=asset_model", $langs->trans("MenuAssetModels"), 1, (empty($conf->global->MAIN_USE_ADVANCED_PERMS) && $user->hasRight('asset',  'read')) || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->hasRight('asset',  'model_advance', 'read'))), '', $mainmenu, 'asset_model');
+			$newmenu->add("/asset/model/list.php?leftmenu=asset_model", $langs->trans("MenuAssetModels"), 1, (empty($conf->global->MAIN_USE_ADVANCED_PERMS) && $user->hasRight('asset',  'read')) || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && $user->hasRight('asset',  'model_advance', 'read')), '', $mainmenu, 'asset_model');
 			if ($usemenuhider || empty($leftmenu) || preg_match('/asset_model/', $leftmenu)) {
-				$newmenu->add("/asset/model/card.php?leftmenu=asset_model&amp;action=create", $langs->trans("MenuNewAssetModel"), 2, (empty($conf->global->MAIN_USE_ADVANCED_PERMS) && $user->hasRight('asset',  'write')) || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->hasRight('asset',  'model_advance', 'write'))));
-				$newmenu->add("/asset/model/list.php?leftmenu=asset_model", $langs->trans("MenuListAssetModels"), 2, (empty($conf->global->MAIN_USE_ADVANCED_PERMS) && $user->hasRight('asset',  'read')) || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->hasRight('asset',  'model_advance', 'read'))));
+				$newmenu->add("/asset/model/card.php?leftmenu=asset_model&amp;action=create", $langs->trans("MenuNewAssetModel"), 2, (empty($conf->global->MAIN_USE_ADVANCED_PERMS) && $user->hasRight('asset',  'write')) || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && $user->hasRight('asset',  'model_advance', 'write')));
+				$newmenu->add("/asset/model/list.php?leftmenu=asset_model", $langs->trans("MenuListAssetModels"), 2, (empty($conf->global->MAIN_USE_ADVANCED_PERMS) && $user->hasRight('asset',  'read')) || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && $user->hasRight('asset',  'model_advance', 'read')));
 			}
 		}
 	}
@@ -2165,8 +2165,8 @@ function get_left_menu_projects($mainmenu, &$newmenu, $usemenuhider = 1, $leftme
 			$search_project_user = GETPOST('search_project_user', 'int');
 
 			$tmpentry = array(
-				'enabled'=>(isModEnabled('projet')),
-				'perms'=>(!empty($user->hasRight('projet',  'lire'))),
+				'enabled'=>isModEnabled('projet'),
+				'perms'=>$user->hasRight('projet',  'lire'),
 				'module'=>'projet'
 			);
 			$listofmodulesforexternal = explode(',', $conf->global->MAIN_MODULES_FOR_EXTERNAL);

From 967e2033193105c54297a4fcb31a6740b0aea6c4 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 7 Sep 2022 13:55:02 +0200
Subject: [PATCH 738/974] Fix fetch missing fields

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

diff --git a/htdocs/fourn/facture/card.php b/htdocs/fourn/facture/card.php
index b928cc5bdf9..75aa5898574 100644
--- a/htdocs/fourn/facture/card.php
+++ b/htdocs/fourn/facture/card.php
@@ -2643,7 +2643,7 @@ if ($action == 'create') {
 		 *	View card
 		 */
 		$objectidnext = $object->getIdReplacingInvoice();
-		
+
 		$head = facturefourn_prepare_head($object);
 		$titre = $langs->trans('SupplierInvoice');
 
@@ -3305,7 +3305,10 @@ if ($action == 'create') {
 					$paymentstatic->datepaye = $db->jdate($objp->dp);
 					$paymentstatic->ref = ($objp->ref ? $objp->ref : $objp->rowid);
 					$paymentstatic->num_payment = $objp->num_payment;
+
 					$paymentstatic->paiementcode = $objp->payment_code;
+					$paymentstatic->type_code = $objp->payment_code;
+					$paymentstatic->type_label = $objp->payment_type;
 
 					print '<tr class="oddeven">';
 					print '<td>';

From aa560db06de3a75e22fac74db00503c20ef06de7 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 7 Sep 2022 13:58:24 +0200
Subject: [PATCH 739/974] Fix regression

---
 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 f60f1da089d..dd322bd8245 100644
--- a/htdocs/compta/facture/card.php
+++ b/htdocs/compta/facture/card.php
@@ -2238,7 +2238,7 @@ if (empty($reshook)) {
 				$type = GETPOST('type');
 				$fk_unit = GETPOST('units', 'alpha');
 			}
-			
+
 			$pu_ht_devise = price2num($price_ht_devise, 'MU');
 
 			// Margin
@@ -2287,7 +2287,7 @@ if (empty($reshook)) {
 					if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) {
 						$outputlangs = $langs;
 						$newlang = '';
-						if (!empty-$conf->global->MAIN_MULTILANGS) && empty($newlang) && GETPOST('lang_id', 'aZ09')) {
+						if (!empty($conf->global->MAIN_MULTILANGS) && empty($newlang) && GETPOST('lang_id', 'aZ09')) {
 							$newlang = GETPOST('lang_id', 'aZ09');
 						}
 						if (!empty($conf->global->MAIN_MULTILANGS) && empty($newlang)) {

From ea6f751fd3a27457613aad536088c8ea0675a73e Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 7 Sep 2022 14:21:36 +0200
Subject: [PATCH 740/974] Update card.php

---
 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 d56f9419989..723ff70139d 100644
--- a/htdocs/societe/card.php
+++ b/htdocs/societe/card.php
@@ -602,7 +602,7 @@ if (empty($reshook)) {
 
 				$result = $object->create($user);
 
-				if (empty($error) && !empty($conf->mailing->enabled) && !empty($object->email)) {
+				if (empty($error) && !empty($conf->mailing->enabled) && !empty($object->email) && !empty($object->no_email)) {
 					// Add mass emailing flag into table mailing_unsubscribe
 					$result = $object->setNoEmail($object->no_email);
 					if ($result < 0) {

From 56f1964c68e19b0db6e28eb5f97dae1b96be7ce3 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 7 Sep 2022 14:23:24 +0200
Subject: [PATCH 741/974] Update card.php

---
 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 723ff70139d..cc0b92fca00 100644
--- a/htdocs/societe/card.php
+++ b/htdocs/societe/card.php
@@ -602,7 +602,7 @@ if (empty($reshook)) {
 
 				$result = $object->create($user);
 
-				if (empty($error) && !empty($conf->mailing->enabled) && !empty($object->email) && !empty($object->no_email)) {
+				if (empty($error) && !empty($conf->mailing->enabled) && !empty($object->email) && $object->no_email == 1) {
 					// Add mass emailing flag into table mailing_unsubscribe
 					$result = $object->setNoEmail($object->no_email);
 					if ($result < 0) {

From de1de589b3769e5aa185936e485fe2866774df20 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Wed, 7 Sep 2022 15:37:58 +0200
Subject: [PATCH 742/974] Update thirdparties.modules.php

---
 htdocs/core/modules/mailings/thirdparties.modules.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/htdocs/core/modules/mailings/thirdparties.modules.php b/htdocs/core/modules/mailings/thirdparties.modules.php
index 1d7acf02c09..335e3ac575a 100644
--- a/htdocs/core/modules/mailings/thirdparties.modules.php
+++ b/htdocs/core/modules/mailings/thirdparties.modules.php
@@ -317,11 +317,11 @@ class mailing_thirdparties extends MailingTargets
 		$s .= ajax_combobox("filter_status_thirdparties");
 
 		if (!empty($conf->global->MAIN_MULTILANGS)) {
-		// Choose language
-		require_once DOL_DOCUMENT_ROOT.'/core/class/html.formadmin.class.php';
-		$formadmin = new FormAdmin($this->db);
-		$s .= '<span class="opacitymedium">'.$langs->trans("DefaultLang").':</span> ';
-		$s .= $formadmin->select_language($langs->getDefaultLang(1), 'filter_lang_thirdparties', 0, null, 1, 0, 0, '', 0, 0, 0, null, 1);
+			// Choose language
+			require_once DOL_DOCUMENT_ROOT.'/core/class/html.formadmin.class.php';
+			$formadmin = new FormAdmin($this->db);
+			$s .= '<span class="opacitymedium">'.$langs->trans("DefaultLang").':</span> ';
+			$s .= $formadmin->select_language($langs->getDefaultLang(1), 'filter_lang_thirdparties', 0, null, 1, 0, 0, '', 0, 0, 0, null, 1);
 		}
 
 		return $s;

From 50169bc96a8cec3533c3d3fc2e50f2c288a57494 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 7 Sep 2022 15:50:40 +0200
Subject: [PATCH 743/974] Clean code

---
 htdocs/admin/menus/edit.php           |  31 ++++---
 htdocs/core/lib/functions.lib.php     |   8 +-
 htdocs/langs/en_US/admin.lang         |   2 +-
 htdocs/langs/en_US/modulebuilder.lang |   1 +
 htdocs/modulebuilder/index.php        | 114 ++++++++++++++++++--------
 5 files changed, 106 insertions(+), 50 deletions(-)

diff --git a/htdocs/admin/menus/edit.php b/htdocs/admin/menus/edit.php
index 471b34866a7..64c3f4a7015 100644
--- a/htdocs/admin/menus/edit.php
+++ b/htdocs/admin/menus/edit.php
@@ -295,11 +295,13 @@ if ($action == 'create') {
 
 	// User
 	print '<tr><td class="nowrap fieldrequired">'.$langs->trans('MenuForUsers').'</td>';
-	print '<td><select class="flat" name="user">';
+	print '<td><select class="flat" name="user" id="menuuser">';
 	print '<option value="2" selected>'.$langs->trans("AllMenus").'</option>';
 	print '<option value="0">'.$langs->trans('Internal').'</option>';
 	print '<option value="1">'.$langs->trans('External').'</option>';
-	print '</select></td>';
+	print '</select>';
+	print ajax_combobox('menuuser');
+	print '</td>';
 	print '<td>'.$langs->trans('DetailUser').'</td></tr>';
 
 	// Type
@@ -392,7 +394,7 @@ if ($action == 'create') {
 	print '<tr><td>'.$langs->trans('Id').'</td><td>'.$menu->id.'</td><td>'.$langs->trans('DetailId').'</td></tr>';
 
 	// Module
-	print '<tr><td>'.$langs->trans('MenuModule').'</td><td>'.$menu->module.'</td><td>'.$langs->trans('DetailMenuModule').'</td></tr>';
+	print '<tr><td>'.$langs->trans('MenuModule').'</td><td>'.(empty($menu->module) ? 'Core' : $menu->module).'</td><td><span class="opacitymedium">'.$langs->trans('DetailMenuModule').'</span></td></tr>';
 
 	// Handler
 	if ($menu->menu_handler == 'all') {
@@ -403,14 +405,17 @@ if ($action == 'create') {
 	print '<tr><td class="fieldrequired">'.$langs->trans('MenuHandler').'</td><td>'.$handler.'</td><td>'.$langs->trans('DetailMenuHandler').'</td></tr>';
 
 	// User
-	print '<tr><td class="nowrap fieldrequired">'.$langs->trans('MenuForUsers').'</td><td><select class="flat" name="user">';
+	print '<tr><td class="nowrap fieldrequired">'.$langs->trans('MenuForUsers').'</td><td>';
+	print '<select class="flat" name="user" id="menuuser">';
 	print '<option value="2"'.($menu->user == 2 ? ' selected' : '').'>'.$langs->trans("AllMenus").'</option>';
 	print '<option value="0"'.($menu->user == 0 ? ' selected' : '').'>'.$langs->trans('Internal').'</option>';
 	print '<option value="1"'.($menu->user == 1 ? ' selected' : '').'>'.$langs->trans('External').'</option>';
-	print '</select></td><td>'.$langs->trans('DetailUser').'</td></tr>';
+	print '</select>';
+	print ajax_combobox('menuuser');
+	print '</td><td>'.$langs->trans('DetailUser').'</td></tr>';
 
 	// Type
-	print '<tr><td class="fieldrequired">'.$langs->trans('Type').'</td>';
+	print '<tr><td class="fieldrequired">'.$langs->trans('Position').'</td>';
 	print '<td>'.$langs->trans(ucfirst($menu->type)).'</td><td>'.$langs->trans('DetailType').'</td></tr>';
 
 	// Mainmenu code
@@ -463,12 +468,6 @@ if ($action == 'create') {
 	print '<tr><td>'.$langs->trans('Position').'</td>';
 	print '<td><input type="text" class="minwidth100" name="position" value="'.$menu->position.'"></td><td>'.$langs->trans('DetailPosition').'</td></tr>';
 
-	// Target
-	print '<tr><td>'.$langs->trans('Target').'</td><td><select class="flat" name="target">';
-	print '<option value=""'.($menu->target == "" ? ' selected' : '').'>&nbsp;</option>';
-	print '<option value="_blank"'.($menu->target == "_blank" ? ' selected' : '').'>'.$langs->trans('_blank').'</option>';
-	print '</select></td><td>'.$langs->trans('DetailTarget').'</td></tr>';
-
 	// Enabled
 	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');
@@ -485,6 +484,14 @@ if ($action == 'create') {
 	}
 	print '</td></tr>';
 
+	// Target
+	print '<tr><td>'.$langs->trans('Target').'</td><td><select class="flat" id="target" name="target">';
+	print '<option value=""'.($menu->target == "" ? ' selected' : '').'>&nbsp;</option>';
+	print '<option value="_blank"'.($menu->target == "_blank" ? ' selected' : '').'>'.$langs->trans('_blank').'</option>';
+	print '</select>';
+	print ajax_combobox("target");
+	print '</td><td>'.$langs->trans('DetailTarget').'</td></tr>';
+
 	print '</table>';
 
 	print dol_get_fiche_end();
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 8a5751d72b3..1bb48831113 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -5118,8 +5118,12 @@ function getTitleFieldOfList($name, $thead = 0, $file = "", $field = "", $begin
 		$out .= '>';
 	}
 	if ($tooltip) {
-		// You can also use 'TranslationString:keyfortooltiponlick' for a tooltip on click.
-		$tmptooltip = explode(':', $tooltip);
+		// You can also use 'TranslationString:keyfortooltiponclick' for a tooltip on click.
+		if (preg_match('/:\w+$/', $tooltip)) {
+			$tmptooltip = explode(':', $tooltip);
+		} else {
+			$tmptooltip = array($tooltip);
+		}
 		$out .= $form->textwithpicto($langs->trans($name), $langs->trans($tmptooltip[0]), 1, 'help', '', 0, 3, (empty($tmptooltip[1]) ? '' : 'extra_'.str_replace('.', '_', $field).'_'.$tmptooltip[1]));
 	} else {
 		$out .= $langs->trans($name);
diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index cbec6cfc5ea..d82631cc8fa 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -1767,7 +1767,7 @@ DetailMenuHandler=Menu handler where to show new menu
 DetailMenuModule=Module name if menu entry come from a module
 DetailType=Type of menu (top or left)
 DetailTitre=Menu label or label code for translation
-DetailUrl=URL where menu send you (Absolute URL link or external link with http://)
+DetailUrl=URL where menu send you (Relative URL link or external link with https://)
 DetailEnabled=Condition to show or not entry
 DetailRight=Condition to display unauthorized grey menus
 DetailLangs=Lang file name for label code translation
diff --git a/htdocs/langs/en_US/modulebuilder.lang b/htdocs/langs/en_US/modulebuilder.lang
index cab8fa37f16..53e60fa0fbd 100644
--- a/htdocs/langs/en_US/modulebuilder.lang
+++ b/htdocs/langs/en_US/modulebuilder.lang
@@ -50,6 +50,7 @@ PathToModulePackage=Path to zip of module/application package
 PathToModuleDocumentation=Path to file of module/application documentation (%s)
 SpaceOrSpecialCharAreNotAllowed=Spaces or special characters are not allowed.
 FileNotYetGenerated=File not yet generated
+GenerateCode=Generate code
 RegenerateClassAndSql=Force update of .class and .sql files
 RegenerateMissingFiles=Generate missing files
 SpecificationFile=File of documentation
diff --git a/htdocs/modulebuilder/index.php b/htdocs/modulebuilder/index.php
index 81da2909779..7e086887a37 100644
--- a/htdocs/modulebuilder/index.php
+++ b/htdocs/modulebuilder/index.php
@@ -2090,10 +2090,12 @@ if ($module == 'initmodule') {
 	//print '<span class="opacitymedium">'.$langs->trans("ModuleBuilderDesc2", 'conf/conf.php', $newdircustom).'</span><br>';
 	print '<br>';
 
-	print '<span class="opacitymedium">'.$langs->trans("ModuleName").'</span> <input type="text" name="modulename" value="'.dol_escape_htmltag($modulename).'" autofocus>';
-	print ' '.$form->textwithpicto('', $langs->trans("EnterNameOfModuleDesc")).'<br>';
+	print '<div class="tagtable">';
 
-	print '<span class="opacitymedium">'.$langs->trans("IdModule").'</span> <input type="text" name="idmodule" class="width75" value="500000" placeholder="'.dol_escape_htmltag($langs->trans("IdModule")).'">';
+	print '<div class="tagtr"><div class="tagtd">';
+	print '<span class="opacitymedium">'.$langs->trans("IdModule").'</span>';
+	print '</div><div class="tagtd">';
+	print '<input type="text" name="idmodule" class="width75" value="500000" placeholder="'.dol_escape_htmltag($langs->trans("IdModule")).'">';
 	print '<span class="opacitymedium">';
 	print ' &nbsp; (';
 	print dolButtonToOpenUrlInDialogPopup('popup_modules_id', $langs->transnoentitiesnoconv("SeeIDsInUse"), $langs->transnoentitiesnoconv("SeeIDsInUse"), '/admin/system/modules.php?mainmenu=home&leftmenu=admintools_info', '', '');
@@ -2101,9 +2103,30 @@ if ($module == 'initmodule') {
 	print '<a href="https://wiki.dolibarr.org/index.php/List_of_modules_id" target="_blank" rel="noopener noreferrer external">'.$langs->trans("SeeReservedIDsRangeHere").'</a>';
 	print ')';
 	print '</span>';
-	print '<br>';
-	print '<span class="opacitymedium">'.$langs->trans("Version").'</span> <input type="text" name="version" class="width75" value="1.0" placeholder="'.dol_escape_htmltag($langs->trans("Version")).'"><br>';
-	print '<span class="opacitymedium">'.$langs->trans("Family").'</span> ';
+	print '</div></div>';
+
+	print '<div class="tagtr"><div class="tagtd">';
+	print '<span class="opacitymedium">'.$langs->trans("ModuleName").'</span>';
+	print '</div><div class="tagtd">';
+	print '<input type="text" name="modulename" value="'.dol_escape_htmltag($modulename).'" autofocus>';
+	print ' '.$form->textwithpicto('', $langs->trans("EnterNameOfModuleDesc"));
+	print '</div></div>';
+
+	print '<div class="tagtr"><div class="tagtd">';
+	print '<span class="opacitymedium">'.$langs->trans("Description").'</span>';
+	print '</div><div class="tagtd">';
+	print '<input type="text" name="description" value="" class="minwidth500"><br>';
+	print '</div></div>';
+
+	print '<div class="tagtr"><div class="tagtd">';
+	print '<span class="opacitymedium">'.$langs->trans("Version").'</span>';
+	print '</div><div class="tagtd">';
+	print '<input type="text" name="version" class="width75" value="1.0" placeholder="'.dol_escape_htmltag($langs->trans("Version")).'">';
+	print '</div></div>';
+
+	print '<div class="tagtr"><div class="tagtd">';
+	print '<span class="opacitymedium">'.$langs->trans("Family").'</span>';
+	print '</div><div class="tagtd">';
 	print '<select name="family" id="family" class="minwidth400">';
 	print '<option value="hr">'.$langs->trans("ModuleFamilyHr").'</option>';
 	print '<option value="crm">'.$langs->trans("ModuleFamilyCrm").'</option>';
@@ -2117,15 +2140,28 @@ if ($module == 'initmodule') {
 	print '<option value="interface">'.$langs->trans("ModuleFamilyInterface").'</option>';
 	print '<option value="base">'.$langs->trans("ModuleFamilyBase").'</option>';
 	print '<option value="other" selected="">'.$langs->trans("ModuleFamilyOther").'</option>';
-	print '</select><br>';
+	print '</select>';
 	print ajax_combobox("family");
-	print '<span class="opacitymedium">'.$langs->trans("Picto").'</span> <input type="text" name="idpicto" value="fa-generic" placeholder="'.dol_escape_htmltag($langs->trans("Picto")).'">';
-	print $form->textwithpicto('', $langs->trans("Example").': fa-generic, fa-globe, ... any font awesome code.<br>Advanced syntax is fa-fakey[_faprefix[_facolor[_fasize]]]');
-	print '<br>';
-	print '<span class="opacitymedium">'.$langs->trans("Description").'</span> <input type="text" name="description" value="" class="minwidth500"><br>';
+	print '</div></div>';
 
-	print '<span class="opacitymedium">'.$langs->trans("EditorName").'</span> <input type="text" name="editorname" value="'.$mysoc->name.'" placeholder="'.dol_escape_htmltag($langs->trans("EditorName")).'"><br>';
-	print '<span class="opacitymedium">'.$langs->trans("EditorUrl").'</span> <input type="text" name="editorurl" value="'.$mysoc->url.'" placeholder="'.dol_escape_htmltag($langs->trans("EditorUrl")).'"><br>';
+	print '<div class="tagtr"><div class="tagtd">';
+	print '<span class="opacitymedium">'.$langs->trans("Picto").'</span>';
+	print '</div><div class="tagtd">';
+	print '<input type="text" name="idpicto" value="fa-generic" placeholder="'.dol_escape_htmltag($langs->trans("Picto")).'">';
+	print $form->textwithpicto('', $langs->trans("Example").': fa-generic, fa-globe, ... any font awesome code.<br>Advanced syntax is fa-fakey[_faprefix[_facolor[_fasize]]]');
+	print '</div></div>';
+
+	print '<div class="tagtr"><div class="tagtd">';
+	print '<span class="opacitymedium">'.$langs->trans("EditorName").'</span>';
+	print '</div><div class="tagtd">';
+	print '<input type="text" name="editorname" value="'.$mysoc->name.'" placeholder="'.dol_escape_htmltag($langs->trans("EditorName")).'"><br>';
+	print '</div></div>';
+
+	print '<div class="tagtr"><div class="tagtd">';
+	print '<span class="opacitymedium">'.$langs->trans("EditorUrl").'</span>';
+	print '</div><div class="tagtd">';
+	print '<input type="text" name="editorurl" value="'.$mysoc->url.'" placeholder="'.dol_escape_htmltag($langs->trans("EditorUrl")).'"><br>';
+	print '</div></div>';
 
 	print '<br><input type="submit" class="button" name="create" value="'.dol_escape_htmltag($langs->trans("Create")).'"'.($dirins ? '' : ' disabled="disabled"').'>';
 	print '</form>';
@@ -2273,7 +2309,7 @@ if ($module == 'initmodule') {
 				print '</table>';
 				print '<br>';
 
-				print load_fiche_titre($form->textwithpicto($langs->trans("DescriptorFile"), $pathtofile), '', '');
+				print load_fiche_titre($form->textwithpicto($langs->trans("DescriptorFile"), $langs->transnoentitiesnoconv("File").' '.$pathtofile), '', '');
 
 				if (!empty($moduleobj)) {
 					print '<div class="underbanner clearboth"></div>';
@@ -2287,7 +2323,7 @@ if ($module == 'initmodule') {
 					print '</td></tr>';
 
 					print '<tr><td>';
-					print $langs->trans("Numero");
+					print $langs->trans("IdModule");
 					print '</td><td>';
 					print $moduleobj->numero;
 					print '<span class="opacitymedium">';
@@ -2297,11 +2333,17 @@ if ($module == 'initmodule') {
 					print '</td></tr>';
 
 					print '<tr><td>';
-					print $langs->trans("Name");
+					print $langs->trans("ModuleName");
 					print '</td><td>';
 					print $moduleobj->getName();
 					print '</td></tr>';
 
+					print '<tr><td>';
+					print $langs->trans("Description");
+					print '</td><td>';
+					print $moduleobj->getDesc();
+					print '</td></tr>';
+
 					print '<tr><td>';
 					print $langs->trans("Version");
 					print '</td><td>';
@@ -2322,12 +2364,6 @@ if ($module == 'initmodule') {
 					print ' &nbsp; '.img_picto('', $moduleobj->picto, 'class="valignmiddle pictomodule paddingrightonly"');
 					print '</td></tr>';
 
-					print '<tr><td>';
-					print $langs->trans("Description");
-					print '</td><td>';
-					print $moduleobj->getDesc();
-					print '</td></tr>';
-
 					print '<tr><td>';
 					print $langs->trans("EditorName");
 					print '</td><td>';
@@ -2351,7 +2387,7 @@ if ($module == 'initmodule') {
 					print '<br><br>';
 
 					// Readme file
-					print load_fiche_titre($form->textwithpicto($langs->trans("ReadmeFile"), $pathtofilereadme), '', '');
+					print load_fiche_titre($form->textwithpicto($langs->trans("ReadmeFile"), $langs->transnoentitiesnoconv("File").' '.$pathtofilereadme), '', '');
 
 					print '<!-- readme file -->';
 					if (dol_is_file($dirread.'/'.$pathtofilereadme)) {
@@ -2363,7 +2399,7 @@ if ($module == 'initmodule') {
 					print '<br><br>';
 
 					// ChangeLog
-					print load_fiche_titre($form->textwithpicto($langs->trans("ChangeLog"), $pathtochangelog), '', '');
+					print load_fiche_titre($form->textwithpicto($langs->trans("ChangeLog"), $langs->transnoentitiesnoconv("File").' '.$pathtochangelog), '', '');
 
 					print '<!-- changelog file -->';
 					if (dol_is_file($dirread.'/'.$pathtochangelog)) {
@@ -2555,7 +2591,7 @@ if ($module == 'initmodule') {
 				print '<input type="text" name="objectname" maxlength="64" value="'.dol_escape_htmltag(GETPOST('objectname', 'alpha') ? GETPOST('objectname', 'alpha') : $modulename).'" placeholder="'.dol_escape_htmltag($langs->trans("ObjectKey")).'" autofocus><br>';
 				print '<input type="checkbox" name="includerefgeneration" id="includerefgeneration" value="includerefgeneration"> <label for="includerefgeneration">'.$form->textwithpicto($langs->trans("IncludeRefGeneration"), $langs->trans("IncludeRefGenerationHelp")).'</label><br>';
 				print '<input type="checkbox" name="includedocgeneration" id="includedocgeneration" value="includedocgeneration"> <label for="includedocgeneration">'.$form->textwithpicto($langs->trans("IncludeDocGeneration"), $langs->trans("IncludeDocGenerationHelp")).'</label><br>';
-				print '<input type="submit" class="button smallpaddingimp" name="create" value="'.dol_escape_htmltag($langs->trans("Generate")).'"'.($dirins ? '' : ' disabled="disabled"').'>';
+				print '<input type="submit" class="button smallpaddingimp" name="create" value="'.dol_escape_htmltag($langs->trans("GenerateCode")).'"'.($dirins ? '' : ' disabled="disabled"').'>';
 				print '<br>';
 				print '<br>';
 				print '<br>';
@@ -2565,7 +2601,7 @@ if ($module == 'initmodule') {
 				//print '<input type="checkbox" name="initfromtablecheck"> ';
 				print $langs->trans("InitStructureFromExistingTable");
 				print '<input type="text" name="initfromtablename" value="" placeholder="'.$langs->trans("TableName").'">';
-				print '<input type="submit" class="button smallpaddingimp" name="createtablearray" value="'.dol_escape_htmltag($langs->trans("Generate")).'"'.($dirins ? '' : ' disabled="disabled"').'>';
+				print '<input type="submit" class="button smallpaddingimp" name="createtablearray" value="'.dol_escape_htmltag($langs->trans("GenerateCode")).'"'.($dirins ? '' : ' disabled="disabled"').'>';
 				print '<br>';
 
 				print '</form>';
@@ -3373,7 +3409,7 @@ if ($module == 'initmodule') {
 					print '<input type="text" name="dicname" maxlength="64" value="'.dol_escape_htmltag(GETPOST('dicname', 'alpha') ? GETPOST('dicname', 'alpha') : $modulename).'" placeholder="'.dol_escape_htmltag($langs->trans("DicKey")).'" autofocus><br>';
 					//print '<input type="checkbox" name="includerefgeneration" id="includerefgeneration" value="includerefgeneration"> <label for="includerefgeneration">'.$form->textwithpicto($langs->trans("IncludeRefGeneration"), $langs->trans("IncludeRefGenerationHelp")).'</label><br>';
 					//print '<input type="checkbox" name="includedocgeneration" id="includedocgeneration" value="includedocgeneration"> <label for="includedocgeneration">'.$form->textwithpicto($langs->trans("IncludeDocGeneration"), $langs->trans("IncludeDocGenerationHelp")).'</label><br>';
-					print '<input type="submit" class="button smallpaddingimp" name="create" value="'.dol_escape_htmltag($langs->trans("Generate")).'"'.($dirins ? '' : ' disabled="disabled"').'>';
+					print '<input type="submit" class="button smallpaddingimp" name="create" value="'.dol_escape_htmltag($langs->trans("GenerateCode")).'"'.($dirins ? '' : ' disabled="disabled"').'>';
 					/*print '<br>';
 					print '<br>';
 					print '<br>';
@@ -3383,7 +3419,7 @@ if ($module == 'initmodule') {
 					//print '<input type="checkbox" name="initfromtablecheck"> ';
 					print $langs->trans("InitStructureFromExistingTable");
 					print '<input type="text" name="initfromtablename" value="" placeholder="'.$langs->trans("TableName").'">';
-					print '<input type="submit" class="button smallpaddingimp" name="createtablearray" value="'.dol_escape_htmltag($langs->trans("Generate")).'"'.($dirins ? '' : ' disabled="disabled"').'>';
+					print '<input type="submit" class="button smallpaddingimp" name="createtablearray" value="'.dol_escape_htmltag($langs->trans("GenerateCode")).'"'.($dirins ? '' : ' disabled="disabled"').'>';
 					print '<br>';
 					*/
 					print '</form>';
@@ -3464,18 +3500,18 @@ if ($module == 'initmodule') {
 
 				print '<tr class="liste_titre">';
 				print_liste_field_titre("#", $_SERVER["PHP_SELF"], '', "", $param, '', $sortfield, $sortorder, 'thsticky ');
-				print_liste_field_titre("Type", $_SERVER["PHP_SELF"], '', "", $param, '', $sortfield, $sortorder);
+				print_liste_field_titre("Position", $_SERVER["PHP_SELF"], '', "", $param, '', $sortfield, $sortorder);
 				print_liste_field_titre("LinkToParentMenu", $_SERVER["PHP_SELF"], '', "", $param, '', $sortfield, $sortorder);
 				print_liste_field_titre("Title", $_SERVER["PHP_SELF"], '', "", $param, '', $sortfield, $sortorder);
 				print_liste_field_titre("mainmenu", $_SERVER["PHP_SELF"], '', "", $param, '', $sortfield, $sortorder);
 				print_liste_field_titre("leftmenu", $_SERVER["PHP_SELF"], '', "", $param, '', $sortfield, $sortorder);
-				print_liste_field_titre("RelativeURL", $_SERVER["PHP_SELF"], '', "", $param, '', $sortfield, $sortorder);
+				print_liste_field_titre("URL", $_SERVER["PHP_SELF"], '', "", $param, '', $sortfield, $sortorder, '', $langs->transnoentitiesnoconv('DetailUrl'));
 				print_liste_field_titre("LanguageFile", $_SERVER["PHP_SELF"], '', "", $param, '', $sortfield, $sortorder);
 				print_liste_field_titre("Position", $_SERVER["PHP_SELF"], '', "", $param, '', $sortfield, $sortorder, 'right ');
-				print_liste_field_titre("Enabled", $_SERVER["PHP_SELF"], '', "", $param, '', $sortfield, $sortorder, 'center ');
-				print_liste_field_titre("Permission", $_SERVER["PHP_SELF"], '', "", $param, '', $sortfield, $sortorder);
-				print_liste_field_titre("Target", $_SERVER["PHP_SELF"], '', "", $param, '', $sortfield, $sortorder);
-				print_liste_field_titre("UserType", $_SERVER["PHP_SELF"], '', "", $param, '', $sortfield, $sortorder, 'right ');
+				print_liste_field_titre("Enabled", $_SERVER["PHP_SELF"], '', "", $param, '', $sortfield, $sortorder, 'center ', $langs->trans('DetailEnabled'));
+				print_liste_field_titre("Rights", $_SERVER["PHP_SELF"], '', "", $param, '', $sortfield, $sortorder, '', $langs->trans('DetailRight'));
+				print_liste_field_titre("Target", $_SERVER["PHP_SELF"], '', "", $param, '', $sortfield, $sortorder, '', $langs->trans('DetailTarget'));
+				print_liste_field_titre("MenuForUsers", $_SERVER["PHP_SELF"], '', "", $param, '', $sortfield, $sortorder, 'right ', $langs->trans('DetailUser'));
 				print "</tr>\n";
 
 				if (count($menus)) {
@@ -3534,7 +3570,15 @@ if ($module == 'initmodule') {
 						print '</td>';
 
 						print '<td class="right">';
-						print dol_escape_htmltag($menu['user']);
+						if ($menu['user'] == 2) {
+							print $langs->trans("AllMenus");
+						} elseif ($menu['user'] == 0) {
+							print $langs->trans('Internal');
+						} elseif ($menu['user'] == 1) {
+							print $langs->trans('External');
+						} else {
+							print $menu['user']; // should not happen
+						}
 						print '</td>';
 
 						print '</tr>';

From 13260bb973db62184fec38ec6cef55e972149a7b Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 7 Sep 2022 15:51:19 +0200
Subject: [PATCH 744/974] Merge

---
 htdocs/core/modules/mailings/thirdparties.modules.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/htdocs/core/modules/mailings/thirdparties.modules.php b/htdocs/core/modules/mailings/thirdparties.modules.php
index 1d7acf02c09..335e3ac575a 100644
--- a/htdocs/core/modules/mailings/thirdparties.modules.php
+++ b/htdocs/core/modules/mailings/thirdparties.modules.php
@@ -317,11 +317,11 @@ class mailing_thirdparties extends MailingTargets
 		$s .= ajax_combobox("filter_status_thirdparties");
 
 		if (!empty($conf->global->MAIN_MULTILANGS)) {
-		// Choose language
-		require_once DOL_DOCUMENT_ROOT.'/core/class/html.formadmin.class.php';
-		$formadmin = new FormAdmin($this->db);
-		$s .= '<span class="opacitymedium">'.$langs->trans("DefaultLang").':</span> ';
-		$s .= $formadmin->select_language($langs->getDefaultLang(1), 'filter_lang_thirdparties', 0, null, 1, 0, 0, '', 0, 0, 0, null, 1);
+			// Choose language
+			require_once DOL_DOCUMENT_ROOT.'/core/class/html.formadmin.class.php';
+			$formadmin = new FormAdmin($this->db);
+			$s .= '<span class="opacitymedium">'.$langs->trans("DefaultLang").':</span> ';
+			$s .= $formadmin->select_language($langs->getDefaultLang(1), 'filter_lang_thirdparties', 0, null, 1, 0, 0, '', 0, 0, 0, null, 1);
 		}
 
 		return $s;

From bed495fc62a53842b9ac72db83959b6ca0fb29c6 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 7 Sep 2022 16:05:00 +0200
Subject: [PATCH 745/974] Trans

---
 htdocs/langs/en_US/modulebuilder.lang | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/langs/en_US/modulebuilder.lang b/htdocs/langs/en_US/modulebuilder.lang
index 53e60fa0fbd..a16dfc52ed2 100644
--- a/htdocs/langs/en_US/modulebuilder.lang
+++ b/htdocs/langs/en_US/modulebuilder.lang
@@ -89,8 +89,8 @@ ListOfMenusEntries=List of menu entries
 ListOfDictionariesEntries=List of dictionaries entries
 ListOfPermissionsDefined=List of defined permissions
 SeeExamples=See examples here
-EnabledDesc=Condition to have this field active (Examples: 1 or $conf->global->MYMODULE_MYOPTION)
-VisibleDesc=Is the field visible ? (Examples: 0=Never visible, 1=Visible on list and create/update/view forms, 2=Visible on list only, 3=Visible on create/update/view form only (not list), 4=Visible on list and update/view form only (not create), 5=Visible on list end view form only (not create, not update).<br><br>Using a negative value means field is not shown by default on list but can be selected for viewing).<br><br>It can be an expression, for example:<br>preg_match('/public/', $_SERVER['PHP_SELF'])?0:1<br>($user->rights->holiday->define_holiday ? 1 : 0)
+EnabledDesc=Condition to have this field active.<br><br>Examples:<br>1<br>isModEnabled('MAIN_MODULE_MYMODULE')<br>getDolGlobalString('MYMODULE_OPTION')==2
+VisibleDesc=Is the field visible ? (Examples: 0=Never visible, 1=Visible on list and create/update/view forms, 2=Visible on list only, 3=Visible on create/update/view form only (not list), 4=Visible on list and update/view form only (not create), 5=Visible on list end view form only (not create, not update).<br><br>Using a negative value means field is not shown by default on list but can be selected for viewing).<br><br>It can be an expression, for example:<br>preg_match('/public/', $_SERVER['PHP_SELF'])?0:1<br>$user->hasRights('holiday', 'define_holiday')?1:5
 DisplayOnPdfDesc=Display this field on compatible PDF documents, you can manage position with "Position" field.<br>Currently, known compatibles PDF models are : eratosthene (order), espadon (ship), sponge (invoices), cyan (propal/quotation), cornas (supplier order)<br><br><strong>For document :</strong><br>0 = not displayed <br>1 = display<br>2 = display only if not empty<br><br><strong>For document lines :</strong><br>0 = not displayed <br>1 = displayed in a column<br>3 = display in line description column after the description<br>4 = display in description column after the description only if not empty
 DisplayOnPdf=Display on PDF
 IsAMeasureDesc=Can the value of field be cumulated to get a total into list? (Examples: 1 or 0)

From 9569d0462e51cd72ce825da4de3f5f0ac2047bb0 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 7 Sep 2022 16:25:06 +0200
Subject: [PATCH 746/974] Clean code

---
 htdocs/admin/menus/edit.php                | 17 ++++++++++-------
 htdocs/core/class/html.formadmin.class.php |  2 ++
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/htdocs/admin/menus/edit.php b/htdocs/admin/menus/edit.php
index 64c3f4a7015..d619cd28e91 100644
--- a/htdocs/admin/menus/edit.php
+++ b/htdocs/admin/menus/edit.php
@@ -305,7 +305,7 @@ if ($action == 'create') {
 	print '<td>'.$langs->trans('DetailUser').'</td></tr>';
 
 	// Type
-	print '<tr><td class="fieldrequired">'.$langs->trans('Type').'</td><td>';
+	print '<tr><td class="fieldrequired">'.$langs->trans('Position').'</td><td>';
 	if ($parent_rowid) {
 		print $langs->trans('Left');
 		print '<input type="hidden" name="type" value="left">';
@@ -315,6 +315,7 @@ if ($action == 'create') {
 		print '<option value="top"'.(GETPOST("type") == 'top' ? ' selected' : '').'>'.$langs->trans('Top').'</option>';
 		print '<option value="left"'.(GETPOST("type") == 'left' ? ' selected' : '').'>'.$langs->trans('Left').'</option>';
 		print '</select>';
+		print ajax_combobox('topleft');
 	}
 	print '</td><td>'.$langs->trans('DetailType').'</td></tr>';
 
@@ -352,12 +353,6 @@ if ($action == 'create') {
 	print '<tr><td>'.$langs->trans('Position').'</td>';
 	print '<td><input type="text" class="width100" name="position" value="'.dol_escape_htmltag(GETPOSTISSET("position") ? GETPOST("position", 'int') : 100).'"></td><td>'.$langs->trans('DetailPosition').'</td></tr>';
 
-	// Target
-	print '<tr><td>'.$langs->trans('Target').'</td><td><select class="flat" name="target">';
-	print '<option value=""'.(isset($menu->target) && $menu->target == "" ? ' selected' : '').'>&nbsp;</option>';
-	print '<option value="_blank"'.(isset($menu->target) && $menu->target == "_blank" ? ' selected' : '').'>'.$langs->trans('_blank').'</option>';
-	print '</select></td></td><td>'.$langs->trans('DetailTarget').'</td></tr>';
-
 	// Enabled
 	print '<tr><td>'.$langs->trans('Enabled').'</td>';
 	print '<td><input type="text" class="minwidth500" name="enabled" value="'.(GETPOSTISSET('enabled') ? GETPOST("enabled", 'alphanohtml') : '1').'"></td><td>'.$langs->trans('DetailEnabled').'</td></tr>';
@@ -366,6 +361,14 @@ if ($action == 'create') {
 	print '<tr><td>'.$langs->trans('Rights').'</td>';
 	print '<td><input type="text" class="minwidth500" name="perms" value="'.(GETPOSTISSET('perms') ? GETPOST('perms', 'alphanohtml') : '1').'"></td><td>'.$langs->trans('DetailRight').'</td></tr>';
 
+	// Target
+	print '<tr><td>'.$langs->trans('Target').'</td><td><select class="flat" name="target" id="target">';
+	print '<option value=""'.(isset($menu->target) && $menu->target == "" ? ' selected' : '').'>&nbsp;</option>';
+	print '<option value="_blank"'.(isset($menu->target) && $menu->target == "_blank" ? ' selected' : '').'>'.$langs->trans('_blank').'</option>';
+	print '</select>';
+	print ajax_combobox("target");
+	print '</td></td><td>'.$langs->trans('DetailTarget').'</td></tr>';
+
 	print '</table>';
 
 	print dol_get_fiche_end();
diff --git a/htdocs/core/class/html.formadmin.class.php b/htdocs/core/class/html.formadmin.class.php
index 1c4a18a9c1f..a0d0dd2758e 100644
--- a/htdocs/core/class/html.formadmin.class.php
+++ b/htdocs/core/class/html.formadmin.class.php
@@ -343,6 +343,8 @@ class FormAdmin
 			print '</option>'."\n";
 		}
 		print '</select>';
+
+		print ajax_combobox($htmlname);
 	}
 
 

From 9835469a02efd96a210482c5ff9db4eec2f8080f Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 7 Sep 2022 16:27:31 +0200
Subject: [PATCH 747/974] Update propal.class.php

---
 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 cd56fac3e7b..e2b128f8cd0 100644
--- a/htdocs/comm/propal/class/propal.class.php
+++ b/htdocs/comm/propal/class/propal.class.php
@@ -384,7 +384,7 @@ class Propal extends CommonObject
 		$this->socid = $socid;
 		$this->id = $propalid;
 
-		$this->duree_validite = isset($conf->global->PROPALE_VALIDITY_DURATION)?((int) $conf->global->PROPALE_VALIDITY_DURATION):0;
+		$this->duree_validite = getDolGlobalInt('PROPALE_VALIDITY_DURATION', 0);
 	}
 
 

From 9d4bc513be3ff8740caa33b1deb304f1233a7352 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 7 Sep 2022 16:39:19 +0200
Subject: [PATCH 748/974] Fix regression

---
 htdocs/core/boxes/box_activity.php            |  2 +-
 .../core/boxes/box_dolibarr_state_board.php   |  2 +-
 htdocs/core/boxes/box_propales.php            |  2 +-
 htdocs/core/menus/standard/eldy.lib.php       | 22 +++++++++----------
 htdocs/index.php                              |  2 +-
 htdocs/user/class/user.class.php              |  1 +
 6 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/htdocs/core/boxes/box_activity.php b/htdocs/core/boxes/box_activity.php
index 017c5fe3d02..fb0a60b567f 100644
--- a/htdocs/core/boxes/box_activity.php
+++ b/htdocs/core/boxes/box_activity.php
@@ -64,7 +64,7 @@ class box_activity extends ModeleBoxes
 
 		$this->hidden = !((isModEnabled('facture') && $user->hasRight('facture', 'read'))
 			|| (isModEnabled('commande') && $user->hasRight('commande', 'read'))
-			|| (isModEnabled('propal') && $user->hasRight('propale', 'read'))
+			|| (isModEnabled('propal') && $user->hasRight('propal', 'read'))
 			);
 	}
 
diff --git a/htdocs/core/boxes/box_dolibarr_state_board.php b/htdocs/core/boxes/box_dolibarr_state_board.php
index a979e3e5a36..1efd1d27f95 100644
--- a/htdocs/core/boxes/box_dolibarr_state_board.php
+++ b/htdocs/core/boxes/box_dolibarr_state_board.php
@@ -124,7 +124,7 @@ class box_dolibarr_state_board extends ModeleBoxes
 				'contacts' => isModEnabled('societe') && $user->hasRight('societe', 'contact', 'lire'),
 				'products' => isModEnabled('product') && $user->hasRight('produit', 'lire'),
 				'services' => isModEnabled('service') && $user->hasRight('service', 'lire'),
-				'proposals' => isModEnabled('propal') && $user->hasRight('propale', 'lire'),
+				'proposals' => isModEnabled('propal') && $user->hasRight('propal', 'read'),
 				'orders' => isModEnabled('commande') && $user->hasRight('commande', 'lire'),
 				'invoices' => isModEnabled('facture') && $user->hasRight('facture', 'lire'),
 				'donations' => isModEnabled('don') && $user->hasRight('don', 'lire'),
diff --git a/htdocs/core/boxes/box_propales.php b/htdocs/core/boxes/box_propales.php
index 8e8efc8d8f3..7114fdb5399 100644
--- a/htdocs/core/boxes/box_propales.php
+++ b/htdocs/core/boxes/box_propales.php
@@ -61,7 +61,7 @@ class box_propales extends ModeleBoxes
 
 		$this->db = $db;
 
-		$this->hidden = !($user->hasRight('propale', 'lire'));
+		$this->hidden = !($user->hasRight('propal', 'read'));
 	}
 
 	/**
diff --git a/htdocs/core/menus/standard/eldy.lib.php b/htdocs/core/menus/standard/eldy.lib.php
index 66f85c3739c..a1b505da46a 100644
--- a/htdocs/core/menus/standard/eldy.lib.php
+++ b/htdocs/core/menus/standard/eldy.lib.php
@@ -234,7 +234,7 @@ function print_eldy_menu($db, $atarget, $type_user, &$tabMenu, &$menu, $noout =
 			|| isModEnabled('contrat')
 			|| isModEnabled('ficheinter')
 			) ? 1 : 0,
-		'perms'=>($user->hasRight('propal',  'lire')
+		'perms'=>($user->hasRight('propal',  'read')
 			|| $user->hasRight('commande',  'lire')
 			|| $user->hasRight('supplier_proposal',  'lire')
 			|| $user->hasRight('fournisseur',  'lire')
@@ -1294,18 +1294,18 @@ function get_left_menu_commercial($mainmenu, &$newmenu, $usemenuhider = 1, $left
 		// Customer proposal
 		if (isModEnabled('propal')) {
 			$langs->load("propal");
-			$newmenu->add("/comm/propal/index.php?leftmenu=propals", $langs->trans("Proposals"), 0, $user->hasRight('propale',  'lire'), '', $mainmenu, 'propals', 100, '', '', '', img_picto('', 'propal', 'class="paddingright pictofixedwidth"'));
-			$newmenu->add("/comm/propal/card.php?action=create&amp;leftmenu=propals", $langs->trans("NewPropal"), 1, $user->hasRight('propale',  'creer'));
-			$newmenu->add("/comm/propal/list.php?leftmenu=propals", $langs->trans("List"), 1, $user->hasRight('propale',  'lire'));
+			$newmenu->add("/comm/propal/index.php?leftmenu=propals", $langs->trans("Proposals"), 0, $user->hasRight('propal',  'read'), '', $mainmenu, 'propals', 100, '', '', '', img_picto('', 'propal', 'class="paddingright pictofixedwidth"'));
+			$newmenu->add("/comm/propal/card.php?action=create&amp;leftmenu=propals", $langs->trans("NewPropal"), 1, $user->hasRight('propal',  'write'));
+			$newmenu->add("/comm/propal/list.php?leftmenu=propals", $langs->trans("List"), 1, $user->hasRight('propal',  'read'));
 			if ($usemenuhider || empty($leftmenu) || $leftmenu == "propals") {
-				$newmenu->add("/comm/propal/list.php?leftmenu=propals&search_status=0", $langs->trans("PropalsDraft"), 2, $user->hasRight('propale',  'lire'));
-				$newmenu->add("/comm/propal/list.php?leftmenu=propals&search_status=1", $langs->trans("PropalsOpened"), 2, $user->hasRight('propale',  'lire'));
-				$newmenu->add("/comm/propal/list.php?leftmenu=propals&search_status=2", $langs->trans("PropalStatusSigned"), 2, $user->hasRight('propale',  'lire'));
-				$newmenu->add("/comm/propal/list.php?leftmenu=propals&search_status=3", $langs->trans("PropalStatusNotSigned"), 2, $user->hasRight('propale',  'lire'));
-				$newmenu->add("/comm/propal/list.php?leftmenu=propals&search_status=4", $langs->trans("PropalStatusBilled"), 2, $user->hasRight('propale',  'lire'));
-				//$newmenu->add("/comm/propal/list.php?leftmenu=propals&search_status=2,3,4", $langs->trans("PropalStatusClosedShort"), 2, $user->hasRight('propale',  'lire'));
+				$newmenu->add("/comm/propal/list.php?leftmenu=propals&search_status=0", $langs->trans("PropalsDraft"), 2, $user->hasRight('propal',  'read'));
+				$newmenu->add("/comm/propal/list.php?leftmenu=propals&search_status=1", $langs->trans("PropalsOpened"), 2, $user->hasRight('propal',  'read'));
+				$newmenu->add("/comm/propal/list.php?leftmenu=propals&search_status=2", $langs->trans("PropalStatusSigned"), 2, $user->hasRight('propal',  'read'));
+				$newmenu->add("/comm/propal/list.php?leftmenu=propals&search_status=3", $langs->trans("PropalStatusNotSigned"), 2, $user->hasRight('propal',  'read'));
+				$newmenu->add("/comm/propal/list.php?leftmenu=propals&search_status=4", $langs->trans("PropalStatusBilled"), 2, $user->hasRight('propal',  'read'));
+				//$newmenu->add("/comm/propal/list.php?leftmenu=propals&search_status=2,3,4", $langs->trans("PropalStatusClosedShort"), 2, $user->hasRight('propal',  'read'));
 			}
-			$newmenu->add("/comm/propal/stats/index.php?leftmenu=propals", $langs->trans("Statistics"), 1, $user->hasRight('propale',  'lire'));
+			$newmenu->add("/comm/propal/stats/index.php?leftmenu=propals", $langs->trans("Statistics"), 1, $user->hasRight('propal',  'read'));
 		}
 
 		// Customers orders
diff --git a/htdocs/index.php b/htdocs/index.php
index 2a0a163f44e..97b82fb93ba 100644
--- a/htdocs/index.php
+++ b/htdocs/index.php
@@ -176,7 +176,7 @@ if (empty($conf->global->MAIN_DISABLE_GLOBAL_WORKBOARD)) {
 	}
 
 	// Number of commercial customer proposals open (expired)
-	if (isModEnabled('propal')  && empty($conf->global->MAIN_DISABLE_BLOCK_CUSTOMER) && $user->hasRight('propale', 'lire')) {
+	if (isModEnabled('propal') && empty($conf->global->MAIN_DISABLE_BLOCK_CUSTOMER) && $user->hasRight('propal', 'read')) {
 		include_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php';
 		$board = new Propal($db);
 		$dashboardlines[$board->element.'_opened'] = $board->load_board($user, "opened");
diff --git a/htdocs/user/class/user.class.php b/htdocs/user/class/user.class.php
index 54f1cbe4fc9..a09811b21fc 100644
--- a/htdocs/user/class/user.class.php
+++ b/htdocs/user/class/user.class.php
@@ -713,6 +713,7 @@ class User extends CommonObject
 			'order' => 'commande',
 			//'product' => 'produit',	// We must check $user->rights->produit...
 			'project' => 'projet',
+			'propale' => 'propal',
 			'shipping' => 'expedition',
 			'task' => 'task@projet',
 			'fichinter' => 'ficheinter',

From 46925dc9c41740987673a03dba47308d3c7adb38 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 7 Sep 2022 17:02:08 +0200
Subject: [PATCH 749/974] CSS

---
 htdocs/comm/propal/card.php           | 133 +-------------------------
 htdocs/core/class/html.form.class.php |   3 +-
 2 files changed, 7 insertions(+), 129 deletions(-)

diff --git a/htdocs/comm/propal/card.php b/htdocs/comm/propal/card.php
index 21a9612c829..52e2f9beb83 100644
--- a/htdocs/comm/propal/card.php
+++ b/htdocs/comm/propal/card.php
@@ -2061,129 +2061,6 @@ if ($action == 'create') {
 
 		$deposit_percent_from_payment_terms = getDictionaryValue('c_payment_term', 'deposit_percent', $object->cond_reglement_id);
 
-		if (! empty($deposit_percent_from_payment_terms) && ! empty($conf->facture->enabled) && ! empty($user->rights->facture->creer)) {
-			require_once DOL_DOCUMENT_ROOT . '/compta/facture/class/facture.class.php';
-
-			$object->fetchObjectLinked();
-
-			$eligibleForDepositGeneration = true;
-
-			if (array_key_exists('facture', $object->linkedObjects)) {
-				foreach ($object->linkedObjects['facture'] as $invoice) {
-					if ($invoice->type == Facture::TYPE_DEPOSIT) {
-						$eligibleForDepositGeneration = false;
-						break;
-					}
-				}
-			}
-
-			if ($eligibleForDepositGeneration && array_key_exists('commande', $object->linkedObjects)) {
-				foreach ($object->linkedObjects['commande'] as $order) {
-					$order->fetchObjectLinked();
-
-					if (array_key_exists('facture', $order->linkedObjects)) {
-						foreach ($order->linkedObjects['facture'] as $invoice) {
-							if ($invoice->type == Facture::TYPE_DEPOSIT) {
-								$eligibleForDepositGeneration = false;
-								break 2;
-							}
-						}
-					}
-				}
-			}
-
-
-			if ($eligibleForDepositGeneration) {
-				$formquestion[] = array(
-					'type' => 'checkbox',
-					'tdclass' => 'showonlyifsigned',
-					'name' => 'generate_deposit',
-					'label' => $form->textwithpicto($langs->trans('GenerateDeposit', $object->deposit_percent), $langs->trans('DepositGenerationPermittedByThePaymentTermsSelected'))
-				);
-
-				$formquestion[] = array(
-					'type' => 'date',
-					'tdclass' => 'fieldrequired showonlyifgeneratedeposit',
-					'name' => 'datef',
-					'label' => $langs->trans('DateInvoice'),
-					'value' => dol_now(),
-					'datenow' => true
-				);
-
-				if (! empty($conf->global->INVOICE_POINTOFTAX_DATE)) {
-					$formquestion[] = array(
-						'type' => 'date',
-						'tdclass' => 'fieldrequired showonlyifgeneratedeposit',
-						'name' => 'date_pointoftax',
-						'label' => $langs->trans('DatePointOfTax'),
-						'value' => dol_now(),
-						'datenow' => true
-					);
-				}
-
-				ob_start();
-				$form->select_conditions_paiements(0, 'cond_reglement_id', -1, 0, 0, 'minwidth200');
-				$paymentTermsSelect = ob_get_clean();
-
-				$formquestion[] = array(
-					'type' => 'other',
-					'tdclass' => 'fieldrequired showonlyifgeneratedeposit',
-					'name' => 'cond_reglement_id',
-					'label' => $langs->trans('PaymentTerm'),
-					'value' => $paymentTermsSelect
-				);
-
-				$formquestion[] = array(
-					'type' => 'checkbox',
-					'tdclass' => 'showonlyifgeneratedeposit',
-					'name' => 'validate_generated_deposit',
-					'label' => $langs->trans('ValidateGeneratedDeposit')
-				);
-
-				$formquestion[] = array(
-					'type' => 'onecolumn',
-					'value' => '
-						<script>
-							let signedValue = ' . $object::STATUS_SIGNED . ';
-
-							$(document).ready(function() {
-								$("[name=generate_deposit]").change(function () {
-									let $self = $(this);
-									let $target = $(".showonlyifgeneratedeposit").parent(".tagtr");
-
-									if (! $self.parents(".tagtr").is(":hidden") && $self.is(":checked")) {
-										$target.show();
-									} else {
-										$target.hide();
-									}
-
-									return true;
-								});
-
-								$("#statut").change(function() {
-									let $target = $(".showonlyifsigned").parent(".tagtr");
-
-									if ($(this).val() == signedValue) {
-										$target.show();
-									} else {
-										$target.hide();
-									}
-
-									$("[name=generate_deposit]").trigger("change");
-
-									return true;
-								});
-
-								$("#statut").trigger("change");
-							});
-						</script>
-					'
-				);
-			}
-		}
-
-		$deposit_percent_from_payment_terms = getDictionaryValue('c_payment_term', 'deposit_percent', $object->cond_reglement_id);
-
 		if (!empty($deposit_percent_from_payment_terms) && isModEnabled('facture') && !empty($user->rights->facture->creer)) {
 			require_once DOL_DOCUMENT_ROOT . '/compta/facture/class/facture.class.php';
 
@@ -2221,6 +2098,7 @@ if ($action == 'create') {
 					'type' => 'checkbox',
 					'tdclass' => 'showonlyifsigned',
 					'name' => 'generate_deposit',
+					'morecss' => 'margintoponly marginbottomonly',
 					'label' => $form->textwithpicto($langs->trans('GenerateDeposit', $object->deposit_percent), $langs->trans('DepositGenerationPermittedByThePaymentTermsSelected'))
 				);
 
@@ -2244,9 +2122,7 @@ if ($action == 'create') {
 					);
 				}
 
-				ob_start();
-				$form->select_conditions_paiements(0, 'cond_reglement_id', -1, 0, 0, 'minwidth200');
-				$paymentTermsSelect = ob_get_clean();
+				$paymentTermsSelect = $form->getSelectConditionsPaiements(0, 'cond_reglement_id', -1, 0, 1, 'minwidth200');
 
 				$formquestion[] = array(
 					'type' => 'other',
@@ -2260,6 +2136,7 @@ if ($action == 'create') {
 					'type' => 'checkbox',
 					'tdclass' => 'showonlyifgeneratedeposit',
 					'name' => 'validate_generated_deposit',
+					'morecss' => 'margintoponly marginbottomonly',
 					'label' => $langs->trans('ValidateGeneratedDeposit')
 				);
 
@@ -2314,9 +2191,9 @@ if ($action == 'create') {
 		}
 
 		if (empty($conf->global->PROPAL_SKIP_ACCEPT_REFUSE)) {
-			$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('SetAcceptedRefused'), $text, 'confirm_closeas', $formquestion, '', 1, 250);
+			$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('SetAcceptedRefused'), $text, 'confirm_closeas', $formquestion, '', 1, 300);
 		} else {
-			$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"] . '?statut=3&id=' . $object->id, $langs->trans('Close'), $text, 'confirm_closeas', $formquestion, '', 1, 250);
+			$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"] . '?statut=3&id=' . $object->id, $langs->trans('Close'), $text, 'confirm_closeas', $formquestion, '', 1, 300);
 		}
 	} elseif ($action == 'delete') {
 		// Confirm delete
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index a738bce9004..41279c8ae36 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -4040,6 +4040,7 @@ class Form
 	 *										0 : use default deposit percentage from entry
 	 *										> 0 : force deposit percentage (for example, from company object)
 	 *	@return	void
+	 *  @deprecated
 	 */
 	public function select_conditions_paiements($selected = 0, $htmlname = 'condid', $filtertype = -1, $addempty = 0, $noinfoadmin = 0, $morecss = '', $deposit_percent = -1)
 	{
@@ -5013,7 +5014,7 @@ class Form
 					} elseif ($input['type'] == 'checkbox') {
 						$more .= '<div class="tagtr">';
 						$more .= '<div class="tagtd'.(empty($input['tdclass']) ? '' : (' '.$input['tdclass'])).'">'.$input['label'].' </div><div class="tagtd">';
-						$more .= '<input type="checkbox" class="flat'.$morecss.'" id="'.dol_escape_htmltag($input['name']).'" name="'.dol_escape_htmltag($input['name']).'"'.$moreattr;
+						$more .= '<input type="checkbox" class="flat'.($morecss ? ' '.$morecss : '').'" id="'.dol_escape_htmltag($input['name']).'" name="'.dol_escape_htmltag($input['name']).'"'.$moreattr;
 						if (!is_bool($input['value']) && $input['value'] != 'false' && $input['value'] != '0' && $input['value'] != '') {
 							$more .= ' checked';
 						}

From 31fcfc5aa5f4be59df83897893436b88cb950fc9 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 7 Sep 2022 17:15:34 +0200
Subject: [PATCH 750/974] Fix conflict in workflow due to new feature

---
 htdocs/comm/propal/card.php | 206 +++++++++++++++++++-----------------
 1 file changed, 106 insertions(+), 100 deletions(-)

diff --git a/htdocs/comm/propal/card.php b/htdocs/comm/propal/card.php
index 52e2f9beb83..c4f620f6686 100644
--- a/htdocs/comm/propal/card.php
+++ b/htdocs/comm/propal/card.php
@@ -2059,126 +2059,132 @@ if ($action == 'create') {
 		}
 		$formquestion[] = array('type' => 'text', 'name' => 'note_private', 'label' => $langs->trans("Note"), 'value' => '');				// Field to complete private note (not replace)
 
-		$deposit_percent_from_payment_terms = getDictionaryValue('c_payment_term', 'deposit_percent', $object->cond_reglement_id);
+		if (getDolGlobalInt('PROPOSAL_SUGGEST_DOWN_PAYMENT_INVOICE_CREATION')) {
+			// This is a hidden option:
+			// Suggestion to create invoice during proposal signature is not enabled by default.
+			// Such choice should be managed by the workflow module and trigger. This option generates conflicts with some setup.
+			// 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') && !empty($user->rights->facture->creer)) {
-			require_once DOL_DOCUMENT_ROOT . '/compta/facture/class/facture.class.php';
+			if (!empty($deposit_percent_from_payment_terms) && isModEnabled('facture') && !empty($user->rights->facture->creer)) {
+				require_once DOL_DOCUMENT_ROOT . '/compta/facture/class/facture.class.php';
 
-			$object->fetchObjectLinked();
+				$object->fetchObjectLinked();
 
-			$eligibleForDepositGeneration = true;
+				$eligibleForDepositGeneration = true;
 
-			if (array_key_exists('facture', $object->linkedObjects)) {
-				foreach ($object->linkedObjects['facture'] as $invoice) {
-					if ($invoice->type == Facture::TYPE_DEPOSIT) {
-						$eligibleForDepositGeneration = false;
-						break;
+				if (array_key_exists('facture', $object->linkedObjects)) {
+					foreach ($object->linkedObjects['facture'] as $invoice) {
+						if ($invoice->type == Facture::TYPE_DEPOSIT) {
+							$eligibleForDepositGeneration = false;
+							break;
+						}
 					}
 				}
-			}
 
-			if ($eligibleForDepositGeneration && array_key_exists('commande', $object->linkedObjects)) {
-				foreach ($object->linkedObjects['commande'] as $order) {
-					$order->fetchObjectLinked();
+				if ($eligibleForDepositGeneration && array_key_exists('commande', $object->linkedObjects)) {
+					foreach ($object->linkedObjects['commande'] as $order) {
+						$order->fetchObjectLinked();
 
-					if (array_key_exists('facture', $order->linkedObjects)) {
-						foreach ($order->linkedObjects['facture'] as $invoice) {
-							if ($invoice->type == Facture::TYPE_DEPOSIT) {
-								$eligibleForDepositGeneration = false;
-								break 2;
+						if (array_key_exists('facture', $order->linkedObjects)) {
+							foreach ($order->linkedObjects['facture'] as $invoice) {
+								if ($invoice->type == Facture::TYPE_DEPOSIT) {
+									$eligibleForDepositGeneration = false;
+									break 2;
+								}
 							}
 						}
 					}
 				}
-			}
 
 
-			if ($eligibleForDepositGeneration) {
-				$formquestion[] = array(
-					'type' => 'checkbox',
-					'tdclass' => 'showonlyifsigned',
-					'name' => 'generate_deposit',
-					'morecss' => 'margintoponly marginbottomonly',
-					'label' => $form->textwithpicto($langs->trans('GenerateDeposit', $object->deposit_percent), $langs->trans('DepositGenerationPermittedByThePaymentTermsSelected'))
-				);
+				if ($eligibleForDepositGeneration) {
+					$formquestion[] = array(
+						'type' => 'checkbox',
+						'tdclass' => 'showonlyifsigned',
+						'name' => 'generate_deposit',
+						'morecss' => 'margintoponly marginbottomonly',
+						'label' => $form->textwithpicto($langs->trans('GenerateDeposit', $object->deposit_percent), $langs->trans('DepositGenerationPermittedByThePaymentTermsSelected'))
+					);
 
-				$formquestion[] = array(
-					'type' => 'date',
-					'tdclass' => 'fieldrequired showonlyifgeneratedeposit',
-					'name' => 'datef',
-					'label' => $langs->trans('DateInvoice'),
-					'value' => dol_now(),
-					'datenow' => true
-				);
-
-				if (!empty($conf->global->INVOICE_POINTOFTAX_DATE)) {
 					$formquestion[] = array(
 						'type' => 'date',
 						'tdclass' => 'fieldrequired showonlyifgeneratedeposit',
-						'name' => 'date_pointoftax',
-						'label' => $langs->trans('DatePointOfTax'),
+						'name' => 'datef',
+						'label' => $langs->trans('DateInvoice'),
 						'value' => dol_now(),
 						'datenow' => true
 					);
+
+					if (!empty($conf->global->INVOICE_POINTOFTAX_DATE)) {
+						$formquestion[] = array(
+							'type' => 'date',
+							'tdclass' => 'fieldrequired showonlyifgeneratedeposit',
+							'name' => 'date_pointoftax',
+							'label' => $langs->trans('DatePointOfTax'),
+							'value' => dol_now(),
+							'datenow' => true
+						);
+					}
+
+					$paymentTermsSelect = $form->getSelectConditionsPaiements(0, 'cond_reglement_id', -1, 0, 1, 'minwidth200');
+
+					$formquestion[] = array(
+						'type' => 'other',
+						'tdclass' => 'fieldrequired showonlyifgeneratedeposit',
+						'name' => 'cond_reglement_id',
+						'label' => $langs->trans('PaymentTerm'),
+						'value' => $paymentTermsSelect
+					);
+
+					$formquestion[] = array(
+						'type' => 'checkbox',
+						'tdclass' => 'showonlyifgeneratedeposit',
+						'name' => 'validate_generated_deposit',
+						'morecss' => 'margintoponly marginbottomonly',
+						'label' => $langs->trans('ValidateGeneratedDeposit')
+					);
+
+					$formquestion[] = array(
+						'type' => 'onecolumn',
+						'value' => '
+							<script>
+								let signedValue = ' . $object::STATUS_SIGNED . ';
+
+								$(document).ready(function() {
+									$("[name=generate_deposit]").change(function () {
+										let $self = $(this);
+										let $target = $(".showonlyifgeneratedeposit").parent(".tagtr");
+
+										if (! $self.parents(".tagtr").is(":hidden") && $self.is(":checked")) {
+											$target.show();
+										} else {
+											$target.hide();
+										}
+
+										return true;
+									});
+
+									$("#statut").change(function() {
+										let $target = $(".showonlyifsigned").parent(".tagtr");
+
+										if ($(this).val() == signedValue) {
+											$target.show();
+										} else {
+											$target.hide();
+										}
+
+										$("[name=generate_deposit]").trigger("change");
+
+										return true;
+									});
+
+									$("#statut").trigger("change");
+								});
+							</script>
+						'
+					);
 				}
-
-				$paymentTermsSelect = $form->getSelectConditionsPaiements(0, 'cond_reglement_id', -1, 0, 1, 'minwidth200');
-
-				$formquestion[] = array(
-					'type' => 'other',
-					'tdclass' => 'fieldrequired showonlyifgeneratedeposit',
-					'name' => 'cond_reglement_id',
-					'label' => $langs->trans('PaymentTerm'),
-					'value' => $paymentTermsSelect
-				);
-
-				$formquestion[] = array(
-					'type' => 'checkbox',
-					'tdclass' => 'showonlyifgeneratedeposit',
-					'name' => 'validate_generated_deposit',
-					'morecss' => 'margintoponly marginbottomonly',
-					'label' => $langs->trans('ValidateGeneratedDeposit')
-				);
-
-				$formquestion[] = array(
-					'type' => 'onecolumn',
-					'value' => '
-						<script>
-							let signedValue = ' . $object::STATUS_SIGNED . ';
-
-							$(document).ready(function() {
-								$("[name=generate_deposit]").change(function () {
-									let $self = $(this);
-									let $target = $(".showonlyifgeneratedeposit").parent(".tagtr");
-
-									if (! $self.parents(".tagtr").is(":hidden") && $self.is(":checked")) {
-										$target.show();
-									} else {
-										$target.hide();
-									}
-
-									return true;
-								});
-
-								$("#statut").change(function() {
-									let $target = $(".showonlyifsigned").parent(".tagtr");
-
-									if ($(this).val() == signedValue) {
-										$target.show();
-									} else {
-										$target.hide();
-									}
-
-									$("[name=generate_deposit]").trigger("change");
-
-									return true;
-								});
-
-								$("#statut").trigger("change");
-							});
-						</script>
-					'
-				);
 			}
 		}
 
@@ -2191,9 +2197,9 @@ if ($action == 'create') {
 		}
 
 		if (empty($conf->global->PROPAL_SKIP_ACCEPT_REFUSE)) {
-			$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('SetAcceptedRefused'), $text, 'confirm_closeas', $formquestion, '', 1, 300);
+			$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('SetAcceptedRefused'), $text, 'confirm_closeas', $formquestion, '', 1, 250);
 		} else {
-			$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"] . '?statut=3&id=' . $object->id, $langs->trans('Close'), $text, 'confirm_closeas', $formquestion, '', 1, 300);
+			$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"] . '?statut=3&id=' . $object->id, $langs->trans('Close'), $text, 'confirm_closeas', $formquestion, '', 1, 250);
 		}
 	} elseif ($action == 'delete') {
 		// Confirm delete

From acdac6552bdad0727cf0a0ae249f4688c1ce48b9 Mon Sep 17 00:00:00 2001
From: Adrien Raze <adrien.raze@atm-consulting.fr>
Date: Wed, 7 Sep 2022 17:49:39 +0200
Subject: [PATCH 751/974] FIX : inventory total columns

---
 htdocs/product/inventory/inventory.php | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/htdocs/product/inventory/inventory.php b/htdocs/product/inventory/inventory.php
index 00523c6bf3d..e2455b30372 100644
--- a/htdocs/product/inventory/inventory.php
+++ b/htdocs/product/inventory/inventory.php
@@ -950,19 +950,23 @@ if ($object->id > 0) {
 			print '</td>';
 		}
 		print '<td class="right"></td>';
-		print '<td class="right">';
-		print '<input type="text" name="qtytoadd" class="maxwidth75" value="">';
-		print '</td>';
 		if (!empty($conf->global->INVENTORY_MANAGE_REAL_PMP)) {
 			print '<td class="right">';
 			print '</td>';
 			print '<td class="right">';
 			print '</td>';
 			print '<td class="right">';
+			print '<input type="text" name="qtytoadd" class="maxwidth75" value="">';
 			print '</td>';
 			print '<td class="right">';
 			print '</td>';
-		}
+			print '<td class="right">';
+			print '</td>';
+		} else {
+			print '<td class="right">';
+			print '<input type="text" name="qtytoadd" class="maxwidth75" value="">';
+			print '</td>';
+        }
 		// Actions
 		print '<td class="center">';
 		print '<input type="submit" class="button paddingright" name="addline" value="'.$langs->trans("Add").'">';
@@ -1160,9 +1164,9 @@ if ($object->id > 0) {
 	}
 	if (!empty($conf->global->INVENTORY_MANAGE_REAL_PMP)) {
 		print '<tr class="liste_total">';
-		print '<td colspan="5">'.$langs->trans("Total").'</td>';
+		print '<td colspan="4">'.$langs->trans("Total").'</td>';
 		print '<td class="right" colspan="2">'.price($totalExpectedValuation).'</td>';
-		print '<td class="right" id="totalRealValuation" colspan="2">'.price($totalRealValuation).'</td>';
+		print '<td class="right" id="totalRealValuation" colspan="3">'.price($totalRealValuation).'</td>';
 		print '<td></td>';
 		print '</tr>';
 	}

From 24a61b57db3c555fab101e1195edefed927a9fd5 Mon Sep 17 00:00:00 2001
From: stickler-ci <support@stickler-ci.com>
Date: Wed, 7 Sep 2022 16:09:08 +0000
Subject: [PATCH 752/974] Fixing style errors.

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

diff --git a/htdocs/product/inventory/inventory.php b/htdocs/product/inventory/inventory.php
index e2455b30372..b33e471c3e4 100644
--- a/htdocs/product/inventory/inventory.php
+++ b/htdocs/product/inventory/inventory.php
@@ -966,7 +966,7 @@ if ($object->id > 0) {
 			print '<td class="right">';
 			print '<input type="text" name="qtytoadd" class="maxwidth75" value="">';
 			print '</td>';
-        }
+		}
 		// Actions
 		print '<td class="center">';
 		print '<input type="submit" class="button paddingright" name="addline" value="'.$langs->trans("Add").'">';

From 8a742df8de72db5f4a18b0cf6f021f628c4d9958 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Wed, 7 Sep 2022 18:38:00 +0200
Subject: [PATCH 753/974] select2 multimatch

---
 htdocs/core/lib/ajax.lib.php | 30 +++++++++++++++++++++---------
 1 file changed, 21 insertions(+), 9 deletions(-)

diff --git a/htdocs/core/lib/ajax.lib.php b/htdocs/core/lib/ajax.lib.php
index 3e1af30ddd2..ef3498b0c71 100644
--- a/htdocs/core/lib/ajax.lib.php
+++ b/htdocs/core/lib/ajax.lib.php
@@ -448,20 +448,32 @@ function ajax_combobox($htmlname, $events = array(), $minLengthToAutocomplete =
 
 	$tmpplugin = 'select2';
 	$msg = "\n".'<!-- JS CODE TO ENABLE '.$tmpplugin.' for id = '.$htmlname.' -->
-          <script>
-        	$(document).ready(function () {
-        		$(\''.(preg_match('/^\./', $htmlname) ? $htmlname : '#'.$htmlname).'\').'.$tmpplugin.'({
-        		    dir: \'ltr\',
-        			width: \''.$widthTypeOfAutocomplete.'\',		/* off or resolve */
+		<script>
+			$(document).ready(function () {
+				$(\''.(preg_match('/^\./', $htmlname) ? $htmlname : '#'.$htmlname).'\').'.$tmpplugin.'({
+					dir: \'ltr\',
+					width: \''.$widthTypeOfAutocomplete.'\',		/* off or resolve */
 					minimumInputLength: '.$minLengthToAutocomplete.',
 					language: select2arrayoflanguage,
-    				containerCssClass: \':all:\',					/* Line to add class of origin SELECT propagated to the new <span class="select2-selection...> tag */
+					matcher: function (params, data) {
+						if ($.trim(params.term) === "") {
+							return data;
+						}
+						keywords = (params.term).split(" ");
+						for (var i = 0; i < keywords.length; i++) {
+							if (((data.text).toUpperCase()).indexOf((keywords[i]).toUpperCase()) == -1) {
+								return null;
+							}
+						}
+						return data;
+					},
+					containerCssClass: \':all:\',					/* Line to add class of origin SELECT propagated to the new <span class="select2-selection...> tag */
 					selectionCssClass: \':all:\',					/* Line to add class of origin SELECT propagated to the new <span class="select2-selection...> tag */
 					templateResult: function (data, container) {	/* Format visible output into combo list */
 	 					/* Code to add class of origin OPTION propagated to the new select2 <li> tag */
 						if (data.element) { $(container).addClass($(data.element).attr("class")); }
-					    //console.log($(data.element).attr("data-html"));
-					    if (data.id == '.((int) $idforemptyvalue).' && $(data.element).attr("data-html") == undefined) {
+						//console.log($(data.element).attr("data-html"));
+						if (data.id == '.((int) $idforemptyvalue).' && $(data.element).attr("data-html") == undefined) {
 							return \'&nbsp;\';
 						}
 						if ($(data.element).attr("data-html") != undefined) return htmlEntityDecodeJs($(data.element).attr("data-html"));		// If property html set, we decode html entities and use this
@@ -498,7 +510,7 @@ function ajax_combobox($htmlname, $events = array(), $minLengthToAutocomplete =
 				var url = obj.url;
 				var htmlname = obj.htmlname;
 				var showempty = obj.showempty;
-			    console.log("Run runJsCodeForEvent-'.$htmlname.' from ajax_combobox id="+id+" method="+method+" showempty="+showempty+" url="+url+" htmlname="+htmlname);
+				console.log("Run runJsCodeForEvent-'.$htmlname.' from ajax_combobox id="+id+" method="+method+" showempty="+showempty+" url="+url+" htmlname="+htmlname);
 				$.getJSON(url,
 						{
 							action: method,

From 3c2f30a824df1bafa67d5bd338046a6a5d491db9 Mon Sep 17 00:00:00 2001
From: UT from dolibit <45215329+dolibit-ut@users.noreply.github.com>
Date: Wed, 7 Sep 2022 19:43:39 +0200
Subject: [PATCH 754/974] Update card.php

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

diff --git a/htdocs/intracommreport/card.php b/htdocs/intracommreport/card.php
index a5acefca8d6..5639712a59f 100644
--- a/htdocs/intracommreport/card.php
+++ b/htdocs/intracommreport/card.php
@@ -33,13 +33,17 @@
  *
  */
 
+
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/functions.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/intracommreport/class/intracommreport.class.php';
 
+// Load translation files required by the page
 $langs->loadLangs(array("intracommreport"));
 
+// Get Parameters
 $id = GETPOST('id', 'int');
 $action = GETPOST('action');
 $exporttype = GETPOSTISSET('exporttype') ? GETPOST('exporttype', 'alphanohtml') : 'deb'; // DEB or DES
@@ -48,6 +52,7 @@ $month = GETPOSTINT('month');
 $label = (string) GETPOST('label', 'alphanohtml');
 $type_declaration = (string) GETPOST('type_declaration', 'alphanohtml');
 $backtopage = GETPOST('backtopage', 'alpha');
+
 $declaration = array(
 	"deb" => $langs->trans("DEB"),
 	"des" => $langs->trans("DES"),
@@ -56,6 +61,8 @@ $typeOfDeclaration = array(
 	"introduction" => $langs->trans("Introduction"),
 	"expedition" => $langs->trans("Expedition"),
 );
+
+// Initialize technical objects
 $object = new IntracommReport($db);
 if ($id > 0) {
 	$object->fetch($id);
@@ -68,6 +75,7 @@ $hookmanager->initHooks(array('intracommcard', 'globalcard'));
 
 $error = 0;
 
+// Permissions
 $permissiontoread = $user->rights->intracommreport->read;
 $permissiontoadd = $user->rights->intracommreport->write;
 $permissiontodelete = $user->rights->intracommreport->delete;

From 310894bddb49959960f0dd7938f0b0ea7ff4d040 Mon Sep 17 00:00:00 2001
From: UT from dolibit <45215329+dolibit-ut@users.noreply.github.com>
Date: Wed, 7 Sep 2022 19:46:00 +0200
Subject: [PATCH 755/974] Update list.php

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

diff --git a/htdocs/intracommreport/list.php b/htdocs/intracommreport/list.php
index 244ebdd862f..afc8ea6950a 100644
--- a/htdocs/intracommreport/list.php
+++ b/htdocs/intracommreport/list.php
@@ -13,7 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 /**
@@ -22,6 +22,8 @@
  *  \brief      Page to list intracomm report
  */
 
+
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/intracommreport/class/intracommreport.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
@@ -30,6 +32,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
 // Load translation files required by the page
 $langs->loadLangs(array('intracommreport'));
 
+// Get Parameters
 $action = GETPOST('action', 'alpha');
 $massaction = GETPOST('massaction', 'alpha');
 $show_files = GETPOST('show_files', 'int');
@@ -123,6 +126,7 @@ $arrayfields = array(
 	'i.label' => array('label'=>$langs->trans("Label"), 'checked'=>1),
 	'i.fk_product_type'=>array('label'=>$langs->trans("Type"), 'checked'=>0, 'enabled'=>(!empty($conf->produit->enabled) && isModEnabled("service"))),
 );
+
 /*
 // Extra fields
 if (isset($extrafields->attributes[$object->table_element]['label']) && is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label']))
@@ -134,6 +138,7 @@ if (isset($extrafields->attributes[$object->table_element]['label']) && is_array
 	}
 }
 */
+
 $object->fields = dol_sort_array($object->fields, 'position');
 $arrayfields = dol_sort_array($arrayfields, 'position');
 
@@ -210,6 +215,7 @@ 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); // Note that $action and $object may have been modified by hook

From 1a061b1690226082e9f007dbc3297695a72f3951 Mon Sep 17 00:00:00 2001
From: UT from dolibit <45215329+dolibit-ut@users.noreply.github.com>
Date: Wed, 7 Sep 2022 19:48:17 +0200
Subject: [PATCH 756/974] Update intracommreport.php

---
 htdocs/intracommreport/admin/intracommreport.php | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/htdocs/intracommreport/admin/intracommreport.php b/htdocs/intracommreport/admin/intracommreport.php
index 3185e8a030e..c025dad354f 100644
--- a/htdocs/intracommreport/admin/intracommreport.php
+++ b/htdocs/intracommreport/admin/intracommreport.php
@@ -13,15 +13,17 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
 /**
- *      \file		htdocs/intracommreport/admin/intracommreport.php
- *      \ingroup	intracommreport
- *      \brief		Page to setup the module intracomm report
+ *    \file       htdocs/intracommreport/admin/intracommreport.php
+ *    \ingroup    intracommreport
+ *    \brief      Page to setup the module intracomm report
  */
 
+
+// Load Dolibarr environment
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/intracommreport.lib.php';
@@ -30,10 +32,12 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
 // Load translation files required by the page
 $langs->loadLangs(array("admin", "intracommreport"));
 
+// Access Control
 if (!$user->admin) {
 	accessforbidden();
 }
 
+// Get Parameters
 $action = GETPOST('action', 'aZ09');
 
 // Parameters INTRACOMMREPORT_* and others
@@ -81,6 +85,7 @@ if ($action == 'update') {
 	}
 }
 
+
 /*
  * View
  */

From 2c38b8e5d483cb0aa41ad812f4c45b5570e62889 Mon Sep 17 00:00:00 2001
From: UT from dolibit <45215329+dolibit-ut@users.noreply.github.com>
Date: Wed, 7 Sep 2022 19:52:42 +0200
Subject: [PATCH 757/974] Update intracommreport.class.php

---
 .../class/intracommreport.class.php           | 21 ++++++++++++-------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/htdocs/intracommreport/class/intracommreport.class.php b/htdocs/intracommreport/class/intracommreport.class.php
index 5411e6b7aaa..18e6e0ecc84 100644
--- a/htdocs/intracommreport/class/intracommreport.class.php
+++ b/htdocs/intracommreport/class/intracommreport.class.php
@@ -14,14 +14,16 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 /**
- *  \file       htdocs/intracommreport/class/intracommreport.class.php
- *  \ingroup    Intracomm report
- *  \brief      File of class to manage intracomm report
+ *    \file       htdocs/intracommreport/class/intracommreport.class.php
+ *    \ingroup    Intracomm report
+ *    \brief      File of class to manage intracomm report
  */
+
+
 require_once DOL_DOCUMENT_ROOT.'/core/class/commonobject.class.php';
 
 
@@ -51,7 +53,7 @@ class IntracommReport extends CommonObject
 	public $declaration_number;
 
 	/**
-	 * 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
+	 * 0 = No test on entity, 1 = Test with field entity, 2 = Test with link by societe
 	 * @var int
 	 */
 	public $ismultientitymanaged = 1;
@@ -83,7 +85,8 @@ class IntracommReport extends CommonObject
 	}
 
 	/**
-	 * Fonction create
+	 * Function create
+	 *
 	 * @param 	User 	$user 		User
 	 * @param 	int 	$notrigger 	notrigger
 	 * @return 	int
@@ -94,7 +97,8 @@ class IntracommReport extends CommonObject
 	}
 
 	/**
-	 * Fonction fetch
+	 * Function fetch
+	 *
 	 * @param 	int 	$id 	object ID
 	 * @return 	int
 	 */
@@ -104,7 +108,8 @@ class IntracommReport extends CommonObject
 	}
 
 	/**
-	 * Fonction delete
+	 * Function delete
+	 *
 	 * @param 	int 	$id 		object ID
 	 * @param 	User 	$user 		User
 	 * @param 	int 	$notrigger 	notrigger

From 851f6236445acca20670ee319d017a2cce27ef82 Mon Sep 17 00:00:00 2001
From: UT from dolibit <45215329+dolibit-ut@users.noreply.github.com>
Date: Wed, 7 Sep 2022 19:59:48 +0200
Subject: [PATCH 758/974] Update list.php

---
 htdocs/bookmarks/list.php | 30 +++++++++++++++++++++---------
 1 file changed, 21 insertions(+), 9 deletions(-)

diff --git a/htdocs/bookmarks/list.php b/htdocs/bookmarks/list.php
index 07ea263eeda..d9205a3e24f 100644
--- a/htdocs/bookmarks/list.php
+++ b/htdocs/bookmarks/list.php
@@ -16,30 +16,32 @@
  */
 
 /**
- *       \file       htdocs/bookmarks/list.php
- *       \brief      Page to display list of bookmarks
- *       \ingroup    bookmark
+ *    \file       htdocs/bookmarks/list.php
+ *    \ingroup    bookmark
+ *    \brief      Page to display list of bookmarks
  */
 
+
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/bookmarks/class/bookmark.class.php';
 
+
 // Load translation files required by the page
 $langs->loadLangs(array('bookmarks', 'admin'));
 
+
+// Get Parameters
 $action = GETPOST('action', 'aZ09');
 $massaction = GETPOST('massaction', 'alpha');
 $show_files = GETPOST('show_files', 'int');
 $confirm = GETPOST('confirm', 'alpha');
 $toselect = GETPOST('toselect', 'array');
 $contextpage = GETPOST('contextpage', 'aZ') ?GETPOST('contextpage', 'aZ') : 'bookmarklist'; // To manage different context of search
-
-// Security check
-if (empty($user->rights->bookmark->lire)) {
-	restrictedArea($user, 'bookmarks');
-}
+$id = GETPOST("id", 'int');
 $optioncss = GETPOST('optioncss', 'alpha');
 
+
 // Load variable for pagination
 $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
@@ -58,15 +60,24 @@ if (!$sortorder) {
 	$sortorder = 'ASC';
 }
 
-$id = GETPOST("id", 'int');
 
+// Initialize Objects
 $object = new Bookmark($db);
 
+
+// Security check
+if (empty($user->rights->bookmark->lire)) {
+	restrictedArea($user, 'bookmarks');
+}
+
+
+// Permissions
 $permissiontoread = !empty($user->rights->bookmark->lire);
 $permissiontoadd = !empty($user->rights->bookmark->creer);
 $permissiontodelete = !empty($user->rights->bookmark->supprimer);
 
 
+
 /*
  * Actions
  */
@@ -82,6 +93,7 @@ if ($action == 'delete') {
 }
 
 
+
 /*
  * View
  */

From 5d5b9e63534da540cac8dc2ed5d54af2cc51f9d1 Mon Sep 17 00:00:00 2001
From: UT from dolibit <45215329+dolibit-ut@users.noreply.github.com>
Date: Wed, 7 Sep 2022 20:03:17 +0200
Subject: [PATCH 759/974] Update card.php

---
 htdocs/bookmarks/card.php | 24 +++++++++++++++++-------
 1 file changed, 17 insertions(+), 7 deletions(-)

diff --git a/htdocs/bookmarks/card.php b/htdocs/bookmarks/card.php
index bbc92a83ef1..60d615192d0 100644
--- a/htdocs/bookmarks/card.php
+++ b/htdocs/bookmarks/card.php
@@ -18,23 +18,22 @@
  */
 
 /**
- *       \file       htdocs/bookmarks/card.php
- *       \brief      Page display/creation of bookmarks
- *       \ingroup    bookmark
+ *    \file       htdocs/bookmarks/card.php
+ *    \ingroup    bookmark
+ *    \brief      Page display/creation of bookmarks
  */
 
 
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/bookmarks/class/bookmark.class.php';
 
+
 // Load translation files required by the page
 $langs->loadLangs(array('bookmarks', 'other'));
 
-// Security check
-if (empty($user->rights->bookmark->lire)) {
-	restrictedArea($user, 'bookmarks');
-}
 
+// Get Parameters
 $id = GETPOST("id", 'int');
 $action = GETPOST("action", "alpha");
 $title = (string) GETPOST("title", "alpha");
@@ -45,12 +44,22 @@ $userid = GETPOST("userid", "int");
 $position = GETPOST("position", "int");
 $backtopage = GETPOST('backtopage', 'alpha');
 
+
+// Initialize Objects
 $object = new Bookmark($db);
 if ($id > 0) {
 	$object->fetch($id);
 }
 
 
+// Security check
+if (empty($user->rights->bookmark->lire)) {
+	restrictedArea($user, 'bookmarks');
+}
+
+
+
+
 /*
  * Actions
  */
@@ -124,6 +133,7 @@ if ($action == 'add' || $action == 'addproduct' || $action == 'update') {
 }
 
 
+
 /*
  * View
  */

From 8d339531421f0bb9fa30f809df51efd0c6943f0e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20France?= <frederic.france@free.fr>
Date: Wed, 7 Sep 2022 20:08:59 +0200
Subject: [PATCH 760/974] add comment

---
 htdocs/accountancy/admin/account.php                     | 1 +
 htdocs/accountancy/admin/accountmodel.php                | 1 +
 htdocs/accountancy/admin/card.php                        | 1 +
 htdocs/accountancy/admin/categories.php                  | 1 +
 htdocs/accountancy/admin/categories_list.php             | 1 +
 htdocs/accountancy/admin/closure.php                     | 1 +
 htdocs/accountancy/admin/fiscalyear.php                  | 1 +
 htdocs/accountancy/admin/fiscalyear_card.php             | 1 +
 htdocs/accountancy/admin/fiscalyear_info.php             | 1 +
 htdocs/accountancy/admin/index.php                       | 1 +
 htdocs/accountancy/admin/journals_list.php               | 1 +
 htdocs/accountancy/admin/subaccount.php                  | 1 +
 htdocs/accountancy/bookkeeping/balance.php               | 1 +
 htdocs/accountancy/bookkeeping/card.php                  | 1 +
 htdocs/accountancy/bookkeeping/list.php                  | 1 +
 htdocs/accountancy/bookkeeping/listbyaccount.php         | 1 +
 htdocs/accountancy/closure/index.php                     | 1 +
 htdocs/accountancy/customer/index.php                    | 1 +
 htdocs/accountancy/expensereport/index.php               | 1 +
 htdocs/accountancy/journal/sellsjournal.php              | 1 +
 htdocs/accountancy/journal/variousjournal.php            | 1 +
 htdocs/accountancy/supplier/index.php                    | 1 +
 htdocs/adherents/admin/member.php                        | 1 +
 htdocs/adherents/admin/member_emails.php                 | 1 +
 htdocs/adherents/admin/member_extrafields.php            | 1 +
 htdocs/adherents/admin/member_type_extrafields.php       | 1 +
 htdocs/adherents/admin/website.php                       | 1 +
 htdocs/adherents/agenda.php                              | 1 +
 htdocs/adherents/document.php                            | 1 +
 htdocs/adherents/htpasswd.php                            | 1 +
 htdocs/adherents/ldap.php                                | 1 +
 htdocs/adherents/stats/byproperties.php                  | 1 +
 htdocs/adherents/stats/geo.php                           | 1 +
 htdocs/adherents/stats/index.php                         | 1 +
 htdocs/adherents/subscription.php                        | 1 +
 htdocs/adherents/subscription/card.php                   | 1 +
 htdocs/adherents/subscription/info.php                   | 1 +
 htdocs/adherents/subscription/list.php                   | 1 +
 htdocs/adherents/type.php                                | 1 +
 htdocs/adherents/type_ldap.php                           | 1 +
 htdocs/adherents/type_translation.php                    | 1 +
 htdocs/adherents/vcard.php                               | 1 +
 htdocs/admin/accountant.php                              | 1 +
 htdocs/admin/accounting.php                              | 1 +
 htdocs/admin/agenda.php                                  | 1 +
 htdocs/admin/agenda_extrafields.php                      | 1 +
 htdocs/admin/agenda_extsites.php                         | 1 +
 htdocs/admin/agenda_other.php                            | 1 +
 htdocs/admin/agenda_reminder.php                         | 1 +
 htdocs/admin/agenda_xcal.php                             | 1 +
 htdocs/admin/bank_extrafields.php                        | 1 +
 htdocs/admin/barcode.php                                 | 1 +
 htdocs/admin/bom.php                                     | 1 +
 htdocs/admin/bom_extrafields.php                         | 1 +
 htdocs/admin/boxes.php                                   | 1 +
 htdocs/admin/chequereceipts.php                          | 1 +
 htdocs/admin/clicktodial.php                             | 1 +
 htdocs/admin/commande.php                                | 1 +
 .../admin/commande_fournisseur_dispatch_extrafields.php  | 1 +
 htdocs/admin/company.php                                 | 1 +
 htdocs/admin/company_socialnetworks.php                  | 1 +
 htdocs/admin/compta.php                                  | 1 +
 htdocs/admin/confexped.php                               | 1 +
 htdocs/admin/const.php                                   | 1 +
 htdocs/admin/contract.php                                | 1 +
 htdocs/admin/dav.php                                     | 1 +
 htdocs/admin/debugbar.php                                | 1 +
 htdocs/admin/defaultvalues.php                           | 1 +
 htdocs/admin/delais.php                                  | 1 +
 htdocs/admin/delivery_extrafields.php                    | 1 +
 htdocs/admin/deliverydet_extrafields.php                 | 1 +
 htdocs/admin/dict.php                                    | 1 +
 htdocs/admin/ecm_directories_extrafields.php             | 1 +
 htdocs/admin/ecm_files_extrafields.php                   | 1 +
 htdocs/admin/emailcollector_card.php                     | 1 +
 htdocs/admin/emailcollector_list.php                     | 1 +
 htdocs/admin/eventorganization_confbooth_extrafields.php | 1 +
 htdocs/admin/events.php                                  | 1 +
 htdocs/admin/expedition.php                              | 1 +
 htdocs/admin/expedition_extrafields.php                  | 1 +
 htdocs/admin/expeditiondet_extrafields.php               | 1 +
 htdocs/admin/expensereport.php                           | 1 +
 htdocs/admin/expensereport_extrafields.php               | 1 +
 htdocs/admin/expensereport_ik.php                        | 1 +
 htdocs/admin/expensereport_rules.php                     | 1 +
 htdocs/admin/export.php                                  | 1 +
 htdocs/admin/external_rss.php                            | 1 +
 htdocs/admin/facture.php                                 | 1 +
 htdocs/admin/facture_situation.php                       | 1 +
 htdocs/admin/fckeditor.php                               | 1 +
 htdocs/admin/fichinter.php                               | 1 +
 htdocs/admin/geoipmaxmind.php                            | 1 +
 htdocs/admin/holiday.php                                 | 1 +
 htdocs/admin/holiday_extrafields.php                     | 1 +
 htdocs/admin/ihm.php                                     | 1 +
 htdocs/admin/import.php                                  | 1 +
 htdocs/admin/index.php                                   | 1 +
 htdocs/admin/ldap.php                                    | 1 +
 htdocs/admin/ldap_contacts.php                           | 1 +
 htdocs/admin/ldap_groups.php                             | 1 +
 htdocs/admin/ldap_members.php                            | 1 +
 htdocs/admin/ldap_members_types.php                      | 1 +
 htdocs/admin/ldap_users.php                              | 1 +
 htdocs/admin/limits.php                                  | 1 +
 htdocs/admin/loan.php                                    | 1 +
 htdocs/admin/mailing.php                                 | 1 +
 htdocs/admin/mailman.php                                 | 1 +
 htdocs/admin/mails.php                                   | 1 +
 htdocs/admin/mails_emailing.php                          | 1 +
 htdocs/admin/mails_senderprofile_list.php                | 1 +
 htdocs/admin/mails_templates.php                         | 1 +
 htdocs/admin/mails_ticket.php                            | 1 +
 htdocs/admin/menus.php                                   | 1 +
 htdocs/admin/menus/edit.php                              | 1 +
 htdocs/admin/menus/index.php                             | 1 +
 htdocs/admin/modulehelp.php                              | 1 +
 htdocs/admin/modules.php                                 | 1 +
 htdocs/admin/mrp.php                                     | 1 +
 htdocs/admin/mrp_extrafields.php                         | 1 +
 htdocs/admin/notification.php                            | 1 +
 htdocs/admin/oauth.php                                   | 1 +
 htdocs/admin/oauthlogintokens.php                        | 1 +
 htdocs/admin/openinghours.php                            | 1 +
 htdocs/admin/order_extrafields.php                       | 1 +
 htdocs/admin/orderdet_extrafields.php                    | 1 +
 htdocs/admin/payment.php                                 | 1 +
 htdocs/admin/paymentbybanktransfer.php                   | 1 +
 htdocs/admin/pdf.php                                     | 1 +
 htdocs/admin/pdf_other.php                               | 1 +
 htdocs/admin/perms.php                                   | 1 +
 htdocs/admin/prelevement.php                             | 1 +
 htdocs/admin/propal.php                                  | 1 +
 htdocs/admin/proxy.php                                   | 1 +
 htdocs/admin/receiptprinter.php                          | 1 +
 htdocs/admin/reception_extrafields.php                   | 1 +
 htdocs/admin/reception_setup.php                         | 1 +
 htdocs/admin/resource.php                                | 1 +
 htdocs/admin/resource_extrafields.php                    | 1 +
 htdocs/admin/security.php                                | 1 +
 htdocs/admin/security_file.php                           | 1 +
 htdocs/admin/security_other.php                          | 1 +
 htdocs/admin/sms.php                                     | 1 +
 htdocs/admin/spip.php                                    | 1 +
 htdocs/admin/supplier_invoice.php                        | 1 +
 htdocs/admin/supplier_order.php                          | 1 +
 htdocs/admin/supplier_payment.php                        | 1 +
 htdocs/admin/supplier_proposal.php                       | 1 +
 htdocs/admin/supplierinvoice_extrafields.php             | 1 +
 htdocs/admin/supplierinvoicedet_extrafields.php          | 1 +
 htdocs/admin/supplierorder_extrafields.php               | 1 +
 htdocs/admin/supplierorderdet_extrafields.php            | 1 +
 htdocs/admin/syslog.php                                  | 1 +
 htdocs/admin/system/about.php                            | 1 +
 htdocs/admin/system/browser.php                          | 1 +
 htdocs/admin/system/constall.php                         | 1 +
 htdocs/admin/system/database-tables.php                  | 1 +
 htdocs/admin/system/database.php                         | 1 +
 htdocs/admin/system/dbtable.php                          | 1 +
 htdocs/admin/system/dolibarr.php                         | 1 +
 htdocs/admin/system/filecheck.php                        | 1 +
 htdocs/admin/system/modules.php                          | 1 +
 htdocs/admin/system/os.php                               | 1 +
 htdocs/admin/system/perf.php                             | 1 +
 htdocs/admin/system/phpinfo.php                          | 1 +
 htdocs/admin/system/security.php                         | 1 +
 htdocs/admin/system/web.php                              | 1 +
 htdocs/admin/system/xcache.php                           | 1 +
 htdocs/admin/system/xdebug.php                           | 1 +
 htdocs/admin/taxes.php                                   | 1 +
 htdocs/admin/ticket.php                                  | 1 +
 htdocs/admin/ticket_extrafields.php                      | 1 +
 htdocs/admin/ticket_public.php                           | 1 +
 htdocs/admin/tools/dolibarr_export.php                   | 1 +
 htdocs/admin/tools/dolibarr_import.php                   | 1 +
 htdocs/admin/tools/export.php                            | 1 +
 htdocs/admin/tools/export_files.php                      | 1 +
 htdocs/admin/tools/index.php                             | 1 +
 htdocs/admin/tools/listevents.php                        | 1 +
 htdocs/admin/tools/listsessions.php                      | 1 +
 htdocs/admin/tools/purge.php                             | 1 +
 htdocs/admin/tools/update.php                            | 1 +
 htdocs/admin/translation.php                             | 1 +
 htdocs/admin/triggers.php                                | 1 +
 htdocs/admin/user.php                                    | 1 +
 htdocs/admin/usergroup.php                               | 1 +
 htdocs/admin/website.php                                 | 1 +
 htdocs/admin/website_options.php                         | 1 +
 htdocs/admin/workflow.php                                | 1 +
 htdocs/api/admin/index.php                               | 1 +
 htdocs/asset/accountancy_codes.php                       | 1 +
 htdocs/asset/admin/asset_extrafields.php                 | 1 +
 htdocs/asset/admin/assetmodel_extrafields.php            | 1 +
 htdocs/asset/admin/setup.php                             | 1 +
 htdocs/asset/agenda.php                                  | 1 +
 htdocs/asset/card.php                                    | 1 +
 htdocs/asset/depreciation.php                            | 1 +
 htdocs/asset/depreciation_options.php                    | 1 +
 htdocs/asset/disposal.php                                | 1 +
 htdocs/asset/document.php                                | 1 +
 htdocs/asset/model/accountancy_codes.php                 | 1 +
 htdocs/asset/model/agenda.php                            | 1 +
 htdocs/asset/model/card.php                              | 1 +
 htdocs/asset/model/depreciation_options.php              | 1 +
 htdocs/asset/model/note.php                              | 1 +
 htdocs/asset/note.php                                    | 1 +
 htdocs/barcode/codeinit.php                              | 1 +
 htdocs/barcode/printsheet.php                            | 1 +
 htdocs/blockedlog/ajax/block-info.php                    | 1 +
 htdocs/blockedlog/ajax/check_signature.php               | 1 +
 htdocs/bookmarks/admin/bookmark.php                      | 1 +
 htdocs/bookmarks/card.php                                | 1 +
 htdocs/bookmarks/list.php                                | 1 +
 htdocs/categories/admin/categorie.php                    | 1 +
 htdocs/categories/admin/categorie_extrafields.php        | 1 +
 htdocs/categories/card.php                               | 1 +
 htdocs/categories/edit.php                               | 1 +
 htdocs/categories/index.php                              | 1 +
 htdocs/categories/info.php                               | 1 +
 htdocs/categories/photos.php                             | 1 +
 htdocs/categories/traduction.php                         | 1 +
 htdocs/categories/viewcat.php                            | 1 +
 htdocs/collab/index.php                                  | 1 +
 htdocs/comm/action/card.php                              | 1 +
 htdocs/comm/action/document.php                          | 1 +
 htdocs/comm/action/index.php                             | 1 +
 htdocs/comm/action/info.php                              | 1 +
 htdocs/comm/action/list.php                              | 1 +
 htdocs/comm/action/pertype.php                           | 1 +
 htdocs/comm/action/peruser.php                           | 1 +
 htdocs/comm/action/rapport/index.php                     | 1 +
 htdocs/comm/admin/propal_extrafields.php                 | 1 +
 htdocs/comm/admin/propaldet_extrafields.php              | 1 +
 htdocs/comm/card.php                                     | 1 +
 htdocs/comm/contact.php                                  | 1 +
 htdocs/comm/index.php                                    | 1 +
 htdocs/comm/mailing/advtargetemailing.php                | 1 +
 htdocs/comm/mailing/card.php                             | 1 +
 htdocs/comm/mailing/cibles.php                           | 1 +
 htdocs/comm/mailing/index.php                            | 1 +
 htdocs/comm/mailing/info.php                             | 1 +
 htdocs/comm/mailing/list.php                             | 1 +
 htdocs/comm/multiprix.php                                | 1 +
 htdocs/comm/propal/card.php                              | 1 +
 htdocs/comm/propal/contact.php                           | 1 +
 htdocs/comm/propal/document.php                          | 1 +
 htdocs/comm/propal/index.php                             | 1 +
 htdocs/comm/propal/info.php                              | 1 +
 htdocs/comm/propal/list.php                              | 1 +
 htdocs/comm/propal/note.php                              | 1 +
 htdocs/comm/propal/stats/index.php                       | 1 +
 htdocs/comm/prospect/index.php                           | 1 +
 htdocs/comm/recap-client.php                             | 1 +
 htdocs/comm/remise.php                                   | 1 +
 htdocs/comm/remx.php                                     | 1 +
 htdocs/commande/card.php                                 | 1 +
 htdocs/commande/contact.php                              | 1 +
 htdocs/commande/customer.php                             | 1 +
 htdocs/commande/document.php                             | 1 +
 htdocs/commande/info.php                                 | 1 +
 htdocs/commande/note.php                                 | 1 +
 htdocs/commande/stats/index.php                          | 1 +
 htdocs/compta/accounting-files.php                       | 1 +
 htdocs/compta/ajaxpayment.php                            | 1 +
 htdocs/compta/bank/annuel.php                            | 1 +
 htdocs/compta/bank/bankentries_list.php                  | 1 +
 htdocs/compta/bank/budget.php                            | 1 +
 htdocs/compta/bank/card.php                              | 1 +
 htdocs/compta/bank/graph.php                             | 1 +
 htdocs/compta/bank/line.php                              | 1 +
 htdocs/compta/bank/list.php                              | 1 +
 htdocs/compta/bank/releve.php                            | 1 +
 htdocs/compta/bank/transfer.php                          | 1 +
 htdocs/compta/bank/treso.php                             | 1 +
 htdocs/compta/bank/various_payment/card.php              | 1 +
 htdocs/compta/bank/various_payment/document.php          | 1 +
 htdocs/compta/bank/various_payment/info.php              | 1 +
 htdocs/compta/bank/various_payment/list.php              | 1 +
 htdocs/compta/cashcontrol/cashcontrol_card.php           | 1 +
 htdocs/compta/cashcontrol/cashcontrol_list.php           | 1 +
 htdocs/compta/cashcontrol/report.php                     | 1 +
 htdocs/compta/charges/index.php                          | 1 +
 htdocs/compta/clients.php                                | 1 +
 htdocs/compta/deplacement/card.php                       | 1 +
 htdocs/compta/deplacement/document.php                   | 1 +
 htdocs/compta/deplacement/index.php                      | 1 +
 htdocs/compta/deplacement/info.php                       | 1 +
 htdocs/compta/deplacement/list.php                       | 1 +
 htdocs/compta/deplacement/stats/index.php                | 1 +
 htdocs/compta/facture/admin/facture_cust_extrafields.php | 1 +
 .../facture/admin/facture_rec_cust_extrafields.php       | 1 +
 .../compta/facture/admin/facturedet_cust_extrafields.php | 1 +
 .../facture/admin/facturedet_rec_cust_extrafields.php    | 1 +
 htdocs/compta/facture/card-rec.php                       | 1 +
 htdocs/compta/facture/contact.php                        | 1 +
 htdocs/compta/facture/document.php                       | 1 +
 htdocs/compta/facture/index.php                          | 1 +
 htdocs/compta/facture/info.php                           | 1 +
 htdocs/compta/facture/invoicetemplate_list.php           | 1 +
 htdocs/compta/facture/list.php                           | 1 +
 htdocs/compta/facture/note.php                           | 1 +
 htdocs/compta/facture/prelevement.php                    | 1 +
 htdocs/compta/facture/stats/index.php                    | 1 +
 htdocs/compta/journal/purchasesjournal.php               | 1 +
 htdocs/compta/journal/sellsjournal.php                   | 1 +
 htdocs/compta/localtax/card.php                          | 1 +
 htdocs/compta/localtax/clients.php                       | 1 +
 htdocs/compta/localtax/list.php                          | 1 +
 htdocs/compta/localtax/quadri_detail.php                 | 1 +
 htdocs/compta/paiement.php                               | 1 +
 htdocs/compta/paiement/card.php                          | 1 +
 htdocs/compta/paiement/cheque/card.php                   | 1 +
 htdocs/compta/paiement/cheque/index.php                  | 1 +
 htdocs/compta/paiement/cheque/list.php                   | 1 +
 htdocs/compta/paiement/index.php                         | 1 +
 htdocs/compta/paiement/info.php                          | 1 +
 htdocs/compta/paiement/list.php                          | 1 +
 htdocs/compta/paiement/rapport.php                       | 1 +
 htdocs/compta/paiement/tovalidate.php                    | 1 +
 htdocs/compta/paiement_charge.php                        | 1 +
 htdocs/compta/paiement_vat.php                           | 1 +
 htdocs/compta/payment_sc/card.php                        | 1 +
 htdocs/compta/payment_vat/card.php                       | 1 +
 htdocs/compta/paymentbybanktransfer/index.php            | 1 +
 htdocs/compta/prelevement/card.php                       | 1 +
 htdocs/compta/prelevement/create.php                     | 1 +
 htdocs/compta/prelevement/demandes.php                   | 1 +
 htdocs/compta/prelevement/factures.php                   | 1 +
 htdocs/compta/prelevement/fiche-rejet.php                | 1 +
 htdocs/compta/prelevement/fiche-stat.php                 | 1 +
 htdocs/compta/prelevement/index.php                      | 1 +
 htdocs/compta/prelevement/line.php                       | 1 +
 htdocs/compta/prelevement/list.php                       | 1 +
 htdocs/compta/prelevement/orders_list.php                | 1 +
 htdocs/compta/prelevement/rejets.php                     | 1 +
 htdocs/compta/prelevement/stats.php                      | 1 +
 htdocs/compta/recap-compta.php                           | 1 +
 htdocs/compta/resultat/clientfourn.php                   | 1 +
 htdocs/compta/resultat/index.php                         | 1 +
 htdocs/compta/resultat/result.php                        | 1 +
 htdocs/compta/sociales/card.php                          | 1 +
 htdocs/compta/sociales/document.php                      | 1 +
 htdocs/compta/sociales/info.php                          | 1 +
 htdocs/compta/sociales/list.php                          | 1 +
 htdocs/compta/sociales/note.php                          | 1 +
 htdocs/compta/sociales/payments.php                      | 1 +
 htdocs/compta/stats/byratecountry.php                    | 1 +
 htdocs/compta/stats/cabyprodserv.php                     | 1 +
 htdocs/compta/stats/cabyuser.php                         | 1 +
 htdocs/compta/stats/casoc.php                            | 1 +
 htdocs/compta/stats/index.php                            | 1 +
 htdocs/compta/stats/supplier_turnover.php                | 1 +
 htdocs/compta/stats/supplier_turnover_by_prodserv.php    | 1 +
 htdocs/compta/tva/card.php                               | 1 +
 htdocs/compta/tva/clients.php                            | 1 +
 htdocs/compta/tva/document.php                           | 1 +
 htdocs/compta/tva/info.php                               | 1 +
 htdocs/compta/tva/list.php                               | 1 +
 htdocs/compta/tva/payments.php                           | 1 +
 htdocs/compta/tva/quadri_detail.php                      | 1 +
 htdocs/contact/ldap.php                                  | 1 +
 htdocs/contact/note.php                                  | 1 +
 htdocs/contact/perso.php                                 | 1 +
 htdocs/contact/project.php                               | 1 +
 htdocs/contact/vcard.php                                 | 1 +
 htdocs/contrat/admin/contract_extrafields.php            | 1 +
 htdocs/contrat/admin/contractdet_extrafields.php         | 1 +
 htdocs/contrat/contact.php                               | 1 +
 htdocs/contrat/list.php                                  | 1 +
 htdocs/contrat/note.php                                  | 1 +
 htdocs/core/ajax/ajaxcompanies.php                       | 1 +
 htdocs/core/ajax/bankconciliate.php                      | 1 +
 htdocs/core/ajax/box.php                                 | 1 +
 htdocs/core/ajax/check_notifications.php                 | 1 +
 htdocs/core/ajax/constantonoff.php                       | 1 +
 htdocs/core/ajax/contacts.php                            | 1 +
 htdocs/core/ajax/fileupload.php                          | 1 +
 htdocs/core/ajax/getaccountcurrency.php                  | 1 +
 htdocs/core/ajax/loadinplace.php                         | 1 +
 htdocs/core/ajax/locationincoterms.php                   | 1 +
 htdocs/core/ajax/objectonoff.php                         | 1 +
 htdocs/core/ajax/pingresult.php                          | 1 +
 htdocs/core/ajax/price.php                               | 1 +
 htdocs/core/ajax/row.php                                 | 1 +
 htdocs/core/ajax/saveinplace.php                         | 1 +
 htdocs/core/ajax/security.php                            | 1 +
 htdocs/core/ajax/selectobject.php                        | 1 +
 htdocs/core/ajax/vatrates.php                            | 1 +
 htdocs/core/ajax/ziptown.php                             | 1 +
 .../filemanagerdol/browser/default/frmactualfolder.php   | 1 +
 .../filemanagerdol/browser/default/frmcreatefolder.php   | 1 +
 .../core/filemanagerdol/browser/default/frmfolders.php   | 1 +
 .../filemanagerdol/browser/default/frmresourceslist.php  | 1 +
 htdocs/core/filemanagerdol/browser/default/frmupload.php | 1 +
 htdocs/core/modules/oauth/generic_oauthcallback.php      | 1 +
 htdocs/core/modules/oauth/github_oauthcallback.php       | 1 +
 htdocs/core/modules/oauth/google_oauthcallback.php       | 1 +
 htdocs/core/modules/oauth/stripelive_oauthcallback.php   | 1 +
 htdocs/core/modules/oauth/stripetest_oauthcallback.php   | 1 +
 htdocs/core/photos_resize.php                            | 1 +
 htdocs/core/tools.php                                    | 1 +
 htdocs/cron/card.php                                     | 1 +
 htdocs/cron/info.php                                     | 1 +
 htdocs/cron/list.php                                     | 1 +
 htdocs/datapolicy/admin/setup.php                        | 1 +
 htdocs/datapolicy/admin/setupmail.php                    | 1 +
 htdocs/datapolicy/mailing.php                            | 1 +
 htdocs/datapolicy/public/index.php                       | 1 +
 htdocs/delivery/card.php                                 | 1 +
 htdocs/don/admin/donation_extrafields.php                | 1 +
 htdocs/don/card.php                                      | 1 +
 htdocs/don/document.php                                  | 1 +
 htdocs/don/index.php                                     | 1 +
 htdocs/don/info.php                                      | 1 +
 htdocs/don/list.php                                      | 1 +
 htdocs/don/note.php                                      | 1 +
 htdocs/don/payment/card.php                              | 1 +
 htdocs/don/payment/payment.php                           | 1 +
 htdocs/don/stats/index.php                               | 1 +
 htdocs/ecm/ajax/ecmdatabase.php                          | 1 +
 htdocs/ecm/dir_add_card.php                              | 1 +
 htdocs/ecm/dir_card.php                                  | 1 +
 htdocs/ecm/file_card.php                                 | 1 +
 htdocs/ecm/file_note.php                                 | 1 +
 htdocs/ecm/index.php                                     | 1 +
 htdocs/ecm/index_auto.php                                | 1 +
 htdocs/ecm/search.php                                    | 1 +
 htdocs/expedition/card.php                               | 1 +
 htdocs/expedition/contact.php                            | 1 +
 htdocs/expedition/document.php                           | 1 +
 htdocs/expedition/index.php                              | 1 +
 htdocs/expedition/list.php                               | 1 +
 htdocs/expedition/note.php                               | 1 +
 htdocs/expedition/shipment.php                           | 1 +
 htdocs/expedition/stats/index.php                        | 1 +
 htdocs/expedition/stats/month.php                        | 1 +
 htdocs/expensereport/card.php                            | 1 +
 htdocs/expensereport/document.php                        | 1 +
 htdocs/expensereport/index.php                           | 1 +
 htdocs/expensereport/info.php                            | 1 +
 htdocs/expensereport/list.php                            | 1 +
 htdocs/expensereport/note.php                            | 1 +
 htdocs/expensereport/payment/card.php                    | 1 +
 htdocs/expensereport/payment/info.php                    | 1 +
 htdocs/expensereport/payment/list.php                    | 1 +
 htdocs/expensereport/payment/payment.php                 | 1 +
 htdocs/expensereport/stats/index.php                     | 1 +
 htdocs/externalsite/admin/index.php                      | 1 +
 htdocs/externalsite/frames.php                           | 1 +
 htdocs/fichinter/admin/fichinter_extrafields.php         | 1 +
 htdocs/fichinter/admin/fichinterdet_extrafields.php      | 1 +
 htdocs/fichinter/card-rec.php                            | 1 +
 htdocs/fichinter/card.php                                | 1 +
 htdocs/fichinter/contact.php                             | 1 +
 htdocs/fichinter/document.php                            | 1 +
 htdocs/fichinter/index.php                               | 1 +
 htdocs/fichinter/info.php                                | 1 +
 htdocs/fichinter/list.php                                | 1 +
 htdocs/fichinter/note.php                                | 1 +
 htdocs/fichinter/stats/index.php                         | 1 +
 htdocs/fourn/ajax/getSupplierPrices.php                  | 1 +
 htdocs/fourn/card.php                                    | 1 +
 htdocs/fourn/commande/card.php                           | 1 +
 htdocs/fourn/commande/contact.php                        | 1 +
 htdocs/fourn/commande/dispatch.php                       | 1 +
 htdocs/fourn/commande/document.php                       | 1 +
 htdocs/fourn/commande/index.php                          | 1 +
 htdocs/fourn/commande/info.php                           | 1 +
 htdocs/fourn/commande/list.php                           | 1 +
 htdocs/fourn/commande/note.php                           | 1 +
 htdocs/fourn/contact.php                                 | 1 +
 htdocs/fourn/facture/card-rec.php                        | 1 +
 htdocs/fourn/facture/card.php                            | 1 +
 htdocs/fourn/facture/contact.php                         | 1 +
 htdocs/fourn/facture/document.php                        | 1 +
 htdocs/fourn/facture/index.php                           | 1 +
 htdocs/fourn/facture/info.php                            | 1 +
 htdocs/fourn/facture/list-rec.php                        | 1 +
 htdocs/fourn/facture/list.php                            | 1 +
 htdocs/fourn/facture/note.php                            | 1 +
 htdocs/fourn/facture/paiement.php                        | 1 +
 htdocs/fourn/facture/rapport.php                         | 1 +
 htdocs/fourn/index.php                                   | 1 +
 htdocs/fourn/paiement/list.php                           | 1 +
 htdocs/fourn/recap-fourn.php                             | 1 +
 htdocs/ftp/admin/ftpclient.php                           | 1 +
 htdocs/ftp/index.php                                     | 1 +
 htdocs/holiday/card.php                                  | 1 +
 htdocs/holiday/card_group.php                            | 1 +
 htdocs/holiday/define_holiday.php                        | 1 +
 htdocs/holiday/document.php                              | 1 +
 htdocs/holiday/info.php                                  | 1 +
 htdocs/holiday/list.php                                  | 1 +
 htdocs/holiday/month_report.php                          | 1 +
 htdocs/holiday/view_log.php                              | 1 +
 htdocs/hrm/establishment/card.php                        | 1 +
 htdocs/hrm/establishment/info.php                        | 1 +
 htdocs/imports/emptyexample.php                          | 1 +
 htdocs/intracommreport/admin/intracommreport.php         | 1 +
 htdocs/intracommreport/card.php                          | 1 +
 htdocs/intracommreport/list.php                          | 1 +
 htdocs/loan/calcmens.php                                 | 1 +
 htdocs/loan/card.php                                     | 1 +
 htdocs/loan/document.php                                 | 1 +
 htdocs/loan/info.php                                     | 1 +
 htdocs/loan/list.php                                     | 1 +
 htdocs/loan/note.php                                     | 1 +
 htdocs/loan/payment/card.php                             | 1 +
 htdocs/loan/payment/payment.php                          | 1 +
 htdocs/loan/schedule.php                                 | 1 +
 htdocs/margin/agentMargins.php                           | 1 +
 htdocs/margin/customerMargins.php                        | 1 +
 htdocs/margin/index.php                                  | 1 +
 htdocs/margin/productMargins.php                         | 1 +
 htdocs/margin/tabs/productMargins.php                    | 1 +
 htdocs/margin/tabs/thirdpartyMargins.php                 | 1 +
 htdocs/modulebuilder/index.php                           | 1 +
 htdocs/mrp/ajax/ajax_bom.php                             | 1 +
 htdocs/mrp/index.php                                     | 1 +
 htdocs/multicurrency/multicurrency_rate.php              | 1 +
 htdocs/opensurvey/card.php                               | 1 +
 htdocs/opensurvey/exportcsv.php                          | 1 +
 htdocs/opensurvey/index.php                              | 1 +
 htdocs/opensurvey/list.php                               | 1 +
 htdocs/opensurvey/results.php                            | 1 +
 htdocs/opensurvey/wizard/choix_autre.php                 | 1 +
 htdocs/opensurvey/wizard/choix_date.php                  | 1 +
 htdocs/opensurvey/wizard/create_survey.php               | 1 +
 htdocs/opensurvey/wizard/index.php                       | 1 +
 htdocs/partnership/admin/website.php                     | 1 +
 htdocs/paybox/admin/paybox.php                           | 1 +
 htdocs/paypal/admin/paypal.php                           | 1 +
 htdocs/printing/admin/printing.php                       | 1 +
 htdocs/printing/index.php                                | 1 +
 htdocs/product/admin/dynamic_prices.php                  | 1 +
 htdocs/product/admin/price_rules.php                     | 1 +
 htdocs/product/admin/product.php                         | 1 +
 htdocs/product/admin/product_extrafields.php             | 1 +
 htdocs/product/admin/product_lot.php                     | 1 +
 htdocs/product/admin/product_lot_extrafields.php         | 1 +
 htdocs/product/admin/product_supplier_extrafields.php    | 1 +
 htdocs/product/admin/product_tools.php                   | 1 +
 htdocs/product/admin/stock_extrafields.php               | 1 +
 htdocs/product/agenda.php                                | 1 +
 htdocs/product/ajax/products.php                         | 1 +
 htdocs/product/composition/card.php                      | 1 +
 htdocs/product/dynamic_price/editor.php                  | 1 +
 htdocs/product/fournisseurs.php                          | 9 +++++----
 htdocs/product/inventory/card.php                        | 1 +
 htdocs/product/inventory/inventory.php                   | 1 +
 htdocs/product/note.php                                  | 1 +
 htdocs/product/popuprop.php                              | 1 +
 htdocs/product/price.php                                 | 1 +
 htdocs/product/reassort.php                              | 1 +
 htdocs/product/reassortlot.php                           | 1 +
 htdocs/product/stats/bom.php                             | 1 +
 htdocs/product/stats/card.php                            | 1 +
 htdocs/product/stats/commande.php                        | 1 +
 htdocs/product/stats/contrat.php                         | 1 +
 htdocs/product/stats/facture.php                         | 1 +
 htdocs/product/stats/facture_fournisseur.php             | 1 +
 htdocs/product/stats/facturerec.php                      | 1 +
 htdocs/product/stats/mo.php                              | 1 +
 htdocs/product/stats/propal.php                          | 1 +
 htdocs/product/stats/supplier_proposal.php               | 1 +
 htdocs/product/stock/card.php                            | 1 +
 htdocs/product/stock/fiche-valo.php                      | 1 +
 htdocs/product/stock/index.php                           | 1 +
 htdocs/product/stock/info.php                            | 1 +
 htdocs/product/stock/list.php                            | 1 +
 htdocs/product/stock/massstockmove.php                   | 1 +
 htdocs/product/stock/movement_card.php                   | 1 +
 htdocs/product/stock/movement_list.php                   | 1 +
 htdocs/product/stock/product.php                         | 1 +
 htdocs/product/stock/productlot_card.php                 | 1 +
 htdocs/product/stock/productlot_document.php             | 1 +
 htdocs/product/stock/productlot_list.php                 | 1 +
 htdocs/product/stock/replenish.php                       | 1 +
 htdocs/product/stock/replenishorders.php                 | 1 +
 htdocs/product/stock/stockatdate.php                     | 1 +
 .../product/stock/stocktransfer/stocktransfer_agenda.php | 1 +
 .../product/stock/stocktransfer/stocktransfer_card.php   | 1 +
 .../stock/stocktransfer/stocktransfer_contact.php        | 1 +
 .../stock/stocktransfer/stocktransfer_document.php       | 1 +
 .../product/stock/stocktransfer/stocktransfer_list.php   | 1 +
 .../product/stock/stocktransfer/stocktransfer_note.php   | 1 +
 htdocs/product/stock/valo.php                            | 1 +
 htdocs/product/traduction.php                            | 1 +
 htdocs/projet/admin/project.php                          | 1 +
 htdocs/projet/admin/project_extrafields.php              | 1 +
 htdocs/projet/admin/project_task_extrafields.php         | 1 +
 htdocs/projet/admin/website.php                          | 1 +
 htdocs/projet/ajax/projects.php                          | 1 +
 htdocs/projet/card.php                                   | 1 +
 htdocs/projet/comment.php                                | 1 +
 htdocs/projet/contact.php                                | 1 +
 htdocs/projet/document.php                               | 1 +
 htdocs/projet/element.php                                | 1 +
 htdocs/projet/index.php                                  | 1 +
 htdocs/projet/info.php                                   | 1 +
 htdocs/projet/list.php                                   | 1 +
 htdocs/projet/note.php                                   | 1 +
 htdocs/projet/stats/index.php                            | 1 +
 htdocs/projet/tasks/document.php                         | 1 +
 htdocs/projet/tasks/stats/index.php                      | 1 +
 htdocs/projet/tasks/time.php                             | 1 +
 htdocs/public/agenda/agendaexport.php                    | 1 +
 htdocs/public/demo/index.php                             | 1 +
 htdocs/public/donations/donateurs_code.php               | 1 +
 htdocs/public/emailing/mailing-read.php                  | 1 +
 htdocs/public/emailing/mailing-unsubscribe.php           | 1 +
 htdocs/public/eventorganization/attendee_new.php         | 1 +
 htdocs/public/eventorganization/subscriptionok.php       | 1 +
 htdocs/public/members/public_card.php                    | 1 +
 htdocs/public/members/public_list.php                    | 1 +
 htdocs/public/notice.php                                 | 1 +
 htdocs/public/onlinesign/newonlinesign.php               | 1 +
 htdocs/public/opensurvey/studs.php                       | 1 +
 htdocs/public/partnership/new.php                        | 1 +
 htdocs/public/payment/newpayment.php                     | 1 +
 htdocs/public/payment/paymentko.php                      | 1 +
 htdocs/public/payment/paymentok.php                      | 1 +
 htdocs/public/project/index.php                          | 1 +
 htdocs/public/project/new.php                            | 1 +
 htdocs/public/project/suggestbooth.php                   | 1 +
 htdocs/public/project/suggestconference.php              | 1 +
 htdocs/public/project/viewandvote.php                    | 1 +
 htdocs/public/recruitment/index.php                      | 1 +
 htdocs/public/recruitment/view.php                       | 1 +
 htdocs/public/stripe/ipn.php                             | 1 +
 htdocs/public/test/test_arrays.php                       | 1 +
 htdocs/public/test/test_csrf.php                         | 1 +
 htdocs/public/test/test_exec.php                         | 1 +
 htdocs/public/test/test_forms.php                        | 1 +
 htdocs/public/test/test_sessionlock.php                  | 1 +
 htdocs/public/ticket/create_ticket.php                   | 1 +
 htdocs/public/ticket/index.php                           | 1 +
 htdocs/public/ticket/list.php                            | 1 +
 htdocs/public/ticket/view.php                            | 1 +
 htdocs/reception/card.php                                | 1 +
 htdocs/reception/contact.php                             | 1 +
 htdocs/reception/document.php                            | 1 +
 htdocs/reception/index.php                               | 1 +
 htdocs/reception/list.php                                | 1 +
 htdocs/reception/note.php                                | 1 +
 htdocs/reception/stats/index.php                         | 1 +
 htdocs/reception/stats/month.php                         | 1 +
 htdocs/recruitment/admin/candidature_extrafields.php     | 1 +
 htdocs/recruitment/admin/jobposition_extrafields.php     | 1 +
 htdocs/recruitment/admin/public_interface.php            | 1 +
 htdocs/recruitment/index.php                             | 1 +
 htdocs/resource/agenda.php                               | 1 +
 htdocs/resource/card.php                                 | 1 +
 htdocs/resource/contact.php                              | 1 +
 htdocs/resource/document.php                             | 1 +
 htdocs/resource/element_resource.php                     | 1 +
 htdocs/resource/list.php                                 | 1 +
 htdocs/resource/note.php                                 | 1 +
 htdocs/salaries/admin/salaries.php                       | 1 +
 htdocs/salaries/admin/salaries_extrafields.php           | 1 +
 htdocs/salaries/ajax/ajaxsalaries.php                    | 1 +
 htdocs/salaries/card.php                                 | 1 +
 htdocs/salaries/document.php                             | 1 +
 htdocs/salaries/info.php                                 | 1 +
 htdocs/salaries/list.php                                 | 1 +
 htdocs/salaries/paiement_salary.php                      | 1 +
 htdocs/salaries/payment_salary/card.php                  | 1 +
 htdocs/salaries/payments.php                             | 1 +
 htdocs/salaries/stats/index.php                          | 1 +
 htdocs/societe/admin/contact_extrafields.php             | 1 +
 htdocs/societe/admin/societe.php                         | 1 +
 htdocs/societe/admin/societe_extrafields.php             | 1 +
 htdocs/societe/ajax/ajaxcompanies.php                    | 1 +
 htdocs/societe/ajax/company.php                          | 1 +
 htdocs/societe/notify/card.php                           | 1 +
 htdocs/stripe/admin/stripe.php                           | 1 +
 htdocs/stripe/ajax/ajax.php                              | 1 +
 htdocs/stripe/charge.php                                 | 1 +
 htdocs/stripe/payout.php                                 | 1 +
 htdocs/stripe/transaction.php                            | 1 +
 .../admin/supplier_proposal_extrafields.php              | 1 +
 .../admin/supplier_proposaldet_extrafields.php           | 1 +
 htdocs/supplier_proposal/card.php                        | 1 +
 htdocs/supplier_proposal/contact.php                     | 1 +
 htdocs/supplier_proposal/document.php                    | 1 +
 htdocs/supplier_proposal/index.php                       | 1 +
 htdocs/supplier_proposal/info.php                        | 1 +
 htdocs/supplier_proposal/list.php                        | 1 +
 htdocs/supplier_proposal/note.php                        | 1 +
 htdocs/takepos/admin/appearance.php                      | 1 +
 htdocs/takepos/admin/bar.php                             | 1 +
 htdocs/takepos/admin/orderprinters.php                   | 1 +
 htdocs/takepos/admin/printqr.php                         | 1 +
 htdocs/takepos/admin/receipt.php                         | 1 +
 htdocs/takepos/admin/setup.php                           | 1 +
 htdocs/takepos/admin/terminal.php                        | 1 +
 htdocs/takepos/ajax/ajax.php                             | 1 +
 htdocs/takepos/floors.php                                | 1 +
 htdocs/takepos/freezone.php                              | 1 +
 htdocs/takepos/genimg/qr.php                             | 1 +
 htdocs/takepos/index.php                                 | 1 +
 htdocs/takepos/pay.php                                   | 1 +
 htdocs/takepos/printbox.php                              | 1 +
 htdocs/takepos/public/auto_order.php                     | 1 +
 htdocs/takepos/public/menu.php                           | 1 +
 htdocs/takepos/reduction.php                             | 1 +
 htdocs/takepos/send.php                                  | 1 +
 htdocs/takepos/smpcb.php                                 | 1 +
 htdocs/takepos/split.php                                 | 1 +
 htdocs/ticket/card.php                                   | 1 +
 htdocs/ticket/contact.php                                | 1 +
 htdocs/ticket/document.php                               | 1 +
 htdocs/ticket/index.php                                  | 1 +
 htdocs/ticket/list.php                                   | 1 +
 htdocs/ticket/messaging.php                              | 1 +
 htdocs/ticket/stats/index.php                            | 1 +
 htdocs/user/admin/group_extrafields.php                  | 1 +
 htdocs/user/admin/user_extrafields.php                   | 1 +
 htdocs/user/agenda_extsites.php                          | 1 +
 htdocs/user/bank.php                                     | 1 +
 htdocs/user/card.php                                     | 1 +
 htdocs/user/clicktodial.php                              | 1 +
 htdocs/user/document.php                                 | 1 +
 htdocs/user/group/card.php                               | 1 +
 htdocs/user/group/ldap.php                               | 1 +
 htdocs/user/group/list.php                               | 1 +
 htdocs/user/group/perms.php                              | 1 +
 htdocs/user/hierarchy.php                                | 1 +
 htdocs/user/home.php                                     | 1 +
 htdocs/user/info.php                                     | 1 +
 htdocs/user/ldap.php                                     | 1 +
 htdocs/user/list.php                                     | 1 +
 htdocs/user/note.php                                     | 1 +
 htdocs/user/notify/card.php                              | 1 +
 htdocs/user/param_ihm.php                                | 1 +
 htdocs/user/passwordforgotten.php                        | 1 +
 htdocs/user/perms.php                                    | 1 +
 htdocs/user/vcard.php                                    | 1 +
 htdocs/variants/admin/admin.php                          | 1 +
 htdocs/variants/ajax/getCombinations.php                 | 1 +
 htdocs/variants/ajax/get_attribute_values.php            | 1 +
 htdocs/variants/ajax/orderAttribute.php                  | 1 +
 htdocs/variants/card.php                                 | 1 +
 htdocs/variants/combinations.php                         | 1 +
 htdocs/variants/list.php                                 | 1 +
 htdocs/webservices/admin/index.php                       | 1 +
 745 files changed, 749 insertions(+), 4 deletions(-)

diff --git a/htdocs/accountancy/admin/account.php b/htdocs/accountancy/admin/account.php
index 423a32cf9c1..c9d7672e7f3 100644
--- a/htdocs/accountancy/admin/account.php
+++ b/htdocs/accountancy/admin/account.php
@@ -23,6 +23,7 @@
  * \brief		List accounting account
  */
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/accounting.lib.php';
diff --git a/htdocs/accountancy/admin/accountmodel.php b/htdocs/accountancy/admin/accountmodel.php
index c1bc435145f..69c3f1b2a6f 100644
--- a/htdocs/accountancy/admin/accountmodel.php
+++ b/htdocs/accountancy/admin/accountmodel.php
@@ -32,6 +32,7 @@
  *		\brief      Page to administer model of chart of accounts
  */
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formadmin.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php';
diff --git a/htdocs/accountancy/admin/card.php b/htdocs/accountancy/admin/card.php
index 7876712fe51..f9abb5e292c 100644
--- a/htdocs/accountancy/admin/card.php
+++ b/htdocs/accountancy/admin/card.php
@@ -23,6 +23,7 @@
  *  \brief      Card of accounting account
  */
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/accounting.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/accountancy/class/accountingaccount.class.php';
diff --git a/htdocs/accountancy/admin/categories.php b/htdocs/accountancy/admin/categories.php
index e65572eafd3..f8837bc81c8 100644
--- a/htdocs/accountancy/admin/categories.php
+++ b/htdocs/accountancy/admin/categories.php
@@ -22,6 +22,7 @@
  * \brief	Page to assign mass categories to accounts
  */
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/accounting.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/accountancy/class/accountancycategory.class.php';
diff --git a/htdocs/accountancy/admin/categories_list.php b/htdocs/accountancy/admin/categories_list.php
index ea613ea38cd..5535a47e30d 100644
--- a/htdocs/accountancy/admin/categories_list.php
+++ b/htdocs/accountancy/admin/categories_list.php
@@ -22,6 +22,7 @@
  *		\brief      Page to administer data tables
  */
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formadmin.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php';
diff --git a/htdocs/accountancy/admin/closure.php b/htdocs/accountancy/admin/closure.php
index 437ff1b7116..e3f979db6a3 100644
--- a/htdocs/accountancy/admin/closure.php
+++ b/htdocs/accountancy/admin/closure.php
@@ -22,6 +22,7 @@
  * \brief		Setup page to configure accounting expert module
  */
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/accounting.lib.php';
diff --git a/htdocs/accountancy/admin/fiscalyear.php b/htdocs/accountancy/admin/fiscalyear.php
index 6a6135dad40..301a3def70e 100644
--- a/htdocs/accountancy/admin/fiscalyear.php
+++ b/htdocs/accountancy/admin/fiscalyear.php
@@ -21,6 +21,7 @@
  *  \brief      Setup page to configure fiscal year
  */
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/fiscalyear.class.php';
diff --git a/htdocs/accountancy/admin/fiscalyear_card.php b/htdocs/accountancy/admin/fiscalyear_card.php
index f6e765caf13..d798b6baa5f 100644
--- a/htdocs/accountancy/admin/fiscalyear_card.php
+++ b/htdocs/accountancy/admin/fiscalyear_card.php
@@ -22,6 +22,7 @@
  * \brief       Page to show a fiscal year
  */
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 
 require_once DOL_DOCUMENT_ROOT.'/core/lib/fiscalyear.lib.php';
diff --git a/htdocs/accountancy/admin/fiscalyear_info.php b/htdocs/accountancy/admin/fiscalyear_info.php
index 77ec988143a..1cc6fcba958 100644
--- a/htdocs/accountancy/admin/fiscalyear_info.php
+++ b/htdocs/accountancy/admin/fiscalyear_info.php
@@ -21,6 +21,7 @@
  * \brief	    Page to show info of a fiscal year
  */
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/fiscalyear.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
diff --git a/htdocs/accountancy/admin/index.php b/htdocs/accountancy/admin/index.php
index af569e08ae3..ed5ced40f7f 100644
--- a/htdocs/accountancy/admin/index.php
+++ b/htdocs/accountancy/admin/index.php
@@ -29,6 +29,7 @@
  * \brief		Setup page to configure accounting expert module
  */
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/accounting.lib.php';
diff --git a/htdocs/accountancy/admin/journals_list.php b/htdocs/accountancy/admin/journals_list.php
index 3ea90e283ce..414205f6bc6 100644
--- a/htdocs/accountancy/admin/journals_list.php
+++ b/htdocs/accountancy/admin/journals_list.php
@@ -26,6 +26,7 @@ if (!defined('CSRFCHECK_WITH_TOKEN')) {
 	define('CSRFCHECK_WITH_TOKEN', '1'); // Force use of CSRF protection with tokens even for GET
 }
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formadmin.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php';
diff --git a/htdocs/accountancy/admin/subaccount.php b/htdocs/accountancy/admin/subaccount.php
index cc0d4de9f31..89ef81b3996 100644
--- a/htdocs/accountancy/admin/subaccount.php
+++ b/htdocs/accountancy/admin/subaccount.php
@@ -23,6 +23,7 @@
  * \brief		List of accounting sub-account (auxiliary accounts)
  */
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/accounting.lib.php';
diff --git a/htdocs/accountancy/bookkeeping/balance.php b/htdocs/accountancy/bookkeeping/balance.php
index 324c9c767b4..cb479a1dc59 100644
--- a/htdocs/accountancy/bookkeeping/balance.php
+++ b/htdocs/accountancy/bookkeeping/balance.php
@@ -24,6 +24,7 @@
  *  \brief 		Balance of book keeping
  */
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 
 // Class
diff --git a/htdocs/accountancy/bookkeeping/card.php b/htdocs/accountancy/bookkeeping/card.php
index 15dba808e00..e120606b927 100644
--- a/htdocs/accountancy/bookkeeping/card.php
+++ b/htdocs/accountancy/bookkeeping/card.php
@@ -25,6 +25,7 @@
  * \brief		Page to show book-entry
  */
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/accounting.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/accountancy/class/bookkeeping.class.php';
diff --git a/htdocs/accountancy/bookkeeping/list.php b/htdocs/accountancy/bookkeeping/list.php
index 4ba5f0aa9be..a76fa1945c2 100644
--- a/htdocs/accountancy/bookkeeping/list.php
+++ b/htdocs/accountancy/bookkeeping/list.php
@@ -25,6 +25,7 @@
  * \brief 		List operation of book keeping
  */
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/accountancy/class/accountancyexport.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/accounting.lib.php';
diff --git a/htdocs/accountancy/bookkeeping/listbyaccount.php b/htdocs/accountancy/bookkeeping/listbyaccount.php
index 4b5f0d9bad6..ba94415782f 100644
--- a/htdocs/accountancy/bookkeeping/listbyaccount.php
+++ b/htdocs/accountancy/bookkeeping/listbyaccount.php
@@ -25,6 +25,7 @@
  * \brief 		List operation of ledger ordered by account number
  */
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 
 require_once DOL_DOCUMENT_ROOT.'/core/lib/accounting.lib.php';
diff --git a/htdocs/accountancy/closure/index.php b/htdocs/accountancy/closure/index.php
index c4b5540fcc8..da4f5eecd25 100644
--- a/htdocs/accountancy/closure/index.php
+++ b/htdocs/accountancy/closure/index.php
@@ -21,6 +21,7 @@
  * \brief 	    Home closure page
  */
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/accounting.lib.php';
diff --git a/htdocs/accountancy/customer/index.php b/htdocs/accountancy/customer/index.php
index 06db5cedd0e..472dce11e37 100644
--- a/htdocs/accountancy/customer/index.php
+++ b/htdocs/accountancy/customer/index.php
@@ -26,6 +26,7 @@
  * \brief 	Home customer journalization page
  */
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/accounting.lib.php';
diff --git a/htdocs/accountancy/expensereport/index.php b/htdocs/accountancy/expensereport/index.php
index d0b25bdffd2..5064003c7ff 100644
--- a/htdocs/accountancy/expensereport/index.php
+++ b/htdocs/accountancy/expensereport/index.php
@@ -24,6 +24,7 @@
  * \brief		Home expense report ventilation
  */
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/accounting.lib.php';
diff --git a/htdocs/accountancy/journal/sellsjournal.php b/htdocs/accountancy/journal/sellsjournal.php
index 107dda05f4a..d34d1f5c3dc 100644
--- a/htdocs/accountancy/journal/sellsjournal.php
+++ b/htdocs/accountancy/journal/sellsjournal.php
@@ -30,6 +30,7 @@
  * \brief		Page with sells journal
  */
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/report.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
diff --git a/htdocs/accountancy/journal/variousjournal.php b/htdocs/accountancy/journal/variousjournal.php
index d737925f2c3..874559751d6 100644
--- a/htdocs/accountancy/journal/variousjournal.php
+++ b/htdocs/accountancy/journal/variousjournal.php
@@ -21,6 +21,7 @@
  * \brief		Page of a journal
  */
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/accounting.lib.php';
diff --git a/htdocs/accountancy/supplier/index.php b/htdocs/accountancy/supplier/index.php
index 449b13f1039..2237b4347ca 100644
--- a/htdocs/accountancy/supplier/index.php
+++ b/htdocs/accountancy/supplier/index.php
@@ -24,6 +24,7 @@
  * \brief		Home supplier journalization page
  */
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/accounting.lib.php';
diff --git a/htdocs/adherents/admin/member.php b/htdocs/adherents/admin/member.php
index 2ffed8b8d97..c94084358bd 100644
--- a/htdocs/adherents/admin/member.php
+++ b/htdocs/adherents/admin/member.php
@@ -30,6 +30,7 @@
  *		\brief      Page to setup the module Foundation
  */
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/member.lib.php';
diff --git a/htdocs/adherents/admin/member_emails.php b/htdocs/adherents/admin/member_emails.php
index c55d44d391f..4f942d1f6a8 100644
--- a/htdocs/adherents/admin/member_emails.php
+++ b/htdocs/adherents/admin/member_emails.php
@@ -29,6 +29,7 @@
  *		\brief      Page to setup the module Foundation
  */
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/member.lib.php';
diff --git a/htdocs/adherents/admin/member_extrafields.php b/htdocs/adherents/admin/member_extrafields.php
index 210e6213d6f..ef12b5cf68e 100644
--- a/htdocs/adherents/admin/member_extrafields.php
+++ b/htdocs/adherents/admin/member_extrafields.php
@@ -24,6 +24,7 @@
  *		\brief      Page to setup extra fields of members
  */
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/member.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
diff --git a/htdocs/adherents/admin/member_type_extrafields.php b/htdocs/adherents/admin/member_type_extrafields.php
index c643d6e15d4..2fc8864b323 100644
--- a/htdocs/adherents/admin/member_type_extrafields.php
+++ b/htdocs/adherents/admin/member_type_extrafields.php
@@ -27,6 +27,7 @@
  *		\brief      Page to setup extra fields of members
  */
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/member.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
diff --git a/htdocs/adherents/admin/website.php b/htdocs/adherents/admin/website.php
index 41ea43c4cec..8831f06fd06 100644
--- a/htdocs/adherents/admin/website.php
+++ b/htdocs/adherents/admin/website.php
@@ -24,6 +24,7 @@
  *		\brief      File of main public page for member module
  */
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
diff --git a/htdocs/adherents/agenda.php b/htdocs/adherents/agenda.php
index 204ba1b8f20..ef1daf0b6c8 100644
--- a/htdocs/adherents/agenda.php
+++ b/htdocs/adherents/agenda.php
@@ -26,6 +26,7 @@
  *  \brief      Page of members events
  */
 
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
 require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
diff --git a/htdocs/adherents/document.php b/htdocs/adherents/document.php
index c8282179fe5..968f95088dd 100644
--- a/htdocs/adherents/document.php
+++ b/htdocs/adherents/document.php
@@ -25,6 +25,7 @@
  *  \ingroup    societe
  */
 
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/member.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
diff --git a/htdocs/adherents/htpasswd.php b/htdocs/adherents/htpasswd.php
index 0a7073f96b0..a97a0a74d28 100644
--- a/htdocs/adherents/htpasswd.php
+++ b/htdocs/adherents/htpasswd.php
@@ -23,6 +23,7 @@
  *      \brief      Export page htpasswd of the membership file
  */
 
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/security2.lib.php';
 
diff --git a/htdocs/adherents/ldap.php b/htdocs/adherents/ldap.php
index db87e514cb5..32b758fee12 100644
--- a/htdocs/adherents/ldap.php
+++ b/htdocs/adherents/ldap.php
@@ -22,6 +22,7 @@
  *       \brief      Page fiche LDAP adherent
  */
 
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/member.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/ldap.lib.php';
diff --git a/htdocs/adherents/stats/byproperties.php b/htdocs/adherents/stats/byproperties.php
index 63deec867ef..f632a1ea9c7 100644
--- a/htdocs/adherents/stats/byproperties.php
+++ b/htdocs/adherents/stats/byproperties.php
@@ -21,6 +21,7 @@
  *		\brief      Page with statistics on members
  */
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/member.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
diff --git a/htdocs/adherents/stats/geo.php b/htdocs/adherents/stats/geo.php
index 3490f61d006..bb65a1047a8 100644
--- a/htdocs/adherents/stats/geo.php
+++ b/htdocs/adherents/stats/geo.php
@@ -21,6 +21,7 @@
  *		\brief      Page with geographical statistics on members
  */
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/member.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
diff --git a/htdocs/adherents/stats/index.php b/htdocs/adherents/stats/index.php
index 0854b94bff2..11447dcd8bb 100644
--- a/htdocs/adherents/stats/index.php
+++ b/htdocs/adherents/stats/index.php
@@ -23,6 +23,7 @@
  *		\brief      Page of subscription members statistics
  */
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
 require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherentstats.class.php';
diff --git a/htdocs/adherents/subscription.php b/htdocs/adherents/subscription.php
index 5779fe036d9..e6431729c44 100644
--- a/htdocs/adherents/subscription.php
+++ b/htdocs/adherents/subscription.php
@@ -27,6 +27,7 @@
  *       \brief      tab for Adding, editing, deleting a member's memberships
  */
 
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/member.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
diff --git a/htdocs/adherents/subscription/card.php b/htdocs/adherents/subscription/card.php
index 439541dff05..6c477d46239 100644
--- a/htdocs/adherents/subscription/card.php
+++ b/htdocs/adherents/subscription/card.php
@@ -22,6 +22,7 @@
  *       \brief      Page to add/edit/remove a member subscription
  */
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/member.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
diff --git a/htdocs/adherents/subscription/info.php b/htdocs/adherents/subscription/info.php
index 9eb431320cd..5faf1d31760 100644
--- a/htdocs/adherents/subscription/info.php
+++ b/htdocs/adherents/subscription/info.php
@@ -22,6 +22,7 @@
  *      \brief      Page with information of subscriptions of a member
  */
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
diff --git a/htdocs/adherents/subscription/list.php b/htdocs/adherents/subscription/list.php
index c19fa40c2bc..1523bd4ee90 100644
--- a/htdocs/adherents/subscription/list.php
+++ b/htdocs/adherents/subscription/list.php
@@ -23,6 +23,7 @@
  *      \brief      list of subscription
  */
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 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/adherents/type.php b/htdocs/adherents/type.php
index b6463e006a9..95a8b153ec3 100644
--- a/htdocs/adherents/type.php
+++ b/htdocs/adherents/type.php
@@ -29,6 +29,7 @@
  *      \brief      Member's type setup
  */
 
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/member.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
diff --git a/htdocs/adherents/type_ldap.php b/htdocs/adherents/type_ldap.php
index d7650a8de2b..058e36fe1bd 100644
--- a/htdocs/adherents/type_ldap.php
+++ b/htdocs/adherents/type_ldap.php
@@ -22,6 +22,7 @@
  *      \brief      Page fiche LDAP members types
  */
 
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/member.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
diff --git a/htdocs/adherents/type_translation.php b/htdocs/adherents/type_translation.php
index d7d062a1e5f..5e1db1233b8 100644
--- a/htdocs/adherents/type_translation.php
+++ b/htdocs/adherents/type_translation.php
@@ -25,6 +25,7 @@
  *	\brief      Member translation page
  */
 
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/member.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
diff --git a/htdocs/adherents/vcard.php b/htdocs/adherents/vcard.php
index 902206c7874..1d97ed7c619 100644
--- a/htdocs/adherents/vcard.php
+++ b/htdocs/adherents/vcard.php
@@ -25,6 +25,7 @@
  *		\brief      Vcard tab of a member
  */
 
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
 require_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
diff --git a/htdocs/admin/accountant.php b/htdocs/admin/accountant.php
index e48ce5f2382..a98b9984009 100644
--- a/htdocs/admin/accountant.php
+++ b/htdocs/admin/accountant.php
@@ -21,6 +21,7 @@
  *	\brief      Setup page to configure accountant / auditor
  */
 
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
diff --git a/htdocs/admin/accounting.php b/htdocs/admin/accounting.php
index ebe0712b03a..fba458936b8 100644
--- a/htdocs/admin/accounting.php
+++ b/htdocs/admin/accounting.php
@@ -21,6 +21,7 @@
  *	\brief      Setup page to configure accounting module
  */
 
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
diff --git a/htdocs/admin/agenda.php b/htdocs/admin/agenda.php
index e9708d8c005..c62101ab70b 100644
--- a/htdocs/admin/agenda.php
+++ b/htdocs/admin/agenda.php
@@ -25,6 +25,7 @@
  *      \brief      Autocreate actions for agenda module setup page
  */
 
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/agenda.lib.php';
diff --git a/htdocs/admin/agenda_extrafields.php b/htdocs/admin/agenda_extrafields.php
index 13f8ad246a0..cc91646b456 100644
--- a/htdocs/admin/agenda_extrafields.php
+++ b/htdocs/admin/agenda_extrafields.php
@@ -26,6 +26,7 @@
  *		\brief      Page to setup extra fields of agenda
  */
 
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/agenda.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
diff --git a/htdocs/admin/agenda_extsites.php b/htdocs/admin/agenda_extsites.php
index 6e0a6e9085f..86701344ba4 100644
--- a/htdocs/admin/agenda_extsites.php
+++ b/htdocs/admin/agenda_extsites.php
@@ -25,6 +25,7 @@
  *      \brief      Page to setup external calendars for agenda module
  */
 
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formadmin.class.php';
diff --git a/htdocs/admin/agenda_other.php b/htdocs/admin/agenda_other.php
index 1014d40de50..7b057a0693c 100644
--- a/htdocs/admin/agenda_other.php
+++ b/htdocs/admin/agenda_other.php
@@ -26,6 +26,7 @@
  *      \brief      Autocreate actions for agenda module setup page
  */
 
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/agenda.lib.php';
diff --git a/htdocs/admin/agenda_reminder.php b/htdocs/admin/agenda_reminder.php
index 166c24f2188..76c717b669d 100644
--- a/htdocs/admin/agenda_reminder.php
+++ b/htdocs/admin/agenda_reminder.php
@@ -21,6 +21,7 @@
  *      \brief      Page to setup agenda reminder options
  */
 
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/agenda.lib.php';
diff --git a/htdocs/admin/agenda_xcal.php b/htdocs/admin/agenda_xcal.php
index e3f2c7307f7..499d7233ed0 100644
--- a/htdocs/admin/agenda_xcal.php
+++ b/htdocs/admin/agenda_xcal.php
@@ -24,6 +24,7 @@
  *      \brief      Page to setup miscellaneous options of agenda module
  */
 
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/agenda.lib.php';
diff --git a/htdocs/admin/bank_extrafields.php b/htdocs/admin/bank_extrafields.php
index 1382ef49983..b872a22108c 100644
--- a/htdocs/admin/bank_extrafields.php
+++ b/htdocs/admin/bank_extrafields.php
@@ -26,6 +26,7 @@
  *		\brief      Page to setup extra fields of bank
  */
 
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/bank.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
diff --git a/htdocs/admin/barcode.php b/htdocs/admin/barcode.php
index 4957d5fb513..966281cb0d1 100644
--- a/htdocs/admin/barcode.php
+++ b/htdocs/admin/barcode.php
@@ -24,6 +24,7 @@
  *	\brief      Page to setup barcode module
  */
 
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formbarcode.class.php';
diff --git a/htdocs/admin/bom.php b/htdocs/admin/bom.php
index b19db5a3d5e..a35aef780d2 100644
--- a/htdocs/admin/bom.php
+++ b/htdocs/admin/bom.php
@@ -21,6 +21,7 @@
  *	\brief      Setup page of module BOM
  */
 
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php';
diff --git a/htdocs/admin/bom_extrafields.php b/htdocs/admin/bom_extrafields.php
index 0691f91b592..2facfc570b8 100644
--- a/htdocs/admin/bom_extrafields.php
+++ b/htdocs/admin/bom_extrafields.php
@@ -26,6 +26,7 @@
  *		\brief      Page to setup extra fields of BOM
  */
 
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/bom/lib/bom.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
diff --git a/htdocs/admin/boxes.php b/htdocs/admin/boxes.php
index 1bc5f67239e..c5234e314ce 100644
--- a/htdocs/admin/boxes.php
+++ b/htdocs/admin/boxes.php
@@ -23,6 +23,7 @@
  *   \brief      Page to setup boxes
  */
 
+// Load Dolibarr environment
 require '../main.inc.php';
 include_once DOL_DOCUMENT_ROOT.'/core/boxes/modules_boxes.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/infobox.class.php';
diff --git a/htdocs/admin/chequereceipts.php b/htdocs/admin/chequereceipts.php
index 396d44625a7..cf93155b814 100644
--- a/htdocs/admin/chequereceipts.php
+++ b/htdocs/admin/chequereceipts.php
@@ -25,6 +25,7 @@
  *		\brief      Page to setup the bank module
  */
 
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php';
diff --git a/htdocs/admin/clicktodial.php b/htdocs/admin/clicktodial.php
index 8b8f2c6c921..5e72dc58c67 100644
--- a/htdocs/admin/clicktodial.php
+++ b/htdocs/admin/clicktodial.php
@@ -23,6 +23,7 @@
  *   \brief      Page to setup module ClickToDial
  */
 
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
 
diff --git a/htdocs/admin/commande.php b/htdocs/admin/commande.php
index 4bffad16ee3..b218a91385b 100644
--- a/htdocs/admin/commande.php
+++ b/htdocs/admin/commande.php
@@ -31,6 +31,7 @@
  *	\brief      Setup page of module Order
  */
 
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php';
diff --git a/htdocs/admin/commande_fournisseur_dispatch_extrafields.php b/htdocs/admin/commande_fournisseur_dispatch_extrafields.php
index cf887b6b454..4f89dd8fff6 100644
--- a/htdocs/admin/commande_fournisseur_dispatch_extrafields.php
+++ b/htdocs/admin/commande_fournisseur_dispatch_extrafields.php
@@ -30,6 +30,7 @@
  *		\brief      Page to setup extra fields of reception
  */
 
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/reception.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
diff --git a/htdocs/admin/company.php b/htdocs/admin/company.php
index af44c18bee6..55d87673a98 100644
--- a/htdocs/admin/company.php
+++ b/htdocs/admin/company.php
@@ -27,6 +27,7 @@
  *	\brief      Setup page to configure company/foundation
  */
 
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
diff --git a/htdocs/admin/company_socialnetworks.php b/htdocs/admin/company_socialnetworks.php
index 1f2d102b644..20d86f4aa59 100644
--- a/htdocs/admin/company_socialnetworks.php
+++ b/htdocs/admin/company_socialnetworks.php
@@ -28,6 +28,7 @@
  *	\brief      Setup page to configure company social networks
  */
 
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
 
diff --git a/htdocs/admin/compta.php b/htdocs/admin/compta.php
index 7bb291d521e..afc23f3ff63 100644
--- a/htdocs/admin/compta.php
+++ b/htdocs/admin/compta.php
@@ -27,6 +27,7 @@
  *	\brief      Page to setup accountancy module
  */
 
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
 
diff --git a/htdocs/admin/confexped.php b/htdocs/admin/confexped.php
index 6eaeb0bf233..870b793fce8 100644
--- a/htdocs/admin/confexped.php
+++ b/htdocs/admin/confexped.php
@@ -25,6 +25,7 @@
  *		\brief      Page to setup sending module
  */
 
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/expedition.lib.php';
diff --git a/htdocs/admin/const.php b/htdocs/admin/const.php
index 1354f418967..e5625b0f975 100644
--- a/htdocs/admin/const.php
+++ b/htdocs/admin/const.php
@@ -24,6 +24,7 @@
  *	\brief      Admin page to define miscellaneous constants
  */
 
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/security.lib.php';
diff --git a/htdocs/admin/contract.php b/htdocs/admin/contract.php
index 31d0776da6b..98c72ac68dc 100644
--- a/htdocs/admin/contract.php
+++ b/htdocs/admin/contract.php
@@ -22,6 +22,7 @@
  *	\brief      Setup page of module Contracts
  */
 
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php';
diff --git a/htdocs/admin/dav.php b/htdocs/admin/dav.php
index d9825ad6886..d70356650d9 100644
--- a/htdocs/admin/dav.php
+++ b/htdocs/admin/dav.php
@@ -21,6 +21,7 @@
  *      \brief      Page to setup DAV server
  */
 
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/dav/dav.lib.php';
diff --git a/htdocs/admin/debugbar.php b/htdocs/admin/debugbar.php
index 6672f04a1af..dccf777df60 100644
--- a/htdocs/admin/debugbar.php
+++ b/htdocs/admin/debugbar.php
@@ -24,6 +24,7 @@
  *	\brief      Setup page for debugbar module
  */
 
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
 
diff --git a/htdocs/admin/defaultvalues.php b/htdocs/admin/defaultvalues.php
index f83b77e67a6..ed8936ee3ee 100644
--- a/htdocs/admin/defaultvalues.php
+++ b/htdocs/admin/defaultvalues.php
@@ -26,6 +26,7 @@
  *       			Mandatory fields are stored into $user->default_values[url]['mandatory']['querystring'|'_noquery_'][paramkey]=paramvalue
  */
 
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
diff --git a/htdocs/admin/delais.php b/htdocs/admin/delais.php
index 6935ec9d521..59c826413aa 100644
--- a/htdocs/admin/delais.php
+++ b/htdocs/admin/delais.php
@@ -25,6 +25,7 @@
  *		\brief      Page to setup late delays
  */
 
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
 
diff --git a/htdocs/admin/delivery_extrafields.php b/htdocs/admin/delivery_extrafields.php
index fa1aa809944..32c8f34e570 100644
--- a/htdocs/admin/delivery_extrafields.php
+++ b/htdocs/admin/delivery_extrafields.php
@@ -27,6 +27,7 @@
  *		\brief      Page to setup extra fields of delivery
  */
 
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/expedition.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
diff --git a/htdocs/admin/deliverydet_extrafields.php b/htdocs/admin/deliverydet_extrafields.php
index 6fbfbb58884..5030379320f 100644
--- a/htdocs/admin/deliverydet_extrafields.php
+++ b/htdocs/admin/deliverydet_extrafields.php
@@ -29,6 +29,7 @@
  *		\brief      Page to setup extra fields of delivery
  */
 
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/expedition.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
diff --git a/htdocs/admin/dict.php b/htdocs/admin/dict.php
index ff74273d744..d1ff4a026b3 100644
--- a/htdocs/admin/dict.php
+++ b/htdocs/admin/dict.php
@@ -34,6 +34,7 @@
  *		\brief      Page to administer data tables
  */
 
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formadmin.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php';
diff --git a/htdocs/admin/ecm_directories_extrafields.php b/htdocs/admin/ecm_directories_extrafields.php
index ea75c5ea0fc..4191e40a369 100644
--- a/htdocs/admin/ecm_directories_extrafields.php
+++ b/htdocs/admin/ecm_directories_extrafields.php
@@ -28,6 +28,7 @@
  *  \brief      Page to setup extra fields of ecm
  */
 
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/ecm.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
diff --git a/htdocs/admin/ecm_files_extrafields.php b/htdocs/admin/ecm_files_extrafields.php
index 41a0d714eb9..1887103bcc9 100644
--- a/htdocs/admin/ecm_files_extrafields.php
+++ b/htdocs/admin/ecm_files_extrafields.php
@@ -28,6 +28,7 @@
  *  \brief      Page to setup extra fields of ecm
  */
 
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/ecm.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
diff --git a/htdocs/admin/emailcollector_card.php b/htdocs/admin/emailcollector_card.php
index 81a1e9d45b5..19486510f58 100644
--- a/htdocs/admin/emailcollector_card.php
+++ b/htdocs/admin/emailcollector_card.php
@@ -22,6 +22,7 @@
  *		\brief      Page to create/edit/view emailcollector
  */
 
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/agenda.lib.php';
diff --git a/htdocs/admin/emailcollector_list.php b/htdocs/admin/emailcollector_list.php
index a41e57266aa..075ece751ce 100644
--- a/htdocs/admin/emailcollector_list.php
+++ b/htdocs/admin/emailcollector_list.php
@@ -21,6 +21,7 @@
  *      \brief      List page for emailcollector
  */
 
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/agenda.lib.php';
diff --git a/htdocs/admin/eventorganization_confbooth_extrafields.php b/htdocs/admin/eventorganization_confbooth_extrafields.php
index f17a2cf91e1..97bc4ad37bd 100644
--- a/htdocs/admin/eventorganization_confbooth_extrafields.php
+++ b/htdocs/admin/eventorganization_confbooth_extrafields.php
@@ -21,6 +21,7 @@
  *		\brief      Page to setup extra fields of EventOrganization
  */
 
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/eventorganization.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
diff --git a/htdocs/admin/events.php b/htdocs/admin/events.php
index ceb3c286ac3..4085207642b 100644
--- a/htdocs/admin/events.php
+++ b/htdocs/admin/events.php
@@ -22,6 +22,7 @@
  *      \brief      Log event setup page
  */
 
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/agenda.lib.php';
diff --git a/htdocs/admin/expedition.php b/htdocs/admin/expedition.php
index 0a9009889f8..485ce901e5c 100644
--- a/htdocs/admin/expedition.php
+++ b/htdocs/admin/expedition.php
@@ -28,6 +28,7 @@
  *	\brief      Page d'administration/configuration du module Expedition
  */
 
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php';
diff --git a/htdocs/admin/expedition_extrafields.php b/htdocs/admin/expedition_extrafields.php
index 948efb6188a..ed4e062970d 100644
--- a/htdocs/admin/expedition_extrafields.php
+++ b/htdocs/admin/expedition_extrafields.php
@@ -27,6 +27,7 @@
  *		\brief      Page to setup extra fields of expedition
  */
 
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/expedition.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
diff --git a/htdocs/admin/expeditiondet_extrafields.php b/htdocs/admin/expeditiondet_extrafields.php
index 41fba691b7f..e0ce6a82b8f 100644
--- a/htdocs/admin/expeditiondet_extrafields.php
+++ b/htdocs/admin/expeditiondet_extrafields.php
@@ -29,6 +29,7 @@
  *		\brief      Page to setup extra fields of expedition
  */
 
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/expedition.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
diff --git a/htdocs/admin/expensereport.php b/htdocs/admin/expensereport.php
index 2418ec3e26c..8c20b493105 100644
--- a/htdocs/admin/expensereport.php
+++ b/htdocs/admin/expensereport.php
@@ -28,6 +28,7 @@
  *	\brief      Setup page of module ExpenseReport
  */
 
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php';
diff --git a/htdocs/admin/expensereport_extrafields.php b/htdocs/admin/expensereport_extrafields.php
index 54ce5a9ffea..3406b9092e7 100644
--- a/htdocs/admin/expensereport_extrafields.php
+++ b/htdocs/admin/expensereport_extrafields.php
@@ -26,6 +26,7 @@
  *		\brief      Page to setup extra fields of expensereport
  */
 
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/expensereport.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
diff --git a/htdocs/admin/expensereport_ik.php b/htdocs/admin/expensereport_ik.php
index 10b14f8ee99..b26cefba580 100644
--- a/htdocs/admin/expensereport_ik.php
+++ b/htdocs/admin/expensereport_ik.php
@@ -24,6 +24,7 @@
  *		\brief      Page to display expense tax ik
  */
 
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/expensereport.lib.php';
diff --git a/htdocs/admin/expensereport_rules.php b/htdocs/admin/expensereport_rules.php
index 7c27ee6e408..1ad9cc67e7d 100644
--- a/htdocs/admin/expensereport_rules.php
+++ b/htdocs/admin/expensereport_rules.php
@@ -25,6 +25,7 @@
  *		\brief      Page to display expense tax ik
  */
 
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/expensereport.lib.php';
diff --git a/htdocs/admin/export.php b/htdocs/admin/export.php
index 0addfcf38f7..3aba8fa8192 100644
--- a/htdocs/admin/export.php
+++ b/htdocs/admin/export.php
@@ -28,6 +28,7 @@
  *	\brief      config Page module Export
  */
 
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
 
diff --git a/htdocs/admin/external_rss.php b/htdocs/admin/external_rss.php
index d0f08783e22..d46f1897b71 100644
--- a/htdocs/admin/external_rss.php
+++ b/htdocs/admin/external_rss.php
@@ -28,6 +28,7 @@
  *      \brief      Page to setupe module ExternalRss
  */
 
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/rssparser.class.php';
diff --git a/htdocs/admin/facture.php b/htdocs/admin/facture.php
index 4a8e54589e9..cdb7794c4d2 100644
--- a/htdocs/admin/facture.php
+++ b/htdocs/admin/facture.php
@@ -27,6 +27,7 @@
  *		\brief      Page to setup invoice module
  */
 
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php';
diff --git a/htdocs/admin/facture_situation.php b/htdocs/admin/facture_situation.php
index 350055348f8..dfc145e72b0 100644
--- a/htdocs/admin/facture_situation.php
+++ b/htdocs/admin/facture_situation.php
@@ -27,6 +27,7 @@
  *		\brief      Page to setup invoice module
  */
 
+// Load Dolibarr environment
 require '../main.inc.php';
 
 // Libraries
diff --git a/htdocs/admin/fckeditor.php b/htdocs/admin/fckeditor.php
index 3c3cd731a7d..c7242085024 100644
--- a/htdocs/admin/fckeditor.php
+++ b/htdocs/admin/fckeditor.php
@@ -24,6 +24,7 @@
  *  \brief      Activation page for the FCKeditor module in the other modules
  */
 
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/doleditor.lib.php';
diff --git a/htdocs/admin/fichinter.php b/htdocs/admin/fichinter.php
index 79896d0ed74..8323ff27440 100644
--- a/htdocs/admin/fichinter.php
+++ b/htdocs/admin/fichinter.php
@@ -28,6 +28,7 @@
  *	\brief      Setup page of module Interventions
  */
 
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php';
diff --git a/htdocs/admin/geoipmaxmind.php b/htdocs/admin/geoipmaxmind.php
index c002c9059d7..c7373fd02db 100644
--- a/htdocs/admin/geoipmaxmind.php
+++ b/htdocs/admin/geoipmaxmind.php
@@ -22,6 +22,7 @@
  *	\brief      Setup page for geoipmaxmind module
  */
 
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
diff --git a/htdocs/admin/holiday.php b/htdocs/admin/holiday.php
index 5902402674d..9a60c6b9b84 100644
--- a/htdocs/admin/holiday.php
+++ b/htdocs/admin/holiday.php
@@ -24,6 +24,7 @@
  *	\brief      Setup page of module Contracts
  */
 
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php';
diff --git a/htdocs/admin/holiday_extrafields.php b/htdocs/admin/holiday_extrafields.php
index 0ef1998d9e7..7c24695bf3d 100644
--- a/htdocs/admin/holiday_extrafields.php
+++ b/htdocs/admin/holiday_extrafields.php
@@ -26,6 +26,7 @@
  *		\brief      Page to setup extra fields of holiday
  */
 
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/holiday.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
diff --git a/htdocs/admin/ihm.php b/htdocs/admin/ihm.php
index 0695408c16d..1026ea12442 100644
--- a/htdocs/admin/ihm.php
+++ b/htdocs/admin/ihm.php
@@ -26,6 +26,7 @@
  *       \brief      Page to setup GUI display options
  */
 
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/usergroups.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
diff --git a/htdocs/admin/import.php b/htdocs/admin/import.php
index 37168baa3d4..432b912e76c 100644
--- a/htdocs/admin/import.php
+++ b/htdocs/admin/import.php
@@ -29,6 +29,7 @@
  *	\brief      config page module import
  */
 
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
 
diff --git a/htdocs/admin/index.php b/htdocs/admin/index.php
index 787a9d6d820..3218f673fd5 100644
--- a/htdocs/admin/index.php
+++ b/htdocs/admin/index.php
@@ -22,6 +22,7 @@
  *		\brief      Home page of setup area
  */
 
+// Load Dolibarr environment
 require '../main.inc.php';
 
 // Load translation files required by the page
diff --git a/htdocs/admin/ldap.php b/htdocs/admin/ldap.php
index 568664b92b7..10e9b90ccd6 100644
--- a/htdocs/admin/ldap.php
+++ b/htdocs/admin/ldap.php
@@ -26,6 +26,7 @@
  *      \brief      Page to setup module LDAP
  */
 
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/ldap.class.php';
diff --git a/htdocs/admin/ldap_contacts.php b/htdocs/admin/ldap_contacts.php
index fef3882d2ff..424c426f023 100644
--- a/htdocs/admin/ldap_contacts.php
+++ b/htdocs/admin/ldap_contacts.php
@@ -26,6 +26,7 @@
  *  \brief      Page d'administration/configuration du module Ldap
  */
 
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/ldap.class.php';
diff --git a/htdocs/admin/ldap_groups.php b/htdocs/admin/ldap_groups.php
index 5723183735e..2422282655e 100644
--- a/htdocs/admin/ldap_groups.php
+++ b/htdocs/admin/ldap_groups.php
@@ -26,6 +26,7 @@
  *		\brief      Page to setup LDAP synchronization for groups
  */
 
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/user/class/user.class.php';
diff --git a/htdocs/admin/ldap_members.php b/htdocs/admin/ldap_members.php
index 876c31d79b1..010b5c08e33 100644
--- a/htdocs/admin/ldap_members.php
+++ b/htdocs/admin/ldap_members.php
@@ -26,6 +26,7 @@
  *		\brief      Page d'administration/configuration du module Ldap adherent
  */
 
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
diff --git a/htdocs/admin/ldap_members_types.php b/htdocs/admin/ldap_members_types.php
index 7933b59d5e0..0a71033d465 100644
--- a/htdocs/admin/ldap_members_types.php
+++ b/htdocs/admin/ldap_members_types.php
@@ -26,6 +26,7 @@
  *		\brief      Page to setup LDAP synchronization for members types
  */
 
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
diff --git a/htdocs/admin/ldap_users.php b/htdocs/admin/ldap_users.php
index f395eb88fb4..a333536a440 100644
--- a/htdocs/admin/ldap_users.php
+++ b/htdocs/admin/ldap_users.php
@@ -27,6 +27,7 @@
  *		\brief      Page d'administration/configuration du module Ldap
  */
 
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/user/class/user.class.php';
diff --git a/htdocs/admin/limits.php b/htdocs/admin/limits.php
index d644f2bd2f6..3d92dd5023f 100644
--- a/htdocs/admin/limits.php
+++ b/htdocs/admin/limits.php
@@ -22,6 +22,7 @@
  *       \brief      Page to setup limits
  */
 
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php';
diff --git a/htdocs/admin/loan.php b/htdocs/admin/loan.php
index 3c777e1f187..ca95c835ecd 100644
--- a/htdocs/admin/loan.php
+++ b/htdocs/admin/loan.php
@@ -22,6 +22,7 @@
  * \brief		Setup page to configure loan module
  */
 
+// Load Dolibarr environment
 require '../main.inc.php';
 
 // Class
diff --git a/htdocs/admin/mailing.php b/htdocs/admin/mailing.php
index da2df89b21a..ab4b747e21c 100644
--- a/htdocs/admin/mailing.php
+++ b/htdocs/admin/mailing.php
@@ -23,6 +23,7 @@
  *		\brief      Page to setup emailing module
  */
 
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/security2.lib.php';
diff --git a/htdocs/admin/mailman.php b/htdocs/admin/mailman.php
index eca17ea8e76..88389f0a4c4 100644
--- a/htdocs/admin/mailman.php
+++ b/htdocs/admin/mailman.php
@@ -27,6 +27,7 @@
  *		\brief      Page to setup the module MailmanSpip (Mailman)
  */
 
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/mailmanspip.lib.php';
diff --git a/htdocs/admin/mails.php b/htdocs/admin/mails.php
index 2f0f4cd3233..208c81c794f 100644
--- a/htdocs/admin/mails.php
+++ b/htdocs/admin/mails.php
@@ -23,6 +23,7 @@
  *       \brief      Page to setup emails sending
  */
 
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
diff --git a/htdocs/admin/mails_emailing.php b/htdocs/admin/mails_emailing.php
index dbdf66f8282..f3a1506a771 100644
--- a/htdocs/admin/mails_emailing.php
+++ b/htdocs/admin/mails_emailing.php
@@ -23,6 +23,7 @@
  *       \brief      Page to setup emails sending
  */
 
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
diff --git a/htdocs/admin/mails_senderprofile_list.php b/htdocs/admin/mails_senderprofile_list.php
index 3f72fc77c6c..cf83ad2cfbe 100644
--- a/htdocs/admin/mails_senderprofile_list.php
+++ b/htdocs/admin/mails_senderprofile_list.php
@@ -22,6 +22,7 @@
  *		\brief      Page to adminsiter email sender profiles
  */
 
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
diff --git a/htdocs/admin/mails_templates.php b/htdocs/admin/mails_templates.php
index d65bcefb11f..98db6ef7e83 100644
--- a/htdocs/admin/mails_templates.php
+++ b/htdocs/admin/mails_templates.php
@@ -33,6 +33,7 @@
  *		\brief      Page to administer emails templates
  */
 
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formadmin.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php';
diff --git a/htdocs/admin/mails_ticket.php b/htdocs/admin/mails_ticket.php
index 8b0d78132a0..b78b3e43857 100644
--- a/htdocs/admin/mails_ticket.php
+++ b/htdocs/admin/mails_ticket.php
@@ -23,6 +23,7 @@
  *       \brief      Page to setup mails for ticket
  */
 
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
diff --git a/htdocs/admin/menus.php b/htdocs/admin/menus.php
index 8034d813c0d..abcb2133e8c 100644
--- a/htdocs/admin/menus.php
+++ b/htdocs/admin/menus.php
@@ -23,6 +23,7 @@
  *      \brief      Page to setup menu manager to use
  */
 
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formadmin.class.php';
diff --git a/htdocs/admin/menus/edit.php b/htdocs/admin/menus/edit.php
index 471b34866a7..5ef4846abf7 100644
--- a/htdocs/admin/menus/edit.php
+++ b/htdocs/admin/menus/edit.php
@@ -24,6 +24,7 @@
  *		\brief      Tool to edit menus
  */
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formadmin.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/menubase.class.php';
diff --git a/htdocs/admin/menus/index.php b/htdocs/admin/menus/index.php
index 5a155d11411..0396c31eb96 100644
--- a/htdocs/admin/menus/index.php
+++ b/htdocs/admin/menus/index.php
@@ -24,6 +24,7 @@
  *  \brief      Index page for menu editor
  */
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formadmin.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/treeview.lib.php';
diff --git a/htdocs/admin/modulehelp.php b/htdocs/admin/modulehelp.php
index dbcc9cfdade..13332b5c277 100644
--- a/htdocs/admin/modulehelp.php
+++ b/htdocs/admin/modulehelp.php
@@ -30,6 +30,7 @@ if (!defined('NOTOKENRENEWAL')) {
 }
 
 
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
diff --git a/htdocs/admin/modules.php b/htdocs/admin/modules.php
index 05f7ed441f7..d011b250730 100644
--- a/htdocs/admin/modules.php
+++ b/htdocs/admin/modules.php
@@ -33,6 +33,7 @@ if (!defined('CSRFCHECK_WITH_TOKEN') && (empty($_GET['action']) || $_GET['action
 	define('CSRFCHECK_WITH_TOKEN', '1'); // Force use of CSRF protection with tokens even for GET
 }
 
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
diff --git a/htdocs/admin/mrp.php b/htdocs/admin/mrp.php
index 2d543cb1faa..36a82e965f4 100644
--- a/htdocs/admin/mrp.php
+++ b/htdocs/admin/mrp.php
@@ -21,6 +21,7 @@
  *	\brief      Setup page of module MRP
  */
 
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php';
diff --git a/htdocs/admin/mrp_extrafields.php b/htdocs/admin/mrp_extrafields.php
index 768ec487165..5553604eeff 100644
--- a/htdocs/admin/mrp_extrafields.php
+++ b/htdocs/admin/mrp_extrafields.php
@@ -26,6 +26,7 @@
  *		\brief      Page to setup extra fields of MOs
  */
 
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/mrp/lib/mrp.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
diff --git a/htdocs/admin/notification.php b/htdocs/admin/notification.php
index 44b5c104813..d3ad20f68b7 100644
--- a/htdocs/admin/notification.php
+++ b/htdocs/admin/notification.php
@@ -26,6 +26,7 @@
  *		\brief      Page to setup notification module
  */
 
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/notify.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
diff --git a/htdocs/admin/oauth.php b/htdocs/admin/oauth.php
index ade561c4ef1..1f2966b05b1 100644
--- a/htdocs/admin/oauth.php
+++ b/htdocs/admin/oauth.php
@@ -24,6 +24,7 @@
  * \brief       Setup page to configure oauth access api
  */
 
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/oauth.lib.php';
diff --git a/htdocs/admin/oauthlogintokens.php b/htdocs/admin/oauthlogintokens.php
index 7de4e146595..62162616a1a 100644
--- a/htdocs/admin/oauthlogintokens.php
+++ b/htdocs/admin/oauthlogintokens.php
@@ -23,6 +23,7 @@
  * \brief       Setup page to configure oauth access to login information
  */
 
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/oauth.lib.php'; // This define $list and $supportedoauth2array
diff --git a/htdocs/admin/openinghours.php b/htdocs/admin/openinghours.php
index b18ebd0c05f..c31e2162156 100644
--- a/htdocs/admin/openinghours.php
+++ b/htdocs/admin/openinghours.php
@@ -21,6 +21,7 @@
  *	\brief      Setup page to configure opening hours
  */
 
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
diff --git a/htdocs/admin/order_extrafields.php b/htdocs/admin/order_extrafields.php
index b66f004295d..0339f3a2b45 100644
--- a/htdocs/admin/order_extrafields.php
+++ b/htdocs/admin/order_extrafields.php
@@ -26,6 +26,7 @@
  *		\brief      Page to setup extra fields of order
  */
 
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/order.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
diff --git a/htdocs/admin/orderdet_extrafields.php b/htdocs/admin/orderdet_extrafields.php
index 3f8102d076a..889a042389a 100644
--- a/htdocs/admin/orderdet_extrafields.php
+++ b/htdocs/admin/orderdet_extrafields.php
@@ -27,6 +27,7 @@
  *		\brief      Page to setup extra fields of order
  */
 
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/order.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
diff --git a/htdocs/admin/payment.php b/htdocs/admin/payment.php
index 089ddbafd23..59da712b266 100644
--- a/htdocs/admin/payment.php
+++ b/htdocs/admin/payment.php
@@ -22,6 +22,7 @@
  *		\brief      Page to setup invoices payments
  */
 
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/invoice.lib.php';
diff --git a/htdocs/admin/paymentbybanktransfer.php b/htdocs/admin/paymentbybanktransfer.php
index eb918086720..f86f6d5c27f 100644
--- a/htdocs/admin/paymentbybanktransfer.php
+++ b/htdocs/admin/paymentbybanktransfer.php
@@ -25,6 +25,7 @@
  *	\brief      Page to setup payments by credit transfer
  */
 
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/prelevement/class/bonprelevement.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
diff --git a/htdocs/admin/pdf.php b/htdocs/admin/pdf.php
index 3468c997a58..b5a823edfb4 100644
--- a/htdocs/admin/pdf.php
+++ b/htdocs/admin/pdf.php
@@ -25,6 +25,7 @@
  *       \brief      Page to setup PDF options
  */
 
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formadmin.class.php';
diff --git a/htdocs/admin/pdf_other.php b/htdocs/admin/pdf_other.php
index 979edb47de4..645fff6adf1 100644
--- a/htdocs/admin/pdf_other.php
+++ b/htdocs/admin/pdf_other.php
@@ -25,6 +25,7 @@
  *       \brief      Page to setup PDF options
  */
 
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formadmin.class.php';
diff --git a/htdocs/admin/perms.php b/htdocs/admin/perms.php
index d2f0d79e4f3..ef20ab6e205 100644
--- a/htdocs/admin/perms.php
+++ b/htdocs/admin/perms.php
@@ -24,6 +24,7 @@
  *		\brief      Page to setup default permissions of a new user
  */
 
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
diff --git a/htdocs/admin/prelevement.php b/htdocs/admin/prelevement.php
index c76cccdcc5c..0dad5e887eb 100644
--- a/htdocs/admin/prelevement.php
+++ b/htdocs/admin/prelevement.php
@@ -25,6 +25,7 @@
  *	\brief      Page to setup Withdrawals
  */
 
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/prelevement/class/bonprelevement.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
diff --git a/htdocs/admin/propal.php b/htdocs/admin/propal.php
index 408c42cc3a8..c24446fb1bd 100644
--- a/htdocs/admin/propal.php
+++ b/htdocs/admin/propal.php
@@ -28,6 +28,7 @@
  *		\brief      Setup page for commercial proposal module
  */
 
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php';
diff --git a/htdocs/admin/proxy.php b/htdocs/admin/proxy.php
index 2c3a2629a76..f2103d0c97d 100644
--- a/htdocs/admin/proxy.php
+++ b/htdocs/admin/proxy.php
@@ -22,6 +22,7 @@
  *		\brief      Page  setup proxy to use for external web access
  */
 
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
diff --git a/htdocs/admin/receiptprinter.php b/htdocs/admin/receiptprinter.php
index 53f0cd9f7f0..a8ae4501ca5 100644
--- a/htdocs/admin/receiptprinter.php
+++ b/htdocs/admin/receiptprinter.php
@@ -24,6 +24,7 @@
  *      \brief      Page to setup receipt printer
  */
 
+// Load Dolibarr environment
 require '../main.inc.php';
 
 require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
diff --git a/htdocs/admin/reception_extrafields.php b/htdocs/admin/reception_extrafields.php
index aa83fca230c..31b4d836db8 100644
--- a/htdocs/admin/reception_extrafields.php
+++ b/htdocs/admin/reception_extrafields.php
@@ -28,6 +28,7 @@
  *		\brief      Page to setup extra fields of reception
  */
 
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/reception.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
diff --git a/htdocs/admin/reception_setup.php b/htdocs/admin/reception_setup.php
index a06760b9da4..09a11999603 100644
--- a/htdocs/admin/reception_setup.php
+++ b/htdocs/admin/reception_setup.php
@@ -21,6 +21,7 @@
  *		\brief      Page to setup reception module
  */
 
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/reception.lib.php';
diff --git a/htdocs/admin/resource.php b/htdocs/admin/resource.php
index 1d3e29c9cd4..9b421a17a6d 100644
--- a/htdocs/admin/resource.php
+++ b/htdocs/admin/resource.php
@@ -22,6 +22,7 @@
  * \brief		Setup page to configure resource module
  */
 
+// Load Dolibarr environment
 require '../main.inc.php';
 
 // Class
diff --git a/htdocs/admin/resource_extrafields.php b/htdocs/admin/resource_extrafields.php
index 068ae6f02d1..b7770797f21 100644
--- a/htdocs/admin/resource_extrafields.php
+++ b/htdocs/admin/resource_extrafields.php
@@ -25,6 +25,7 @@
  *		\brief      Page to setup extra fields of resource
  */
 
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/resource.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
diff --git a/htdocs/admin/security.php b/htdocs/admin/security.php
index 516197b7a70..14975f8c68a 100644
--- a/htdocs/admin/security.php
+++ b/htdocs/admin/security.php
@@ -23,6 +23,7 @@
  *      \brief      Page de configuration du module securite
  */
 
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/security2.lib.php';
diff --git a/htdocs/admin/security_file.php b/htdocs/admin/security_file.php
index 62b91ad55b3..b20287ce19b 100644
--- a/htdocs/admin/security_file.php
+++ b/htdocs/admin/security_file.php
@@ -23,6 +23,7 @@
  *      \brief      Security options setup
  */
 
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
diff --git a/htdocs/admin/security_other.php b/htdocs/admin/security_other.php
index 9e103422b97..1a0c65f3ceb 100644
--- a/htdocs/admin/security_other.php
+++ b/htdocs/admin/security_other.php
@@ -23,6 +23,7 @@
  *      \brief      Security options setup
  */
 
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
diff --git a/htdocs/admin/sms.php b/htdocs/admin/sms.php
index 19a94d05dd8..391ca42a6d3 100644
--- a/htdocs/admin/sms.php
+++ b/htdocs/admin/sms.php
@@ -23,6 +23,7 @@
  *       \brief      Page to setup emails sending
  */
 
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
 
diff --git a/htdocs/admin/spip.php b/htdocs/admin/spip.php
index 92dba301854..391f459aca3 100644
--- a/htdocs/admin/spip.php
+++ b/htdocs/admin/spip.php
@@ -27,6 +27,7 @@
  *		\brief      Page to setup the module MailmanSpip (SPIP)
  */
 
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/mailmanspip.lib.php';
diff --git a/htdocs/admin/supplier_invoice.php b/htdocs/admin/supplier_invoice.php
index aa337ff1f29..61085b4aeb8 100644
--- a/htdocs/admin/supplier_invoice.php
+++ b/htdocs/admin/supplier_invoice.php
@@ -27,6 +27,7 @@
  *  \brief      Setup to admin supplier invoices
  */
 
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php';
diff --git a/htdocs/admin/supplier_order.php b/htdocs/admin/supplier_order.php
index 0204f184de7..d1cd596f0e6 100644
--- a/htdocs/admin/supplier_order.php
+++ b/htdocs/admin/supplier_order.php
@@ -27,6 +27,7 @@
  *  \brief      Page d'administration-configuration du module Fournisseur
  */
 
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php';
diff --git a/htdocs/admin/supplier_payment.php b/htdocs/admin/supplier_payment.php
index a41f9fdf80c..967d7f95998 100644
--- a/htdocs/admin/supplier_payment.php
+++ b/htdocs/admin/supplier_payment.php
@@ -23,6 +23,7 @@
  *		\brief      Page to setup supplier invoices payments
  */
 
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/fourn.lib.php';
diff --git a/htdocs/admin/supplier_proposal.php b/htdocs/admin/supplier_proposal.php
index 593ad13ff82..fa3702d36b7 100644
--- a/htdocs/admin/supplier_proposal.php
+++ b/htdocs/admin/supplier_proposal.php
@@ -23,6 +23,7 @@
  * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php';
diff --git a/htdocs/admin/supplierinvoice_extrafields.php b/htdocs/admin/supplierinvoice_extrafields.php
index 6105e6a716b..760a89c4a0d 100644
--- a/htdocs/admin/supplierinvoice_extrafields.php
+++ b/htdocs/admin/supplierinvoice_extrafields.php
@@ -27,6 +27,7 @@
  *		\brief      Page to setup extra fields of supplierinvoice
  */
 
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/fourn.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
diff --git a/htdocs/admin/supplierinvoicedet_extrafields.php b/htdocs/admin/supplierinvoicedet_extrafields.php
index 3bdf8e1e8cc..55664d46966 100644
--- a/htdocs/admin/supplierinvoicedet_extrafields.php
+++ b/htdocs/admin/supplierinvoicedet_extrafields.php
@@ -28,6 +28,7 @@
  *		\brief      Page to setup extra fields of supplierinvoice line
  */
 
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/fourn.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
diff --git a/htdocs/admin/supplierorder_extrafields.php b/htdocs/admin/supplierorder_extrafields.php
index e45f8d63cc1..63c679e3ef9 100644
--- a/htdocs/admin/supplierorder_extrafields.php
+++ b/htdocs/admin/supplierorder_extrafields.php
@@ -26,6 +26,7 @@
  *		\brief      Page to setup extra fields of supplierorder
  */
 
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/fourn.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
diff --git a/htdocs/admin/supplierorderdet_extrafields.php b/htdocs/admin/supplierorderdet_extrafields.php
index 8fd2516a41d..7f38fe77cc8 100644
--- a/htdocs/admin/supplierorderdet_extrafields.php
+++ b/htdocs/admin/supplierorderdet_extrafields.php
@@ -27,6 +27,7 @@
  *		\brief      Page to setup extra fields of supplierorder line
  */
 
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/fourn.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
diff --git a/htdocs/admin/syslog.php b/htdocs/admin/syslog.php
index 875d024fd65..71f7fd7f875 100644
--- a/htdocs/admin/syslog.php
+++ b/htdocs/admin/syslog.php
@@ -24,6 +24,7 @@
  *	\brief      Setup page for logs module
  */
 
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
 
diff --git a/htdocs/admin/system/about.php b/htdocs/admin/system/about.php
index de6f0c146f3..a9c87ca61a3 100644
--- a/htdocs/admin/system/about.php
+++ b/htdocs/admin/system/about.php
@@ -24,6 +24,7 @@
  *       \brief      About Dolibarr File page
  */
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
diff --git a/htdocs/admin/system/browser.php b/htdocs/admin/system/browser.php
index 2919df67d85..7e2c772183d 100644
--- a/htdocs/admin/system/browser.php
+++ b/htdocs/admin/system/browser.php
@@ -22,6 +22,7 @@
  *  \brief      Page to show Dolibarr informations
  */
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/memory.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
diff --git a/htdocs/admin/system/constall.php b/htdocs/admin/system/constall.php
index fee82d89958..4acb8e0ff59 100644
--- a/htdocs/admin/system/constall.php
+++ b/htdocs/admin/system/constall.php
@@ -22,6 +22,7 @@
  *		\brief      Page to show all Dolibarr setup (config file and database constants)
  */
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 
 // Load translation files required by the page
diff --git a/htdocs/admin/system/database-tables.php b/htdocs/admin/system/database-tables.php
index 457d71d98d9..de49bf687a1 100644
--- a/htdocs/admin/system/database-tables.php
+++ b/htdocs/admin/system/database-tables.php
@@ -28,6 +28,7 @@ if (! defined('CSRFCHECK_WITH_TOKEN')) {
 	define('CSRFCHECK_WITH_TOKEN', '1');		// Force use of CSRF protection with tokens even for GET
 }
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
diff --git a/htdocs/admin/system/database.php b/htdocs/admin/system/database.php
index 422e8ab2bc6..9a0a1e4d850 100644
--- a/htdocs/admin/system/database.php
+++ b/htdocs/admin/system/database.php
@@ -23,6 +23,7 @@
  *   \brief      Page with system information of database
  */
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 
 $langs->load("admin");
diff --git a/htdocs/admin/system/dbtable.php b/htdocs/admin/system/dbtable.php
index 87136f2ec6a..1a1fd00ecbb 100644
--- a/htdocs/admin/system/dbtable.php
+++ b/htdocs/admin/system/dbtable.php
@@ -24,6 +24,7 @@
  *  \brief          Page d'info des contraintes d'une table
  */
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 
 $langs->load("admin");
diff --git a/htdocs/admin/system/dolibarr.php b/htdocs/admin/system/dolibarr.php
index 31fa647f403..80efc0a9891 100644
--- a/htdocs/admin/system/dolibarr.php
+++ b/htdocs/admin/system/dolibarr.php
@@ -22,6 +22,7 @@
  *  \brief      Page to show Dolibarr information
  */
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/memory.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
diff --git a/htdocs/admin/system/filecheck.php b/htdocs/admin/system/filecheck.php
index 97fab9658c7..7d8233cdc0a 100644
--- a/htdocs/admin/system/filecheck.php
+++ b/htdocs/admin/system/filecheck.php
@@ -24,6 +24,7 @@
  *  \brief      Page to check Dolibarr files integrity
  */
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/geturl.lib.php';
diff --git a/htdocs/admin/system/modules.php b/htdocs/admin/system/modules.php
index 9e60ff46bd7..c2ad387d955 100644
--- a/htdocs/admin/system/modules.php
+++ b/htdocs/admin/system/modules.php
@@ -22,6 +22,7 @@
  *  \brief      File to list all Dolibarr modules
  */
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 
diff --git a/htdocs/admin/system/os.php b/htdocs/admin/system/os.php
index d778d60cb3a..c60e1610054 100644
--- a/htdocs/admin/system/os.php
+++ b/htdocs/admin/system/os.php
@@ -21,6 +21,7 @@
  *		\brief      Page des infos systeme de l'OS
  */
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 
diff --git a/htdocs/admin/system/perf.php b/htdocs/admin/system/perf.php
index f43bc3bf49a..dcd853a5356 100644
--- a/htdocs/admin/system/perf.php
+++ b/htdocs/admin/system/perf.php
@@ -20,6 +20,7 @@
  *  \brief      Page to show Performance information
  */
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/memory.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
diff --git a/htdocs/admin/system/phpinfo.php b/htdocs/admin/system/phpinfo.php
index c9324565e5b..aa09cf0a27c 100644
--- a/htdocs/admin/system/phpinfo.php
+++ b/htdocs/admin/system/phpinfo.php
@@ -24,6 +24,7 @@
  *		\brief      Page des infos systeme de php
  */
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
diff --git a/htdocs/admin/system/security.php b/htdocs/admin/system/security.php
index ad4befadad6..4ba5bec5b11 100644
--- a/htdocs/admin/system/security.php
+++ b/htdocs/admin/system/security.php
@@ -20,6 +20,7 @@
  *  \brief      Page to show Security information
  */
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/memory.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
diff --git a/htdocs/admin/system/web.php b/htdocs/admin/system/web.php
index 921fd839109..6ba6829823d 100644
--- a/htdocs/admin/system/web.php
+++ b/htdocs/admin/system/web.php
@@ -20,6 +20,7 @@
  *		\brief      Page with web server system information
  */
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/security2.lib.php';
diff --git a/htdocs/admin/system/xcache.php b/htdocs/admin/system/xcache.php
index 4e2f881a14c..4453dc694d4 100644
--- a/htdocs/admin/system/xcache.php
+++ b/htdocs/admin/system/xcache.php
@@ -20,6 +20,7 @@
  *     \brief      Page administration XCache
  */
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 
 $langs->load("admin");
diff --git a/htdocs/admin/system/xdebug.php b/htdocs/admin/system/xdebug.php
index 8c3a70ff6ec..f6d2e3926b9 100644
--- a/htdocs/admin/system/xdebug.php
+++ b/htdocs/admin/system/xdebug.php
@@ -20,6 +20,7 @@
  *     \brief      Page administration XDebug
  */
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 
 $langs->load("admin");
diff --git a/htdocs/admin/taxes.php b/htdocs/admin/taxes.php
index fb4b2ec6d72..ccdbedc1f89 100644
--- a/htdocs/admin/taxes.php
+++ b/htdocs/admin/taxes.php
@@ -25,6 +25,7 @@
  *     \brief      Page de configuration du module tax
  */
 
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
 if (isModEnabled('accounting')) {
diff --git a/htdocs/admin/ticket.php b/htdocs/admin/ticket.php
index f1fbba03840..b4a24a2d0cd 100644
--- a/htdocs/admin/ticket.php
+++ b/htdocs/admin/ticket.php
@@ -22,6 +22,7 @@
  *     \brief       Page to setup module ticket
  */
 
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php";
 require_once DOL_DOCUMENT_ROOT."/ticket/class/ticket.class.php";
diff --git a/htdocs/admin/ticket_extrafields.php b/htdocs/admin/ticket_extrafields.php
index be75f604542..fc792030ade 100644
--- a/htdocs/admin/ticket_extrafields.php
+++ b/htdocs/admin/ticket_extrafields.php
@@ -21,6 +21,7 @@
  *      \brief      Page to setup extra fields of ticket
  */
 
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT."/core/lib/ticket.lib.php";
 require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
diff --git a/htdocs/admin/ticket_public.php b/htdocs/admin/ticket_public.php
index 3e4c088620d..e1557f7d14e 100644
--- a/htdocs/admin/ticket_public.php
+++ b/htdocs/admin/ticket_public.php
@@ -22,6 +22,7 @@
  *     \brief       Page to public interface of module Ticket
  */
 
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php";
 require_once DOL_DOCUMENT_ROOT."/ticket/class/ticket.class.php";
diff --git a/htdocs/admin/tools/dolibarr_export.php b/htdocs/admin/tools/dolibarr_export.php
index 588cc5ed866..779db36fb2f 100644
--- a/htdocs/admin/tools/dolibarr_export.php
+++ b/htdocs/admin/tools/dolibarr_export.php
@@ -22,6 +22,7 @@
  *		\brief      Page to export database
  */
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
diff --git a/htdocs/admin/tools/dolibarr_import.php b/htdocs/admin/tools/dolibarr_import.php
index c409d6a500b..8c7576b8bef 100644
--- a/htdocs/admin/tools/dolibarr_import.php
+++ b/htdocs/admin/tools/dolibarr_import.php
@@ -26,6 +26,7 @@ if (! defined('CSRFCHECK_WITH_TOKEN')) {
 	define('CSRFCHECK_WITH_TOKEN', '1');		// Force use of CSRF protection with tokens even for GET
 }
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 
 // Load translation files required by the page
diff --git a/htdocs/admin/tools/export.php b/htdocs/admin/tools/export.php
index 3f3316f6996..8299e2198ee 100644
--- a/htdocs/admin/tools/export.php
+++ b/htdocs/admin/tools/export.php
@@ -23,6 +23,7 @@
  *		\brief      Page to export a database into a dump file
  */
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
diff --git a/htdocs/admin/tools/export_files.php b/htdocs/admin/tools/export_files.php
index 84bbd197a64..35e1194c80e 100644
--- a/htdocs/admin/tools/export_files.php
+++ b/htdocs/admin/tools/export_files.php
@@ -27,6 +27,7 @@ if (! defined('CSRFCHECK_WITH_TOKEN')) {
 	define('CSRFCHECK_WITH_TOKEN', '1');		// Force use of CSRF protection with tokens even for GET
 }
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
diff --git a/htdocs/admin/tools/index.php b/htdocs/admin/tools/index.php
index 4c89ab60989..3941b29ce6e 100644
--- a/htdocs/admin/tools/index.php
+++ b/htdocs/admin/tools/index.php
@@ -22,6 +22,7 @@
  * 		\brief      Page d'accueil de l'espace outils admin
  */
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 
 // Load translation files required by the page
diff --git a/htdocs/admin/tools/listevents.php b/htdocs/admin/tools/listevents.php
index da7ae901766..3e04243eb72 100644
--- a/htdocs/admin/tools/listevents.php
+++ b/htdocs/admin/tools/listevents.php
@@ -24,6 +24,7 @@
  *      \brief      List of security events
  */
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/events.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
diff --git a/htdocs/admin/tools/listsessions.php b/htdocs/admin/tools/listsessions.php
index cc9aaa356bc..592362b936f 100644
--- a/htdocs/admin/tools/listsessions.php
+++ b/htdocs/admin/tools/listsessions.php
@@ -26,6 +26,7 @@ if (! defined('CSRFCHECK_WITH_TOKEN')) {
 	define('CSRFCHECK_WITH_TOKEN', '1');		// Force use of CSRF protection with tokens even for GET
 }
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
 
diff --git a/htdocs/admin/tools/purge.php b/htdocs/admin/tools/purge.php
index f6ce58a40c0..d8d68de7450 100644
--- a/htdocs/admin/tools/purge.php
+++ b/htdocs/admin/tools/purge.php
@@ -25,6 +25,7 @@ if (! defined('CSRFCHECK_WITH_TOKEN')) {
 	define('CSRFCHECK_WITH_TOKEN', '1');		// Force use of CSRF protection with tokens even for GET
 }
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 
diff --git a/htdocs/admin/tools/update.php b/htdocs/admin/tools/update.php
index 902e68b381e..2bed274fd72 100644
--- a/htdocs/admin/tools/update.php
+++ b/htdocs/admin/tools/update.php
@@ -26,6 +26,7 @@ if (! defined('CSRFCHECK_WITH_TOKEN')) {
 	define('CSRFCHECK_WITH_TOKEN', '1');		// Force use of CSRF protection with tokens even for GET
 }
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
diff --git a/htdocs/admin/translation.php b/htdocs/admin/translation.php
index 154ac3f5665..abb5ebfd6ba 100644
--- a/htdocs/admin/translation.php
+++ b/htdocs/admin/translation.php
@@ -22,6 +22,7 @@
  *       \brief      Page to show translation information
  */
 
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
diff --git a/htdocs/admin/triggers.php b/htdocs/admin/triggers.php
index a1f8496ad6d..2fc450af8d0 100644
--- a/htdocs/admin/triggers.php
+++ b/htdocs/admin/triggers.php
@@ -20,6 +20,7 @@
  *       \brief      Page to view triggers
  */
 
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/interfaces.class.php';
 
diff --git a/htdocs/admin/user.php b/htdocs/admin/user.php
index 6f1012d1af4..20eb7a0c0b2 100644
--- a/htdocs/admin/user.php
+++ b/htdocs/admin/user.php
@@ -28,6 +28,7 @@
  *		\brief      Page to setup user module
  */
 
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/usergroups.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
diff --git a/htdocs/admin/usergroup.php b/htdocs/admin/usergroup.php
index b23a35442ef..ff2a1a180fe 100644
--- a/htdocs/admin/usergroup.php
+++ b/htdocs/admin/usergroup.php
@@ -27,6 +27,7 @@
  *		\brief      Page to setup usergroup module
  */
 
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/usergroups.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
diff --git a/htdocs/admin/website.php b/htdocs/admin/website.php
index 80e806b6595..3c348d71a12 100644
--- a/htdocs/admin/website.php
+++ b/htdocs/admin/website.php
@@ -21,6 +21,7 @@
  *		\brief      Page to administer web sites
  */
 
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formadmin.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php';
diff --git a/htdocs/admin/website_options.php b/htdocs/admin/website_options.php
index 1f5ebaec4c6..0a749741152 100644
--- a/htdocs/admin/website_options.php
+++ b/htdocs/admin/website_options.php
@@ -21,6 +21,7 @@
  *		\brief      Page to administer web sites
  */
 
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formadmin.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php';
diff --git a/htdocs/admin/workflow.php b/htdocs/admin/workflow.php
index e29a351a705..824643093ad 100644
--- a/htdocs/admin/workflow.php
+++ b/htdocs/admin/workflow.php
@@ -24,6 +24,7 @@
  *	\brief		Workflows setup page
  */
 
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
 
diff --git a/htdocs/api/admin/index.php b/htdocs/api/admin/index.php
index 82486e836bc..cd1208516e3 100644
--- a/htdocs/api/admin/index.php
+++ b/htdocs/api/admin/index.php
@@ -25,6 +25,7 @@
  *		\brief      Page to setup Webservices REST module
  */
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
diff --git a/htdocs/asset/accountancy_codes.php b/htdocs/asset/accountancy_codes.php
index 824f1a75bbb..224380fc295 100644
--- a/htdocs/asset/accountancy_codes.php
+++ b/htdocs/asset/accountancy_codes.php
@@ -22,6 +22,7 @@
  *  \brief      Card with accountancy code on Asset
  */
 
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT . '/core/lib/asset.lib.php';
 require_once DOL_DOCUMENT_ROOT . '/asset/class/asset.class.php';
diff --git a/htdocs/asset/admin/asset_extrafields.php b/htdocs/asset/admin/asset_extrafields.php
index 321041d754d..b7a67151407 100644
--- a/htdocs/asset/admin/asset_extrafields.php
+++ b/htdocs/asset/admin/asset_extrafields.php
@@ -27,6 +27,7 @@
  *  \brief      Page to setup extra fields of asset
  */
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/asset.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
diff --git a/htdocs/asset/admin/assetmodel_extrafields.php b/htdocs/asset/admin/assetmodel_extrafields.php
index 7b2bbc1260d..44f2b1d7ca4 100644
--- a/htdocs/asset/admin/assetmodel_extrafields.php
+++ b/htdocs/asset/admin/assetmodel_extrafields.php
@@ -27,6 +27,7 @@
  *  \brief      Page to setup extra fields of asset model
  */
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/asset.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
diff --git a/htdocs/asset/admin/setup.php b/htdocs/asset/admin/setup.php
index 4f8f06ca160..f36559e4577 100644
--- a/htdocs/asset/admin/setup.php
+++ b/htdocs/asset/admin/setup.php
@@ -22,6 +22,7 @@
  * \brief   Asset setup page.
  */
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/asset.lib.php';
 require_once DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php";
diff --git a/htdocs/asset/agenda.php b/htdocs/asset/agenda.php
index 8d325954a76..4d1e6d4be56 100644
--- a/htdocs/asset/agenda.php
+++ b/htdocs/asset/agenda.php
@@ -22,6 +22,7 @@
  *  \brief      Tab of events on Asset
  */
 
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/asset.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/asset/class/asset.class.php';
diff --git a/htdocs/asset/card.php b/htdocs/asset/card.php
index c2d768b5405..0f19bed4625 100644
--- a/htdocs/asset/card.php
+++ b/htdocs/asset/card.php
@@ -22,6 +22,7 @@
  *  \brief      Page to create/edit/view asset
  */
 
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/asset.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/asset/class/asset.class.php';
diff --git a/htdocs/asset/depreciation.php b/htdocs/asset/depreciation.php
index 679d750c668..eae2ff45e2b 100644
--- a/htdocs/asset/depreciation.php
+++ b/htdocs/asset/depreciation.php
@@ -22,6 +22,7 @@
  *  \brief      Card with depreciation on Asset
  */
 
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT . '/core/lib/asset.lib.php';
 require_once DOL_DOCUMENT_ROOT . '/asset/class/asset.class.php';
diff --git a/htdocs/asset/depreciation_options.php b/htdocs/asset/depreciation_options.php
index 23c66d8961b..f4558ae6157 100644
--- a/htdocs/asset/depreciation_options.php
+++ b/htdocs/asset/depreciation_options.php
@@ -22,6 +22,7 @@
  *  \brief      Card with depreciation options on Asset
  */
 
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT . '/core/lib/asset.lib.php';
 require_once DOL_DOCUMENT_ROOT . '/asset/class/asset.class.php';
diff --git a/htdocs/asset/disposal.php b/htdocs/asset/disposal.php
index e06e86c78ac..0f1b71e1929 100644
--- a/htdocs/asset/disposal.php
+++ b/htdocs/asset/disposal.php
@@ -22,6 +22,7 @@
  *  \brief      Card with disposal info on Asset
  */
 
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/asset.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/asset/class/asset.class.php';
diff --git a/htdocs/asset/document.php b/htdocs/asset/document.php
index 9f4439f94d6..ee5f7845aed 100644
--- a/htdocs/asset/document.php
+++ b/htdocs/asset/document.php
@@ -22,6 +22,7 @@
  *  \brief      Page for attached files on assets
  */
 
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/asset.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/asset/class/asset.class.php';
diff --git a/htdocs/asset/model/accountancy_codes.php b/htdocs/asset/model/accountancy_codes.php
index 6eb6d70abaf..b39a72bb7a3 100644
--- a/htdocs/asset/model/accountancy_codes.php
+++ b/htdocs/asset/model/accountancy_codes.php
@@ -22,6 +22,7 @@
  *  \brief      Card with accountancy code on Asset Model
  */
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT . '/core/lib/asset.lib.php';
 require_once DOL_DOCUMENT_ROOT . '/asset/class/assetmodel.class.php';
diff --git a/htdocs/asset/model/agenda.php b/htdocs/asset/model/agenda.php
index fb2ff12aa88..e0a463ec112 100644
--- a/htdocs/asset/model/agenda.php
+++ b/htdocs/asset/model/agenda.php
@@ -22,6 +22,7 @@
  *  \brief      Tab of events on Asset Model
  */
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT . '/core/lib/asset.lib.php';
 require_once DOL_DOCUMENT_ROOT . '/asset/class/assetmodel.class.php';
diff --git a/htdocs/asset/model/card.php b/htdocs/asset/model/card.php
index 756ac32e31f..3eb75eded08 100644
--- a/htdocs/asset/model/card.php
+++ b/htdocs/asset/model/card.php
@@ -22,6 +22,7 @@
  *  \brief      Page to create/edit/view asset Model
  */
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT . '/core/lib/asset.lib.php';
 require_once DOL_DOCUMENT_ROOT . '/asset/class/assetmodel.class.php';
diff --git a/htdocs/asset/model/depreciation_options.php b/htdocs/asset/model/depreciation_options.php
index f3f585f5397..e8519e581d9 100644
--- a/htdocs/asset/model/depreciation_options.php
+++ b/htdocs/asset/model/depreciation_options.php
@@ -22,6 +22,7 @@
  *  \brief      Card with depreciation options on Asset Model
  */
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT . '/core/lib/asset.lib.php';
 require_once DOL_DOCUMENT_ROOT . '/asset/class/assetmodel.class.php';
diff --git a/htdocs/asset/model/note.php b/htdocs/asset/model/note.php
index 8c88feba449..52d7e13e777 100644
--- a/htdocs/asset/model/note.php
+++ b/htdocs/asset/model/note.php
@@ -22,6 +22,7 @@
  *  \brief      Card with notes on Asset Model
  */
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT . '/core/lib/asset.lib.php';
 require_once DOL_DOCUMENT_ROOT . '/asset/class/assetmodel.class.php';
diff --git a/htdocs/asset/note.php b/htdocs/asset/note.php
index 810ab7f4462..fd404a77447 100644
--- a/htdocs/asset/note.php
+++ b/htdocs/asset/note.php
@@ -22,6 +22,7 @@
  *  \brief      Card with notes on Asset
  */
 
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/asset.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/asset/class/asset.class.php';
diff --git a/htdocs/barcode/codeinit.php b/htdocs/barcode/codeinit.php
index fe8ff50cf96..382c14f917e 100644
--- a/htdocs/barcode/codeinit.php
+++ b/htdocs/barcode/codeinit.php
@@ -22,6 +22,7 @@
  *	\brief      Page to make mass init of barcode
  */
 
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
 require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
diff --git a/htdocs/barcode/printsheet.php b/htdocs/barcode/printsheet.php
index c55db4ef2a1..d66f243c239 100644
--- a/htdocs/barcode/printsheet.php
+++ b/htdocs/barcode/printsheet.php
@@ -29,6 +29,7 @@ if (!empty($_POST['mode']) && $_POST['mode'] === 'label') {	// Page is called to
 	}
 }
 
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/format_cards.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
diff --git a/htdocs/blockedlog/ajax/block-info.php b/htdocs/blockedlog/ajax/block-info.php
index da27b8fc50e..9c2850608af 100644
--- a/htdocs/blockedlog/ajax/block-info.php
+++ b/htdocs/blockedlog/ajax/block-info.php
@@ -37,6 +37,7 @@ if (!defined('NOREQUIREHTML')) {
 }
 
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/blockedlog/class/blockedlog.class.php';
 
diff --git a/htdocs/blockedlog/ajax/check_signature.php b/htdocs/blockedlog/ajax/check_signature.php
index 60a763635c0..ab2f6b0427f 100644
--- a/htdocs/blockedlog/ajax/check_signature.php
+++ b/htdocs/blockedlog/ajax/check_signature.php
@@ -37,6 +37,7 @@ if (!defined('NOREQUIREHTML')) {
 }
 
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/geturl.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/blockedlog/class/blockedlog.class.php';
diff --git a/htdocs/bookmarks/admin/bookmark.php b/htdocs/bookmarks/admin/bookmark.php
index 3d5c8eb3bc0..74b44bd8f9b 100644
--- a/htdocs/bookmarks/admin/bookmark.php
+++ b/htdocs/bookmarks/admin/bookmark.php
@@ -22,6 +22,7 @@
  *		\brief      Page to setup bookmark module
  */
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
 
diff --git a/htdocs/bookmarks/card.php b/htdocs/bookmarks/card.php
index bbc92a83ef1..da42ac5ae7d 100644
--- a/htdocs/bookmarks/card.php
+++ b/htdocs/bookmarks/card.php
@@ -24,6 +24,7 @@
  */
 
 
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/bookmarks/class/bookmark.class.php';
 
diff --git a/htdocs/bookmarks/list.php b/htdocs/bookmarks/list.php
index 07ea263eeda..bb5187a3b72 100644
--- a/htdocs/bookmarks/list.php
+++ b/htdocs/bookmarks/list.php
@@ -21,6 +21,7 @@
  *       \ingroup    bookmark
  */
 
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/bookmarks/class/bookmark.class.php';
 
diff --git a/htdocs/categories/admin/categorie.php b/htdocs/categories/admin/categorie.php
index f7022477d97..72b7f02f0d2 100644
--- a/htdocs/categories/admin/categorie.php
+++ b/htdocs/categories/admin/categorie.php
@@ -23,6 +23,7 @@
  *      \brief      Categorie admin pages
  */
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/categories.lib.php';
 
diff --git a/htdocs/categories/admin/categorie_extrafields.php b/htdocs/categories/admin/categorie_extrafields.php
index 2a1879135d6..aea67145258 100644
--- a/htdocs/categories/admin/categorie_extrafields.php
+++ b/htdocs/categories/admin/categorie_extrafields.php
@@ -24,6 +24,7 @@
  *		\brief      Page to setup extra fields of category
  */
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/categories.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
diff --git a/htdocs/categories/card.php b/htdocs/categories/card.php
index 361f2a5f1ce..7f04c6d1005 100644
--- a/htdocs/categories/card.php
+++ b/htdocs/categories/card.php
@@ -27,6 +27,7 @@
  *		\brief      Page to create a new category
  */
 
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
diff --git a/htdocs/categories/edit.php b/htdocs/categories/edit.php
index 518889b85b3..caacc986cc5 100644
--- a/htdocs/categories/edit.php
+++ b/htdocs/categories/edit.php
@@ -25,6 +25,7 @@
  *      \brief      Page d'edition de categorie produit
  */
 
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
diff --git a/htdocs/categories/index.php b/htdocs/categories/index.php
index 4a9e771416c..babbf23e99a 100644
--- a/htdocs/categories/index.php
+++ b/htdocs/categories/index.php
@@ -27,6 +27,7 @@
  *      \brief      Home page of category area
  */
 
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/treeview.lib.php';
diff --git a/htdocs/categories/info.php b/htdocs/categories/info.php
index f5b54f50de9..81685a51e7b 100644
--- a/htdocs/categories/info.php
+++ b/htdocs/categories/info.php
@@ -23,6 +23,7 @@
  *      \brief      Category info page
  */
 
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
diff --git a/htdocs/categories/photos.php b/htdocs/categories/photos.php
index 4e7d5bb8943..bd98afb87f7 100644
--- a/htdocs/categories/photos.php
+++ b/htdocs/categories/photos.php
@@ -26,6 +26,7 @@
  *       \brief      Gestion des photos d'une categorie
  */
 
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
diff --git a/htdocs/categories/traduction.php b/htdocs/categories/traduction.php
index 69a27c5cff5..8aecdde63ea 100644
--- a/htdocs/categories/traduction.php
+++ b/htdocs/categories/traduction.php
@@ -25,6 +25,7 @@
  *	\brief      Page of translation of categories
  */
 
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/categories.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
diff --git a/htdocs/categories/viewcat.php b/htdocs/categories/viewcat.php
index 0e5da0735ce..8fbb897d900 100644
--- a/htdocs/categories/viewcat.php
+++ b/htdocs/categories/viewcat.php
@@ -27,6 +27,7 @@
  *       \brief      Page to show a category card
  */
 
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/categories.lib.php';
diff --git a/htdocs/collab/index.php b/htdocs/collab/index.php
index 296e0f3852f..746cc019a8b 100644
--- a/htdocs/collab/index.php
+++ b/htdocs/collab/index.php
@@ -24,6 +24,7 @@
 define('NOSCANPOSTFORINJECTION', 1);
 define('NOSTYLECHECK', 1);
 
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
diff --git a/htdocs/comm/action/card.php b/htdocs/comm/action/card.php
index 14654914dd5..20c30783337 100644
--- a/htdocs/comm/action/card.php
+++ b/htdocs/comm/action/card.php
@@ -30,6 +30,7 @@
  *       \brief      Page for event card
  */
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/agenda.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
diff --git a/htdocs/comm/action/document.php b/htdocs/comm/action/document.php
index ada742f9742..9a4a4e6a869 100644
--- a/htdocs/comm/action/document.php
+++ b/htdocs/comm/action/document.php
@@ -26,6 +26,7 @@
  *       \brief      Page of documents linked to actions
  */
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/agenda.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
diff --git a/htdocs/comm/action/index.php b/htdocs/comm/action/index.php
index e287ccfd2d7..f46b0adc3cb 100644
--- a/htdocs/comm/action/index.php
+++ b/htdocs/comm/action/index.php
@@ -30,6 +30,7 @@
  *  \brief      Home page of calendar events
  */
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
 require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
diff --git a/htdocs/comm/action/info.php b/htdocs/comm/action/info.php
index 73acc0e7c82..807a8e6f412 100644
--- a/htdocs/comm/action/info.php
+++ b/htdocs/comm/action/info.php
@@ -22,6 +22,7 @@
  *		\brief      Page des informations d'une action
  */
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/agenda.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
diff --git a/htdocs/comm/action/list.php b/htdocs/comm/action/list.php
index b42bf003333..790c1744bd8 100644
--- a/htdocs/comm/action/list.php
+++ b/htdocs/comm/action/list.php
@@ -31,6 +31,7 @@ if (!defined("NOREDIRECTBYMAINTOLOGIN")) {
 	define('NOREDIRECTBYMAINTOLOGIN', 1);
 }
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
 require_once DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php';
diff --git a/htdocs/comm/action/pertype.php b/htdocs/comm/action/pertype.php
index d21b20bbfaf..47ea39de146 100644
--- a/htdocs/comm/action/pertype.php
+++ b/htdocs/comm/action/pertype.php
@@ -28,6 +28,7 @@
  *  \brief      Tab of calendar events per type
  */
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php';
 require_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
diff --git a/htdocs/comm/action/peruser.php b/htdocs/comm/action/peruser.php
index f28a3b2f719..5c5ef948c30 100644
--- a/htdocs/comm/action/peruser.php
+++ b/htdocs/comm/action/peruser.php
@@ -28,6 +28,7 @@
  *  \brief      Tab of calendar events per user
  */
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php';
 require_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
diff --git a/htdocs/comm/action/rapport/index.php b/htdocs/comm/action/rapport/index.php
index 4414981b6fb..2cc3f6a7a9d 100644
--- a/htdocs/comm/action/rapport/index.php
+++ b/htdocs/comm/action/rapport/index.php
@@ -24,6 +24,7 @@
  *		\brief      Page with reports of actions
  */
 
+// Load Dolibarr environment
 require '../../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
diff --git a/htdocs/comm/admin/propal_extrafields.php b/htdocs/comm/admin/propal_extrafields.php
index 7a4cfe7a6ea..d0aa0db96b0 100644
--- a/htdocs/comm/admin/propal_extrafields.php
+++ b/htdocs/comm/admin/propal_extrafields.php
@@ -24,6 +24,7 @@
  *		\brief      Page to setup extra fields of third party
  */
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/propal.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
diff --git a/htdocs/comm/admin/propaldet_extrafields.php b/htdocs/comm/admin/propaldet_extrafields.php
index 91517d456c5..4d68948e34c 100644
--- a/htdocs/comm/admin/propaldet_extrafields.php
+++ b/htdocs/comm/admin/propaldet_extrafields.php
@@ -27,6 +27,7 @@
  *		\brief      Page to setup extra fields of order
  */
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/propal.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
diff --git a/htdocs/comm/card.php b/htdocs/comm/card.php
index 6b3161190d8..67df6af0298 100644
--- a/htdocs/comm/card.php
+++ b/htdocs/comm/card.php
@@ -32,6 +32,7 @@
  *       \brief      Page to show customer card of a third party
  */
 
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
diff --git a/htdocs/comm/contact.php b/htdocs/comm/contact.php
index d83fdbcb78c..19be738a50e 100644
--- a/htdocs/comm/contact.php
+++ b/htdocs/comm/contact.php
@@ -24,6 +24,7 @@
  *      \brief      Liste des contacts
  */
 
+// Load Dolibarr environment
 require '../main.inc.php';
 
 // Load translation files required by the page
diff --git a/htdocs/comm/index.php b/htdocs/comm/index.php
index c2852cd45c9..ed6184e0cd4 100644
--- a/htdocs/comm/index.php
+++ b/htdocs/comm/index.php
@@ -27,6 +27,7 @@
  *	\brief		Home page of commercial area
  */
 
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/agenda.lib.php';
diff --git a/htdocs/comm/mailing/advtargetemailing.php b/htdocs/comm/mailing/advtargetemailing.php
index 8f0a2b38c7d..d2e9fc7d0d5 100644
--- a/htdocs/comm/mailing/advtargetemailing.php
+++ b/htdocs/comm/mailing/advtargetemailing.php
@@ -26,6 +26,7 @@ if (!defined('NOSTYLECHECK')) {
 	define('NOSTYLECHECK', '1');
 }
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 
 require_once DOL_DOCUMENT_ROOT.'/comm/mailing/class/mailing.class.php';
diff --git a/htdocs/comm/mailing/card.php b/htdocs/comm/mailing/card.php
index ed1fa3f523e..633e881030c 100644
--- a/htdocs/comm/mailing/card.php
+++ b/htdocs/comm/mailing/card.php
@@ -28,6 +28,7 @@ if (!defined('NOSTYLECHECK')) {
 	define('NOSTYLECHECK', '1');
 }
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/emailing.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
diff --git a/htdocs/comm/mailing/cibles.php b/htdocs/comm/mailing/cibles.php
index 764455e5f62..1beefca8cf6 100644
--- a/htdocs/comm/mailing/cibles.php
+++ b/htdocs/comm/mailing/cibles.php
@@ -24,6 +24,7 @@
  *       \brief      Page to define emailing targets
  */
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/modules/mailings/modules_mailings.php';
 require_once DOL_DOCUMENT_ROOT.'/comm/mailing/class/mailing.class.php';
diff --git a/htdocs/comm/mailing/index.php b/htdocs/comm/mailing/index.php
index 9ac09ac529b..d3ebc379b55 100644
--- a/htdocs/comm/mailing/index.php
+++ b/htdocs/comm/mailing/index.php
@@ -24,6 +24,7 @@
  *       \brief      Home page for emailing area
  */
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/comm/mailing/class/mailing.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
diff --git a/htdocs/comm/mailing/info.php b/htdocs/comm/mailing/info.php
index 74d6943a044..86ce2eb70b2 100644
--- a/htdocs/comm/mailing/info.php
+++ b/htdocs/comm/mailing/info.php
@@ -22,6 +22,7 @@
  *		\brief      Page with log information for emailing
  */
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/comm/mailing/class/mailing.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
diff --git a/htdocs/comm/mailing/list.php b/htdocs/comm/mailing/list.php
index 757b6373f3f..13a7e63d364 100644
--- a/htdocs/comm/mailing/list.php
+++ b/htdocs/comm/mailing/list.php
@@ -22,6 +22,7 @@
  *       \brief      Liste des mailings
  */
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/comm/mailing/class/mailing.class.php';
 
diff --git a/htdocs/comm/multiprix.php b/htdocs/comm/multiprix.php
index 0e582946df9..81e5cd0d9d2 100644
--- a/htdocs/comm/multiprix.php
+++ b/htdocs/comm/multiprix.php
@@ -23,6 +23,7 @@
  *	\brief      Tab to set the price level of a thirdparty
  */
 
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
diff --git a/htdocs/comm/propal/card.php b/htdocs/comm/propal/card.php
index 388a4f97d4b..2e996a66cfa 100644
--- a/htdocs/comm/propal/card.php
+++ b/htdocs/comm/propal/card.php
@@ -37,6 +37,7 @@
  * \brief 		Page of commercial proposals card and list
  */
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
diff --git a/htdocs/comm/propal/contact.php b/htdocs/comm/propal/contact.php
index 2497ba905a8..97fceb99f9e 100644
--- a/htdocs/comm/propal/contact.php
+++ b/htdocs/comm/propal/contact.php
@@ -24,6 +24,7 @@
  *       \brief      Tab to manage contacts/adresses of proposal
  */
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php';
 require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
diff --git a/htdocs/comm/propal/document.php b/htdocs/comm/propal/document.php
index 6f17c655e82..f58ed518517 100644
--- a/htdocs/comm/propal/document.php
+++ b/htdocs/comm/propal/document.php
@@ -26,6 +26,7 @@
  *       \brief      Management page of documents attached to a business proposal
  */
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/propal.lib.php';
diff --git a/htdocs/comm/propal/index.php b/htdocs/comm/propal/index.php
index 0e108b8ee9f..a3b46dfec24 100644
--- a/htdocs/comm/propal/index.php
+++ b/htdocs/comm/propal/index.php
@@ -25,6 +25,7 @@
  *	\brief	Home page of proposal area
  */
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
 require_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php';
diff --git a/htdocs/comm/propal/info.php b/htdocs/comm/propal/info.php
index c67ec346ecb..933791bbec2 100644
--- a/htdocs/comm/propal/info.php
+++ b/htdocs/comm/propal/info.php
@@ -24,6 +24,7 @@
  *	\brief      Page d'affichage des infos d'une proposition commerciale
  */
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php';
diff --git a/htdocs/comm/propal/list.php b/htdocs/comm/propal/list.php
index cf6237cd012..9a727b5f68c 100644
--- a/htdocs/comm/propal/list.php
+++ b/htdocs/comm/propal/list.php
@@ -37,6 +37,7 @@
  *	\brief      	Page of commercial proposals card and list
  */
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
diff --git a/htdocs/comm/propal/note.php b/htdocs/comm/propal/note.php
index 2b007ab3fa0..d2e453eac9e 100644
--- a/htdocs/comm/propal/note.php
+++ b/htdocs/comm/propal/note.php
@@ -26,6 +26,7 @@
  *	\brief      Fiche d'information sur une proposition commerciale
  */
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/propal.lib.php';
diff --git a/htdocs/comm/propal/stats/index.php b/htdocs/comm/propal/stats/index.php
index 576285594b4..af5247fb10f 100644
--- a/htdocs/comm/propal/stats/index.php
+++ b/htdocs/comm/propal/stats/index.php
@@ -26,6 +26,7 @@
  *		\brief      Page des stats propositions commerciales
  */
 
+// Load Dolibarr environment
 require '../../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propalestats.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/dolgraph.class.php';
diff --git a/htdocs/comm/prospect/index.php b/htdocs/comm/prospect/index.php
index bda09507ed0..83c30743c77 100644
--- a/htdocs/comm/prospect/index.php
+++ b/htdocs/comm/prospect/index.php
@@ -24,6 +24,7 @@
  *		\brief      Home page of propest area
  */
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/agenda.lib.php';
 
diff --git a/htdocs/comm/recap-client.php b/htdocs/comm/recap-client.php
index da37fe1048c..60295558621 100644
--- a/htdocs/comm/recap-client.php
+++ b/htdocs/comm/recap-client.php
@@ -22,6 +22,7 @@
  *		\brief      Page de fiche recap client
  */
 
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
diff --git a/htdocs/comm/remise.php b/htdocs/comm/remise.php
index cdd8fefc4b0..4da58a6bd91 100644
--- a/htdocs/comm/remise.php
+++ b/htdocs/comm/remise.php
@@ -22,6 +22,7 @@
  *		\brief      Page to edit relative discount of a customer
  */
 
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
diff --git a/htdocs/comm/remx.php b/htdocs/comm/remx.php
index a47a865fc45..b28af96527e 100644
--- a/htdocs/comm/remx.php
+++ b/htdocs/comm/remx.php
@@ -26,6 +26,7 @@
 
 if (! defined('CSRFCHECK_WITH_TOKEN')) define('CSRFCHECK_WITH_TOKEN', '1');		// Force use of CSRF protection with tokens even for GET
 
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
diff --git a/htdocs/commande/card.php b/htdocs/commande/card.php
index d6a4aead2ec..ae531f373e5 100644
--- a/htdocs/commande/card.php
+++ b/htdocs/commande/card.php
@@ -35,6 +35,7 @@
  *   \brief     Page to show customer order
  */
 
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
diff --git a/htdocs/commande/contact.php b/htdocs/commande/contact.php
index 1be1384df30..c353287962e 100644
--- a/htdocs/commande/contact.php
+++ b/htdocs/commande/contact.php
@@ -25,6 +25,7 @@
  *     \brief      Onglet de gestion des contacts de commande
  */
 
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
 require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
diff --git a/htdocs/commande/customer.php b/htdocs/commande/customer.php
index e181cc03c6a..a6eb116f17d 100644
--- a/htdocs/commande/customer.php
+++ b/htdocs/commande/customer.php
@@ -26,6 +26,7 @@
  *	\brief      Show list of customers to add an new invoice from orders
  */
 
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
 require_once DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php';
diff --git a/htdocs/commande/document.php b/htdocs/commande/document.php
index 501a803b697..c341ae59b4e 100644
--- a/htdocs/commande/document.php
+++ b/htdocs/commande/document.php
@@ -26,6 +26,7 @@
  *	\brief      Management page of documents attached to an order
  */
 
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/order.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
diff --git a/htdocs/commande/info.php b/htdocs/commande/info.php
index 396052082c5..4442af6a679 100644
--- a/htdocs/commande/info.php
+++ b/htdocs/commande/info.php
@@ -23,6 +23,7 @@
  *		\brief      Sale Order info page
  */
 
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
diff --git a/htdocs/commande/note.php b/htdocs/commande/note.php
index 2082e356797..452e58076c7 100644
--- a/htdocs/commande/note.php
+++ b/htdocs/commande/note.php
@@ -25,6 +25,7 @@
  *  \brief      Fiche de notes sur une commande
  */
 
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/order.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
diff --git a/htdocs/commande/stats/index.php b/htdocs/commande/stats/index.php
index 3e33ddedf57..15642da2d39 100644
--- a/htdocs/commande/stats/index.php
+++ b/htdocs/commande/stats/index.php
@@ -26,6 +26,7 @@
  *		\brief      Page with customers or suppliers orders statistics
  */
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
 require_once DOL_DOCUMENT_ROOT.'/commande/class/commandestats.class.php';
diff --git a/htdocs/compta/accounting-files.php b/htdocs/compta/accounting-files.php
index 4e7ab4802b7..7e9264614cd 100644
--- a/htdocs/compta/accounting-files.php
+++ b/htdocs/compta/accounting-files.php
@@ -32,6 +32,7 @@ if ((array_key_exists('action', $_GET) && $_GET['action'] == 'dl') || (array_key
 	}
 }
 
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
diff --git a/htdocs/compta/ajaxpayment.php b/htdocs/compta/ajaxpayment.php
index 0332a925f9d..f9dec6d0f19 100644
--- a/htdocs/compta/ajaxpayment.php
+++ b/htdocs/compta/ajaxpayment.php
@@ -36,6 +36,7 @@ if (!defined('NOREQUIREHTML')) {
 	define('NOREQUIREHTML', '1'); // If we don't need to load the html.form.class.php
 }
 
+// Load Dolibarr environment
 require '../main.inc.php';
 
 $langs->load('compta');
diff --git a/htdocs/compta/bank/annuel.php b/htdocs/compta/bank/annuel.php
index 41d58cb35c2..93fbf63780b 100644
--- a/htdocs/compta/bank/annuel.php
+++ b/htdocs/compta/bank/annuel.php
@@ -24,6 +24,7 @@
  *		\brief       Page to report input-output of a bank account
  */
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/bank.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
diff --git a/htdocs/compta/bank/bankentries_list.php b/htdocs/compta/bank/bankentries_list.php
index d9689202297..8dcb85797dd 100644
--- a/htdocs/compta/bank/bankentries_list.php
+++ b/htdocs/compta/bank/bankentries_list.php
@@ -31,6 +31,7 @@
  *	\brief      List of bank transactions
  */
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
diff --git a/htdocs/compta/bank/budget.php b/htdocs/compta/bank/budget.php
index 3e40e45b58e..8385dab544c 100644
--- a/htdocs/compta/bank/budget.php
+++ b/htdocs/compta/bank/budget.php
@@ -24,6 +24,7 @@
  *		\brief      Page de budget
  */
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
 
diff --git a/htdocs/compta/bank/card.php b/htdocs/compta/bank/card.php
index 62c4dfa53ec..a923f3a0829 100644
--- a/htdocs/compta/bank/card.php
+++ b/htdocs/compta/bank/card.php
@@ -29,6 +29,7 @@
  *		\brief      Page to create/view a bank account
  */
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/bank.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
diff --git a/htdocs/compta/bank/graph.php b/htdocs/compta/bank/graph.php
index c9bc7c649b3..a3fd0b0b15b 100644
--- a/htdocs/compta/bank/graph.php
+++ b/htdocs/compta/bank/graph.php
@@ -23,6 +23,7 @@
  *	\brief      Page graph des transactions bancaires
  */
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/bank.lib.php';
 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 a22e32b2595..49edf3c3a1a 100644
--- a/htdocs/compta/bank/line.php
+++ b/htdocs/compta/bank/line.php
@@ -30,6 +30,7 @@
  *	\brief      Page to edit a bank transaction record
  */
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
 require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
diff --git a/htdocs/compta/bank/list.php b/htdocs/compta/bank/list.php
index 362ca3d488f..213d31b2012 100644
--- a/htdocs/compta/bank/list.php
+++ b/htdocs/compta/bank/list.php
@@ -26,6 +26,7 @@
  *       \brief      Home page of bank module
  */
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/bank.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/tva/class/tva.class.php';
diff --git a/htdocs/compta/bank/releve.php b/htdocs/compta/bank/releve.php
index ea80f1caab3..8f5e7f29069 100644
--- a/htdocs/compta/bank/releve.php
+++ b/htdocs/compta/bank/releve.php
@@ -27,6 +27,7 @@
  *		\brief      Page to show a bank statement report
  */
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/bank.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
diff --git a/htdocs/compta/bank/transfer.php b/htdocs/compta/bank/transfer.php
index ff38abb32d4..d613cfcca1c 100644
--- a/htdocs/compta/bank/transfer.php
+++ b/htdocs/compta/bank/transfer.php
@@ -27,6 +27,7 @@
  *		\brief      Page de saisie d'un virement
  */
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/bank.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
diff --git a/htdocs/compta/bank/treso.php b/htdocs/compta/bank/treso.php
index 0d76b40a3e2..fd910e642e4 100644
--- a/htdocs/compta/bank/treso.php
+++ b/htdocs/compta/bank/treso.php
@@ -25,6 +25,7 @@
  *	\brief      Page to estimate future balance
  */
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/bank.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
diff --git a/htdocs/compta/bank/various_payment/card.php b/htdocs/compta/bank/various_payment/card.php
index 804efd010e3..0b044f8f806 100644
--- a/htdocs/compta/bank/various_payment/card.php
+++ b/htdocs/compta/bank/various_payment/card.php
@@ -22,6 +22,7 @@
  *  \brief      Page of various expenses
  */
 
+// Load Dolibarr environment
 require '../../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/bank.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
diff --git a/htdocs/compta/bank/various_payment/document.php b/htdocs/compta/bank/various_payment/document.php
index 6cbfd596c44..611d516613b 100644
--- a/htdocs/compta/bank/various_payment/document.php
+++ b/htdocs/compta/bank/various_payment/document.php
@@ -22,6 +22,7 @@
  *  \brief      Page of linked files onto various payment
  */
 
+// Load Dolibarr environment
 require '../../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
diff --git a/htdocs/compta/bank/various_payment/info.php b/htdocs/compta/bank/various_payment/info.php
index 51442fd20a1..7cca5c7b4ec 100644
--- a/htdocs/compta/bank/various_payment/info.php
+++ b/htdocs/compta/bank/various_payment/info.php
@@ -21,6 +21,7 @@
  *  \brief      Page with info about various payment
  */
 
+// Load Dolibarr environment
 require '../../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/paymentvarious.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/bank.lib.php';
diff --git a/htdocs/compta/bank/various_payment/list.php b/htdocs/compta/bank/various_payment/list.php
index fe9bb032fa8..77aea8ccc0e 100644
--- a/htdocs/compta/bank/various_payment/list.php
+++ b/htdocs/compta/bank/various_payment/list.php
@@ -24,6 +24,7 @@
  *  \brief      List of various payments
  */
 
+// Load Dolibarr environment
 require '../../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/paymentvarious.class.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
diff --git a/htdocs/compta/cashcontrol/cashcontrol_card.php b/htdocs/compta/cashcontrol/cashcontrol_card.php
index 97bca312645..78ba0e2335e 100644
--- a/htdocs/compta/cashcontrol/cashcontrol_card.php
+++ b/htdocs/compta/cashcontrol/cashcontrol_card.php
@@ -27,6 +27,7 @@
  *      \brief      Page to show a cash fence
  */
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
diff --git a/htdocs/compta/cashcontrol/cashcontrol_list.php b/htdocs/compta/cashcontrol/cashcontrol_list.php
index 4e86cb21141..5b764cfb730 100644
--- a/htdocs/compta/cashcontrol/cashcontrol_list.php
+++ b/htdocs/compta/cashcontrol/cashcontrol_list.php
@@ -22,6 +22,7 @@
  *		\brief      List page for cashcontrol
  */
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/cashcontrol/class/cashcontrol.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php';
diff --git a/htdocs/compta/cashcontrol/report.php b/htdocs/compta/cashcontrol/report.php
index af61af5e836..a617c99e7af 100644
--- a/htdocs/compta/cashcontrol/report.php
+++ b/htdocs/compta/cashcontrol/report.php
@@ -38,6 +38,7 @@ if (!defined('NOBROWSERNOTIF')) {
 
 $_GET['optioncss'] = "print";
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/cashcontrol/class/cashcontrol.class.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
diff --git a/htdocs/compta/charges/index.php b/htdocs/compta/charges/index.php
index 71ab6dd4961..b5fdd0da597 100644
--- a/htdocs/compta/charges/index.php
+++ b/htdocs/compta/charges/index.php
@@ -28,6 +28,7 @@
  *		\brief      Page to list payments of special expenses
  */
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/tva/class/tva.class.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/tva/class/paymentvat.class.php';
diff --git a/htdocs/compta/clients.php b/htdocs/compta/clients.php
index bc1d3790280..cd472c270e3 100644
--- a/htdocs/compta/clients.php
+++ b/htdocs/compta/clients.php
@@ -23,6 +23,7 @@
  *	\brief      Show list of customers to add an new invoice
  */
 
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
 require_once DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php';
diff --git a/htdocs/compta/deplacement/card.php b/htdocs/compta/deplacement/card.php
index 8259d40f694..f8e5f3ba03b 100644
--- a/htdocs/compta/deplacement/card.php
+++ b/htdocs/compta/deplacement/card.php
@@ -25,6 +25,7 @@
  *  \brief      Page to show a trip card
  */
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/trip.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/deplacement/class/deplacement.class.php';
diff --git a/htdocs/compta/deplacement/document.php b/htdocs/compta/deplacement/document.php
index 2a16d6e4f49..77e8b695bf2 100644
--- a/htdocs/compta/deplacement/document.php
+++ b/htdocs/compta/deplacement/document.php
@@ -27,6 +27,7 @@
  *       \brief      Page of linked files onto trip and expenses
  */
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/deplacement/class/deplacement.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
diff --git a/htdocs/compta/deplacement/index.php b/htdocs/compta/deplacement/index.php
index 8af897378f5..a4a782de603 100644
--- a/htdocs/compta/deplacement/index.php
+++ b/htdocs/compta/deplacement/index.php
@@ -23,6 +23,7 @@
  *  \brief      Page list of expenses
  */
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/tva/class/tva.class.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/deplacement/class/deplacement.class.php';
diff --git a/htdocs/compta/deplacement/info.php b/htdocs/compta/deplacement/info.php
index e180e104eb4..cfbbf33ab22 100644
--- a/htdocs/compta/deplacement/info.php
+++ b/htdocs/compta/deplacement/info.php
@@ -22,6 +22,7 @@
  * 	\brief      Page to show a trip information
  */
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/trip.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
diff --git a/htdocs/compta/deplacement/list.php b/htdocs/compta/deplacement/list.php
index 2aa03441e9b..cae06774332 100644
--- a/htdocs/compta/deplacement/list.php
+++ b/htdocs/compta/deplacement/list.php
@@ -25,6 +25,7 @@
  *  \brief      Page to list trips and expenses
  */
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/tva/class/tva.class.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/deplacement/class/deplacement.class.php';
diff --git a/htdocs/compta/deplacement/stats/index.php b/htdocs/compta/deplacement/stats/index.php
index 7da90915b18..50848654a71 100644
--- a/htdocs/compta/deplacement/stats/index.php
+++ b/htdocs/compta/deplacement/stats/index.php
@@ -23,6 +23,7 @@
  *  \brief      Page for statistics of module trips and expenses
  */
 
+// Load Dolibarr environment
 require '../../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/dolgraph.class.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/deplacement/class/deplacementstats.class.php';
diff --git a/htdocs/compta/facture/admin/facture_cust_extrafields.php b/htdocs/compta/facture/admin/facture_cust_extrafields.php
index 42fb64738e1..4268bd19fa1 100644
--- a/htdocs/compta/facture/admin/facture_cust_extrafields.php
+++ b/htdocs/compta/facture/admin/facture_cust_extrafields.php
@@ -25,6 +25,7 @@
 * \brief Page to setup extra fields of customer invoice
 */
 
+// Load Dolibarr environment
 require '../../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/invoice.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
diff --git a/htdocs/compta/facture/admin/facture_rec_cust_extrafields.php b/htdocs/compta/facture/admin/facture_rec_cust_extrafields.php
index 1c834134f6d..d595a665daa 100644
--- a/htdocs/compta/facture/admin/facture_rec_cust_extrafields.php
+++ b/htdocs/compta/facture/admin/facture_rec_cust_extrafields.php
@@ -26,6 +26,7 @@
 * \brief Page to setup extra fields of customer invoice
 */
 
+// Load Dolibarr environment
 require '../../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/invoice.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
diff --git a/htdocs/compta/facture/admin/facturedet_cust_extrafields.php b/htdocs/compta/facture/admin/facturedet_cust_extrafields.php
index 7b7f62ed94c..0c24c6ed2b4 100644
--- a/htdocs/compta/facture/admin/facturedet_cust_extrafields.php
+++ b/htdocs/compta/facture/admin/facturedet_cust_extrafields.php
@@ -26,6 +26,7 @@
 * \brief Page to setup extra fields of customer invoice
 */
 
+// Load Dolibarr environment
 require '../../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/invoice.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
diff --git a/htdocs/compta/facture/admin/facturedet_rec_cust_extrafields.php b/htdocs/compta/facture/admin/facturedet_rec_cust_extrafields.php
index 900aab1e10b..06553dcbdcf 100644
--- a/htdocs/compta/facture/admin/facturedet_rec_cust_extrafields.php
+++ b/htdocs/compta/facture/admin/facturedet_rec_cust_extrafields.php
@@ -26,6 +26,7 @@
 * \brief Page to setup extra fields of customer invoice
 */
 
+// Load Dolibarr environment
 require '../../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/invoice.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
diff --git a/htdocs/compta/facture/card-rec.php b/htdocs/compta/facture/card-rec.php
index 031247951e9..95073a83b9d 100644
--- a/htdocs/compta/facture/card-rec.php
+++ b/htdocs/compta/facture/card-rec.php
@@ -30,6 +30,7 @@
  *	\brief      Page to show predefined invoice
  */
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture-rec.class.php';
 require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
diff --git a/htdocs/compta/facture/contact.php b/htdocs/compta/facture/contact.php
index 6b7d8108bda..62705ffd876 100644
--- a/htdocs/compta/facture/contact.php
+++ b/htdocs/compta/facture/contact.php
@@ -25,6 +25,7 @@
  *       \brief      Onglet de gestion des contacts des factures
  */
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
 require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
diff --git a/htdocs/compta/facture/document.php b/htdocs/compta/facture/document.php
index 36ed546ab41..ee3700fd67e 100644
--- a/htdocs/compta/facture/document.php
+++ b/htdocs/compta/facture/document.php
@@ -27,6 +27,7 @@
  *	\brief      Page for attached files on invoices
  */
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/discount.class.php';
diff --git a/htdocs/compta/facture/index.php b/htdocs/compta/facture/index.php
index 1821d4720af..ebc2dea0882 100644
--- a/htdocs/compta/facture/index.php
+++ b/htdocs/compta/facture/index.php
@@ -21,6 +21,7 @@
  *	\brief		Home page of customer invoices area
  */
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
diff --git a/htdocs/compta/facture/info.php b/htdocs/compta/facture/info.php
index de08730d2c5..0d70f095d31 100644
--- a/htdocs/compta/facture/info.php
+++ b/htdocs/compta/facture/info.php
@@ -23,6 +23,7 @@
  *		\brief      Page des informations d'une facture
  */
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/discount.class.php';
diff --git a/htdocs/compta/facture/invoicetemplate_list.php b/htdocs/compta/facture/invoicetemplate_list.php
index 71573505a7f..6da1ed7ef5a 100644
--- a/htdocs/compta/facture/invoicetemplate_list.php
+++ b/htdocs/compta/facture/invoicetemplate_list.php
@@ -29,6 +29,7 @@
  *	\brief      Page to show list of template/recurring invoices
  */
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture-rec.class.php';
 require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
diff --git a/htdocs/compta/facture/list.php b/htdocs/compta/facture/list.php
index 309ec6fdae6..882c83e9460 100644
--- a/htdocs/compta/facture/list.php
+++ b/htdocs/compta/facture/list.php
@@ -35,6 +35,7 @@
  *	\brief      List of customer invoices
  */
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
diff --git a/htdocs/compta/facture/note.php b/htdocs/compta/facture/note.php
index b15e11dc614..451ccbab8c4 100644
--- a/htdocs/compta/facture/note.php
+++ b/htdocs/compta/facture/note.php
@@ -25,6 +25,7 @@
  *      \brief      Fiche de notes sur une facture
  */
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/discount.class.php';
diff --git a/htdocs/compta/facture/prelevement.php b/htdocs/compta/facture/prelevement.php
index 5a10c2055c0..1f0a877efa8 100644
--- a/htdocs/compta/facture/prelevement.php
+++ b/htdocs/compta/facture/prelevement.php
@@ -27,6 +27,7 @@
  *	\brief      Management of direct debit order or credit tranfer of invoices
  */
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/invoice.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/fourn.lib.php';
diff --git a/htdocs/compta/facture/stats/index.php b/htdocs/compta/facture/stats/index.php
index 73b9d94bdda..7bb430489b2 100644
--- a/htdocs/compta/facture/stats/index.php
+++ b/htdocs/compta/facture/stats/index.php
@@ -26,6 +26,7 @@
  *  \brief      Page des stats factures
  */
 
+// Load Dolibarr environment
 require '../../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/dolgraph.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php';
diff --git a/htdocs/compta/journal/purchasesjournal.php b/htdocs/compta/journal/purchasesjournal.php
index ea320007f4d..2c7c5d42156 100644
--- a/htdocs/compta/journal/purchasesjournal.php
+++ b/htdocs/compta/journal/purchasesjournal.php
@@ -28,6 +28,7 @@
  */
 global $mysoc;
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/report.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
diff --git a/htdocs/compta/journal/sellsjournal.php b/htdocs/compta/journal/sellsjournal.php
index 44cdcde6778..d704e09ad68 100644
--- a/htdocs/compta/journal/sellsjournal.php
+++ b/htdocs/compta/journal/sellsjournal.php
@@ -30,6 +30,7 @@
  */
 global $mysoc;
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/report.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
diff --git a/htdocs/compta/localtax/card.php b/htdocs/compta/localtax/card.php
index 84f40f5cd19..1ced651a6ac 100644
--- a/htdocs/compta/localtax/card.php
+++ b/htdocs/compta/localtax/card.php
@@ -23,6 +23,7 @@
  *		\brief      Page of second or third tax payments (like IRPF for spain, ...)
  */
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/localtax/class/localtax.class.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
diff --git a/htdocs/compta/localtax/clients.php b/htdocs/compta/localtax/clients.php
index 72155845b0c..7f8e181f121 100644
--- a/htdocs/compta/localtax/clients.php
+++ b/htdocs/compta/localtax/clients.php
@@ -23,6 +23,7 @@
  *		\brief      Third parties localtax report
  */
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/report.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/tax.lib.php';
diff --git a/htdocs/compta/localtax/list.php b/htdocs/compta/localtax/list.php
index 6f6fc303262..ee2e13e1d57 100644
--- a/htdocs/compta/localtax/list.php
+++ b/htdocs/compta/localtax/list.php
@@ -21,6 +21,7 @@
  *		\brief      List of IRPF payments
  */
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/localtax/class/localtax.class.php';
 
diff --git a/htdocs/compta/localtax/quadri_detail.php b/htdocs/compta/localtax/quadri_detail.php
index 696e70ab40d..0dfb0ab3c6d 100644
--- a/htdocs/compta/localtax/quadri_detail.php
+++ b/htdocs/compta/localtax/quadri_detail.php
@@ -27,6 +27,7 @@
  */
 global $mysoc;
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/report.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/tax.lib.php';
diff --git a/htdocs/compta/paiement.php b/htdocs/compta/paiement.php
index 46a01e4ba70..dec5787302a 100644
--- a/htdocs/compta/paiement.php
+++ b/htdocs/compta/paiement.php
@@ -30,6 +30,7 @@
  *	\brief      Payment page for customers invoices
  */
 
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/paiement/class/paiement.class.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
diff --git a/htdocs/compta/paiement/card.php b/htdocs/compta/paiement/card.php
index 1b2a8dcfc34..89ee368b7d5 100644
--- a/htdocs/compta/paiement/card.php
+++ b/htdocs/compta/paiement/card.php
@@ -27,6 +27,7 @@
  *		\remarks	Nearly same file than fournisseur/paiement/card.php
  */
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/paiement/class/paiement.class.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
diff --git a/htdocs/compta/paiement/cheque/card.php b/htdocs/compta/paiement/cheque/card.php
index 5409d3c381e..2591defbf7d 100644
--- a/htdocs/compta/paiement/cheque/card.php
+++ b/htdocs/compta/paiement/cheque/card.php
@@ -27,6 +27,7 @@
  *	\brief		Page for cheque deposits
  */
 
+// Load Dolibarr environment
 require '../../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/paiement/class/paiement.class.php';
diff --git a/htdocs/compta/paiement/cheque/index.php b/htdocs/compta/paiement/cheque/index.php
index e4aad2c5bf4..38b779de1ad 100644
--- a/htdocs/compta/paiement/cheque/index.php
+++ b/htdocs/compta/paiement/cheque/index.php
@@ -24,6 +24,7 @@
  *		\brief      Home page for cheque receipts
  */
 
+// Load Dolibarr environment
 require '../../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/paiement/cheque/class/remisecheque.class.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
diff --git a/htdocs/compta/paiement/cheque/list.php b/htdocs/compta/paiement/cheque/list.php
index 1c3abfe87bd..ea65eac132b 100644
--- a/htdocs/compta/paiement/cheque/list.php
+++ b/htdocs/compta/paiement/cheque/list.php
@@ -25,6 +25,7 @@
  *   \brief      Page list of cheque deposits
  */
 
+// Load Dolibarr environment
 require '../../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/paiement/cheque/class/remisecheque.class.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
diff --git a/htdocs/compta/paiement/index.php b/htdocs/compta/paiement/index.php
index 4c4f6bac248..a773e593599 100644
--- a/htdocs/compta/paiement/index.php
+++ b/htdocs/compta/paiement/index.php
@@ -16,6 +16,7 @@
  *
  */
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 
 // Security check
diff --git a/htdocs/compta/paiement/info.php b/htdocs/compta/paiement/info.php
index 4f279813b0a..1cbee7a50cb 100644
--- a/htdocs/compta/paiement/info.php
+++ b/htdocs/compta/paiement/info.php
@@ -23,6 +23,7 @@
  *		\brief      Onglet info d'un paiement
  */
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/paiement/class/paiement.class.php';
diff --git a/htdocs/compta/paiement/list.php b/htdocs/compta/paiement/list.php
index e6b57137df8..2837e147398 100644
--- a/htdocs/compta/paiement/list.php
+++ b/htdocs/compta/paiement/list.php
@@ -30,6 +30,7 @@
  *  \brief      Payment page for customer invoices
  */
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/paiement/class/paiement.class.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
diff --git a/htdocs/compta/paiement/rapport.php b/htdocs/compta/paiement/rapport.php
index 326be7144a8..eb27f948b2e 100644
--- a/htdocs/compta/paiement/rapport.php
+++ b/htdocs/compta/paiement/rapport.php
@@ -24,6 +24,7 @@
  *	\brief      Payment reports page
  */
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/modules/rapport/pdf_paiement.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
diff --git a/htdocs/compta/paiement/tovalidate.php b/htdocs/compta/paiement/tovalidate.php
index 6b811bc2d13..6d780c6471f 100644
--- a/htdocs/compta/paiement/tovalidate.php
+++ b/htdocs/compta/paiement/tovalidate.php
@@ -22,6 +22,7 @@
  * 	\brief      Page list payment to validate. Visible in menu when option BILL_ADD_PAYMENT_VALIDATION is on.
  */
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 
 // Load translation files required by the page
diff --git a/htdocs/compta/paiement_charge.php b/htdocs/compta/paiement_charge.php
index 50236a29e64..4ae310fe421 100644
--- a/htdocs/compta/paiement_charge.php
+++ b/htdocs/compta/paiement_charge.php
@@ -23,6 +23,7 @@
  *      \brief      Page to add payment of a tax
  */
 
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/sociales/class/chargesociales.class.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/sociales/class/paymentsocialcontribution.class.php';
diff --git a/htdocs/compta/paiement_vat.php b/htdocs/compta/paiement_vat.php
index f1f243bc06d..76fcc1c9672 100644
--- a/htdocs/compta/paiement_vat.php
+++ b/htdocs/compta/paiement_vat.php
@@ -23,6 +23,7 @@
  *      \brief      Page to add payment of a tax
  */
 
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/tva/class/paymentvat.class.php';
diff --git a/htdocs/compta/payment_sc/card.php b/htdocs/compta/payment_sc/card.php
index 1b2bbe63525..1d93075bc5b 100644
--- a/htdocs/compta/payment_sc/card.php
+++ b/htdocs/compta/payment_sc/card.php
@@ -26,6 +26,7 @@
  *		\remarks	File similar to fourn/paiement/card.php
  */
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/sociales/class/chargesociales.class.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/sociales/class/paymentsocialcontribution.class.php';
diff --git a/htdocs/compta/payment_vat/card.php b/htdocs/compta/payment_vat/card.php
index ae3e1a201fa..8beeaa1f229 100644
--- a/htdocs/compta/payment_vat/card.php
+++ b/htdocs/compta/payment_vat/card.php
@@ -26,6 +26,7 @@
  *		\remarks	Fichier presque identique a fournisseur/paiement/card.php
  */
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/tva/class/tva.class.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/tva/class/paymentvat.class.php';
diff --git a/htdocs/compta/paymentbybanktransfer/index.php b/htdocs/compta/paymentbybanktransfer/index.php
index ee7cc064df6..9e79cd98939 100644
--- a/htdocs/compta/paymentbybanktransfer/index.php
+++ b/htdocs/compta/paymentbybanktransfer/index.php
@@ -26,6 +26,7 @@
  */
 
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/prelevement/class/bonprelevement.class.php';
 require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php';
diff --git a/htdocs/compta/prelevement/card.php b/htdocs/compta/prelevement/card.php
index 129f083895c..c03a2eea6b5 100644
--- a/htdocs/compta/prelevement/card.php
+++ b/htdocs/compta/prelevement/card.php
@@ -24,6 +24,7 @@
  *	\brief      Card of a direct debit
  */
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/prelevement.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/prelevement/class/ligneprelevement.class.php';
diff --git a/htdocs/compta/prelevement/create.php b/htdocs/compta/prelevement/create.php
index 832429fe012..2429e9c62c9 100644
--- a/htdocs/compta/prelevement/create.php
+++ b/htdocs/compta/prelevement/create.php
@@ -27,6 +27,7 @@
  *	\brief      Page to create a direct debit order or a credit transfer order
  */
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/prelevement/class/bonprelevement.class.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
diff --git a/htdocs/compta/prelevement/demandes.php b/htdocs/compta/prelevement/demandes.php
index 86f1bcf583c..585c601da56 100644
--- a/htdocs/compta/prelevement/demandes.php
+++ b/htdocs/compta/prelevement/demandes.php
@@ -24,6 +24,7 @@
  *  \brief      Page to list bank transfer requests (debit order or payments of vendors)
  */
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/modules/modPrelevement.class.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
diff --git a/htdocs/compta/prelevement/factures.php b/htdocs/compta/prelevement/factures.php
index 0722450a610..d6009631ac2 100644
--- a/htdocs/compta/prelevement/factures.php
+++ b/htdocs/compta/prelevement/factures.php
@@ -24,6 +24,7 @@
  *     \brief      Page liste des factures prelevees
  */
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/prelevement.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/prelevement/class/bonprelevement.class.php';
diff --git a/htdocs/compta/prelevement/fiche-rejet.php b/htdocs/compta/prelevement/fiche-rejet.php
index 93d621a0665..0e59adfc166 100644
--- a/htdocs/compta/prelevement/fiche-rejet.php
+++ b/htdocs/compta/prelevement/fiche-rejet.php
@@ -24,6 +24,7 @@
  *		\brief      Debit order or credit transfer reject
  */
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/prelevement.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/prelevement/class/bonprelevement.class.php';
diff --git a/htdocs/compta/prelevement/fiche-stat.php b/htdocs/compta/prelevement/fiche-stat.php
index ca698854234..8d88d761956 100644
--- a/htdocs/compta/prelevement/fiche-stat.php
+++ b/htdocs/compta/prelevement/fiche-stat.php
@@ -23,6 +23,7 @@
  *	\brief      Debit order or credit transfer statistics
  */
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/prelevement.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/prelevement/class/bonprelevement.class.php';
diff --git a/htdocs/compta/prelevement/index.php b/htdocs/compta/prelevement/index.php
index df45a5bdabd..830bd101d0a 100644
--- a/htdocs/compta/prelevement/index.php
+++ b/htdocs/compta/prelevement/index.php
@@ -26,6 +26,7 @@
  */
 
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/prelevement/class/bonprelevement.class.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
diff --git a/htdocs/compta/prelevement/line.php b/htdocs/compta/prelevement/line.php
index 65ba71a0d2f..1fccef050d1 100644
--- a/htdocs/compta/prelevement/line.php
+++ b/htdocs/compta/prelevement/line.php
@@ -25,6 +25,7 @@
  *	\brief      card of withdraw line
  */
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/prelevement/class/bonprelevement.class.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/prelevement/class/ligneprelevement.class.php';
diff --git a/htdocs/compta/prelevement/list.php b/htdocs/compta/prelevement/list.php
index d9cb6f6fb7d..b84bc7f3d2d 100644
--- a/htdocs/compta/prelevement/list.php
+++ b/htdocs/compta/prelevement/list.php
@@ -25,6 +25,7 @@
  *      \brief      Page list of direct debit orders or credit transfers orders
  */
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/prelevement/class/bonprelevement.class.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/prelevement/class/ligneprelevement.class.php';
diff --git a/htdocs/compta/prelevement/orders_list.php b/htdocs/compta/prelevement/orders_list.php
index ee370b9532e..bc5ba09ed83 100644
--- a/htdocs/compta/prelevement/orders_list.php
+++ b/htdocs/compta/prelevement/orders_list.php
@@ -24,6 +24,7 @@
  * 	\brief      Page to list direct debit orders or credit transfer orders
  */
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/prelevement/class/bonprelevement.class.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
diff --git a/htdocs/compta/prelevement/rejets.php b/htdocs/compta/prelevement/rejets.php
index 029d5dd8598..06cfe8e625d 100644
--- a/htdocs/compta/prelevement/rejets.php
+++ b/htdocs/compta/prelevement/rejets.php
@@ -24,6 +24,7 @@
  *      \brief      Reject page
  */
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/prelevement/class/rejetprelevement.class.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/prelevement/class/ligneprelevement.class.php';
diff --git a/htdocs/compta/prelevement/stats.php b/htdocs/compta/prelevement/stats.php
index 8ee4c854600..32c0ce58587 100644
--- a/htdocs/compta/prelevement/stats.php
+++ b/htdocs/compta/prelevement/stats.php
@@ -24,6 +24,7 @@
  *      \brief      Page with statistics on withdrawals
  */
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/prelevement/class/ligneprelevement.class.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
diff --git a/htdocs/compta/recap-compta.php b/htdocs/compta/recap-compta.php
index 4bd79a3c0d5..d24cd602ec2 100644
--- a/htdocs/compta/recap-compta.php
+++ b/htdocs/compta/recap-compta.php
@@ -23,6 +23,7 @@
  *  \brief      Page de fiche recap customer
  */
 
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
diff --git a/htdocs/compta/resultat/clientfourn.php b/htdocs/compta/resultat/clientfourn.php
index 87d548ee94f..d5856733d4a 100644
--- a/htdocs/compta/resultat/clientfourn.php
+++ b/htdocs/compta/resultat/clientfourn.php
@@ -31,6 +31,7 @@
  *	\brief      Page reporting
  */
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/tva/class/tva.class.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/sociales/class/chargesociales.class.php';
diff --git a/htdocs/compta/resultat/index.php b/htdocs/compta/resultat/index.php
index e9706e9216f..5b2ca11be54 100644
--- a/htdocs/compta/resultat/index.php
+++ b/htdocs/compta/resultat/index.php
@@ -28,6 +28,7 @@
  *      \brief      Page reporting result
  */
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/report.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
diff --git a/htdocs/compta/resultat/result.php b/htdocs/compta/resultat/result.php
index bbe32d0cbc1..c77cfd90edd 100644
--- a/htdocs/compta/resultat/result.php
+++ b/htdocs/compta/resultat/result.php
@@ -24,6 +24,7 @@
  * \brief 		Page for accounting result
  */
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/accounting.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/report.lib.php';
diff --git a/htdocs/compta/sociales/card.php b/htdocs/compta/sociales/card.php
index 945bd4a3771..7c644c63e38 100644
--- a/htdocs/compta/sociales/card.php
+++ b/htdocs/compta/sociales/card.php
@@ -25,6 +25,7 @@
  *		\brief      Social contribution card page
  */
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formsocialcontrib.class.php';
diff --git a/htdocs/compta/sociales/document.php b/htdocs/compta/sociales/document.php
index 741100a53a3..a8d5327b285 100644
--- a/htdocs/compta/sociales/document.php
+++ b/htdocs/compta/sociales/document.php
@@ -27,6 +27,7 @@
  *       \brief      Page with attached files on social contributions
  */
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/sociales/class/chargesociales.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
diff --git a/htdocs/compta/sociales/info.php b/htdocs/compta/sociales/info.php
index 98440da6486..a2005b0a25a 100644
--- a/htdocs/compta/sociales/info.php
+++ b/htdocs/compta/sociales/info.php
@@ -21,6 +21,7 @@
  *	\brief      Page with info about social contribution
  */
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/sociales/class/chargesociales.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/tax.lib.php';
diff --git a/htdocs/compta/sociales/list.php b/htdocs/compta/sociales/list.php
index f36694bb3b2..6acce83b3e6 100644
--- a/htdocs/compta/sociales/list.php
+++ b/htdocs/compta/sociales/list.php
@@ -28,6 +28,7 @@
  *	\brief		Page to list all social contributions
  */
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/sociales/class/chargesociales.class.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
diff --git a/htdocs/compta/sociales/note.php b/htdocs/compta/sociales/note.php
index 59af7a36870..c65b731109d 100644
--- a/htdocs/compta/sociales/note.php
+++ b/htdocs/compta/sociales/note.php
@@ -21,6 +21,7 @@
  *  \brief      Tab for notes on Taxes
  */
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/sociales/class/chargesociales.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/tax.lib.php';
diff --git a/htdocs/compta/sociales/payments.php b/htdocs/compta/sociales/payments.php
index 0d1482d53ec..95130dcf7f6 100644
--- a/htdocs/compta/sociales/payments.php
+++ b/htdocs/compta/sociales/payments.php
@@ -28,6 +28,7 @@
  *		\brief      Page to list payments of special expenses
  */
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/tva/class/tva.class.php';
 require_once DOL_DOCUMENT_ROOT.'/user/class/user.class.php';
diff --git a/htdocs/compta/stats/byratecountry.php b/htdocs/compta/stats/byratecountry.php
index 86a547204f7..f19c37fb84a 100644
--- a/htdocs/compta/stats/byratecountry.php
+++ b/htdocs/compta/stats/byratecountry.php
@@ -22,6 +22,7 @@
  *		\brief      VAT by rate
  */
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/report.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/tax.lib.php';
diff --git a/htdocs/compta/stats/cabyprodserv.php b/htdocs/compta/stats/cabyprodserv.php
index 152c6ac0442..80a0a47538d 100644
--- a/htdocs/compta/stats/cabyprodserv.php
+++ b/htdocs/compta/stats/cabyprodserv.php
@@ -24,6 +24,7 @@
  *	   \brief	   Page reporting TO by Products & Services
  */
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/report.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/tax.lib.php';
diff --git a/htdocs/compta/stats/cabyuser.php b/htdocs/compta/stats/cabyuser.php
index 611ee74eae4..b880420d4fc 100644
--- a/htdocs/compta/stats/cabyuser.php
+++ b/htdocs/compta/stats/cabyuser.php
@@ -25,6 +25,7 @@
  *      \brief       Page reporting Salesover by user
  */
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/report.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/tax.lib.php';
diff --git a/htdocs/compta/stats/casoc.php b/htdocs/compta/stats/casoc.php
index 24f832c552d..870cfbd56c6 100644
--- a/htdocs/compta/stats/casoc.php
+++ b/htdocs/compta/stats/casoc.php
@@ -27,6 +27,7 @@
  *       \brief       Page reporting Turnover (CA) by thirdparty
  */
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/report.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
diff --git a/htdocs/compta/stats/index.php b/htdocs/compta/stats/index.php
index a81c732017f..53d445a4749 100644
--- a/htdocs/compta/stats/index.php
+++ b/htdocs/compta/stats/index.php
@@ -24,6 +24,7 @@
  *	\brief       Page reporting CA
  */
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/report.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
diff --git a/htdocs/compta/stats/supplier_turnover.php b/htdocs/compta/stats/supplier_turnover.php
index abbb92223cb..53446163183 100644
--- a/htdocs/compta/stats/supplier_turnover.php
+++ b/htdocs/compta/stats/supplier_turnover.php
@@ -20,6 +20,7 @@
  *	\brief       Page reporting purchase turnover
  */
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/report.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
diff --git a/htdocs/compta/stats/supplier_turnover_by_prodserv.php b/htdocs/compta/stats/supplier_turnover_by_prodserv.php
index d2bd20964f8..611de00b50f 100644
--- a/htdocs/compta/stats/supplier_turnover_by_prodserv.php
+++ b/htdocs/compta/stats/supplier_turnover_by_prodserv.php
@@ -20,6 +20,7 @@
  *	   \brief	   Page reporting purchase turnover by Products & Services
  */
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/report.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/tax.lib.php';
diff --git a/htdocs/compta/tva/card.php b/htdocs/compta/tva/card.php
index 5f089a4e205..10bb3ac16ec 100644
--- a/htdocs/compta/tva/card.php
+++ b/htdocs/compta/tva/card.php
@@ -26,6 +26,7 @@
  *		\brief      Page of VAT payments
  */
 
+// 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.formfile.class.php';
diff --git a/htdocs/compta/tva/clients.php b/htdocs/compta/tva/clients.php
index f7b860cd792..aa639804ba0 100644
--- a/htdocs/compta/tva/clients.php
+++ b/htdocs/compta/tva/clients.php
@@ -26,6 +26,7 @@
  *		\brief      Page of sales taxes
  */
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/report.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/tax.lib.php';
diff --git a/htdocs/compta/tva/document.php b/htdocs/compta/tva/document.php
index 745742b1c8e..86e31632c17 100644
--- a/htdocs/compta/tva/document.php
+++ b/htdocs/compta/tva/document.php
@@ -28,6 +28,7 @@
  *       \brief      Page with attached files on social contributions
  */
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/tva/class/tva.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
diff --git a/htdocs/compta/tva/info.php b/htdocs/compta/tva/info.php
index 96eed7ce20b..ea9ea7b5a37 100644
--- a/htdocs/compta/tva/info.php
+++ b/htdocs/compta/tva/info.php
@@ -21,6 +21,7 @@
  *	\brief      Page with info about vat
  */
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/tva/class/tva.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/vat.lib.php';
diff --git a/htdocs/compta/tva/list.php b/htdocs/compta/tva/list.php
index 524f8b0105b..194393e51f0 100644
--- a/htdocs/compta/tva/list.php
+++ b/htdocs/compta/tva/list.php
@@ -26,6 +26,7 @@
  *	\brief		List of VAT payments
  */
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 
 require_once DOL_DOCUMENT_ROOT.'/compta/tva/class/tva.class.php';
diff --git a/htdocs/compta/tva/payments.php b/htdocs/compta/tva/payments.php
index eba36a10625..38a5884da1c 100644
--- a/htdocs/compta/tva/payments.php
+++ b/htdocs/compta/tva/payments.php
@@ -27,6 +27,7 @@
  *		\brief      Page to list payments of special expenses
  */
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/tva/class/tva.class.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/tva/class/tva.class.php';
diff --git a/htdocs/compta/tva/quadri_detail.php b/htdocs/compta/tva/quadri_detail.php
index 15c45d6055b..18b3c9c6b86 100644
--- a/htdocs/compta/tva/quadri_detail.php
+++ b/htdocs/compta/tva/quadri_detail.php
@@ -28,6 +28,7 @@
  *		\brief      VAT by rate
  */
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/report.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/tax.lib.php';
diff --git a/htdocs/contact/ldap.php b/htdocs/contact/ldap.php
index d7ddd520ac0..04741396ff5 100644
--- a/htdocs/contact/ldap.php
+++ b/htdocs/contact/ldap.php
@@ -22,6 +22,7 @@
  *       \brief      Page fiche LDAP contact
  */
 
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/contact.lib.php';
diff --git a/htdocs/contact/note.php b/htdocs/contact/note.php
index a3bfb861b0f..dc67ccc87d4 100644
--- a/htdocs/contact/note.php
+++ b/htdocs/contact/note.php
@@ -25,6 +25,7 @@
  *   \ingroup    societe
  */
 
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/contact.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
diff --git a/htdocs/contact/perso.php b/htdocs/contact/perso.php
index aa7ba34d9f0..bdfa4ddb708 100644
--- a/htdocs/contact/perso.php
+++ b/htdocs/contact/perso.php
@@ -24,6 +24,7 @@
  *       \brief      Onglet informations personnelles d'un contact
  */
 
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/contact.lib.php';
diff --git a/htdocs/contact/project.php b/htdocs/contact/project.php
index 6680f7f7ee3..2c5ffb78e5d 100644
--- a/htdocs/contact/project.php
+++ b/htdocs/contact/project.php
@@ -22,6 +22,7 @@
  *  \brief      Page of third party projects
  */
 
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 
diff --git a/htdocs/contact/vcard.php b/htdocs/contact/vcard.php
index 256039fa96f..fe11c90c0b9 100644
--- a/htdocs/contact/vcard.php
+++ b/htdocs/contact/vcard.php
@@ -24,6 +24,7 @@
  *		\brief      Onglet vcard d'un contact
  */
 
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
 require_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
diff --git a/htdocs/contrat/admin/contract_extrafields.php b/htdocs/contrat/admin/contract_extrafields.php
index 71483f6b1aa..8821a15608d 100644
--- a/htdocs/contrat/admin/contract_extrafields.php
+++ b/htdocs/contrat/admin/contract_extrafields.php
@@ -27,6 +27,7 @@
  */
 
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/contract.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
diff --git a/htdocs/contrat/admin/contractdet_extrafields.php b/htdocs/contrat/admin/contractdet_extrafields.php
index cc4cf23e37b..1d56089e83a 100644
--- a/htdocs/contrat/admin/contractdet_extrafields.php
+++ b/htdocs/contrat/admin/contractdet_extrafields.php
@@ -27,6 +27,7 @@
  */
 
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/contract.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
diff --git a/htdocs/contrat/contact.php b/htdocs/contrat/contact.php
index d32a0464b02..8ceefe2f168 100644
--- a/htdocs/contrat/contact.php
+++ b/htdocs/contrat/contact.php
@@ -24,6 +24,7 @@
  *      \brief      Onglet de gestion des contacts des contrats
  */
 
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/contract.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/contrat/class/contrat.class.php';
diff --git a/htdocs/contrat/list.php b/htdocs/contrat/list.php
index 0630f664b8d..8c24c4e65ee 100644
--- a/htdocs/contrat/list.php
+++ b/htdocs/contrat/list.php
@@ -30,6 +30,7 @@
  *       \brief      Page to list contracts
  */
 
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/contrat/class/contrat.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
diff --git a/htdocs/contrat/note.php b/htdocs/contrat/note.php
index 997ba94de3b..391b10718ce 100644
--- a/htdocs/contrat/note.php
+++ b/htdocs/contrat/note.php
@@ -24,6 +24,7 @@
  *      \brief      Fiche de notes sur un contrat
  */
 
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/contract.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/contrat/class/contrat.class.php';
diff --git a/htdocs/core/ajax/ajaxcompanies.php b/htdocs/core/ajax/ajaxcompanies.php
index 350f03398aa..9f135d8cb42 100644
--- a/htdocs/core/ajax/ajaxcompanies.php
+++ b/htdocs/core/ajax/ajaxcompanies.php
@@ -30,6 +30,7 @@ if (!defined('NOREQUIREAJAX'))  define('NOREQUIREAJAX', '1');
 if (!defined('NOREQUIRESOC'))   define('NOREQUIRESOC', '1');
 if (!defined('NOCSRFCHECK'))    define('NOCSRFCHECK', '1');
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 
 
diff --git a/htdocs/core/ajax/bankconciliate.php b/htdocs/core/ajax/bankconciliate.php
index 351903ea1f7..5407c30545d 100644
--- a/htdocs/core/ajax/bankconciliate.php
+++ b/htdocs/core/ajax/bankconciliate.php
@@ -37,6 +37,7 @@ if (!defined('NOREQUIRESOC')) {
 }
 //if (! defined('NOREQUIRETRAN'))  define('NOREQUIRETRAN','1');    // Required to know date format for dol_print_date
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
diff --git a/htdocs/core/ajax/box.php b/htdocs/core/ajax/box.php
index 8559cdd10b0..a6a93c69f68 100644
--- a/htdocs/core/ajax/box.php
+++ b/htdocs/core/ajax/box.php
@@ -37,6 +37,7 @@ if (!defined('NOREQUIRESOC')) {
 	define('NOREQUIRESOC', '1');
 }
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/infobox.class.php';
 
diff --git a/htdocs/core/ajax/check_notifications.php b/htdocs/core/ajax/check_notifications.php
index 96a33f1f099..df2db07d0ab 100644
--- a/htdocs/core/ajax/check_notifications.php
+++ b/htdocs/core/ajax/check_notifications.php
@@ -39,6 +39,7 @@ if (!defined('NOREQUIRETRAN')) {
 	define('NOREQUIRETRAN', '1');
 }
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 
 //$time = (int) GETPOST('time', 'int'); // Use the time parameter that is always increased by time_update, even if call is late
diff --git a/htdocs/core/ajax/constantonoff.php b/htdocs/core/ajax/constantonoff.php
index b8beec3111a..a38b353519f 100644
--- a/htdocs/core/ajax/constantonoff.php
+++ b/htdocs/core/ajax/constantonoff.php
@@ -43,6 +43,7 @@ if (!defined('CSRFCHECK_WITH_TOKEN')) {
 	define('CSRFCHECK_WITH_TOKEN', '1'); // Token is required even in GET mode
 }
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
 
diff --git a/htdocs/core/ajax/contacts.php b/htdocs/core/ajax/contacts.php
index 39291eb0bba..4577fccf3c6 100644
--- a/htdocs/core/ajax/contacts.php
+++ b/htdocs/core/ajax/contacts.php
@@ -31,6 +31,7 @@ if (!defined('NOREQUIREAJAX')) {
 	define('NOREQUIREAJAX', '1');
 }
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 
 $id = GETPOST('id', 'int'); // id of thirdparty
diff --git a/htdocs/core/ajax/fileupload.php b/htdocs/core/ajax/fileupload.php
index 53d65e4ab75..0f6fac32338 100644
--- a/htdocs/core/ajax/fileupload.php
+++ b/htdocs/core/ajax/fileupload.php
@@ -35,6 +35,7 @@ if (!defined('NOREQUIREHTML')) {
 }
 
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/fileupload.class.php';
 
diff --git a/htdocs/core/ajax/getaccountcurrency.php b/htdocs/core/ajax/getaccountcurrency.php
index 3c1147a1a57..ff27812aaa2 100644
--- a/htdocs/core/ajax/getaccountcurrency.php
+++ b/htdocs/core/ajax/getaccountcurrency.php
@@ -30,6 +30,7 @@ if (!defined('NOREQUIREAJAX')) {
 	define('NOREQUIREAJAX', '1');
 }
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 
 $id = GETPOST('id', 'int');
diff --git a/htdocs/core/ajax/loadinplace.php b/htdocs/core/ajax/loadinplace.php
index 0a3e30928b8..1cdecf6306d 100644
--- a/htdocs/core/ajax/loadinplace.php
+++ b/htdocs/core/ajax/loadinplace.php
@@ -33,6 +33,7 @@ if (!defined('NOREQUIRESOC')) {
 	define('NOREQUIRESOC', '1');
 }
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/genericobject.class.php';
 
diff --git a/htdocs/core/ajax/locationincoterms.php b/htdocs/core/ajax/locationincoterms.php
index 3a508a07057..34a7459c972 100644
--- a/htdocs/core/ajax/locationincoterms.php
+++ b/htdocs/core/ajax/locationincoterms.php
@@ -42,6 +42,7 @@ if (!defined('NOCSRFCHECK')) {
 	define('NOCSRFCHECK', '1');
 }
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.form.class.php';
 
diff --git a/htdocs/core/ajax/objectonoff.php b/htdocs/core/ajax/objectonoff.php
index ffd05c4747e..1df1bbba213 100644
--- a/htdocs/core/ajax/objectonoff.php
+++ b/htdocs/core/ajax/objectonoff.php
@@ -39,6 +39,7 @@ if (!defined('NOREQUIRETRAN')) {
 	define('NOREQUIRETRAN', '1');
 }
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/genericobject.class.php';
 
diff --git a/htdocs/core/ajax/pingresult.php b/htdocs/core/ajax/pingresult.php
index 8e3cc622512..73b740bdfaf 100644
--- a/htdocs/core/ajax/pingresult.php
+++ b/htdocs/core/ajax/pingresult.php
@@ -40,6 +40,7 @@ if (!defined('NOREQUIRETRAN')) {
 	define('NOREQUIRETRAN', '1');
 }
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
 
diff --git a/htdocs/core/ajax/price.php b/htdocs/core/ajax/price.php
index bf93e12fce8..283afb77653 100644
--- a/htdocs/core/ajax/price.php
+++ b/htdocs/core/ajax/price.php
@@ -33,6 +33,7 @@ if (!defined('NOREQUIRESOC')) {
 	define('NOREQUIRESOC', '1');
 }
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 
 $output		= GETPOST('output', 'alpha');
diff --git a/htdocs/core/ajax/row.php b/htdocs/core/ajax/row.php
index fcc39e1aae1..3aa429ee89e 100644
--- a/htdocs/core/ajax/row.php
+++ b/htdocs/core/ajax/row.php
@@ -46,6 +46,7 @@ if (!defined('NOREQUIRETRAN')) {
 	define('NOREQUIRETRAN', '1');
 }
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/genericobject.class.php';
 $hookmanager->initHooks(array('rowinterface'));
diff --git a/htdocs/core/ajax/saveinplace.php b/htdocs/core/ajax/saveinplace.php
index a127fa08645..32fdae72835 100644
--- a/htdocs/core/ajax/saveinplace.php
+++ b/htdocs/core/ajax/saveinplace.php
@@ -33,6 +33,7 @@ if (!defined('NOREQUIRESOC')) {
 	define('NOREQUIRESOC', '1');
 }
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/genericobject.class.php';
 
diff --git a/htdocs/core/ajax/security.php b/htdocs/core/ajax/security.php
index 1f2143d4b72..e5dc91c05d1 100644
--- a/htdocs/core/ajax/security.php
+++ b/htdocs/core/ajax/security.php
@@ -40,6 +40,7 @@ if (!defined('NOREQUIRETRAN')) {
 	define('NOREQUIRETRAN', '1');
 }
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 
 $action = GETPOST('action');
diff --git a/htdocs/core/ajax/selectobject.php b/htdocs/core/ajax/selectobject.php
index c8c3e13ea3d..1028ad69db4 100644
--- a/htdocs/core/ajax/selectobject.php
+++ b/htdocs/core/ajax/selectobject.php
@@ -39,6 +39,7 @@ if (!defined('NOCSRFCHECK')) {
 	define('NOCSRFCHECK', '1');
 }
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 
 $objectdesc = GETPOST('objectdesc', 'alpha');
diff --git a/htdocs/core/ajax/vatrates.php b/htdocs/core/ajax/vatrates.php
index 7bb8be9e612..56cb4c788e3 100644
--- a/htdocs/core/ajax/vatrates.php
+++ b/htdocs/core/ajax/vatrates.php
@@ -30,6 +30,7 @@ if (!defined('NOREQUIREAJAX')) {
 	define('NOREQUIREAJAX', '1');
 }
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 
 $id = GETPOST('id', 'int');
diff --git a/htdocs/core/ajax/ziptown.php b/htdocs/core/ajax/ziptown.php
index aa9474ce142..6452bcec884 100644
--- a/htdocs/core/ajax/ziptown.php
+++ b/htdocs/core/ajax/ziptown.php
@@ -41,6 +41,7 @@ if (!defined('NOCSRFCHECK')) {
 	define('NOCSRFCHECK', '1');
 }
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php';
 
diff --git a/htdocs/core/filemanagerdol/browser/default/frmactualfolder.php b/htdocs/core/filemanagerdol/browser/default/frmactualfolder.php
index 949307c0624..1304afa1754 100644
--- a/htdocs/core/filemanagerdol/browser/default/frmactualfolder.php
+++ b/htdocs/core/filemanagerdol/browser/default/frmactualfolder.php
@@ -21,6 +21,7 @@
 
 define('NOTOKENRENEWAL', 1); // Disables token renewal
 
+// Load Dolibarr environment
 require '../../../../main.inc.php';
 
 top_httphead();
diff --git a/htdocs/core/filemanagerdol/browser/default/frmcreatefolder.php b/htdocs/core/filemanagerdol/browser/default/frmcreatefolder.php
index 26fb3fbc2ab..3189ae92ee8 100644
--- a/htdocs/core/filemanagerdol/browser/default/frmcreatefolder.php
+++ b/htdocs/core/filemanagerdol/browser/default/frmcreatefolder.php
@@ -21,6 +21,7 @@
 
 define('NOTOKENRENEWAL', 1); // Disables token renewal
 
+// Load Dolibarr environment
 require '../../../../main.inc.php';
 
 $langs->load("ecm");
diff --git a/htdocs/core/filemanagerdol/browser/default/frmfolders.php b/htdocs/core/filemanagerdol/browser/default/frmfolders.php
index 424992ee979..d8d1fae179a 100644
--- a/htdocs/core/filemanagerdol/browser/default/frmfolders.php
+++ b/htdocs/core/filemanagerdol/browser/default/frmfolders.php
@@ -21,6 +21,7 @@
 
 define('NOTOKENRENEWAL', 1); // Disables token renewal
 
+// Load Dolibarr environment
 require '../../../../main.inc.php';
 
 top_httphead();
diff --git a/htdocs/core/filemanagerdol/browser/default/frmresourceslist.php b/htdocs/core/filemanagerdol/browser/default/frmresourceslist.php
index 2a6e3deee68..16ad0d426d6 100644
--- a/htdocs/core/filemanagerdol/browser/default/frmresourceslist.php
+++ b/htdocs/core/filemanagerdol/browser/default/frmresourceslist.php
@@ -21,6 +21,7 @@
 
 define('NOTOKENRENEWAL', 1); // Disables token renewal
 
+// Load Dolibarr environment
 require '../../../../main.inc.php';
 
 top_httphead();
diff --git a/htdocs/core/filemanagerdol/browser/default/frmupload.php b/htdocs/core/filemanagerdol/browser/default/frmupload.php
index ab91c06b15d..e5807bd41c7 100644
--- a/htdocs/core/filemanagerdol/browser/default/frmupload.php
+++ b/htdocs/core/filemanagerdol/browser/default/frmupload.php
@@ -21,6 +21,7 @@
 
 define('NOTOKENRENEWAL', 1); // Disables token renewal
 
+// Load Dolibarr environment
 require '../../../../main.inc.php';
 
 top_httphead();
diff --git a/htdocs/core/modules/oauth/generic_oauthcallback.php b/htdocs/core/modules/oauth/generic_oauthcallback.php
index 9d66bb07302..34422111d5d 100644
--- a/htdocs/core/modules/oauth/generic_oauthcallback.php
+++ b/htdocs/core/modules/oauth/generic_oauthcallback.php
@@ -22,6 +22,7 @@
  *      \brief      Page to get oauth callback
  */
 
+// Load Dolibarr environment
 require '../../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/includes/OAuth/bootstrap.php';
 use OAuth\Common\Storage\DoliStorage;
diff --git a/htdocs/core/modules/oauth/github_oauthcallback.php b/htdocs/core/modules/oauth/github_oauthcallback.php
index f496c42d0ac..24140718880 100644
--- a/htdocs/core/modules/oauth/github_oauthcallback.php
+++ b/htdocs/core/modules/oauth/github_oauthcallback.php
@@ -22,6 +22,7 @@
  *      \brief      Page to get oauth callback
  */
 
+// Load Dolibarr environment
 require '../../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/includes/OAuth/bootstrap.php';
 use OAuth\Common\Storage\DoliStorage;
diff --git a/htdocs/core/modules/oauth/google_oauthcallback.php b/htdocs/core/modules/oauth/google_oauthcallback.php
index 9208a6110a9..f30d73c2d4e 100644
--- a/htdocs/core/modules/oauth/google_oauthcallback.php
+++ b/htdocs/core/modules/oauth/google_oauthcallback.php
@@ -25,6 +25,7 @@
  *      \brief      Page to get oauth callback
  */
 
+// Load Dolibarr environment
 require '../../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/includes/OAuth/bootstrap.php';
 use OAuth\Common\Storage\DoliStorage;
diff --git a/htdocs/core/modules/oauth/stripelive_oauthcallback.php b/htdocs/core/modules/oauth/stripelive_oauthcallback.php
index f24921faf83..ef35b6573cc 100644
--- a/htdocs/core/modules/oauth/stripelive_oauthcallback.php
+++ b/htdocs/core/modules/oauth/stripelive_oauthcallback.php
@@ -22,6 +22,7 @@
  *      \brief      Page to get oauth callback
  */
 
+// Load Dolibarr environment
 require '../../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/includes/OAuth/bootstrap.php';
 use OAuth\Common\Storage\DoliStorage;
diff --git a/htdocs/core/modules/oauth/stripetest_oauthcallback.php b/htdocs/core/modules/oauth/stripetest_oauthcallback.php
index b41b579857e..a5d481dbef5 100644
--- a/htdocs/core/modules/oauth/stripetest_oauthcallback.php
+++ b/htdocs/core/modules/oauth/stripetest_oauthcallback.php
@@ -22,6 +22,7 @@
  *      \brief      Page to get oauth callback
  */
 
+// Load Dolibarr environment
 require '../../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/includes/OAuth/bootstrap.php';
 use OAuth\Common\Storage\DoliStorage;
diff --git a/htdocs/core/photos_resize.php b/htdocs/core/photos_resize.php
index e35d09d7e3f..6797f12593f 100644
--- a/htdocs/core/photos_resize.php
+++ b/htdocs/core/photos_resize.php
@@ -24,6 +24,7 @@
  *       \brief     File of page to resize photos
  */
 
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/product.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/images.lib.php';
diff --git a/htdocs/core/tools.php b/htdocs/core/tools.php
index 3c55f1a1e37..86b1dfc8875 100644
--- a/htdocs/core/tools.php
+++ b/htdocs/core/tools.php
@@ -22,6 +22,7 @@
  *       \brief      Home page for top menu tools
  */
 
+// Load Dolibarr environment
 require '../main.inc.php';
 
 // Load translation files required by the page
diff --git a/htdocs/cron/card.php b/htdocs/cron/card.php
index 319c16c7d0c..ac28bc631a4 100644
--- a/htdocs/cron/card.php
+++ b/htdocs/cron/card.php
@@ -24,6 +24,7 @@
  *  \brief      Cron Jobs Card
  */
 
+// Load Dolibarr environment
 require '../main.inc.php';
 
 require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
diff --git a/htdocs/cron/info.php b/htdocs/cron/info.php
index 689daf8eff5..aff0a6919d0 100644
--- a/htdocs/cron/info.php
+++ b/htdocs/cron/info.php
@@ -20,6 +20,7 @@
  *  \brief      	Page of info of a cron job
  */
 
+// Load Dolibarr environment
 require '../main.inc.php';
 
 require_once DOL_DOCUMENT_ROOT."/cron/class/cronjob.class.php";
diff --git a/htdocs/cron/list.php b/htdocs/cron/list.php
index 41082fa79cd..a2c3b1d4807 100644
--- a/htdocs/cron/list.php
+++ b/htdocs/cron/list.php
@@ -24,6 +24,7 @@
  *  \brief      Lists Jobs
  */
 
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/cron/class/cronjob.class.php';
diff --git a/htdocs/datapolicy/admin/setup.php b/htdocs/datapolicy/admin/setup.php
index 26b71ce60e1..28c0f4f9422 100644
--- a/htdocs/datapolicy/admin/setup.php
+++ b/htdocs/datapolicy/admin/setup.php
@@ -22,6 +22,7 @@
  * \brief   datapolicy setup page.
  */
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php";
 require_once '../lib/datapolicy.lib.php';
diff --git a/htdocs/datapolicy/admin/setupmail.php b/htdocs/datapolicy/admin/setupmail.php
index 825bd13b142..d8f866502b8 100644
--- a/htdocs/datapolicy/admin/setupmail.php
+++ b/htdocs/datapolicy/admin/setupmail.php
@@ -18,6 +18,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php";
 require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
diff --git a/htdocs/datapolicy/mailing.php b/htdocs/datapolicy/mailing.php
index 7e2dccaf7d4..f15d00d5307 100644
--- a/htdocs/datapolicy/mailing.php
+++ b/htdocs/datapolicy/mailing.php
@@ -22,6 +22,7 @@
  * \brief   datapolicy mailing page.
  */
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
 require_once DOL_DOCUMENT_ROOT.'/datapolicy/class/datapolicy.class.php';
diff --git a/htdocs/datapolicy/public/index.php b/htdocs/datapolicy/public/index.php
index 104b393bf7e..3bca5d301a7 100644
--- a/htdocs/datapolicy/public/index.php
+++ b/htdocs/datapolicy/public/index.php
@@ -32,6 +32,7 @@ if (!defined('NOREQUIREMENU')) {
 	define('NOREQUIREMENU', '1');
 }
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
 require_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
diff --git a/htdocs/delivery/card.php b/htdocs/delivery/card.php
index 2d829c79b25..ad9ec2d414a 100644
--- a/htdocs/delivery/card.php
+++ b/htdocs/delivery/card.php
@@ -27,6 +27,7 @@
  *	\brief      Page to describe a delivery receipt
  */
 
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/delivery/class/delivery.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/modules/delivery/modules_delivery.php';
diff --git a/htdocs/don/admin/donation_extrafields.php b/htdocs/don/admin/donation_extrafields.php
index 1fc28065a5c..7d774478217 100644
--- a/htdocs/don/admin/donation_extrafields.php
+++ b/htdocs/don/admin/donation_extrafields.php
@@ -22,6 +22,7 @@
  *  \brief      Page to setup extra fields of donations
  */
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/donation.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
diff --git a/htdocs/don/card.php b/htdocs/don/card.php
index b3b1a517077..dfc4a128dc0 100644
--- a/htdocs/don/card.php
+++ b/htdocs/don/card.php
@@ -27,6 +27,7 @@
  *  \brief      Page of donation card
  */
 
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/modules/dons/modules_don.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/donation.lib.php';
diff --git a/htdocs/don/document.php b/htdocs/don/document.php
index 53ca935e5ae..219a5116658 100644
--- a/htdocs/don/document.php
+++ b/htdocs/don/document.php
@@ -29,6 +29,7 @@
  *       \brief      Page of linked files onto donation
  */
 
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
diff --git a/htdocs/don/index.php b/htdocs/don/index.php
index 85e2eb3e48f..9dc14918477 100644
--- a/htdocs/don/index.php
+++ b/htdocs/don/index.php
@@ -24,6 +24,7 @@
  *  \brief      Home page of donation module
  */
 
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/don/class/don.class.php';
 
diff --git a/htdocs/don/info.php b/htdocs/don/info.php
index b19826f9bcd..82dd9842210 100644
--- a/htdocs/don/info.php
+++ b/htdocs/don/info.php
@@ -21,6 +21,7 @@
  * 	\brief      Page to show a donation information
  */
 
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/donation.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
diff --git a/htdocs/don/list.php b/htdocs/don/list.php
index 73314d9727c..1ab7220d894 100644
--- a/htdocs/don/list.php
+++ b/htdocs/don/list.php
@@ -25,6 +25,7 @@
  *  \brief      List of donations
  */
 
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/don/class/don.class.php';
 if (isModEnabled('project')) {
diff --git a/htdocs/don/note.php b/htdocs/don/note.php
index 57ca862ad77..4d84c4b1417 100644
--- a/htdocs/don/note.php
+++ b/htdocs/don/note.php
@@ -25,6 +25,7 @@
  *      \brief      Page to show a donation notes
  */
 
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/don/class/don.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/donation.lib.php';
diff --git a/htdocs/don/payment/card.php b/htdocs/don/payment/card.php
index 1b4ebaaf88e..f5507e5e6c7 100644
--- a/htdocs/don/payment/card.php
+++ b/htdocs/don/payment/card.php
@@ -22,6 +22,7 @@
  *		\brief      Tab payment of a donation
  */
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/don/class/don.class.php';
 require_once DOL_DOCUMENT_ROOT.'/don/class/paymentdonation.class.php';
diff --git a/htdocs/don/payment/payment.php b/htdocs/don/payment/payment.php
index 092f5114141..6a2cc78f128 100644
--- a/htdocs/don/payment/payment.php
+++ b/htdocs/don/payment/payment.php
@@ -22,6 +22,7 @@
  *  \brief      Page to add payment of a donation
  */
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/don/class/don.class.php';
 require_once DOL_DOCUMENT_ROOT.'/don/class/paymentdonation.class.php';
diff --git a/htdocs/don/stats/index.php b/htdocs/don/stats/index.php
index f56bdcd15ac..4109c30d335 100644
--- a/htdocs/don/stats/index.php
+++ b/htdocs/don/stats/index.php
@@ -24,6 +24,7 @@
  *  \brief      Page with donations statistics
  */
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/don/class/don.class.php';
 require_once DOL_DOCUMENT_ROOT.'/don/class/donstats.class.php';
diff --git a/htdocs/ecm/ajax/ecmdatabase.php b/htdocs/ecm/ajax/ecmdatabase.php
index 2ce35973483..475e22754b0 100644
--- a/htdocs/ecm/ajax/ecmdatabase.php
+++ b/htdocs/ecm/ajax/ecmdatabase.php
@@ -33,6 +33,7 @@ if (!defined('NOREQUIRESOC')) {
 	define('NOREQUIRESOC', '1');
 }
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 
diff --git a/htdocs/ecm/dir_add_card.php b/htdocs/ecm/dir_add_card.php
index 6f80a68dc35..01a1cfb63a9 100644
--- a/htdocs/ecm/dir_add_card.php
+++ b/htdocs/ecm/dir_add_card.php
@@ -25,6 +25,7 @@
 
 if (! defined('DISABLE_JS_GRAHP')) define('DISABLE_JS_GRAPH', 1);
 
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
 require_once DOL_DOCUMENT_ROOT.'/ecm/class/htmlecm.form.class.php';
diff --git a/htdocs/ecm/dir_card.php b/htdocs/ecm/dir_card.php
index 930575d1778..c36cebfc80c 100644
--- a/htdocs/ecm/dir_card.php
+++ b/htdocs/ecm/dir_card.php
@@ -22,6 +22,7 @@
  *	\brief     	Card of a directory for ECM module
  */
 
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
 require_once DOL_DOCUMENT_ROOT.'/ecm/class/ecmdirectory.class.php';
diff --git a/htdocs/ecm/file_card.php b/htdocs/ecm/file_card.php
index 0a1114fb40c..f55ad4061a4 100644
--- a/htdocs/ecm/file_card.php
+++ b/htdocs/ecm/file_card.php
@@ -21,6 +21,7 @@
  *	\brief     	Card of a file for ECM module
  */
 
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
 require_once DOL_DOCUMENT_ROOT.'/ecm/class/ecmdirectory.class.php';
diff --git a/htdocs/ecm/file_note.php b/htdocs/ecm/file_note.php
index 53b120d3191..07534dc5ae8 100644
--- a/htdocs/ecm/file_note.php
+++ b/htdocs/ecm/file_note.php
@@ -25,6 +25,7 @@
  *  \brief      Tab for notes on an ECM file
  */
 
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/ecm.lib.php';
diff --git a/htdocs/ecm/index.php b/htdocs/ecm/index.php
index ceaf74f533d..79c4d7dcc24 100644
--- a/htdocs/ecm/index.php
+++ b/htdocs/ecm/index.php
@@ -24,6 +24,7 @@
  *	\brief      Main page for ECM section area
  */
 
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/ecm.lib.php';
diff --git a/htdocs/ecm/index_auto.php b/htdocs/ecm/index_auto.php
index 8014a4522bb..88c3802fba5 100644
--- a/htdocs/ecm/index_auto.php
+++ b/htdocs/ecm/index_auto.php
@@ -23,6 +23,7 @@
  *	\brief      Main page for ECM section area
  */
 
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/ecm.lib.php';
diff --git a/htdocs/ecm/search.php b/htdocs/ecm/search.php
index 5f86c0e8c57..77ae4408da3 100644
--- a/htdocs/ecm/search.php
+++ b/htdocs/ecm/search.php
@@ -22,6 +22,7 @@
  *	\brief      Page to make advanced search into ECM
  */
 
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/ecm.lib.php';
diff --git a/htdocs/expedition/card.php b/htdocs/expedition/card.php
index 24489288554..87aba2b670b 100644
--- a/htdocs/expedition/card.php
+++ b/htdocs/expedition/card.php
@@ -35,6 +35,7 @@
  *	\brief      Card of a shipment
  */
 
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
 require_once DOL_DOCUMENT_ROOT.'/expedition/class/expedition.class.php';
diff --git a/htdocs/expedition/contact.php b/htdocs/expedition/contact.php
index da2fe595aec..4c540adcd9e 100644
--- a/htdocs/expedition/contact.php
+++ b/htdocs/expedition/contact.php
@@ -23,6 +23,7 @@
  *     \brief      Onglet de gestion des contacts de expedition
  */
 
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/expedition/class/expedition.class.php';
 require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
diff --git a/htdocs/expedition/document.php b/htdocs/expedition/document.php
index 08f30446f72..71e325677e6 100644
--- a/htdocs/expedition/document.php
+++ b/htdocs/expedition/document.php
@@ -26,6 +26,7 @@
  *	\brief      Management page of documents attached to an expedition
  */
 
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/order.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
diff --git a/htdocs/expedition/index.php b/htdocs/expedition/index.php
index 8a992e0c7ec..a644aeedbad 100644
--- a/htdocs/expedition/index.php
+++ b/htdocs/expedition/index.php
@@ -25,6 +25,7 @@
  *       \brief      Home page of shipping area.
  */
 
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
 require_once DOL_DOCUMENT_ROOT.'/expedition/class/expedition.class.php';
diff --git a/htdocs/expedition/list.php b/htdocs/expedition/list.php
index b693800e253..e67b59605f2 100644
--- a/htdocs/expedition/list.php
+++ b/htdocs/expedition/list.php
@@ -26,6 +26,7 @@
  *      \brief      Page to list all shipments
  */
 
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/expedition/class/expedition.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
diff --git a/htdocs/expedition/note.php b/htdocs/expedition/note.php
index f3e2c2bdb07..d23bb0298ea 100644
--- a/htdocs/expedition/note.php
+++ b/htdocs/expedition/note.php
@@ -24,6 +24,7 @@
  *      \brief      Note card expedition
  */
 
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/expedition/class/expedition.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/sendings.lib.php';
diff --git a/htdocs/expedition/shipment.php b/htdocs/expedition/shipment.php
index 4d5b27e9c7a..4aa9a9a7f54 100644
--- a/htdocs/expedition/shipment.php
+++ b/htdocs/expedition/shipment.php
@@ -26,6 +26,7 @@
  *  \brief      Tab shipments/delivery receipts on the order
  */
 
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
 require_once DOL_DOCUMENT_ROOT.'/expedition/class/expedition.class.php';
diff --git a/htdocs/expedition/stats/index.php b/htdocs/expedition/stats/index.php
index b97af33cb6e..3e8cba9def2 100644
--- a/htdocs/expedition/stats/index.php
+++ b/htdocs/expedition/stats/index.php
@@ -23,6 +23,7 @@
  *     \brief      Page with shipment statistics
  */
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/expedition/class/expedition.class.php';
 require_once DOL_DOCUMENT_ROOT.'/expedition/class/expeditionstats.class.php';
diff --git a/htdocs/expedition/stats/month.php b/htdocs/expedition/stats/month.php
index 254fd9aad90..34842efaaf3 100644
--- a/htdocs/expedition/stats/month.php
+++ b/htdocs/expedition/stats/month.php
@@ -22,6 +22,7 @@
  *    \brief      Page des stats expeditions par mois
  */
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/expedition/class/expedition.class.php';
 require_once DOL_DOCUMENT_ROOT.'/expedition/class/expeditionstats.class.php';
diff --git a/htdocs/expensereport/card.php b/htdocs/expensereport/card.php
index 680f1861fe3..3c7c7a1ad89 100644
--- a/htdocs/expensereport/card.php
+++ b/htdocs/expensereport/card.php
@@ -26,6 +26,7 @@
  *  \brief      	Page for trip and expense report card
  */
 
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formexpensereport.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
diff --git a/htdocs/expensereport/document.php b/htdocs/expensereport/document.php
index 8c3b5f56549..a4572c9a169 100644
--- a/htdocs/expensereport/document.php
+++ b/htdocs/expensereport/document.php
@@ -28,6 +28,7 @@
  *       \brief      Page of linked files onto trip and expens reports
  */
 
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
diff --git a/htdocs/expensereport/index.php b/htdocs/expensereport/index.php
index 504101a1720..fced8a58e14 100644
--- a/htdocs/expensereport/index.php
+++ b/htdocs/expensereport/index.php
@@ -28,6 +28,7 @@
  *  \brief      Page list of expenses
  */
 
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/tva/class/tva.class.php';
 require_once DOL_DOCUMENT_ROOT.'/expensereport/class/expensereport.class.php';
diff --git a/htdocs/expensereport/info.php b/htdocs/expensereport/info.php
index 605197d14ac..c2216185b5c 100644
--- a/htdocs/expensereport/info.php
+++ b/htdocs/expensereport/info.php
@@ -23,6 +23,7 @@
  * 	\brief      Page to show a trip information
  */
 
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/expensereport.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
diff --git a/htdocs/expensereport/list.php b/htdocs/expensereport/list.php
index 38f85c6c006..896bb29cf43 100644
--- a/htdocs/expensereport/list.php
+++ b/htdocs/expensereport/list.php
@@ -29,6 +29,7 @@
  *		\brief      list of expense reports
  */
 
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
diff --git a/htdocs/expensereport/note.php b/htdocs/expensereport/note.php
index 5649f2144e4..18c99dfd229 100644
--- a/htdocs/expensereport/note.php
+++ b/htdocs/expensereport/note.php
@@ -24,6 +24,7 @@
  *  \brief      Tab for notes on expense reports
  */
 
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/expensereport.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
diff --git a/htdocs/expensereport/payment/card.php b/htdocs/expensereport/payment/card.php
index c24689a9d69..316dccd91d8 100644
--- a/htdocs/expensereport/payment/card.php
+++ b/htdocs/expensereport/payment/card.php
@@ -21,6 +21,7 @@
  *		\brief      Tab payment of an expense report
  */
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/expensereport/class/expensereport.class.php';
 require_once DOL_DOCUMENT_ROOT.'/expensereport/class/paymentexpensereport.class.php';
diff --git a/htdocs/expensereport/payment/info.php b/htdocs/expensereport/payment/info.php
index a654c77b6cd..b5d87b81a51 100644
--- a/htdocs/expensereport/payment/info.php
+++ b/htdocs/expensereport/payment/info.php
@@ -24,6 +24,7 @@
  *		\brief      Tab payment info
  */
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/expensereport/class/paymentexpensereport.class.php';
diff --git a/htdocs/expensereport/payment/list.php b/htdocs/expensereport/payment/list.php
index 5a08c30f636..cb93aae4ff0 100644
--- a/htdocs/expensereport/payment/list.php
+++ b/htdocs/expensereport/payment/list.php
@@ -33,6 +33,7 @@
  *	\brief		Payment list for expense reports
  */
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/expensereport/class/paymentexpensereport.class.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
diff --git a/htdocs/expensereport/payment/payment.php b/htdocs/expensereport/payment/payment.php
index 74e0c63151b..6456bf80d7f 100644
--- a/htdocs/expensereport/payment/payment.php
+++ b/htdocs/expensereport/payment/payment.php
@@ -23,6 +23,7 @@
  *  \brief      Page to add payment of an expense report
  */
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/expensereport/class/expensereport.class.php';
 require_once DOL_DOCUMENT_ROOT.'/expensereport/class/paymentexpensereport.class.php';
diff --git a/htdocs/expensereport/stats/index.php b/htdocs/expensereport/stats/index.php
index ded5a7a3805..b4d11320411 100644
--- a/htdocs/expensereport/stats/index.php
+++ b/htdocs/expensereport/stats/index.php
@@ -24,6 +24,7 @@
  *  \brief      Page for statistics of module trips and expenses
  */
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/dolgraph.class.php';
 require_once DOL_DOCUMENT_ROOT.'/expensereport/class/expensereportstats.class.php';
diff --git a/htdocs/externalsite/admin/index.php b/htdocs/externalsite/admin/index.php
index 0b55a297be9..deb05ade024 100644
--- a/htdocs/externalsite/admin/index.php
+++ b/htdocs/externalsite/admin/index.php
@@ -30,6 +30,7 @@ if (!defined('NOSCANPOSTFORINJECTION')) {
 	define('NOSCANPOSTFORINJECTION', '1'); // Do not check anti CSRF attack test
 }
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
 
diff --git a/htdocs/externalsite/frames.php b/htdocs/externalsite/frames.php
index 6deb6e9cf72..6b958a15a67 100644
--- a/htdocs/externalsite/frames.php
+++ b/htdocs/externalsite/frames.php
@@ -26,6 +26,7 @@
  *					  /externalsite/frames.php?keyforcontent=EXTERNAL_SITE_URL_abc to show URL defined into $conf->global->EXTERNAL_SITE_URL_abc
  */
 
+// Load Dolibarr environment
 require '../main.inc.php';
 
 // Load translation files required by the page
diff --git a/htdocs/fichinter/admin/fichinter_extrafields.php b/htdocs/fichinter/admin/fichinter_extrafields.php
index 31459b22b5d..67427f8f73b 100644
--- a/htdocs/fichinter/admin/fichinter_extrafields.php
+++ b/htdocs/fichinter/admin/fichinter_extrafields.php
@@ -26,6 +26,7 @@
  */
 
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/fichinter.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
diff --git a/htdocs/fichinter/admin/fichinterdet_extrafields.php b/htdocs/fichinter/admin/fichinterdet_extrafields.php
index 5fb1567efe4..69913abd188 100644
--- a/htdocs/fichinter/admin/fichinterdet_extrafields.php
+++ b/htdocs/fichinter/admin/fichinterdet_extrafields.php
@@ -26,6 +26,7 @@
  */
 
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/fichinter.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
diff --git a/htdocs/fichinter/card-rec.php b/htdocs/fichinter/card-rec.php
index 04e9c293cc1..6c07ec6837d 100644
--- a/htdocs/fichinter/card-rec.php
+++ b/htdocs/fichinter/card-rec.php
@@ -30,6 +30,7 @@
  *  \brief       Page to show predefined fichinter
  */
 
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/fichinter/class/fichinter.class.php';
 require_once DOL_DOCUMENT_ROOT.'/fichinter/class/fichinterrec.class.php';
diff --git a/htdocs/fichinter/card.php b/htdocs/fichinter/card.php
index 7cde90e3d7e..a090c8573c4 100644
--- a/htdocs/fichinter/card.php
+++ b/htdocs/fichinter/card.php
@@ -30,6 +30,7 @@
  *	\ingroup    ficheinter
  */
 
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
 require_once DOL_DOCUMENT_ROOT.'/fichinter/class/fichinter.class.php';
diff --git a/htdocs/fichinter/contact.php b/htdocs/fichinter/contact.php
index 8528281c607..02099d959c7 100644
--- a/htdocs/fichinter/contact.php
+++ b/htdocs/fichinter/contact.php
@@ -23,6 +23,7 @@
  *       \brief      Onglet de gestion des contacts de fiche d'intervention
  */
 
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/fichinter/class/fichinter.class.php';
 require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
diff --git a/htdocs/fichinter/document.php b/htdocs/fichinter/document.php
index a2511cfee8f..1b388763c02 100644
--- a/htdocs/fichinter/document.php
+++ b/htdocs/fichinter/document.php
@@ -28,6 +28,7 @@
  *       \brief      Page des documents joints sur les contrats
  */
 
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/fichinter/class/fichinter.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
diff --git a/htdocs/fichinter/index.php b/htdocs/fichinter/index.php
index 7e0bf6f7f44..06e5ca0b21f 100644
--- a/htdocs/fichinter/index.php
+++ b/htdocs/fichinter/index.php
@@ -25,6 +25,7 @@
  *	\brief      Home page of interventional module
  */
 
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/notify.class.php';
diff --git a/htdocs/fichinter/info.php b/htdocs/fichinter/info.php
index a5c0abfeb3d..c556ba022e0 100644
--- a/htdocs/fichinter/info.php
+++ b/htdocs/fichinter/info.php
@@ -24,6 +24,7 @@
  *	\brief      Page d'affichage des infos d'une fiche d'intervention
  */
 
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/fichinter/class/fichinter.class.php';
diff --git a/htdocs/fichinter/list.php b/htdocs/fichinter/list.php
index 554f0053a92..858ea2d3a4b 100644
--- a/htdocs/fichinter/list.php
+++ b/htdocs/fichinter/list.php
@@ -29,6 +29,7 @@
  *	\ingroup    ficheinter
  */
 
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
 require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
diff --git a/htdocs/fichinter/note.php b/htdocs/fichinter/note.php
index 3fb2e349c04..5b246e55eb7 100644
--- a/htdocs/fichinter/note.php
+++ b/htdocs/fichinter/note.php
@@ -24,6 +24,7 @@
  *	\brief      Fiche d'information sur une fiche d'intervention
  */
 
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/fichinter/class/fichinter.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/fichinter.lib.php';
diff --git a/htdocs/fichinter/stats/index.php b/htdocs/fichinter/stats/index.php
index 9e49d9bc4b5..f1ab4b08fec 100644
--- a/htdocs/fichinter/stats/index.php
+++ b/htdocs/fichinter/stats/index.php
@@ -21,6 +21,7 @@
  *		\brief      Page with interventions statistics
  */
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/fichinter/class/fichinter.class.php';
 require_once DOL_DOCUMENT_ROOT.'/fichinter/class/fichinterstats.class.php';
diff --git a/htdocs/fourn/ajax/getSupplierPrices.php b/htdocs/fourn/ajax/getSupplierPrices.php
index 6ebac09d8fb..632a8fcb6cb 100644
--- a/htdocs/fourn/ajax/getSupplierPrices.php
+++ b/htdocs/fourn/ajax/getSupplierPrices.php
@@ -35,6 +35,7 @@ if (!defined('NOREQUIRESOC')) {
 	define('NOREQUIRESOC', '1');
 }
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.product.class.php';
 
diff --git a/htdocs/fourn/card.php b/htdocs/fourn/card.php
index 9a7a3d7dcc0..00a3ba55caa 100644
--- a/htdocs/fourn/card.php
+++ b/htdocs/fourn/card.php
@@ -29,6 +29,7 @@
  *	\brief      Page for supplier third party card (view, edit)
  */
 
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.class.php';
 require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php';
diff --git a/htdocs/fourn/commande/card.php b/htdocs/fourn/commande/card.php
index 86113b13592..5e1d3f188c1 100644
--- a/htdocs/fourn/commande/card.php
+++ b/htdocs/fourn/commande/card.php
@@ -33,6 +33,7 @@
  *	\brief		Card supplier order
  */
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formorder.class.php';
diff --git a/htdocs/fourn/commande/contact.php b/htdocs/fourn/commande/contact.php
index 32eb55d2d4c..92859d2eb1f 100644
--- a/htdocs/fourn/commande/contact.php
+++ b/htdocs/fourn/commande/contact.php
@@ -24,6 +24,7 @@
  *       \brief      Onglet de gestion des contacts de commande
  */
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.commande.class.php';
 require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
diff --git a/htdocs/fourn/commande/dispatch.php b/htdocs/fourn/commande/dispatch.php
index c5aa40d99d6..1383ebd8b0f 100644
--- a/htdocs/fourn/commande/dispatch.php
+++ b/htdocs/fourn/commande/dispatch.php
@@ -30,6 +30,7 @@
  * \brief Page to dispatch receiving
  */
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/modules/supplier_order/modules_commandefournisseur.php';
 require_once DOL_DOCUMENT_ROOT.'/product/stock/class/entrepot.class.php';
diff --git a/htdocs/fourn/commande/document.php b/htdocs/fourn/commande/document.php
index 957fa32867f..0eba3dbc601 100644
--- a/htdocs/fourn/commande/document.php
+++ b/htdocs/fourn/commande/document.php
@@ -27,6 +27,7 @@
  *	\brief      Management page of attached documents to a supplier order
  */
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/order.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
diff --git a/htdocs/fourn/commande/index.php b/htdocs/fourn/commande/index.php
index 3d5a111ed03..5fc4d46072e 100644
--- a/htdocs/fourn/commande/index.php
+++ b/htdocs/fourn/commande/index.php
@@ -25,6 +25,7 @@
  *	 \brief	  Home page of supplier's orders area
  */
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
 require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.commande.class.php';
diff --git a/htdocs/fourn/commande/info.php b/htdocs/fourn/commande/info.php
index 27f0483d35a..017818e3e6b 100644
--- a/htdocs/fourn/commande/info.php
+++ b/htdocs/fourn/commande/info.php
@@ -24,6 +24,7 @@
  *       \brief      Fiche commande
  */
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/fourn.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
diff --git a/htdocs/fourn/commande/list.php b/htdocs/fourn/commande/list.php
index c6401b0a70a..936f12e5d1f 100644
--- a/htdocs/fourn/commande/list.php
+++ b/htdocs/fourn/commande/list.php
@@ -31,6 +31,7 @@
  *   \brief      List of purchase orders
  */
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
diff --git a/htdocs/fourn/commande/note.php b/htdocs/fourn/commande/note.php
index 7c19c6c8867..ee5c0335ce9 100644
--- a/htdocs/fourn/commande/note.php
+++ b/htdocs/fourn/commande/note.php
@@ -25,6 +25,7 @@
  *       \brief      Fiche note commande
  */
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/fourn.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.commande.class.php';
diff --git a/htdocs/fourn/contact.php b/htdocs/fourn/contact.php
index 9d6e3abd4cf..6ffb734f175 100644
--- a/htdocs/fourn/contact.php
+++ b/htdocs/fourn/contact.php
@@ -23,6 +23,7 @@
  *		\brief      Liste des contacts fournisseurs
  */
 
+// Load Dolibarr environment
 require '../main.inc.php';
 
 $langs->load("companies");
diff --git a/htdocs/fourn/facture/card-rec.php b/htdocs/fourn/facture/card-rec.php
index 3b3a0d75253..f9c955e5c82 100644
--- a/htdocs/fourn/facture/card-rec.php
+++ b/htdocs/fourn/facture/card-rec.php
@@ -30,6 +30,7 @@
  *    \brief      Page to show predefined invoice
  */
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT . '/fourn/class/fournisseur.facture-rec.class.php';
 require_once DOL_DOCUMENT_ROOT . '/fourn/class/fournisseur.product.class.php';
diff --git a/htdocs/fourn/facture/card.php b/htdocs/fourn/facture/card.php
index 2ee737fdf0e..3a124e65c14 100644
--- a/htdocs/fourn/facture/card.php
+++ b/htdocs/fourn/facture/card.php
@@ -33,6 +33,7 @@
  *	\brief      Page for supplier invoice card (view, edit, validate)
  */
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
 require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.class.php';
diff --git a/htdocs/fourn/facture/contact.php b/htdocs/fourn/facture/contact.php
index ad36d63e9a7..f9f7a754b8f 100644
--- a/htdocs/fourn/facture/contact.php
+++ b/htdocs/fourn/facture/contact.php
@@ -25,6 +25,7 @@
  *      \brief      Onglet de gestion des contacts des factures
  */
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.class.php';
 require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php';
diff --git a/htdocs/fourn/facture/document.php b/htdocs/fourn/facture/document.php
index 4479b89c34d..fa08b721370 100644
--- a/htdocs/fourn/facture/document.php
+++ b/htdocs/fourn/facture/document.php
@@ -28,6 +28,7 @@
  *       \brief      Page to manage documents joined to vendor invoices
  */
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.class.php';
 require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php';
diff --git a/htdocs/fourn/facture/index.php b/htdocs/fourn/facture/index.php
index 9546d434bb9..0b6baf3dbb2 100644
--- a/htdocs/fourn/facture/index.php
+++ b/htdocs/fourn/facture/index.php
@@ -21,6 +21,7 @@
  *	\brief		Home page of customer invoices area
  */
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
diff --git a/htdocs/fourn/facture/info.php b/htdocs/fourn/facture/info.php
index c5491dfdbfd..a4322c2448e 100644
--- a/htdocs/fourn/facture/info.php
+++ b/htdocs/fourn/facture/info.php
@@ -25,6 +25,7 @@
  *		\brief      Page des informations d'une facture fournisseur
  */
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.class.php';
 require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php';
diff --git a/htdocs/fourn/facture/list-rec.php b/htdocs/fourn/facture/list-rec.php
index 93519ff9524..aa58a03e945 100644
--- a/htdocs/fourn/facture/list-rec.php
+++ b/htdocs/fourn/facture/list-rec.php
@@ -29,6 +29,7 @@
  *	\brief      Page to show list of template/recurring invoices
  */
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture-rec.class.php';
 require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
diff --git a/htdocs/fourn/facture/list.php b/htdocs/fourn/facture/list.php
index 4c5b84ea4ee..90e4b000cd7 100644
--- a/htdocs/fourn/facture/list.php
+++ b/htdocs/fourn/facture/list.php
@@ -34,6 +34,7 @@
  *       \brief      List of suppliers invoices
  */
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
diff --git a/htdocs/fourn/facture/note.php b/htdocs/fourn/facture/note.php
index c405b6bab12..e1eb788723f 100644
--- a/htdocs/fourn/facture/note.php
+++ b/htdocs/fourn/facture/note.php
@@ -26,6 +26,7 @@
  *      \brief      Fiche de notes sur une facture fournisseur
  */
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/fourn.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.class.php';
diff --git a/htdocs/fourn/facture/paiement.php b/htdocs/fourn/facture/paiement.php
index d9b755fdf4e..bac4fd1b616 100644
--- a/htdocs/fourn/facture/paiement.php
+++ b/htdocs/fourn/facture/paiement.php
@@ -33,6 +33,7 @@
  *	\brief      Payment page for supplier invoices
  */
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.class.php';
 require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php';
diff --git a/htdocs/fourn/facture/rapport.php b/htdocs/fourn/facture/rapport.php
index f46871b03e9..b2840362d47 100644
--- a/htdocs/fourn/facture/rapport.php
+++ b/htdocs/fourn/facture/rapport.php
@@ -22,6 +22,7 @@
  *	\brief      Payment reports page
  */
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/modules/rapport/pdf_paiement_fourn.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
diff --git a/htdocs/fourn/index.php b/htdocs/fourn/index.php
index 68a6d663d8a..18d86da67e7 100644
--- a/htdocs/fourn/index.php
+++ b/htdocs/fourn/index.php
@@ -23,6 +23,7 @@
  *	\brief      Home page of suppliers area
  */
 
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.commande.class.php';
 require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php';
diff --git a/htdocs/fourn/paiement/list.php b/htdocs/fourn/paiement/list.php
index edffba6a7a8..980413b05a0 100644
--- a/htdocs/fourn/paiement/list.php
+++ b/htdocs/fourn/paiement/list.php
@@ -33,6 +33,7 @@
  *	\brief		Payment list for supplier invoices
  */
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/fourn/class/paiementfourn.class.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
diff --git a/htdocs/fourn/recap-fourn.php b/htdocs/fourn/recap-fourn.php
index b5489a3d8e0..3ef2ef6116e 100644
--- a/htdocs/fourn/recap-fourn.php
+++ b/htdocs/fourn/recap-fourn.php
@@ -23,6 +23,7 @@
  *		\brief      Page de fiche recap supplier
  */
 
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php';
diff --git a/htdocs/ftp/admin/ftpclient.php b/htdocs/ftp/admin/ftpclient.php
index c3d5509aa36..42c326b8a9d 100644
--- a/htdocs/ftp/admin/ftpclient.php
+++ b/htdocs/ftp/admin/ftpclient.php
@@ -22,6 +22,7 @@
  *       \brief      Admin page to setup FTP client module
  */
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
 
diff --git a/htdocs/ftp/index.php b/htdocs/ftp/index.php
index f798ff10973..857d41fc85b 100644
--- a/htdocs/ftp/index.php
+++ b/htdocs/ftp/index.php
@@ -23,6 +23,7 @@
  *  \brief      Main page for FTP section area
  */
 
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
diff --git a/htdocs/holiday/card.php b/htdocs/holiday/card.php
index f1faf827b34..3cc05be2068 100644
--- a/htdocs/holiday/card.php
+++ b/htdocs/holiday/card.php
@@ -29,6 +29,7 @@
  *		\brief      Form and file creation of paid holiday.
  */
 
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.form.class.php';
 require_once DOL_DOCUMENT_ROOT.'/user/class/usergroup.class.php';
diff --git a/htdocs/holiday/card_group.php b/htdocs/holiday/card_group.php
index 950e2342de8..de10c3d72f6 100644
--- a/htdocs/holiday/card_group.php
+++ b/htdocs/holiday/card_group.php
@@ -29,6 +29,7 @@
  *		\brief      Form and file creation of paid holiday.
  */
 
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.form.class.php';
 require_once DOL_DOCUMENT_ROOT.'/user/class/usergroup.class.php';
diff --git a/htdocs/holiday/define_holiday.php b/htdocs/holiday/define_holiday.php
index 3ea0d87d3cd..486315f36ac 100644
--- a/htdocs/holiday/define_holiday.php
+++ b/htdocs/holiday/define_holiday.php
@@ -26,6 +26,7 @@
  *		\brief      File that defines the balance of paid holiday of users.
  */
 
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/user/class/user.class.php';
 require_once DOL_DOCUMENT_ROOT.'/holiday/class/holiday.class.php';
diff --git a/htdocs/holiday/document.php b/htdocs/holiday/document.php
index 9d3e63bd09a..c47b47634d7 100644
--- a/htdocs/holiday/document.php
+++ b/htdocs/holiday/document.php
@@ -28,6 +28,7 @@
  *       \brief      Page des documents joints sur les contrats
  */
 
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/holiday/class/holiday.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
diff --git a/htdocs/holiday/info.php b/htdocs/holiday/info.php
index 5df3a5069de..a1aea0720a5 100644
--- a/htdocs/holiday/info.php
+++ b/htdocs/holiday/info.php
@@ -23,6 +23,7 @@
  * 	\brief      Page to show a leave information
  */
 
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/holiday.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
diff --git a/htdocs/holiday/list.php b/htdocs/holiday/list.php
index 521695b45f2..8f16676f9ce 100644
--- a/htdocs/holiday/list.php
+++ b/htdocs/holiday/list.php
@@ -25,6 +25,7 @@
  *		\brief      List of holiday
  */
 
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.form.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
diff --git a/htdocs/holiday/month_report.php b/htdocs/holiday/month_report.php
index bfde7e34191..a3b8171cc62 100644
--- a/htdocs/holiday/month_report.php
+++ b/htdocs/holiday/month_report.php
@@ -24,6 +24,7 @@
  *      \brief      Monthly report of leave requests.
  */
 
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/holiday/class/holiday.class.php';
 require_once DOL_DOCUMENT_ROOT.'/user/class/user.class.php';
diff --git a/htdocs/holiday/view_log.php b/htdocs/holiday/view_log.php
index 1463b91939e..7642fc6b84d 100644
--- a/htdocs/holiday/view_log.php
+++ b/htdocs/holiday/view_log.php
@@ -24,6 +24,7 @@
  *  \ingroup    holiday
  */
 
+// Load Dolibarr environment
 require '../main.inc.php';
 
 // Security check (access forbidden for external user too)
diff --git a/htdocs/hrm/establishment/card.php b/htdocs/hrm/establishment/card.php
index 1b30eed663a..71c48b63011 100644
--- a/htdocs/hrm/establishment/card.php
+++ b/htdocs/hrm/establishment/card.php
@@ -20,6 +20,7 @@
  *  \brief      	Page to show an establishment
  */
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/hrm.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/hrm/class/establishment.class.php';
diff --git a/htdocs/hrm/establishment/info.php b/htdocs/hrm/establishment/info.php
index b0d9e8d5f81..bae5f28376d 100644
--- a/htdocs/hrm/establishment/info.php
+++ b/htdocs/hrm/establishment/info.php
@@ -20,6 +20,7 @@
  *  \brief      	Page to show info of an establishment
  */
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/hrm.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
diff --git a/htdocs/imports/emptyexample.php b/htdocs/imports/emptyexample.php
index 6435f91241c..6d8b3f2d647 100644
--- a/htdocs/imports/emptyexample.php
+++ b/htdocs/imports/emptyexample.php
@@ -48,6 +48,7 @@ function llxFooter()
 	print '</body></html>';
 }
 
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/imports/class/import.class.php';
diff --git a/htdocs/intracommreport/admin/intracommreport.php b/htdocs/intracommreport/admin/intracommreport.php
index 3185e8a030e..7b7eeb2e6ae 100644
--- a/htdocs/intracommreport/admin/intracommreport.php
+++ b/htdocs/intracommreport/admin/intracommreport.php
@@ -22,6 +22,7 @@
  *      \brief		Page to setup the module intracomm report
  */
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/intracommreport.lib.php';
diff --git a/htdocs/intracommreport/card.php b/htdocs/intracommreport/card.php
index a5acefca8d6..0f7df7340ba 100644
--- a/htdocs/intracommreport/card.php
+++ b/htdocs/intracommreport/card.php
@@ -33,6 +33,7 @@
  *
  */
 
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/functions.lib.php';
diff --git a/htdocs/intracommreport/list.php b/htdocs/intracommreport/list.php
index 244ebdd862f..a1c9b508b76 100644
--- a/htdocs/intracommreport/list.php
+++ b/htdocs/intracommreport/list.php
@@ -22,6 +22,7 @@
  *  \brief      Page to list intracomm report
  */
 
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/intracommreport/class/intracommreport.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
diff --git a/htdocs/loan/calcmens.php b/htdocs/loan/calcmens.php
index cc6debab86c..73b222c8274 100644
--- a/htdocs/loan/calcmens.php
+++ b/htdocs/loan/calcmens.php
@@ -33,6 +33,7 @@ if (!defined('NOREQUIREAJAX')) {
 	define('NOREQUIREAJAX', '1');
 }
 
+// Load Dolibarr environment
 require '../main.inc.php';
 require DOL_DOCUMENT_ROOT.'/core/lib/loan.lib.php';
 
diff --git a/htdocs/loan/card.php b/htdocs/loan/card.php
index 7ec8e7894fc..f7ee7280067 100644
--- a/htdocs/loan/card.php
+++ b/htdocs/loan/card.php
@@ -24,6 +24,7 @@
  *  \brief      Loan card
  */
 
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/loan/class/loan.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/loan.lib.php';
diff --git a/htdocs/loan/document.php b/htdocs/loan/document.php
index a9d92f472f4..c809711005f 100644
--- a/htdocs/loan/document.php
+++ b/htdocs/loan/document.php
@@ -22,6 +22,7 @@
  *       \brief      Page with attached files on loan
  */
 
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/loan/class/loan.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
diff --git a/htdocs/loan/info.php b/htdocs/loan/info.php
index a0e235a2afb..49618d0f46c 100644
--- a/htdocs/loan/info.php
+++ b/htdocs/loan/info.php
@@ -22,6 +22,7 @@
  *	\brief      Page with info about loan
  */
 
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/loan/class/loan.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/loan.lib.php';
diff --git a/htdocs/loan/list.php b/htdocs/loan/list.php
index f9b08a63a48..146c0521a61 100644
--- a/htdocs/loan/list.php
+++ b/htdocs/loan/list.php
@@ -24,6 +24,7 @@
  *  \brief      Page to list all loans
  */
 
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/loan/class/loan.class.php';
 
diff --git a/htdocs/loan/note.php b/htdocs/loan/note.php
index c9b6ef0e679..2f2ee7021eb 100644
--- a/htdocs/loan/note.php
+++ b/htdocs/loan/note.php
@@ -27,6 +27,7 @@
  *   \brief      Tab for notes on loan
  */
 
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/loan/class/loan.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/loan.lib.php';
diff --git a/htdocs/loan/payment/card.php b/htdocs/loan/payment/card.php
index 8f7ad7da44c..6c302feddac 100644
--- a/htdocs/loan/payment/card.php
+++ b/htdocs/loan/payment/card.php
@@ -21,6 +21,7 @@
  *  \brief      Payment's card of loan
  */
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/loan/class/loan.class.php';
 require_once DOL_DOCUMENT_ROOT.'/loan/class/paymentloan.class.php';
diff --git a/htdocs/loan/payment/payment.php b/htdocs/loan/payment/payment.php
index c20c3978571..6a136f8ba2e 100644
--- a/htdocs/loan/payment/payment.php
+++ b/htdocs/loan/payment/payment.php
@@ -23,6 +23,7 @@
  *		\brief      Page to add payment of a loan
  */
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/loan/class/loan.class.php';
 require_once DOL_DOCUMENT_ROOT.'/loan/class/loanschedule.class.php';
diff --git a/htdocs/loan/schedule.php b/htdocs/loan/schedule.php
index cd5faa1afe3..8887c82ef42 100644
--- a/htdocs/loan/schedule.php
+++ b/htdocs/loan/schedule.php
@@ -23,6 +23,7 @@
  *  \brief      Schedule card
  */
 
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/loan/class/loan.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/loan.lib.php';
diff --git a/htdocs/margin/agentMargins.php b/htdocs/margin/agentMargins.php
index 5f8c7320cd1..3bb84086b1e 100644
--- a/htdocs/margin/agentMargins.php
+++ b/htdocs/margin/agentMargins.php
@@ -23,6 +23,7 @@
  *	\brief      Page des marges par agent commercial
  */
 
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
diff --git a/htdocs/margin/customerMargins.php b/htdocs/margin/customerMargins.php
index 290a94908c0..d348bb4e9b7 100644
--- a/htdocs/margin/customerMargins.php
+++ b/htdocs/margin/customerMargins.php
@@ -22,6 +22,7 @@
  *	\brief      Page des marges par client
  */
 
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
diff --git a/htdocs/margin/index.php b/htdocs/margin/index.php
index 0dcab7435f7..8363cd331c4 100644
--- a/htdocs/margin/index.php
+++ b/htdocs/margin/index.php
@@ -22,6 +22,7 @@
  *	\brief      Page d'index du module margin
  */
 
+// Load Dolibarr environment
 require '../main.inc.php';
 
 if ($user->rights->produit->lire) {
diff --git a/htdocs/margin/productMargins.php b/htdocs/margin/productMargins.php
index ac006c042aa..f25b9c1937a 100644
--- a/htdocs/margin/productMargins.php
+++ b/htdocs/margin/productMargins.php
@@ -23,6 +23,7 @@
  *	\brief      Page des marges par produit
  */
 
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
diff --git a/htdocs/margin/tabs/productMargins.php b/htdocs/margin/tabs/productMargins.php
index 93895b01e2f..2a4b1072e87 100644
--- a/htdocs/margin/tabs/productMargins.php
+++ b/htdocs/margin/tabs/productMargins.php
@@ -21,6 +21,7 @@
  *	\brief      Page des marges des factures clients pour un produit
  */
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/product.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
diff --git a/htdocs/margin/tabs/thirdpartyMargins.php b/htdocs/margin/tabs/thirdpartyMargins.php
index 363af100cbe..00188256619 100644
--- a/htdocs/margin/tabs/thirdpartyMargins.php
+++ b/htdocs/margin/tabs/thirdpartyMargins.php
@@ -21,6 +21,7 @@
  *	\brief      Page for invoice margins of a thirdparty
  */
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
diff --git a/htdocs/modulebuilder/index.php b/htdocs/modulebuilder/index.php
index 81da2909779..46613047cb1 100644
--- a/htdocs/modulebuilder/index.php
+++ b/htdocs/modulebuilder/index.php
@@ -31,6 +31,7 @@ if (!defined('NOSCANPOSTFORINJECTION')) {
 	define('NOSCANPOSTFORINJECTION', '1'); // Do not check anti SQL+XSS injection attack test
 }
 
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
diff --git a/htdocs/mrp/ajax/ajax_bom.php b/htdocs/mrp/ajax/ajax_bom.php
index 54bfaf893ab..a46563e02c8 100644
--- a/htdocs/mrp/ajax/ajax_bom.php
+++ b/htdocs/mrp/ajax/ajax_bom.php
@@ -42,6 +42,7 @@ if (!defined('NOREQUIREAJAX')) {
 	define('NOREQUIREAJAX', '1');
 }
 
+// Load Dolibarr environment
 require '../../main.inc.php'; // Load $user and permissions
 require_once DOL_DOCUMENT_ROOT.'/bom/class/bom.class.php';
 
diff --git a/htdocs/mrp/index.php b/htdocs/mrp/index.php
index d9ee0e39cc6..d7929ce1422 100644
--- a/htdocs/mrp/index.php
+++ b/htdocs/mrp/index.php
@@ -26,6 +26,7 @@
  *       \brief      Home page for BOM and MRP modules
  */
 
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/bom/class/bom.class.php';
 require_once DOL_DOCUMENT_ROOT.'/mrp/class/mo.class.php';
diff --git a/htdocs/multicurrency/multicurrency_rate.php b/htdocs/multicurrency/multicurrency_rate.php
index 3f20476f72a..6f1fdaeb309 100644
--- a/htdocs/multicurrency/multicurrency_rate.php
+++ b/htdocs/multicurrency/multicurrency_rate.php
@@ -32,6 +32,7 @@
  *  \brief      Page to list multicurrency rate
  */
 
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/multicurrency.lib.php';
diff --git a/htdocs/opensurvey/card.php b/htdocs/opensurvey/card.php
index 20985a52647..fa6201eb77f 100644
--- a/htdocs/opensurvey/card.php
+++ b/htdocs/opensurvey/card.php
@@ -23,6 +23,7 @@
  *	\brief      Page to edit survey
  */
 
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php";
 require_once DOL_DOCUMENT_ROOT."/core/lib/files.lib.php";
diff --git a/htdocs/opensurvey/exportcsv.php b/htdocs/opensurvey/exportcsv.php
index 76e4ffd9023..26fd6f57168 100644
--- a/htdocs/opensurvey/exportcsv.php
+++ b/htdocs/opensurvey/exportcsv.php
@@ -23,6 +23,7 @@
  */
 
 
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php";
 require_once DOL_DOCUMENT_ROOT."/core/lib/files.lib.php";
diff --git a/htdocs/opensurvey/index.php b/htdocs/opensurvey/index.php
index ba608723816..35e2b013525 100644
--- a/htdocs/opensurvey/index.php
+++ b/htdocs/opensurvey/index.php
@@ -23,6 +23,7 @@
  *	\brief      Home page of opensurvey area
  */
 
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php";
 require_once DOL_DOCUMENT_ROOT."/core/lib/files.lib.php";
diff --git a/htdocs/opensurvey/list.php b/htdocs/opensurvey/list.php
index 0e22c524529..44241007dfb 100644
--- a/htdocs/opensurvey/list.php
+++ b/htdocs/opensurvey/list.php
@@ -22,6 +22,7 @@
  *	\brief      Page to list surveys
  */
 
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php";
 require_once DOL_DOCUMENT_ROOT."/core/lib/files.lib.php";
diff --git a/htdocs/opensurvey/results.php b/htdocs/opensurvey/results.php
index 610d690944b..f8a2648a809 100644
--- a/htdocs/opensurvey/results.php
+++ b/htdocs/opensurvey/results.php
@@ -23,6 +23,7 @@
  *	\brief      Page to preview votes of a survey
  */
 
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php";
 require_once DOL_DOCUMENT_ROOT."/core/lib/files.lib.php";
diff --git a/htdocs/opensurvey/wizard/choix_autre.php b/htdocs/opensurvey/wizard/choix_autre.php
index be9396646d5..bbc13d5d36b 100644
--- a/htdocs/opensurvey/wizard/choix_autre.php
+++ b/htdocs/opensurvey/wizard/choix_autre.php
@@ -22,6 +22,7 @@
  *	\brief      Page to create a new survey (choice selection)
  */
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php";
 require_once DOL_DOCUMENT_ROOT."/core/lib/files.lib.php";
diff --git a/htdocs/opensurvey/wizard/choix_date.php b/htdocs/opensurvey/wizard/choix_date.php
index dcf0bc436b3..46983829c3b 100644
--- a/htdocs/opensurvey/wizard/choix_date.php
+++ b/htdocs/opensurvey/wizard/choix_date.php
@@ -22,6 +22,7 @@
  *	\brief      Page to create a new survey (date selection)
  */
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php";
 require_once DOL_DOCUMENT_ROOT."/core/lib/files.lib.php";
diff --git a/htdocs/opensurvey/wizard/create_survey.php b/htdocs/opensurvey/wizard/create_survey.php
index d35e7b3f5d9..48e6b56c0af 100644
--- a/htdocs/opensurvey/wizard/create_survey.php
+++ b/htdocs/opensurvey/wizard/create_survey.php
@@ -24,6 +24,7 @@
  *	\brief      Page to create a new survey
  */
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php";
 require_once DOL_DOCUMENT_ROOT."/core/lib/files.lib.php";
diff --git a/htdocs/opensurvey/wizard/index.php b/htdocs/opensurvey/wizard/index.php
index e55385e33a4..b8ccd0d8588 100644
--- a/htdocs/opensurvey/wizard/index.php
+++ b/htdocs/opensurvey/wizard/index.php
@@ -23,6 +23,7 @@ if (!defined('NOTOKENRENEWAL')) {
 	define('NOTOKENRENEWAL', '1');
 }
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
diff --git a/htdocs/partnership/admin/website.php b/htdocs/partnership/admin/website.php
index 2b1a6d4d365..b3bccf9fa00 100644
--- a/htdocs/partnership/admin/website.php
+++ b/htdocs/partnership/admin/website.php
@@ -24,6 +24,7 @@
  *		\brief      File of main public page for partnership module
  */
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
diff --git a/htdocs/paybox/admin/paybox.php b/htdocs/paybox/admin/paybox.php
index f651ba43760..9b3a2a74fd1 100644
--- a/htdocs/paybox/admin/paybox.php
+++ b/htdocs/paybox/admin/paybox.php
@@ -23,6 +23,7 @@
  * \brief      Page to setup paybox module
  */
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
diff --git a/htdocs/paypal/admin/paypal.php b/htdocs/paypal/admin/paypal.php
index d5142c851d9..68759eeb5e3 100644
--- a/htdocs/paypal/admin/paypal.php
+++ b/htdocs/paypal/admin/paypal.php
@@ -24,6 +24,7 @@
  * \brief      Page to setup paypal module
  */
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/paypal/lib/paypal.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/payments.lib.php';
diff --git a/htdocs/printing/admin/printing.php b/htdocs/printing/admin/printing.php
index 3eda0fc4457..fb8426abc1b 100644
--- a/htdocs/printing/admin/printing.php
+++ b/htdocs/printing/admin/printing.php
@@ -22,6 +22,7 @@
  *      \brief      Page to setup printing module
  */
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 
 require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
diff --git a/htdocs/printing/index.php b/htdocs/printing/index.php
index 7ce4399501b..a4cc4d9103d 100644
--- a/htdocs/printing/index.php
+++ b/htdocs/printing/index.php
@@ -22,6 +22,7 @@
  *  \brief      Printing
  */
 
+// Load Dolibarr environment
 require '../main.inc.php';
 include_once DOL_DOCUMENT_ROOT.'/core/modules/printing/modules_printing.php';
 
diff --git a/htdocs/product/admin/dynamic_prices.php b/htdocs/product/admin/dynamic_prices.php
index e1e23feac86..8ab5eefc2d4 100644
--- a/htdocs/product/admin/dynamic_prices.php
+++ b/htdocs/product/admin/dynamic_prices.php
@@ -21,6 +21,7 @@
  *  \brief		Page for configuring dynamic prices
  */
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/product.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.product.class.php';
diff --git a/htdocs/product/admin/price_rules.php b/htdocs/product/admin/price_rules.php
index 2166ada6138..4fa0c293b2d 100644
--- a/htdocs/product/admin/price_rules.php
+++ b/htdocs/product/admin/price_rules.php
@@ -19,6 +19,7 @@
  * This page is a tab in the setup of module Product if option PRODUIT_MULTIPRICES_ALLOW_AUTOCALC_PRICELEVEL is set.
  */
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/product.lib.php';
diff --git a/htdocs/product/admin/product.php b/htdocs/product/admin/product.php
index 8696b27e521..42f80906574 100644
--- a/htdocs/product/admin/product.php
+++ b/htdocs/product/admin/product.php
@@ -30,6 +30,7 @@
  *  \brief      Setup page of product module
  */
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/product.lib.php';
diff --git a/htdocs/product/admin/product_extrafields.php b/htdocs/product/admin/product_extrafields.php
index eaabe41eb74..724173478e3 100644
--- a/htdocs/product/admin/product_extrafields.php
+++ b/htdocs/product/admin/product_extrafields.php
@@ -25,6 +25,7 @@
  *		\brief      Page to setup extra fields of third party
  */
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/product.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
diff --git a/htdocs/product/admin/product_lot.php b/htdocs/product/admin/product_lot.php
index bf43c2d0048..8f46412871a 100644
--- a/htdocs/product/admin/product_lot.php
+++ b/htdocs/product/admin/product_lot.php
@@ -21,6 +21,7 @@
  *  \brief	  Setup page of product lot module
  */
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/product/stock/class/productlot.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
diff --git a/htdocs/product/admin/product_lot_extrafields.php b/htdocs/product/admin/product_lot_extrafields.php
index a164fec6d81..e318b050d7a 100644
--- a/htdocs/product/admin/product_lot_extrafields.php
+++ b/htdocs/product/admin/product_lot_extrafields.php
@@ -25,6 +25,7 @@
  *		\brief      Page to setup extra fields of third party
  */
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/product.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
diff --git a/htdocs/product/admin/product_supplier_extrafields.php b/htdocs/product/admin/product_supplier_extrafields.php
index b6d83ba1db9..04da7c74be0 100644
--- a/htdocs/product/admin/product_supplier_extrafields.php
+++ b/htdocs/product/admin/product_supplier_extrafields.php
@@ -26,6 +26,7 @@
  *		\brief      Page to setup extra fields of products
  */
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/product.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
diff --git a/htdocs/product/admin/product_tools.php b/htdocs/product/admin/product_tools.php
index 674e90f3614..1bf36688f93 100644
--- a/htdocs/product/admin/product_tools.php
+++ b/htdocs/product/admin/product_tools.php
@@ -25,6 +25,7 @@
 // TODO We must add a confirmation on button because this will make a mass change
 // FIXME Should also change table product_price for price levels
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/product.lib.php';
diff --git a/htdocs/product/admin/stock_extrafields.php b/htdocs/product/admin/stock_extrafields.php
index 3a7b2c150db..a42410d9bf6 100644
--- a/htdocs/product/admin/stock_extrafields.php
+++ b/htdocs/product/admin/stock_extrafields.php
@@ -24,6 +24,7 @@
  *		\brief      Page to setup extra fields of third party
  */
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/stock.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
diff --git a/htdocs/product/agenda.php b/htdocs/product/agenda.php
index 8ec76640871..4914527552d 100644
--- a/htdocs/product/agenda.php
+++ b/htdocs/product/agenda.php
@@ -27,6 +27,7 @@
  *  \brief      Page of product events
  */
 
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
diff --git a/htdocs/product/ajax/products.php b/htdocs/product/ajax/products.php
index 0e606932ce2..8fb1ce8f060 100644
--- a/htdocs/product/ajax/products.php
+++ b/htdocs/product/ajax/products.php
@@ -45,6 +45,7 @@ if (empty($_GET['keysearch']) && !defined('NOREQUIREHTML')) {
 	define('NOREQUIREHTML', '1');
 }
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 
 $htmlname = GETPOST('htmlname', 'aZ09');
diff --git a/htdocs/product/composition/card.php b/htdocs/product/composition/card.php
index 7f7b8ca01a8..d7e218a56a1 100644
--- a/htdocs/product/composition/card.php
+++ b/htdocs/product/composition/card.php
@@ -27,6 +27,7 @@
  *  \brief      Page of product file
  */
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/product/class/html.formproduct.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/product.lib.php';
diff --git a/htdocs/product/dynamic_price/editor.php b/htdocs/product/dynamic_price/editor.php
index 893cc654f89..f5240d5cf61 100644
--- a/htdocs/product/dynamic_price/editor.php
+++ b/htdocs/product/dynamic_price/editor.php
@@ -21,6 +21,7 @@
  *  \brief	    Page for editing expression
  */
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/product.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.product.class.php';
diff --git a/htdocs/product/fournisseurs.php b/htdocs/product/fournisseurs.php
index 4e27ae3dfa3..d28eca5252a 100644
--- a/htdocs/product/fournisseurs.php
+++ b/htdocs/product/fournisseurs.php
@@ -32,6 +32,7 @@
  *  \brief      Page of tab suppliers for products
  */
 
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/product.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
@@ -514,15 +515,15 @@ if ($id > 0 || $ref) {
 					function load_vat() {
 						// get soc id
 						let socid = $("#id_fourn")[0].value
-	
+
 						// load available VAT rates
 						let vat_url = "'.dol_buildpath('/core/ajax/vatrates.php', 1).'"
-						//Make GET request with params 
+						//Make GET request with params
 						let options = "";
 						options += "id=" + socid
 						options += "&htmlname=tva_tx"
 						options += "&action=default" // not defined in vatrates.php, default behavior.
-	
+
 						var get = $.getJSON(
 							vat_url,
 							options,
@@ -536,7 +537,7 @@ if ($id > 0 || $ref) {
 								})
 							}
 						);
-	
+
 					}
 					function replaceVATWithSupplierValue(vat_rate) {
 						console.log("Default VAT rate for the supplier: " + vat_rate + "%")
diff --git a/htdocs/product/inventory/card.php b/htdocs/product/inventory/card.php
index 796470c469c..6e1bb1e8a2e 100644
--- a/htdocs/product/inventory/card.php
+++ b/htdocs/product/inventory/card.php
@@ -21,6 +21,7 @@
  *		\brief      Inventory card
  */
 
+// 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.formfile.class.php';
diff --git a/htdocs/product/inventory/inventory.php b/htdocs/product/inventory/inventory.php
index be7512df6fc..1a10cf75537 100644
--- a/htdocs/product/inventory/inventory.php
+++ b/htdocs/product/inventory/inventory.php
@@ -21,6 +21,7 @@
  *		\brief      Tabe to enter counting
  */
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 include_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php';
 include_once DOL_DOCUMENT_ROOT.'/product/class/html.formproduct.class.php';
diff --git a/htdocs/product/note.php b/htdocs/product/note.php
index 93d40e296e9..6341ef6fa3b 100644
--- a/htdocs/product/note.php
+++ b/htdocs/product/note.php
@@ -26,6 +26,7 @@
  *   \ingroup    societe
  */
 
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/product.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
diff --git a/htdocs/product/popuprop.php b/htdocs/product/popuprop.php
index 17716a4b3ed..f657eef99eb 100644
--- a/htdocs/product/popuprop.php
+++ b/htdocs/product/popuprop.php
@@ -26,6 +26,7 @@
  * \brief      List of products or services by popularity
  */
 
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
 
diff --git a/htdocs/product/price.php b/htdocs/product/price.php
index 341b8a56e62..787cc034f68 100644
--- a/htdocs/product/price.php
+++ b/htdocs/product/price.php
@@ -34,6 +34,7 @@
  * \brief Page to show product prices
  */
 
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/product.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php';
diff --git a/htdocs/product/reassort.php b/htdocs/product/reassort.php
index 0b1bd5d8d6a..0da084d1f39 100644
--- a/htdocs/product/reassort.php
+++ b/htdocs/product/reassort.php
@@ -26,6 +26,7 @@
  *  \brief      Page to list stocks
  */
 
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
diff --git a/htdocs/product/reassortlot.php b/htdocs/product/reassortlot.php
index b31fb885c53..31a2060287f 100644
--- a/htdocs/product/reassortlot.php
+++ b/htdocs/product/reassortlot.php
@@ -27,6 +27,7 @@
  *  \brief      Page to list stocks
  */
 
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
 require_once DOL_DOCUMENT_ROOT.'/product/stock/class/productlot.class.php';
diff --git a/htdocs/product/stats/bom.php b/htdocs/product/stats/bom.php
index a8e76a178bf..707549655e0 100644
--- a/htdocs/product/stats/bom.php
+++ b/htdocs/product/stats/bom.php
@@ -24,6 +24,7 @@
  *       \brief      Page of MO referring product
  */
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/product.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/bom/class/bom.class.php';
diff --git a/htdocs/product/stats/card.php b/htdocs/product/stats/card.php
index b77997fcfc7..d2f3e2358d9 100644
--- a/htdocs/product/stats/card.php
+++ b/htdocs/product/stats/card.php
@@ -26,6 +26,7 @@
  *       \brief      Page of product statistics
  */
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/product.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
diff --git a/htdocs/product/stats/commande.php b/htdocs/product/stats/commande.php
index 9f38f68ee33..f856b8a310f 100644
--- a/htdocs/product/stats/commande.php
+++ b/htdocs/product/stats/commande.php
@@ -24,6 +24,7 @@
  *       \brief      Page des stats des commandes clients pour un produit
  */
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/product.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
diff --git a/htdocs/product/stats/contrat.php b/htdocs/product/stats/contrat.php
index 03bb1828f66..196831a5466 100644
--- a/htdocs/product/stats/contrat.php
+++ b/htdocs/product/stats/contrat.php
@@ -23,6 +23,7 @@
  *       \brief      Page des stats des contrats pour un produit
  */
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/product.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/contrat/class/contrat.class.php';
diff --git a/htdocs/product/stats/facture.php b/htdocs/product/stats/facture.php
index c62c421d6e4..4ee1e4f95b2 100644
--- a/htdocs/product/stats/facture.php
+++ b/htdocs/product/stats/facture.php
@@ -25,6 +25,7 @@
  *	\brief      Page of invoice statistics for a product
  */
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/product.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
diff --git a/htdocs/product/stats/facture_fournisseur.php b/htdocs/product/stats/facture_fournisseur.php
index 59ca77d5937..6e5ed524ad9 100644
--- a/htdocs/product/stats/facture_fournisseur.php
+++ b/htdocs/product/stats/facture_fournisseur.php
@@ -25,6 +25,7 @@
  * \brief 		Page of supplier invoice statistics for a product
  */
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/product.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php';
diff --git a/htdocs/product/stats/facturerec.php b/htdocs/product/stats/facturerec.php
index b71c24d75cb..9415f2d6546 100644
--- a/htdocs/product/stats/facturerec.php
+++ b/htdocs/product/stats/facturerec.php
@@ -26,6 +26,7 @@
  *	\brief      Page of template invoice statistics for a product
  */
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/product.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture-rec.class.php';
diff --git a/htdocs/product/stats/mo.php b/htdocs/product/stats/mo.php
index 38bebc562ed..a4947db1085 100644
--- a/htdocs/product/stats/mo.php
+++ b/htdocs/product/stats/mo.php
@@ -23,6 +23,7 @@
  *       \brief      Page of MO referring product
  */
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/product.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/mrp/class/mo.class.php';
diff --git a/htdocs/product/stats/propal.php b/htdocs/product/stats/propal.php
index 2f6faca07a7..42467368b91 100644
--- a/htdocs/product/stats/propal.php
+++ b/htdocs/product/stats/propal.php
@@ -24,6 +24,7 @@
  * \brief Page des stats des propals pour un produit
  */
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/product.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php';
diff --git a/htdocs/product/stats/supplier_proposal.php b/htdocs/product/stats/supplier_proposal.php
index 2136b9b26cf..ff14c764af6 100644
--- a/htdocs/product/stats/supplier_proposal.php
+++ b/htdocs/product/stats/supplier_proposal.php
@@ -24,6 +24,7 @@
  * \brief 	Page des stats des propals pour un produit
  */
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/product.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/supplier_proposal/class/supplier_proposal.class.php';
diff --git a/htdocs/product/stock/card.php b/htdocs/product/stock/card.php
index 43fb04b1ad3..999c1993a4f 100644
--- a/htdocs/product/stock/card.php
+++ b/htdocs/product/stock/card.php
@@ -28,6 +28,7 @@
  *	\brief      Page fiche entrepot
  */
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
 require_once DOL_DOCUMENT_ROOT.'/product/stock/class/entrepot.class.php';
diff --git a/htdocs/product/stock/fiche-valo.php b/htdocs/product/stock/fiche-valo.php
index a2a15a34e53..b4277e559b1 100644
--- a/htdocs/product/stock/fiche-valo.php
+++ b/htdocs/product/stock/fiche-valo.php
@@ -22,6 +22,7 @@
  *	\brief      Page fiche de valorisation du stock dans l'entrepot
  */
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/product/stock/class/entrepot.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/stock.lib.php';
diff --git a/htdocs/product/stock/index.php b/htdocs/product/stock/index.php
index 0f9deb92772..dcf53a760b1 100644
--- a/htdocs/product/stock/index.php
+++ b/htdocs/product/stock/index.php
@@ -25,6 +25,7 @@
  *  \brief		Home page of stock area
  */
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/product/stock/class/entrepot.class.php';
 require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
diff --git a/htdocs/product/stock/info.php b/htdocs/product/stock/info.php
index 29e337c3728..b47706df401 100644
--- a/htdocs/product/stock/info.php
+++ b/htdocs/product/stock/info.php
@@ -21,6 +21,7 @@
  *	\brief      Page des informations d'un entrepot
  */
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/product/stock/class/entrepot.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
diff --git a/htdocs/product/stock/list.php b/htdocs/product/stock/list.php
index f182cf1847b..1532a47b582 100644
--- a/htdocs/product/stock/list.php
+++ b/htdocs/product/stock/list.php
@@ -25,6 +25,7 @@
  *      \brief      Page with warehouse and stock value
  */
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/product/stock/class/entrepot.class.php';
 
diff --git a/htdocs/product/stock/massstockmove.php b/htdocs/product/stock/massstockmove.php
index 4da9156e955..0c41cbed44a 100644
--- a/htdocs/product/stock/massstockmove.php
+++ b/htdocs/product/stock/massstockmove.php
@@ -23,6 +23,7 @@
  *  			outgoing warehouse and create all stock movements for this.
  */
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
 require_once DOL_DOCUMENT_ROOT.'/product/stock/class/entrepot.class.php';
diff --git a/htdocs/product/stock/movement_card.php b/htdocs/product/stock/movement_card.php
index c31bbbc3101..e28dcc5ca51 100644
--- a/htdocs/product/stock/movement_card.php
+++ b/htdocs/product/stock/movement_card.php
@@ -26,6 +26,7 @@
  *	\brief      Page to list stock movements
  */
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
 require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
diff --git a/htdocs/product/stock/movement_list.php b/htdocs/product/stock/movement_list.php
index b0f83cae0ec..55cf0b44f85 100644
--- a/htdocs/product/stock/movement_list.php
+++ b/htdocs/product/stock/movement_list.php
@@ -26,6 +26,7 @@
  *	\brief      Page to list stock movements
  */
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
 require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
diff --git a/htdocs/product/stock/product.php b/htdocs/product/stock/product.php
index ca3624fe147..bb89e670ee8 100644
--- a/htdocs/product/stock/product.php
+++ b/htdocs/product/stock/product.php
@@ -31,6 +31,7 @@
  *	\brief      Page to list detailed stock of a product
  */
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/product/stock/class/entrepot.class.php';
 require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
diff --git a/htdocs/product/stock/productlot_card.php b/htdocs/product/stock/productlot_card.php
index 6e6f8991e83..5219897ed61 100644
--- a/htdocs/product/stock/productlot_card.php
+++ b/htdocs/product/stock/productlot_card.php
@@ -24,6 +24,7 @@
  *					Initialy built by build_class_from_table on 2016-05-17 12:22
  */
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php';
diff --git a/htdocs/product/stock/productlot_document.php b/htdocs/product/stock/productlot_document.php
index 842aa83bd07..be6c7f640a4 100644
--- a/htdocs/product/stock/productlot_document.php
+++ b/htdocs/product/stock/productlot_document.php
@@ -29,6 +29,7 @@
  *       \brief      Page of attached documents for porudct lots
  */
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/product.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
diff --git a/htdocs/product/stock/productlot_list.php b/htdocs/product/stock/productlot_list.php
index ed0c62564c6..c15479b1f4f 100644
--- a/htdocs/product/stock/productlot_list.php
+++ b/htdocs/product/stock/productlot_list.php
@@ -24,6 +24,7 @@
  *              Initialy built by build_class_from_table on 2016-05-17 12:22
  */
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
diff --git a/htdocs/product/stock/replenish.php b/htdocs/product/stock/replenish.php
index 1eb8a444d8a..53f01d7899c 100644
--- a/htdocs/product/stock/replenish.php
+++ b/htdocs/product/stock/replenish.php
@@ -28,6 +28,7 @@
  *  \brief      Page to list stocks to replenish
  */
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
diff --git a/htdocs/product/stock/replenishorders.php b/htdocs/product/stock/replenishorders.php
index b66eff03a71..d077c1d0ba8 100644
--- a/htdocs/product/stock/replenishorders.php
+++ b/htdocs/product/stock/replenishorders.php
@@ -25,6 +25,7 @@
  *  \brief      Page to list replenishment orders
  */
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
diff --git a/htdocs/product/stock/stockatdate.php b/htdocs/product/stock/stockatdate.php
index 6297dbcb15b..0571caeb6fb 100644
--- a/htdocs/product/stock/stockatdate.php
+++ b/htdocs/product/stock/stockatdate.php
@@ -26,6 +26,7 @@
  *  \brief      Page to list stocks at a given date
  */
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
 require_once DOL_DOCUMENT_ROOT.'/product/stock/class/entrepot.class.php';
diff --git a/htdocs/product/stock/stocktransfer/stocktransfer_agenda.php b/htdocs/product/stock/stocktransfer/stocktransfer_agenda.php
index 6d09dd03b44..e21bfcb19f2 100644
--- a/htdocs/product/stock/stocktransfer/stocktransfer_agenda.php
+++ b/htdocs/product/stock/stocktransfer/stocktransfer_agenda.php
@@ -22,6 +22,7 @@
  *  \brief      Page of StockTransfer events
  */
 
+// Load Dolibarr environment
 require '../../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
diff --git a/htdocs/product/stock/stocktransfer/stocktransfer_card.php b/htdocs/product/stock/stocktransfer/stocktransfer_card.php
index 921ee89758a..522a3eb4d7f 100644
--- a/htdocs/product/stock/stocktransfer/stocktransfer_card.php
+++ b/htdocs/product/stock/stocktransfer/stocktransfer_card.php
@@ -22,6 +22,7 @@
  *		\brief      Page to create/edit/view stocktransfer
  */
 
+// 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.formfile.class.php';
diff --git a/htdocs/product/stock/stocktransfer/stocktransfer_contact.php b/htdocs/product/stock/stocktransfer/stocktransfer_contact.php
index 393a9b6517c..6c0ef97fe28 100644
--- a/htdocs/product/stock/stocktransfer/stocktransfer_contact.php
+++ b/htdocs/product/stock/stocktransfer/stocktransfer_contact.php
@@ -25,6 +25,7 @@
  *       \brief      Tab to manage contacts/adresses of proposal
  */
 
+// Load Dolibarr environment
 require '../../../main.inc.php';
 // Load translation files required by the page
 $langs->loadLangs(array('facture', 'orders', 'sendings', 'companies', 'stocks'));
diff --git a/htdocs/product/stock/stocktransfer/stocktransfer_document.php b/htdocs/product/stock/stocktransfer/stocktransfer_document.php
index 68233cd358f..7220581bc52 100644
--- a/htdocs/product/stock/stocktransfer/stocktransfer_document.php
+++ b/htdocs/product/stock/stocktransfer/stocktransfer_document.php
@@ -22,6 +22,7 @@
  *  \brief      Tab for documents linked to StockTransfer
  */
 
+// Load Dolibarr environment
 require '../../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
diff --git a/htdocs/product/stock/stocktransfer/stocktransfer_list.php b/htdocs/product/stock/stocktransfer/stocktransfer_list.php
index 6b9d98a63b9..72c538a58c6 100644
--- a/htdocs/product/stock/stocktransfer/stocktransfer_list.php
+++ b/htdocs/product/stock/stocktransfer/stocktransfer_list.php
@@ -23,6 +23,7 @@
  *		\brief      List page for stocktransfer
  */
 
+// Load Dolibarr environment
 require '../../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
diff --git a/htdocs/product/stock/stocktransfer/stocktransfer_note.php b/htdocs/product/stock/stocktransfer/stocktransfer_note.php
index 5df73f02e73..2176af2803a 100644
--- a/htdocs/product/stock/stocktransfer/stocktransfer_note.php
+++ b/htdocs/product/stock/stocktransfer/stocktransfer_note.php
@@ -22,6 +22,7 @@
  *  \brief      Car with notes on StockTransfer
  */
 
+// Load Dolibarr environment
 require '../../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/product/stock/stocktransfer/class/stocktransfer.class.php';
 require_once DOL_DOCUMENT_ROOT.'/product/stock/stocktransfer/lib/stocktransfer_stocktransfer.lib.php';
diff --git a/htdocs/product/stock/valo.php b/htdocs/product/stock/valo.php
index 926b0c01634..6bf59ebeb0e 100644
--- a/htdocs/product/stock/valo.php
+++ b/htdocs/product/stock/valo.php
@@ -23,6 +23,7 @@
  *  \brief      Page with stock values
  */
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/product/stock/class/entrepot.class.php';
 
diff --git a/htdocs/product/traduction.php b/htdocs/product/traduction.php
index 7f91e9c73a8..3f536b6761a 100644
--- a/htdocs/product/traduction.php
+++ b/htdocs/product/traduction.php
@@ -25,6 +25,7 @@
  *	\brief      Page de traduction des produits
  */
 
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/product.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
diff --git a/htdocs/projet/admin/project.php b/htdocs/projet/admin/project.php
index 36ef3a501ff..37eb33d9206 100644
--- a/htdocs/projet/admin/project.php
+++ b/htdocs/projet/admin/project.php
@@ -27,6 +27,7 @@
  *  \brief      Page to setup project module
  */
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/project.lib.php';
diff --git a/htdocs/projet/admin/project_extrafields.php b/htdocs/projet/admin/project_extrafields.php
index bb586b6a100..2447c12631e 100644
--- a/htdocs/projet/admin/project_extrafields.php
+++ b/htdocs/projet/admin/project_extrafields.php
@@ -26,6 +26,7 @@
  *		\brief      Page to setup extra fields of project
  */
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/project.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
diff --git a/htdocs/projet/admin/project_task_extrafields.php b/htdocs/projet/admin/project_task_extrafields.php
index 695ef3f57a6..612a7f67e6d 100644
--- a/htdocs/projet/admin/project_task_extrafields.php
+++ b/htdocs/projet/admin/project_task_extrafields.php
@@ -26,6 +26,7 @@
  *		\brief      Page to setup extra fields of project
  */
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/project.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
diff --git a/htdocs/projet/admin/website.php b/htdocs/projet/admin/website.php
index eead379c804..3be04a9843c 100644
--- a/htdocs/projet/admin/website.php
+++ b/htdocs/projet/admin/website.php
@@ -24,6 +24,7 @@
  *		\brief      File of main public page for project module to catch lead
  */
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
diff --git a/htdocs/projet/ajax/projects.php b/htdocs/projet/ajax/projects.php
index 69e439fdf1f..e9e8f85ddf3 100644
--- a/htdocs/projet/ajax/projects.php
+++ b/htdocs/projet/ajax/projects.php
@@ -45,6 +45,7 @@ if (!defined('NOREQUIREHTML')) {
 	define('NOREQUIREHTML', '1');
 }
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 
 $htmlname = GETPOST('htmlname', 'aZ09');
diff --git a/htdocs/projet/card.php b/htdocs/projet/card.php
index 451334c5d77..8994935fb98 100644
--- a/htdocs/projet/card.php
+++ b/htdocs/projet/card.php
@@ -23,6 +23,7 @@
  *	\brief      Project card
  */
 
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 require_once DOL_DOCUMENT_ROOT.'/projet/class/task.class.php';
diff --git a/htdocs/projet/comment.php b/htdocs/projet/comment.php
index 997f45a39d0..5ea5b920f8c 100644
--- a/htdocs/projet/comment.php
+++ b/htdocs/projet/comment.php
@@ -23,6 +23,7 @@
  *	\brief      Page of a project task
  */
 
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 require_once DOL_DOCUMENT_ROOT.'/projet/class/task.class.php';
diff --git a/htdocs/projet/contact.php b/htdocs/projet/contact.php
index ec1f739f58f..ee37aa68fdd 100644
--- a/htdocs/projet/contact.php
+++ b/htdocs/projet/contact.php
@@ -22,6 +22,7 @@
  *       \brief      List of all contacts of a project
  */
 
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 require_once DOL_DOCUMENT_ROOT.'/projet/class/task.class.php';
diff --git a/htdocs/projet/document.php b/htdocs/projet/document.php
index ad5b8715e95..0a2acc4c3bc 100644
--- a/htdocs/projet/document.php
+++ b/htdocs/projet/document.php
@@ -23,6 +23,7 @@
  *	\brief      Page to managed related documents linked to a project
  */
 
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/project.lib.php';
diff --git a/htdocs/projet/element.php b/htdocs/projet/element.php
index 594362ba05d..8c7f2e0df51 100644
--- a/htdocs/projet/element.php
+++ b/htdocs/projet/element.php
@@ -29,6 +29,7 @@
  *		\brief      Page of project referrers
  */
 
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 require_once DOL_DOCUMENT_ROOT.'/projet/class/task.class.php';
diff --git a/htdocs/projet/index.php b/htdocs/projet/index.php
index b519f298ecc..b0e779a5bec 100644
--- a/htdocs/projet/index.php
+++ b/htdocs/projet/index.php
@@ -24,6 +24,7 @@
  *       \brief      Main project home page
  */
 
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 require_once DOL_DOCUMENT_ROOT.'/projet/class/task.class.php';
diff --git a/htdocs/projet/info.php b/htdocs/projet/info.php
index 8964cca8c19..bef020d9a38 100644
--- a/htdocs/projet/info.php
+++ b/htdocs/projet/info.php
@@ -22,6 +22,7 @@
  *		\brief      Page with events on project
  */
 
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
diff --git a/htdocs/projet/list.php b/htdocs/projet/list.php
index b22a8849820..31144a708c7 100644
--- a/htdocs/projet/list.php
+++ b/htdocs/projet/list.php
@@ -29,6 +29,7 @@
  *	\brief      Page to list projects
  */
 
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
diff --git a/htdocs/projet/note.php b/htdocs/projet/note.php
index 3eed5e14c60..ce099c04745 100644
--- a/htdocs/projet/note.php
+++ b/htdocs/projet/note.php
@@ -22,6 +22,7 @@
  *	\brief      Fiche d'information sur un projet
  */
 
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/project.lib.php';
diff --git a/htdocs/projet/stats/index.php b/htdocs/projet/stats/index.php
index 5926451e321..ba293dea744 100644
--- a/htdocs/projet/stats/index.php
+++ b/htdocs/projet/stats/index.php
@@ -22,6 +22,7 @@
  *       \brief      Page for project statistics
  */
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/dolgraph.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php';
diff --git a/htdocs/projet/tasks/document.php b/htdocs/projet/tasks/document.php
index bc313dcebfa..3e569cd557f 100644
--- a/htdocs/projet/tasks/document.php
+++ b/htdocs/projet/tasks/document.php
@@ -24,6 +24,7 @@
  *	\brief      Page de gestion des documents attachees a une tache d'un projet
  */
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 require_once DOL_DOCUMENT_ROOT.'/projet/class/task.class.php';
diff --git a/htdocs/projet/tasks/stats/index.php b/htdocs/projet/tasks/stats/index.php
index 2ca72552fa4..dd807b7bb93 100644
--- a/htdocs/projet/tasks/stats/index.php
+++ b/htdocs/projet/tasks/stats/index.php
@@ -22,6 +22,7 @@
  *       \brief      Page for tasks statistics
  */
 
+// Load Dolibarr environment
 require '../../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/dolgraph.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/project.lib.php';
diff --git a/htdocs/projet/tasks/time.php b/htdocs/projet/tasks/time.php
index 3d5c74ff5ed..9e5e9c8618d 100644
--- a/htdocs/projet/tasks/time.php
+++ b/htdocs/projet/tasks/time.php
@@ -27,6 +27,7 @@
  *	\brief		Page to add new time spent on a task
  */
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 require_once DOL_DOCUMENT_ROOT.'/projet/class/task.class.php';
diff --git a/htdocs/public/agenda/agendaexport.php b/htdocs/public/agenda/agendaexport.php
index a0e7ea817a7..aa145326dbb 100644
--- a/htdocs/public/agenda/agendaexport.php
+++ b/htdocs/public/agenda/agendaexport.php
@@ -79,6 +79,7 @@ if (is_numeric($entity)) {
 	define("DOLENTITY", $entity);
 }
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php';
 
diff --git a/htdocs/public/demo/index.php b/htdocs/public/demo/index.php
index 49bde1a2b9b..93aeff82157 100644
--- a/htdocs/public/demo/index.php
+++ b/htdocs/public/demo/index.php
@@ -37,6 +37,7 @@ if (!defined('NOIPCHECK')) {
 	define('NOIPCHECK', '1'); // Do not check IP defined into conf $dolibarr_main_restrict_ip
 }
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 require_once '../../core/lib/functions2.lib.php';
 
diff --git a/htdocs/public/donations/donateurs_code.php b/htdocs/public/donations/donateurs_code.php
index 87db3ee4133..675566fad44 100644
--- a/htdocs/public/donations/donateurs_code.php
+++ b/htdocs/public/donations/donateurs_code.php
@@ -55,6 +55,7 @@ function llxFooterVierge()
 	print '</body></html>';
 }
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/don/class/don.class.php';
 
diff --git a/htdocs/public/emailing/mailing-read.php b/htdocs/public/emailing/mailing-read.php
index 7fac6ff323e..1c2bd6cea98 100644
--- a/htdocs/public/emailing/mailing-read.php
+++ b/htdocs/public/emailing/mailing-read.php
@@ -68,6 +68,7 @@ function llxFooter()
 }
 
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 
 $mtid = GETPOST('mtid');
diff --git a/htdocs/public/emailing/mailing-unsubscribe.php b/htdocs/public/emailing/mailing-unsubscribe.php
index cd69132d1a8..a5291d06b7f 100644
--- a/htdocs/public/emailing/mailing-unsubscribe.php
+++ b/htdocs/public/emailing/mailing-unsubscribe.php
@@ -53,6 +53,7 @@ if (! defined('NOREQUIREAJAX')) {
 }
 
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
 
diff --git a/htdocs/public/eventorganization/attendee_new.php b/htdocs/public/eventorganization/attendee_new.php
index 8bb85022b2e..3b45ba7374a 100644
--- a/htdocs/public/eventorganization/attendee_new.php
+++ b/htdocs/public/eventorganization/attendee_new.php
@@ -45,6 +45,7 @@ if (is_numeric($entity)) {
 	define("DOLENTITY", $entity);
 }
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
diff --git a/htdocs/public/eventorganization/subscriptionok.php b/htdocs/public/eventorganization/subscriptionok.php
index 8acf3daba78..9e07f17d3cb 100644
--- a/htdocs/public/eventorganization/subscriptionok.php
+++ b/htdocs/public/eventorganization/subscriptionok.php
@@ -48,6 +48,7 @@ if (is_numeric($entity)) {
 	define("DOLENTITY", $entity);
 }
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/payments.lib.php';
diff --git a/htdocs/public/members/public_card.php b/htdocs/public/members/public_card.php
index d58b6448edb..6e58d51681b 100644
--- a/htdocs/public/members/public_card.php
+++ b/htdocs/public/members/public_card.php
@@ -46,6 +46,7 @@ if (is_numeric($entity)) {
 	define("DOLENTITY", $entity);
 }
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 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/public/members/public_list.php b/htdocs/public/members/public_list.php
index 178af5fce11..09eb36b6f47 100644
--- a/htdocs/public/members/public_list.php
+++ b/htdocs/public/members/public_list.php
@@ -45,6 +45,7 @@ if (is_numeric($entity)) {
 	define("DOLENTITY", $entity);
 }
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 
 // Security check
diff --git a/htdocs/public/notice.php b/htdocs/public/notice.php
index d5ac4070ff0..a682abd78c8 100644
--- a/htdocs/public/notice.php
+++ b/htdocs/public/notice.php
@@ -40,6 +40,7 @@ if (!defined('NOBROWSERNOTIF')) {
 	define('NOBROWSERNOTIF', '1');
 }
 
+// Load Dolibarr environment
 require '../main.inc.php';
 
 
diff --git a/htdocs/public/onlinesign/newonlinesign.php b/htdocs/public/onlinesign/newonlinesign.php
index c7264ade568..d9474da0ad3 100644
--- a/htdocs/public/onlinesign/newonlinesign.php
+++ b/htdocs/public/onlinesign/newonlinesign.php
@@ -45,6 +45,7 @@ if (is_numeric($entity)) {
 	define("DOLENTITY", $entity);
 }
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/payments.lib.php';
diff --git a/htdocs/public/opensurvey/studs.php b/htdocs/public/opensurvey/studs.php
index 4853eec496e..cc49dff5b50 100644
--- a/htdocs/public/opensurvey/studs.php
+++ b/htdocs/public/opensurvey/studs.php
@@ -35,6 +35,7 @@ if (!defined('NOIPCHECK')) {
 	define('NOIPCHECK', '1'); // Do not check IP defined into conf $dolibarr_main_restrict_ip
 }
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php";
 require_once DOL_DOCUMENT_ROOT."/core/lib/files.lib.php";
diff --git a/htdocs/public/partnership/new.php b/htdocs/public/partnership/new.php
index a50892c9e08..b38ca18a1eb 100644
--- a/htdocs/public/partnership/new.php
+++ b/htdocs/public/partnership/new.php
@@ -52,6 +52,7 @@ if (is_numeric($entity)) {
 	define("DOLENTITY", $entity);
 }
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/partnership/class/partnership.class.php';
diff --git a/htdocs/public/payment/newpayment.php b/htdocs/public/payment/newpayment.php
index e75435a8b3f..0fbb1b69b02 100644
--- a/htdocs/public/payment/newpayment.php
+++ b/htdocs/public/payment/newpayment.php
@@ -56,6 +56,7 @@ if (is_numeric($entity)) {
 	define("DOLENTITY", $entity);
 }
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/payments.lib.php';
diff --git a/htdocs/public/payment/paymentko.php b/htdocs/public/payment/paymentko.php
index 606bed0c490..7c9def65c96 100644
--- a/htdocs/public/payment/paymentko.php
+++ b/htdocs/public/payment/paymentko.php
@@ -46,6 +46,7 @@ if (is_numeric($entity)) {
 	define("DOLENTITY", $entity);
 }
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/payments.lib.php';
diff --git a/htdocs/public/payment/paymentok.php b/htdocs/public/payment/paymentok.php
index 209e931a75b..8c793f6bbaa 100644
--- a/htdocs/public/payment/paymentok.php
+++ b/htdocs/public/payment/paymentok.php
@@ -50,6 +50,7 @@ if (is_numeric($entity)) {
 	define("DOLENTITY", $entity);
 }
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/payments.lib.php';
diff --git a/htdocs/public/project/index.php b/htdocs/public/project/index.php
index e5dfeb59a8e..917f2cda531 100644
--- a/htdocs/public/project/index.php
+++ b/htdocs/public/project/index.php
@@ -41,6 +41,7 @@ if (is_numeric($entity)) {
 	define("DOLENTITY", $entity);
 }
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/payments.lib.php';
diff --git a/htdocs/public/project/new.php b/htdocs/public/project/new.php
index d984b3346d8..3594d227f41 100644
--- a/htdocs/public/project/new.php
+++ b/htdocs/public/project/new.php
@@ -50,6 +50,7 @@ if (is_numeric($entity)) {
 	define("DOLENTITY", $entity);
 }
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/json.lib.php';
diff --git a/htdocs/public/project/suggestbooth.php b/htdocs/public/project/suggestbooth.php
index 52193e4fcd4..98173d2eebf 100644
--- a/htdocs/public/project/suggestbooth.php
+++ b/htdocs/public/project/suggestbooth.php
@@ -45,6 +45,7 @@ if (is_numeric($entity)) {
 	define("DOLENTITY", $entity);
 }
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
diff --git a/htdocs/public/project/suggestconference.php b/htdocs/public/project/suggestconference.php
index 05cc8e61a82..b19a7f40637 100644
--- a/htdocs/public/project/suggestconference.php
+++ b/htdocs/public/project/suggestconference.php
@@ -45,6 +45,7 @@ if (is_numeric($entity)) {
 	define("DOLENTITY", $entity);
 }
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
diff --git a/htdocs/public/project/viewandvote.php b/htdocs/public/project/viewandvote.php
index 805eb8cfdd1..c7461835615 100644
--- a/htdocs/public/project/viewandvote.php
+++ b/htdocs/public/project/viewandvote.php
@@ -41,6 +41,7 @@ if (is_numeric($entity)) {
 	define("DOLENTITY", $entity);
 }
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/payments.lib.php';
diff --git a/htdocs/public/recruitment/index.php b/htdocs/public/recruitment/index.php
index 32585c94bb4..4656216364e 100644
--- a/htdocs/public/recruitment/index.php
+++ b/htdocs/public/recruitment/index.php
@@ -34,6 +34,7 @@ if (!defined('NOBROWSERNOTIF')) {
 	define('NOBROWSERNOTIF', '1');
 }
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/recruitment/class/recruitmentjobposition.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php';
diff --git a/htdocs/public/recruitment/view.php b/htdocs/public/recruitment/view.php
index 2eaa51ac2fe..92400498801 100644
--- a/htdocs/public/recruitment/view.php
+++ b/htdocs/public/recruitment/view.php
@@ -34,6 +34,7 @@ if (!defined('NOBROWSERNOTIF')) {
 	define('NOBROWSERNOTIF', '1');
 }
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/recruitment/class/recruitmentjobposition.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php';
diff --git a/htdocs/public/stripe/ipn.php b/htdocs/public/stripe/ipn.php
index 29e22c72de7..6cebee29cd8 100644
--- a/htdocs/public/stripe/ipn.php
+++ b/htdocs/public/stripe/ipn.php
@@ -34,6 +34,7 @@ if (is_numeric($entity)) {
 	define("DOLENTITY", $entity);
 }
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/user/class/user.class.php';
diff --git a/htdocs/public/test/test_arrays.php b/htdocs/public/test/test_arrays.php
index 609ced5f684..15f54b646a5 100644
--- a/htdocs/public/test/test_arrays.php
+++ b/htdocs/public/test/test_arrays.php
@@ -22,6 +22,7 @@ if (!defined("NOLOGIN")) {
 	define("NOLOGIN", '1'); // If this page is public (can be called outside logged session)
 }
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 
 // Security
diff --git a/htdocs/public/test/test_csrf.php b/htdocs/public/test/test_csrf.php
index 43372d22f15..eb2527bb62d 100644
--- a/htdocs/public/test/test_csrf.php
+++ b/htdocs/public/test/test_csrf.php
@@ -22,6 +22,7 @@ if (!defined("NOLOGIN")) {
 	define("NOLOGIN", '1'); // If this page is public (can be called outside logged session)
 }
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 
 // Security
diff --git a/htdocs/public/test/test_exec.php b/htdocs/public/test/test_exec.php
index ef6f41df132..59259d0ac49 100644
--- a/htdocs/public/test/test_exec.php
+++ b/htdocs/public/test/test_exec.php
@@ -41,6 +41,7 @@ if (!defined("NOSESSION")) {
 	define("NOSESSION", '1');
 }
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 
 // Security
diff --git a/htdocs/public/test/test_forms.php b/htdocs/public/test/test_forms.php
index c5d25e0871e..acc9151798f 100644
--- a/htdocs/public/test/test_forms.php
+++ b/htdocs/public/test/test_forms.php
@@ -5,6 +5,7 @@ define("NOCSRFCHECK", 1); // We accept to go on this page from external web site
 	define('NOSESSION', '1');
 }*/
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 include_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
 
diff --git a/htdocs/public/test/test_sessionlock.php b/htdocs/public/test/test_sessionlock.php
index 1aea6204b3e..ce764d5daed 100644
--- a/htdocs/public/test/test_sessionlock.php
+++ b/htdocs/public/test/test_sessionlock.php
@@ -61,6 +61,7 @@ print '<br>';
 print 'session_status='.session_status().' (before main.inc.php)';
 print '<br>';
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 
 // Security
diff --git a/htdocs/public/ticket/create_ticket.php b/htdocs/public/ticket/create_ticket.php
index 7ebbdb05af3..e95c60f205c 100644
--- a/htdocs/public/ticket/create_ticket.php
+++ b/htdocs/public/ticket/create_ticket.php
@@ -52,6 +52,7 @@ if (is_numeric($entity)) {
 	define("DOLENTITY", $entity);
 }
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/ticket/class/actions_ticket.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formticket.class.php';
diff --git a/htdocs/public/ticket/index.php b/htdocs/public/ticket/index.php
index 6332f063541..d764fdc57a5 100644
--- a/htdocs/public/ticket/index.php
+++ b/htdocs/public/ticket/index.php
@@ -42,6 +42,7 @@ if (is_numeric($entity)) {
 	define("DOLENTITY", $entity);
 }
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/ticket/class/actions_ticket.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formticket.class.php';
diff --git a/htdocs/public/ticket/list.php b/htdocs/public/ticket/list.php
index 7af60f50e83..3dc9c19aaf4 100644
--- a/htdocs/public/ticket/list.php
+++ b/htdocs/public/ticket/list.php
@@ -43,6 +43,7 @@ if (is_numeric($entity)) {
 	define("DOLENTITY", $entity);
 }
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/ticket/class/actions_ticket.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formticket.class.php';
diff --git a/htdocs/public/ticket/view.php b/htdocs/public/ticket/view.php
index de76e2f9904..846db5ed1fe 100644
--- a/htdocs/public/ticket/view.php
+++ b/htdocs/public/ticket/view.php
@@ -44,6 +44,7 @@ if (is_numeric($entity)) {
 	define("DOLENTITY", $entity);
 }
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/ticket/class/actions_ticket.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formticket.class.php';
diff --git a/htdocs/reception/card.php b/htdocs/reception/card.php
index 5f49f18a23a..a078cdaca15 100644
--- a/htdocs/reception/card.php
+++ b/htdocs/reception/card.php
@@ -33,6 +33,7 @@
  *	\brief      Card of a reception
  */
 
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
 require_once DOL_DOCUMENT_ROOT.'/reception/class/reception.class.php';
diff --git a/htdocs/reception/contact.php b/htdocs/reception/contact.php
index 5b10ac8bcb1..442657ecf43 100644
--- a/htdocs/reception/contact.php
+++ b/htdocs/reception/contact.php
@@ -23,6 +23,7 @@
  *     \brief      Onglet de gestion des contacts de reception
  */
 
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/reception/class/reception.class.php';
 require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.commande.class.php';
diff --git a/htdocs/reception/document.php b/htdocs/reception/document.php
index c349a25fd8b..10227373015 100644
--- a/htdocs/reception/document.php
+++ b/htdocs/reception/document.php
@@ -26,6 +26,7 @@
  *	\brief      Management page of documents attached to an reception
  */
 
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/order.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
diff --git a/htdocs/reception/index.php b/htdocs/reception/index.php
index ed5f3a715d2..62eb42924c1 100644
--- a/htdocs/reception/index.php
+++ b/htdocs/reception/index.php
@@ -25,6 +25,7 @@
  *       \brief      Home page of reception area.
  */
 
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.commande.class.php';
 require_once DOL_DOCUMENT_ROOT.'/reception/class/reception.class.php';
diff --git a/htdocs/reception/list.php b/htdocs/reception/list.php
index 88c86168678..8179da3e42b 100644
--- a/htdocs/reception/list.php
+++ b/htdocs/reception/list.php
@@ -24,6 +24,7 @@
  *      \brief      Page to list all receptions
  */
 
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/reception/class/reception.class.php';
 require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php';
diff --git a/htdocs/reception/note.php b/htdocs/reception/note.php
index cb2c84ebd76..617d260e643 100644
--- a/htdocs/reception/note.php
+++ b/htdocs/reception/note.php
@@ -24,6 +24,7 @@
  *      \brief      Note card reception
  */
 
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/reception/class/reception.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/reception.lib.php';
diff --git a/htdocs/reception/stats/index.php b/htdocs/reception/stats/index.php
index 638b7b0dbfc..b1f5dbdc7f9 100644
--- a/htdocs/reception/stats/index.php
+++ b/htdocs/reception/stats/index.php
@@ -24,6 +24,7 @@
  *     \brief      Page with reception statistics
  */
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/reception/class/reception.class.php';
 require_once DOL_DOCUMENT_ROOT.'/reception/class/receptionstats.class.php';
diff --git a/htdocs/reception/stats/month.php b/htdocs/reception/stats/month.php
index 806006394df..019cafce8c6 100644
--- a/htdocs/reception/stats/month.php
+++ b/htdocs/reception/stats/month.php
@@ -22,6 +22,7 @@
  *    \brief      Page des stats receptions par mois
  */
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/reception/class/reception.class.php';
 require_once DOL_DOCUMENT_ROOT.'/reception/class/receptionstats.class.php';
diff --git a/htdocs/recruitment/admin/candidature_extrafields.php b/htdocs/recruitment/admin/candidature_extrafields.php
index 73a8398fd80..8d08cce1a70 100644
--- a/htdocs/recruitment/admin/candidature_extrafields.php
+++ b/htdocs/recruitment/admin/candidature_extrafields.php
@@ -21,6 +21,7 @@
  *		\brief      Page to setup extra fields of Candidature
  */
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/recruitment/lib/recruitment.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
diff --git a/htdocs/recruitment/admin/jobposition_extrafields.php b/htdocs/recruitment/admin/jobposition_extrafields.php
index 95918bdd1c1..d41dee3b2c5 100644
--- a/htdocs/recruitment/admin/jobposition_extrafields.php
+++ b/htdocs/recruitment/admin/jobposition_extrafields.php
@@ -21,6 +21,7 @@
  *		\brief      Page to setup extra fields of Candidature
  */
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/recruitment/lib/recruitment.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
diff --git a/htdocs/recruitment/admin/public_interface.php b/htdocs/recruitment/admin/public_interface.php
index f145b0b39a9..a9cbf698a10 100644
--- a/htdocs/recruitment/admin/public_interface.php
+++ b/htdocs/recruitment/admin/public_interface.php
@@ -24,6 +24,7 @@
  *		\brief      File of main public page for open job position
  */
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/recruitment/lib/recruitment.lib.php';
diff --git a/htdocs/recruitment/index.php b/htdocs/recruitment/index.php
index 80ef1c9fbd9..1f0cf69f867 100644
--- a/htdocs/recruitment/index.php
+++ b/htdocs/recruitment/index.php
@@ -24,6 +24,7 @@
  *	\brief      Home page of recruitment top menu
  */
 
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/recruitment/class/recruitmentjobposition.class.php';
 require_once DOL_DOCUMENT_ROOT.'/recruitment/class/recruitmentcandidature.class.php';
diff --git a/htdocs/resource/agenda.php b/htdocs/resource/agenda.php
index a5af098f10b..8fddadcce11 100644
--- a/htdocs/resource/agenda.php
+++ b/htdocs/resource/agenda.php
@@ -28,6 +28,7 @@
  *  \brief      Page of resource events
  */
 
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
diff --git a/htdocs/resource/card.php b/htdocs/resource/card.php
index 4ffbe1eb0a7..cf4b4b8e110 100644
--- a/htdocs/resource/card.php
+++ b/htdocs/resource/card.php
@@ -22,6 +22,7 @@
  */
 
 
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
 require_once DOL_DOCUMENT_ROOT.'/resource/class/dolresource.class.php';
diff --git a/htdocs/resource/contact.php b/htdocs/resource/contact.php
index cf291cce28c..515b7b336a9 100644
--- a/htdocs/resource/contact.php
+++ b/htdocs/resource/contact.php
@@ -28,6 +28,7 @@
  *       \brief      Contacts management tab for resources
  */
 
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/resource/class/dolresource.class.php';
 require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
diff --git a/htdocs/resource/document.php b/htdocs/resource/document.php
index 001598d2023..6c5b4496d23 100644
--- a/htdocs/resource/document.php
+++ b/htdocs/resource/document.php
@@ -28,6 +28,7 @@
  *       \brief      Page des documents joints sur les resources
  */
 
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/resource/class/dolresource.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
diff --git a/htdocs/resource/element_resource.php b/htdocs/resource/element_resource.php
index 80e25fa9c25..a5ca456310e 100644
--- a/htdocs/resource/element_resource.php
+++ b/htdocs/resource/element_resource.php
@@ -25,6 +25,7 @@
  */
 
 
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/resource/class/dolresource.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
diff --git a/htdocs/resource/list.php b/htdocs/resource/list.php
index 1ef64555133..23282fe6363 100644
--- a/htdocs/resource/list.php
+++ b/htdocs/resource/list.php
@@ -23,6 +23,7 @@
  *      \brief      Page to manage resource objects
  */
 
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/resource/class/dolresource.class.php';
 
diff --git a/htdocs/resource/note.php b/htdocs/resource/note.php
index 98efb72d55b..d2c02df0481 100644
--- a/htdocs/resource/note.php
+++ b/htdocs/resource/note.php
@@ -25,6 +25,7 @@
  *	\brief      Fiche d'information sur une resource
  */
 
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/resource/class/dolresource.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/resource.lib.php';
diff --git a/htdocs/salaries/admin/salaries.php b/htdocs/salaries/admin/salaries.php
index 5343d4831ba..c30b6ff3565 100644
--- a/htdocs/salaries/admin/salaries.php
+++ b/htdocs/salaries/admin/salaries.php
@@ -22,6 +22,7 @@
  * \brief		Setup page to configure salaries module
  */
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 
 // Class
diff --git a/htdocs/salaries/admin/salaries_extrafields.php b/htdocs/salaries/admin/salaries_extrafields.php
index 86fc5991757..7b9607e0f30 100644
--- a/htdocs/salaries/admin/salaries_extrafields.php
+++ b/htdocs/salaries/admin/salaries_extrafields.php
@@ -23,6 +23,7 @@
  *		\brief      Page to setup extra fields of salaries
  */
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/salaries.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
diff --git a/htdocs/salaries/ajax/ajaxsalaries.php b/htdocs/salaries/ajax/ajaxsalaries.php
index 0e0428b9074..e8641f3a39a 100644
--- a/htdocs/salaries/ajax/ajaxsalaries.php
+++ b/htdocs/salaries/ajax/ajaxsalaries.php
@@ -42,6 +42,7 @@ if (!defined('NOCSRFCHECK')) {
 	define('NOCSRFCHECK', '1');
 }
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/salaries/class/salary.class.php';
 
diff --git a/htdocs/salaries/card.php b/htdocs/salaries/card.php
index d5ccbdec38f..ab4ba4cd4b8 100644
--- a/htdocs/salaries/card.php
+++ b/htdocs/salaries/card.php
@@ -26,6 +26,7 @@
  *  \brief      Page of salaries payments
  */
 
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/salaries/class/salary.class.php';
diff --git a/htdocs/salaries/document.php b/htdocs/salaries/document.php
index eb4c63390a8..163042dbeb8 100644
--- a/htdocs/salaries/document.php
+++ b/htdocs/salaries/document.php
@@ -30,6 +30,7 @@
  *       \brief      Page of linked files onto salaries
  */
 
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
diff --git a/htdocs/salaries/info.php b/htdocs/salaries/info.php
index 7c8962499ce..e16493ddc91 100644
--- a/htdocs/salaries/info.php
+++ b/htdocs/salaries/info.php
@@ -24,6 +24,7 @@
  *	\brief      Page with info about salaries contribution
  */
 
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/salaries/class/salary.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/salaries.lib.php';
diff --git a/htdocs/salaries/list.php b/htdocs/salaries/list.php
index dd44155ea5a..b4a76115a5b 100644
--- a/htdocs/salaries/list.php
+++ b/htdocs/salaries/list.php
@@ -24,6 +24,7 @@
  *		\brief     	List of salaries payments
  */
 
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/salaries/class/paymentsalary.class.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
diff --git a/htdocs/salaries/paiement_salary.php b/htdocs/salaries/paiement_salary.php
index 8c885385a7f..30279ee3538 100644
--- a/htdocs/salaries/paiement_salary.php
+++ b/htdocs/salaries/paiement_salary.php
@@ -23,6 +23,7 @@
  *      \brief      Page to add payment of a salary
  */
 
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/salaries/class/salary.class.php';
 require_once DOL_DOCUMENT_ROOT.'/salaries/class/paymentsalary.class.php';
diff --git a/htdocs/salaries/payment_salary/card.php b/htdocs/salaries/payment_salary/card.php
index 3e41e4269f6..2d295a23131 100644
--- a/htdocs/salaries/payment_salary/card.php
+++ b/htdocs/salaries/payment_salary/card.php
@@ -26,6 +26,7 @@
  *		\remarks	Fichier presque identique a fournisseur/paiement/card.php
  */
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/salaries/class/salary.class.php';
 require_once DOL_DOCUMENT_ROOT.'/salaries/class/paymentsalary.class.php';
diff --git a/htdocs/salaries/payments.php b/htdocs/salaries/payments.php
index 6893d701d96..2d19a0fa72d 100644
--- a/htdocs/salaries/payments.php
+++ b/htdocs/salaries/payments.php
@@ -24,6 +24,7 @@
  *		\brief     	List of salaries payments
  */
 
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/salaries/class/salary.class.php';
 require_once DOL_DOCUMENT_ROOT.'/salaries/class/paymentsalary.class.php';
diff --git a/htdocs/salaries/stats/index.php b/htdocs/salaries/stats/index.php
index b3a8fdaa30e..4dfd0c84e0c 100644
--- a/htdocs/salaries/stats/index.php
+++ b/htdocs/salaries/stats/index.php
@@ -23,6 +23,7 @@
  *  \brief      Page for statistics of module salaries
  */
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/dolgraph.class.php';
 require_once DOL_DOCUMENT_ROOT.'/salaries/class/salariesstats.class.php';
diff --git a/htdocs/societe/admin/contact_extrafields.php b/htdocs/societe/admin/contact_extrafields.php
index 6b9a872be6c..dbd51ce1aac 100644
--- a/htdocs/societe/admin/contact_extrafields.php
+++ b/htdocs/societe/admin/contact_extrafields.php
@@ -24,6 +24,7 @@
  *		\brief      Page to setup extra fields of contact
  */
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
diff --git a/htdocs/societe/admin/societe.php b/htdocs/societe/admin/societe.php
index f9f5f800a04..092cb37e9d1 100644
--- a/htdocs/societe/admin/societe.php
+++ b/htdocs/societe/admin/societe.php
@@ -25,6 +25,7 @@
  *	\brief      Third party module setup page
  */
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
diff --git a/htdocs/societe/admin/societe_extrafields.php b/htdocs/societe/admin/societe_extrafields.php
index 1d77831c661..8ba7e49d968 100644
--- a/htdocs/societe/admin/societe_extrafields.php
+++ b/htdocs/societe/admin/societe_extrafields.php
@@ -24,6 +24,7 @@
  *		\brief      Page to setup extra fields of third party
  */
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
diff --git a/htdocs/societe/ajax/ajaxcompanies.php b/htdocs/societe/ajax/ajaxcompanies.php
index d9c9885ecc5..6aff1842d0f 100644
--- a/htdocs/societe/ajax/ajaxcompanies.php
+++ b/htdocs/societe/ajax/ajaxcompanies.php
@@ -42,6 +42,7 @@ if (!defined('NOCSRFCHECK')) {
 	define('NOCSRFCHECK', '1');
 }
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
 
diff --git a/htdocs/societe/ajax/company.php b/htdocs/societe/ajax/company.php
index f845c161ab2..a2e3e793fae 100644
--- a/htdocs/societe/ajax/company.php
+++ b/htdocs/societe/ajax/company.php
@@ -41,6 +41,7 @@ if (!defined('NOCSRFCHECK')) {
 	define('NOCSRFCHECK', '1');
 }
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
 
diff --git a/htdocs/societe/notify/card.php b/htdocs/societe/notify/card.php
index a9c0bdf04d0..ba1ead0e068 100644
--- a/htdocs/societe/notify/card.php
+++ b/htdocs/societe/notify/card.php
@@ -24,6 +24,7 @@
  *		\brief      Tab for notifications of third party
  */
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/notify.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
diff --git a/htdocs/stripe/admin/stripe.php b/htdocs/stripe/admin/stripe.php
index eb947d1dc28..33536271115 100644
--- a/htdocs/stripe/admin/stripe.php
+++ b/htdocs/stripe/admin/stripe.php
@@ -25,6 +25,7 @@
  * \brief      Page to setup stripe module
  */
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/stripe/lib/stripe.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
diff --git a/htdocs/stripe/ajax/ajax.php b/htdocs/stripe/ajax/ajax.php
index fa5392349eb..33927aa291d 100644
--- a/htdocs/stripe/ajax/ajax.php
+++ b/htdocs/stripe/ajax/ajax.php
@@ -39,6 +39,7 @@ if (!defined('NOBROWSERNOTIF')) {
 	define('NOBROWSERNOTIF', '1');
 }
 
+// Load Dolibarr environment
 require '../../main.inc.php'; // Load $user and permissions
 require_once DOL_DOCUMENT_ROOT.'/includes/stripe/stripe-php/init.php';
 require_once DOL_DOCUMENT_ROOT.'/stripe/class/stripe.class.php';
diff --git a/htdocs/stripe/charge.php b/htdocs/stripe/charge.php
index eb30537438c..6328d35d2ba 100644
--- a/htdocs/stripe/charge.php
+++ b/htdocs/stripe/charge.php
@@ -18,6 +18,7 @@
 
 // Put here all includes required by your class file
 
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
 require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
diff --git a/htdocs/stripe/payout.php b/htdocs/stripe/payout.php
index a33c183a1e7..964a702d338 100644
--- a/htdocs/stripe/payout.php
+++ b/htdocs/stripe/payout.php
@@ -18,6 +18,7 @@
 
 // Put here all includes required by your class file
 
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
 require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
diff --git a/htdocs/stripe/transaction.php b/htdocs/stripe/transaction.php
index f04833ff107..d883f81becf 100644
--- a/htdocs/stripe/transaction.php
+++ b/htdocs/stripe/transaction.php
@@ -18,6 +18,7 @@
 
 // Put here all includes required by your class file
 
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
 require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
diff --git a/htdocs/supplier_proposal/admin/supplier_proposal_extrafields.php b/htdocs/supplier_proposal/admin/supplier_proposal_extrafields.php
index e77a72ea6c4..dad2859cd8d 100644
--- a/htdocs/supplier_proposal/admin/supplier_proposal_extrafields.php
+++ b/htdocs/supplier_proposal/admin/supplier_proposal_extrafields.php
@@ -18,6 +18,7 @@
  * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/supplier_proposal.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
diff --git a/htdocs/supplier_proposal/admin/supplier_proposaldet_extrafields.php b/htdocs/supplier_proposal/admin/supplier_proposaldet_extrafields.php
index 304cbbd1e3a..477134e319e 100644
--- a/htdocs/supplier_proposal/admin/supplier_proposaldet_extrafields.php
+++ b/htdocs/supplier_proposal/admin/supplier_proposaldet_extrafields.php
@@ -21,6 +21,7 @@
  * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/supplier_proposal.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
diff --git a/htdocs/supplier_proposal/card.php b/htdocs/supplier_proposal/card.php
index 26679d58908..6be49c0c9fb 100644
--- a/htdocs/supplier_proposal/card.php
+++ b/htdocs/supplier_proposal/card.php
@@ -34,6 +34,7 @@
  *	\brief		Card supplier proposal
  */
 
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
diff --git a/htdocs/supplier_proposal/contact.php b/htdocs/supplier_proposal/contact.php
index 51137133aca..fde016c78c4 100644
--- a/htdocs/supplier_proposal/contact.php
+++ b/htdocs/supplier_proposal/contact.php
@@ -24,6 +24,7 @@
  *       \brief      Tab to manage contact of a supplier proposal
  */
 
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/supplier_proposal/class/supplier_proposal.class.php';
 require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
diff --git a/htdocs/supplier_proposal/document.php b/htdocs/supplier_proposal/document.php
index 74dd7c6160e..7aacfb8f8b2 100644
--- a/htdocs/supplier_proposal/document.php
+++ b/htdocs/supplier_proposal/document.php
@@ -26,6 +26,7 @@
  *       \brief      Management page of documents attached to a business proposal
  */
 
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/supplier_proposal/class/supplier_proposal.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/supplier_proposal.lib.php';
diff --git a/htdocs/supplier_proposal/index.php b/htdocs/supplier_proposal/index.php
index 6fd6480105b..a77c4eac47d 100644
--- a/htdocs/supplier_proposal/index.php
+++ b/htdocs/supplier_proposal/index.php
@@ -24,6 +24,7 @@
  *	\brief      Home page of vendor proposal area
  */
 
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
 require_once DOL_DOCUMENT_ROOT.'/supplier_proposal/class/supplier_proposal.class.php';
diff --git a/htdocs/supplier_proposal/info.php b/htdocs/supplier_proposal/info.php
index b95c06581ce..d1f0daad639 100644
--- a/htdocs/supplier_proposal/info.php
+++ b/htdocs/supplier_proposal/info.php
@@ -24,6 +24,7 @@
  *      \brief      Page d'affichage des infos d'une proposition commerciale
  */
 
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/supplier_proposal/class/supplier_proposal.class.php';
diff --git a/htdocs/supplier_proposal/list.php b/htdocs/supplier_proposal/list.php
index 3b04695da20..a0299ef3fec 100644
--- a/htdocs/supplier_proposal/list.php
+++ b/htdocs/supplier_proposal/list.php
@@ -33,6 +33,7 @@
  *	\brief      	Page of supplier proposals card and list
  */
 
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
diff --git a/htdocs/supplier_proposal/note.php b/htdocs/supplier_proposal/note.php
index 48ce778c0cf..118855cecf3 100644
--- a/htdocs/supplier_proposal/note.php
+++ b/htdocs/supplier_proposal/note.php
@@ -26,6 +26,7 @@
  *	\brief      Fiche d'information sur une proposition commerciale
  */
 
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/supplier_proposal/class/supplier_proposal.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/supplier_proposal.lib.php';
diff --git a/htdocs/takepos/admin/appearance.php b/htdocs/takepos/admin/appearance.php
index 9198b03bb63..e1761a56552 100644
--- a/htdocs/takepos/admin/appearance.php
+++ b/htdocs/takepos/admin/appearance.php
@@ -23,6 +23,7 @@
  *	\brief      Setup page for TakePos module
  */
 
+// Load Dolibarr environment
 require '../../main.inc.php'; // Load $user and permissions
 require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/product/class/html.formproduct.class.php';
diff --git a/htdocs/takepos/admin/bar.php b/htdocs/takepos/admin/bar.php
index 2f37de1a1b0..77a7a68b1c3 100644
--- a/htdocs/takepos/admin/bar.php
+++ b/htdocs/takepos/admin/bar.php
@@ -23,6 +23,7 @@
  *	\brief      Setup page for TakePos module - Bar Restaurant features
  */
 
+// Load Dolibarr environment
 require '../../main.inc.php'; // Load $user and permissions
 require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/product/class/html.formproduct.class.php';
diff --git a/htdocs/takepos/admin/orderprinters.php b/htdocs/takepos/admin/orderprinters.php
index cddf839375a..f01f3d4de66 100644
--- a/htdocs/takepos/admin/orderprinters.php
+++ b/htdocs/takepos/admin/orderprinters.php
@@ -26,6 +26,7 @@
  *      \brief      Home page of category area
  */
 
+// Load Dolibarr environment
 require '../../main.inc.php'; // Load $user and permissions
 require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/treeview.lib.php';
diff --git a/htdocs/takepos/admin/printqr.php b/htdocs/takepos/admin/printqr.php
index 87f742fe544..b5fe118e847 100644
--- a/htdocs/takepos/admin/printqr.php
+++ b/htdocs/takepos/admin/printqr.php
@@ -21,6 +21,7 @@
  *	\brief      Print QR Menu
  */
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 
 // Security check
diff --git a/htdocs/takepos/admin/receipt.php b/htdocs/takepos/admin/receipt.php
index 7cc5da97f64..457e17d76e0 100644
--- a/htdocs/takepos/admin/receipt.php
+++ b/htdocs/takepos/admin/receipt.php
@@ -25,6 +25,7 @@
  *	\brief      Setup page for TakePos module
  */
 
+// Load Dolibarr environment
 require '../../main.inc.php'; // Load $user and permissions
 require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/product/class/html.formproduct.class.php';
diff --git a/htdocs/takepos/admin/setup.php b/htdocs/takepos/admin/setup.php
index 543b5ba160f..38cd6d1275d 100644
--- a/htdocs/takepos/admin/setup.php
+++ b/htdocs/takepos/admin/setup.php
@@ -24,6 +24,7 @@
  *	\brief      Setup page for TakePos module
  */
 
+// Load Dolibarr environment
 require '../../main.inc.php'; // Load $user and permissions
 require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/product/class/html.formproduct.class.php';
diff --git a/htdocs/takepos/admin/terminal.php b/htdocs/takepos/admin/terminal.php
index dcf9ef08cee..eb43455216c 100644
--- a/htdocs/takepos/admin/terminal.php
+++ b/htdocs/takepos/admin/terminal.php
@@ -24,6 +24,7 @@
  *	\brief      Setup page for TakePos module
  */
 
+// Load Dolibarr environment
 require '../../main.inc.php'; // Load $user and permissions
 require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/product/class/html.formproduct.class.php';
diff --git a/htdocs/takepos/ajax/ajax.php b/htdocs/takepos/ajax/ajax.php
index a2698e05cd5..857e8249f21 100644
--- a/htdocs/takepos/ajax/ajax.php
+++ b/htdocs/takepos/ajax/ajax.php
@@ -40,6 +40,7 @@ if (!defined('NOBROWSERNOTIF')) {
 	define('NOBROWSERNOTIF', '1');
 }
 
+// Load Dolibarr environment
 require '../../main.inc.php'; // Load $user and permissions
 require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 require_once DOL_DOCUMENT_ROOT."/product/class/product.class.php";
diff --git a/htdocs/takepos/floors.php b/htdocs/takepos/floors.php
index 868719112b5..46fe0f3529d 100644
--- a/htdocs/takepos/floors.php
+++ b/htdocs/takepos/floors.php
@@ -41,6 +41,7 @@ if (!defined('NOREQUIREAJAX')) {
 	define('NOREQUIREAJAX', '1');
 }
 
+// Load Dolibarr environment
 require '../main.inc.php'; // Load $user and permissions
 require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
 
diff --git a/htdocs/takepos/freezone.php b/htdocs/takepos/freezone.php
index 9da6ed3b8ef..952c867ae47 100644
--- a/htdocs/takepos/freezone.php
+++ b/htdocs/takepos/freezone.php
@@ -42,6 +42,7 @@ if (!defined('NOREQUIREAJAX')) {
 	define('NOREQUIREAJAX', '1');
 }
 
+// Load Dolibarr environment
 require '../main.inc.php'; // Load $user and permissions
 require_once DOL_DOCUMENT_ROOT.'/core/lib/functions.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
diff --git a/htdocs/takepos/genimg/qr.php b/htdocs/takepos/genimg/qr.php
index c1dae9e8b20..eb33a08e370 100644
--- a/htdocs/takepos/genimg/qr.php
+++ b/htdocs/takepos/genimg/qr.php
@@ -42,6 +42,7 @@ if (!defined('NOREQUIREAJAX')) {
 	define('NOREQUIREAJAX', '1');
 }
 
+// Load Dolibarr environment
 require '../../main.inc.php'; // Load $user and permissions
 require '../../core/modules/barcode/doc/tcpdfbarcode.modules.php';
 
diff --git a/htdocs/takepos/index.php b/htdocs/takepos/index.php
index 410de2c330c..7e573be9102 100644
--- a/htdocs/takepos/index.php
+++ b/htdocs/takepos/index.php
@@ -43,6 +43,7 @@ if (!defined('NOREQUIREAJAX')) {
 	define('NOREQUIREAJAX', '1');
 }
 
+// Load Dolibarr environment
 require '../main.inc.php'; // Load $user and permissions
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.form.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
diff --git a/htdocs/takepos/pay.php b/htdocs/takepos/pay.php
index 7b5d4aea6b5..8773f52a149 100644
--- a/htdocs/takepos/pay.php
+++ b/htdocs/takepos/pay.php
@@ -39,6 +39,7 @@ if (!defined('NOREQUIREHTML')) {
 	define('NOREQUIREHTML', '1');
 }
 
+// Load Dolibarr environment
 require '../main.inc.php'; // Load $user and permissions
 require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
 require_once DOL_DOCUMENT_ROOT.'/stripe/class/stripe.class.php';
diff --git a/htdocs/takepos/printbox.php b/htdocs/takepos/printbox.php
index 7a79bdbcf88..176805662a5 100644
--- a/htdocs/takepos/printbox.php
+++ b/htdocs/takepos/printbox.php
@@ -42,6 +42,7 @@ if (!defined('NOREQUIREAJAX')) {
 	define('NOREQUIREAJAX', '1');
 }
 
+// Load Dolibarr environment
 require '../main.inc.php'; // Load $user and permissions
 require_once DOL_DOCUMENT_ROOT.'/core/lib/functions.lib.php';
 
diff --git a/htdocs/takepos/public/auto_order.php b/htdocs/takepos/public/auto_order.php
index 308cd75b12e..d123ac84f53 100644
--- a/htdocs/takepos/public/auto_order.php
+++ b/htdocs/takepos/public/auto_order.php
@@ -31,6 +31,7 @@ if (!defined('NOBROWSERNOTIF')) {
 	define('NOBROWSERNOTIF', '1');
 }
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 
 if (!$conf->global->TAKEPOS_AUTO_ORDER) {
diff --git a/htdocs/takepos/public/menu.php b/htdocs/takepos/public/menu.php
index 5d9d318db07..e7ab4d9fe1d 100644
--- a/htdocs/takepos/public/menu.php
+++ b/htdocs/takepos/public/menu.php
@@ -31,6 +31,7 @@ if (!defined('NOBROWSERNOTIF')) {
 	define('NOBROWSERNOTIF', '1');
 }
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 
 require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
diff --git a/htdocs/takepos/reduction.php b/htdocs/takepos/reduction.php
index bcb133d7ff1..e02884d810c 100644
--- a/htdocs/takepos/reduction.php
+++ b/htdocs/takepos/reduction.php
@@ -41,6 +41,7 @@ if (!defined('NOREQUIREAJAX')) {
 	define('NOREQUIREAJAX', '1');
 }
 
+// Load Dolibarr environment
 require '../main.inc.php'; // Load $user and permissions
 require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
 
diff --git a/htdocs/takepos/send.php b/htdocs/takepos/send.php
index 890bc1d55dd..24e4abde433 100644
--- a/htdocs/takepos/send.php
+++ b/htdocs/takepos/send.php
@@ -42,6 +42,7 @@ if (!defined('NOREQUIREAJAX')) {
 	define('NOREQUIREAJAX', '1');
 }
 
+// Load Dolibarr environment
 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';
diff --git a/htdocs/takepos/smpcb.php b/htdocs/takepos/smpcb.php
index 66dfdd32a2f..6433ece5042 100644
--- a/htdocs/takepos/smpcb.php
+++ b/htdocs/takepos/smpcb.php
@@ -37,6 +37,7 @@ if (!defined('NOREQUIREAJAX')) {
 	define('NOREQUIREAJAX', '1');
 }
 
+// Load Dolibarr environment
 require '../main.inc.php';
 
 if (empty($user->rights->takepos->run)) {
diff --git a/htdocs/takepos/split.php b/htdocs/takepos/split.php
index 2c9c68902b5..68e2995f192 100644
--- a/htdocs/takepos/split.php
+++ b/htdocs/takepos/split.php
@@ -41,6 +41,7 @@ if (!defined('NOREQUIREAJAX')) {
 	define('NOREQUIREAJAX', '1');
 }
 
+// Load Dolibarr environment
 require '../main.inc.php'; // Load $user and permissions
 require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
 
diff --git a/htdocs/ticket/card.php b/htdocs/ticket/card.php
index eabdaa8a16a..9abc2893cda 100755
--- a/htdocs/ticket/card.php
+++ b/htdocs/ticket/card.php
@@ -25,6 +25,7 @@
  *    \ingroup 	ticket
  */
 
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/ticket/class/actions_ticket.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formticket.class.php';
diff --git a/htdocs/ticket/contact.php b/htdocs/ticket/contact.php
index b410c901096..bf39f123708 100644
--- a/htdocs/ticket/contact.php
+++ b/htdocs/ticket/contact.php
@@ -24,6 +24,7 @@
  *       \brief      Contacts of tickets
  */
 
+// Load Dolibarr environment
 require '../main.inc.php';
 
 require_once DOL_DOCUMENT_ROOT.'/ticket/class/ticket.class.php';
diff --git a/htdocs/ticket/document.php b/htdocs/ticket/document.php
index b0481225a4a..5a7d46540c4 100644
--- a/htdocs/ticket/document.php
+++ b/htdocs/ticket/document.php
@@ -25,6 +25,7 @@
  *  \brief      files linked to a ticket
  */
 
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/ticket.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/ticket/class/ticket.class.php';
diff --git a/htdocs/ticket/index.php b/htdocs/ticket/index.php
index 8071d222748..ec609db64c2 100644
--- a/htdocs/ticket/index.php
+++ b/htdocs/ticket/index.php
@@ -22,6 +22,7 @@
  *    \ingroup	ticket
  */
 
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/ticket/class/actions_ticket.class.php';
 require_once DOL_DOCUMENT_ROOT.'/ticket/class/ticketstats.class.php';
diff --git a/htdocs/ticket/list.php b/htdocs/ticket/list.php
index c73084e34f3..d25ee868191 100644
--- a/htdocs/ticket/list.php
+++ b/htdocs/ticket/list.php
@@ -25,6 +25,7 @@
  *    \brief    List page for tickets
  */
 
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/ticket/class/actions_ticket.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formticket.class.php';
diff --git a/htdocs/ticket/messaging.php b/htdocs/ticket/messaging.php
index f4c2f181911..2f5a024a6b0 100644
--- a/htdocs/ticket/messaging.php
+++ b/htdocs/ticket/messaging.php
@@ -21,6 +21,7 @@
  *    	\brief		Page with events on ticket
  */
 
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/ticket/class/actions_ticket.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formticket.class.php';
diff --git a/htdocs/ticket/stats/index.php b/htdocs/ticket/stats/index.php
index 463526ba711..52965da8182 100644
--- a/htdocs/ticket/stats/index.php
+++ b/htdocs/ticket/stats/index.php
@@ -21,6 +21,7 @@
  *		\brief      Page with tickets statistics
  */
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/ticket/class/actions_ticket.class.php';
 require_once DOL_DOCUMENT_ROOT.'/ticket/class/ticketstats.class.php';
diff --git a/htdocs/user/admin/group_extrafields.php b/htdocs/user/admin/group_extrafields.php
index b31104d12b3..6793445879f 100644
--- a/htdocs/user/admin/group_extrafields.php
+++ b/htdocs/user/admin/group_extrafields.php
@@ -25,6 +25,7 @@
  *  \brief      Page to setup extra fields of users
  */
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/usergroups.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
diff --git a/htdocs/user/admin/user_extrafields.php b/htdocs/user/admin/user_extrafields.php
index 7dc15ca8447..2855c544b25 100644
--- a/htdocs/user/admin/user_extrafields.php
+++ b/htdocs/user/admin/user_extrafields.php
@@ -24,6 +24,7 @@
  *		\brief      Page to setup extra fields of users
  */
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/usergroups.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
diff --git a/htdocs/user/agenda_extsites.php b/htdocs/user/agenda_extsites.php
index 5fb7a3d0a9d..4891480cc2d 100644
--- a/htdocs/user/agenda_extsites.php
+++ b/htdocs/user/agenda_extsites.php
@@ -22,6 +22,7 @@
  *      \brief      Page to setup external calendars for agenda module
  */
 
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formadmin.class.php';
diff --git a/htdocs/user/bank.php b/htdocs/user/bank.php
index 4f3ee5c32c8..0c9540575c1 100644
--- a/htdocs/user/bank.php
+++ b/htdocs/user/bank.php
@@ -28,6 +28,7 @@
  *		\brief      Tab for HRM
  */
 
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/usergroups.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/bank.lib.php';
diff --git a/htdocs/user/card.php b/htdocs/user/card.php
index b1038b3a4cd..e2da7421ce8 100644
--- a/htdocs/user/card.php
+++ b/htdocs/user/card.php
@@ -35,6 +35,7 @@
  *       \brief      Tab of user card
  */
 
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/user/class/user.class.php';
 require_once DOL_DOCUMENT_ROOT.'/user/class/usergroup.class.php';
diff --git a/htdocs/user/clicktodial.php b/htdocs/user/clicktodial.php
index 50d514166ee..2302b6e7681 100644
--- a/htdocs/user/clicktodial.php
+++ b/htdocs/user/clicktodial.php
@@ -22,6 +22,7 @@
  *       \brief      Page for Click to dial datas
  */
 
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/usergroups.lib.php';
 
diff --git a/htdocs/user/document.php b/htdocs/user/document.php
index 06a7fb4e9db..99191368186 100644
--- a/htdocs/user/document.php
+++ b/htdocs/user/document.php
@@ -25,6 +25,7 @@
  *  \ingroup    user
  */
 
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/usergroups.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
diff --git a/htdocs/user/group/card.php b/htdocs/user/group/card.php
index 98fe9c6c8b4..e5ffc83d6eb 100644
--- a/htdocs/user/group/card.php
+++ b/htdocs/user/group/card.php
@@ -25,6 +25,7 @@
  *       \brief      Tab of a user group
  */
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/user/class/usergroup.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/usergroups.lib.php';
diff --git a/htdocs/user/group/ldap.php b/htdocs/user/group/ldap.php
index 00c0101b708..dd12669980a 100644
--- a/htdocs/user/group/ldap.php
+++ b/htdocs/user/group/ldap.php
@@ -23,6 +23,7 @@
  *       \brief      Page fiche LDAP groupe
  */
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/user/class/usergroup.class.php';
 require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
diff --git a/htdocs/user/group/list.php b/htdocs/user/group/list.php
index a6a1cf4c752..4575d9d5b67 100644
--- a/htdocs/user/group/list.php
+++ b/htdocs/user/group/list.php
@@ -25,6 +25,7 @@
  *      \brief      Page of user groups
  */
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/user/class/usergroup.class.php';
 
diff --git a/htdocs/user/group/perms.php b/htdocs/user/group/perms.php
index 15fcc2a319f..21060f5fde9 100644
--- a/htdocs/user/group/perms.php
+++ b/htdocs/user/group/perms.php
@@ -29,6 +29,7 @@ if (!defined('CSRFCHECK_WITH_TOKEN')) {
 	define('CSRFCHECK_WITH_TOKEN', '1'); // Force use of CSRF protection with tokens even for GET
 }
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/user/class/usergroup.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/usergroups.lib.php';
diff --git a/htdocs/user/hierarchy.php b/htdocs/user/hierarchy.php
index 95918274378..c48eda2312e 100644
--- a/htdocs/user/hierarchy.php
+++ b/htdocs/user/hierarchy.php
@@ -26,6 +26,7 @@
  *      \brief      Page of hierarchy view of user module
  */
 
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/treeview.lib.php';
 
diff --git a/htdocs/user/home.php b/htdocs/user/home.php
index 8555af8f467..96ca5428683 100644
--- a/htdocs/user/home.php
+++ b/htdocs/user/home.php
@@ -22,6 +22,7 @@
  *	\brief      Home page of users and groups management
  */
 
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/user/class/usergroup.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
diff --git a/htdocs/user/info.php b/htdocs/user/info.php
index 8c5643c5f42..dfb1fe23d0b 100644
--- a/htdocs/user/info.php
+++ b/htdocs/user/info.php
@@ -22,6 +22,7 @@
  *		\brief      Page des informations d'un utilisateur
  */
 
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/usergroups.lib.php';
diff --git a/htdocs/user/ldap.php b/htdocs/user/ldap.php
index 01be4fdcbae..e6255d09fbe 100644
--- a/htdocs/user/ldap.php
+++ b/htdocs/user/ldap.php
@@ -22,6 +22,7 @@
  *      \brief      Page fiche LDAP utilisateur
  */
 
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/usergroups.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/ldap.class.php';
diff --git a/htdocs/user/list.php b/htdocs/user/list.php
index 59211d14743..6ee81cf6cb7 100644
--- a/htdocs/user/list.php
+++ b/htdocs/user/list.php
@@ -25,6 +25,7 @@
  *      \brief      Page of users
  */
 
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
 if (isModEnabled('categorie')) {
diff --git a/htdocs/user/note.php b/htdocs/user/note.php
index 2b5a05dcd68..4b64a15d217 100644
--- a/htdocs/user/note.php
+++ b/htdocs/user/note.php
@@ -23,6 +23,7 @@
  *      \brief      Fiche de notes sur un utilisateur Dolibarr
  */
 
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/usergroups.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/user/class/user.class.php';
diff --git a/htdocs/user/notify/card.php b/htdocs/user/notify/card.php
index ce515dc7d16..e20d7be3d9a 100644
--- a/htdocs/user/notify/card.php
+++ b/htdocs/user/notify/card.php
@@ -25,6 +25,7 @@
  *		\brief      Tab for notifications of third party
  */
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/notify.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/usergroups.lib.php';
diff --git a/htdocs/user/param_ihm.php b/htdocs/user/param_ihm.php
index 6124b77e95f..ca656ed7f4e 100644
--- a/htdocs/user/param_ihm.php
+++ b/htdocs/user/param_ihm.php
@@ -23,6 +23,7 @@
  *       \brief      Page to show user setup for display
  */
 
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/usergroups.lib.php';
diff --git a/htdocs/user/passwordforgotten.php b/htdocs/user/passwordforgotten.php
index dabac0727dc..eee3816ca67 100644
--- a/htdocs/user/passwordforgotten.php
+++ b/htdocs/user/passwordforgotten.php
@@ -25,6 +25,7 @@
 
 define("NOLOGIN", 1); // This means this output page does not require to be logged.
 
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/usergroups.lib.php';
diff --git a/htdocs/user/perms.php b/htdocs/user/perms.php
index f98e3030eea..6dca3bdca83 100644
--- a/htdocs/user/perms.php
+++ b/htdocs/user/perms.php
@@ -30,6 +30,7 @@ if (!defined('CSRFCHECK_WITH_TOKEN')) {
 	define('CSRFCHECK_WITH_TOKEN', '1'); // Force use of CSRF protection with tokens even for GET
 }
 
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/usergroups.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
diff --git a/htdocs/user/vcard.php b/htdocs/user/vcard.php
index df6894947b7..44b7fda1e05 100644
--- a/htdocs/user/vcard.php
+++ b/htdocs/user/vcard.php
@@ -25,6 +25,7 @@
  *		\brief      Onglet vcard d'un user
  */
 
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/user/class/user.class.php';
 require_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
diff --git a/htdocs/variants/admin/admin.php b/htdocs/variants/admin/admin.php
index ade64ea6a7b..082e1d6ef6e 100644
--- a/htdocs/variants/admin/admin.php
+++ b/htdocs/variants/admin/admin.php
@@ -16,6 +16,7 @@
  * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/product.lib.php';
diff --git a/htdocs/variants/ajax/getCombinations.php b/htdocs/variants/ajax/getCombinations.php
index 2559ed6169c..f1f952a7b40 100644
--- a/htdocs/variants/ajax/getCombinations.php
+++ b/htdocs/variants/ajax/getCombinations.php
@@ -33,6 +33,7 @@ if (!defined('NOREQUIRESOC')) {
 	define('NOREQUIRESOC', '1');
 }
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
 require_once DOL_DOCUMENT_ROOT.'/variants/class/ProductCombination.class.php';
diff --git a/htdocs/variants/ajax/get_attribute_values.php b/htdocs/variants/ajax/get_attribute_values.php
index 4500db843e8..ff9782f58a0 100644
--- a/htdocs/variants/ajax/get_attribute_values.php
+++ b/htdocs/variants/ajax/get_attribute_values.php
@@ -32,6 +32,7 @@ if (!defined('NOREQUIRESOC')) {
 	define('NOREQUIRESOC', '1');
 }
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
 require_once DOL_DOCUMENT_ROOT.'/variants/class/ProductAttribute.class.php';
diff --git a/htdocs/variants/ajax/orderAttribute.php b/htdocs/variants/ajax/orderAttribute.php
index 9be6e69d852..d9f0ba47fd7 100644
--- a/htdocs/variants/ajax/orderAttribute.php
+++ b/htdocs/variants/ajax/orderAttribute.php
@@ -36,6 +36,7 @@ if (!defined('NOREQUIRETRAN')) {
 	define('NOREQUIRETRAN', '1');
 }
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 require DOL_DOCUMENT_ROOT . '/variants/class/ProductAttribute.class.php';
 
diff --git a/htdocs/variants/card.php b/htdocs/variants/card.php
index 68bb8d60998..e0f2d4f4d20 100644
--- a/htdocs/variants/card.php
+++ b/htdocs/variants/card.php
@@ -23,6 +23,7 @@
  * \brief 	Page to show product attribute
  */
 
+// Load Dolibarr environment
 require '../main.inc.php';
 require 'class/ProductAttribute.class.php';
 require 'class/ProductAttributeValue.class.php';
diff --git a/htdocs/variants/combinations.php b/htdocs/variants/combinations.php
index 7337bf57f94..0480a22a59a 100644
--- a/htdocs/variants/combinations.php
+++ b/htdocs/variants/combinations.php
@@ -18,6 +18,7 @@
  * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/product.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
diff --git a/htdocs/variants/list.php b/htdocs/variants/list.php
index 33e3055e084..930b01ff4e2 100644
--- a/htdocs/variants/list.php
+++ b/htdocs/variants/list.php
@@ -22,6 +22,7 @@
  *		\brief      List page for product attribute
  */
 
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
 require_once DOL_DOCUMENT_ROOT.'/variants/class/ProductAttribute.class.php';
diff --git a/htdocs/webservices/admin/index.php b/htdocs/webservices/admin/index.php
index 4cc7df953b8..30a7c0fb7ce 100644
--- a/htdocs/webservices/admin/index.php
+++ b/htdocs/webservices/admin/index.php
@@ -24,6 +24,7 @@
  *		\brief      Page to setup webservices module
  */
 
+// Load Dolibarr environment
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
 

From 835441d437801340a259c5fcd88e6c5f50d25de8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20France?= <frederic.france@free.fr>
Date: Wed, 7 Sep 2022 20:14:49 +0200
Subject: [PATCH 761/974] remove blank line

---
 build/exe/doliwamp/config.inc.php.install             | 11 +++++------
 dev/tools/test/namespacemig/main.inc.php              |  1 -
 htdocs/compta/bank/account_statement_document.php     |  1 -
 htdocs/compta/bank/document.php                       |  1 -
 htdocs/core/class/workboardresponse.class.php         |  1 -
 htdocs/core/modules/mailings/partnership.modules.php  |  1 -
 htdocs/core/modules/modDataPolicy.class.php           |  1 -
 htdocs/core/modules/modVariants.class.php             |  1 -
 htdocs/datapolicy/admin/setupmail.php                 |  1 -
 htdocs/datapolicy/public/index.php                    |  1 -
 htdocs/debugbar/class/autoloader.php                  |  1 -
 htdocs/product/inventory/ajax/searchfrombarcode.php   |  1 -
 htdocs/resource/contact.php                           |  1 -
 htdocs/variants/ajax/getCombinations.php              |  1 -
 htdocs/variants/ajax/orderAttribute.php               |  1 -
 htdocs/variants/class/ProductAttribute.class.php      |  1 -
 htdocs/variants/class/ProductAttributeValue.class.php |  1 -
 htdocs/variants/class/ProductCombination.class.php    |  1 -
 .../class/ProductCombination2ValuePair.class.php      |  1 -
 htdocs/zapier/class/api_zapier.class.php              |  1 -
 test/phpunit/functional/InstallTest.php               |  1 -
 21 files changed, 5 insertions(+), 26 deletions(-)

diff --git a/build/exe/doliwamp/config.inc.php.install b/build/exe/doliwamp/config.inc.php.install
index 6ad04752766..544cb116c7e 100644
--- a/build/exe/doliwamp/config.inc.php.install
+++ b/build/exe/doliwamp/config.inc.php.install
@@ -1,5 +1,4 @@
 <?php
-
 /* !!! DO NOT EDIT THIS FILE, EDIT config.inc.php INSTEAD !!! */
 
 // vim: expandtab sw=4 ts=4 sts=4:
@@ -139,7 +138,7 @@ $cfg['UseDbSearch']             = TRUE;   // whether to enable the "database sea
 $cfg['IgnoreMultiSubmitErrors'] = FALSE;  // if set to true, PMA continues computing multiple-statement queries
                                           // even if one of the queries failed
 $cfg['VerboseMultiSubmit']      = TRUE;   // if set to true, PMA will show the affected rows of EACH statement on
-                                          // multiple-statement queries. See the libraries/import.php file for 
+                                          // multiple-statement queries. See the libraries/import.php file for
                                           // hardcoded defaults on how many queries a statement may contain!
 $cfg['AllowArbitraryServer']    = FALSE;  // allow login to any user entered server in cookie based auth
 
@@ -195,7 +194,7 @@ $cfg['CharEditing']           = 'input';
                                         //  textarea - allows newlines in fields
 $cfg['InsertRows']            = 2;      // How many rows can be inserted at one time
 
-$cfg['ForeignKeyDropdownOrder'] =       // Sort order for items in a foreign-key dropdown box. 
+$cfg['ForeignKeyDropdownOrder'] =       // Sort order for items in a foreign-key dropdown box.
     array( 'content-id', 'id-content'); // 'content' is the referenced data, 'id' is the key value.
 $cfg['ForeignKeyMaxLimit'] = 100;       // A dropdown will be used if fewer items are present
 
@@ -488,7 +487,7 @@ $cfg['ShowBrowseComments']  = TRUE;         // shows stored relation-comments in
 $cfg['ShowPropertyComments']= TRUE;         // shows stored relation-comments in 'table property' mode.
 $cfg['RepeatCells']         = 100;          // repeat header names every X cells? (0 = deactivate)
 
-$cfg['EditInWindow']        = TRUE;         // Set to TRUE if Edit link should open the query to edit in the query window (assuming Javascript is enabled), and to FALSE if we should edit in the right panel 
+$cfg['EditInWindow']        = TRUE;         // Set to TRUE if Edit link should open the query to edit in the query window (assuming Javascript is enabled), and to FALSE if we should edit in the right panel
 $cfg['QueryWindowWidth']    = 550;          // Width of Query window
 $cfg['QueryWindowHeight']   = 310;          // Height of Query window
 $cfg['QueryHistoryDB']      = FALSE;         // Set to TRUE if you want DB-based query history.
@@ -561,7 +560,7 @@ $cfg['SQLQuery']['Refresh']   = TRUE;       // Refresh the results page
  */
 $cfg['UploadDir']             = '';         // Directory for uploaded files that can be executed by
                                             // phpMyAdmin. For example './upload'. Leave empty for
-                                            // no upload directory support. Use %u for username 
+                                            // no upload directory support. Use %u for username
                                             // inclusion.
 $cfg['SaveDir']               = '';         // Directory where phpMyAdmin can save exported data on
                                             // server. For example './save'. Leave empty for no save
@@ -645,7 +644,7 @@ $cfg['ColumnTypes'] = array(
 );
 
 // Attributes
-// Note: the "ON UPDATE CURRENT_TIMESTAMP" attribute is added dynamically 
+// Note: the "ON UPDATE CURRENT_TIMESTAMP" attribute is added dynamically
 // for MySQL >= 4.1.2, in libraries/tbl_properties.inc.php
 
 $cfg['AttributeTypes'] = array(
diff --git a/dev/tools/test/namespacemig/main.inc.php b/dev/tools/test/namespacemig/main.inc.php
index d46d8e38c1c..e013e6af1da 100644
--- a/dev/tools/test/namespacemig/main.inc.php
+++ b/dev/tools/test/namespacemig/main.inc.php
@@ -1,5 +1,4 @@
 <?php
-
 /*spl_autoload_register(function ($class_name) {
 	//var_dump('class='.$class_name);
 	require $class_name;
diff --git a/htdocs/compta/bank/account_statement_document.php b/htdocs/compta/bank/account_statement_document.php
index 09cf9709aee..a07759ad504 100644
--- a/htdocs/compta/bank/account_statement_document.php
+++ b/htdocs/compta/bank/account_statement_document.php
@@ -1,5 +1,4 @@
 <?php
-
 /* Copyright (C) 2003-2007 Rodolphe Quiedeville  <rodolphe@quiedeville.org>
  * Copyright (C) 2004-2008 Laurent Destailleur   <eldy@users.sourceforge.net>
  * Copyright (C) 2005      Marc Barilley / Ocebo <marc@ocebo.com>
diff --git a/htdocs/compta/bank/document.php b/htdocs/compta/bank/document.php
index 91f514948a6..595d627609b 100644
--- a/htdocs/compta/bank/document.php
+++ b/htdocs/compta/bank/document.php
@@ -1,5 +1,4 @@
 <?php
-
 /* Copyright (C) 2003-2007 Rodolphe Quiedeville  <rodolphe@quiedeville.org>
  * Copyright (C) 2004-2008 Laurent Destailleur   <eldy@users.sourceforge.net>
  * Copyright (C) 2005      Marc Barilley / Ocebo <marc@ocebo.com>
diff --git a/htdocs/core/class/workboardresponse.class.php b/htdocs/core/class/workboardresponse.class.php
index ac1d8fe9676..0df05a04027 100644
--- a/htdocs/core/class/workboardresponse.class.php
+++ b/htdocs/core/class/workboardresponse.class.php
@@ -1,5 +1,4 @@
 <?php
-
 /* Copyright (C) 2015   Marcos García   <marcosgdf@gmail.com>
  * Copyright (C) 2018   Charlene Benke  <charlie@patas-monkey.com>
  *
diff --git a/htdocs/core/modules/mailings/partnership.modules.php b/htdocs/core/modules/mailings/partnership.modules.php
index aa1f861bfe2..8a1fe0f2c16 100644
--- a/htdocs/core/modules/mailings/partnership.modules.php
+++ b/htdocs/core/modules/mailings/partnership.modules.php
@@ -1,5 +1,4 @@
 <?php
-
 /* Copyright (C) 2018-2018 Andre Schild        <a.schild@aarboard.ch>
  * Copyright (C) 2005-2010 Laurent Destailleur <eldy@users.sourceforge.net>
  * Copyright (C) 2005-2009 Regis Houssin       <regis.houssin@inodbox.com>
diff --git a/htdocs/core/modules/modDataPolicy.class.php b/htdocs/core/modules/modDataPolicy.class.php
index 1b82334a95b..12a2c8818e7 100644
--- a/htdocs/core/modules/modDataPolicy.class.php
+++ b/htdocs/core/modules/modDataPolicy.class.php
@@ -1,5 +1,4 @@
 <?php
-
 /* Copyright (C) 2004-2018 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2018      Nicolas ZABOURI      <info@inovea-conseil.com>
  *
diff --git a/htdocs/core/modules/modVariants.class.php b/htdocs/core/modules/modVariants.class.php
index e1364fd845e..8c330044cb0 100644
--- a/htdocs/core/modules/modVariants.class.php
+++ b/htdocs/core/modules/modVariants.class.php
@@ -1,5 +1,4 @@
 <?php
-
 /* 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>
diff --git a/htdocs/datapolicy/admin/setupmail.php b/htdocs/datapolicy/admin/setupmail.php
index d8f866502b8..e625a84e8ee 100644
--- a/htdocs/datapolicy/admin/setupmail.php
+++ b/htdocs/datapolicy/admin/setupmail.php
@@ -1,5 +1,4 @@
 <?php
-
 /* Copyright (C) 2004-2017  Laurent Destailleur     <eldy@users.sourceforge.net>
  * Copyright (C) 2018       Nicolas ZABOURI         <info@inovea-conseil.com>
  * Copyright (C) 2018       Frédéric France         <frederic.france@netlogic.fr>
diff --git a/htdocs/datapolicy/public/index.php b/htdocs/datapolicy/public/index.php
index 3bca5d301a7..0e1acb7f6dd 100644
--- a/htdocs/datapolicy/public/index.php
+++ b/htdocs/datapolicy/public/index.php
@@ -1,5 +1,4 @@
 <?php
-
 /* Copyright (C) 2018      Nicolas ZABOURI      <info@inovea-conseil.com>
  *
  * This program is free software: you can redistribute it and/or modify
diff --git a/htdocs/debugbar/class/autoloader.php b/htdocs/debugbar/class/autoloader.php
index 91606babb84..a093315172a 100644
--- a/htdocs/debugbar/class/autoloader.php
+++ b/htdocs/debugbar/class/autoloader.php
@@ -1,5 +1,4 @@
 <?php
-
 /**
  * Simple autoloader, so we don't need Composer just for this.
  */
diff --git a/htdocs/product/inventory/ajax/searchfrombarcode.php b/htdocs/product/inventory/ajax/searchfrombarcode.php
index 2d29e1d9d2e..d8f4ecf2ed2 100644
--- a/htdocs/product/inventory/ajax/searchfrombarcode.php
+++ b/htdocs/product/inventory/ajax/searchfrombarcode.php
@@ -1,5 +1,4 @@
 <?php
-
 /*
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/htdocs/resource/contact.php b/htdocs/resource/contact.php
index 515b7b336a9..45e4ce4b329 100644
--- a/htdocs/resource/contact.php
+++ b/htdocs/resource/contact.php
@@ -1,5 +1,4 @@
 <?php
-
 /* Copyright (C) 2005-2012  Regis Houssin        <regis.houssin@inodbox.com>
  * Copyright (C) 2007-2009  Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2012       Juanjo Menent        <jmenent@2byte.es>
diff --git a/htdocs/variants/ajax/getCombinations.php b/htdocs/variants/ajax/getCombinations.php
index f1f952a7b40..fb8b4c147cc 100644
--- a/htdocs/variants/ajax/getCombinations.php
+++ b/htdocs/variants/ajax/getCombinations.php
@@ -1,5 +1,4 @@
 <?php
-
 /* Copyright (C) 2016	Marcos García	<marcosgdf@gmail.com>
  * Copyright (C) 2022   Open-Dsi		<support@open-dsi.fr>
  *
diff --git a/htdocs/variants/ajax/orderAttribute.php b/htdocs/variants/ajax/orderAttribute.php
index d9f0ba47fd7..6de1c7dcab9 100644
--- a/htdocs/variants/ajax/orderAttribute.php
+++ b/htdocs/variants/ajax/orderAttribute.php
@@ -1,5 +1,4 @@
 <?php
-
 /* Copyright (C) 2016	Marcos García	<marcosgdf@gmail.com>
  * Copyright (C) 2022   Open-Dsi		<support@open-dsi.fr>
  *
diff --git a/htdocs/variants/class/ProductAttribute.class.php b/htdocs/variants/class/ProductAttribute.class.php
index 29ea45a17ec..fc96f247e63 100644
--- a/htdocs/variants/class/ProductAttribute.class.php
+++ b/htdocs/variants/class/ProductAttribute.class.php
@@ -1,5 +1,4 @@
 <?php
-
 /* Copyright (C) 2016	Marcos García	<marcosgdf@gmail.com>
  * Copyright (C) 2022   Open-Dsi		<support@open-dsi.fr>
  *
diff --git a/htdocs/variants/class/ProductAttributeValue.class.php b/htdocs/variants/class/ProductAttributeValue.class.php
index 2e8b414f727..d6da6bcd95a 100644
--- a/htdocs/variants/class/ProductAttributeValue.class.php
+++ b/htdocs/variants/class/ProductAttributeValue.class.php
@@ -1,5 +1,4 @@
 <?php
-
 /* Copyright (C) 2016	Marcos García	<marcosgdf@gmail.com>
  * Copyright (C) 2022   Open-Dsi		<support@open-dsi.fr>
  *
diff --git a/htdocs/variants/class/ProductCombination.class.php b/htdocs/variants/class/ProductCombination.class.php
index 215536ac43a..cc767449e75 100644
--- a/htdocs/variants/class/ProductCombination.class.php
+++ b/htdocs/variants/class/ProductCombination.class.php
@@ -1,5 +1,4 @@
 <?php
-
 /* 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>
diff --git a/htdocs/variants/class/ProductCombination2ValuePair.class.php b/htdocs/variants/class/ProductCombination2ValuePair.class.php
index 27406cdfc75..dee18dc99e1 100644
--- a/htdocs/variants/class/ProductCombination2ValuePair.class.php
+++ b/htdocs/variants/class/ProductCombination2ValuePair.class.php
@@ -1,5 +1,4 @@
 <?php
-
 /* Copyright (C) 2016	Marcos García	<marcosgdf@gmail.com>
  * Copyright (C) 2022   Open-Dsi		<support@open-dsi.fr>
  *
diff --git a/htdocs/zapier/class/api_zapier.class.php b/htdocs/zapier/class/api_zapier.class.php
index cfb46fb70b9..0a206852bc1 100644
--- a/htdocs/zapier/class/api_zapier.class.php
+++ b/htdocs/zapier/class/api_zapier.class.php
@@ -1,5 +1,4 @@
 <?php
-
 /* Copyright (C) 2015       Jean-François Ferry     <jfefe@aternatik.fr>
  * Copyright (C) 2019-2020  Frédéric France         <frederic.france@netlogic.fr>
  *
diff --git a/test/phpunit/functional/InstallTest.php b/test/phpunit/functional/InstallTest.php
index 394a8c626b7..ce3f9377244 100644
--- a/test/phpunit/functional/InstallTest.php
+++ b/test/phpunit/functional/InstallTest.php
@@ -1,5 +1,4 @@
 <?php
-
 /* Copyright (C) 2016  Raphaël Doursenaud <rdoursenaud@gpcsolutions.fr>
  *
  * Install functional test using PHPUnit's Selenium

From 63195e0ca38b5c2b7c7754cdcc8181eeccdb297a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20France?= <frederic.france@free.fr>
Date: Wed, 7 Sep 2022 20:21:01 +0200
Subject: [PATCH 762/974] fix license

---
 htdocs/admin/holiday_extrafields.php                            | 2 +-
 htdocs/core/customreports.php                                   | 2 +-
 htdocs/core/lib/intracommreport.lib.php                         | 2 +-
 htdocs/core/modules/modIntracommreport.class.php                | 2 +-
 htdocs/core/modules/modMrp.class.php                            | 2 +-
 htdocs/core/modules/modZapier.class.php                         | 2 +-
 .../triggers/interface_90_modSociete_ContactRoles.class.php     | 2 +-
 .../triggers/interface_99_modZapier_ZapierTriggers.class.php    | 2 +-
 htdocs/fichinter/class/fichinterrec.class.php                   | 2 +-
 htdocs/intracommreport/admin/intracommreport.php                | 2 +-
 htdocs/intracommreport/class/intracommreport.class.php          | 2 +-
 htdocs/intracommreport/list.php                                 | 2 +-
 htdocs/mrp/class/mo.class.php                                   | 2 +-
 htdocs/mrp/lib/mrp.lib.php                                      | 2 +-
 htdocs/mrp/lib/mrp_mo.lib.php                                   | 2 +-
 htdocs/mrp/mo_document.php                                      | 2 +-
 htdocs/mrp/mo_note.php                                          | 2 +-
 htdocs/mrp/mo_production.php                                    | 2 +-
 htdocs/multicurrency/multicurrency_rate.php                     | 2 +-
 htdocs/partnership/class/partnershiputils.class.php             | 2 +-
 htdocs/product/admin/product_supplier_extrafields.php           | 2 +-
 htdocs/projet/activity/permonth.php                             | 2 +-
 htdocs/takepos/admin/appearance.php                             | 2 +-
 htdocs/takepos/admin/receipt.php                                | 2 +-
 htdocs/takepos/send.php                                         | 2 +-
 htdocs/takepos/smpcb.php                                        | 2 +-
 htdocs/theme/eldy/manifest.json.php                             | 2 +-
 htdocs/theme/md/manifest.json.php                               | 2 +-
 htdocs/ticket/messaging.php                                     | 2 +-
 htdocs/variants/lib/variants.lib.php                            | 2 +-
 htdocs/zapier/admin/setup.php                                   | 2 +-
 htdocs/zapier/class/api_zapier.class.php                        | 2 +-
 htdocs/zapier/class/hook.class.php                              | 2 +-
 htdocs/zapier/lib/zapier.lib.php                                | 2 +-
 scripts/user/migrate_picture_path.php                           | 2 +-
 35 files changed, 35 insertions(+), 35 deletions(-)

diff --git a/htdocs/admin/holiday_extrafields.php b/htdocs/admin/holiday_extrafields.php
index 7c24695bf3d..c51b2846cf9 100644
--- a/htdocs/admin/holiday_extrafields.php
+++ b/htdocs/admin/holiday_extrafields.php
@@ -17,7 +17,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 /**
diff --git a/htdocs/core/customreports.php b/htdocs/core/customreports.php
index 0cf1c27c8a5..8fe774df32d 100644
--- a/htdocs/core/customreports.php
+++ b/htdocs/core/customreports.php
@@ -12,7 +12,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  *
  * Note: This tool can be included into a list page with :
  * define('USE_CUSTOM_REPORT_AS_INCLUDE', 1);
diff --git a/htdocs/core/lib/intracommreport.lib.php b/htdocs/core/lib/intracommreport.lib.php
index 9bf4996525b..6c4bea20adb 100644
--- a/htdocs/core/lib/intracommreport.lib.php
+++ b/htdocs/core/lib/intracommreport.lib.php
@@ -13,7 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
 /**
diff --git a/htdocs/core/modules/modIntracommreport.class.php b/htdocs/core/modules/modIntracommreport.class.php
index 25f26050ed0..4a9de11109a 100644
--- a/htdocs/core/modules/modIntracommreport.class.php
+++ b/htdocs/core/modules/modIntracommreport.class.php
@@ -15,7 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 /**
diff --git a/htdocs/core/modules/modMrp.class.php b/htdocs/core/modules/modMrp.class.php
index ff09c7570f6..1fd806bdc56 100644
--- a/htdocs/core/modules/modMrp.class.php
+++ b/htdocs/core/modules/modMrp.class.php
@@ -15,7 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 /**
diff --git a/htdocs/core/modules/modZapier.class.php b/htdocs/core/modules/modZapier.class.php
index c92de9d5909..77d80780284 100644
--- a/htdocs/core/modules/modZapier.class.php
+++ b/htdocs/core/modules/modZapier.class.php
@@ -13,7 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 /**
  *  \defgroup   zapier     Module Zapier
diff --git a/htdocs/core/triggers/interface_90_modSociete_ContactRoles.class.php b/htdocs/core/triggers/interface_90_modSociete_ContactRoles.class.php
index 2f291f5698b..cecb7f7cb98 100644
--- a/htdocs/core/triggers/interface_90_modSociete_ContactRoles.class.php
+++ b/htdocs/core/triggers/interface_90_modSociete_ContactRoles.class.php
@@ -18,7 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 /**
diff --git a/htdocs/core/triggers/interface_99_modZapier_ZapierTriggers.class.php b/htdocs/core/triggers/interface_99_modZapier_ZapierTriggers.class.php
index b131dd0391f..eca74045316 100644
--- a/htdocs/core/triggers/interface_99_modZapier_ZapierTriggers.class.php
+++ b/htdocs/core/triggers/interface_99_modZapier_ZapierTriggers.class.php
@@ -12,7 +12,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
 /**
diff --git a/htdocs/fichinter/class/fichinterrec.class.php b/htdocs/fichinter/class/fichinterrec.class.php
index bcf89704e55..96ef9e97314 100644
--- a/htdocs/fichinter/class/fichinterrec.class.php
+++ b/htdocs/fichinter/class/fichinterrec.class.php
@@ -19,7 +19,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 /**
diff --git a/htdocs/intracommreport/admin/intracommreport.php b/htdocs/intracommreport/admin/intracommreport.php
index 7b7eeb2e6ae..5df21406dbc 100644
--- a/htdocs/intracommreport/admin/intracommreport.php
+++ b/htdocs/intracommreport/admin/intracommreport.php
@@ -13,7 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
 /**
diff --git a/htdocs/intracommreport/class/intracommreport.class.php b/htdocs/intracommreport/class/intracommreport.class.php
index 5411e6b7aaa..09b18036059 100644
--- a/htdocs/intracommreport/class/intracommreport.class.php
+++ b/htdocs/intracommreport/class/intracommreport.class.php
@@ -14,7 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 /**
diff --git a/htdocs/intracommreport/list.php b/htdocs/intracommreport/list.php
index a1c9b508b76..115a53e31d4 100644
--- a/htdocs/intracommreport/list.php
+++ b/htdocs/intracommreport/list.php
@@ -13,7 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 /**
diff --git a/htdocs/mrp/class/mo.class.php b/htdocs/mrp/class/mo.class.php
index 263ca494518..b58c7169f25 100644
--- a/htdocs/mrp/class/mo.class.php
+++ b/htdocs/mrp/class/mo.class.php
@@ -14,7 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 /**
diff --git a/htdocs/mrp/lib/mrp.lib.php b/htdocs/mrp/lib/mrp.lib.php
index c9720cb56bc..dac11e1dd1c 100644
--- a/htdocs/mrp/lib/mrp.lib.php
+++ b/htdocs/mrp/lib/mrp.lib.php
@@ -12,7 +12,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
 /**
diff --git a/htdocs/mrp/lib/mrp_mo.lib.php b/htdocs/mrp/lib/mrp_mo.lib.php
index 08bc07f298a..f78f5da9166 100644
--- a/htdocs/mrp/lib/mrp_mo.lib.php
+++ b/htdocs/mrp/lib/mrp_mo.lib.php
@@ -12,7 +12,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
 /**
diff --git a/htdocs/mrp/mo_document.php b/htdocs/mrp/mo_document.php
index 810ea7c3200..e19e0b391a2 100644
--- a/htdocs/mrp/mo_document.php
+++ b/htdocs/mrp/mo_document.php
@@ -12,7 +12,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 /**
diff --git a/htdocs/mrp/mo_note.php b/htdocs/mrp/mo_note.php
index 865b3bf38ce..c32751b28d4 100644
--- a/htdocs/mrp/mo_note.php
+++ b/htdocs/mrp/mo_note.php
@@ -12,7 +12,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 /**
diff --git a/htdocs/mrp/mo_production.php b/htdocs/mrp/mo_production.php
index 3dbfe40106d..ea74129e7a3 100644
--- a/htdocs/mrp/mo_production.php
+++ b/htdocs/mrp/mo_production.php
@@ -12,7 +12,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 /**
diff --git a/htdocs/multicurrency/multicurrency_rate.php b/htdocs/multicurrency/multicurrency_rate.php
index 6f1fdaeb309..312f9f95559 100644
--- a/htdocs/multicurrency/multicurrency_rate.php
+++ b/htdocs/multicurrency/multicurrency_rate.php
@@ -23,7 +23,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 /**
diff --git a/htdocs/partnership/class/partnershiputils.class.php b/htdocs/partnership/class/partnershiputils.class.php
index 874059431e1..13f5942ba70 100644
--- a/htdocs/partnership/class/partnershiputils.class.php
+++ b/htdocs/partnership/class/partnershiputils.class.php
@@ -12,7 +12,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 /**
diff --git a/htdocs/product/admin/product_supplier_extrafields.php b/htdocs/product/admin/product_supplier_extrafields.php
index 04da7c74be0..259f476e6af 100644
--- a/htdocs/product/admin/product_supplier_extrafields.php
+++ b/htdocs/product/admin/product_supplier_extrafields.php
@@ -17,7 +17,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 /**
diff --git a/htdocs/projet/activity/permonth.php b/htdocs/projet/activity/permonth.php
index ead8d24550f..380b4891376 100644
--- a/htdocs/projet/activity/permonth.php
+++ b/htdocs/projet/activity/permonth.php
@@ -15,7 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 /**
diff --git a/htdocs/takepos/admin/appearance.php b/htdocs/takepos/admin/appearance.php
index e1761a56552..250606703af 100644
--- a/htdocs/takepos/admin/appearance.php
+++ b/htdocs/takepos/admin/appearance.php
@@ -14,7 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 /**
diff --git a/htdocs/takepos/admin/receipt.php b/htdocs/takepos/admin/receipt.php
index 457e17d76e0..a4c2efa03e9 100644
--- a/htdocs/takepos/admin/receipt.php
+++ b/htdocs/takepos/admin/receipt.php
@@ -16,7 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 /**
diff --git a/htdocs/takepos/send.php b/htdocs/takepos/send.php
index 24e4abde433..2003abaf1f1 100644
--- a/htdocs/takepos/send.php
+++ b/htdocs/takepos/send.php
@@ -13,7 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 /**
diff --git a/htdocs/takepos/smpcb.php b/htdocs/takepos/smpcb.php
index 6433ece5042..26d058838e0 100644
--- a/htdocs/takepos/smpcb.php
+++ b/htdocs/takepos/smpcb.php
@@ -12,7 +12,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 /**
diff --git a/htdocs/theme/eldy/manifest.json.php b/htdocs/theme/eldy/manifest.json.php
index 6f3dc2e9cbc..d468f685814 100644
--- a/htdocs/theme/eldy/manifest.json.php
+++ b/htdocs/theme/eldy/manifest.json.php
@@ -17,7 +17,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 /**
diff --git a/htdocs/theme/md/manifest.json.php b/htdocs/theme/md/manifest.json.php
index 2ad98e7e565..5d8736a0fad 100644
--- a/htdocs/theme/md/manifest.json.php
+++ b/htdocs/theme/md/manifest.json.php
@@ -17,7 +17,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 /**
diff --git a/htdocs/ticket/messaging.php b/htdocs/ticket/messaging.php
index 2f5a024a6b0..6e9c63462a2 100644
--- a/htdocs/ticket/messaging.php
+++ b/htdocs/ticket/messaging.php
@@ -12,7 +12,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 /**
diff --git a/htdocs/variants/lib/variants.lib.php b/htdocs/variants/lib/variants.lib.php
index e04d6fc15fe..609ea6cb1a1 100644
--- a/htdocs/variants/lib/variants.lib.php
+++ b/htdocs/variants/lib/variants.lib.php
@@ -12,7 +12,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
 /**
diff --git a/htdocs/zapier/admin/setup.php b/htdocs/zapier/admin/setup.php
index 90e2b8b8283..6737d23354f 100644
--- a/htdocs/zapier/admin/setup.php
+++ b/htdocs/zapier/admin/setup.php
@@ -13,7 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
 /**
diff --git a/htdocs/zapier/class/api_zapier.class.php b/htdocs/zapier/class/api_zapier.class.php
index 0a206852bc1..f065a165a54 100644
--- a/htdocs/zapier/class/api_zapier.class.php
+++ b/htdocs/zapier/class/api_zapier.class.php
@@ -13,7 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 /**
diff --git a/htdocs/zapier/class/hook.class.php b/htdocs/zapier/class/hook.class.php
index 0da11465fa8..9b5b7335559 100644
--- a/htdocs/zapier/class/hook.class.php
+++ b/htdocs/zapier/class/hook.class.php
@@ -12,7 +12,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 /**
diff --git a/htdocs/zapier/lib/zapier.lib.php b/htdocs/zapier/lib/zapier.lib.php
index a92f2879b4d..e483ebd9229 100644
--- a/htdocs/zapier/lib/zapier.lib.php
+++ b/htdocs/zapier/lib/zapier.lib.php
@@ -12,7 +12,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
 /**
diff --git a/scripts/user/migrate_picture_path.php b/scripts/user/migrate_picture_path.php
index dd395dc0629..d64c843767f 100755
--- a/scripts/user/migrate_picture_path.php
+++ b/scripts/user/migrate_picture_path.php
@@ -15,7 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 /**

From a079fb3fec94acf5a31d0a0ed1bc505fe1070897 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 7 Sep 2022 20:45:02 +0200
Subject: [PATCH 763/974] CSS

---
 htdocs/core/boxes/box_external_rss.php | 8 +++++---
 htdocs/core/boxes/modules_boxes.php    | 2 +-
 htdocs/core/lib/functions.lib.php      | 2 +-
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/htdocs/core/boxes/box_external_rss.php b/htdocs/core/boxes/box_external_rss.php
index 2a04aa27803..54f68c5e57f 100644
--- a/htdocs/core/boxes/box_external_rss.php
+++ b/htdocs/core/boxes/box_external_rss.php
@@ -120,6 +120,8 @@ class box_external_rss extends ModeleBoxes
 		// INFO on items
 		$items = $rssparser->getItems();
 		//print '<pre>'.print_r($items,true).'</pre>';
+
+		// Loop on last items
 		$nbitems = count($items);
 		for ($line = 0; $line < $max && $line < $nbitems; $line++) {
 			$item = $items[$line];
@@ -179,18 +181,18 @@ class box_external_rss extends ModeleBoxes
 
 			$this->info_box_contents[$line][0] = array(
 				'td' => 'class="left" width="16"',
-				'logo' => $this->boximg,
+				'text' => img_picto('', 'rss'),
 				'url' => $href,
 				'tooltip' => $tooltip,
 				'target' => 'newrss',
 			);
 
 			$this->info_box_contents[$line][1] = array(
-				'td' => '',
+				'td' => 'class="tdoverflowmax300"',
 				'text' => $title,
 				'url' => $href,
 				'tooltip' => $tooltip,
-				'maxlength' => 64,
+				'maxlength' => 0,
 				'target' => 'newrss',
 			);
 
diff --git a/htdocs/core/boxes/modules_boxes.php b/htdocs/core/boxes/modules_boxes.php
index 5d423a9e202..769f74da1a1 100644
--- a/htdocs/core/boxes/modules_boxes.php
+++ b/htdocs/core/boxes/modules_boxes.php
@@ -326,7 +326,7 @@ class ModeleBoxes // Can't be abtract as it is instantiated to build "empty" box
 							}
 
 							$maxlength = $MAXLENGTHBOX;
-							if (!empty($contents[$i][$j]['maxlength'])) {
+							if (isset($contents[$i][$j]['maxlength'])) {
 								$maxlength = $contents[$i][$j]['maxlength'];
 							}
 
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 1bb48831113..7391785312f 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -3974,7 +3974,7 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $
 				'salary', 'shipment', 'state', 'supplier_invoice', 'supplier_invoicea', 'supplier_invoicer', 'supplier_invoiced',
 				'technic', 'ticket',
 				'error', 'warning',
-				'recent', 'reception', 'recruitmentcandidature', 'recruitmentjobposition', 'resource', 'recurring',
+				'recent', 'reception', 'recruitmentcandidature', 'recruitmentjobposition', 'resource', 'recurring','rss',
 				'shapes', 'square', 'stop-circle', 'supplier', 'supplier_proposal', 'supplier_order', 'supplier_invoice',
 				'timespent', 'title_setup', 'title_accountancy', 'title_bank', 'title_hrm', 'title_agenda',
 				'uncheck', 'user-cog', 'user-injured', 'user-md', 'vat', 'website', 'workstation', 'webhook', 'world', 'private',

From 0234b352fe2e0f342dd86aa1aa54e41ec6e311df Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?This=20Charl=C3=A8ne?=
 <1179011+defrance@users.noreply.github.com>
Date: Wed, 7 Sep 2022 23:13:49 +0200
Subject: [PATCH 764/974] php V8 warning

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

diff --git a/htdocs/supplier_proposal/card.php b/htdocs/supplier_proposal/card.php
index 9e92a5fb4b6..3f7b1eeb71c 100644
--- a/htdocs/supplier_proposal/card.php
+++ b/htdocs/supplier_proposal/card.php
@@ -1282,7 +1282,7 @@ if ($action == 'create') {
 	// Shipping Method
 	if (!empty($conf->expedition->enabled)) {
 		print '<tr><td>'.$langs->trans('SendingMethod').'</td><td colspan="2">';
-		print $form->selectShippingMethod(GETPOST('shipping_method_id') > 0 ? GETPOST('shipping_method_id', 'int') : $shipping_method_id, 'shipping_method_id', '', 1);
+		print $form->selectShippingMethod(GETPOST('shipping_method_id') > 0 ? GETPOST('shipping_method_id', 'int') : "", 'shipping_method_id', '', 1);
 		print '</td></tr>';
 	}
 
@@ -1290,7 +1290,7 @@ if ($action == 'create') {
 	print '<tr><td>'.$langs->trans("DeliveryDate").'</td>';
 	print '<td colspan="2">';
 	$datedelivery = dol_mktime(0, 0, 0, GETPOST('liv_month'), GETPOST('liv_day'), GETPOST('liv_year'));
-	if ($conf->global->DATE_LIVRAISON_WEEK_DELAY != "") {
+	if (!empty($conf->global->DATE_LIVRAISON_WEEK_DELAY)) {
 		$tmpdte = time() + ((7 * $conf->global->DATE_LIVRAISON_WEEK_DELAY) * 24 * 60 * 60);
 		$syear = date("Y", $tmpdte);
 		$smonth = date("m", $tmpdte);
@@ -1307,7 +1307,7 @@ if ($action == 'create') {
 	print '<td>'.$langs->trans("DefaultModel").'</td>';
 	print '<td colspan="2">';
 	$list = ModelePDFSupplierProposal::liste_modeles($db);
-	$preselected = ($conf->global->SUPPLIER_PROPOSAL_ADDON_PDF_ODT_DEFAULT ? $conf->global->SUPPLIER_PROPOSAL_ADDON_PDF_ODT_DEFAULT : $conf->global->SUPPLIER_PROPOSAL_ADDON_PDF);
+	$preselected = (!empty($conf->global->SUPPLIER_PROPOSAL_ADDON_PDF_ODT_DEFAULT) ? $conf->global->SUPPLIER_PROPOSAL_ADDON_PDF_ODT_DEFAULT : $conf->global->SUPPLIER_PROPOSAL_ADDON_PDF);
 	print $form->selectarray('model', $list, $preselected, 0, 0, 0, '', 0, 0, 0, '', '', 1);
 	print "</td></tr>";
 

From 15ae8709242855df49f73cc4828499627325b4d0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?This=20Charl=C3=A8ne?=
 <1179011+defrance@users.noreply.github.com>
Date: Wed, 7 Sep 2022 23:17:24 +0200
Subject: [PATCH 765/974] Update card.php

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

diff --git a/htdocs/supplier_proposal/card.php b/htdocs/supplier_proposal/card.php
index 3f7b1eeb71c..5756149e74d 100644
--- a/htdocs/supplier_proposal/card.php
+++ b/htdocs/supplier_proposal/card.php
@@ -448,10 +448,10 @@ if (empty($reshook)) {
 						if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) {
 							$outputlangs = $langs;
 							$newlang = '';
-							if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id', 'aZ09')) {
+							if (!empty($conf->global->MAIN_MULTILANGS) && empty($newlang) && GETPOST('lang_id', 'aZ09')) {
 								$newlang = GETPOST('lang_id', 'aZ09');
 							}
-							if ($conf->global->MAIN_MULTILANGS && empty($newlang)) {
+							if (!empty($conf->global->MAIN_MULTILANGS) && empty($newlang)) {
 								$newlang = $object->thirdparty->default_lang;
 							}
 							if (!empty($newlang)) {

From ecf3a5c537b3c555615e37e40580de5a68f2b7d6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?This=20Charl=C3=A8ne?=
 <1179011+defrance@users.noreply.github.com>
Date: Wed, 7 Sep 2022 23:22:40 +0200
Subject: [PATCH 766/974] php V8 warning

---
 .../modules/supplier_proposal/doc/pdf_aurore.modules.php    | 6 +++---
 1 file changed, 3 insertions(+), 3 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 70ee5d75710..5d1d868e8b1 100644
--- a/htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php
+++ b/htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php
@@ -1323,7 +1323,7 @@ class pdf_aurore extends ModelePDFSupplierProposal
 				}
 			} else {
 				$text = $this->emetteur->name;
-				$pdf->MultiCell(100, 4, $outputlangs->convToOutputCharset($text), 0, $ltrdirection);
+				$pdf->MultiCell(100, 4, $outputlangs->convToOutputCharset($text), 0);
 			}
 		}
 
@@ -1343,11 +1343,11 @@ class pdf_aurore extends ModelePDFSupplierProposal
 		$posy += 1;
 		$pdf->SetFont('', '', $default_font_size - 2);
 
-		if ($object->ref_client) {
+		if ($object->ref_fourn) {
 			$posy += 4;
 			$pdf->SetXY($posx, $posy);
 			$pdf->SetTextColor(0, 0, 60);
-			$pdf->MultiCell(100, 3, $outputlangs->transnoentities("RefCustomer")." : ".dol_trunc($outputlangs->convToOutputCharset($object->ref_client), 65), '', 'R');
+			$pdf->MultiCell(100, 3, $outputlangs->transnoentities("RefSupplier")." : ".dol_trunc($outputlangs->convToOutputCharset($object->ref_fourn), 65), '', 'R');
 		}
 		/* PHFAVRE
 		$posy+=4;

From 72c4bb91066ec3e95b1de86b3e7d47d457b95b97 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?This=20Charl=C3=A8ne?=
 <1179011+defrance@users.noreply.github.com>
Date: Wed, 7 Sep 2022 23:29:41 +0200
Subject: [PATCH 767/974] Update card.php

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

diff --git a/htdocs/supplier_proposal/card.php b/htdocs/supplier_proposal/card.php
index 5756149e74d..09f12d70e4a 100644
--- a/htdocs/supplier_proposal/card.php
+++ b/htdocs/supplier_proposal/card.php
@@ -686,6 +686,7 @@ if (empty($reshook)) {
 					$ref_supplier = $productsupplier->ref_supplier;
 
 					// Get vat rate
+					$tva_npr = 0;
 					if (!GETPOSTISSET('tva_tx')) {	// If vat rate not provided from the form (the form has the priority)
 						$tva_tx = get_default_tva($object->thirdparty, $mysoc, $productsupplier->id, GETPOST('idprodfournprice', 'alpha'));
 						$tva_npr = get_default_npr($object->thirdparty, $mysoc, $productsupplier->id, GETPOST('idprodfournprice', 'alpha'));
@@ -841,10 +842,10 @@ if (empty($reshook)) {
 				if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) {
 					$outputlangs = $langs;
 					$newlang = '';
-					if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id', 'aZ09')) {
+					if (!empty($conf->global->MAIN_MULTILANGS) && empty($newlang) && GETPOST('lang_id', 'aZ09')) {
 						$newlang = GETPOST('lang_id', 'aZ09');
 					}
-					if ($conf->global->MAIN_MULTILANGS && empty($newlang)) {
+					if (!empty($conf->global->MAIN_MULTILANGS) && empty($newlang)) {
 						$newlang = $object->thirdparty->default_lang;
 					}
 					if (!empty($newlang)) {

From 9476ae002f6ac8105add09a1d262fcb34005122d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?This=20Charl=C3=A8ne?=
 <1179011+defrance@users.noreply.github.com>
Date: Wed, 7 Sep 2022 23:36:20 +0200
Subject: [PATCH 768/974] fix typo

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

diff --git a/htdocs/supplier_proposal/class/supplier_proposal.class.php b/htdocs/supplier_proposal/class/supplier_proposal.class.php
index 98da7f03365..0e8789dc84a 100644
--- a/htdocs/supplier_proposal/class/supplier_proposal.class.php
+++ b/htdocs/supplier_proposal/class/supplier_proposal.class.php
@@ -2950,7 +2950,7 @@ class SupplierProposalLine extends CommonObjectLine
 			$this->product_label	= $objp->product_label;
 			$this->product_desc		= $objp->product_desc;
 
-			$this->ref_fourn = $objp->ref_produit_forun;
+			$this->ref_fourn = $objp->ref_produit_fourn;
 
 			// Multicurrency
 			$this->fk_multicurrency = $objp->fk_multicurrency;

From 5aa70ae2a60408303a0bdbfc922df3e06e007d83 Mon Sep 17 00:00:00 2001
From: UT from dolibit <45215329+dolibit-ut@users.noreply.github.com>
Date: Thu, 8 Sep 2022 10:05:33 +0200
Subject: [PATCH 769/974] Update multicurrency_rate.php

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

diff --git a/htdocs/multicurrency/multicurrency_rate.php b/htdocs/multicurrency/multicurrency_rate.php
index 3f20476f72a..f3ab5afc9ec 100644
--- a/htdocs/multicurrency/multicurrency_rate.php
+++ b/htdocs/multicurrency/multicurrency_rate.php
@@ -27,18 +27,23 @@
  */
 
 /**
- *  \file       htdocs/multicurrency/multicurrency_rate.php
- *  \ingroup    multicurrency
- *  \brief      Page to list multicurrency rate
+ *    \file       htdocs/multicurrency/multicurrency_rate.php
+ *    \ingroup    multicurrency
+ *    \brief      Page to list multicurrency rate
  */
 
+
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/multicurrency.lib.php';
 
+
 // Load translation files required by the page
 $langs->loadLangs(array('multicurrency'));
 
+
+// Get Parameters
 $action				= GETPOST('action', 'alpha');
 $massaction			= GETPOST('massaction', 'alpha');
 $show_files			= GETPOST('show_files', 'int');
@@ -69,12 +74,13 @@ if (!$sortfield) $sortfield = "cr.date_sync";
 if (!$sortorder) $sortorder = "DESC";
 
 
-// Initialize technical object to manage hooks. Note that conf->hooks_modules contains array of hooks
+// Initialize technical objects
 $object = new CurrencyRate($db);
-
-$extrafields = new ExtraFields($db);
 $form = new Form($db);
+$extrafields = new ExtraFields($db);
 
+
+// Initialize technical object to manage hooks. Note that conf->hooks_modules contains array of hooks
 $hookmanager->initHooks(array('EditorRatelist', 'globallist'));
 
 if (empty($action)) {

From 39627db43455d6ff2f45c190ee05a90d1ce2698f Mon Sep 17 00:00:00 2001
From: UT from dolibit <45215329+dolibit-ut@users.noreply.github.com>
Date: Thu, 8 Sep 2022 10:07:47 +0200
Subject: [PATCH 770/974] Update card.php

---
 htdocs/opensurvey/card.php | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/htdocs/opensurvey/card.php b/htdocs/opensurvey/card.php
index 20985a52647..be0eb45bb7e 100644
--- a/htdocs/opensurvey/card.php
+++ b/htdocs/opensurvey/card.php
@@ -18,15 +18,17 @@
  */
 
 /**
- *	\file       htdocs/opensurvey/card.php
- *	\ingroup    opensurvey
- *	\brief      Page to edit survey
+ *    \file       htdocs/opensurvey/card.php
+ *    \ingroup    opensurvey
+ *    \brief      Page to edit survey
  */
 
+
+// Load Dolibarr environment
 require '../main.inc.php';
+require_once DOL_DOCUMENT_ROOT."/core/class/doleditor.class.php";
 require_once DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php";
 require_once DOL_DOCUMENT_ROOT."/core/lib/files.lib.php";
-require_once DOL_DOCUMENT_ROOT."/core/class/doleditor.class.php";
 require_once DOL_DOCUMENT_ROOT."/opensurvey/class/opensurveysondage.class.php";
 require_once DOL_DOCUMENT_ROOT."/opensurvey/lib/opensurvey.lib.php";
 
@@ -36,7 +38,7 @@ if (empty($user->rights->opensurvey->read)) {
 	accessforbidden();
 }
 
-// Initialisation des variables
+// Initialize Variables
 $action = GETPOST('action', 'aZ09');
 $cancel = GETPOST('cancel', 'alpha');
 
@@ -46,6 +48,7 @@ if (GETPOST('id')) {
 	$numsondage = (string) GETPOST('id', 'alpha');
 }
 
+// Initialize objects
 $object = new Opensurveysondage($db);
 
 $result = $object->fetch(0, $numsondage);

From fee724dbedca940239e32f84a69f41a8fb85d11b Mon Sep 17 00:00:00 2001
From: UT from dolibit <45215329+dolibit-ut@users.noreply.github.com>
Date: Thu, 8 Sep 2022 10:12:01 +0200
Subject: [PATCH 771/974] Update exportcsv.php

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

diff --git a/htdocs/opensurvey/exportcsv.php b/htdocs/opensurvey/exportcsv.php
index 76e4ffd9023..624fd620816 100644
--- a/htdocs/opensurvey/exportcsv.php
+++ b/htdocs/opensurvey/exportcsv.php
@@ -1,6 +1,7 @@
 <?php
-/* Copyright (C) 2013      Laurent Destailleur <eldy@users.sourceforge.net>
- * Copyright (C) 2014 Marcos García				<marcosgdf@gmail.com>
+
+/* Copyright (C) 2013      Laurent Destailleur        <eldy@users.sourceforge.net>
+ * Copyright (C) 2014      Marcos García              <marcosgdf@gmail.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -17,23 +18,26 @@
  */
 
 /**
- *	\file       htdocs/opensurvey/exportcsv.php
- *	\ingroup    opensurvey
- *	\brief      Page to list surveys
+ *    \file       htdocs/opensurvey/exportcsv.php
+ *    \ingroup    opensurvey
+ *    \brief      Page to list surveys
  */
 
 
+// Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php";
 require_once DOL_DOCUMENT_ROOT."/core/lib/files.lib.php";
 require_once DOL_DOCUMENT_ROOT."/opensurvey/class/opensurveysondage.class.php";
 
+
 $action = GETPOST('action', 'aZ09');
 $numsondage = '';
 if (GETPOST('id')) {
 	$numsondage = GETPOST("id", 'alpha');
 }
 
+// Initialize Objects
 $object = new Opensurveysondage($db);
 $result = $object->fetch(0, $numsondage);
 if ($result <= 0) {

From 444ba4bf46e2225bbe6952a30fea6b2a548f3fb1 Mon Sep 17 00:00:00 2001
From: atm-lena <lena.papazian@atm-consulting.fr>
Date: Thu, 8 Sep 2022 11:40:40 +0200
Subject: [PATCH 772/974] FIX Returns

---
 htdocs/bom/ajax/ajax.php               | 2 +-
 htdocs/bom/tpl/objectline_view.tpl.php | 4 +++-
 htdocs/core/class/cunits.class.php     | 4 ++--
 htdocs/core/lib/functions.lib.php      | 4 ++--
 4 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/htdocs/bom/ajax/ajax.php b/htdocs/bom/ajax/ajax.php
index 2a57752edde..444ce9beeb2 100644
--- a/htdocs/bom/ajax/ajax.php
+++ b/htdocs/bom/ajax/ajax.php
@@ -66,7 +66,7 @@ $idproduct = GETPOST('idproduct', 'int');
 
 top_httphead();
 
-if ($action == 'getDurationUnitByProduct') {
+if ($action == 'getDurationUnitByProduct' && $user->hasRight('product', 'lire')) {
 	$product = new Product($db);
 	$res = $product->fetch($idproduct);
 
diff --git a/htdocs/bom/tpl/objectline_view.tpl.php b/htdocs/bom/tpl/objectline_view.tpl.php
index 7c436d5721e..46c708f8c4e 100644
--- a/htdocs/bom/tpl/objectline_view.tpl.php
+++ b/htdocs/bom/tpl/objectline_view.tpl.php
@@ -65,7 +65,9 @@ if (empty($outputalsopricetotalwithtax)) {
 }
 
 // add html5 elements
-$domData  = ' data-element="'.$line->element.'service"';
+if($filtertype == 1) $domData  = ' data-element="'.$line->element.'service"';
+else $domData  = ' data-element="'.$line->element.'"';
+
 $domData .= ' data-id="'.$line->id.'"';
 $domData .= ' data-qty="'.$line->qty.'"';
 $domData .= ' data-product_type="'.$line->product_type.'"';
diff --git a/htdocs/core/class/cunits.class.php b/htdocs/core/class/cunits.class.php
index 3104ccd347d..102bbbda652 100644
--- a/htdocs/core/class/cunits.class.php
+++ b/htdocs/core/class/cunits.class.php
@@ -427,9 +427,9 @@ class CUnits // extends CommonObject
 	{
 
 		if ($mode == 'short_label') {
-			return dol_getIdFromCode($this->db, $code, 'c_units', 'short_label', 'rowid', 0, ' AND unit_type = "'.$unit_type.'"');
+			return dol_getIdFromCode($this->db, $code, 'c_units', 'short_label', 'rowid', 0, ' AND unit_type = "'.$this->db->escape($unit_type).'"');
 		} elseif ($mode == 'code') {
-			return dol_getIdFromCode($this->db, $code, 'c_units', 'code', 'rowid', 0, ' AND unit_type = "'. $unit_type .'"');
+			return dol_getIdFromCode($this->db, $code, 'c_units', 'code', 'rowid', 0, ' AND unit_type = "'. $this->db->escape($unit_type) .'"');
 		}
 
 		return $code;
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index afee28da2fd..2e819b8539d 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -8539,11 +8539,11 @@ function dol_osencode($str)
  * 		@param	string	$fieldkey		Field to search the key into
  * 		@param	string	$fieldid		Field to get
  *      @param  int		$entityfilter	Filter by entity
- * 	    @param	string		$filters	Filter on other fields
+ * 	    @param	string	$filters	Filter on other fields
  *      @return int						<0 if KO, Id of code if OK
  *      @see $langs->getLabelFromKey
  */
-function dol_getIdFromCode($db, $key, $tablename, $fieldkey = 'code', $fieldid = 'id', $entityfilter = 0, $filters = array())
+function dol_getIdFromCode($db, $key, $tablename, $fieldkey = 'code', $fieldid = 'id', $entityfilter = 0, $filters = '')
 {
 	global $cache_codes;
 

From 8152e3f82a6cf09ba9b97481258b00e57d2628bb Mon Sep 17 00:00:00 2001
From: atm-lena <lena.papazian@atm-consulting.fr>
Date: Thu, 8 Sep 2022 11:43:48 +0200
Subject: [PATCH 773/974] Clean code

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

diff --git a/htdocs/bom/class/bom.class.php b/htdocs/bom/class/bom.class.php
index 64af253b1f2..78b7e78f91f 100644
--- a/htdocs/bom/class/bom.class.php
+++ b/htdocs/bom/class/bom.class.php
@@ -667,6 +667,7 @@ class BOM extends CommonObject
 	 * @param	float	$efficiency				Efficiency in MO
 	 * @param	int		$position				Position of BOM-Line in BOM-Lines
 	 * @param	string	$import_key				Import Key
+	 * @param	int	$fk_unit					Unit of line
 	 * @return	int								<0 if KO, Id of updated BOM-Line if OK
 	 */
 	public function updateLine($rowid, $qty, $qty_frozen = 0, $disable_stock_change = 0, $efficiency = 1.0, $position = -1, $import_key = null, $fk_unit)

From 25fcc201e1d6cc86212bdb2814f1c582e5dc6df9 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 8 Sep 2022 11:44:09 +0200
Subject: [PATCH 774/974] Fix warning

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

diff --git a/htdocs/product/stock/movement_list.php b/htdocs/product/stock/movement_list.php
index b0f83cae0ec..e63a17efe15 100644
--- a/htdocs/product/stock/movement_list.php
+++ b/htdocs/product/stock/movement_list.php
@@ -136,7 +136,7 @@ $arrayfields = array(
 	'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'=>empty($conf->global->STOCK_MOVEMENT_LIST_HIDE_UNIT_PRICE))
+	'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)
 );

From d0429ad8a102bd248b6287fabf6c2737fd3f8422 Mon Sep 17 00:00:00 2001
From: stickler-ci <support@stickler-ci.com>
Date: Thu, 8 Sep 2022 09:48:48 +0000
Subject: [PATCH 775/974] Fixing style errors.

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

diff --git a/htdocs/bom/tpl/objectline_view.tpl.php b/htdocs/bom/tpl/objectline_view.tpl.php
index 46c708f8c4e..a3b9df0bdf0 100644
--- a/htdocs/bom/tpl/objectline_view.tpl.php
+++ b/htdocs/bom/tpl/objectline_view.tpl.php
@@ -65,7 +65,7 @@ if (empty($outputalsopricetotalwithtax)) {
 }
 
 // add html5 elements
-if($filtertype == 1) $domData  = ' data-element="'.$line->element.'service"';
+if ($filtertype == 1) $domData  = ' data-element="'.$line->element.'service"';
 else $domData  = ' data-element="'.$line->element.'"';
 
 $domData .= ' data-id="'.$line->id.'"';

From 58d67c0922a3ac86e20f6b0ed547c067bd9b2067 Mon Sep 17 00:00:00 2001
From: lmarcouiller <lucas.marcouiller@gmail.com>
Date: Thu, 8 Sep 2022 11:52:10 +0200
Subject: [PATCH 776/974] fix #22145 : impossible to delete ticket

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

diff --git a/htdocs/ticket/class/ticket.class.php b/htdocs/ticket/class/ticket.class.php
index 9ee7d2c81b6..9c95e56870a 100644
--- a/htdocs/ticket/class/ticket.class.php
+++ b/htdocs/ticket/class/ticket.class.php
@@ -1016,6 +1016,19 @@ class Ticket extends CommonObject
 			}
 		}
 
+		// Delete all child tables
+
+		if (!$error) {
+			$sql = "DELETE FROM ".MAIN_DB_PREFIX."categorie_ticket";
+			$sql .= " WHERE fk_ticket = ".(int) $this->id;
+
+			$result = $this->db->query($sql);
+			if (!$result) {
+				$error++;
+				$this->errors[] = $this->db->lasterror();
+			}
+		}
+
 		if (!$error) {
 			$sql = "DELETE FROM ".MAIN_DB_PREFIX."ticket";
 			$sql .= " WHERE rowid=".((int) $this->id);

From 1b5636ff66ce2dab7985b30af3e7b017edf2de03 Mon Sep 17 00:00:00 2001
From: atm-lena <lena.papazian@atm-consulting.fr>
Date: Thu, 8 Sep 2022 11:58:18 +0200
Subject: [PATCH 777/974] Fix stickler

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

diff --git a/htdocs/bom/class/bom.class.php b/htdocs/bom/class/bom.class.php
index 78b7e78f91f..b61a65f95a2 100644
--- a/htdocs/bom/class/bom.class.php
+++ b/htdocs/bom/class/bom.class.php
@@ -667,10 +667,10 @@ class BOM extends CommonObject
 	 * @param	float	$efficiency				Efficiency in MO
 	 * @param	int		$position				Position of BOM-Line in BOM-Lines
 	 * @param	string	$import_key				Import Key
-	 * @param	int	$fk_unit					Unit of line
+	 * @param	int		$fk_unit					Unit of line
 	 * @return	int								<0 if KO, Id of updated BOM-Line if OK
 	 */
-	public function updateLine($rowid, $qty, $qty_frozen = 0, $disable_stock_change = 0, $efficiency = 1.0, $position = -1, $import_key = null, $fk_unit)
+	public function updateLine($rowid, $qty, $qty_frozen = 0, $disable_stock_change = 0, $efficiency = 1.0, $position = -1, $import_key = null, $fk_unit = 0)
 	{
 		global $mysoc, $conf, $langs, $user;
 
@@ -740,7 +740,7 @@ class BOM extends CommonObject
 			$this->line->efficiency = $efficiency;
 			$this->line->import_key = $import_key;
 			$this->line->position = $rankToUse;
-			$this->line->fk_unit = $fk_unit;
+			if(!empty($fk_unit)) $this->line->fk_unit = $fk_unit;
 
 			$result = $this->line->update($user);
 

From 1e0ce2f90aeec43ca564c1cab597c188e8a1074f Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 8 Sep 2022 12:29:33 +0200
Subject: [PATCH 778/974] FIX test on hasRight for product module

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

diff --git a/htdocs/user/class/user.class.php b/htdocs/user/class/user.class.php
index a09811b21fc..3ecb47f89c6 100644
--- a/htdocs/user/class/user.class.php
+++ b/htdocs/user/class/user.class.php
@@ -711,7 +711,7 @@ class User extends CommonObject
 			'member' => 'adherent',	// We must check $user->rights->adherent...
 			'mo' => 'mrp',
 			'order' => 'commande',
-			//'product' => 'produit',	// We must check $user->rights->produit...
+			'produit' => 'product',
 			'project' => 'projet',
 			'propale' => 'propal',
 			'shipping' => 'expedition',
@@ -748,8 +748,9 @@ class User extends CommonObject
 			$permlevel1 = $tmp[0];
 		}
 
-		//var_dump($module);
-		//var_dump($this->rights->$module);
+		// In $conf->modules, we have 'accounting', 'product', 'facture', ...
+		// In $user->rights, we have 'accounting', 'produit', 'facture', ...
+		//if ($a) { var_dump($module); var_dump($this->rights->$rightsPath); var_dump($conf->modules); }
 		if (!in_array($module, $conf->modules)) {
 			return 0;
 		}
@@ -764,7 +765,7 @@ class User extends CommonObject
 		if ($permlevel1 == 'recruitmentcandidature') {
 			$permlevel1 = 'recruitmentjobposition';
 		}
-		//var_dump($module.' '.$permlevel1.' '.$permlevel2. ' '. $rightsPath);
+
 		//var_dump($this->rights);
 		if (empty($rightsPath) || empty($this->rights) || empty($this->rights->$rightsPath) || empty($permlevel1)) {
 			return 0;

From 4c092526508239a881b9474e81358b925cbd3933 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 8 Sep 2022 12:29:46 +0200
Subject: [PATCH 779/974] Clean code

---
 htdocs/core/ajax/selectsearchbox.php          |  2 +-
 .../core/boxes/box_dolibarr_state_board.php   |  4 +--
 htdocs/core/boxes/box_produits.php            |  4 +--
 htdocs/core/lib/product.lib.php               |  4 +--
 htdocs/core/menus/standard/eldy.lib.php       | 36 +++++++++----------
 htdocs/fourn/product/list.php                 |  2 +-
 htdocs/product/index.php                      |  4 +--
 htdocs/user/class/user.class.php              |  2 +-
 8 files changed, 29 insertions(+), 29 deletions(-)

diff --git a/htdocs/core/ajax/selectsearchbox.php b/htdocs/core/ajax/selectsearchbox.php
index 201a4b89991..b643351dc73 100644
--- a/htdocs/core/ajax/selectsearchbox.php
+++ b/htdocs/core/ajax/selectsearchbox.php
@@ -78,7 +78,7 @@ if (isModEnabled('societe') && empty($conf->global->MAIN_SEARCHFORM_CONTACT_DISA
 	$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 ? '?sall='.urlencode($search_boxvalue) : ''));
 }
 
-if (((isModEnabled('product') && $user->hasRight('produit', 'lire')) || (isModEnabled('service') && $user->hasRight('service', 'lire'))) && empty($conf->global->MAIN_SEARCHFORM_PRODUITSERVICE_DISABLED)) {
+if (((isModEnabled('product') && $user->hasRight('product', 'read')) || (isModEnabled('service') && $user->hasRight('service', 'read'))) && empty($conf->global->MAIN_SEARCHFORM_PRODUITSERVICE_DISABLED)) {
 	$arrayresult['searchintoproduct'] = array('position'=>30, 'shortcut'=>'P', 'img'=>'object_product', 'label'=>$langs->trans("SearchIntoProductsOrServices", $search_boxvalue), 'text'=>img_picto('', 'object_product', 'class="pictofixedwidth"').' '.$langs->trans("SearchIntoProductsOrServices", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/product/list.php'.($search_boxvalue ? '?sall='.urlencode($search_boxvalue) : ''));
 	// search on lot/serial numbers
 	if (isModEnabled('productbatch')) {
diff --git a/htdocs/core/boxes/box_dolibarr_state_board.php b/htdocs/core/boxes/box_dolibarr_state_board.php
index 1efd1d27f95..a60d5c20a93 100644
--- a/htdocs/core/boxes/box_dolibarr_state_board.php
+++ b/htdocs/core/boxes/box_dolibarr_state_board.php
@@ -122,8 +122,8 @@ class box_dolibarr_state_board extends ModeleBoxes
 								 )
 								 && empty($conf->global->SOCIETE_DISABLE_SUPPLIERS_STATS),
 				'contacts' => isModEnabled('societe') && $user->hasRight('societe', 'contact', 'lire'),
-				'products' => isModEnabled('product') && $user->hasRight('produit', 'lire'),
-				'services' => isModEnabled('service') && $user->hasRight('service', 'lire'),
+				'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'),
diff --git a/htdocs/core/boxes/box_produits.php b/htdocs/core/boxes/box_produits.php
index 505d022dccd..19f9724cc98 100644
--- a/htdocs/core/boxes/box_produits.php
+++ b/htdocs/core/boxes/box_produits.php
@@ -150,9 +150,9 @@ class box_produits extends ModeleBoxes
 					$productstatic->accountancy_code_buy_export = $objp->accountancy_code_buy_export;
 					$productstatic->date_modification = $datem;
 
-					$usercancreadprice = getDolGlobalString('MAIN_USE_ADVANCED_PERMS')?$user->hasRight('product', 'product_advance', 'read_prices'):$user->hasRight('product', 'lire');
+					$usercancreadprice = getDolGlobalString('MAIN_USE_ADVANCED_PERMS')?$user->hasRight('product', 'product_advance', 'read_prices'):$user->hasRight('product', 'read');
 					if ($productstatic->isService()) {
-						$usercancreadprice = getDolGlobalString('MAIN_USE_ADVANCED_PERMS')?$user->hasRight('service', 'service_advance', 'read_prices'):$user->hasRight('service', 'lire');
+						$usercancreadprice = getDolGlobalString('MAIN_USE_ADVANCED_PERMS')?$user->hasRight('service', 'service_advance', 'read_prices'):$user->hasRight('service', 'read');
 					}
 
 					$this->info_box_contents[$line][] = array(
diff --git a/htdocs/core/lib/product.lib.php b/htdocs/core/lib/product.lib.php
index 56cb195060b..b5056c2cce3 100644
--- a/htdocs/core/lib/product.lib.php
+++ b/htdocs/core/lib/product.lib.php
@@ -38,11 +38,11 @@ function product_prepare_head($object)
 	$langs->load("products");
 
 	$label = $langs->trans('Product');
-	$usercancreadprice = getDolGlobalString('MAIN_USE_ADVANCED_PERMS')?$user->hasRight('product', 'product_advance', 'read_prices'):$user->hasRight('product', 'lire');
+	$usercancreadprice = getDolGlobalString('MAIN_USE_ADVANCED_PERMS')?$user->hasRight('product', 'product_advance', 'read_prices'):$user->hasRight('product', 'read');
 
 	if ($object->isService()) {
 		$label = $langs->trans('Service');
-		$usercancreadprice = getDolGlobalString('MAIN_USE_ADVANCED_PERMS')?$user->hasRight('service', 'service_advance', 'read_prices'):$user->hasRight('service', 'lire');
+		$usercancreadprice = getDolGlobalString('MAIN_USE_ADVANCED_PERMS')?$user->hasRight('service', 'service_advance', 'read_prices'):$user->hasRight('service', 'read');
 	}
 
 	$h = 0;
diff --git a/htdocs/core/menus/standard/eldy.lib.php b/htdocs/core/menus/standard/eldy.lib.php
index a1b505da46a..afaad336f9e 100644
--- a/htdocs/core/menus/standard/eldy.lib.php
+++ b/htdocs/core/menus/standard/eldy.lib.php
@@ -150,7 +150,7 @@ function print_eldy_menu($db, $atarget, $type_user, &$tabMenu, &$menu, $noout =
 	// Products-Services
 	$tmpentry = array(
 		'enabled'=> (isModEnabled('product') || isModEnabled('service') || isModEnabled('expedition')),
-		'perms'=> ($user->hasRight('produit',  'lire') || $user->hasRight('service',  'lire') || $user->hasRight('expedition',  'lire')),
+		'perms'=> ($user->hasRight('product',  'read') || $user->hasRight('service',  'read') || $user->hasRight('expedition',  'lire')),
 		'module'=>'product|service'
 	);
 	$menu_arr[] = array(
@@ -1990,22 +1990,22 @@ function get_left_menu_products($mainmenu, &$newmenu, $usemenuhider = 1, $leftme
 	if ($mainmenu == 'products') {
 		// Products
 		if (isModEnabled('product')) {
-			$newmenu->add("/product/index.php?leftmenu=product&amp;type=0", $langs->trans("Products"), 0, $user->hasRight('produit',  'lire'), '', $mainmenu, 'product', 0, '', '', '', img_picto('', 'product', 'class="pictofixedwidth"'));
-			$newmenu->add("/product/card.php?leftmenu=product&amp;action=create&amp;type=0", $langs->trans("NewProduct"), 1, $user->hasRight('produit',  'creer'));
-			$newmenu->add("/product/list.php?leftmenu=product&amp;type=0", $langs->trans("List"), 1, $user->hasRight('produit',  'lire'));
+			$newmenu->add("/product/index.php?leftmenu=product&amp;type=0", $langs->trans("Products"), 0, $user->hasRight('product',  'read'), '', $mainmenu, 'product', 0, '', '', '', img_picto('', 'product', 'class="pictofixedwidth"'));
+			$newmenu->add("/product/card.php?leftmenu=product&amp;action=create&amp;type=0", $langs->trans("NewProduct"), 1, $user->hasRight('product',  'creer'));
+			$newmenu->add("/product/list.php?leftmenu=product&amp;type=0", $langs->trans("List"), 1, $user->hasRight('product',  'read'));
 			if (isModEnabled('stock')) {
-				$newmenu->add("/product/reassort.php?type=0", $langs->trans("MenuStocks"), 1, $user->hasRight('produit',  'lire') && $user->hasRight('stock',  'lire'));
+				$newmenu->add("/product/reassort.php?type=0", $langs->trans("MenuStocks"), 1, $user->hasRight('product',  'read') && $user->hasRight('stock',  'lire'));
 			}
 			if (isModEnabled('productbatch')) {
 				$langs->load("stocks");
-				$newmenu->add("/product/reassortlot.php?type=0&search_subjecttolotserial=1", $langs->trans("StocksByLotSerial"), 1, $user->hasRight('produit',  'lire') && $user->hasRight('stock',  'lire'));
-				$newmenu->add("/product/stock/productlot_list.php", $langs->trans("LotSerial"), 1, $user->hasRight('produit',  'lire') && $user->hasRight('stock',  'lire'));
+				$newmenu->add("/product/reassortlot.php?type=0&search_subjecttolotserial=1", $langs->trans("StocksByLotSerial"), 1, $user->hasRight('product',  'read') && $user->hasRight('stock',  'lire'));
+				$newmenu->add("/product/stock/productlot_list.php", $langs->trans("LotSerial"), 1, $user->hasRight('product',  'read') && $user->hasRight('stock',  'lire'));
 			}
 			if (isModEnabled('variants')) {
-				$newmenu->add("/variants/list.php", $langs->trans("VariantAttributes"), 1, $user->hasRight('produit',  'lire'));
+				$newmenu->add("/variants/list.php", $langs->trans("VariantAttributes"), 1, $user->hasRight('product',  'read'));
 			}
 			if (isModEnabled('propal') || (isModEnabled('commande') && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD)) || isModEnabled('facture') || isModEnabled('fournisseur') || 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('produit',  'lire'));
+				$newmenu->add("/product/stats/card.php?id=all&leftmenu=stats&type=0", $langs->trans("Statistics"), 1, $user->hasRight('product',  'read'));
 			}
 
 			// Categories
@@ -2018,11 +2018,11 @@ function get_left_menu_products($mainmenu, &$newmenu, $usemenuhider = 1, $leftme
 
 		// Services
 		if (isModEnabled('service')) {
-			$newmenu->add("/product/index.php?leftmenu=service&amp;type=1", $langs->trans("Services"), 0, $user->hasRight('service',  'lire'), '', $mainmenu, 'service', 0, '', '', '', img_picto('', 'service', 'class="pictofixedwidth"'));
+			$newmenu->add("/product/index.php?leftmenu=service&amp;type=1", $langs->trans("Services"), 0, $user->hasRight('service',  'read'), '', $mainmenu, 'service', 0, '', '', '', img_picto('', 'service', 'class="pictofixedwidth"'));
 			$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',  'lire'));
+			$newmenu->add("/product/list.php?leftmenu=service&amp;type=1", $langs->trans("List"), 1, $user->hasRight('service',  'read'));
 			if (isModEnabled('propal') || isModEnabled('commande') || isModEnabled('facture') || (isModEnabled('fournisseur') && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD)) || 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',  'lire'));
+				$newmenu->add("/product/stats/card.php?id=all&leftmenu=stats&type=1", $langs->trans("Statistics"), 1, $user->hasRight('service',  'read'));
 			}
 			// Categories
 			if (isModEnabled('categorie')) {
@@ -2035,16 +2035,16 @@ function get_left_menu_products($mainmenu, &$newmenu, $usemenuhider = 1, $leftme
 		// Warehouse
 		if (isModEnabled('stock')) {
 			$langs->load("stocks");
-			$newmenu->add("/product/stock/index.php?leftmenu=stock", $langs->trans("Warehouses"), 0, $user->hasRight('stock',  'lire'), '', $mainmenu, 'stock', 0, '', '', '', img_picto('', 'stock', 'class="pictofixedwidth"'));
-			$newmenu->add("/product/stock/card.php?action=create", $langs->trans("MenuNewWarehouse"), 1, $user->hasRight('stock',  'creer'));
+			$newmenu->add("/product/stock/index.php?leftmenu=stock", $langs->trans("Warehouses"), 0, $user->hasRight('stock', 'lire'), '', $mainmenu, 'stock', 0, '', '', '', img_picto('', 'stock', 'class="pictofixedwidth"'));
+			$newmenu->add("/product/stock/card.php?action=create", $langs->trans("MenuNewWarehouse"), 1, $user->hasRight('stock', 'creer'));
 			$newmenu->add("/product/stock/list.php", $langs->trans("List"), 1, $user->hasRight('stock',  'lire'));
-			$newmenu->add("/product/stock/movement_list.php", $langs->trans("Movements"), 1, $user->hasRight('stock',  'mouvement', 'lire'));
+			$newmenu->add("/product/stock/movement_list.php", $langs->trans("Movements"), 1, $user->hasRight('stock', 'mouvement', 'lire'));
 
-			$newmenu->add("/product/stock/massstockmove.php", $langs->trans("MassStockTransferShort"), 1, $user->hasRight('stock',  'mouvement', 'creer'));
+			$newmenu->add("/product/stock/massstockmove.php", $langs->trans("MassStockTransferShort"), 1, $user->hasRight('stock', 'mouvement', 'creer'));
 			if (isModEnabled('supplier_order')) {
-				$newmenu->add("/product/stock/replenish.php", $langs->trans("Replenishment"), 1, $user->hasRight('stock',  'mouvement', 'creer') && $user->hasRight('fournisseur',  'lire'));
+				$newmenu->add("/product/stock/replenish.php", $langs->trans("Replenishment"), 1, $user->hasRight('stock', 'mouvement', 'creer') && $user->hasRight('fournisseur',  'lire'));
 			}
-			$newmenu->add("/product/stock/stockatdate.php", $langs->trans("StockAtDate"), 1, $user->hasRight('produit',  'lire') && $user->hasRight('stock',  'lire'));
+			$newmenu->add("/product/stock/stockatdate.php", $langs->trans("StockAtDate"), 1, $user->hasRight('product', 'read', '', 1) && $user->hasRight('stock', 'lire'));
 
 			// Categories for warehouses
 			if (isModEnabled('categorie')) {
diff --git a/htdocs/fourn/product/list.php b/htdocs/fourn/product/list.php
index 4bd64a60fc8..5588fbd79ee 100644
--- a/htdocs/fourn/product/list.php
+++ b/htdocs/fourn/product/list.php
@@ -79,7 +79,7 @@ if (empty($user->rights->produit->lire) && empty($user->rights->service->lire))
 }
 
 // Permissions
-$permissiontoadd = ($user->hasRight('produit', 'lire') || $user->hasRight('service', 'lire'));
+$permissiontoadd = ($user->hasRight('product', 'read') || $user->hasRight('service', 'read'));
 
 
 /*
diff --git a/htdocs/product/index.php b/htdocs/product/index.php
index 726a8b56135..3ca5bfbc655 100644
--- a/htdocs/product/index.php
+++ b/htdocs/product/index.php
@@ -341,9 +341,9 @@ if ((isModEnabled("product") || isModEnabled("service")) && ($user->rights->prod
 				$product_static->status_buy = $objp->tobuy;
 				$product_static->status_batch = $objp->tobatch;
 
-				$usercancreadprice = getDolGlobalString('MAIN_USE_ADVANCED_PERMS')?$user->hasRight('product', 'product_advance', 'read_prices'):$user->hasRight('product', 'lire');
+				$usercancreadprice = getDolGlobalString('MAIN_USE_ADVANCED_PERMS')?$user->hasRight('product', 'product_advance', 'read_prices'):$user->hasRight('product', 'read');
 				if ($product_static->isService()) {
-					$usercancreadprice = getDolGlobalString('MAIN_USE_ADVANCED_PERMS')?$user->hasRight('service', 'service_advance', 'read_prices'):$user->hasRight('service', 'lire');
+					$usercancreadprice = getDolGlobalString('MAIN_USE_ADVANCED_PERMS')?$user->hasRight('service', 'service_advance', 'read_prices'):$user->hasRight('service', 'read');
 				}
 
 				// Multilangs
diff --git a/htdocs/user/class/user.class.php b/htdocs/user/class/user.class.php
index 3ecb47f89c6..f521d10c936 100644
--- a/htdocs/user/class/user.class.php
+++ b/htdocs/user/class/user.class.php
@@ -708,7 +708,7 @@ class User extends CommonObject
 		// For compatibility with bad naming permissions on module
 		$moduletomoduletouse = array(
 			'contract' => 'contrat',
-			'member' => 'adherent',	// We must check $user->rights->adherent...
+			'member' => 'adherent',
 			'mo' => 'mrp',
 			'order' => 'commande',
 			'produit' => 'product',

From 044d2baca1585751958e9bc4a8b979a6a5073e78 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 8 Sep 2022 14:02:21 +0200
Subject: [PATCH 780/974] Sync transifex

---
 htdocs/langs/ar_SA/accountancy.lang     |    9 +-
 htdocs/langs/ar_SA/admin.lang           |   38 +-
 htdocs/langs/ar_SA/agenda.lang          |    3 +
 htdocs/langs/bg_BG/admin.lang           |   32 +-
 htdocs/langs/bs_BA/admin.lang           |  137 +-
 htdocs/langs/ca_ES/accountancy.lang     |   11 +-
 htdocs/langs/ca_ES/admin.lang           |   78 +-
 htdocs/langs/ca_ES/agenda.lang          |   11 +-
 htdocs/langs/ca_ES/banks.lang           |   11 +-
 htdocs/langs/ca_ES/bills.lang           |   12 +-
 htdocs/langs/ca_ES/bookmarks.lang       |    1 +
 htdocs/langs/cs_CZ/admin.lang           |   32 +-
 htdocs/langs/da_DK/accountancy.lang     |   11 +-
 htdocs/langs/da_DK/admin.lang           |   44 +-
 htdocs/langs/da_DK/agenda.lang          |    3 +
 htdocs/langs/da_DK/banks.lang           |    1 +
 htdocs/langs/da_DK/bills.lang           |    1 +
 htdocs/langs/de_AT/banks.lang           |    1 -
 htdocs/langs/de_CH/accountancy.lang     |    3 +-
 htdocs/langs/de_CH/admin.lang           |    5 +-
 htdocs/langs/de_CH/banks.lang           |    6 -
 htdocs/langs/de_DE/accountancy.lang     |   15 +-
 htdocs/langs/de_DE/admin.lang           |   34 +-
 htdocs/langs/de_DE/agenda.lang          |    3 +
 htdocs/langs/de_DE/banks.lang           |   71 +-
 htdocs/langs/de_DE/bills.lang           |    1 +
 htdocs/langs/de_DE/blockedlog.lang      |    2 +-
 htdocs/langs/de_DE/bookmarks.lang       |    1 +
 htdocs/langs/el_GR/accountancy.lang     |  341 +--
 htdocs/langs/el_GR/admin.lang           |  142 +-
 htdocs/langs/el_GR/agenda.lang          |   13 +-
 htdocs/langs/el_GR/assets.lang          |   20 +-
 htdocs/langs/el_GR/banks.lang           |  151 +-
 htdocs/langs/el_GR/bills.lang           |  517 ++---
 htdocs/langs/en_GB/admin.lang           |    3 +-
 htdocs/langs/es_AR/admin.lang           |    4 +-
 htdocs/langs/es_CL/admin.lang           |    4 +-
 htdocs/langs/es_CL/install.lang         |    1 -
 htdocs/langs/es_CO/admin.lang           |    4 +-
 htdocs/langs/es_CO/install.lang         |    1 -
 htdocs/langs/es_EC/admin.lang           |    5 +-
 htdocs/langs/es_EC/install.lang         |    1 -
 htdocs/langs/es_ES/accountancy.lang     |    7 +-
 htdocs/langs/es_ES/admin.lang           |   32 +-
 htdocs/langs/es_ES/agenda.lang          |    3 +
 htdocs/langs/es_ES/banks.lang           |    7 +-
 htdocs/langs/es_ES/bills.lang           |   18 +-
 htdocs/langs/es_ES/bookmarks.lang       |    1 +
 htdocs/langs/es_MX/admin.lang           |    4 +-
 htdocs/langs/es_VE/admin.lang           |    3 +-
 htdocs/langs/et_EE/admin.lang           |   32 +-
 htdocs/langs/fa_IR/admin.lang           |   32 +-
 htdocs/langs/fi_FI/admin.lang           |   32 +-
 htdocs/langs/fr_CA/admin.lang           |    4 +-
 htdocs/langs/fr_CA/assets.lang          |    2 +-
 htdocs/langs/fr_FR/accountancy.lang     |    7 +-
 htdocs/langs/fr_FR/admin.lang           |   32 +-
 htdocs/langs/fr_FR/agenda.lang          |    3 +
 htdocs/langs/fr_FR/assets.lang          |  183 +-
 htdocs/langs/fr_FR/banks.lang           |    5 +-
 htdocs/langs/fr_FR/bills.lang           |   14 +-
 htdocs/langs/gl_ES/accountancy.lang     |    7 +-
 htdocs/langs/gl_ES/admin.lang           |   32 +-
 htdocs/langs/gl_ES/agenda.lang          |    3 +
 htdocs/langs/gl_ES/banks.lang           |    1 +
 htdocs/langs/gl_ES/bills.lang           |    1 +
 htdocs/langs/hr_HR/accountancy.lang     |    7 +-
 htdocs/langs/hr_HR/admin.lang           |   32 +-
 htdocs/langs/hu_HU/accountancy.lang     |    7 +-
 htdocs/langs/hu_HU/admin.lang           |   36 +-
 htdocs/langs/hu_HU/agenda.lang          |    3 +
 htdocs/langs/hu_HU/bills.lang           |    5 +-
 htdocs/langs/id_ID/assets.lang          |  183 +-
 htdocs/langs/it_CH/accountancy.lang     |    3 +
 htdocs/langs/it_IT/admin.lang           |   32 +-
 htdocs/langs/it_IT/agenda.lang          |    3 +
 htdocs/langs/ja_JP/accountancy.lang     |    7 +-
 htdocs/langs/ja_JP/admin.lang           |   32 +-
 htdocs/langs/ja_JP/agenda.lang          |    3 +
 htdocs/langs/ja_JP/bills.lang           |    1 +
 htdocs/langs/ko_KR/admin.lang           |  137 +-
 htdocs/langs/lt_LT/admin.lang           |   32 +-
 htdocs/langs/lv_LV/admin.lang           |   32 +-
 htdocs/langs/nb_NO/accountancy.lang     |    7 +-
 htdocs/langs/nb_NO/admin.lang           |   32 +-
 htdocs/langs/nl_BE/admin.lang           |    4 +-
 htdocs/langs/nl_NL/accountancy.lang     |    7 +-
 htdocs/langs/nl_NL/admin.lang           |   42 +-
 htdocs/langs/pl_PL/admin.lang           |   32 +-
 htdocs/langs/pt_BR/admin.lang           |    1 -
 htdocs/langs/pt_MZ/admin.lang           |    2 -
 htdocs/langs/pt_PT/admin.lang           |   32 +-
 htdocs/langs/ro_RO/accountancy.lang     |    7 +-
 htdocs/langs/ro_RO/admin.lang           |   32 +-
 htdocs/langs/ro_RO/agenda.lang          |    3 +
 htdocs/langs/ro_RO/banks.lang           |    1 +
 htdocs/langs/ro_RO/bills.lang           |    1 +
 htdocs/langs/ru_RU/admin.lang           |   32 +-
 htdocs/langs/sk_SK/admin.lang           |   32 +-
 htdocs/langs/sl_SI/admin.lang           |   32 +-
 htdocs/langs/sr_RS/admin.lang           |   32 +-
 htdocs/langs/sv_SE/admin.lang           |   32 +-
 htdocs/langs/th_TH/admin.lang           |   32 +-
 htdocs/langs/tr_TR/admin.lang           |   32 +-
 htdocs/langs/vi_VN/admin.lang           |   32 +-
 htdocs/langs/zh_CN/admin.lang           | 2604 ++++++++++++-----------
 htdocs/langs/zh_CN/banks.lang           |   16 +-
 htdocs/langs/zh_CN/bills.lang           |   23 +-
 htdocs/langs/zh_TW/accountancy.lang     |   19 +-
 htdocs/langs/zh_TW/admin.lang           |   48 +-
 htdocs/langs/zh_TW/agenda.lang          |    7 +-
 htdocs/langs/zh_TW/banks.lang           |    5 +-
 htdocs/partnership/partnershipindex.php |  197 --
 113 files changed, 3755 insertions(+), 2427 deletions(-)
 create mode 100644 htdocs/langs/it_CH/accountancy.lang
 delete mode 100644 htdocs/partnership/partnershipindex.php

diff --git a/htdocs/langs/ar_SA/accountancy.lang b/htdocs/langs/ar_SA/accountancy.lang
index 913349b4bb8..495ece856df 100644
--- a/htdocs/langs/ar_SA/accountancy.lang
+++ b/htdocs/langs/ar_SA/accountancy.lang
@@ -48,8 +48,9 @@ CountriesNotInEEC=ليس ضمن دول الاتحاد الأوروبي
 CountriesInEECExceptMe=البلدان في المجموعة الاقتصادية الأوروبية باستثناء %s
 CountriesExceptMe=جميع الدول باستثناء %s
 AccountantFiles=تصدير مستندات المصدر
-ExportAccountingSourceDocHelp=With this tool, you can export the source events (list in CSV and PDFs) that are used to generate your accountancy.
+ExportAccountingSourceDocHelp=باستخدام هذه الأداة ، يمكنك البحث عن مصدر الأحداث التي يتم استخدامها لإنشاء المحاسبة الخاصة بك وتصديرها. <br> سيحتوي ملف ZIP المُصدَّر على قوائم العناصر المطلوبة في CSV ، بالإضافة إلى الملفات المرفقة بتنسيقها الأصلي (PDF ، ODT ، DOCX ...).
 ExportAccountingSourceDocHelp2=لتصدير دفاترك المحاسبية ، إستخدم القائمة %s - %s .
+ExportAccountingProjectHelp=حدد مشروعًا إذا كنت بحاجة إلى تقرير محاسبة لمشروع معين فقط. لا يتم تضمين تقارير المصروفات ودفعات القرض في تقارير المشروع.
 VueByAccountAccounting=عرض حسب الحساب المحاسبي
 VueBySubAccountAccounting=عرض حسب الحساب المحاسبة الفرعي
 
@@ -183,6 +184,8 @@ ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT=حساب تسجيل الاشتراكات
 
 ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT=حساب افتراضي لتسجيل إيداع العميل
 UseAuxiliaryAccountOnCustomerDeposit=تخزين حساب العميل كحساب فردي في دفتر الأستاذ الفرعي لخطوط الدفعات المقدمة (إذا تم تعطيله ، فسيظل الحساب الفردي لبنود الدَفعة المقدمة فارغًا)
+ACCOUNTING_ACCOUNT_SUPPLIER_DEPOSIT=Accounting account by default to register supplier deposit
+UseAuxiliaryAccountOnSupplierDeposit=Store supplier account as individual account in subsidiary ledger for lines of down payments (if disabled, individual account for down payment lines will remain empty)
 
 ACCOUNTING_PRODUCT_BUY_ACCOUNT=حساب افتراضي للمنتجات المشتراة (يستخدم إذا لم يتم تحديده في ورقة المنتج)
 ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT=حساب افتراضي للمنتجات المشتراة في الاتحاد الاوروبي (يستخدم إذا لم يتم تحديده في ورقة المنتج)
@@ -279,7 +282,7 @@ DescVentilExpenseReportMore=إذا قمت بإعداد حساب على نوع ب
 DescVentilDoneExpenseReport=راجع هنا قائمة بنود تقارير المصروفات وحساب رسومها
 
 Closure=الإغلاق السنوي
-DescClosure=Consult here the number of movements by month not yet validated & locked
+DescClosure=استشر هنا عدد الحركات حسب الشهر التي لم يتم التحقق من صحتها وإغلاقها
 OverviewOfMovementsNotValidated=نظرة عامة على الحركات التي لم يتم التحقق من صحتها وإغلاقها
 AllMovementsWereRecordedAsValidated=تم تسجيل جميع الحركات على أنها محققة ومغلقة
 NotAllMovementsCouldBeRecordedAsValidated=لا يمكن تسجيل جميع الحركات على أنها تم التحقق من صحتها وقفلها
@@ -332,7 +335,7 @@ ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS=تعطيل الربط والتحو
 
 ## Export
 NotifiedExportDate=ضع علامة على الخطوط المصدرة كـ <span class="warning"> (لتعديل سطر ، ستحتاج إلى حذف المعاملة بالكامل وإعادة تحويلها إلى المحاسبة) </span>
-NotifiedValidationDate=Validate and Lock the exported entries <span class="warning">(same effect than the "Closure" feature, modification and deletion of the lines will DEFINITELY not be possible)</span>
+NotifiedValidationDate=تحقق من صحة الإدخالات التي تم تصديرها وقفلها <span class="warning"> (نفس التأثير من ميزة "%s" ، ولن يكون تعديل الأسطر وحذفها بالتأكيد ممكنًا) </span>
 DateValidationAndLock=التحقق من صحة التاريخ والقفل
 ConfirmExportFile=تأكيد إنشاء ملف محاسبي تصدير؟
 ExportDraftJournal=تصدير مسودة دفتر اليومية
diff --git a/htdocs/langs/ar_SA/admin.lang b/htdocs/langs/ar_SA/admin.lang
index 6db0f18e637..16ed55874ab 100644
--- a/htdocs/langs/ar_SA/admin.lang
+++ b/htdocs/langs/ar_SA/admin.lang
@@ -109,7 +109,7 @@ 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=ملاحظة : لم يتم وضح حد في إعدادات الـ PHP الخاص بك
 MaxSizeForUploadedFiles=الحجم الأقصى لتحميل الملفات (0 لمنع أي تحميل)
-UseCaptchaCode=Use graphical code (CAPTCHA) on login page and some public pages
+UseCaptchaCode=استخدم الكود الرسومي (CAPTCHA) في صفحة تسجيل الدخول وبعض الصفحات العامة
 AntiVirusCommand=المسار الكامل لبرنامج مكافحة الفيروسات
 AntiVirusCommandExample=Example for ClamAv Daemon (require clamav-daemon): /usr/bin/clamdscan<br>Example for ClamWin (very very slow): c:\\Progra~1\\ClamWin\\bin\\clamscan.exe
 AntiVirusParam= المزيد من الصلاحيات بإستخدام command line
@@ -477,7 +477,7 @@ InstalledInto=مثبت في الدليل %s
 BarcodeInitForThirdparties=تهيئة الباركود الجماعي للأطراف الثالثة
 BarcodeInitForProductsOrServices=الحرف الأول الباركود الشامل أو إعادة للمنتجات أو الخدمات
 CurrentlyNWithoutBarCode=حاليًا ، لديك سجل <strong> %s </strong> على <strong> %s </strong> %s بدون barcodef49fz0
-InitEmptyBarCode=قيمة الحرف الأول للسجلات فارغة الصورة٪ المقبلة
+InitEmptyBarCode=القيمة الأولية للرموز الشريطية الفارغة %s
 EraseAllCurrentBarCode=محو كل القيم الباركود الحالية
 ConfirmEraseAllCurrentBarCode=هل أنت متأكد أنك تريد مسح كافة قيم الباركود الحالية؟
 AllBarcodeReset=وقد أزيلت كل القيم الباركود
@@ -504,7 +504,7 @@ WarningPHPMailC=- يعد استخدام خادم SMTP الخاص بموفر خد
 WarningPHPMailD=كذلك ، يوصى بتغيير طريقة إرسال رسائل البريد الإلكتروني إلى القيمة "SMTP". إذا كنت تريد حقًا الاحتفاظ بالطريقة الافتراضية "PHP" لإرسال رسائل البريد الإلكتروني ، فما عليك سوى تجاهل هذا التحذير أو إزالته عن طريق ضبط MAIN_HIDE_WARNING_TO_ENCOURAGE_SMTP_SETUP ثابتًا على 1 في Home - Setup - Other.
 WarningPHPMail2=إذا كان موفر البريد الإلكتروني SMTP بحاجة إلى تقييد عميل البريد الإلكتروني لبعض عناوين IP (نادر جدًا) ، فهذا هو عنوان IP الخاص بوكيل مستخدم البريد (MUA) لتطبيق ERP CRM الخاص بك: <strong> %s </strong>.
 WarningPHPMailSPF=إذا كان اسم المجال في عنوان البريد الإلكتروني الخاص بالمرسل محميًا بسجل SPF (اسأل مسجل اسم المجال الخاص بك) ، يجب عليك إضافة عناوين IP التالية في سجل SPF الخاص بـ DNS لمجالك: <strong> %s </strong>.
-ActualMailSPFRecordFound=Actual SPF record found (for email %s) : %s
+ActualMailSPFRecordFound=تم العثور على سجل SPF الفعلي (للبريد الإلكتروني %s): %s
 ClickToShowDescription=انقر لإظهار الوصف
 DependsOn=تحتاج هذه الوحدة إلى الوحدة (الوحدات)
 RequiredBy=هذه الوحدة مطلوبة من قبل الوحدة (الوحدات)
@@ -714,6 +714,7 @@ Permission27=حذف مقترحات تجارية
 Permission28=الصادرات التجارية مقترحات
 Permission31=قراءة المنتجات
 Permission32=إنشاء / تعديل المنتجات
+Permission33=Read prices products
 Permission34=حذف المنتجات
 Permission36=انظر / إدارة المنتجات المخفية
 Permission38=منتجات التصدير
@@ -739,6 +740,7 @@ Permission79=إنشاء / تعديل والاشتراكات
 Permission81=قراءة أوامر العملاء
 Permission82=إنشاء / تعديل أوامر العملاء
 Permission84=صحة أوامر العملاء
+Permission85=إنشاء مستندات أوامر المبيعات
 Permission86=إرسال أوامر العملاء
 Permission87=وثيقة أوامر العملاء
 Permission88=إلغاء أوامر العملاء
@@ -874,6 +876,7 @@ Permission525=قرض الوصول آلة حاسبة
 Permission527=قروض التصدير
 Permission531=قراءة الخدمات
 Permission532=إنشاء / تعديل الخدمات
+Permission533=Read prices services
 Permission534=حذف خدمات
 Permission536=انظر / إدارة الخدمات الخفية
 Permission538=تصدير الخدمات
@@ -1129,7 +1132,7 @@ ValueOfConstantKey=قيمة ثابت التكوين
 ConstantIsOn=الخيار %s قيد التشغيل
 NbOfDays=لا أيام
 AtEndOfMonth=في نهاية الشهر
-CurrentNext=A given day in month
+CurrentNext=يوم معين في الشهر
 Offset=ويقابل
 AlwaysActive=حركة دائمة
 Upgrade=ترقية
@@ -1235,6 +1238,7 @@ BrowserName=اسم المتصفح
 BrowserOS=متصفح OS
 ListOfSecurityEvents=قائمة الأحداث الأمنية لدوليبار
 SecurityEventsPurged=تم إزالة الأحداث الأمنية
+TrackableSecurityEvents=Trackable security events
 LogEventDesc=تمكين التسجيل لأحداث أمنية محددة. تسجيل المسؤولين عبر القائمة <b> %s - %s </b>. تحذير ، يمكن لهذه الميزة إنشاء كمية كبيرة من البيانات في قاعدة البيانات.
 AreaForAdminOnly=يمكن تعيين معطيات الإعدادات بواسطة المستخدم المسؤول <b> </b> فقط.
 SystemInfoDesc=معلومات النظام هي معلومات فنية متنوعة تحصل عليها في وضع القراءة فقط وتكون مرئية للمسؤولين فقط.
@@ -1977,6 +1981,7 @@ MailToSendSupplierOrder=اوامر الشراء
 MailToSendSupplierInvoice=فواتير الموردين
 MailToSendContract=عقود
 MailToSendReception=حفلات الاستقبال
+MailToExpenseReport=تقارير المصاريف
 MailToThirdparty=أطراف ثالثة
 MailToMember=أعضاء
 MailToUser=المستخدمين
@@ -2030,6 +2035,7 @@ MAIN_PDF_MARGIN_RIGHT=الهامش الايمن لملفات صيغة المست
 MAIN_PDF_MARGIN_TOP=الهامش العلوي لصيغة المستندات المتنقلة
 MAIN_PDF_MARGIN_BOTTOM=الهامش العلوي لصيغة المستندات المتنقلة
 MAIN_DOCUMENTS_LOGO_HEIGHT=ارتفاع الشعار على صيغة المستندات المتنقلة
+DOC_SHOW_FIRST_SALES_REP=Show first sales representative
 MAIN_GENERATE_PROPOSALS_WITH_PICTURE=أضف عمودًا للصورة في سطور الاقتراح
 MAIN_DOCUMENTS_WITH_PICTURE_WIDTH=عرض العمود إذا تم إضافة صورة على الخطوط
 MAIN_PDF_NO_SENDER_FRAME=إخفاء الحدود في إطار عنوان المرسل
@@ -2063,6 +2069,12 @@ EmailCollectors=جامعي البريد الإلكتروني
 EmailCollectorDescription=أضف وظيفة مجدولة وصفحة إعداد لمسح صناديق البريد الإلكتروني بانتظام (باستخدام بروتوكول IMAP) وتسجيل رسائل البريد الإلكتروني المستلمة في التطبيق الخاص بك ، في المكان الصحيح و / أو إنشاء بعض السجلات تلقائيًا (مثل العملاء المتوقعين).
 NewEmailCollector=جامع البريد الإلكتروني الجديد
 EMailHost=مضيف خادم IMAP للبريد الإلكتروني
+EMailHostPort=منفذ خادم IMAP للبريد الإلكتروني
+loginPassword=Login/Password
+oauthToken=Oauth2 token
+accessType=Acces type
+oauthService=Oauth service
+TokenMustHaveBeenCreated=Module OAuth2 must be enabled and an oauth2 token must have been created with the correct permissions (for example scope "gmail_full" with OAuth for Gmail).
 MailboxSourceDirectory=دليل مصدر صندوق البريد
 MailboxTargetDirectory=دليل الهدف صندوق البريد
 EmailcollectorOperations=العمليات التي يقوم بها المجمع
@@ -2106,7 +2118,7 @@ CreateCandidature=إنشاء طلب وظيفة
 FormatZip=الرمز البريدي
 MainMenuCode=رمز دخول القائمة (mainmenu)
 ECMAutoTree=عرض شجرة ECM التلقائية
-OperationParamDesc=Define the rules to use to extract or set values.<br>Example for operations that need to extract a name from email subject:<br>name=EXTRACT:SUBJECT:Message from company ([^\n]*)<br>Example for operations that create objects:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value including value of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
+OperationParamDesc=Define the rules to use to extract some data or set values to use for operation.<br><br>Example to extract a company name from email subject into a temporary variable:<br>tmp_var=EXTRACT:SUBJECT:Message from company ([^\n]*)<br><br>Examples to set the properties of an object to create:<br>objproperty1=SET:a hard coded value<br>objproperty2=SET:__tmp_var__<br>objproperty3=SETIFEMPTY:a value (value is set only if property is not already defined)<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
 OpeningHours=ساعات الافتتاح
 OpeningHoursDesc=ادخل هنا ساعات الافتتاح لشركتك
 ResourceSetup=تكوين وحدة الموارد
@@ -2212,6 +2224,7 @@ NoExternalModuleWithUpdate=لم يتم العثور على تحديثات للو
 SwaggerDescriptionFile=ملف وصف Swagger API (للاستخدام مع redoc على سبيل المثال)
 YouEnableDeprecatedWSAPIsUseRESTAPIsInstead=لقد قمت بتمكين WS API الموقوف. يجب عليك استخدام REST API بدلاً من ذلك.
 RandomlySelectedIfSeveral=يتم اختياره عشوائيًا في حالة توفر عدة صور
+SalesRepresentativeInfo=For Proposals, Orders, Invoices.
 DatabasePasswordObfuscated=كلمة مرور قاعدة البيانات مشوشة في ملف conf
 DatabasePasswordNotObfuscated=لم يتم إخفاء كلمة مرور قاعدة البيانات في ملف conf
 APIsAreNotEnabled=لم يتم تمكين الوحدات النمطية لواجهات برمجة التطبيقات
@@ -2277,5 +2290,20 @@ INVOICE_ADD_ZATCA_QR_CODEMore=تحتاج بعض الدول العربية إلى
 INVOICE_ADD_SWISS_QR_CODE=أظهر رمز QR-Bill السويسري على الفواتير
 UrlSocialNetworksDesc=رابط URL للشبكة الاجتماعية. استخدم {socialid} للجزء المتغير الذي يحتوي على معرف الشبكة الاجتماعية.
 IfThisCategoryIsChildOfAnother=إذا كانت هذه الفئة تابعة لفئة أخرى
+DarkThemeMode=وضع المظهر الداكن
+AlwaysDisabled=دائما معطل
+AccordingToBrowser=حسب المتصفح
+AlwaysEnabled=ممكّن دائمًا
+DoesNotWorkWithAllThemes=لن تعمل مع جميع المواضيع
 NoName=بدون اسم
+ShowAdvancedOptions= عرض الخيارات المتقدمة
+HideAdvancedoptions= إخفاء الخيارات المتقدمة
 CIDLookupURL=تجلب الوحدة عنوان URL يمكن استخدامه بواسطة أداة خارجية للحصول على اسم طرف ثالث أو جهة اتصال من رقم هاتفه. URL المطلوب استخدامه هو:
+OauthNotAvailableForAllAndHadToBeCreatedBefore=مصادقة OAUTH2 غير متاحة لجميع المضيفين ، ويجب أن يكون قد تم إنشاء رمز مميز بالأذونات الصحيحة في المنبع باستخدام الوحدة النمطية OAUTH
+MAIN_MAIL_SMTPS_OAUTH_SERVICE=خدمة مصادقة OAUTH2
+DontForgetCreateTokenOauthMod=يجب إنشاء رمز مميز بالأذونات الصحيحة مع وحدة OAUTH النمطية
+MAIN_MAIL_SMTPS_AUTH_TYPE=طريقة المصادقة
+UsePassword=استخدم كلمة مرور
+UseOauth=استخدم رمز OAUTH
+Images=الصور
+MaxNumberOfImagesInGetPost=Max number of images allowed in a HTML field submitted in a form
diff --git a/htdocs/langs/ar_SA/agenda.lang b/htdocs/langs/ar_SA/agenda.lang
index 233df54d68a..9d44ff39b8d 100644
--- a/htdocs/langs/ar_SA/agenda.lang
+++ b/htdocs/langs/ar_SA/agenda.lang
@@ -57,6 +57,7 @@ MemberValidatedInDolibarr=العضو%s التأكد من صلاحيته
 MemberModifiedInDolibarr=العضو %sتم تعديلة
 MemberResiliatedInDolibarr=العضو %sتم إنهاؤه
 MemberDeletedInDolibarr=العضو %s تم حذفة
+MemberExcludedInDolibarr=تم استبعاد العضو %s
 MemberSubscriptionAddedInDolibarr=تمت إضافة اشتراك %s للعضو %s
 MemberSubscriptionModifiedInDolibarr=اشتراك %s للعضو %s معدّل
 MemberSubscriptionDeletedInDolibarr=تم حذف الاشتراك %s للعضو %s
@@ -159,6 +160,7 @@ DateActionBegin=تاريخ البدء الحدث
 ConfirmCloneEvent=هل انت متأكد انك ترغب في استنساخ الحدث <b>%s</b> ؟
 RepeatEvent=تكرار الحدث
 OnceOnly=مرة واحدة فقط
+EveryDay=كل يوم
 EveryWeek=كل اسبوع
 EveryMonth=كل شهر
 DayOfMonth=يوم من الشهر
@@ -174,3 +176,4 @@ AddReminder=إنشاء إشعار تذكير تلقائي لهذا الحدث
 ErrorReminderActionCommCreation=خطأ في إنشاء إشعار التذكير لهذا الحدث
 BrowserPush=إعلام المتصفح المنبثق
 ActiveByDefault=يتم التمكين افتراضيًا
+Until=حتى
diff --git a/htdocs/langs/bg_BG/admin.lang b/htdocs/langs/bg_BG/admin.lang
index 8272d0a8165..f5b3ddc3cbc 100644
--- a/htdocs/langs/bg_BG/admin.lang
+++ b/htdocs/langs/bg_BG/admin.lang
@@ -477,7 +477,7 @@ InstalledInto=Installed into directory %s
 BarcodeInitForThirdparties=Масова баркод инициализация за контрагенти
 BarcodeInitForProductsOrServices=Масово въвеждане на баркод или зануляване за продукти или услуги
 CurrentlyNWithoutBarCode=В момента имате <strong>%s</strong> записа на <strong>%s</strong> %s без дефиниран баркод.
-InitEmptyBarCode=Първоначална стойност за следващите %s празни записа
+InitEmptyBarCode=Init value for the %s empty barcodes
 EraseAllCurrentBarCode=Изтриване на всички текущи стойности на баркода
 ConfirmEraseAllCurrentBarCode=Сигурни ли сте че, искате да изтриете всички текущи стойности на баркода?
 AllBarcodeReset=Всички стойности на баркода са премахнати
@@ -714,6 +714,7 @@ Permission27=Изтриване на търговски предложения
 Permission28=Експортиране на търговски предложения
 Permission31=Преглед на продукти
 Permission32=Създаване / променяне на продукти
+Permission33=Read prices products
 Permission34=Изтриване на продукти
 Permission36=Преглед / управление на скрити продукти
 Permission38=Експортиране на продукти
@@ -739,6 +740,7 @@ Permission79=Създаване / променяне на абонаменти
 Permission81=Преглед на поръчки за продажба
 Permission82=Създаване / променяне на поръчки за продажба
 Permission84=Валидиране на поръчки за продажба
+Permission85=Generate the documents sales orders
 Permission86=Изпращане на поръчки за продажба
 Permission87=Приключване на поръчки за продажба
 Permission88=Анулиране на поръчки за продажба
@@ -874,6 +876,7 @@ Permission525=Достъп до кредитен калкулатор
 Permission527=Експортиране на кредити
 Permission531=Преглед на услуги
 Permission532=Създаване / променяне на услуги
+Permission533=Read prices services
 Permission534=Изтриване на услуги
 Permission536=Преглед / управление на скрити услуги
 Permission538=Експортиране на услуги
@@ -1235,6 +1238,7 @@ BrowserName=Име на браузър
 BrowserOS=ОС на браузър
 ListOfSecurityEvents=Списък на събития относно сигурността в Dolibarr
 SecurityEventsPurged=Събитията относно сигурността са премахнати
+TrackableSecurityEvents=Trackable security events
 LogEventDesc=Активиране на регистрирането за конкретни събития за сигурност. Администриране на записаните събития, чрез меню <b>%s - %s</b>. Внимание, тази функция може да генерира голямо количество данни в базата данни.
 AreaForAdminOnly=Параметрите за настройка могат да се задават само от <b>Администратори</b>.
 SystemInfoDesc=Системната информация е различна техническа информация, която получавате в режим само за четене и е видима само за администратори.
@@ -1977,6 +1981,7 @@ MailToSendSupplierOrder=Поръчки за покупка
 MailToSendSupplierInvoice=Фактури за доставка
 MailToSendContract=Договори
 MailToSendReception=Стокови разписки
+MailToExpenseReport=Разходни отчети
 MailToThirdparty=Контрагенти
 MailToMember=Членове
 MailToUser=Потребители
@@ -2030,6 +2035,7 @@ MAIN_PDF_MARGIN_RIGHT=Дясна граница в PDF
 MAIN_PDF_MARGIN_TOP=Горна граница в PDF
 MAIN_PDF_MARGIN_BOTTOM=Долна граница в PDF
 MAIN_DOCUMENTS_LOGO_HEIGHT=Height for logo on PDF
+DOC_SHOW_FIRST_SALES_REP=Show first sales representative
 MAIN_GENERATE_PROPOSALS_WITH_PICTURE=Add column for picture on proposal lines
 MAIN_DOCUMENTS_WITH_PICTURE_WIDTH=Width of the column if a picture is added on lines
 MAIN_PDF_NO_SENDER_FRAME=Hide borders on sender address frame
@@ -2063,6 +2069,12 @@ EmailCollectors=Email collectors
 EmailCollectorDescription=Добавете планирана задача в страницата за настройка, за да сканирате редовно пощенските кутии (използвайки протокола IMAP) и да записвате получените в приложението имейли на правилното място и / или да създавате автоматично някои записи (например нови възможности).
 NewEmailCollector=Нов колекционер на имейли
 EMailHost=Адрес на IMAP сървър
+EMailHostPort=Port of email IMAP server
+loginPassword=Login/Password
+oauthToken=Oauth2 token
+accessType=Acces type
+oauthService=Oauth service
+TokenMustHaveBeenCreated=Module OAuth2 must be enabled and an oauth2 token must have been created with the correct permissions (for example scope "gmail_full" with OAuth for Gmail).
 MailboxSourceDirectory=Директория / Източник в пощенската кутия
 MailboxTargetDirectory=Директория / Цел в пощенската кутия
 EmailcollectorOperations=Операции за извършване от колекционера
@@ -2106,7 +2118,7 @@ CreateCandidature=Create job application
 FormatZip=Zip
 MainMenuCode=Код на меню (главно меню)
 ECMAutoTree=Показване на автоматично ECM дърво
-OperationParamDesc=Define the rules to use to extract or set values.<br>Example for operations that need to extract a name from email subject:<br>name=EXTRACT:SUBJECT:Message from company ([^\n]*)<br>Example for operations that create objects:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value including value of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
+OperationParamDesc=Define the rules to use to extract some data or set values to use for operation.<br><br>Example to extract a company name from email subject into a temporary variable:<br>tmp_var=EXTRACT:SUBJECT:Message from company ([^\n]*)<br><br>Examples to set the properties of an object to create:<br>objproperty1=SET:a hard coded value<br>objproperty2=SET:__tmp_var__<br>objproperty3=SETIFEMPTY:a value (value is set only if property is not already defined)<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
 OpeningHours=Работно време
 OpeningHoursDesc=Въведете тук редовното работно време на вашата фирма.
 ResourceSetup=Конфигурация на модул Ресурси
@@ -2212,6 +2224,7 @@ NoExternalModuleWithUpdate=No updates found for external modules
 SwaggerDescriptionFile=Swagger API description file (for use with redoc for example)
 YouEnableDeprecatedWSAPIsUseRESTAPIsInstead=You enabled deprecated WS API. You should use REST API instead.
 RandomlySelectedIfSeveral=Randomly selected if several pictures are available
+SalesRepresentativeInfo=For Proposals, Orders, Invoices.
 DatabasePasswordObfuscated=Database password is obfuscated in conf file
 DatabasePasswordNotObfuscated=Database password is NOT obfuscated in conf file
 APIsAreNotEnabled=APIs modules are not enabled
@@ -2277,5 +2290,20 @@ INVOICE_ADD_ZATCA_QR_CODEMore=Some Arabic countries need this QR Code on their i
 INVOICE_ADD_SWISS_QR_CODE=Show the swiss QR-Bill code on invoices
 UrlSocialNetworksDesc=Url link of social network. Use {socialid} for the variable part that contains the social network ID.
 IfThisCategoryIsChildOfAnother=If this category is a child of another one
+DarkThemeMode=Dark theme mode
+AlwaysDisabled=Always disabled
+AccordingToBrowser=According to browser
+AlwaysEnabled=Always Enabled
+DoesNotWorkWithAllThemes=Will not work with all themes
 NoName=No name
+ShowAdvancedOptions= Show advanced options
+HideAdvancedoptions= Hide advanced options
 CIDLookupURL=The module brings an URL that can be used by an external tool to get the name of a thirdparty or contact from its phone number. URL to use is:
+OauthNotAvailableForAllAndHadToBeCreatedBefore=OAUTH2 authentication is not available for all hosts, and a token with the right permissions must have been created upstream with the OAUTH module
+MAIN_MAIL_SMTPS_OAUTH_SERVICE=OAUTH2 authentication service
+DontForgetCreateTokenOauthMod=A token with the right permissions must have been created upstream with the OAUTH module
+MAIN_MAIL_SMTPS_AUTH_TYPE=Authentification method
+UsePassword=Use a password
+UseOauth=Use a OAUTH token
+Images=Images
+MaxNumberOfImagesInGetPost=Max number of images allowed in a HTML field submitted in a form
diff --git a/htdocs/langs/bs_BA/admin.lang b/htdocs/langs/bs_BA/admin.lang
index 2ce6165e282..b1a8291b68d 100644
--- a/htdocs/langs/bs_BA/admin.lang
+++ b/htdocs/langs/bs_BA/admin.lang
@@ -109,7 +109,7 @@ NextValueForReplacements=Slijedeća vrijednost (zamjene)
 MustBeLowerThanPHPLimit=Note: your PHP configuration currently limits the maximum filesize for upload to <b>%s</b> %s, irrespective of the value of this parameter
 NoMaxSizeByPHPLimit=Note: No limit is set in your PHP configuration
 MaxSizeForUploadedFiles=Maximum size for uploaded files (0 to disallow any upload)
-UseCaptchaCode=Use graphical code (CAPTCHA) on login page
+UseCaptchaCode=Use graphical code (CAPTCHA) on login page and some public pages
 AntiVirusCommand=Full path to antivirus command
 AntiVirusCommandExample=Example for ClamAv Daemon (require clamav-daemon): /usr/bin/clamdscan<br>Example for ClamWin (very very slow): c:\\Progra~1\\ClamWin\\bin\\clamscan.exe
 AntiVirusParam= Više parametara preko komandne linije
@@ -477,7 +477,7 @@ InstalledInto=Installed into directory %s
 BarcodeInitForThirdparties=Mass barcode init for third-parties
 BarcodeInitForProductsOrServices=Mass barcode init or reset for products or services
 CurrentlyNWithoutBarCode=Currently, you have <strong>%s</strong> record on <strong>%s</strong> %s without barcode defined.
-InitEmptyBarCode=Init value for next %s empty records
+InitEmptyBarCode=Init value for the %s empty barcodes
 EraseAllCurrentBarCode=Erase all current barcode values
 ConfirmEraseAllCurrentBarCode=Are you sure you want to erase all current barcode values?
 AllBarcodeReset=All barcode values have been removed
@@ -504,7 +504,7 @@ WarningPHPMailC=- Using the SMTP server of your own Email Service Provider to se
 WarningPHPMailD=Also, it is therefore recommended to change the sending method of e-mails to the value "SMTP". If you really want to keep the default "PHP" method to send emails, just ignore this warning, or remove it by setting the MAIN_HIDE_WARNING_TO_ENCOURAGE_SMTP_SETUP constant to 1 in Home - Setup - Other.
 WarningPHPMail2=If your email SMTP provider need to restrict email client to some IP addresses (very rare), this is the IP address of the mail user agent (MUA) for your ERP CRM application: <strong>%s</strong>.
 WarningPHPMailSPF=If the domain name in your sender email address is protected by a SPF record (ask your domain name registar), you must add the following IPs in the SPF record of the DNS of your domain: <strong>%s</strong>.
-ActualMailSPFRecordFound=Actual SPF record found : %s
+ActualMailSPFRecordFound=Actual SPF record found (for email %s) : %s
 ClickToShowDescription=Click to show description
 DependsOn=This module needs the module(s)
 RequiredBy=This module is required by module(s)
@@ -714,13 +714,14 @@ Permission27=Delete commercial proposals
 Permission28=Export commercial proposals
 Permission31=Read products
 Permission32=Create/modify products
+Permission33=Read prices products
 Permission34=Delete products
 Permission36=See/manage hidden products
 Permission38=Export products
 Permission39=Ignore minimum price
-Permission41=Read projects and tasks (shared project and projects I'm contact for). Can also enter time consumed, for me or my hierarchy, on assigned tasks (Timesheet)
-Permission42=Create/modify projects (shared project and projects I'm contact for). Can also create tasks and assign users to project and tasks
-Permission44=Delete projects (shared project and projects I'm contact for)
+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=Delete projects (shared projects and projects of which I am a contact)
 Permission45=Export projects
 Permission61=Read interventions
 Permission62=Create/modify interventions
@@ -739,6 +740,7 @@ Permission79=Create/modify subscriptions
 Permission81=Read customers orders
 Permission82=Create/modify customers orders
 Permission84=Validate customers orders
+Permission85=Generate the documents sales orders
 Permission86=Send customers orders
 Permission87=Close customers orders
 Permission88=Cancel customers orders
@@ -766,9 +768,10 @@ Permission122=Kreiranje/mijenjati trećih strana vezanih sa korisnika
 Permission125=Brisanje trećih stranaka vezanih za korisnika
 Permission126=Izvoz trećih stranaka
 Permission130=Create/modify third parties payment information
-Permission141=Read all projects and tasks (also private projects for which I am not a contact)
-Permission142=Create/modify all projects and tasks (also private projects for which I am not a contact)
-Permission144=Delete all projects and tasks (also private projects i am not contact for)
+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)
 Permission146=Read providers
 Permission147=Read stats
 Permission151=Read direct debit payment orders
@@ -873,6 +876,7 @@ Permission525=Access loan calculator
 Permission527=Export loans
 Permission531=Read services
 Permission532=Create/modify services
+Permission533=Read prices services
 Permission534=Delete services
 Permission536=See/manage hidden services
 Permission538=Export services
@@ -883,6 +887,9 @@ Permission564=Record Debits/Rejections of credit transfer
 Permission601=Read stickers
 Permission602=Create/modify stickers
 Permission609=Delete stickers
+Permission611=Read attributes of variants
+Permission612=Create/Update attributes of variants
+Permission613=Delete attributes of variants
 Permission650=Read Bills of Materials
 Permission651=Create/Update Bills of Materials
 Permission652=Delete Bills of Materials
@@ -969,6 +976,8 @@ Permission4021=Create/modify your evaluation
 Permission4022=Validate evaluation
 Permission4023=Delete evaluation
 Permission4030=See comparison menu
+Permission4031=Read personal information
+Permission4032=Write personal information
 Permission10001=Read website content
 Permission10002=Create/modify website content (html and javascript content)
 Permission10003=Create/modify website content (dynamic php code). Dangerous, must be reserved to restricted developers.
@@ -1068,6 +1077,7 @@ DictionaryExpenseTaxCat=Expense report - Transportation categories
 DictionaryExpenseTaxRange=Expense report - Range by transportation category
 DictionaryTransportMode=Intracomm report - Transport mode
 DictionaryBatchStatus=Product lot/serial Quality Control status
+DictionaryAssetDisposalType=Type of disposal of assets
 TypeOfUnit=Type of unit
 SetupSaved=Postavke snimljene
 SetupNotSaved=Setup not saved
@@ -1122,7 +1132,7 @@ ValueOfConstantKey=Value of a configuration constant
 ConstantIsOn=Option %s is on
 NbOfDays=No. of days
 AtEndOfMonth=At end of month
-CurrentNext=Current/Next
+CurrentNext=A given day in month
 Offset=Offset
 AlwaysActive=Always active
 Upgrade=Upgrade
@@ -1187,7 +1197,7 @@ BankModuleNotActive=Bank accounts module not enabled
 ShowBugTrackLink=Show the link "<strong>%s</strong>"
 ShowBugTrackLinkDesc=Keep empty to not display this link, use value 'github' for the link to the Dolibarr project or define directly an url 'https://...'
 Alerts=Upozorenja
-DelaysOfToleranceBeforeWarning=Delay before displaying a warning alert for:
+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=Project not closed in time
@@ -1228,6 +1238,7 @@ BrowserName=Browser name
 BrowserOS=Browser OS
 ListOfSecurityEvents=List of Dolibarr security events
 SecurityEventsPurged=Security events purged
+TrackableSecurityEvents=Trackable security events
 LogEventDesc=Enable logging for specific security events. Administrators the log via menu <b>%s - %s</b>. Warning, this feature can generate a large amount of data in the database.
 AreaForAdminOnly=Setup parameters can be set by <b>administrator users</b> only.
 SystemInfoDesc=System information is miscellaneous technical information you get in read only mode and visible for administrators only.
@@ -1339,6 +1350,7 @@ TransKeyWithoutOriginalValue=You forced a new translation for the translation ke
 TitleNumberOfActivatedModules=Activated modules
 TotalNumberOfActivatedModules=Activated modules: <b>%s</b> / <b>%s</b>
 YouMustEnableOneModule=You must at least enable 1 module
+YouMustEnableTranslationOverwriteBefore=You must first enable translation overwriting to be allowed to replace a translation
 ClassNotFoundIntoPathWarning=Class %s not found in PHP path
 YesInSummer=Yes in summer
 OnlyFollowingModulesAreOpenedToExternalUsers=Note, only the following modules are available to external users (irrespective of the permissions of such users) and only if permissions are granted:<br>
@@ -1420,6 +1432,8 @@ WatermarkOnDraftInvoices=Vodeni žig na nacrte faktura (ništa, ako je prazno)
 PaymentsNumberingModule=Payments numbering model
 SuppliersPayment=Vendor payments
 SupplierPaymentSetup=Vendor payments setup
+InvoiceCheckPosteriorDate=Check facture date before validation
+InvoiceCheckPosteriorDateHelp=Validating an invoice will be forbidden if its date is anterior to the date of last invoice of same type.
 ##### Proposals #####
 PropalSetup=Commercial proposals module setup
 ProposalsNumberingModules=Commercial proposal numbering models
@@ -1917,6 +1931,7 @@ ConfFileMustContainCustom=Installing or building an external module from applica
 HighlightLinesOnMouseHover=Highlight table lines when mouse move passes over
 HighlightLinesColor=Highlight color of the line when the mouse passes over (use 'ffffff' for no highlight)
 HighlightLinesChecked=Highlight color of the line when it is checked (use 'ffffff' for no highlight)
+UseBorderOnTable=Show left-right borders on tables
 BtnActionColor=Color of the action button
 TextBtnActionColor=Text color of the action button
 TextTitleColor=Text color of Page title
@@ -1925,7 +1940,7 @@ PressF5AfterChangingThis=Press CTRL+F5 on keyboard or clear your browser cache a
 NotSupportedByAllThemes=Will works with core themes, may not be supported by external themes
 BackgroundColor=Background color
 TopMenuBackgroundColor=Background color for Top menu
-TopMenuDisableImages=Hide images in Top menu
+TopMenuDisableImages=Icon or Text in Top menu
 LeftMenuBackgroundColor=Background color for Left menu
 BackgroundTableTitleColor=Background color for Table title line
 BackgroundTableTitleTextColor=Text color for Table title line
@@ -1938,7 +1953,7 @@ EnterAnyCode=This field contains a reference to identify the line. Enter any val
 Enter0or1=Enter 0 or 1
 UnicodeCurrency=Enter here between braces, list of byte number that represent the currency symbol. For example: for $, enter [36] - for brazil real R$ [82,36] - for €, enter [8364]
 ColorFormat=The RGB color is in HEX format, eg: FF0000
-PictoHelp=Icon name in dolibarr format ('image.png' if into the current theme directory, 'image.png@nom_du_module' if into the directory /img/ of a module)
+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>- fonwtawesome_xxx_fa_color_size for a FontAwesome fa-xxx picto (with prefix, color and size set)
 PositionIntoComboList=Position of line into combo lists
 SellTaxRate=Sales tax rate
 RecuperableOnly=Yes for VAT "Not Perceived but Recoverable" dedicated for some state in France. Keep value to "No" in all other cases.
@@ -1966,6 +1981,7 @@ MailToSendSupplierOrder=Narudžbe za nabavku
 MailToSendSupplierInvoice=Fakture prodavača
 MailToSendContract=Ugovori
 MailToSendReception=Receptions
+MailToExpenseReport=Izvještaj o troškovima
 MailToThirdparty=Subjekti
 MailToMember=Članovi
 MailToUser=Korisnici
@@ -2019,6 +2035,7 @@ MAIN_PDF_MARGIN_RIGHT=Right margin on PDF
 MAIN_PDF_MARGIN_TOP=Top margin on PDF
 MAIN_PDF_MARGIN_BOTTOM=Bottom margin on PDF
 MAIN_DOCUMENTS_LOGO_HEIGHT=Height for logo on PDF
+DOC_SHOW_FIRST_SALES_REP=Show first sales representative
 MAIN_GENERATE_PROPOSALS_WITH_PICTURE=Add column for picture on proposal lines
 MAIN_DOCUMENTS_WITH_PICTURE_WIDTH=Width of the column if a picture is added on lines
 MAIN_PDF_NO_SENDER_FRAME=Hide borders on sender address frame
@@ -2037,7 +2054,7 @@ COMPANY_AQUARIUM_CLEAN_REGEX=Regex filter to clean value (COMPANY_AQUARIUM_CLEAN
 COMPANY_DIGITARIA_CLEAN_REGEX=Regex filter to clean value (COMPANY_DIGITARIA_CLEAN_REGEX)
 COMPANY_DIGITARIA_UNIQUE_CODE=Duplicate not allowed
 GDPRContact=Data Protection Officer (DPO, Data Privacy or GDPR contact)
-GDPRContactDesc=If you store data about European companies/citizens, you can name the contact who is responsible for the General Data Protection Regulation here
+GDPRContactDesc=If you store personal data in your Information System, you can name the contact who is responsible for the General Data Protection Regulation here
 HelpOnTooltip=Help text to show on tooltip
 HelpOnTooltipDesc=Put text or a translation key here for the text to show in a tooltip when this field appears in a form
 YouCanDeleteFileOnServerWith=You can delete this file on the server with Command Line:<br>%s
@@ -2048,27 +2065,46 @@ VATIsUsedIsOff=Note: The option to use Sales Tax or VAT has been set to <strong>
 SwapSenderAndRecipientOnPDF=Swap sender and recipient address position on PDF documents
 FeatureSupportedOnTextFieldsOnly=Warning, feature supported on text fields and combo lists only. Also an URL parameter action=create or action=edit must be set OR page name must end with 'new.php' to trigger this feature.
 EmailCollector=Email collector
+EmailCollectors=Email collectors
 EmailCollectorDescription=Add a scheduled job and a setup page to scan regularly email boxes (using IMAP protocol) and record emails received into your application, at the right place and/or create some records automatically (like leads).
 NewEmailCollector=New Email Collector
 EMailHost=Host of email IMAP server
+EMailHostPort=Port of email IMAP server
+loginPassword=Login/Password
+oauthToken=Oauth2 token
+accessType=Acces type
+oauthService=Oauth service
+TokenMustHaveBeenCreated=Module OAuth2 must be enabled and an oauth2 token must have been created with the correct permissions (for example scope "gmail_full" with OAuth for Gmail).
 MailboxSourceDirectory=Mailbox source directory
 MailboxTargetDirectory=Mailbox target directory
 EmailcollectorOperations=Operations to do by collector
 EmailcollectorOperationsDesc=Operations are executed from top to bottom order
 MaxEmailCollectPerCollect=Max number of emails collected per collect
 CollectNow=Collect now
-ConfirmCloneEmailCollector=Are you sure you want to clone the Email collector %s ?
+ConfirmCloneEmailCollector=Are you sure you want to clone the Email collector %s?
 DateLastCollectResult=Date of latest collect try
 DateLastcollectResultOk=Date of latest collect success
 LastResult=Latest result
+EmailCollectorHideMailHeaders=Do not include the content of email header into the saved content of collected e-mails
+EmailCollectorHideMailHeadersHelp=When enabled, e-mail headers are not added at the end of the email content that is saved as an agenda event.
 EmailCollectorConfirmCollectTitle=Email collect confirmation
-EmailCollectorConfirmCollect=Do you want to run the collection for this collector now ?
+EmailCollectorConfirmCollect=Do you want to run this collector now?
+EmailCollectorExampleToCollectTicketRequestsDesc=Collect emails that match some rules and create automatically a ticket (Module Ticket must be enabled) with the email informations. You can use this collector if you provide some support by email, so your ticket request will be automatically generated. Activate also Collect_Responses to collect answers of your client directly on the ticket view (you must reply from Dolibarr).
+EmailCollectorExampleToCollectTicketRequests=Example collecting the ticket request (first message only)
+EmailCollectorExampleToCollectAnswersFromExternalEmailSoftwareDesc=Scan your mailbox "Sent" directory to find emails that was sent as an answer of another email directly from your email software and not from Dolibarr. If such an email is found, the event of answer is recorded into Dolibarr
+EmailCollectorExampleToCollectAnswersFromExternalEmailSoftware=Example collecting e-mail answers sent from an external e-mail software
+EmailCollectorExampleToCollectDolibarrAnswersDesc=Collect all emails that are an answer of an email sent from your application. An event (Module Agenda must be enabled) with the email response will be recorded at the good place. For example, if you send a commercial proposal, order, invoice or message for a ticket by email from the application, and the recipient answers your email, the system will automatically catch the answer and add it into your ERP.
+EmailCollectorExampleToCollectDolibarrAnswers=Example collecting all ingoing messages being answers to messages sent from Dolibarr'
+EmailCollectorExampleToCollectLeadsDesc=Collect emails that match some rules and create automatically a lead (Module Project must be enabled) with the email informations. 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 thirdparty can't be found in database (new customer), the lead will be attached to the thirdparty with ID 1.
+EmailCollectorExampleToCollectLeads=Example collecting leads
+EmailCollectorExampleToCollectJobCandidaturesDesc=Collect emails applying to job offers (Module Recruitment must be enabled). You can complete this collector if you want to automatically create a candidature for a job request. Note: With this initial example, the title of the candidature is generated including the email.
+EmailCollectorExampleToCollectJobCandidatures=Example collecting job candidatures received by e-mail
 NoNewEmailToProcess=No new email (matching filters) to process
 NothingProcessed=Nothing done
-XEmailsDoneYActionsDone=%s emails qualified, %s emails successfully processed (for %s record/actions done)
+XEmailsDoneYActionsDone=%s emails pre-qualified, %s emails successfully processed (for %s record/actions done)
 RecordEvent=Record an event in agenda (with type Email sent or received)
 CreateLeadAndThirdParty=Create a lead (and a third party if necessary)
-CreateTicketAndThirdParty=Create a ticket (linked to a third party if the third party was loaded by a previous operation, with no third party otherwise)
+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=Latest result code
 NbOfEmailsInInbox=Number of emails in source directory
 LoadThirdPartyFromName=Load third party searching on %s (load only)
@@ -2082,14 +2118,14 @@ CreateCandidature=Create job application
 FormatZip=Zip
 MainMenuCode=Menu entry code (mainmenu)
 ECMAutoTree=Show automatic ECM tree
-OperationParamDesc=Define the rules to use to extract or set values.<br>Example for operations that need to extract a name from email subject:<br>name=EXTRACT:SUBJECT:Message from company ([^\n]*)<br>Example for operations that create objects:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value including value of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
+OperationParamDesc=Define the rules to use to extract some data or set values to use for operation.<br><br>Example to extract a company name from email subject into a temporary variable:<br>tmp_var=EXTRACT:SUBJECT:Message from company ([^\n]*)<br><br>Examples to set the properties of an object to create:<br>objproperty1=SET:a hard coded value<br>objproperty2=SET:__tmp_var__<br>objproperty3=SETIFEMPTY:a value (value is set only if property is not already defined)<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
 OpeningHours=Opening hours
 OpeningHoursDesc=Enter here the regular opening hours of your company.
 ResourceSetup=Configuration of Resource module
 UseSearchToSelectResource=Use a search form to choose a resource (rather than a drop-down list).
 DisabledResourceLinkUser=Disable feature to link a resource to users
 DisabledResourceLinkContact=Disable feature to link a resource to contacts
-EnableResourceUsedInEventCheck=Enable feature to check if a resource is in use in an event
+EnableResourceUsedInEventCheck=Prohibit the use of the same resource at the same time in the agenda
 ConfirmUnactivation=Confirm module reset
 OnMobileOnly=On small screen (smartphone) only
 DisableProspectCustomerType=Disable the "Prospect + Customer" third party type (so third party must be "Prospect" or "Customer", but can't be both)
@@ -2134,7 +2170,7 @@ DeleteEmailCollector=Delete email collector
 ConfirmDeleteEmailCollector=Are you sure you want to delete this email collector?
 RecipientEmailsWillBeReplacedWithThisValue=Recipient emails will be always replaced with this value
 AtLeastOneDefaultBankAccountMandatory=At least 1 default bank account must be defined
-RESTRICT_ON_IP=Allow access to some host IP only (wildcard not allowed, use space between values). Empty means every hosts can access.
+RESTRICT_ON_IP=Allow API access to only certain client IPs (wildcard not allowed, use space between values). Empty means every clients can access.
 IPListExample=127.0.0.1 192.168.0.2 [::1]
 BaseOnSabeDavVersion=Based on the library SabreDAV version
 NotAPublicIp=Not a public IP
@@ -2144,6 +2180,9 @@ EmailTemplate=Template for email
 EMailsWillHaveMessageID=Emails will have a tag 'References' matching this syntax
 PDF_SHOW_PROJECT=Show project on document
 ShowProjectLabel=Project Label
+PDF_INCLUDE_ALIAS_IN_THIRDPARTY_NAME=Include alias in thirdparty name
+THIRDPARTY_ALIAS=Name thirdparty - Alias thirdparty
+ALIAS_THIRDPARTY=Alias thirdparty - Name thirdparty
 PDF_USE_ALSO_LANGUAGE_CODE=If you want to have some texts in your PDF duplicated in 2 different languages in the same generated PDF, you must set here this second language so generated PDF will contains 2 different languages in same page, the one chosen when generating PDF and this one (only few PDF templates support this). Keep empty for 1 language per PDF.
 PDF_USE_A=Gererate PDF documents with format PDF/A instead of defaut format PDF
 FafaIconSocialNetworksDesc=Enter here the code of a FontAwesome icon. If you don't know what is FontAwesome, you can use the generic value fa-address-book.
@@ -2185,6 +2224,7 @@ NoExternalModuleWithUpdate=No updates found for external modules
 SwaggerDescriptionFile=Swagger API description file (for use with redoc for example)
 YouEnableDeprecatedWSAPIsUseRESTAPIsInstead=You enabled deprecated WS API. You should use REST API instead.
 RandomlySelectedIfSeveral=Randomly selected if several pictures are available
+SalesRepresentativeInfo=For Proposals, Orders, Invoices.
 DatabasePasswordObfuscated=Database password is obfuscated in conf file
 DatabasePasswordNotObfuscated=Database password is NOT obfuscated in conf file
 APIsAreNotEnabled=APIs modules are not enabled
@@ -2206,12 +2246,12 @@ DashboardDisableBlockAdherent=Disable the thumb for memberships
 DashboardDisableBlockExpenseReport=Disable the thumb for expense reports
 DashboardDisableBlockHoliday=Disable the thumb for leaves
 EnabledCondition=Condition to have field enabled (if not enabled, visibility will always be off)
-IfYouUseASecondTaxYouMustSetYouUseTheMainTax=If you want to use a second tax, you must enable also the first sale tax
-IfYouUseAThirdTaxYouMustSetYouUseTheMainTax=If you want to use a third tax, you must enable also the first sale tax
+IfYouUseASecondTaxYouMustSetYouUseTheMainTax=If you want to use a second tax, you must enable also the first sales tax
+IfYouUseAThirdTaxYouMustSetYouUseTheMainTax=If you want to use a third tax, you must enable also the first sales tax
 LanguageAndPresentation=Language and presentation
 SkinAndColors=Skin and colors
-IfYouUseASecondTaxYouMustSetYouUseTheMainTax=If you want to use a second tax, you must enable also the first sale tax
-IfYouUseAThirdTaxYouMustSetYouUseTheMainTax=If you want to use a third tax, you must enable also the first sale tax
+IfYouUseASecondTaxYouMustSetYouUseTheMainTax=If you want to use a second tax, you must enable also the first sales tax
+IfYouUseAThirdTaxYouMustSetYouUseTheMainTax=If you want to use a third tax, you must enable also the first sales tax
 PDF_USE_1A=Generate PDF with PDF/A-1b format
 MissingTranslationForConfKey = Missing translation for %s
 NativeModules=Native modules
@@ -2220,3 +2260,50 @@ API_DISABLE_COMPRESSION=Disable compression of API responses
 EachTerminalHasItsOwnCounter=Each terminal use its own counter.
 FillAndSaveAccountIdAndSecret=Fill and save account ID and secret first
 PreviousHash=Previous hash
+LateWarningAfter="Late" warning after
+TemplateforBusinessCards=Template for a business card in different size
+InventorySetup= Inventory Setup
+ExportUseLowMemoryMode=Use a low memory mode
+ExportUseLowMemoryModeHelp=Use the low memory mode to execute the exec of the dump (compression is done through a pipe instead of into the PHP memory). This method does not allow to check that file is completed and error message can't be reported if it fails.
+
+ModuleWebhookName = Webhook
+ModuleWebhookDesc = Interface to catch dolibarr triggers and send it to an URL
+WebhookSetup = Webhook setup
+Settings = Settings
+WebhookSetupPage = Webhook setup page
+ShowQuickAddLink=Show a button to quickly add an element in top right menu
+
+HashForPing=Hash used for ping
+ReadOnlyMode=Is instance in "Read Only" mode
+DEBUGBAR_USE_LOG_FILE=Use the <b>dolibarr.log</b> file to trap Logs
+UsingLogFileShowAllRecordOfSubrequestButIsSlower=Use the dolibarr.log file to trap Logs instead of live memory catching. It allows to catch all logs instead of only log of current process (so including the one of ajax subrequests pages) but will make your instance very very slow. Not recommended.
+FixedOrPercent=Fixed (use keyword 'fixed') or percent (use keyword 'percent')
+DefaultOpportunityStatus=Default opportunity status (first status when lead is created)
+
+IconAndText=Icon and text
+TextOnly=Text only
+IconOnlyAllTextsOnHover=Icon only - All texts appears under icon on mouse hover menu bar
+IconOnlyTextOnHover=Icon only - Text of icon appears under icon on mouse hover the icon
+IconOnly=Icon only - Text on tooltip only
+INVOICE_ADD_ZATCA_QR_CODE=Show the ZATCA QR code on invoices
+INVOICE_ADD_ZATCA_QR_CODEMore=Some Arabic countries need this QR Code on their invoices
+INVOICE_ADD_SWISS_QR_CODE=Show the swiss QR-Bill code on invoices
+UrlSocialNetworksDesc=Url link of social network. Use {socialid} for the variable part that contains the social network ID.
+IfThisCategoryIsChildOfAnother=If this category is a child of another one
+DarkThemeMode=Dark theme mode
+AlwaysDisabled=Always disabled
+AccordingToBrowser=According to browser
+AlwaysEnabled=Always Enabled
+DoesNotWorkWithAllThemes=Will not work with all themes
+NoName=No name
+ShowAdvancedOptions= Show advanced options
+HideAdvancedoptions= Hide advanced options
+CIDLookupURL=The module brings an URL that can be used by an external tool to get the name of a thirdparty or contact from its phone number. URL to use is:
+OauthNotAvailableForAllAndHadToBeCreatedBefore=OAUTH2 authentication is not available for all hosts, and a token with the right permissions must have been created upstream with the OAUTH module
+MAIN_MAIL_SMTPS_OAUTH_SERVICE=OAUTH2 authentication service
+DontForgetCreateTokenOauthMod=A token with the right permissions must have been created upstream with the OAUTH module
+MAIN_MAIL_SMTPS_AUTH_TYPE=Authentification method
+UsePassword=Use a password
+UseOauth=Use a OAUTH token
+Images=Images
+MaxNumberOfImagesInGetPost=Max number of images allowed in a HTML field submitted in a form
diff --git a/htdocs/langs/ca_ES/accountancy.lang b/htdocs/langs/ca_ES/accountancy.lang
index 006583d8ec0..e640d6fe233 100644
--- a/htdocs/langs/ca_ES/accountancy.lang
+++ b/htdocs/langs/ca_ES/accountancy.lang
@@ -48,8 +48,9 @@ CountriesNotInEEC=Països no integrats a la CEE
 CountriesInEECExceptMe=Països a la CEE excepte %s
 CountriesExceptMe=Tots els països, excepte %s
 AccountantFiles=Exporta documents d'origen
-ExportAccountingSourceDocHelp=Amb aquesta eina, podeu exportar els esdeveniments d'origen (llista en CSV i PDF) que s'utilitzen per a generar la vostra comptabilitat.
+ExportAccountingSourceDocHelp=Amb aquesta eina, podeu cercar i exportar els esdeveniments d'origen que s'utilitzen per a generar la vostra comptabilitat. <br> El fitxer ZIP exportat contindrà les llistes dels elements sol·licitats en CSV, així com els seus fitxers adjunts en el seu format original (PDF, ODT, DOCX...).
 ExportAccountingSourceDocHelp2=Per a exportar els vostres diaris, utilitzeu l'entrada de menú %s - %s.
+ExportAccountingProjectHelp=Especifiqueu un projecte si només necessiteu un informe comptable per a un projecte concret. Els informes de despeses i els pagaments del préstec no s'inclouen als informes del projecte.
 VueByAccountAccounting=Visualització per compte comptable
 VueBySubAccountAccounting=Visualització per subcompte comptable
 
@@ -61,9 +62,9 @@ MainAccountForSubscriptionPaymentNotDefined=Compte comptable per a IVA no defini
 
 AccountancyArea=Àrea de comptabilitat
 AccountancyAreaDescIntro=L'ús del mòdul de comptabilitat es realitza en diverses etapes:
-AccountancyAreaDescActionOnce=Les següents accions s'executen normalment per una sola vegada, o un cop l'any ...
+AccountancyAreaDescActionOnce=Les accions següents s'executen normalment una sola vegada o una vegada a l'any...
 AccountancyAreaDescActionOnceBis=Cal fer els passos següents per a estalviar-vos temps en el futur suggerint-vos automàticament el compte comptable predeterminat correcte quan transferiu dades a la comptabilitat
-AccountancyAreaDescActionFreq=Les següents accions s'executen normalment cada mes, setmana o dia per empreses molt grans ...
+AccountancyAreaDescActionFreq=Les accions següents s'executen normalment cada mes, setmana o dia per empreses molt grans...
 
 AccountancyAreaDescJournalSetup=PAS %s: comproveu el contingut de la vostra llista de diari des del menú %s
 AccountancyAreaDescChartModel=PAS %s: Comproveu que existeix un model de pla comptable o creeu-ne un des del menú %s
@@ -183,6 +184,8 @@ ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT=Compte comptable per a registrar les don
 
 ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT=Compte comptable per defecte per a registrar el dipòsit del client
 UseAuxiliaryAccountOnCustomerDeposit=Emmagatzema el compte del client com a compte individual al llibre major subsidiari per a les línies de pagament inicial (si està desactivat, el compte individual per a les línies de pagament inicial romandrà buit)
+ACCOUNTING_ACCOUNT_SUPPLIER_DEPOSIT=Compte comptable per defecte per a registrar el dipòsit del proveïdor
+UseAuxiliaryAccountOnSupplierDeposit=Emmagatzema el compte del proveïdor com a compte individual al llibre major subsidiari per a les línies de pagament inicial (si està desactivat, el compte individual de les línies de pagament inicial romandrà buit)
 
 ACCOUNTING_PRODUCT_BUY_ACCOUNT=Compte comptable per defecte per als productes comprats (utilitzat si no es defineix en el producte)
 ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT=Compte de comptabilitat per defecte dels productes comprats a la CEE (utilitzat si no està definit a la taula de productes)
@@ -332,7 +335,7 @@ ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS=Desactiva la vinculació i transfer
 
 ## Export
 NotifiedExportDate=Marca les línies exportades com a Exportades <span class="warning"> (per a modificar una línia, hauràs de suprimir tota la transacció i tornar-la a transferir a la comptabilitat) </span>
-NotifiedValidationDate=Validate and Lock the exported entries <span class="warning">(same effect than the "Closure" feature, modification and deletion of the lines will DEFINITELY not be possible)</span>
+NotifiedValidationDate=Validar i bloquejar les entrades exportades <span class="warning"> (mateix efecte que la característica "%s", la modificació i la supressió de les línies DEFINITIVAMENT no seran possibles) </span>
 DateValidationAndLock=Validació de data i bloqueig
 ConfirmExportFile=Confirmació de la generació del fitxer d'exportació comptable?
 ExportDraftJournal=Exporta els esborranys del llibre
diff --git a/htdocs/langs/ca_ES/admin.lang b/htdocs/langs/ca_ES/admin.lang
index 135680a2e8f..133b33e1d24 100644
--- a/htdocs/langs/ca_ES/admin.lang
+++ b/htdocs/langs/ca_ES/admin.lang
@@ -159,7 +159,7 @@ SystemInfo=Informació del sistema
 SystemToolsArea=Àrea utilitats del sistema
 SystemToolsAreaDesc=Aquesta àrea proporciona funcions d'administració. Utilitzeu el menú per a triar la funció necessària.
 Purge=Purga
-PurgeAreaDesc=Aquesta pàgina us permet suprimir tots els fitxers generats o emmagatzemats per Dolibarr (fitxers temporals o tots els fitxers del directori <b> %s </b>). Normalment no és necessari fer servir aquesta funció. Es proporciona com a solució alternativa als usuaris que allotgen Dolibarr amb un proveïdor que no ofereix permisos per a eliminar fitxers generats pel servidor web.
+PurgeAreaDesc=Aquesta pàgina us permet suprimir tots els fitxers generats o emmagatzemats per Dolibarr (fitxers temporals o tots els fitxers del directori <b> %s </b>). Normalment, l'ús d'aquesta funció no és necessari. Es proporciona com a solució alternativa als usuaris que allotgen Dolibarr amb un proveïdor que no ofereix permisos per a eliminar fitxers generats pel servidor web.
 PurgeDeleteLogFile=Suprimeix els fitxers de registre, inclosos <b> %s </b> definits per al mòdul Syslog (sense risc de perdre dades)
 PurgeDeleteTemporaryFiles=Suprimeix tots els fitxers de registre i temporals (no hi ha risc de perdre dades). El paràmetre pot ser 'tempfilesold', 'logfiles' o tots dos 'tempfilesold+logfiles'. Nota: la supressió de 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)
@@ -235,7 +235,7 @@ DoliPartnersDesc=Llista d’empreses que ofereixen mòduls o funcions desenvolup
 WebSiteDesc=Llocs web de referència per a trobar més mòduls (no core)...
 DevelopYourModuleDesc=Algunes solucions per a desenvolupar el vostre propi mòdul...
 URL=URL
-RelativeURL=URL relativa
+RelativeURL=URL relatiu
 BoxesAvailable=Panells disponibles
 BoxesActivated=Panells activats
 ActivateOn=Activar a
@@ -249,7 +249,7 @@ Security=Seguretat
 Passwords=Contrasenyes
 DoNotStoreClearPassword=Encripta les contrasenyes emmagatzemades a la base de dades (NO com a text sense format). Es recomana activar aquesta opció.
 MainDbPasswordFileConfEncrypted=Encriptar la contrasenya de la base de dades emmagatzemada a conf.php. Es recomana activar aquesta opció.
-InstrucToEncodePass=Per a tenir la contrasenya codificada al fitxer <b>conf.php</b>, substituïu la línia <br> <b> $ dolibarr_main_db_pass="...";</b><br>per<br><b> $dolibarr_main_db_pass = "xifrat:%s";</b>
+InstrucToEncodePass=Per a tenir la contrasenya codificada al fitxer <b>conf.php</b>, substituïu la línia <br> <b> $ dolibarr_main_db_pass="...";</b><br>per<br><b> $dolibarr_main_db_pass = "crypted:%s";</b>
 InstrucToClearPass=Per a tenir la contrasenya descodificada en el fitxer de configuració <b>conf.php</b>, reemplaça en aquest fitxer la línia <br><b>$dolibarr_main_db_pass="crypted:...";</b><br>per<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 a llegir i imprimir amb qualsevol navegador PDF. Tanmateix, ja no és possible editar ni copiar. Tingueu en compte que l'ús d'aquesta funció fa que la creació d'un PDF combinat global no funcioni.
@@ -359,13 +359,13 @@ LastActivationVersion=Última versió d'activació
 UpdateServerOffline=Actualitza el servidor fora de línia
 WithCounter=Gestiona un comptador
 GenericMaskCodes=Podeu introduir qualsevol màscara de numeració. En aquesta màscara, es poden utilitzar les etiquetes següents: <br><b>{000000}</b> correspon a un número que s'incrementarà a cada %s. Introduïu tants zeros com la longitud desitjada del comptador. El comptador es completarà amb zeros des de l'esquerra per tal de tenir tants zeros com la màscara. <br><b>{000000+000}</b> igual que l'anterior, però s'aplica un desplaçament corresponent al número a la dreta del signe + a partir del primer %s. <br> <b>{000000@x} </b> igual que l'anterior, però el comptador es reinicia a zero quan s'arriba al mes x (x entre 1 i 12, o 0 per a utilitzar els primers mesos de l'any fiscal definits a la vostra configuració, o 99 torna a zero cada mes). Si s'utilitza aquesta opció i x és 2 o superior, també es requereix la seqüència {yy} {mm} o {yyyy} {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>, <b> {yyyy} </b> o <b>{y}</b> amb l'any sobre 2, 4 o 1 número. <br>
-GenericMaskCodes2= <b> {cccc} </b> el codi del client en n caràcters <br> <b> {cccc000} a09a4b739f17f8z. Aquest comptador dedicat al client es restableix al mateix temps que el comptador global. <br> <b> {tttt} </b> El codi del tipus de tercers en n caràcters (vegeu el menú Inici - Configuració - Diccionari - Tipus de tercers). Si afegiu aquesta etiqueta, el comptador serà diferent per a cada tipus de tercer. <br>
+GenericMaskCodes2= <b> {cccc} </b> el codi del client en n caràcters <br><b>{cccc000}</b>. Aquest comptador dedicat al client es restableix al mateix temps que el comptador global. <br> <b> {tttt} </b> El codi del tipus de tercers en n caràcters (vegeu el menú Inici - Configuració - Diccionari - Tipus de tercers). Si afegiu aquesta etiqueta, el comptador serà diferent per a cada tipus de tercer. <br>
 GenericMaskCodes3=Qualsevol altre caràcter a la màscara es quedarà sense canvis. <br> No es permeten espais<br>
 GenericMaskCodes3EAN=La resta de caràcters de la màscara romandran intactes (excepte * o ? En 13a posició a EAN13). <br>No es permeten espais. <br> A EAN13, l'últim caràcter després de l'últim } a la 13a posició hauria de ser * o ? . Se substituirà per la clau calculada.<br>
 GenericMaskCodes4a=<u>Exemple en el 99 %s del tercer L'Empresa, amb data 31/01/2007:</u><br>
 GenericMaskCodes4b=<u>Exemple sobre un tercer creat el 31/03/2007: </u> <br>
 GenericMaskCodes4c=<u>Exemple en un producte/servei creat el 31/03/2007:</u><br>
-GenericMaskCodes5=<b>ABC{yy}{mm}-{000000}</b> donarà <b>ABC0701-000099</b> <br><b> {0000+100@1}-ZZZ/{dd}/XXX</b> donarà <b>0199-ZZZ/31/XXX</b><br><b> IN{yy}{mm}-{0000}-{t}</b> donarà<b>IN0701-0099-A</b> si el tipus d'empresa és 'Responsable Inscripto' amb codi per a tipus que és 'A_RI'
+GenericMaskCodes5=<b>ABC{yy}{mm}-{000000}</b> donarà <b>ABC0701-000099</b> <br><b> {0000+100@1}-ZZZ/{dd}/XXX</b> donarà <b>0199-ZZZ/31/XXX</b><br><b> IN{yy}{mm}-{0000}-{t}</b> donarà <b>IN0701-0099-A</b> si el tipus d'empresa és 'Responsable Inscripto' amb codi per a tipus que és 'A_RI'
 GenericNumRefModelDesc=Retorna un nombre creat d'acord amb una màscara definida.
 ServerAvailableOnIPOrPort=Servidor disponible a l'adreça <b>%s</b> al port <b>%s</b>
 ServerNotAvailableOnIPOrPort=Servidor no disponible en l'adreça <b>%s</b> al port <b>%s</b>
@@ -417,7 +417,7 @@ HideRefOnPDF=Amaga la ref. dels productes
 HideDetailsOnPDF=Amaga els detalls de les línies de producte
 PlaceCustomerAddressToIsoLocation=Utilitza la posició estàndard francesa (La Poste) per a la posició d'adreça del client
 Library=Llibreria
-UrlGenerationParameters=Seguretat de les URL
+UrlGenerationParameters=Paràmetres per a protegir els URL
 SecurityTokenIsUnique=Fer servir un paràmetre securekey únic per a cada URL?
 EnterRefToBuildUrl=Introduïu la referència de l'objecte %s
 GetSecuredUrl=Obteniu l'URL calculat
@@ -440,7 +440,7 @@ Boolean=Boleà (una casella de selecció)
 ExtrafieldPhone = Telèfon
 ExtrafieldPrice = Preu
 ExtrafieldMail = Correu electrònic
-ExtrafieldUrl = Url
+ExtrafieldUrl = URL
 ExtrafieldSelect = Llista de selecció
 ExtrafieldSelectList = Llista de selecció de table
 ExtrafieldSeparator=Separador (no és un camp)
@@ -453,12 +453,12 @@ ComputedFormula=Camp calculat
 ComputedFormulaDesc=Podeu introduir aquí una fórmula utilitzant altres propietats de l’objecte o qualsevol codi PHP per a obtenir un valor calculat dinàmicament. Podeu utilitzar qualsevol fórmula compatible amb PHP, inclòs l'operador condicional «?»  i els següents objectes globals: <strong>$db, $conf, $langs, $mysoc, $user, $object</strong>. <br><strong>ATENCIÓ</strong>: Només poden estar disponibles algunes propietats de $object. Si necessiteu una propietat no carregada, només cal que incorporeu l'objecte a la vostra fórmula com en el segon exemple. <br> Utilitzar un camp calculat implica que no podreu introduir cap valor des de la interfície. A més, si hi ha un error de sintaxi, la fórmula pot no tornar res. <br> <br> Exemple de fórmula: <br> $object->id < 10 ? round($object->id / 2, 2): ($object->id + 2 * $user->id) * (int) substr($mysoc->zip, 1, 2 ) <br> <br> Exemple per a tornar a carregar l'objecte <br>  (($reloadedobj = new Societe($db)) && ($reloadedobj->fetchNoCompute($obj->id ? $obj->id: ($obj->rowid ? $obj->rowid: $object->id)) > 0)) ? $reloadedobj->array_options['options_extrafieldkey'] * $reloadedobj->capital / 5: '-1'<br> <br> Un altre exemple de fórmula per a forçar la càrrega de l'objecte i el seu objecte pare: <br> (($reloadedobj = new Task($db)) && ($reloadedobj->fetchNoCompute($object->id) > 0) && ($secondloadedobj = new Project($db)) && ($secondloadedobj->fetchNoCompute($reloadedobj->fk_project) > 0)) ? $secondloadedobj->ref: 'Parent project not found'
 Computedpersistent=Emmagatzemar el camp computat
 ComputedpersistentDesc=Els camps addicionals calculats s’emmagatzemaran a la base de dades, però el valor només es recalcularà 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=Mantenir aquest camp buit significa que el valor s'emmagatzema sense xifrar (el camp només ha d'estar amagat amb una estrella sobre la pantalla). <br> Establiu aquí el valor 'auto' per a utilitzar la regla de xifrat per defecte per a guardar la contrasenya a la base de dades (el valor llegit serà només el "hash", no hi haurà cap manera de recuperar el valor original)
+ExtrafieldParamHelpPassword=Si deixeu aquest camp en blanc, vol dir que aquest valor s'emmagatzemarà sense xifratge (el camp només s'ha d'amagar amb una estrella a la pantalla). <br> Establiu 'auto' per a utilitzar la regla de xifratge predeterminada per a desar la contrasenya a la base de dades (aleshores, el valor llegit serà només el hash, no hi ha manera de recuperar el valor original)
 ExtrafieldParamHelpselect=La llista de valors ha de ser un conjunt de línies amb un format del tipus clau,valor (on la clau no pot ser '0') <br><br> per exemple: <br>1,valor1<br>2,valor2<br>codi3,valor3<br>...<br><br>Per a tenir la llista depenent d'una altra llista d'atributs complementaris: <br>1,valor1|options_<i>codi_llista_pare</i>:clau_pare<br>2,valor2|options_<i>codi_llista_pare</i>:clau_pare <br><br>Per a tenir la llista depenent d'una altra llista:<br>1,valor1|<i>codi_llista_pare</i>:clau_pare<br>2,valor2|<i>codi_llista_pare</i>:clau_pare
 ExtrafieldParamHelpcheckbox=La llista de valor ha de ser un conjunt de línies del tipus clau,valor (on la clau no pot ser '0')<br><br> per exemple: <br>1,valor1<br>2,valor2<br>3,valor3<br>...
 ExtrafieldParamHelpradio=La llista de valor ha de ser un conjunt de línies del tipus clau,valor (on la clau no pot ser '0')<br><br> per exemple: <br>1,valor1<br>2,valor2<br>3,valor3<br>...
-ExtrafieldParamHelpsellist=Llista de valors que provenen d’una taula<br>Sintaxi: nom_taula:nom_camp:id_camp::filtresql<br>Exemple: c_typent:libelle:id::filtresql<br><br>- id_camp ha de ser necessàriament una clau primària numèrica<br>- el filtresql és una condició SQL. Pot ser una prova simple (p.ex. active=1) per a mostrar només els valors actius<br>També pots utilitzar $ID$ al filtre per a representar el ID de l'actual objecte en curs<br>Per a utilitzar un SELECT al filtre, utilitzeu la paraula clau $SEL$ per a evitar la protecció anti injecció.<br>Si vols filtrar camps addicionals utilitza la sintaxi extra.nom_camp=... (on nom_camp és el codi del camp addicional)<br><br>Per a tenir la llista en funció d’una altra llista d’atributs complementaris:<br>c_typent:libelle:id:options_<i>codi_llista_mare</i>|parent_column:filtre <br><br>Per a tenir la llista en funció d'una altra llista:<br>c_typent:libelle:id:<i>codi_llista_mare</i>|parent_column:filter
-ExtrafieldParamHelpchkbxlst=La llista de valors prové d'una taula <br> Sintaxi: nom_taula:nom_camp:id_camp::filtre <br> Exemple: c_typent:libelle:id::filtre<br> <br> filtre pot ser una comprovació simple (p. ex. active=1) per a mostrar només el valor actiu <br> També podeu utilitzar $ID$ en el filtre per a representar l'ID actual de l'objecte en curs <br>Per a fer un SELECT al filtre, utilitzeu $SEL$ <br> si voleu filtrar per camps extra utilitzeu la sintaxi extra.fieldcode=... (on el codi de camp és el codi del camp extra) <br> <br>Per a tenir la llista depenent d'una altra llista d'atributs complementaris: <br>c_typent:libelle:id:options_<i>codi_llista_pare</i>|parent_column: filter  <br><br>Per a tenir la llista depenent d'una altra llista:<br> c_typent:libelle:id:<i>codi_llista_pare</i>|parent_column:filter
+ExtrafieldParamHelpsellist=Llista de valors que provenen d’una taula<br>Sintaxi: nom_taula:nom_camp:id_camp::filtresql<br>Exemple: c_typent:libelle:id::filtresql<br><br>- id_camp ha de ser necessàriament una clau primària numèrica<br>- el filtresql és una condició SQL. Pot ser una prova simple (p.ex. active=1) per a mostrar només els valors actius<br>També pots utilitzar $ID$ al filtre per a representar el ID de l'actual objecte en curs<br>Per a utilitzar un SELECT al filtre, utilitzeu la paraula clau $SEL$ per a evitar la protecció anti injecció.<br>Si vols filtrar camps addicionals, utilitza la sintaxi extra.nom_camp=... (on nom_camp és el codi del camp addicional)<br><br>Per a tenir la llista en funció d’una altra llista d’atributs complementaris:<br>c_typent:libelle:id:options_<i>codi_llista_mare</i>|parent_column:filtre <br><br>Per a tenir la llista en funció d'una altra llista:<br>c_typent:libelle:id:<i>codi_llista_mare</i>|parent_column:filter
+ExtrafieldParamHelpchkbxlst=La llista de valors prové d'una taula <br> Sintaxi: nom_taula:nom_camp:id_camp::filtre <br> Exemple: c_typent:libelle:id::filtre<br> <br> filtre pot ser una comprovació simple (p. ex. active=1) per a mostrar només el valor actiu <br> També podeu utilitzar $ID$ en el filtre per a representar l'ID actual de l'objecte en curs <br>Per a fer un SELECT al filtre, utilitzeu $SEL$ <br> si voleu filtrar per camps extra, utilitzeu la sintaxi extra.fieldcode=... (on el codi de camp és el codi del camp extra) <br> <br>Per a tenir la llista depenent d'una altra llista d'atributs complementaris: <br>c_typent:libelle:id:options_<i>codi_llista_pare</i>|parent_column: filter  <br><br>Per a tenir la llista depenent d'una altra llista:<br> c_typent:libelle:id:<i>codi_llista_pare</i>|parent_column:filter
 ExtrafieldParamHelplink=Els paràmetres han de ser ObjectName:Classpath <br>Sintaxi: ObjectName:Classpath
 ExtrafieldParamHelpSeparator=Manteniu-lo buit per un simple separador <br> Configureu-ho a 1 per a un separador col·lapsador (obert per defecte per a la sessió nova, i es mantindrà l'estat de cada sessió d'usuari) <br> Configureu-ho a 2 per a un separador col·lapsat (es va desplomar per defecte per a la sessió nova, i es mantindrà l'estat per a cada sessió d'usuari)
 LibraryToBuildPDF=Llibreria utilitzada per a la generació de PDF
@@ -471,13 +471,13 @@ KeepEmptyToUseDefault=Deixa-ho buit per a usar el valor per defecte
 KeepThisEmptyInMostCases=En la majoria dels casos, pots deixar aquest camp buit.
 DefaultLink=Enllaç per defecte
 SetAsDefault=Indica'l com Defecte
-ValueOverwrittenByUserSetup=Atenció: Aquest valor pot ser sobreescrit per un valor específic de la configuració de l'usuari (cada usuari pot tenir la seva pròpia url clicktodial)
+ValueOverwrittenByUserSetup=Avís, aquest valor es pot sobreescriure per la configuració específica de l'usuari (cada usuari pot establir el seu propi URL de clicktodial)
 ExternalModule=Mòdul extern
 InstalledInto=Instal·lat al directori %s
 BarcodeInitForThirdparties=Inicialització massiva de codis de barres per a tercers
 BarcodeInitForProductsOrServices=Inici massiu de codi de barres per productes o serveis
 CurrentlyNWithoutBarCode=Actualment, té <strong>%s</strong> registres a <strong>%s</strong> %s sense codi de barres definit.
-InitEmptyBarCode=Iniciar valor pels %s registres buits
+InitEmptyBarCode=Valor inicial per als codis de barres buits %s
 EraseAllCurrentBarCode=Esborrar tots els valors de codi de barres actuals
 ConfirmEraseAllCurrentBarCode=Esteu segur que voleu esborrar tots els valors de codis de barres actuals?
 AllBarcodeReset=S'han eliminat tots els valors de codi de barres
@@ -714,13 +714,14 @@ Permission27=Elimina pressupostos
 Permission28=Exportar els pressupostos
 Permission31=Consulta productes
 Permission32=Crear/modificar productes
+Permission33=Consulta preus de productes
 Permission34=Elimina productes
 Permission36=Veure/gestionar els productes ocults
 Permission38=Exportar productes
 Permission39=Ignora el preu mínim
-Permission41=Llegir projectes i tasques (projectes i projectes compartits dels quals sóc contacte).
-Permission42=Crear/modificar projectes (projectes compartits i projectes dels quals sóc contacte). També pot assignar usuaris a projectes i tasques
-Permission44=Suprimir projectes (projectes compartits i projectes dels quals sóc un contacte)
+Permission41=Consulta projectes i tasques (projectes i projectes compartits dels quals soc contacte).
+Permission42=Crea/modifica projectes (projectes compartits i projectes dels quals soc contacte). També pot assignar usuaris a projectes i tasques
+Permission44=Elimina projectes (projectes compartits i projectes dels quals soc un contacte)
 Permission45=Exporta projectes
 Permission61=Consulta intervencions
 Permission62=Crea/modifica intervencions
@@ -739,6 +740,7 @@ Permission79=Crear/modificar cotitzacions
 Permission81=Consulta comandes de clients
 Permission82=Crear/modificar comandes de clients
 Permission84=Validar comandes de clients
+Permission85=Generar els documents de comandes de venda
 Permission86=Envia comandes de clients
 Permission87=Tancar comandes de clients
 Permission88=Anul·lar comandes de clients
@@ -766,9 +768,9 @@ Permission122=Crea/modifica tercers enllaçats a l'usuari
 Permission125=Elimina tercers enllaçats a l'usuari
 Permission126=Exporta tercers
 Permission130=Crear/modificar informació de pagament de tercers
-Permission141=Llegeix tots els projectes i tasques (així com els projectes privats dels quals no sóc un contacte)
-Permission142=Crear/modificar tots els projectes i tasques (així com els projectes privats dels quals no sóc un contacte)
-Permission144=Suprimeix tots els projectes i tasques (així com els projectes privats dels quals no sóc un contacte)
+Permission141=Consulta tots els projectes i tasques (així com els projectes privats dels quals no soc un contacte)
+Permission142=Crea/modifica tots els projectes i tasques (així com els projectes privats dels quals no soc un contacte)
+Permission144=Elimina tots els projectes i tasques (així com els projectes privats dels quals no soc un contacte)
 Permission145=Pot introduir el temps consumit, per a mi o la meva jerarquia, en les tasques assignades (full de temps)
 Permission146=Consulta proveïdors
 Permission147=Consulta estadístiques
@@ -874,6 +876,7 @@ Permission525=Calculadora de crèdit
 Permission527=Exportar préstecs
 Permission531=Consultar serveis
 Permission532=Crear/modificar serveis
+Permission533=Consulta preus de serveis
 Permission534=Eliminar serveis
 Permission536=Veure / gestionar els serveis ocults
 Permission538=Exportar serveis
@@ -896,7 +899,7 @@ Permission662=Suprimeix l'ordre de fabricació (OF)
 Permission701=Consultar donacions
 Permission702=Crear/modificar donacions
 Permission703=Eliminar donacions
-Permission771=Consulta informes de despeses (propis i dels subordinats)
+Permission771=Consulta els informes de despeses (propis i dels subordinats)
 Permission772=Crear/modificar informes de despeses (per a tu i els teus subordinats)
 Permission773=Eliminar els informes de despeses
 Permission775=Aprovar els informes de despeses
@@ -1102,12 +1105,12 @@ LocalTax2Management=3r tipus d'impost
 LocalTax2IsUsedExample=
 LocalTax2IsNotUsedExample=
 LocalTax1ManagementES=Gestió Recàrrec d'Equivalència
-LocalTax1IsUsedDescES=El tipus de RE proposat per defecte en les creacions de pressupostos, factures, comandes, etc. Respon a la següent regla:<br>Si el comprador no està subjecte a RE, RE per defecte= 0. Final de regla.<br>Si el comprador està subjecte a RE aleshores s'aplica valor de RE per defecte. Final de regla.<br>
+LocalTax1IsUsedDescES=El tipus de RE proposat per defecte en les creacions de pressupostos, factures, comandes, etc. respon a la següent regla:<br>Si el comprador no està subjecte a RE, RE per defecte= 0. Final de regla.<br>Si el comprador està subjecte a RE, aleshores s'aplica valor de RE per defecte. Final de regla.<br>
 LocalTax1IsNotUsedDescES=Per defecte, el RE proposat és 0. Fi de la regla.
 LocalTax1IsUsedExampleES=A Espanya, es tracta de persones físiques: autònoms subjectes a uns epígrafs concrets de l'IAE.
 LocalTax1IsNotUsedExampleES=A Espanya, es tracta d'empreses jurídiques: Societats limitades, anònimes, etc. i persones físiques (autònoms) subjectes a certs epígrafs de l'IAE.
 LocalTax2ManagementES=Gestió IRPF
-LocalTax2IsUsedDescES=El tipus d'IRPF proposat per defecte en les creacions de pressupostos, factures, comandes, etc. Respon a la següent regla:<br>Si el venedor no està subjecte a IRPF, IRPF per defecte= 0. Final de regla.<br>Si el venedor està subjecte a IRPF aleshores s'aplica valor d'IRPF per defecte. Final de regla.<br>
+LocalTax2IsUsedDescES=El tipus d'IRPF proposat per defecte en les creacions de pressupostos, factures, comandes, etc. respon a la següent regla:<br>Si el venedor no està subjecte a IRPF, IRPF per defecte= 0. Final de regla.<br>Si el venedor està subjecte a IRPF, aleshores s'aplica valor d'IRPF per defecte. Final de regla.<br>
 LocalTax2IsNotUsedDescES=Per defecte, l'IRPF proposat és 0. Fi de la regla.
 LocalTax2IsUsedExampleES=A Espanya, es tracta de persones físiques: autònoms i professionals independents que presten serveis i empreses que han triat el règim fiscal de mòduls.
 LocalTax2IsNotUsedExampleES=A Espanya, es tracta d'empreses no subjectes al règim fiscal de mòduls.
@@ -1235,6 +1238,7 @@ BrowserName=Nom del navegador
 BrowserOS=S.O. del navegador
 ListOfSecurityEvents=Llistat d'esdeveniments de seguretat Dolibarr
 SecurityEventsPurged=Esdeveniments de seguretat purgats
+TrackableSecurityEvents=Esdeveniments de seguretat rastrejables
 LogEventDesc=Habiliteu el registre per a esdeveniments de seguretat específics. Els administradors del registre a través del menú <b> %s - %s </b>. Avís, aquesta funció pot generar una gran quantitat de dades a la base de dades.
 AreaForAdminOnly=Els paràmetres de configuració només poden ser establerts per <b>usuaris administradors</b>.
 SystemInfoDesc=La informació del sistema és informació tècnica diversa que obteniu en mode de només lectura i visible només per als administradors.
@@ -1384,7 +1388,7 @@ PasswordPatternDesc=Descripció del patró de contrasenya
 ##### Users setup #####
 RuleForGeneratedPasswords=Regles per a generar i validar contrasenyes
 DisableForgetPasswordLinkOnLogonPage=No mostri l'enllaç "Contrasenya oblidada" a la pàgina d'inici de sessió
-UsersSetup=Configuració del mòdul usuaris
+UsersSetup=Configuració del mòdul d'usuaris
 UserMailRequired=Cal un correu electrònic per a crear un usuari nou
 UserHideInactive=Amaga els usuaris inactius de totes les llistes desplegables d'usuaris (no es recomana: pot ser que no pugueu filtrar ni cercar usuaris antics en algunes pàgines)
 UsersDocModules=Plantilles de documents per a documents generats a partir d'un registre d'usuari
@@ -1392,7 +1396,7 @@ GroupsDocModules=Plantilles de documents per a documents generats a partir d’u
 ##### HRM setup #####
 HRMSetup=Configuració de mòdul de gestió de recursos humans
 ##### Company setup #####
-CompanySetup=Configuració del mòdul empreses
+CompanySetup=Configuració del mòdul d'empreses
 CompanyCodeChecker=Opcions per a la generació automàtica de codis de client / proveïdor
 AccountCodeManager=Opcions per a la generació automàtica de comptes comptables de client/proveïdor
 NotificationsDesc=Les notificacions per correu electrònic es poden enviar automàticament per a alguns esdeveniments de Dolibarr. <br> Es poden definir els destinataris de les notificacions:
@@ -1412,7 +1416,7 @@ TechnicalServicesProvided=Prestació de serveis tècnics
 WebDAVSetupDesc=Aquest és l'enllaç per a accedir al directori WebDAV. Conté un missatge "públic" obert a qualsevol usuari que conegui l'URL (si es permet l'accés al directori públic) i un directori "privat" que necessita un compte d'inici de sessió/contrasenya existent per a l'accés.
 WebDavServer=URL de l'arrel del servidor %s: %s
 ##### Webcal setup #####
-WebCalUrlForVCalExport=Un vincle d'exportació del calendari en format <b>%s</b> estarà disponible a la url: %s
+WebCalUrlForVCalExport=Un enllaç d'exportació al format <b> %s </b> està disponible a l'enllaç següent: %s
 ##### Invoices #####
 BillsSetup=Configuració del mòdul Factures
 BillsNumberingModule=Mòdul de numeració de factures i abonaments
@@ -1977,6 +1981,7 @@ MailToSendSupplierOrder=Comandes de compra
 MailToSendSupplierInvoice=Factures del proveïdor
 MailToSendContract=Contractes
 MailToSendReception=Recepcions
+MailToExpenseReport=Informes de despeses
 MailToThirdparty=Tercers
 MailToMember=Socis
 MailToUser=Usuaris
@@ -2030,6 +2035,7 @@ MAIN_PDF_MARGIN_RIGHT=Marge dret al PDF
 MAIN_PDF_MARGIN_TOP=Marge superior al PDF
 MAIN_PDF_MARGIN_BOTTOM=Marge inferior al PDF
 MAIN_DOCUMENTS_LOGO_HEIGHT=Alçada del logotip en PDF
+DOC_SHOW_FIRST_SALES_REP=Mostra el primer agent comercial
 MAIN_GENERATE_PROPOSALS_WITH_PICTURE=Afegiu una columna per a la imatge a les línies de proposta
 MAIN_DOCUMENTS_WITH_PICTURE_WIDTH=Amplada de la columna si s'afegeix una imatge a les línies
 MAIN_PDF_NO_SENDER_FRAME=Amaga les vores del marc d’adreça del remitent
@@ -2063,6 +2069,12 @@ EmailCollectors=Col·leccionistes de correu electrònic
 EmailCollectorDescription=Afegiu una tasca programada i una pàgina de configuració per a escanejar regularment bústies de correu electrònic (mitjançant el protocol IMAP) i enregistreu els correus electrònics rebuts a la vostra aplicació, al lloc correcte i/o creeu alguns registres automàticament (com ara clients potencials).
 NewEmailCollector=Col·lector nou de correus electrònics
 EMailHost=Servidor IMAP de correu electrònic
+EMailHostPort=Port del servidor IMAP de correu electrònic
+loginPassword=Inici de sessió/Contrasenya
+oauthToken=Testimoni Oauth2
+accessType=Tipus d'accés
+oauthService=Servei d'Oauth
+TokenMustHaveBeenCreated=El mòdul OAuth2 ha d'estar habilitat i s'ha d'haver creat un testimoni oauth2 amb els permisos correctes (per exemple, l'àmbit "gmail_full" amb OAuth per a Gmail).
 MailboxSourceDirectory=Directori d'origen de la bústia
 MailboxTargetDirectory=Directori de destinació de la bústia
 EmailcollectorOperations=Operacions a fer per recol·lector
@@ -2106,7 +2118,7 @@ CreateCandidature=Crea sol·licitud de feina
 FormatZip=Format Zip
 MainMenuCode=Codi d'entrada del menú (menú principal)
 ECMAutoTree=Mostra l'arbre ECM automàtic
-OperationParamDesc=Definiu les regles a utilitzar per a extreure o establir valors. <br> Exemple d'operacions que necessiten extreure un nom de l'assumpte del correu electrònic: <br> name=EXTRACT:SUBJECT:Missatge de l'empresa ([^\n] *) <br> Exemple per a les operacions que creen objectes: <br> objproperty1 = SET: el valor en conjunt <br> objproperty2 = SET: un valor incloent el valor de __objproperty1__ <br> objproperty3 = SETIFEMPTY: valor utilitzat si objproperty3 no està ja definit <br> objproperty4 = extracte: HEADER :X-Myheaderkey:\\s*([^\\s]*) <br> options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*) <br> object.objproperty5=EXTRACT:BODY:El nom de la meva empresa és\\s( [^\\s]*) <br> <br> Utilitzeu un ; char com a separador per a extreure o establir diverses propietats.
+OperationParamDesc=Definiu les regles que s'han d'utilitzar per a extreure algunes dades o establir valors que s'utilitzen per al funcionament. <br> <br> Exemple per a extreure el nom d'una empresa de l'assumpte del correu electrònic a una variable temporal: <br> tmp_var=EXTRACT:SUBJECT:Missatge de l'empresa ([^\n]*) <br> <br> Exemples per a establir les propietats d'un objecte a crear: <br>objproperty1=SET:un valor fixat<br> objproperty2=SET:__tmp_var__<br>objproperty3=SETIFEMPTY:un valor (el valor s'estableix només si la propietat encara no s'ha definit)<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*) <br>object.objproperty5=EXTRACT:BODY:El nom de la meva empresa és\\s([^\\s]*) <br><br> Utilitzeu un caràcter ; com a separador per a extreure o establir diverses propietats.
 OpeningHours=Horari d'obertura
 OpeningHoursDesc=Introduïu aquí l'horari habitual d'obertura de la vostra empresa.
 ResourceSetup=Configuració del mòdul de recursos
@@ -2212,6 +2224,7 @@ NoExternalModuleWithUpdate=No s'han trobat actualitzacions per a mòduls externs
 SwaggerDescriptionFile=Fitxer de descripció de l'API Swagger (per a utilitzar-lo amb redoc, per exemple)
 YouEnableDeprecatedWSAPIsUseRESTAPIsInstead=Heu activat l'API WS obsoleta. Haureu d’utilitzar l’API REST.
 RandomlySelectedIfSeveral=Seleccionat aleatòriament si hi ha diverses imatges disponibles
+SalesRepresentativeInfo=Per a Pressupostos, Comandes, Factures.
 DatabasePasswordObfuscated=La contrasenya de la base de dades està ofuscada al fitxer conf
 DatabasePasswordNotObfuscated=La contrasenya de la base de dades NO està ofuscada al fitxer conf
 APIsAreNotEnabled=Els mòduls API no estan habilitats
@@ -2277,5 +2290,20 @@ INVOICE_ADD_ZATCA_QR_CODEMore=Alguns països àrabs necessiten aquest codi QR a
 INVOICE_ADD_SWISS_QR_CODE=Mostra el codi QR-Bill suís a les factures
 UrlSocialNetworksDesc=Enllaç URL de la xarxa social. Utilitzeu {socialid} per a la part variable que conté l'identificador de la xarxa social.
 IfThisCategoryIsChildOfAnother=Si aquesta categoria és fill d'una altra
+DarkThemeMode=Mode de tema fosc
+AlwaysDisabled=Sempre inhabilitat
+AccordingToBrowser=Segons el navegador
+AlwaysEnabled=Sempre activat
+DoesNotWorkWithAllThemes=No funcionarà amb tots els temes
 NoName=Sense nom
+ShowAdvancedOptions= Mostra opcions avançades
+HideAdvancedoptions= Amaga les opcions avançades
 CIDLookupURL=El mòdul aporta un URL que pot utilitzar una eina externa per a obtenir el nom d'un tercer o contacte des del seu número de telèfon. L'URL a utilitzar és:
+OauthNotAvailableForAllAndHadToBeCreatedBefore=L'autenticació OAUTH2 no està disponible per a tots els amfitrions i s'ha d'haver creat un testimoni amb els permisos adequats aigües amunt amb el mòdul OAUTH
+MAIN_MAIL_SMTPS_OAUTH_SERVICE=Servei d'autenticació OAUTH2
+DontForgetCreateTokenOauthMod=S'ha d'haver creat un testimoni amb els permisos adequats aigües amunt amb el mòdul OAUTH
+MAIN_MAIL_SMTPS_AUTH_TYPE=Mètode d'autenticació
+UsePassword=Utilitzeu una contrasenya
+UseOauth=Utilitzeu un testimoni OAUTH
+Images=Imatges
+MaxNumberOfImagesInGetPost=Nombre màxim d'imatges permeses en un camp HTML enviat en un formulari
diff --git a/htdocs/langs/ca_ES/agenda.lang b/htdocs/langs/ca_ES/agenda.lang
index 9b7319bbd02..0e5ffda43e7 100644
--- a/htdocs/langs/ca_ES/agenda.lang
+++ b/htdocs/langs/ca_ES/agenda.lang
@@ -57,6 +57,7 @@ MemberValidatedInDolibarr=Soci %s validat
 MemberModifiedInDolibarr=Soci %s modificat
 MemberResiliatedInDolibarr=Membre %s acabat
 MemberDeletedInDolibarr=Soci %s eliminat
+MemberExcludedInDolibarr=Soci %s exclòs
 MemberSubscriptionAddedInDolibarr=Subscripció %s per a membre %s, afegida
 MemberSubscriptionModifiedInDolibarr=Subscripció %s per a membre %s, modificada
 MemberSubscriptionDeletedInDolibarr=Subscripció %s per a membre %s, eliminada
@@ -133,9 +134,9 @@ AgendaUrlOptions1=Podeu també afegir aquests paràmetres al filtre de sortida:
 AgendaUrlOptions3=<b>logina=%s</b> ​​per a restringir insercions a les accions creades per l'usuari <b>%s</b>.
 AgendaUrlOptionsNotAdmin=<b>logina=!%s</b> ​​per a restringir la producció d'accions que no pertanyen a l'usuari <b>%s</b>.
 AgendaUrlOptions4=<b>logint=%s</b> per a restringir la producció d'accions assignades a l'usuari <b>%s</b> (propietari i altres).
-AgendaUrlOptionsProject=<b>project=PROJECT_ID</b> per a restringir la sortida d'accions associades al projecta <b>PROJECT_ID</b>.
-AgendaUrlOptionsNotAutoEvent=<b>notactiontype=systemauto</b> per excloure esdeveniments automàtics.
-AgendaUrlOptionsIncludeHolidays= <b> includeholidays = 1 </b> per incloure esdeveniments de vacances.
+AgendaUrlOptionsProject= <b> project=__PROJECT_ID__</b> per a restringir la sortida a accions vinculades al projecte <b>__PROJECT_ID__</b>.
+AgendaUrlOptionsNotAutoEvent= <b>notactiontype=systemauto</b> per a excloure els esdeveniments automàtics.
+AgendaUrlOptionsIncludeHolidays= <b>includeholidays=1</b> per a incloure esdeveniments de vacances.
 AgendaShowBirthdayEvents=Aniversaris de contactes
 AgendaHideBirthdayEvents=Amaga els aniversaris dels contactes
 Busy=Ocupat
@@ -148,7 +149,7 @@ ExtSites=Calendaris externs
 ExtSitesEnableThisTool=Mostra calendaris externs (definit a la configuració global) a Agenda. No afecta els calendaris externs definits pels usuaris.
 ExtSitesNbOfAgenda=Nombre de calendaris
 AgendaExtNb=Calendari núm. %s
-ExtSiteUrlAgenda=Url d'accés a l'arxiu. ical
+ExtSiteUrlAgenda=URL per a accedir al fitxer .ical
 ExtSiteNoLabel=Sense descripció
 VisibleTimeRange=Rang de temps visible
 VisibleDaysRange=Rang de dies visible
@@ -159,6 +160,7 @@ DateActionBegin=Data d'inici de l'esdeveniment
 ConfirmCloneEvent=Estàs segur que vols clonar l'esdeveniment <b>%s</b>?
 RepeatEvent=Repeteix esdeveniment
 OnceOnly=Una sola vegada
+EveryDay=Cada dia
 EveryWeek=Cada setmana
 EveryMonth=Cada mes
 DayOfMonth=Dia del mes
@@ -174,3 +176,4 @@ AddReminder=Crea una notificació de recordatori automàtica per a aquest esdeve
 ErrorReminderActionCommCreation=S'ha produït un error en crear la notificació de recordatori per a aquest esdeveniment
 BrowserPush=Notificació emergent del navegador
 ActiveByDefault=Habilitat per defecte
+Until=fins a
diff --git a/htdocs/langs/ca_ES/banks.lang b/htdocs/langs/ca_ES/banks.lang
index 6a714996c26..a8c84c96961 100644
--- a/htdocs/langs/ca_ES/banks.lang
+++ b/htdocs/langs/ca_ES/banks.lang
@@ -114,7 +114,7 @@ TransferTo=Cap a
 TransferFromToDone=La transferència de <b>%s</b> cap a <b>%s</b> de <b>%s</b> %s s'ha creat.
 CheckTransmitter=Remitent
 ValidateCheckReceipt=Vols validar aquesta remesa de xec?
-ConfirmValidateCheckReceipt=Esteu segur que voleu enviar aquest rebut de xec per validar-lo? No es podran fer canvis un cop validats.
+ConfirmValidateCheckReceipt=Esteu segur que voleu enviar aquest rebut de xec per a la validació? No es podran fer canvis un cop validat.
 DeleteCheckReceipt=Vols suprimir aquesta remesa de xec?
 ConfirmDeleteCheckReceipt=Vols eliminar aquesta remesa de xec?
 BankChecks=Xec bancari
@@ -172,8 +172,8 @@ SEPAMandate=Mandat SEPA
 YourSEPAMandate=La vostra ordre SEPA
 FindYourSEPAMandate=Aquest és el vostre mandat SEPA per a autoritzar la nostra empresa a fer una ordre de domiciliació bancària al vostre banc. Torneu-lo signat (escaneja el document signat) o envieu-lo per correu electrònic a
 AutoReportLastAccountStatement=Ompliu automàticament el camp "nombre d'extracte bancari" amb l'últim número de l'extracte al fer la conciliació
-CashControl=POS cash control
-NewCashFence=New cash control (opening or closing)
+CashControl=Control d'efectiu TPV
+NewCashFence=Nou control d'efectiu (obertura o tancament)
 BankColorizeMovement=Color de moviments
 BankColorizeMovementDesc=Si aquesta funció està habilitada, podeu triar un color de fons específic per als moviments de dèbit o de crèdit
 BankColorizeMovementName1=Color de fons pel moviment de dèbit
@@ -183,5 +183,6 @@ NoBankAccountDefined=No s'ha definit cap compte bancari
 NoRecordFoundIBankcAccount=No s'ha trobat cap registre al compte bancari. Normalment, això passa quan un registre s’ha suprimit manualment de la llista de transaccions del compte bancari (per exemple, durant una conciliació del compte bancari). Una altra raó és que el pagament es va registrar quan es va desactivar el mòdul "%s".
 AlreadyOneBankAccount=Ja s'ha definit un compte bancari
 SEPAXMLPlacePaymentTypeInformationInCreditTransfertransactionInformation=Transferència SEPA: "Tipus de pagament" al nivell "Transferència de crèdit".
-SEPAXMLPlacePaymentTypeInformationInCreditTransfertransactionInformationHelp=Quan es genera un fitxer XML SEPA per a transferències de crèdit, la secció "PaymentTypeInformation" ara es pot col·locar dins de la secció "CreditTransferTransactionInformation" (en lloc de la secció "Pagament"). Us recomanem fermament que no marqueu aquesta opció per col·locar PaymentTypeInformation al nivell de pagament, ja que tots els bancs no l'acceptaran necessàriament al nivell CreditTransferTransactionInformation. Poseu-vos en contacte amb el vostre banc abans de col·locar PaymentTypeInformation al nivell CreditTransferTransactionInformation.
-ToCreateRelatedRecordIntoBank=Per crear un registre bancari relacionat que falta
+SEPAXMLPlacePaymentTypeInformationInCreditTransfertransactionInformationHelp=Quan es genera un fitxer XML SEPA per a transferències de crèdit, la secció "PaymentTypeInformation" ara es pot col·locar dins de la secció "CreditTransferTransactionInformation" (en lloc de la secció "Pagament"). Us recomanem fermament que no marqueu aquesta opció per a col·locar PaymentTypeInformation al nivell de pagament, ja que tots els bancs no l'acceptaran necessàriament al nivell CreditTransferTransactionInformation. Poseu-vos en contacte amb el vostre banc abans de col·locar PaymentTypeInformation al nivell CreditTransferTransactionInformation.
+ToCreateRelatedRecordIntoBank=Per a crear un registre bancari relacionat que falta
+BanklineExtraFields=Camps extra de la línia bancària
diff --git a/htdocs/langs/ca_ES/bills.lang b/htdocs/langs/ca_ES/bills.lang
index 9f902fcaa56..627f4f31374 100644
--- a/htdocs/langs/ca_ES/bills.lang
+++ b/htdocs/langs/ca_ES/bills.lang
@@ -237,7 +237,7 @@ AlreadyPaidNoCreditNotesNoDeposits=Ja pagat (exclosos els abonaments i bestretes
 Abandoned=Abandonada
 RemainderToPay=Queda sense pagar
 RemainderToPayMulticurrency=La moneda original pendent de pagament
-RemainderToTake=Queda per cobrar
+RemainderToTake=Import restant per a cobrar
 RemainderToTakeMulticurrency=Import restant, moneda original
 RemainderToPayBack=Import pendent per reemborsar
 RemainderToPayBackMulticurrency=Import restant per reembossar, moneda original
@@ -429,14 +429,24 @@ PaymentConditionShort14D=14 dies
 PaymentCondition14D=14 dies
 PaymentConditionShort14DENDMONTH=14 dies final de mes
 PaymentCondition14DENDMONTH=En els 14 dies següents a final de mes
+PaymentConditionShortDEP30PCTDEL=__DEPOSIT_PERCENT__%% dipòsit
+PaymentConditionDEP30PCTDEL=__DEPOSIT_PERCENT__%% dipòsit, la resta a l'entrega
 FixAmount=Import fixe: 1 línia amb l'etiqueta '%s'
 VarAmount=Import variable (%% total)
 VarAmountOneLine=Quantitat variable (%% tot.) - 1 línia amb l'etiqueta '%s'
 VarAmountAllLines=Import variable (%% tot.): Totes les línies des de l'origen
+DepositPercent=Dipòsit %%
+DepositGenerationPermittedByThePaymentTermsSelected=Això ho permeten les condicions de pagament seleccionades
+GenerateDeposit=Genereu una factura de dipòsit %s%%
+ValidateGeneratedDeposit=Valida el dipòsit generat
+DepositGenerated=Dipòsit generat
+ErrorCanOnlyAutomaticallyGenerateADepositFromProposalOrOrder=Només podeu generar automàticament un ingrés a partir d'una proposta o d'una comanda
+ErrorPaymentConditionsNotEligibleToDepositCreation=Les condicions de pagament escollides no són elegibles per a la generació automàtica de dipòsits
 # PaymentType
 PaymentTypeVIR=Transferència bancària
 PaymentTypeShortVIR=Transferència bancària
 PaymentTypePRE=Ordre de pagament de domiciliació
+PaymentTypePREdetails=(al compte *-%s)
 PaymentTypeShortPRE=Ordre de pagament de dèbit
 PaymentTypeLIQ=Efectiu
 PaymentTypeShortLIQ=Efectiu
diff --git a/htdocs/langs/ca_ES/bookmarks.lang b/htdocs/langs/ca_ES/bookmarks.lang
index 6cd64eb6bf9..a35255308eb 100644
--- a/htdocs/langs/ca_ES/bookmarks.lang
+++ b/htdocs/langs/ca_ES/bookmarks.lang
@@ -20,3 +20,4 @@ ChooseIfANewWindowMustBeOpenedOnClickOnBookmark=Trieu si la pàgina enllaçada s
 BookmarksManagement=Gestió de marcadors
 BookmarksMenuShortCut=Ctrl + shift + m
 NoBookmarks=No s'han definit cap marcador
+NoBookmarkFound=No s'ha trobat cap marcador
diff --git a/htdocs/langs/cs_CZ/admin.lang b/htdocs/langs/cs_CZ/admin.lang
index 40b25d2b26e..11d510faad1 100644
--- a/htdocs/langs/cs_CZ/admin.lang
+++ b/htdocs/langs/cs_CZ/admin.lang
@@ -477,7 +477,7 @@ InstalledInto=Nainstalován do adresáře %s
 BarcodeInitForThirdparties=Hromadná inicializace čárového kódu pro subjekty
 BarcodeInitForProductsOrServices=Hromadná inicializace nebo resetování čárového kódu pro produkty nebo služby
 CurrentlyNWithoutBarCode=V současné době máte <strong> %s </strong> záznam na <strong> %s </strong> %s bez definice čárového kódu.
-InitEmptyBarCode=Init hodnota pro příští %s prázdnými záznamů
+InitEmptyBarCode=Init value for the %s empty barcodes
 EraseAllCurrentBarCode=Vymazat všechny aktuální hodnoty čárových kódů
 ConfirmEraseAllCurrentBarCode=Jste si jisti, že chcete vymazat všechny aktuální hodnoty čárových kódů?
 AllBarcodeReset=Byly odstraněny všechny hodnoty čárových kódů
@@ -714,6 +714,7 @@ Permission27=Odstranění obchodních návrhů
 Permission28=Export obchodních návrhů
 Permission31=Přečtěte si produkty
 Permission32=Vytvářejte/upravujte produkty
+Permission33=Read prices products
 Permission34=Odstranit produkty
 Permission36=Zobrazení/správa skrytých produktů
 Permission38=Export produktů
@@ -739,6 +740,7 @@ Permission79=Vytvořit/upravit předplatné
 Permission81=Přečtěte objednávky odběratelů
 Permission82=Vytvářejte/upravujte objednávky zákazníků
 Permission84=Potvrzení objednávky odběratelů
+Permission85=Generate the documents sales orders
 Permission86=Posílejte objednávky zákazníků
 Permission87=Zavřít objednávky zákazníků
 Permission88=Storno objednávky odběratelů
@@ -874,6 +876,7 @@ Permission525=Přístup na úvěrovou kalkulačku
 Permission527=Export půjček
 Permission531=Přečtěte si služby
 Permission532=Vytvářejte/upravujte služby
+Permission533=Read prices services
 Permission534=Smazat služby
 Permission536=Zobrazení/správa skrytých služeb
 Permission538=Export služeb
@@ -1235,6 +1238,7 @@ BrowserName=Název prohlížeče
 BrowserOS=Prohlížeč OS
 ListOfSecurityEvents=Seznam bezpečnostních událostí Dolibarru
 SecurityEventsPurged=Bezpečnostní události byly vymazány
+TrackableSecurityEvents=Trackable security events
 LogEventDesc=Povolte protokolování pro konkrétní události zabezpečení. Administrátoři přihlašují pomocí menu <b> %s - %s </b>. Upozornění: Tato funkce může generovat velké množství dat v databázi.
 AreaForAdminOnly=Parametry nastavení mohou být nastaveny pouze <b>uživateli administrátora </b> .
 SystemInfoDesc=Systémové informace jsou různé technické informace, které získáte pouze v režimu pro čtení a viditelné pouze pro správce.
@@ -1977,6 +1981,7 @@ MailToSendSupplierOrder=Objednávky
 MailToSendSupplierInvoice=Faktury dodavatele
 MailToSendContract=Smlouvy
 MailToSendReception=Recepce
+MailToExpenseReport=Výkazy výdajů
 MailToThirdparty=Subjekty
 MailToMember=Členové
 MailToUser=Uživatelé
@@ -2030,6 +2035,7 @@ MAIN_PDF_MARGIN_RIGHT=Pravý okraj v PDF
 MAIN_PDF_MARGIN_TOP=Nejvyšší okraj ve formátu PDF
 MAIN_PDF_MARGIN_BOTTOM=Dolní okraj v PDF
 MAIN_DOCUMENTS_LOGO_HEIGHT=Height for logo on PDF
+DOC_SHOW_FIRST_SALES_REP=Show first sales representative
 MAIN_GENERATE_PROPOSALS_WITH_PICTURE=Add column for picture on proposal lines
 MAIN_DOCUMENTS_WITH_PICTURE_WIDTH=Width of the column if a picture is added on lines
 MAIN_PDF_NO_SENDER_FRAME=Hide borders on sender address frame
@@ -2063,6 +2069,12 @@ EmailCollectors=Email collectors
 EmailCollectorDescription=Přidejte plánovanou úlohu a stránku s nastavením pro pravidelné skenování poštovních schránek (pomocí protokolu IMAP) a zaznamenávejte e-maily přijaté do vaší aplikace na správném místě a / nebo vytvořte automaticky nějaké záznamy (například potenciální zákazníci).
 NewEmailCollector=Nový e-mailový sběratel
 EMailHost=Hostitel poštovního IMAP serveru
+EMailHostPort=Port of email IMAP server
+loginPassword=Login/Password
+oauthToken=Oauth2 token
+accessType=Acces type
+oauthService=Oauth service
+TokenMustHaveBeenCreated=Module OAuth2 must be enabled and an oauth2 token must have been created with the correct permissions (for example scope "gmail_full" with OAuth for Gmail).
 MailboxSourceDirectory=Adresář zdrojové schránky
 MailboxTargetDirectory=Adresář cílové schránky
 EmailcollectorOperations=Operace prováděné sběratelem
@@ -2106,7 +2118,7 @@ CreateCandidature=Create job application
 FormatZip=Zip
 MainMenuCode=Vstupní kód nabídky (hlavní menu)
 ECMAutoTree=Zobrazit automatický strom ECM
-OperationParamDesc=Define the rules to use to extract or set values.<br>Example for operations that need to extract a name from email subject:<br>name=EXTRACT:SUBJECT:Message from company ([^\n]*)<br>Example for operations that create objects:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value including value of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
+OperationParamDesc=Define the rules to use to extract some data or set values to use for operation.<br><br>Example to extract a company name from email subject into a temporary variable:<br>tmp_var=EXTRACT:SUBJECT:Message from company ([^\n]*)<br><br>Examples to set the properties of an object to create:<br>objproperty1=SET:a hard coded value<br>objproperty2=SET:__tmp_var__<br>objproperty3=SETIFEMPTY:a value (value is set only if property is not already defined)<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
 OpeningHours=Otevírací doba
 OpeningHoursDesc=Zadejte zde běžnou pracovní dobu vaší společnosti.
 ResourceSetup=Konfigurace modulu zdrojů
@@ -2212,6 +2224,7 @@ NoExternalModuleWithUpdate=No updates found for external modules
 SwaggerDescriptionFile=Swagger API description file (for use with redoc for example)
 YouEnableDeprecatedWSAPIsUseRESTAPIsInstead=You enabled deprecated WS API. You should use REST API instead.
 RandomlySelectedIfSeveral=Randomly selected if several pictures are available
+SalesRepresentativeInfo=For Proposals, Orders, Invoices.
 DatabasePasswordObfuscated=Database password is obfuscated in conf file
 DatabasePasswordNotObfuscated=Database password is NOT obfuscated in conf file
 APIsAreNotEnabled=APIs modules are not enabled
@@ -2277,5 +2290,20 @@ INVOICE_ADD_ZATCA_QR_CODEMore=Some Arabic countries need this QR Code on their i
 INVOICE_ADD_SWISS_QR_CODE=Show the swiss QR-Bill code on invoices
 UrlSocialNetworksDesc=Url link of social network. Use {socialid} for the variable part that contains the social network ID.
 IfThisCategoryIsChildOfAnother=If this category is a child of another one
+DarkThemeMode=Dark theme mode
+AlwaysDisabled=Always disabled
+AccordingToBrowser=According to browser
+AlwaysEnabled=Always Enabled
+DoesNotWorkWithAllThemes=Will not work with all themes
 NoName=No name
+ShowAdvancedOptions= Show advanced options
+HideAdvancedoptions= Hide advanced options
 CIDLookupURL=The module brings an URL that can be used by an external tool to get the name of a thirdparty or contact from its phone number. URL to use is:
+OauthNotAvailableForAllAndHadToBeCreatedBefore=OAUTH2 authentication is not available for all hosts, and a token with the right permissions must have been created upstream with the OAUTH module
+MAIN_MAIL_SMTPS_OAUTH_SERVICE=OAUTH2 authentication service
+DontForgetCreateTokenOauthMod=A token with the right permissions must have been created upstream with the OAUTH module
+MAIN_MAIL_SMTPS_AUTH_TYPE=Authentification method
+UsePassword=Use a password
+UseOauth=Use a OAUTH token
+Images=Images
+MaxNumberOfImagesInGetPost=Max number of images allowed in a HTML field submitted in a form
diff --git a/htdocs/langs/da_DK/accountancy.lang b/htdocs/langs/da_DK/accountancy.lang
index b014a283cdf..b8ba3cba44c 100644
--- a/htdocs/langs/da_DK/accountancy.lang
+++ b/htdocs/langs/da_DK/accountancy.lang
@@ -48,8 +48,9 @@ CountriesNotInEEC=Lande ikke i EU
 CountriesInEECExceptMe=Lande i EU undtagen %s
 CountriesExceptMe=Alle lande undtagen %s
 AccountantFiles=Eksporter kildedokumenter
-ExportAccountingSourceDocHelp=Med dette værktøj kan du eksportere de kildebegivenheder (liste i CSV og PDF'er), der bruges til at generere dit regnskab.
+ExportAccountingSourceDocHelp=Med dette værktøj kan du søge og eksportere de kildebegivenheder, der bruges til at generere dit regnskab.<br>Den eksporterede ZIP-fil vil indeholde lister over ønskede elementer i CSV, såvel som deres vedhæftede filer i deres originale format (PDF, ODT, DOCX...).
 ExportAccountingSourceDocHelp2=For at eksportere dine tidsskrifter skal du bruge menuindgangen %s - %s.
+ExportAccountingProjectHelp=Angiv et projekt, hvis du kun har brug for en regnskabsrapport for et specifikt projekt. Udgiftsrapporter og lånebetalinger indgår ikke i projektrapporter.
 VueByAccountAccounting=Vis efter regnskabskonto
 VueBySubAccountAccounting=Vis efter regnskabsmæssig underkonto
 
@@ -183,6 +184,8 @@ ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT=Regnskabskonto for at registrere abonnem
 
 ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT=Regnskabskonto er som standard for at registrere kundeindbetaling
 UseAuxiliaryAccountOnCustomerDeposit=Gem kundekonto som individuel konto i hovedbog for linjer med forudbetalinger (hvis den er deaktiveret, forbliver individuel konto for forudbetalingslinjer tomme)
+ACCOUNTING_ACCOUNT_SUPPLIER_DEPOSIT=Regnskabskonto som standard for at registrere leverandørindskud
+UseAuxiliaryAccountOnSupplierDeposit=Gem leverandørkonto som individuel konto i hovedbog for linjer med forudbetalinger (hvis den er deaktiveret, vil individuel konto for forudbetalingslinjer forblive tom)
 
 ACCOUNTING_PRODUCT_BUY_ACCOUNT=Regnskabskonto som standard for de købte produkter (bruges hvis ikke defineret i produktarket)
 ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT=Regnskabskonto som standard for de købte produkter i EØF (brugt, hvis ikke defineret i produktarket)
@@ -221,7 +224,7 @@ ByPersonalizedAccountGroups=Efter brugerdefinerede grupper
 ByYear=År
 NotMatch=Ikke angivet
 DeleteMvt=Slet nogle linjer fra regnskabet
-DelMonth=Måned at slette
+DelMonth=Måned der skal slettes
 DelYear=År, der skal slettes
 DelJournal=Kladde, der skal slettes
 ConfirmDeleteMvt=Dette vil slette alle linjer i regnskabet for året/måneden og/eller for en bestemt kladde (mindst et kriterium er påkrævet). Du bliver nødt til at genbruge funktionen '%s' for at få den slettede post tilbage i hovedbogen.
@@ -332,7 +335,7 @@ ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS=Deaktiver binding og overførsel i
 
 ## Export
 NotifiedExportDate=Flag eksporterede linjer som eksporteret <span class="warning"> (for at ændre en linje skal du slette hele transaktionen og overføre den til regnskab igen) </span>
-NotifiedValidationDate=Valider og lås de eksporterede poster <span class="warning"> (samme effekt som "Closure"-funktionen, ændring og sletning af linjerne vil DEFINITIVT ikke være mulig) </span>
+NotifiedValidationDate=Valider og lås de eksporterede indgange <span class="warning"> (samme effekt som "%s"-funktionen, ændring og sletning af linjerne vil DEFINITIVT ikke være mulig) </span>
 DateValidationAndLock=Datovalidering og lås
 ConfirmExportFile=Bekræftelse af genereringen af den regnskabsmæssige eksportfil?
 ExportDraftJournal=Eksporter udkast til kladde
@@ -410,7 +413,7 @@ AccountancyUnletteringModifiedSuccessfully=%s afstemning blev ændret med succes
 ConfirmMassUnlettering=Bekræftelse af masseafstemning
 ConfirmMassUnletteringQuestion=Er du sikker på, at du vil afstemme de  %s valgte post(er)?
 ConfirmMassDeleteBookkeepingWriting=Bekræftelse på massesletning
-ConfirmMassDeleteBookkeepingWritingQuestion=Dette vil slette transaktionen fra regnskabet (alle linjer relateret til den samme transaktion vil blive slettet) Er du sikker på, at du vil slette de(n) %s valgte post(er)?
+ConfirmMassDeleteBookkeepingWritingQuestion=Dette vil slette transaktionen fra regnskabet (alle linjer relateret til den samme transaktion vil blive slettet) Er du sikker på, at du vil slette de %s valgte post(er)?
 
 ## Error
 SomeMandatoryStepsOfSetupWereNotDone=Visse obligatoriske trin i opsætningen blev ikke udført. Gør venligst dette
diff --git a/htdocs/langs/da_DK/admin.lang b/htdocs/langs/da_DK/admin.lang
index f475511a6ff..01b6d39787a 100644
--- a/htdocs/langs/da_DK/admin.lang
+++ b/htdocs/langs/da_DK/admin.lang
@@ -59,12 +59,12 @@ UserInterface=Brugergrænseflade
 GUISetup=Udseende
 SetupArea=Opsætning
 UploadNewTemplate=Upload nye skabelon(er)
-FormToTestFileUploadForm=Formular til at teste filupload (i henhold til opsætning)
-ModuleMustBeEnabled=Moduler/Applikationer <b>%s</b> skal være aktiveret
-ModuleIsEnabled=Moduler/Applikationer <b>%s</b> er blevet aktiveret
+FormToTestFileUploadForm=Formular til at teste filoverførsel (i henhold til opsætning)
+ModuleMustBeEnabled=Modulet/Applikationen <b>%s</b> skal være aktiveret
+ModuleIsEnabled=Modulet/Applikationen <b>%s</b> er blevet aktiveret
 IfModuleEnabled=Bemærk: ja er kun effektiv, hvis modulet <b>%s</b> er aktiveret
 RemoveLock=Fjern/omdøb filen <b>%s</b>, hvis den findes, for at tillade brug af opdaterings-/installationsværktøjet.
-RestoreLock=Gendan filen <b>%s</b> , med kun læsetilladelse, for at deaktivere enhver yderligere brug af opdaterings-/installationsværktøjet.
+RestoreLock=Gendan filen <b>%s</b>, med kun læsetilladelse, for at deaktivere enhver yderligere brug af opdaterings-/installationsværktøjet.
 SecuritySetup=Sikkerhedsopsætning
 PHPSetup=PHP opsætning
 OSSetup=OS opsætning
@@ -123,7 +123,7 @@ DetailMenuIdParent=ID for overordnet menu (tom for en topmenu)
 ParentID=Overordnet ID
 DetailPosition=Sorterings nummer for at definere menuposition
 AllMenus=Alle
-NotConfigured=Moduler/Applikationer ikke konfigureret
+NotConfigured=Modul/Applikation ikke konfigureret
 Active=Aktiv
 SetupShort=Opsætning
 OtherOptions=Andre muligheder
@@ -477,7 +477,7 @@ InstalledInto=Installeret i mappen %s
 BarcodeInitForThirdparties=Masse stregkode init for tredjeparter
 BarcodeInitForProductsOrServices=Masse stregkode init eller nulstil for produkter eller tjenester
 CurrentlyNWithoutBarCode=I øjeblikket har du <strong>%s</strong> post på <strong>%s</strong> %s uden stregkode defineret.
-InitEmptyBarCode=Initial værdi for næste %s tomme poster
+InitEmptyBarCode=standard værdi for de tomme stregkoder %s
 EraseAllCurrentBarCode=Slet alle aktuelle stregkodeværdier
 ConfirmEraseAllCurrentBarCode=Er du sikker på, at du vil slette alle aktuelle stregkodeværdier?
 AllBarcodeReset=Alle stregkodeværdier er blevet fjernet
@@ -714,6 +714,7 @@ Permission27=Slet tilbud
 Permission28=Eksporter tilbud
 Permission31=Læs varer
 Permission32=Opret/rediger varer
+Permission33=Læs priser produkter
 Permission34=Slet varer
 Permission36=Se/administrer skjulte varer
 Permission38=Eksportere varer
@@ -739,6 +740,7 @@ Permission79=Opret/ændre abonnementer
 Permission81=Læs kundeordrer
 Permission82=Oprette/ændre kundeordrer
 Permission84=Bekræfte kundeordrer
+Permission85=Generer dokumenternes salgsordrer
 Permission86=Send kundeordrer
 Permission87=Luk kundeordrer
 Permission88=Annuller kundeordrer
@@ -874,6 +876,7 @@ Permission525=Få adgang til låneberegner
 Permission527=Eksporter lån
 Permission531=Læs ydelser
 Permission532=Opret/ændre ydelser
+Permission533=Læs priser tjenester
 Permission534=Slet ydelser
 Permission536=Se/administrer skjulte ydelser
 Permission538=Eksport af ydelser
@@ -1235,6 +1238,7 @@ BrowserName=Browsernavn
 BrowserOS=Browser OS
 ListOfSecurityEvents=Liste over Dolibarr sikkerhedshændelser
 SecurityEventsPurged=Sikkerhedshændelser ryddet
+TrackableSecurityEvents=Sporbare sikkerhedshændelser
 LogEventDesc=Aktiver logning for specifikke sikkerhedshændelser. Administratorer loggen via menuen <b>%s - %s</b> . Advarsel, denne funktion kan generere en stor mængde data i databasen.
 AreaForAdminOnly=Opsætningsparametre kan kun indstilles af <b>administratorbrugere</b>.
 SystemInfoDesc=Systemoplysninger er diverse tekniske oplysninger, du får i skrivebeskyttet tilstand og kun synlige for administratorer.
@@ -1977,6 +1981,7 @@ MailToSendSupplierOrder=Indkøbsordre
 MailToSendSupplierInvoice=Leverandørfakturaer
 MailToSendContract=Kontrakter
 MailToSendReception=Modtagelse
+MailToExpenseReport=Udgiftsrapporter
 MailToThirdparty=Tredje partier
 MailToMember=Medlemmer
 MailToUser=Brugere
@@ -2030,6 +2035,7 @@ MAIN_PDF_MARGIN_RIGHT=Højre margen på PDF
 MAIN_PDF_MARGIN_TOP=Topmargen på PDF
 MAIN_PDF_MARGIN_BOTTOM=Bundmargen på PDF
 MAIN_DOCUMENTS_LOGO_HEIGHT=Højde for logo på PDF
+DOC_SHOW_FIRST_SALES_REP=Vis den første salgsrepræsentant
 MAIN_GENERATE_PROPOSALS_WITH_PICTURE=Tilføj kolonne til billede på forslagslinjer
 MAIN_DOCUMENTS_WITH_PICTURE_WIDTH=Spaltens bredde, hvis et billede tilføjes på linjer
 MAIN_PDF_NO_SENDER_FRAME=Skjul kanter på afsenderadresserammen
@@ -2063,6 +2069,12 @@ EmailCollectors=E-mail samlere
 EmailCollectorDescription=Tilføj et planlagt job og en opsætningsside for at scanne regelmæssigt e-mail-bokse (ved hjælp af IMAP protokol) og registrere e-mails modtaget i dit program, på det rigtige sted og/eller oprette nogle poster automatisk (såsom kundeemner).
 NewEmailCollector=Ny e-mail samler
 EMailHost=Vært for e-mail IMAP-server
+EMailHostPort=Port på e-mail-IMAP-server
+loginPassword=Login kodeord
+oauthToken=Oauth2 token
+accessType=Adgangstype
+oauthService=Oauth service
+TokenMustHaveBeenCreated=Modul OAuth2 skal være aktiveret, og et oauth2-token skal være oprettet med de korrekte tilladelser (f.eks. scope "gmail_full" med OAuth til Gmail).
 MailboxSourceDirectory=Postkassens kildemappe
 MailboxTargetDirectory=Postkassens målmappe
 EmailcollectorOperations=Operationer, der skal udføres af samler
@@ -2106,7 +2118,7 @@ CreateCandidature=Opret jobansøgning
 FormatZip=ZIP
 MainMenuCode=Menuindgangskode (hovedmenu)
 ECMAutoTree=Vis automatisk ECM-træ
-OperationParamDesc=Definer de regler, der skal bruges til at udtrække eller angive værdier.<br>Eksempel på operationer, der skal udtrække et navn fra e-mailens emne:<br>name=EXTRACT:SUBJECT:Besked fra virksomheden ([^\\n]*)<br>Eksempel på handlinger, der opretter objekter:<br>objproperty1=SET:værdien der skal indstilles<br>objproperty2=SET:en værdi inklusive værdien af __objproperty1__<br>objproperty3=SETIFEMPTY:værdi, der bruges, hvis objproperty3 ikke allerede er defineret<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:Mit firmanavn er\\s([^\\s]*)<br><br>Brug en ; karakter som separator for at udtrække eller indstille flere egenskaber.
+OperationParamDesc=Definer de regler, der skal bruges til at udtrække nogle data, eller sæt værdier, der skal bruges til drift. <br> <br> Eksempel på at udtrække et firmanavn fra e-mail-emne til en midlertidig variabel: <br> tmp_var=EXTRACT:SUBJECT:Besked fra firma ([^\n]*) <br> <br> Eksempler på at indstille egenskaberne for et objekt til at skabe: <br> objproperty1=SET:en hårdkodet værdi <br> objproperty2=SET_fcv_prty_set er allerede defineret objproperty2=SET:__t1V_værdi egenskaben:__t1VDa_værdi er allerede defineret:_0mp1VDa værdi: <br> objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*) <br> options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*) <br> options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*) a0342bACTertyD5 firmanavn er\\s([^\\s]*) <br> <br> Brug en ; char som separator for at udtrække eller indstille flere egenskaber.
 OpeningHours=Åbningstider
 OpeningHoursDesc=Indtast her din virksomheds almindelige åbningstider.
 ResourceSetup=Opsætning af ressourcemodul
@@ -2212,7 +2224,8 @@ NoExternalModuleWithUpdate=Ingen opdateringer fundet for eksterne moduler
 SwaggerDescriptionFile=Swagger API beskrivelsesfil (til brug med for eksempel redoc)
 YouEnableDeprecatedWSAPIsUseRESTAPIsInstead=Du har aktiveret forældet WS API. Du bør bruge REST API i stedet.
 RandomlySelectedIfSeveral=Tilfældigt valgt, hvis flere billeder er tilgængelige
-DatabasePasswordObfuscated=Databaseadgangskode er tilsløret i conf-filen
+SalesRepresentativeInfo=For tilbud, ordrer, fakturaer.
+DatabasePasswordObfuscated=Databaseadgangskode er sløret i conf-filen
 DatabasePasswordNotObfuscated=Databaseadgangskoden er IKKE sløret i conf-filen
 APIsAreNotEnabled=API-moduler er ikke aktiveret
 YouShouldSetThisToOff=Du skal indstille dette til 0 eller fra
@@ -2277,5 +2290,20 @@ INVOICE_ADD_ZATCA_QR_CODEMore=Nogle arabiske lande har brug for denne QR-kode p
 INVOICE_ADD_SWISS_QR_CODE=Vis den schweiziske QR-Bill-kode på fakturaer
 UrlSocialNetworksDesc=URL-link til socialt netværk. Brug {socialid} til den variable del, der indeholder det sociale netværks-id.
 IfThisCategoryIsChildOfAnother=Hvis denne kategori er en under kategori af en anden
+DarkThemeMode=Mørkt tematilstand
+AlwaysDisabled=Altid deaktiveret
+AccordingToBrowser=Ifølge browser
+AlwaysEnabled=Altid aktiveret
+DoesNotWorkWithAllThemes=Fungerer ikke med alle temaer
 NoName=Intet navn
+ShowAdvancedOptions= Vis avancerede muligheder
+HideAdvancedoptions= Skjul avancerede muligheder
 CIDLookupURL=Modulet bringer en URL, der kan bruges af et eksternt værktøj til at hente navnet på en tredjepart eller kontakt fra dens telefonnummer. URL der skal bruges er:
+OauthNotAvailableForAllAndHadToBeCreatedBefore=OAUTH2 godkendelse er ikke tilgængelig for alle værter, og en token med de korrekte tilladelser skal være oprettet med OAUTH modulet.
+MAIN_MAIL_SMTPS_OAUTH_SERVICE=OAUTH2 godkendelsesservice
+DontForgetCreateTokenOauthMod=En token med de korrekte tilladelser skal være oprettet med OAUTH modulet
+MAIN_MAIL_SMTPS_AUTH_TYPE=Godkendelsesmetode
+UsePassword=Brug en adgangskode
+UseOauth=Brug en OAUTH token
+Images=Billeder
+MaxNumberOfImagesInGetPost=Maks. antal billeder tilladt i et HTML-felt indsendt i en formular
diff --git a/htdocs/langs/da_DK/agenda.lang b/htdocs/langs/da_DK/agenda.lang
index a46930e3574..8e8daa1f91d 100644
--- a/htdocs/langs/da_DK/agenda.lang
+++ b/htdocs/langs/da_DK/agenda.lang
@@ -57,6 +57,7 @@ MemberValidatedInDolibarr=Medlem %s bekræftet
 MemberModifiedInDolibarr=Medlem %s ændret
 MemberResiliatedInDolibarr=Medlem %s afsluttet
 MemberDeletedInDolibarr=Medlem %s slettet
+MemberExcludedInDolibarr=Medlem %s udelukket
 MemberSubscriptionAddedInDolibarr=Abonnement %s for medlem %s tilføjet
 MemberSubscriptionModifiedInDolibarr=Abonnement %s for medlem %s ændret
 MemberSubscriptionDeletedInDolibarr=Abonnement %s for medlem %s slettet
@@ -159,6 +160,7 @@ DateActionBegin=Startdato for begivenhed
 ConfirmCloneEvent=Er du sikker på, du vil klone begivenheden <b>%s</b>?
 RepeatEvent=Begivenhed med gentagelse
 OnceOnly=kun Én gang
+EveryDay=Hver dag
 EveryWeek=Hver uge
 EveryMonth=Hver måned
 DayOfMonth=Dag i måneden
@@ -174,3 +176,4 @@ AddReminder=Opret en automatisk påmindelsesmeddelelse om denne begivenhed
 ErrorReminderActionCommCreation=Fejl ved oprettelse af påmindelsesmeddelelsen for denne begivenhed
 BrowserPush=Browser pop op meddelelse
 ActiveByDefault=Aktiveret som standard
+Until=indtil
diff --git a/htdocs/langs/da_DK/banks.lang b/htdocs/langs/da_DK/banks.lang
index 524731969e5..f86ad9814dc 100644
--- a/htdocs/langs/da_DK/banks.lang
+++ b/htdocs/langs/da_DK/banks.lang
@@ -185,3 +185,4 @@ AlreadyOneBankAccount=Allerede en bankkonto defineret
 SEPAXMLPlacePaymentTypeInformationInCreditTransfertransactionInformation=SEPA-overførsel: 'Betalingstype' på 'Kreditoverførsel'-niveau
 SEPAXMLPlacePaymentTypeInformationInCreditTransfertransactionInformationHelp=Når du genererer en SEPA XML-fil til kreditoverførsler, kan sektionen "PaymentTypeInformation" nu placeres i sektionen "CreditTransferTransactionInformation" (i stedet for sektionen "Payment"). Vi anbefaler kraftigt at holde dette umarkeret for at placere PaymentTypeInformation på betalingsniveau, da alle banker ikke nødvendigvis vil acceptere det på CreditTransferTransactionInformation-niveau. Kontakt din bank, før du placerer PaymentTypeInformation på CreditTransferTransactionInformation-niveau.
 ToCreateRelatedRecordIntoBank=For at oprette manglende relateret bankpost
+BanklineExtraFields=Bank Line Extrafields
diff --git a/htdocs/langs/da_DK/bills.lang b/htdocs/langs/da_DK/bills.lang
index ac2f38a2d72..8724ad4fa90 100644
--- a/htdocs/langs/da_DK/bills.lang
+++ b/htdocs/langs/da_DK/bills.lang
@@ -446,6 +446,7 @@ ErrorPaymentConditionsNotEligibleToDepositCreation=De valgte betalingsbetingelse
 PaymentTypeVIR=Bankoverførsel
 PaymentTypeShortVIR=Bankoverførsel
 PaymentTypePRE=Betalingsordre med "Direkte debit"
+PaymentTypePREdetails=(på konto *-%s)
 PaymentTypeShortPRE=Debit betalingsordre
 PaymentTypeLIQ=Kontanter
 PaymentTypeShortLIQ=Kontanter
diff --git a/htdocs/langs/de_AT/banks.lang b/htdocs/langs/de_AT/banks.lang
index 299e9bcce7a..0ad385b6ae7 100644
--- a/htdocs/langs/de_AT/banks.lang
+++ b/htdocs/langs/de_AT/banks.lang
@@ -14,7 +14,6 @@ EndBankBalance=Abschlusssaldo
 CurrentBalance=derezitige Bilanz
 FutureBalance=zukünftiger Bilanz
 ShowAllTimeBalance=Eröffnungsbilanz
-RIB=Kontonummer
 SwiftValid=BIC gültig
 SwiftNotValid=BIC ungültig
 AccountStatementShort=Kontenauszug
diff --git a/htdocs/langs/de_CH/accountancy.lang b/htdocs/langs/de_CH/accountancy.lang
index bd62ac5984e..6a826327010 100644
--- a/htdocs/langs/de_CH/accountancy.lang
+++ b/htdocs/langs/de_CH/accountancy.lang
@@ -39,7 +39,7 @@ CountriesNotInEEC=Nicht EWR - Staaten
 CountriesInEECExceptMe=Länder im EWR ausser %s
 CountriesExceptMe=Alle Staaten, ausser %s
 AccountantFiles=Geschäftsvorgänge exportieren
-ExportAccountingSourceDocHelp=Mit diesem Tool können Sie die Quellereignisse (Liste in CSV und PDFs) exportieren, die zur Erstellung Ihrer Buchhaltung verwendet werden.
+ExportAccountingSourceDocHelp=With this tool, you can search and export the source events that are used to generate your accountancy. <br>The exported ZIP file will contain the lists of requested items in CSV, as well as their attached files in their original format (PDF, ODT, DOCX...).
 ExportAccountingSourceDocHelp2=Die Journale exportierst du im Menu %s - %s.
 VueByAccountAccounting=Anzeigen nach Buchhaltungskonto
 VueBySubAccountAccounting=Anzeigen nach Nebenbuchkonto
@@ -232,6 +232,7 @@ AccountingAccountForSalesTaxAreDefinedInto=Obacht: Das Buchhaltungskonto für  d
 NumberOfAccountancyEntries=Anzahl Einträge
 NumberOfAccountancyMovements=Anzahl Bewegungen
 ACCOUNTING_DISABLE_BINDING_ON_SALES=Bindung & Übertragung in der Verkaufsbuchhaltung deaktivieren (Kundenrechnungen werden in der Buchhaltung nicht berücksichtigt)
+NotifiedValidationDate=Validate and Lock the exported entries <span class="warning">(same effect than the "%s" feature, modification and deletion of the lines will DEFINITELY not be possible)</span>
 ConfirmExportFile=Bestätigen der Generierung der Buchhaltungsexportdatei ?
 ExportDraftJournal=Exportiere Entwurfsjournal
 Modelcsv=Exportformat
diff --git a/htdocs/langs/de_CH/admin.lang b/htdocs/langs/de_CH/admin.lang
index 5fd45270f3d..3529a5b6b40 100644
--- a/htdocs/langs/de_CH/admin.lang
+++ b/htdocs/langs/de_CH/admin.lang
@@ -192,6 +192,7 @@ DownloadPackageFromWebSite=Lade das gefundene Paket herunter (zum Beispiel von d
 UnpackPackageInDolibarrRoot=Entpacke das Archiv in dein aktuelles Dolibarr Verzeichnis: <b>%s</b>.
 SetupIsReadyForUse=Modulinstallation abgeschlossen. Aktiviere und konfiguriere nun das Modul im Menu "<a href="%s">%s</a>".
 InfDirExample=<br>Dann deklariere in <strong>conf.php</strong><br> $dolibarr_main_url_root_alt='/custom'<br>$dolibarr_main_document_root_alt='/path/of/dolibarr/htdocs/custom'<br>\n"#" heisst, die Variablen sind auskommentiert und werden nicht berücksichtigt.\nEntferne einfach "#", um die Variablen scharf zu schalten.
+CurrentVersion=Aktuelle dolibarr-Version
 CallUpdatePage=Zur Aktualisierung der Daten und der Datenbankstruktur gehst du zur Seite %s.
 UpdateServerOffline=Update-Server offline
 WithCounter=Zähler verwalten
@@ -255,6 +256,7 @@ SetAsDefault=Als Standard definieren
 InstalledInto=Installiert im Verzeichnis %s
 BarcodeInitForThirdparties=Barcode Init. für alle Partner
 BarcodeInitForProductsOrServices=Alle Strichcodes für Produkte oder Services initialisieren oder zurücksetzen
+InitEmptyBarCode=Init value for the %s empty barcodes
 EraseAllCurrentBarCode=Alle aktuellen Barcode-Werte löschen
 ConfirmEraseAllCurrentBarCode=Wirklich alle aktuellen Barcode-Werte löschen?
 AllBarcodeReset=Alle Barcode-Werte wurden entfernt
@@ -593,6 +595,7 @@ MailToSendProposal=Angebote Kunde
 MailToSendOrder=Kundenbestellungen
 MailToSendIntervention=Arbeitseinsätze
 MailToSendReception=Lieferungen
+MailToExpenseReport=Spesenrapporte
 ModelModulesProduct=Vorlage für Produktdokumente
 SeeSubstitutionVars=Siehe * für eine Liste der Verfügbaren Variablen
 AddRemoveTabs=Tab hinzufügen oder entfernen
@@ -626,7 +629,7 @@ NewEmailCollector=Neuer E-Mail - Sammeldienst
 EMailHost=IMAP Server Host
 EmailCollectorConfirmCollectTitle=E-Mail - Sammeldienst Bestätigung
 NoNewEmailToProcess=Ich habe keinen neuen E-Mails (die zu den Filtern passen) abzuarbeiten.
-OperationParamDesc=Define the rules to use to extract or set values.<br>Example for operations that need to extract a name from email subject:<br>name=EXTRACT:SUBJECT:Message from company ([^\n]*)<br>Example for operations that create objects:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value including value of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
+OperationParamDesc=Define the rules to use to extract some data or set values to use for operation.<br><br>Example to extract a company name from email subject into a temporary variable:<br>tmp_var=EXTRACT:SUBJECT:Message from company ([^\n]*)<br><br>Examples to set the properties of an object to create:<br>objproperty1=SET:a hard coded value<br>objproperty2=SET:__tmp_var__<br>objproperty3=SETIFEMPTY:a value (value is set only if property is not already defined)<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
 ResourceSetup=Modul Ressourcen einrichten
 UseSearchToSelectResource=Zeige eine Suchmaske für Ressourcen, statt eine Drop-down - Liste
 DisabledResourceLinkUser=Verknüpfungsmöglichkeit zwischen Ressource und Benutzer unterbinden.
diff --git a/htdocs/langs/de_CH/banks.lang b/htdocs/langs/de_CH/banks.lang
index 17a8a1189bf..97978944dc1 100644
--- a/htdocs/langs/de_CH/banks.lang
+++ b/htdocs/langs/de_CH/banks.lang
@@ -1,18 +1,14 @@
 # Dolibarr language file - Source file is en_US - banks
 MenuBankCash=Bank | Bar
 FinancialAccount=Finanzkonto
-BankAccount=Bankkonto
 BankAccounts=Kontenübersicht
 BankAccountsAndGateways=Bankkonten | Schnittstellen
 AccountRef=Konto-Referenz
-AccountLabel=Kontobezeichnung
 CashAccount=Kasse
 CashAccounts=Kassen
 BankBalanceBefore=Bilanz vor
 BankBalanceAfter=Bilanz nach
 AllTime=Vom start
-Reconciliation=Zahlungsabgleich
-RIB=Kontonummer
 SwiftValid=BIC/SWIFT gültig
 SwiftNotValid=BIC/SWIFT ungültig
 IbanValid=BAN gültig
@@ -44,8 +40,6 @@ Conciliated=Ausgeglichen
 BankLineConciliated=Transaktion mit Bankbeleg ausgeglichen
 SupplierInvoicePayment=Lieferantenzahlung
 MenuBankInternalTransfer=Kontoübertrag
-TransferFrom=Von
-TransferTo=An
 CheckTransmitter=Absender
 ValidateCheckReceipt=Chequebeleg genehmigen?
 DeleteCheckReceipt=Chequebeleg löschen?
diff --git a/htdocs/langs/de_DE/accountancy.lang b/htdocs/langs/de_DE/accountancy.lang
index e8e2f413cd7..eeb63ab1489 100644
--- a/htdocs/langs/de_DE/accountancy.lang
+++ b/htdocs/langs/de_DE/accountancy.lang
@@ -48,8 +48,9 @@ CountriesNotInEEC=Nicht-EU Länder
 CountriesInEECExceptMe=EU-Länder außer %s
 CountriesExceptMe=Alle Länder außer %s
 AccountantFiles=Belegdokumente exportieren
-ExportAccountingSourceDocHelp=Mit diesem Tool können Sie die Quellereignisse (CSV-Liste und PDFs) exportieren, die zur Erstellung Ihrer Buchhaltung verwendet werden.
+ExportAccountingSourceDocHelp=Mit diesem Tool können Sie die Quellereignisse suchen und exportieren, die zum Erstellen Ihrer Buchhaltung verwendet werden. <br> Die exportierte ZIP-Datei enthält die Listen der angeforderten Buchhaltungsdaten im CSV-Format sowie die zugehörigen Dokumente im Originalformat (PDF, ODT, DOCX...).
 ExportAccountingSourceDocHelp2=Um Ihre Journale zu exportieren, verwenden Sie den Menüeintrag %s - %s.
+ExportAccountingProjectHelp=Geben Sie ein Projekt an, wenn Sie einen Buchhaltungsbericht nur für ein bestimmtes Projekt benötigen. Spesenabrechnungen und Darlehenszahlungen sind in den Projektberichten nicht enthalten.
 VueByAccountAccounting=Ansicht nach Buchungskonto
 VueBySubAccountAccounting=Ansicht nach Buchhaltungsunterkonto
 
@@ -181,8 +182,10 @@ ACCOUNTING_ACCOUNT_SUSPENSE=Verrechnungskonto/Zwischenkonto
 DONATION_ACCOUNTINGACCOUNT=Buchungskonto für Spenden
 ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT=Buchungskonto für Abonnements
 
-ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT=Standard-Buchungskonto zur Registrierung der Kundeneinzahlung
+ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT=Standard-Buchungskonto zur Erfassung einer Kundenanzahlung
 UseAuxiliaryAccountOnCustomerDeposit=Debitorenkonto als Einzelkonto im Nebenbuch für Anzahlungspositionen hinterlegen (bei Deaktivierung bleibt Einzelkonto für Anzahlungspositionen leer)
+ACCOUNTING_ACCOUNT_SUPPLIER_DEPOSIT=Standard-Buchungskonto zur Erfassung der Lieferantenkaution
+UseAuxiliaryAccountOnSupplierDeposit=Lieferantenkonto als Einzelkonto im Nebenbuch für Anzahlungsbuchungen speichern (falls deaktiviert, bleibt Einzelkonto für Anzahlungsbuchungen leer)
 
 ACCOUNTING_PRODUCT_BUY_ACCOUNT=Standard-Buchungskonto für gekaufte Produkte \n(wenn nicht anders im Produktblatt definiert)
 ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT=Standard-Buchungskonto für gekaufte Produkte in der EWG (wird verwendet, wenn nicht im Produktblatt definiert)
@@ -192,8 +195,8 @@ ACCOUNTING_PRODUCT_SOLD_INTRA_ACCOUNT=Standard-Buchungskonto für in die EWG ver
 ACCOUNTING_PRODUCT_SOLD_EXPORT_ACCOUNT=Standard-Buchungskonto für außerhalb der EWG verkaufte Produkte [EXPORT] \n(wird verwendet, wenn nicht im Produktblatt definiert) 
 
 ACCOUNTING_SERVICE_BUY_ACCOUNT=Standard-Buchungskonto für die gekauften Leistungen (wenn nicht anders im Produktblatt definiert)
-ACCOUNTING_SERVICE_BUY_INTRA_ACCOUNT=Standardmäßig Buchungskonto für eingekaufte Dienstleistungen in der EWG (wird verwendet, wenn nicht im Leistungsblatt definiert)
-ACCOUNTING_SERVICE_BUY_EXPORT_ACCOUNT=Standardmäßig Buchungskonto für die gekauften und aus der EWG importierten Dienstleistungen (wird verwendet, wenn nicht im Leistungsblatt definiert)
+ACCOUNTING_SERVICE_BUY_INTRA_ACCOUNT=Standard-Buchungskonto für eingekaufte Dienstleistungen in der EWG (wird verwendet, wenn nicht im Leistungsblatt definiert)
+ACCOUNTING_SERVICE_BUY_EXPORT_ACCOUNT=Standard-Buchungskonto für die gekauften und aus der EWG importierten Dienstleistungen (wird verwendet, wenn nicht im Leistungsblatt definiert)
 ACCOUNTING_SERVICE_SOLD_ACCOUNT=Standard-Buchungskonto für die verkauften Leistungen (wenn nicht anders im Produktblatt definiert)
 ACCOUNTING_SERVICE_SOLD_INTRA_ACCOUNT=Standard-Buchungskonto für in die EWG verkaufte Dienstleistungen \n(wird verwendet, wenn nicht im Produktblatt definiert) 
 ACCOUNTING_SERVICE_SOLD_EXPORT_ACCOUNT=Standard-Buchungskonto für außerhalb der EWG verkaufte Dienstleistungen [EXPORT] \n(wird verwendet, wenn nicht im Produktblatt definiert) 
@@ -332,7 +335,7 @@ ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS=Deaktivieren Sie die Bindung und Ü
 
 ## Export
 NotifiedExportDate=Exportierte Zeilen als exportiert kennzeichnen <span class="warning">(um eine Zeile zu ändern, müssen Sie die gesamte Transaktion löschen und erneut in die Buchhaltung übertragen)</span>
-NotifiedValidationDate=Festschreiben der exportierten Einträge <span class="warning">(gleiche Wirkung wie die "Abschluss"-Funktion, Änderungen und Löschungen der Zeilen sind DEFINITIV NICHT möglich)</span>
+NotifiedValidationDate=Festschreiben der exportierten Einträge <span class="warning">(gleiche Wirkung wie die Funktion  "%s", Änderungen und Löschungen der Zeilen sind danach DEFINITIV NICHT möglich)</span>
 DateValidationAndLock=Festschreibungsdatum
 ConfirmExportFile=Exportdatei der Buchhaltung erstellen?
 ExportDraftJournal=Entwurfsjournal exportieren
@@ -413,7 +416,7 @@ ConfirmMassDeleteBookkeepingWriting=Bestätigung für Massenlöschen
 ConfirmMassDeleteBookkeepingWritingQuestion=Dadurch wird die Transaktion aus der Buchhaltung gelöscht (alle Zeilen, die sich auf dieselbe Transaktion beziehen, werden gelöscht). Möchten Sie die %s ausgewählten Datensätze wirklich löschen?
 
 ## Error
-SomeMandatoryStepsOfSetupWereNotDone=Einige zwingende Einstellungen wurden nicht gemacht, bitte vervollständigen sie die Einrichtung
+SomeMandatoryStepsOfSetupWereNotDone=Einige obligatorische Einstellungen wurden noch nicht vorgenommen, bitte vervollständigen Sie die Einrichtung.
 ErrorNoAccountingCategoryForThisCountry=Keine Buchhaltung Kategorie für das Land %s verfügbar (siehe Startseite - Einstellungen - Stammdaten)
 ErrorInvoiceContainsLinesNotYetBounded=Sie versuchen einige Rechnungspositionen der Rechnung <strong>%s</strong> zu journalisieren, aber einige Postionen sind keinem Buchungskonto zugewiesen. Alle Rechnungspositionen dieser Rechnung werden ignoriert.
 ErrorInvoiceContainsLinesNotYetBoundedShort=Einige Rechnungspositionen sind unkontiert.
diff --git a/htdocs/langs/de_DE/admin.lang b/htdocs/langs/de_DE/admin.lang
index a5cce538d5a..d1a296b7370 100644
--- a/htdocs/langs/de_DE/admin.lang
+++ b/htdocs/langs/de_DE/admin.lang
@@ -349,7 +349,7 @@ NotExistsDirect=Das alternative Stammverzeichnis ist nicht zu einem existierende
 InfDirAlt=Seit Version 3 ist es möglich, ein alternatives Stammverzeichnis anzugeben. Dies ermöglicht, Erweiterungen und eigene Templates am gleichen Ort zu speichern.<br>Erstellen Sie einfach ein Verzeichis im Hauptverzeichnis von Dolibarr an (z.B. "custom").<br>
 InfDirExample=<br>Danach in der Datei <strong>conf.php</strong> deklarieren<br> $dolibarr_main_root_alt='/custom'<br>$dolibarr_main_document_root_alt='/path/of/dolibarr/htdocs/custom'<br>Wenn diese Zeilen mit "#" auskommentiert sind, um sie zu aktivieren, einfach das Zeichen "#" entfernen.
 YouCanSubmitFile=Die ZIP-Datei des Modulpakets kann von hier hochgeladen werden:
-CurrentVersion=Aktuelle dolibarr-Version
+CurrentVersion=Aktuelle Dolibarr-Version
 CallUpdatePage=Zur Aktualisierung der Daten und Datenbankstrukturen zur Seite %s gehen.
 LastStableVersion=Letzte stabile Version
 LastActivationDate=Datum der letzten Aktivierung
@@ -477,7 +477,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=Startwert für die nächsten %s leeren Datensätze
+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
@@ -714,6 +714,7 @@ Permission27=Angebote löschen
 Permission28=Angebote exportieren
 Permission31=Produkte/Leistungen einsehen
 Permission32=Produkte/Leistungen erstellen/bearbeiten
+Permission33=Preise für Produkte einsehen 
 Permission34=Produkte/Leistungen löschen
 Permission36=Projekte/Leistungen exportieren
 Permission38=Produkte exportieren
@@ -739,6 +740,7 @@ Permission79=Abonnements erstellen/bearbeiten
 Permission81=Kundenaufträge einsehen
 Permission82=Kundenaufträge erstellen/bearbeiten
 Permission84=Kundenaufträge freigeben
+Permission85=Generieren Sie die Belege Verkaufsaufträge
 Permission86=Kundenaufträge per E-Mail versenden
 Permission87=Kundenaufträge abschließen
 Permission88=Kundenaufträge verwerfen
@@ -874,6 +876,7 @@ Permission525=Zugriff auf Darlehensrechner
 Permission527=Darlehen exportieren
 Permission531=Leistungen einsehen
 Permission532=Leistungen erstellen/bearbeiten
+Permission533=Preise für Leistungen einsehen
 Permission534=Leistungen löschen
 Permission536=Versteckte Leistungen einsehen/verwalten
 Permission538=Leistungen exportieren
@@ -1235,6 +1238,7 @@ BrowserName=Browsername
 BrowserOS=Betriebssystem des Browsers
 ListOfSecurityEvents=Liste der sicherheitsrelevanten Ereignisse
 SecurityEventsPurged=Security-Ereignisse gelöscht
+TrackableSecurityEvents=Zu erfassende Sicherheitsereignisse
 LogEventDesc=Aktivieren Sie die Protokollierung für bestimmte Sicherheitsereignisse. Administrieren Sie das Protokoll über Menü <b> %s - %s </b>. Achtung, diese Funktion kann eine große Datenmenge in der Datenbank erzeugen.
 AreaForAdminOnly=Einstellungen können nur durch </b>Administratoren</b> verändert werden.
 SystemInfoDesc=Verschiedene systemrelevante, technische Informationen - Lesemodus und nur für Administratoren sichtbar.
@@ -1977,6 +1981,7 @@ MailToSendSupplierOrder=Lieferantenbestellungen
 MailToSendSupplierInvoice=Lieferantenrechnungen
 MailToSendContract=Verträge
 MailToSendReception=Wareneingänge
+MailToExpenseReport=Spesenabrechnungen
 MailToThirdparty=Geschäftspartner
 MailToMember=Mitglieder
 MailToUser=Benutzer
@@ -2030,6 +2035,7 @@ MAIN_PDF_MARGIN_RIGHT=Rechter Rand im PDF
 MAIN_PDF_MARGIN_TOP=Oberer Rand im PDF
 MAIN_PDF_MARGIN_BOTTOM=Unterer Rand im PDF
 MAIN_DOCUMENTS_LOGO_HEIGHT=Höhe des Logos im PDF
+DOC_SHOW_FIRST_SALES_REP=Ersten Vertriebsmitarbeiter anzeigen
 MAIN_GENERATE_PROPOSALS_WITH_PICTURE=Spalte für Bild in Angebotspositionen hinzufügen
 MAIN_DOCUMENTS_WITH_PICTURE_WIDTH=Breite der Spalte, wenn den Positionen ein Bild hinzugefügt wird
 MAIN_PDF_NO_SENDER_FRAME=Rahmen des Absenderadressbereichs ausblenden
@@ -2063,6 +2069,12 @@ EmailCollectors=E-Mail-Kollektoren
 EmailCollectorDescription=Fügt einen geplanten Auftrag und eine Einrichtungsseite hinzu, um regelmäßig E-Mail-Postfächer (unter Verwendung des IMAP-Protokolls) zu scannen und E-Mails, die in Ihrer Anwendung eingegangen sind, am richtigen Ort aufzuzeichnen und / oder einige Datensätze automatisch zu erstellen (z. B. Leads).
 NewEmailCollector=Neuer eMail-Colletor
 EMailHost=Hostname des IMAP-Servers
+EMailHostPort=Port des E-Mail-IMAP-Servers
+loginPassword=Login/Passwort
+oauthToken=Oauth2-Token
+accessType=Zugriffstyp
+oauthService=Oauth-Dienst
+TokenMustHaveBeenCreated=Das Modul OAuth2 muss aktiviert sein und ein Oauth2-Token muss mit den richtigen Berechtigungen erstellt worden sein (z. B. Geltungsbereich „gmail_full“ bei OAuth für Gmail).
 MailboxSourceDirectory=Quellverzechnis des eMail-Kontos
 MailboxTargetDirectory=Zielverzechnis des eMail-Kontos
 EmailcollectorOperations=Aktivitäten, die der eMail-Collector ausführen soll
@@ -2106,7 +2118,7 @@ CreateCandidature=Stellen-Bewerbung erstellen
 FormatZip=Zip
 MainMenuCode=Menüpunktcode (Hauptmenü)
 ECMAutoTree=Automatischen ECM-Baum anzeigen
-OperationParamDesc=Definieren Sie die Regeln, die zum Extrahieren oder Festlegen von Werten verwendet werden sollen. <br> Beispiel für Operationen, die einen Namen aus dem E-Mail-Betreff extrahieren: <br> name=EXTRACT:SUBJECT:Message_from_company ([^]*) <br> Beispiel für Operationen, die Objekte erstellen:<br>objproperty1=SET:der_zu_setzende_Wert <br>objproperty2=SET:ein_Wert,_der_auch__objproperty1__ enthalten_kann<br>obproperty3=SETIFEMPTY:verwendeter_Wert_wenn_objproperty3_nicht_definiert_ist<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>  object.objproperty5=EXTRACT:BODY:Mein Firmenname ist\\s( [^\\s]*)<br><br> Verwenden Sie ein ; als Trennzeichen, um mehrere Eigenschaften zu extrahieren oder festzulegen.
+OperationParamDesc=Definieren Sie die Regeln, die verwendet werden sollen, um einige Daten zu extrahieren, oder legen Sie Werte fest, die für den Vorgang verwendet werden sollen. <br> <br> Beispiel zum Extrahieren eines Firmennamens aus dem E-Mail-Betreff in eine temporäre Variable: <br> tmp_var=EXTRACT:SUBJECT:Nachricht von Firma ([^\n]*) <br> <br> Beispiele zum Festlegen der Eigenschaften eines zu erstellenden Objekts: <br> objproperty1=SET:ein hartcodierter Wert <br> objproperty2=SET:__tmp_var__ <br> objproperty3=SETIFEMPTY:ein Wert (Wert wird nur gesetzt, wenn die Property nicht schon definiert ist) <br> objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*) <br> options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*) <br> object.objproperty5=EXTRACT:BODY:My Firmenname ist\\s([^\\s]*) <br> <br> Verwenden Sie ein Semikolon ; als Trennzeichen, um mehrere Eigenschaften zu extrahieren oder festzulegen.
 OpeningHours=Öffnungszeiten
 OpeningHoursDesc=Geben sie hier die regulären Öffnungszeiten ihres Unternehmens an.
 ResourceSetup=Konfiguration vom Ressourcenmodul
@@ -2212,6 +2224,7 @@ NoExternalModuleWithUpdate=Keine Updates für externe Module gefunden
 SwaggerDescriptionFile=Swagger API-Beschreibungsdatei (zum Beispiel zur Verwendung mit Redoc)
 YouEnableDeprecatedWSAPIsUseRESTAPIsInstead=Sie haben die veraltete WS-API aktiviert. Sie sollten stattdessen die REST-API verwenden.
 RandomlySelectedIfSeveral=Zufallsauswahl, wenn mehrere Bilder vorhanden sind
+SalesRepresentativeInfo=Für Angebote, Aufträge, Rechnungen.
 DatabasePasswordObfuscated=Das Datenbankpasswort ist in der conf-Datei verschleiert
 DatabasePasswordNotObfuscated=Das Datenbankpasswort ist in der conf-Datei NICHT verschleiert
 APIsAreNotEnabled=Es sind keine API-Module aktiviert.
@@ -2277,5 +2290,20 @@ INVOICE_ADD_ZATCA_QR_CODEMore=Einige arabische Länder benötigen diesen QR-Code
 INVOICE_ADD_SWISS_QR_CODE=Schweizer QR-Rechnungscode auf Rechnungen anzeigen
 UrlSocialNetworksDesc=URL-Link des sozialen Netzwerks. Verwenden Sie {socialid} für den variablen Teil, der die ID des sozialen Netzwerks enthält.
 IfThisCategoryIsChildOfAnother=Wenn diese Kategorie unterhalb einer anderen ist
+DarkThemeMode=Dark Theme-Modus
+AlwaysDisabled=Immer deaktiviert
+AccordingToBrowser=Je nach Browser
+AlwaysEnabled=Immer aktiviert
+DoesNotWorkWithAllThemes=Funktioniert nicht mit allen Themes
 NoName=Kein Name
+ShowAdvancedOptions= Erweiterte Optionen anzeigen
+HideAdvancedoptions= Erweiterte Optionen ausblenden
 CIDLookupURL=Das Modul bringt eine URL mit, die von einem externen Tool verwendet werden kann, um den Namen eines Geschäftspartners oder Kontakts aus seiner Telefonnummer zu ermitteln. Zu verwendende URL ist:
+OauthNotAvailableForAllAndHadToBeCreatedBefore=Die OAUTH2-Authentifizierung ist nicht für alle Hosts verfügbar, und ein Token mit den richtigen Berechtigungen muss im Vorfeld mit dem OAUTH-Modul erstellt worden sein
+MAIN_MAIL_SMTPS_OAUTH_SERVICE=OAUTH2-Authentifizierungsdienst
+DontForgetCreateTokenOauthMod=Ein Token mit den richtigen Berechtigungen muss zuvor mit dem OAUTH-Modul erstellt worden sein
+MAIN_MAIL_SMTPS_AUTH_TYPE=Authentifizierungsmethode
+UsePassword=Passwort verwenden
+UseOauth=OAUTH-Token verwenden
+Images=Bilder
+MaxNumberOfImagesInGetPost=Maximal zulässige Anzahl von Bildern, die in einem HTML-Feld in einem Formular eingefügt werden können
diff --git a/htdocs/langs/de_DE/agenda.lang b/htdocs/langs/de_DE/agenda.lang
index ad2e71909a8..6236ce05914 100644
--- a/htdocs/langs/de_DE/agenda.lang
+++ b/htdocs/langs/de_DE/agenda.lang
@@ -57,6 +57,7 @@ MemberValidatedInDolibarr=Mitglied %s freigegeben
 MemberModifiedInDolibarr=Mitglied %s geändert
 MemberResiliatedInDolibarr=Mitglied %s aufgehoben
 MemberDeletedInDolibarr=Mitglied %s gelöscht
+MemberExcludedInDolibarr=Mitglied %s ausgeschlossen
 MemberSubscriptionAddedInDolibarr=Abonnement %s für Mitglied %s hinzugefügt
 MemberSubscriptionModifiedInDolibarr=Abonnement %s für Mitglied %s geändert
 MemberSubscriptionDeletedInDolibarr=Abonnement %s für Mitglied %s gelöscht
@@ -159,6 +160,7 @@ DateActionBegin=Startzeit des Ereignis
 ConfirmCloneEvent=Möchten Sie dieses Ereignis <b>%s</b> wirklich duplizieren?
 RepeatEvent=Wiederhole Ereignis
 OnceOnly=Nur einmal
+EveryDay=Jeden Tag
 EveryWeek=Jede Woche
 EveryMonth=Jeden Monat
 DayOfMonth=Tag des Monat
@@ -174,3 +176,4 @@ AddReminder=Erstellt eine automatische Erinnerungsbenachrichtigung für dieses E
 ErrorReminderActionCommCreation=Fehler beim Erstellen der Erinnerungsbenachrichtigung für dieses Ereignis
 BrowserPush=Browser-Popup-Benachrichtigung
 ActiveByDefault=Standardmäßig aktiviert
+Until=bis
diff --git a/htdocs/langs/de_DE/banks.lang b/htdocs/langs/de_DE/banks.lang
index cd5cac4c215..7fe61fb045b 100644
--- a/htdocs/langs/de_DE/banks.lang
+++ b/htdocs/langs/de_DE/banks.lang
@@ -5,17 +5,17 @@ MenuVariousPayment=Sonstige Zahlungen
 MenuNewVariousPayment=Neue sonstige Zahlung
 BankName=Name der Bank
 FinancialAccount=Konto
-BankAccount=Bankkonto – Übersicht
+BankAccount=Bankkonto
 BankAccounts=Bankkonten
 BankAccountsAndGateways=Bankkonten | Gateways
 ShowAccount=Zeige Konto
-AccountRef=Finanzkonto Nr./Ref.
-AccountLabel=Bezeichnung Finanzkontos
+AccountRef=Bankkonto Nr./Ref.
+AccountLabel=Kontobezeichnung
 CashAccount=Geldkonto
 CashAccounts=Geldkonten
 CurrentAccounts=Girokonten
 SavingAccounts=Sparkonten
-ErrorBankLabelAlreadyExists=Kontenbezeichnung existiert bereits
+ErrorBankLabelAlreadyExists=Kontobezeichnung existiert bereits
 BankBalance=Kontostand
 BankBalanceBefore=Saldo (vorher)
 BankBalanceAfter=Bilanz (nachher)
@@ -27,8 +27,8 @@ CurrentBalance=Aktueller Kontostand
 FutureBalance=Zukünftiger Kontostand
 ShowAllTimeBalance=Zeige Kontostand seit Eröffnung
 AllTime=Beginn ab
-Reconciliation=Zahlungsausgleich
-RIB=Bank Kontonummer
+Reconciliation=Zahlungsabgleich
+RIB=Kontonummer
 IBAN=IBAN
 BIC=BIC / SWIFT-Code
 SwiftValid=BIC / SWIFT-Code gültig
@@ -51,15 +51,15 @@ BankAccountOwner=Kontoinhaber
 BankAccountOwnerAddress=Kontoinhaber-Adresse
 CreateAccount=Konto erstellen
 NewBankAccount=Neues Konto
-NewFinancialAccount=Neues Finanzkonto
-MenuNewFinancialAccount=Neues Finanzkonto
+NewFinancialAccount=Neues Konto
+MenuNewFinancialAccount=Neues Konto
 EditFinancialAccount=Konto bearbeiten
 LabelBankCashAccount=Bank- oder Kassenbezeichnung
 AccountType=Art des Kontos
 BankType0=Sparkonto
 BankType1=Girokonto
 BankType2=Kasse
-AccountsArea=Finanzkonten
+AccountsArea=Konten
 AccountCard=Konto – Übersicht
 DeleteAccount=Konto löschen
 ConfirmDeleteAccount=Sind Sie sicher, dass Sie dieses Konto löschen wollen?
@@ -70,23 +70,23 @@ RemoveFromRubrique=Aus Kostenstelle entfernen
 RemoveFromRubriqueConfirm=Möchten Sie die Verknüpfung zwischen dieser Transaktion und der Kategorie entfernen?
 ListBankTransactions=Liste von Bank-Transaktionen
 IdTransaction=Transaktions-ID
-BankTransactions=Bank-Transaktionen
+BankTransactions=Banktransaktionen
 BankTransaction=Bank-Transaktion
-ListTransactions=Liste Einträge
-ListTransactionsByCategory=Liste Einträge/Kategorie
-TransactionsToConciliate=Einträge zum Ausgleichen
+ListTransactions=Transaktionsliste
+ListTransactionsByCategory=Transaktionen/Kategorie
+TransactionsToConciliate=Einträge zum Abgleichen
 TransactionsToConciliateShort=Auszugleichen
-Conciliable=Kann ausgeglichen werden
-Conciliate=Ausgleichen
-Conciliation=Ausgleich
+Conciliable=Kann abgeglichen werden
+Conciliate=Abgleichen
+Conciliation=Abgleich
 SaveStatementOnly=Nur Buchung speichern
-ReconciliationLate=Zahlungsausgleich spät
+ReconciliationLate=Zahlungsabgleich überfällig
 IncludeClosedAccount=Geschlossene Konten miteinbeziehen
 OnlyOpenedAccount=nur geöffnete Konten
 AccountToCredit=Konto für Gutschrift
 AccountToDebit=Zu belastendes Konto
-DisableConciliation=Zahlungsausgleich für dieses Konto deaktivieren
-ConciliationDisabled=Zahlungsausgleich deaktiviert
+DisableConciliation=Funktion Zahlungsabgleich für dieses Konto deaktivieren
+ConciliationDisabled=Funktion Zahlungsabgleich deaktiviert
 LinkedToAConciliatedTransaction=Verknüpft mit einer beschwichtigen Transaktion
 StatusAccountOpened=Offen
 StatusAccountClosed=Geschlossen
@@ -94,12 +94,12 @@ AccountIdShort=Nummer
 LineRecord=Transaktion
 AddBankRecord=Erstelle Transaktion
 AddBankRecordLong=Eintrag manuell hinzufügen
-Conciliated=ausgeglichen
-ReConciliedBy=Ausgeglichen durch
+Conciliated=Abgeglichen
+ReConciliedBy=Abgeglichen durch
 DateConciliating=Ausgleichsdatum
 BankLineConciliated=Eintrag mit Bankbeleg abgeglichen
-BankLineReconciled=ausgeglichen
-BankLineNotReconciled=nicht ausgeglichen
+BankLineReconciled=Abgeglichen
+BankLineNotReconciled=Nicht abgeglichen
 CustomerInvoicePayment=Kundenzahlung
 SupplierInvoicePayment=Lieferanten Zahlung
 SubscriptionPayment=Beitragszahlung
@@ -107,10 +107,10 @@ WithdrawalPayment=Lastschrift
 SocialContributionPayment=Zahlung von Steuern/Sozialabgaben
 BankTransfer=Überweisung
 BankTransfers=Überweisungen
-MenuBankInternalTransfer=interner Transfer
+MenuBankInternalTransfer=Interner Transfer
 TransferDesc=Verwenden Sie die interne Überweisung, um von einem Konto auf ein anderes zu überweisen. Die Anwendung schreibt zwei Datensätze: eine Belastung auf dem Quellkonto und eine Gutschrift auf dem Zielkonto. Für diese Transaktion werden derselbe Betrag, Bezeichnung und Datum verwendet.
-TransferFrom=von
-TransferTo=bis
+TransferFrom=Von
+TransferTo=An
 TransferFromToDone=Eine Überweisung <b>von %s nach %s iHv %s %s</b> wurde verbucht.
 CheckTransmitter=Absenderadresse
 ValidateCheckReceipt=Rechnungseingang gültig?
@@ -137,18 +137,18 @@ PaymentDateUpdateSucceeded=Zahlungsdatum erforlgreich aktualisiert
 PaymentDateUpdateFailed=Zahlungsdatum konnte nicht aktualisiert werden
 Transactions=Transaktionen
 BankTransactionLine=Bank-Transaktionen
-AllAccounts=Alle Finanzkonten
+AllAccounts=Alle Bank- und Bargeldkonten
 BackToAccount=Zurück zum Konto
-ShowAllAccounts=Alle Finanzkonten
-FutureTransaction=Zukünftige Transaktion. Ausgleichen nicht möglich.
+ShowAllAccounts=Für alle Bankkonten anzeigen
+FutureTransaction=Zukünftige Transaktion. Abgleich nicht möglich.
 SelectChequeTransactionAndGenerate=Wählen/filtern Sie die Schecks, die in den Scheckeinzahlungsbeleg aufgenommen werden sollen. Klicken Sie anschließend auf „Erstellen“.
-InputReceiptNumber=Wählen Sie den Kontoauszug  der mit der Zahlung übereinstimmt. Verwenden Sie einen sortierbaren numerischen Wert: YYYYMM oder YYYYMMDD
+InputReceiptNumber=Wählen Sie den Kontoauszug, auf dem die Zahlung erfasst ist. Verwenden Sie einen sortierbaren numerischen Wert: YYYYMM oder YYYYMMDD
 EventualyAddCategory=Wenn möglich Kategorie angeben, in der die Daten eingeordnet werden
 ToConciliate=auszugleichen ?
 ThenCheckLinesAndConciliate=Dann die Zeilen im Bankauszug prüfen und Klicken
-DefaultRIB=Standard Bankkonto-Nummer
+DefaultRIB=Standardkonto
 AllRIB=Alle Bankkonto-Nummern
-LabelRIB=Bankkonto Bezeichnung
+LabelRIB=Bezeichnung Bankkonto
 NoBANRecord=Keine Bankkonto-Nummern Einträge
 DeleteARib=Lösche Bankkonto-Nummern Eintrag
 ConfirmDeleteRib=Sind Sie sicher, dass Sie diesen Bankkonto-Nummern Eintrag löschen wollen?
@@ -161,7 +161,7 @@ BankAccountModelModule=Dokumentvorlagen für Bankkonten
 DocumentModelSepaMandate=Vorlage für SEPA Mandate. Nur sinnvoll in EU Ländern.
 DocumentModelBan=Template für den Druck von Seiten mit Bankkonto-Nummern Eintrag.
 NewVariousPayment=Neue sonstige Zahlung
-VariousPayment=Sonstige Bezahlung
+VariousPayment=Sonstige Zahlungen
 VariousPayments=Sonstige Zahlungen
 ShowVariousPayment=Sonstige Zahlung anzeigen
 AddVariousPayment=Sonstige Zahlung hinzufügen
@@ -172,8 +172,8 @@ SEPAMandate=SEPA Mandat
 YourSEPAMandate=Ihr SEPA-Mandat
 FindYourSEPAMandate=Dies ist Ihr SEPA-Mandat, um unser Unternehmen zu ermächtigen, fällige Beträge bei Ihrer Bank per Lastschrift einzuziehen. Senden Sie es unterschrieben per E-Mail (Scan des unterschriebenen Dokuments) oder per Post an
 AutoReportLastAccountStatement=Füllen Sie das Feld 'Nummer des Kontoauszugs' bei der Abstimmung automatisch mit der Nummer des letzten Kontoauszugs
-CashControl=POS-Kassensteuerung
-NewCashFence=Neue Kassensteuerung (Öffnen oder Schließen )
+CashControl=POS Kassenbestand
+NewCashFence=Neuer Kassenbestand (Öffnen oder Schließen)
 BankColorizeMovement=Buchungen farbig darstellen
 BankColorizeMovementDesc=Wenn diese Funktion aktiviert ist, können Sie eine bestimmte Hintergrundfarbe für Debit- oder Kreditbewegungen auswählen
 BankColorizeMovementName1=Hintergrundfarbe für Sollbuchungen
@@ -185,3 +185,4 @@ AlreadyOneBankAccount=Es wurde bereits ein Bankkonto definiert
 SEPAXMLPlacePaymentTypeInformationInCreditTransfertransactionInformation=SEPA-Überweisung: „Zahlungsart“ auf Ebene „Überweisung“.
 SEPAXMLPlacePaymentTypeInformationInCreditTransfertransactionInformationHelp=Bei der Generierung einer SEPA-XML-Datei für Überweisungen kann nun der Abschnitt „PaymentTypeInformation“ innerhalb des Abschnitts „CreditTransferTransactionInformation“ platziert werden (statt im Abschnitt „Payment“). Wir empfehlen dringend, dies deaktiviert zu lassen, um PaymentTypeInformation auf Payment-Ebene zu platzieren, da nicht alle Banken es auf CreditTransferTransactionInformation-Ebene akzeptieren. Wenden Sie sich an Ihre Bank, bevor Sie PaymentTypeInformation auf der Ebene CreditTransferTransactionInformation platzieren.
 ToCreateRelatedRecordIntoBank=Um einen fehlenden zugehörigen Bankdatensatz zu erstellen
+BanklineExtraFields=Ergänzende Attribute Bankbuchung 
diff --git a/htdocs/langs/de_DE/bills.lang b/htdocs/langs/de_DE/bills.lang
index 352a5a567f7..10b75b18d0f 100644
--- a/htdocs/langs/de_DE/bills.lang
+++ b/htdocs/langs/de_DE/bills.lang
@@ -446,6 +446,7 @@ ErrorPaymentConditionsNotEligibleToDepositCreation=Die gewählten Zahlungsbeding
 PaymentTypeVIR=Banküberweisung
 PaymentTypeShortVIR=Banküberweisung
 PaymentTypePRE=Lastschrift
+PaymentTypePREdetails=(auf Rechnung *-%s)
 PaymentTypeShortPRE=Lastschrift
 PaymentTypeLIQ=Bar
 PaymentTypeShortLIQ=Bar
diff --git a/htdocs/langs/de_DE/blockedlog.lang b/htdocs/langs/de_DE/blockedlog.lang
index b2d033f5246..e651c440332 100644
--- a/htdocs/langs/de_DE/blockedlog.lang
+++ b/htdocs/langs/de_DE/blockedlog.lang
@@ -2,7 +2,7 @@ BlockedLog=Unveränderbare Logs
 Field=Feld
 BlockedLogDesc=Dieses Modul trägt in real time einige Events in eine Log (block chain), die nicht nicht verändert werden kann. Dieses Modul ermöglicht so eine Kompatibilität mit den Finanzregeln, die in einigen Ländern gemacht wurden (zB in Frankreich Loi de Finance 2016 NF525)
 Fingerprints=Eingetragene Events und Fingerprints
-FingerprintsDesc=Dies ist das Tool zum Durchsuchen oder Extrahieren der unveränderlichen Protokolle. Unveränderliche Protokolle werden in Echtzeit erstellt und lokal in einer dedizierten Tabelle archiviert, wenn Sie ein Geschäftsereignis aufzeichnen. Sie können dieses Tool verwenden, um dieses Archiv zu exportieren und in einem externen Speicher zu speichern (einige Länder, wie Frankreich, verlangen, dass Sie dies jedes Jahr tun). Beachten Sie, dass es keine Funktion zum Löschen dieses Protokolls gibt und jede Änderung, die direkt in diesem Protokoll vorgenommen werden soll (z. B. von einem Hacker), mit einem ungültigen Fingerabdruck gemeldet wird. Wenn Sie diese Tabelle wirklich löschen müssen, weil Sie Ihre Anwendung zu Demo-/Testzwecken verwendet haben und Ihre Daten bereinigen möchten, um mit der Produktion zu beginnen, können Sie Ihren Reseller oder Integrator bitten, Ihre Datenbank zurückzusetzen (alle Ihre Daten werden entfernt).
+FingerprintsDesc=Dies ist das Tool zum Durchsuchen oder Extrahieren der unveränderlichen Protokolle. Unveränderliche Protokolle werden in Echtzeit erstellt und lokal in einer dedizierten Tabelle archiviert, wenn Sie ein Geschäftsereignis aufzeichnen. Sie können dieses Tool verwenden, um dieses Archiv zu exportieren und in einem externen Speicher zu speichern (einige Länder, wie Frankreich, verlangen, dass Sie dies jedes Jahr tun). Beachten Sie, dass es keine Funktion zum Löschen dieses Protokolls gibt und jede Änderung, die direkt in diesem Protokoll vorgenommen wird, z. B. von einem Hacker, mit einem ungültigen digitalen Fingerabdruck gemeldet wird. Wenn Sie diese Tabelle wirklich löschen müssen, weil Sie Ihre Anwendung zu Demo-/Testzwecken verwendet haben und Ihre Daten bereinigen möchten, um mit der Produktion zu beginnen, können Sie Ihren Reseller oder Integrator bitten, Ihre Datenbank zurückzusetzen (alle Ihre Daten werden entfernt).
 CompanyInitialKey=Ihr Hashkey
 BrowseBlockedLog=Unveränderbare Logs
 ShowAllFingerPrintsMightBeTooLong=Unveränderbare Logs anzeigen (kann lange dauern...)
diff --git a/htdocs/langs/de_DE/bookmarks.lang b/htdocs/langs/de_DE/bookmarks.lang
index ffd5c5d9044..475220a35ab 100644
--- a/htdocs/langs/de_DE/bookmarks.lang
+++ b/htdocs/langs/de_DE/bookmarks.lang
@@ -20,3 +20,4 @@ ChooseIfANewWindowMustBeOpenedOnClickOnBookmark=Wählen Sie aus, ob die verlinkt
 BookmarksManagement=Verwalten von Lesezeichen
 BookmarksMenuShortCut=STRG + Umschalt + m
 NoBookmarks=Keine Lesezeichen definiert
+NoBookmarkFound=Kein Lesezeichen gefunden
diff --git a/htdocs/langs/el_GR/accountancy.lang b/htdocs/langs/el_GR/accountancy.lang
index 0bafe1eeb7b..724cd5fa56b 100644
--- a/htdocs/langs/el_GR/accountancy.lang
+++ b/htdocs/langs/el_GR/accountancy.lang
@@ -4,7 +4,7 @@ Accounting=Λογιστική
 ACCOUNTING_EXPORT_SEPARATORCSV=Διαχωριστικό στηλών για το αρχείο που θα εξαχθεί
 ACCOUNTING_EXPORT_DATE=Μορφή ημερομηνίας για το αρχείο που θα εξαχθεί
 ACCOUNTING_EXPORT_PIECE=Εξαγωγή του αριθμού καταχώρησης
-ACCOUNTING_EXPORT_GLOBAL_ACCOUNT=Εξαγωγή με καθολικό λογαριασμό
+ACCOUNTING_EXPORT_GLOBAL_ACCOUNT=Εξαγωγή γενικού λογαριασμού
 ACCOUNTING_EXPORT_LABEL=Εξαγωγή ετικέτας
 ACCOUNTING_EXPORT_AMOUNT=Εξαγωγή ποσού
 ACCOUNTING_EXPORT_DEVISE=Εξαγωγή νομίσματος
@@ -20,23 +20,23 @@ ProductForThisThirdparty=Προϊόν προς τρίτο μέρος
 ServiceForThisThirdparty=Υπηρεσία προς τρίτο μέρος
 CantSuggest=Δεν προτείνεται
 AccountancySetupDoneFromAccountancyMenu=Οι περισσότερες ρυθμίσεις της λογιστικής γίνονται από το μενού %s
-ConfigAccountingExpert=Διαμόρφωση της μονάδας λογιστική (διπλή εγγραφή)
-Journalization=Εγγραφή ημερολογίου
+ConfigAccountingExpert=Διαμόρφωση της ενότητας λογιστική (διπλή εγγραφή)
+Journalization=Καταχώρηση ημερολογίου
 Journals=Ημερολόγια
 JournalFinancial=Οικονομικά ημερολόγια
 BackToChartofaccounts=Επιστροφή στο λογιστικό σχέδιο 
 Chartofaccounts=Λογιστικό σχέδιο 
 ChartOfSubaccounts=Λογιστικό σχέδιο μεμονωμένων λογαριασμών
-ChartOfIndividualAccountsOfSubsidiaryLedger=Λογιστικό σχέδιο μεμονωμένων λογαριασμών του δευτερεύοντος καθολικού
-CurrentDedicatedAccountingAccount=Τρέχον ειδικό λογαριασμό
+ChartOfIndividualAccountsOfSubsidiaryLedger=Λογιστικό σχέδιο μεμονωμένων λογαριασμών του θυγατρικού καθολικού
+CurrentDedicatedAccountingAccount=Τρέχων αποκλειστικός λογαριασμός
 AssignDedicatedAccountingAccount=Νέος λογαριασμός προς ανάθεση
 InvoiceLabel=Ετικέτα τιμολογίου
 OverviewOfAmountOfLinesNotBound=Επισκόπηση του ποσού των γραμμών που δεν δεσμεύονται σε λογιστικό λογαριασμό
-OverviewOfAmountOfLinesBound=Επισκόπηση του ποσού των γραμμών που έχουν ήδη συνδεθεί με έναν λογαριασμό λογιστικής
+OverviewOfAmountOfLinesBound=Επισκόπηση του ποσού των γραμμών που έχουν ήδη δεσμευτεί σε έναν λογιστικό λογαριασμό
 OtherInfo=Άλλες πληροφορίες
 DeleteCptCategory=Κατάργηση λογαριασμού λογιστικής από την ομάδα
 ConfirmDeleteCptCategory=Είστε σίγουροι ότι θέλετε να καταργήσετε αυτόν τον λογαριασμό λογιστικής από την ομάδα λογαριασμών λογιστικής ;
-JournalizationInLedgerStatus=Κατάσταση της περιοδικής εγγραφής
+JournalizationInLedgerStatus=Κατάσταση καταχωρήσεων ημερολογίου
 AlreadyInGeneralLedger=Έχει ήδη μεταφερθεί στα λογιστικά ημερολόγια και το καθολικό
 NotYetInGeneralLedger=Δεν έχει μεταφερθεί ακόμη στα λογιστικά ημερολόγια και στο καθολικό
 GroupIsEmptyCheckSetup=Η ομάδα είναι κενή, ελέγξτε τη ρύθμιση της εξατομικευμένης ομάδας λογιστικής
@@ -47,43 +47,44 @@ CountriesInEEC=Χώρες στην Ε.Ε.
 CountriesNotInEEC=Χώρες που δεν ανήκουν στην Ε.Ε.
 CountriesInEECExceptMe=Χώρες στην Ε.Ε. εκτός από %s
 CountriesExceptMe=Όλες οι χώρες εκτός από %s
-AccountantFiles=Εξαγωγή εγγράφων προέλευσης
-ExportAccountingSourceDocHelp=Με αυτό το εργαλείο, μπορείτε να εξαγάγετε τα συμβάντα (λίστα σε CSV και PDF) που χρησιμοποιούνται για τη δημιουργία της λογιστικής σας.
+AccountantFiles=Εξαγωγή εγγράφων πηγής
+ExportAccountingSourceDocHelp=Με αυτό το εργαλείο, μπορείτε να αναζητήσετε και να εξαγάγετε τα συμβάντα πηγής που χρησιμοποιούνται για τη δημιουργία της λογιστικής σας. <br> Το εξαγόμενο αρχείο ZIP θα περιέχει τις λίστες των ζητούμενων στοιχείων σε CSV, καθώς και τα συνημμένα αρχεία τους στην αρχική τους μορφή (PDF, ODT, DOCX...).
 ExportAccountingSourceDocHelp2=Για να εξαγάγετε τα ημερολόγια σας, χρησιμοποιήστε την καταχώριση μενού %s - %s.
+ExportAccountingProjectHelp=Προσδιορίστε ένα έργο εάν χρειάζεστε μια λογιστική αναφορά μόνο για ένα συγκεκριμένο έργο. Οι αναφορές εξόδων και οι πληρωμές δανείων δεν περιλαμβάνονται στις αναφορές του έργου.
 VueByAccountAccounting=Προβολή ανά λογαριασμό λογιστικής
 VueBySubAccountAccounting=Προβολή ανά λογιστικό υπολογαριασμό
 
-MainAccountForCustomersNotDefined=Κύριος λογαριασμός λογιστικής για πελάτες που δεν έχουν οριστεί κατά τη ρύθμιση
-MainAccountForSuppliersNotDefined=Κύριος λογαριασμός λογιστικής για προμηθευτές που δεν έχουν οριστεί κατά τη ρύθμιση
-MainAccountForUsersNotDefined=Κύριος λογαριασμός λογιστικής για χρήστες που δεν έχουν οριστεί κατά τη ρύθμιση
-MainAccountForVatPaymentNotDefined=Κύριος λογαριασμός λογιστικής για πληρωμή ΦΠΑ που δεν έχει οριστεί κατά τη ρύθμιση
-MainAccountForSubscriptionPaymentNotDefined=Κύριος λογαριασμός λογιστικής για την πληρωμή συνδρομής που δεν έχει οριστεί κατά τη ρύθμιση
+MainAccountForCustomersNotDefined=Ο Κύριος λογαριασμός λογιστικής για πελάτες δεν έχει οριστεί κατά τη ρύθμιση
+MainAccountForSuppliersNotDefined=Ο Κύριος λογαριασμός λογιστικής για προμηθευτές δεν έχει οριστεί κατά τη ρύθμιση
+MainAccountForUsersNotDefined=Ο Κύριος λογαριασμός λογιστικής για χρήστες δεν έχει οριστεί κατά τη ρύθμιση
+MainAccountForVatPaymentNotDefined=Ο Κύριος λογαριασμός λογιστικής για πληρωμή ΦΠΑ δεν έχει οριστεί κατά τη ρύθμιση
+MainAccountForSubscriptionPaymentNotDefined=Ο κύριος λογαριασμός λογιστικής για την πληρωμή συνδρομής δεν έχει οριστεί κατά τη ρύθμιση
 
 AccountancyArea=Τομέας Λογιστικής 
-AccountancyAreaDescIntro=Η χρήση της μονάδας λογιστικής πραγματοποιείται σε διάφορα στάδια:
+AccountancyAreaDescIntro=Η χρήση της ενότητας λογιστικής πραγματοποιείται σε διάφορα στάδια:
 AccountancyAreaDescActionOnce=Οι ακόλουθες ενέργειες εκτελούνται συνήθως μόνο μία φορά ή μία φορά το χρόνο ...
-AccountancyAreaDescActionOnceBis=Τα επόμενα βήματα πρέπει να γίνουν για να εξοικονομήσετε χρόνο στο μέλλον, προτείνοντάς σας αυτόματα τον σωστό προεπιλεγμένο λογαριασμό λογιστικής κατά τη μεταφορά δεδομένων στη λογιστική
+AccountancyAreaDescActionOnceBis=Τα επόμενα βήματα πρέπει να γίνουν για να εξοικονομήσετε χρόνο στο μέλλον, προτείνοντάς σας αυτόματα τον σωστό προκαθορισμένο λογαριασμό λογιστικής κατά τη μεταφορά δεδομένων στη λογιστική
 AccountancyAreaDescActionFreq=Οι παρακάτω ενέργειες εκτελούνται συνήθως κάθε μήνα, εβδομάδα ή μέρα για πολύ μεγάλες επιχειρήσεις ...
 
 AccountancyAreaDescJournalSetup=ΒΗΜΑ %s: Ελέγξτε το περιεχόμενο της λίστας ημερολογίου σας από το μενού %s
-AccountancyAreaDescChartModel=ΒΗΜΑ %s: Ελέγξτε αν υπάρχει ένα μοντέλο λογιστικού σχεδίου ή δημιουργήστε ένα από το μενού %s
+AccountancyAreaDescChartModel=ΒΗΜΑ %s: Ελέγξτε αν υπάρχει ένα υπόδειγμα λογιστικού σχεδίου ή δημιουργήστε ένα από το μενού %s
 AccountancyAreaDescChart=ΒΗΜΑ %s: Επιλέξτε ή/και ολοκληρώστε το λογιστικό σας σχέδιο από το μενού %s
 
-AccountancyAreaDescVat=STEP %s: Καθορίστε λογαριασμούς λογιστικής για κάθε τιμή ΦΠΑ. Για αυτό, χρησιμοποιήστε την καταχώρηση μενού %s.
-AccountancyAreaDescDefault=STEP %s: Καθορίστε προεπιλεγμένους λογαριασμούς λογιστικής. Για αυτό, χρησιμοποιήστε την καταχώρηση μενού %s.
+AccountancyAreaDescVat=ΒΗΜΑ %s: Καθορίστε λογαριασμούς λογιστικής για κάθε τιμή ΦΠΑ. Για αυτό, χρησιμοποιήστε την καταχώρηση μενού %s.
+AccountancyAreaDescDefault=ΒΗΜΑ %s: Καθορίστε προεπιλεγμένους λογαριασμούς λογιστικής. Για αυτό, χρησιμοποιήστε την καταχώρηση μενού %s.
 AccountancyAreaDescExpenseReport=ΒΗΜΑ %s: Ορίστε προεπιλεγμένους λογιστικούς λογαριασμούς για κάθε τύπο αναφοράς Εξόδων. Για αυτό, χρησιμοποιήστε την καταχώρηση μενού %s.
-AccountancyAreaDescSal=STEP %s: Ορίστε τους προεπιλεγμένους λογαριασμούς λογιστικής για την πληρωμή των μισθών. Για αυτό, χρησιμοποιήστε την καταχώρηση μενού %s.
+AccountancyAreaDescSal=ΒΗΜΑ %s: Ορίστε τους προεπιλεγμένους λογαριασμούς λογιστικής για την πληρωμή των μισθών. Για αυτό, χρησιμοποιήστε την καταχώρηση μενού %s.
 AccountancyAreaDescContrib=ΒΗΜΑ %s: Ορίστε προεπιλεγμένους λογαριασμούς λογιστικούς για Φόρους (ειδικά έξοδα). Για αυτό, χρησιμοποιήστε την καταχώρηση μενού %s.
-AccountancyAreaDescDonation=STEP %s: Ορίστε προεπιλεγμένους λογαριασμούς λογιστικής για δωρεές. Για αυτό, χρησιμοποιήστε την καταχώρηση μενού %s.
-AccountancyAreaDescSubscription=STEP %s: Ορίστε τους προεπιλεγμένους λογαριασμούς λογιστικής για συνδρομή μέλους. Για αυτό, χρησιμοποιήστε την καταχώρηση μενού %s.
-AccountancyAreaDescMisc=STEP %s: Καθορισμός υποχρεωτικών προεπιλεγμένων λογαριασμών και προεπιλεγμένων λογαριασμών λογιστικής για διάφορες συναλλαγές. Για αυτό, χρησιμοποιήστε την καταχώρηση μενού %s.
+AccountancyAreaDescDonation=ΒΗΜΑ %s: Ορίστε προεπιλεγμένους λογαριασμούς λογιστικής για δωρεές. Για αυτό, χρησιμοποιήστε την καταχώρηση μενού %s.
+AccountancyAreaDescSubscription=ΒΗΜΑ %s: Ορίστε τους προεπιλεγμένους λογαριασμούς λογιστικής για συνδρομή μέλους. Για αυτό, χρησιμοποιήστε την καταχώρηση μενού %s.
+AccountancyAreaDescMisc=ΒΗΜΑ %s: Καθορίστε υποχρεωτικούς προεπιλεγμένους λογαριασμούς λογιστικής για διάφορες συναλλαγές. Για αυτό, χρησιμοποιήστε την καταχώρηση μενού %s.
 AccountancyAreaDescLoan=ΒΗΜΑ %s: Ορίστε προεπιλεγμένους λογαριασμούς λογιστικής για δάνεια. Για αυτό, χρησιμοποιήστε την καταχώρηση μενού %s.
-AccountancyAreaDescBank=STEP %s: Καθορίστε τους λογαριασμούς λογιστικής και τον κωδικό ημερολογίων για κάθε τραπεζικό και χρηματοοικονομικό λογαριασμό. Για αυτό, χρησιμοποιήστε την καταχώρηση μενού %s.
+AccountancyAreaDescBank=ΒΗΜΑ %s: Καθορίστε τους λογαριασμούς λογιστικής και τον κωδικό ημερολογίων για κάθε τραπεζικό και χρηματοοικονομικό λογαριασμό. Για αυτό, χρησιμοποιήστε την καταχώρηση μενού %s.
 AccountancyAreaDescProd=ΒΗΜΑ %s: Ορίστε λογαριασμούς λογιστικής στα Προϊόντα/Υπηρεσίες σας. Για αυτό, χρησιμοποιήστε την καταχώρηση μενού %s.
 
-AccountancyAreaDescBind=STEP %s: Ελέγξτε τη σύνδεση μεταξύ των υφιστάμενων γραμμών %s και ο λογαριασμός λογιστικής έχει ολοκληρωθεί, έτσι ώστε η εφαρμογή θα είναι σε θέση να καταγράφει τις συναλλαγές στο Καθολικό με ένα κλικ. Συμπληρώστε τις συνδέσεις που λείπουν. Για αυτό, χρησιμοποιήστε την καταχώρηση μενού %s.
-AccountancyAreaDescWriteRecords=STEP %s: Εγγραφη συναλλαγών στο Καθολικό. Για αυτό, μεταβείτε στο μενού <strong>%s</strong> και πατήστε το κουμπί <strong>%s</strong> .
-AccountancyAreaDescAnalyze=STEP %s: Προσθέστε ή επεξεργαστείτε υπάρχουσες συναλλαγές και δημιουργήστε αναφορές και εξαγωγές.
+AccountancyAreaDescBind=ΒΗΜΑ %s: Ελέγξτε ότι η δέσμευση μεταξύ των υφιστάμενων %s γραμμών και του  λογαριασμού λογιστικής έχει ολοκληρωθεί, έτσι ώστε η εφαρμογή να είναι σε θέση να καταγράφει τις συναλλαγές στο Καθολικό με ένα κλικ. Συμπληρώστε τις δεσμεύσεις που λείπουν. Για αυτό, χρησιμοποιήστε την καταχώρηση μενού %s.
+AccountancyAreaDescWriteRecords=ΒΗΜΑ %s: Εγγραφή συναλλαγών στο Καθολικό. Για αυτό, μεταβείτε στο μενού <strong>%s</strong> και πατήστε το κουμπί <strong>%s</strong> .
+AccountancyAreaDescAnalyze=ΒΗΜΑ%s: Προσθέστε ή επεξεργαστείτε υπάρχουσες συναλλαγές και δημιουργήστε αναφορές και εξαγωγές.
 
 AccountancyAreaDescClosePeriod=ΒΗΜΑ %s: Κλείσιμο περιόδου, ώστε να μην μπορούμε να κάνουμε τροποποίηση στο μέλλον.
 
@@ -102,122 +103,124 @@ ShowAccountingAccountInJournals=Εμφάνιση λογαριασμού λογι
 AccountAccountingSuggest=Προτεινόμενος λογαριασμός λογιστικής 
 MenuDefaultAccounts=Προεπιλεγμένοι λογαριασμοί
 MenuBankAccounts=Τραπεζικοί Λογαριασμοί
-MenuVatAccounts=Λογαριασμοί ΦΠΑ
+MenuVatAccounts=Λογαριασμοί Φ.Π.Α.
 MenuTaxAccounts=Λογαριασμοί Φόρων
-MenuExpenseReportAccounts=Λογαριασμοί εκθέσεων δαπανών
+MenuExpenseReportAccounts=Λογαριασμοί αναφορών εξόδων
 MenuLoanAccounts=Λογαριασμοί δανείων
 MenuProductsAccounts=Λογαριασμοί προϊόντων
-MenuClosureAccounts=Λογαριασμοί κλεισίματος
+MenuClosureAccounts=Κλείσιμο Λογαριασμών
 MenuAccountancyClosure=Κλείσιμο
-MenuAccountancyValidationMovements=Επικυρώστε τις κινήσεις
+MenuAccountancyValidationMovements=Επικύρωση κινήσεων
 ProductsBinding=Λογαριασμοί προϊόντων
 TransferInAccounting=Μεταφορά στη λογιστική
 RegistrationInAccounting=Καταγραφή στη λογιστική
-Binding=Δεσμευση λογαριασμών
-CustomersVentilation=Συνδετικό τιμολόγιο πελατών
-SuppliersVentilation=Δεσμευτικό τιμολόγιο προμηθευτή
-ExpenseReportsVentilation=Αναφορά σύνδεσης εξόδων
-CreateMvts=Δημιουργήστε μία νέα συναλλαγή
+Binding=Δέσμευση λογαριασμών
+CustomersVentilation=Δέσμευση τιμολογίου πελάτη
+SuppliersVentilation=Δέσμευση τιμολογίου προμηθευτή
+ExpenseReportsVentilation=Δέσμευση Αναφοράς εξόδων
+CreateMvts=Δημιουργία νέας συναλλαγής
 UpdateMvts=Τροποποίηση συναλλαγής
 ValidTransaction=Επικύρωση συναλλαγής
 WriteBookKeeping=Καταγραφή συναλλαγών στη λογιστική
 Bookkeeping=Καθολικό
 BookkeepingSubAccount=Βοηθητικό καθολικό
-AccountBalance=Υπόλοιπο λογαριασμού
+AccountBalance=Ισοζύγιο λογαριασμού
 ObjectsRef=Αναφορά αντικειμένου προέλευσης
-CAHTF=Συνολικός προμηθευτής αγοράς προ φόρων
-TotalExpenseReport=Συνολική αναφορά δαπανών
+CAHTF=Σύνολο αγορών προμηθευτών προ φόρων
+TotalExpenseReport=Σύνολο αναφοράς εξόδων
 InvoiceLines=Γραμμές τιμολογίων προς δέσμευση
 InvoiceLinesDone=Δεσμευμένες γραμμές τιμολογίων
-ExpenseReportLines=Γραμμές εκθέσεων δαπανών προς δέσμευση
-ExpenseReportLinesDone=Δεσμευμένες γραμμές αναφορών δαπανών
-IntoAccount=Σύνδεση γραμμής με τον λογιστικό λογαριασμό
+ExpenseReportLines=Γραμμές αναφορών εξόδων προς δέσμευση
+ExpenseReportLinesDone=Δεσμευμένες γραμμές αναφορών εξόδων
+IntoAccount=Δέσμευση γραμμής με τον λογιστικό λογαριασμό
 TotalForAccount=Σύνολο λογιστικού λογαριασμού
 
 
 Ventilate=Δέσμευση
-LineId=Γραμμή ταυτότητας
+LineId=Id Γραμμής
 Processing=Γίνεται επεξεργασία
 EndProcessing=Η διαδικασία τερματίστηκε.
 SelectedLines=Επιλεγμένες γραμμές
 Lineofinvoice=Γραμμή τιμολογίου
-LineOfExpenseReport=Γραμμή αναφοράς δαπανών
+LineOfExpenseReport=Γραμμή αναφοράς εξόδων
 NoAccountSelected=Δεν έχει επιλεχθεί λογαριασμός λογιστικής
 VentilatedinAccount=Δεσμεύτηκε με επιτυχία στο λογαριασμό λογιστικής
 NotVentilatedinAccount=Δεν δεσμεύεται στον λογαριασμό λογιστικής
-XLineSuccessfullyBinded=%s προϊόντα/υπηρεσίες δεσμεύτηκαν επιτυχώς σε λογιστικό λογαριασμό
+XLineSuccessfullyBinded=%s προϊόντα/υπηρεσίες δεσμεύτηκαν επιτυχώς σε ένα λογιστικό λογαριασμό
 XLineFailedToBeBinded=%s προϊόντα/υπηρεσίες δεν δεσμεύτηκαν σε κάποιο λογιστικό λογαριασμό
 
 ACCOUNTING_LIMIT_LIST_VENTILATION=Μέγιστος αριθμός γραμμών στη λίστα και στη σελίδα δεσμεύσεων (συνιστάται: 50)
-ACCOUNTING_LIST_SORT_VENTILATION_TODO=Ξεκινήστε τη διαλογή της σελίδας &quot;Δεσμευτική ενέργεια&quot; από τα πιο πρόσφατα στοιχεία
-ACCOUNTING_LIST_SORT_VENTILATION_DONE=Ξεκινήστε τη διαλογή της σελίδας &quot;Δεσμευτική πραγματοποίηση&quot; από τα πιο πρόσφατα στοιχεία
+ACCOUNTING_LIST_SORT_VENTILATION_TODO=Ξεκινήστε την ταξινόμηση της σελίδας "Προς δέσμευση" με τα πιο πρόσφατα στοιχεία
+ACCOUNTING_LIST_SORT_VENTILATION_DONE=Ξεκινήστε την ταξινόμηση της σελίδας "Δεσμευμένα" με τα πιο πρόσφατα στοιχεία
 
 ACCOUNTING_LENGTH_DESCRIPTION=Μειώστε την περιγραφή προϊόντων και υπηρεσιών σε καταχωρίσεις μετά από x χαρακτήρες (Καλύτερη = 50)
-ACCOUNTING_LENGTH_DESCRIPTION_ACCOUNT=Διαγραφή της φόρμας περιγραφής του λογαριασμού προϊόντος και υπηρεσιών στις καταχωρίσεις μετά από τους χαρακτήρες x (Καλύτερη = 50)
-ACCOUNTING_LENGTH_GACCOUNT=Διάρκεια λογαριασμών γενικής λογιστικής (Εάν ορίσετε την τιμή 6 εδώ, ο λογαριασμός &#39;706&#39; θα εμφανιστεί στην οθόνη ως &#39;706000&#39;)
-ACCOUNTING_LENGTH_AACCOUNT=Μήκος λογαριασμών τρίτου λογαριασμού (Εάν ορίσετε τιμή 6 εδώ, ο λογαριασμός &#39;401&#39; θα εμφανιστεί στην οθόνη ως &#39;401000&#39;)
+ACCOUNTING_LENGTH_DESCRIPTION_ACCOUNT=Μειώστε την περιγραφή του λογαριασμού προϊόντος και υπηρεσιών στις καταχωρίσεις μετά από x χαρακτήρες (Καλύτερη = 50)
+ACCOUNTING_LENGTH_GACCOUNT=Μήκος των γενικών λογιστικών λογαριασμών (Εάν ορίσετε την τιμή στο 6 εδώ, ο λογαριασμός '706' θα εμφανίζεται σαν '706000' στην οθόνη)
+ACCOUNTING_LENGTH_AACCOUNT=Μήκος των λογαριασμών τρίτων (Εάν ορίσετε την τιμή στο 6 εδώ, ο λογαριασμός "401" θα εμφανίζεται σαν "401000" στην οθόνη)
 ACCOUNTING_MANAGE_ZERO=Να επιτρέπεται η διαχείριση διαφορετικού αριθμού μηδενικών στο τέλος ενός λογαριασμού λογιστικής. Απαιτείται από ορισμένες χώρες (όπως η Ελβετία). Εάν είναι απενεργοποιημένη (προεπιλογή), μπορείτε να ορίσετε τις ακόλουθες δύο παραμέτρους για να ζητήσετε από την εφαρμογή να προσθέσει εικονικά μηδενικά.
 BANK_DISABLE_DIRECT_INPUT=Απενεργοποίηση άμεσης καταγραφής συναλλαγής σε τραπεζικό λογαριασμό
-ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL=Ενεργοποίηση προσχεδίου εξαγωγής στο ημερολόγιο
+ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL=Ενεργοποίηση εξαγωγής προσχεδίου στο ημερολόγιο
 ACCOUNTANCY_COMBO_FOR_AUX=Ενεργοποίηση σύνθετης λίστας για θυγατρικό λογαριασμό (ενδέχεται να είναι αργή εάν έχετε πολλά τρίτα μέρη, διακοπή της δυνατότητας αναζήτησης σε ένα μέρος της αξίας)
-ACCOUNTING_DATE_START_BINDING=Καθορίστε ημερομηνία έναρξης δεσμεύσεων & μεταφοράς στη λογιστική. Κάτω από αυτή την ημερομηνία, οι συναλλαγές δεν θα μεταφερθούν στο λογιστικό.
-ACCOUNTING_DEFAULT_PERIOD_ON_TRANSFER=Στο λογιστικό έμβασμα, ποια είναι η προεπιλεγμένη περίοδος
+ACCOUNTING_DATE_START_BINDING=Καθορίστε ημερομηνία έναρξης δεσμεύσεων & μεταφοράς στη λογιστική. Πριν από αυτή την ημερομηνία, οι συναλλαγές δεν θα μεταφερθούν στη λογιστική.
+ACCOUNTING_DEFAULT_PERIOD_ON_TRANSFER=Ποια είναι η προεπιλεγμένη περίοδος στη λογιστική μεταφορά;
 
 ACCOUNTING_SELL_JOURNAL=Ημερολόγιο πωλήσεων
 ACCOUNTING_PURCHASE_JOURNAL=Ημερολόγιο αγορών
-ACCOUNTING_MISCELLANEOUS_JOURNAL=Ημερολόγιο 
+ACCOUNTING_MISCELLANEOUS_JOURNAL=Ημερολόγιο διαφόρων
 ACCOUNTING_EXPENSEREPORT_JOURNAL=Ημερολόγιο εξόδων
 ACCOUNTING_SOCIAL_JOURNAL=Κοινωνικό ημερολόγιο
 ACCOUNTING_HAS_NEW_JOURNAL=Έχει νέο περιοδικό
 
-ACCOUNTING_RESULT_PROFIT=Λογαριασμός λογαριασμού αποτελεσμάτων (Κέρδος)
-ACCOUNTING_RESULT_LOSS=Λογαριασμός λογαριασμού αποτελεσμάτων (Απώλεια)
-ACCOUNTING_CLOSURE_DEFAULT_JOURNAL=Περιοδικό κλεισίματος
+ACCOUNTING_RESULT_PROFIT=Αποτέλεσμα λογιστικού λογαριασμού (Κέρδος)
+ACCOUNTING_RESULT_LOSS=Αποτέλεσμα λογιστικού λογαριασμού (Ζημιά)
+ACCOUNTING_CLOSURE_DEFAULT_JOURNAL=Ημερολόγιο κλεισίματος
 
 ACCOUNTING_ACCOUNT_TRANSFER_CASH=Λογαριασμός λογιστικής της μεταβατικής τραπεζικής μεταφοράς
-TransitionalAccount=Μεταβατικό τραπεζικό λογαριασμό μεταφοράς
+TransitionalAccount=Λογαριασμός της μεταβατικής τραπεζικής μεταφοράς
 
 ACCOUNTING_ACCOUNT_SUSPENSE=Λογαριασμός λογιστικής αναμονής
 DONATION_ACCOUNTINGACCOUNT=Λογαριασμός λογιστικής για την εγγραφή δωρεών
 ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT=Λογαριασμός λογιστικής για την εγγραφή συνδρομών
 
-ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT=Λογιστικός λογαριασμός από προεπιλογή για εγγραφή κατάθεσης πελάτη
-UseAuxiliaryAccountOnCustomerDeposit=Αποθηκεύστε τον λογαριασμό πελάτη ως ατομικό λογαριασμό στο καθολικό θυγατρικής για γραμμές προκαταβολών (εάν απενεργοποιηθεί, ο ατομικός λογαριασμός για τις γραμμές προκαταβολών θα παραμείνει κενός)
+ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT=Προεπιλεγμένος λογαριασμός λογιστικής για καταγραφή κατάθεσης πελάτη
+UseAuxiliaryAccountOnCustomerDeposit=Αποθηκεύστε τον λογαριασμό πελάτη ως ατομικό λογαριασμό στο θυγατρικό καθολικό για γραμμές προκαταβολών (εάν απενεργοποιηθεί, ο ατομικός λογαριασμός για τις γραμμές προκαταβολών θα παραμείνει κενός)
+ACCOUNTING_ACCOUNT_SUPPLIER_DEPOSIT=Προεπιλεγμένος λογαριασμός λογιστικής για εγγραφή κατάθεσης σε προμηθευτή
+UseAuxiliaryAccountOnSupplierDeposit=Αποθηκεύστε τον λογαριασμό προμηθευτή ως ατομικό λογαριασμό στο θυγατρικό καθολικό για γραμμές προκαταβολών (εάν απενεργοποιηθεί, ο ατομικός λογαριασμός για τις γραμμές προκαταβολών θα παραμείνει κενός)
 
-ACCOUNTING_PRODUCT_BUY_ACCOUNT=Λογαριασμός λογιστικής από προεπιλογή για τα αγορασμένα προϊόντα (χρησιμοποιείται αν δεν ορίζεται στο φύλλο προϊόντων)
-ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT=Λογαριασμός από προεπιλογή για τα προϊόντα που αγοράστηκαν στην ΕΟΚ (χρησιμοποιείται αν δεν ορίζεται στο φύλλο προϊόντος)
-ACCOUNTING_PRODUCT_BUY_EXPORT_ACCOUNT=Λογαριασμός από προεπιλογή για τα προϊόντα που αγοράστηκαν και εισάγονται εκτός ΕΟΚ (χρησιμοποιείται αν δεν ορίζεται στο φύλλο προϊόντος)
-ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Λογαριασμός λογαριασμού από προεπιλογή για τα προϊόντα που πωλούνται (χρησιμοποιείται αν δεν ορίζεται στο φύλλο προϊόντος)
-ACCOUNTING_PRODUCT_SOLD_INTRA_ACCOUNT=Λογαριασμός λογιστικής από προεπιλογή για τα προϊόντα που πωλούνται στην ΕΟΚ (χρησιμοποιείται αν δεν ορίζεται στο φύλλο προϊόντων)
-ACCOUNTING_PRODUCT_SOLD_EXPORT_ACCOUNT=Λογαριασμός λογαριασμού από προεπιλογή για τα προϊόντα που πωλούνται και εξάγονται εκτός ΕΟΚ (χρησιμοποιείται αν δεν ορίζεται στο φύλλο προϊόντων)
+ACCOUNTING_PRODUCT_BUY_ACCOUNT=Προεπιλεγμένος λογαριασμός λογιστικής για τα αγορασμένα προϊόντα (χρησιμοποιείται αν δεν ορίζεται στο φύλλο προϊόντων)
+ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT=Προεπιλεγμένος λογαριασμός λογιστικής για τα προϊόντα που αγοράστηκαν στην Ε.Ε. (χρησιμοποιείται αν δεν ορίζεται στο φύλλο προϊόντος)
+ACCOUNTING_PRODUCT_BUY_EXPORT_ACCOUNT=Προεπιλεγμένος λογαριασμός λογιστικής για τα προϊόντα που αγοράστηκαν και εισάγονται εκτός Ε.Ε. (χρησιμοποιείται αν δεν ορίζεται στο φύλλο προϊόντος)
+ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Προεπιλεγμένος λογαριασμός λογιστικής για τα πωληθέντα προϊόντα (χρησιμοποιείται εάν δεν ορίζεται στο φύλλο προϊόντος)
+ACCOUNTING_PRODUCT_SOLD_INTRA_ACCOUNT=Προεπιλεγμένος λογαριασμός λογιστικής για τα προϊόντα που πωλήθηκαν στην Ε.Ε. (χρησιμοποιείται αν δεν ορίζεται στο φύλλο προϊόντων)
+ACCOUNTING_PRODUCT_SOLD_EXPORT_ACCOUNT=Προεπιλεγμένος λογαριασμός λογιστικής για τα προϊόντα που πωλούνται και εξάγονται εκτός ΕΟΚ (χρησιμοποιείται αν δεν ορίζεται στο φύλλο προϊόντων)
 
-ACCOUNTING_SERVICE_BUY_ACCOUNT=Λογαριασμός λογαριασμού από προεπιλογή για τις υπηρεσίες που αγοράσατε (χρησιμοποιείται αν δεν ορίζεται στο φύλλο εξυπηρέτησης)
-ACCOUNTING_SERVICE_BUY_INTRA_ACCOUNT=Λογαριασμός από προεπιλογή για τις υπηρεσίες που αγοράστηκαν στην ΕΟΚ (χρησιμοποιείται αν δεν ορίζεται στο φύλλο υπηρεσίας)
-ACCOUNTING_SERVICE_BUY_EXPORT_ACCOUNT=Λογαριασμός από προεπιλογή για τις υπηρεσίες που αγοράστηκαν και εισήχθησαν εκτός ΕΟΚ (χρησιμοποιείται αν δεν ορίζεται στο φύλλο υπηρεσίας)
-ACCOUNTING_SERVICE_SOLD_ACCOUNT=Λογαριασμός λογαριασμού από προεπιλογή για τις υπηρεσίες πώλησης (χρησιμοποιείται αν δεν ορίζεται στο φύλλο εξυπηρέτησης)
-ACCOUNTING_SERVICE_SOLD_INTRA_ACCOUNT=Λογαριασμός λογαριασμού από προεπιλογή για τις υπηρεσίες που πωλούνται στην ΕΟΚ (χρησιμοποιείται αν δεν ορίζεται στο φύλλο υπηρεσιών)
-ACCOUNTING_SERVICE_SOLD_EXPORT_ACCOUNT=Λογαριασμός λογαριασμού από προεπιλογή για τις υπηρεσίες που πωλούνται και εξάγονται εκτός ΕΟΚ (χρησιμοποιείται αν δεν ορίζεται στο φύλλο υπηρεσιών)
+ACCOUNTING_SERVICE_BUY_ACCOUNT=Προεπιλεγμένος λογαριασμός λογιστικής για τις υπηρεσίες που αγοράσατε (χρησιμοποιείται αν δεν ορίζεται στο φύλλο εξυπηρέτησης)
+ACCOUNTING_SERVICE_BUY_INTRA_ACCOUNT=Προεπιλεγμένος λογαριασμός λογιστικής για τις υπηρεσίες που αγοράστηκαν στην Ε.Ε. (χρησιμοποιείται αν δεν ορίζεται στο φύλλο υπηρεσίας)
+ACCOUNTING_SERVICE_BUY_EXPORT_ACCOUNT=Προεπιλεγμένος λογαριασμός λογιστικής για τις υπηρεσίες που αγοράστηκαν και εισήχθησαν εκτός Ε.Ε. (χρησιμοποιείται αν δεν ορίζεται στο φύλλο υπηρεσίας)
+ACCOUNTING_SERVICE_SOLD_ACCOUNT=Προεπιλεγμένος λογαριασμός λογιστικής για την παροχή υπηρεσιών (χρησιμοποιείται αν δεν ορίζεται στο φύλλο εξυπηρέτησης)
+ACCOUNTING_SERVICE_SOLD_INTRA_ACCOUNT=Προεπιλεγμένος λογαριασμός λογιστικής για την παροχή υπηρεσιών σε χώρες της Ε.Ε. (χρησιμοποιείται αν δεν ορίζεται στο φύλλο υπηρεσιών)
+ACCOUNTING_SERVICE_SOLD_EXPORT_ACCOUNT=Προεπιλεγμένος λογαριασμός λογιστικής για την παροχή υπηρεσιών σε χώρες εκτός Ε.Ε. (χρησιμοποιείται αν δεν ορίζεται στο φύλλο υπηρεσιών)
 
 Doctype=Τύπος εγγράφου
 Docdate=Ημερομηνία
-Docref=Παραπομπή
+Docref=Αναφορά
 LabelAccount=Ετικέτα λογαριασμού
 LabelOperation=Λειτουργία ετικετών
 Sens=Κατεύθυνση
 AccountingDirectionHelp=Για έναν λογιστικό λογαριασμό πελάτη, χρησιμοποιήστε την Πίστωση για να καταγράψετε μια πληρωμή που λάβατε <br> Για έναν λογιστικό λογαριασμό ενός προμηθευτή, χρησιμοποιήστε τη Χρέωση για να καταγράψετε μια πληρωμή που κάνατε
-LetteringCode=Κωδικός γράμματος
-Lettering=Γράμματα
+LetteringCode=Κωδικός συμφωνίας
+Lettering=Συμφωνία
 Codejournal=Ημερολόγιο
-JournalLabel=Ετικέτα περιοδικών
-NumPiece=Αριθμός τεμαχίου
-TransactionNumShort=Αριθ. συναλλαγή
+JournalLabel=Ετικέτα Ημερολογίου
+NumPiece=Αριθμός καταχώρησης
+TransactionNumShort=Αριθ. συναλλαγής
 AccountingCategory=Προσαρμοσμένη ομάδα
-GroupByAccountAccounting=Ομαδοποίηση κατά λογαριασμό γενικού καθολικού
+GroupByAccountAccounting=Ομαδοποίηση ανά λογαριασμό γενικού καθολικού
 GroupBySubAccountAccounting=Ομαδοποίηση ανά λογαριασμό βοηθητικού καθολικού
 AccountingAccountGroupsDesc=Μπορείτε να ορίσετε εδώ ορισμένες ομάδες λογιστικού λογαριασμού. Θα χρησιμοποιηθούν για εξατομικευμένες λογιστικές εκθέσεις.
-ByAccounts=Με λογαριασμούς
-ByPredefinedAccountGroups=Με προκαθορισμένες ομάδες
-ByPersonalizedAccountGroups=Με εξατομικευμένες ομάδες
+ByAccounts=Ανά λογαριασμούς
+ByPredefinedAccountGroups=Ανά προκαθορισμένες ομάδες
+ByPersonalizedAccountGroups=Ανά εξατομικευμένες ομάδες
 ByYear=Ανά έτος
 NotMatch=Δεν έχει οριστεί
 DeleteMvt=Διαγράψτε μερικές γραμμές από τη λογιστική
@@ -226,57 +229,57 @@ DelYear=Έτος προς διαγραφή
 DelJournal=Ημερολόγιο προς διαγραφή
 ConfirmDeleteMvt=Αυτό θα διαγράψει όλες τις γραμμές στη λογιστική για το έτος/μήνα ή/και για ένα συγκεκριμένο ημερολόγιο (Απαιτείται τουλάχιστον ένα κριτήριο). Θα πρέπει να επαναχρησιμοποιήσετε τη δυνατότητα '%s' για να επαναφέρετε τη διαγραμμένη εγγραφή στο καθολικό.
 ConfirmDeleteMvtPartial=Αυτό θα διαγράψει τη συναλλαγή από τη λογιστική (όλες οι γραμμές που σχετίζονται με την ίδια συναλλαγή θα διαγραφούν)
-FinanceJournal=Ημερολόγιο οικονομικών
-ExpenseReportsJournal=Έκθεση εκθέσεων δαπανών
-DescFinanceJournal=Finance journal including all the types of payments by bank account
+FinanceJournal=Ημερολόγιο χρηματοοικονομικών
+ExpenseReportsJournal=Ημερολόγιο αναφοράς εξόδων
+DescFinanceJournal=Ημερολόγιο χρηματοοικονομικών που περιλαμβάνει όλους τους τύπους πληρωμών μέσω τραπεζικού λογαριασμού
 DescJournalOnlyBindedVisible=Αυτή είναι μια προβολή αρχείων που είναι δεσμευμένα σε έναν λογιστικό λογαριασμό και μπορούν να καταγραφούν στα Ημερολόγια και στο Καθολικό.
 VATAccountNotDefined=Δεν έχει οριστεί λογαριασμός για ΦΠΑ
-ThirdpartyAccountNotDefined=Ο λογαριασμός για τρίτους δεν έχει οριστεί
-ProductAccountNotDefined=Λογαριασμός για το προϊόν δεν έχει οριστεί
-FeeAccountNotDefined=Λογαριασμός για αμοιβή δεν ορίζεται
+ThirdpartyAccountNotDefined=Ο λογαριασμός για τρίτο μέρος δεν έχει οριστεί
+ProductAccountNotDefined=Ο λογαριασμός για το προϊόν δεν έχει οριστεί
+FeeAccountNotDefined=Ο λογαριασμός αμοιβών δεν έχει οριστεί
 BankAccountNotDefined=Ο λογαριασμός για την τράπεζα δεν έχει οριστεί
-CustomerInvoicePayment=Πληρωμή τιμολογίου προμηθευτή
+CustomerInvoicePayment=Πληρωμή τιμολογίου πελάτη
 ThirdPartyAccount=Λογαριασμός τρίτου μέρους
 NewAccountingMvt=Νέα συναλλαγή
 NumMvts=Αριθμός συναλλαγής
 ListeMvts=Λίστα κινήσεων
-ErrorDebitCredit=Χρεωστικές και Πιστωτικές δεν μπορούν να χουν την ίδια αξία ταυτόχρονα
-AddCompteFromBK=Προσθέστε λογαριασμούς λογιστικής στην ομάδα
-ReportThirdParty=Δημιουργία λίστας λογαριασμού τρίτου μέρους
-DescThirdPartyReport=Συμβουλευτείτε εδώ τη λίστα με τους πελάτες και τους προμηθευτές τρίτων και τους λογαριασμούς τους
+ErrorDebitCredit=Η χρέωση και η πίστωση δεν μπορούν να έχουν αξία ταυτόχρονα
+AddCompteFromBK=Προσθήκη λογαριασμών λογιστικής στην ομάδα
+ReportThirdParty=Λίστα λογαριασμού τρίτου μέρους
+DescThirdPartyReport=Συμβουλευτείτε εδώ τη λίστα με τους πελάτες και τους προμηθευτές και τους λογαριασμούς τους
 ListAccounts=Λίστα των λογιστικών λογαριασμών
-UnknownAccountForThirdparty=Άγνωστο λογαριασμό τρίτων. Θα χρησιμοποιήσουμε %s
-UnknownAccountForThirdpartyBlocking=Άγνωστο λογαριασμό τρίτων. Σφάλμα αποκλεισμού
+UnknownAccountForThirdparty=Άγνωστος λογαριασμός τρίτου μέρους. Θα χρησιμοποιήσουμε %s
+UnknownAccountForThirdpartyBlocking=Άγνωστος λογαριασμός τρίτου μέρους. Σφάλμα αποκλεισμού
 ThirdpartyAccountNotDefinedOrThirdPartyUnknown=Ο λογαριασμός Βοηθητικού καθολικού δεν έχει οριστεί ή το τρίτο μέρος ή ο χρήστης είναι άγνωστος. Θα χρησιμοποιήσουμε %s
-ThirdpartyAccountNotDefinedOrThirdPartyUnknownSubledgerIgnored=Άγνωστο  τρίτο μέρος και βοηθητικό καθολικό δεν έχει οριστεί για την πληρωμή. Θα διατηρήσουμε κενή την τιμή του λογαριασμού βοηθητικού καθολικού.
+ThirdpartyAccountNotDefinedOrThirdPartyUnknownSubledgerIgnored=Άγνωστο  τρίτο μέρος και το βοηθητικό καθολικό δεν έχει οριστεί για την πληρωμή. Θα διατηρήσουμε κενή την τιμή του λογαριασμού βοηθητικού καθολικού.
 ThirdpartyAccountNotDefinedOrThirdPartyUnknownBlocking=Ο λογαριασμός Βοηθητικού καθολικού δεν έχει οριστεί ή το τρίτο μέρος ή ο χρήστης είναι άγνωστος. Σφάλμα αποκλεισμού.
 UnknownAccountForThirdpartyAndWaitingAccountNotDefinedBlocking=Ο λογαριασμός λογαριασμού τρίτου μέρους και ο λογαριασμός αναμονής δεν έχουν οριστεί. Σφάλμα αποκλεισμού
 PaymentsNotLinkedToProduct=Πληρωμή που δεν συνδέεται με κανένα προϊόν / υπηρεσία
-OpeningBalance=Άνοιγμα υπολοίπου
-ShowOpeningBalance=Εμφάνιση αρχικού υπολοίπου
-HideOpeningBalance=Κρύψιμο αρχικού υπολοίπου
+OpeningBalance=Ισολογισμός έναρξης
+ShowOpeningBalance=Εμφάνιση ισολογισμού έναρξης
+HideOpeningBalance=Κρύψιμο ισολογισμού έναρξης
 ShowSubtotalByGroup=Εμφάνιση υποσυνόλου ανά επίπεδο
 
 Pcgtype=Ομάδα του λογαριασμού
-PcgtypeDesc=Η ομάδα λογαριασμού χρησιμοποιείται ως προκαθορισμένα κριτήρια «φίλτρου» και «ομαδοποίησης» για ορισμένες λογιστικές αναφορές. Για παράδειγμα, τα «ΕΙΣΟΔΗΜΑ» ή «ΕΞΟΔΑ» χρησιμοποιούνται ως ομάδες λογιστικών λογαριασμών προϊόντων για τη δημιουργία της αναφοράς εξόδων / εσόδων.
+PcgtypeDesc=Η ομάδα λογαριασμού χρησιμοποιείται ως προκαθορισμένο κριτήριο «φίλτρου» και «ομαδοποίησης» για ορισμένες λογιστικές αναφορές. Για παράδειγμα,  «ΕΣΟΔΑ» ή «ΕΞΟΔΑ» χρησιμοποιούνται ως ομάδες λογιστικών λογαριασμών προϊόντων για τη δημιουργία της αναφοράς εξόδων / εσόδων.
 
-Reconcilable=Συμβιβάσιμος
+Reconcilable=Προς συμφωνία
 
-TotalVente=Total turnover before tax
+TotalVente=Συνολικός κύκλος εργασιών προ φόρων
 TotalMarge=Συνολικό περιθώριο πωλήσεων
 
 DescVentilCustomer=Συμβουλευτείτε εδώ τον κατάλογο των γραμμών τιμολογίων πελατών που δεσμεύονται (ή όχι) σε λογαριασμό λογιστικής προϊόντων
-DescVentilMore=Στις περισσότερες περιπτώσεις, εάν χρησιμοποιείτε προκαθορισμένα προϊόντα ή υπηρεσίες και ορίζετε τον αριθμό λογαριασμού στην κάρτα προϊόντος / υπηρεσίας, η εφαρμογή θα είναι σε θέση να πραγματοποιήσει όλες τις δεσμεύσεις μεταξύ των γραμμών τιμολογίου σας και του λογαριασμού λογιστικής του λογαριασμού σας, ένα κλικ με το κουμπί <strong>&quot;%s&quot;</strong> . Εάν ο λογαριασμός δεν έχει οριστεί σε κάρτες προϊόντων / υπηρεσιών ή εάν εξακολουθείτε να έχετε κάποιες γραμμές που δεν δεσμεύονται σε ένα λογαριασμό, θα πρέπει να κάνετε μια χειροκίνητη σύνδεση από το μενού &quot; <strong>%s</strong> &quot;.
-DescVentilDoneCustomer=Συμβουλευτείτε εδώ τον κατάλογο των γραμμών των πελατών τιμολογίων και τον λογαριασμό λογιστικής του προϊόντος τους
-DescVentilTodoCustomer=Δεσμεύστε τις γραμμές τιμολογίου που δεν έχουν ήδη συνδεθεί με έναν λογαριασμό λογιστικής προϊόντος
+DescVentilMore=Στις περισσότερες περιπτώσεις, εάν χρησιμοποιείτε προκαθορισμένα προϊόντα ή υπηρεσίες και ορίσετε τον αριθμό λογαριασμού στην κάρτα προϊόντος/υπηρεσίας, η εφαρμογή θα μπορεί να δεσμεύει όλες τις γραμμές τιμολογίων σας και τον λογιστικό λογαριασμό του λογιστικού σας σχεδίου, ακριβώς με ένα κλικ στο κουμπί <strong> "%s" </strong> . Εάν ο λογαριασμός δεν έχει οριστεί σε κάρτες προϊόντων/υπηρεσιών ή εάν εξακολουθείτε να έχετε κάποιες γραμμές που δεν είναι δεσμευμένες σε έναν λογαριασμό, θα πρέπει να κάνετε χειροκίνητη δέσμευση από το μενού " <strong> %s </strong> ".
+DescVentilDoneCustomer=Συμβουλευτείτε εδώ τη λίστα με τις γραμμές τιμολογίων πελατών και τον λογιστικό λογαριασμό προϊόντων τους
+DescVentilTodoCustomer=Δεσμεύστε τις γραμμές τιμολογίου που δεν έχουν ήδη δεσμευθεί με έναν λογαριασμό λογιστικής προϊόντος
 ChangeAccount=Αλλάξτε το λογαριασμό λογιστικής προϊόντος / υπηρεσίας για επιλεγμένες γραμμές με τον ακόλουθο λογαριασμό λογιστικής:
 Vide=-
-DescVentilSupplier=Συμβουλευτείτε εδώ τη λίστα των γραμμών τιμολογίου προμηθευτή που δεσμεύονται ή δεν έχουν ακόμη συνδεθεί με έναν λογαριασμό λογιστικής προϊόντος (εμφανίζονται μόνο εγγραφές που δεν έχουν ήδη μεταφερθεί στη λογιστική)
-DescVentilDoneSupplier=Συμβουλευτείτε εδώ τον κατάλογο των γραμμών των τιμολογίων προμηθευτών και του λογαριασμού τους
-DescVentilTodoExpenseReport=Γραμμές αναφοράς δεσμευμένων δαπανών που δεν έχουν ήδη συνδεθεί με λογαριασμό λογιστικής αμοιβής
-DescVentilExpenseReport=Συμβουλευτείτε εδώ τον κατάλογο των γραμμών αναφοράς δαπανών που δεσμεύονται (ή όχι) σε λογαριασμό λογιστικής αμοιβής
-DescVentilExpenseReportMore=Εάν ρυθμίσετε τον λογαριασμό λογαριασμών σε γραμμές αναφοράς τύπου εξόδων, η εφαρμογή θα είναι σε θέση να κάνει όλη τη δέσμευση μεταξύ των γραμμών αναφοράς δαπανών σας και του λογαριασμού λογιστικής του λογαριασμού σας, με ένα μόνο κλικ με το κουμπί <strong>&quot;%s&quot;</strong> . Εάν ο λογαριασμός δεν έχει οριστεί σε λεξικό τελών ή αν έχετε ακόμα ορισμένες γραμμές που δεν δεσμεύονται σε κανένα λογαριασμό, θα πρέπει να κάνετε μια χειροκίνητη σύνδεση από το μενού &quot; <strong>%s</strong> &quot;.
-DescVentilDoneExpenseReport=Συμβουλευτείτε εδώ τον κατάλογο των γραμμών των εκθέσεων δαπανών και του λογιστικού λογαριασμού τους
+DescVentilSupplier=Συμβουλευτείτε εδώ τη λίστα των γραμμών τιμολογίου προμηθευτή που δεσμεύονται ή δεν έχουν ακόμη δεσμευθεί με έναν λογαριασμό λογιστικής προϊόντος (εμφανίζονται μόνο εγγραφές που δεν έχουν ήδη μεταφερθεί στη λογιστική)
+DescVentilDoneSupplier=Συμβουλευτείτε εδώ τον κατάλογο των γραμμών των τιμολογίων προμηθευτών και του λογιστικού λογαριασμού τους
+DescVentilTodoExpenseReport=Δεσμεύστε τις γραμμές αναφοράς εξόδων που δεν έχουν ήδη δεσμευθεί με ένα Λογιστικός λογαριασμός αμοιβής
+DescVentilExpenseReport=Συμβουλευτείτε εδώ τον κατάλογο των γραμμών αναφοράς εξόδων που δεσμεύονται (ή όχι) σε ένα λογαριασμό λογιστικής αμοιβής
+DescVentilExpenseReportMore=Εάν ρυθμίσετε τον λογιστικό λογαριασμό σε γραμμές τύπου αναφοράς εξόδων, η εφαρμογή θα είναι σε θέση να κάνει όλη τη δέσμευση μεταξύ των γραμμών αναφοράς εξόδων σας και του λογαριασμού λογιστικής του λογιστικού σχεδίου σας, με ένα μόνο κλικ στο κουμπί <strong>"%s"</strong> . Εάν ο λογαριασμός δεν έχει οριστεί σε λεξικό αμοιβών ή αν έχετε ακόμα ορισμένες γραμμές που δεν δεσμεύονται σε κανένα λογαριασμό, θα πρέπει να κάνετε μια χειροκίνητη σύνδεση από το μενού "<strong>%s</strong>".
+DescVentilDoneExpenseReport=Συμβουλευτείτε εδώ τον κατάλογο των γραμμών των αναφορών εξόδων και του λογιστικού λογαριασμού των αμοιβών τους
 
 Closure=Ετήσιο κλείσιμο
 DescClosure=Δείτε εδώ τον αριθμό των κινήσεων ανά μήνα που δεν έχουν ακόμη επικυρωθεί και κλειδωθεί
@@ -284,60 +287,60 @@ OverviewOfMovementsNotValidated=Επισκόπηση κινήσεων που δ
 AllMovementsWereRecordedAsValidated=Όλες οι κινήσεις καταγράφηκαν ως επικυρωμένες και κλειδωμένες
 NotAllMovementsCouldBeRecordedAsValidated=Δεν ήταν δυνατό να καταγραφούν όλες οι κινήσεις ως επικυρωμένες και κλειδωμένες
 ValidateMovements=Επικύρωση και κλείδωμα εγγραφής...
-DescValidateMovements=Απαγορεύεται οποιαδήποτε τροποποίηση ή διαγραφή γραφής, γράμματος και διαγραφής. Όλες οι καταχωρήσεις για μια άσκηση πρέπει να επικυρωθούν, διαφορετικά το κλείσιμο δεν θα είναι δυνατό
+DescValidateMovements=Απαγορεύεται οποιαδήποτε τροποποίηση ή διαγραφή γραφής, συμφωνίας και διαγραφής. Όλες οι καταχωρήσεις πρέπει να επικυρωθούν, διαφορετικά το κλείσιμο δεν θα είναι δυνατό
 
 ValidateHistory=Δεσμεύστε αυτόματα
 AutomaticBindingDone=Ολοκληρώθηκαν οι αυτόματες δεσμεύσεις (%s) - Δεν είναι δυνατή η αυτόματη δέσμευση για κάποιες εγγραφές (%s)
 
 ErrorAccountancyCodeIsAlreadyUse=Σφάλμα, δεν μπορείτε να διαγράψετε αυτόν τον λογιστικό λογαριασμό γιατί χρησιμοποιείται
 MvtNotCorrectlyBalanced=Η κίνηση δεν είναι σωστά ισοζυγισμένη. Χρέωση = %s & Πίστωση = %s
-Balancing=Εξισορρόπηση
-FicheVentilation=Δεσμευτική κάρτα
-GeneralLedgerIsWritten=Οι συναλλαγές γράφονται στο Ledger
-GeneralLedgerSomeRecordWasNotRecorded=Ορισμένες από τις συναλλαγές δεν μπόρεσαν να πραγματοποιηθούν σε περιοδικά. Εάν δεν υπάρχει άλλο μήνυμα σφάλματος, αυτό πιθανότατα οφείλεται στο γεγονός ότι είχαν ήδη καταχωρηθεί περιοδικά.
+Balancing=Ισολογισμός
+FicheVentilation=Καρτέλα Δεσμεύσεων
+GeneralLedgerIsWritten=Οι συναλλαγές καταχωρήθηκαν στο Καθολικό
+GeneralLedgerSomeRecordWasNotRecorded=Δεν ήταν δυνατή η καταγραφή ορισμένων από τις συναλλαγές. Εάν δεν υπάρχει άλλο μήνυμα σφάλματος, αυτό πιθανότατα οφείλεται στο ότι είχαν ήδη καταχωρηθεί στο ημερολόγιο.
 NoNewRecordSaved=Δεν υπάρχει άλλη εγγραφή για μεταφορά
 ListOfProductsWithoutAccountingAccount=Κατάλογος προϊόντων που δεν δεσμεύονται σε κανένα λογιστικό λογαριασμό
-ChangeBinding=Αλλάξτε τη σύνδεση
+ChangeBinding=Αλλάξτε τη δέσμευση
 Accounted=Καταχωρήθηκε στο καθολικό
 NotYetAccounted=Δεν έχει μεταφερθεί ακόμη στη λογιστική
-ShowTutorial=Εμφάνιση Οδηγού
-NotReconciled=Δεν ταιριάζουν
+ShowTutorial=Εμφάνιση Οδηγιών
+NotReconciled=Μη συμφωνημένες
 WarningRecordWithoutSubledgerAreExcluded=Προειδοποίηση, όλες οι γραμμές χωρίς καθορισμένο λογαριασμό βοηθητικού καθολικού  φιλτράρονται και εξαιρούνται από αυτήν την προβολή
 AccountRemovedFromCurrentChartOfAccount=Λογαριασμός λογιστικής που δεν υπάρχει στο τρέχον λογιστικό σχέδιο
 
 ## Admin
-BindingOptions=Δεσμευτικές επιλογές
-ApplyMassCategories=Εφαρμογή κατηγοριών μάζας
-AddAccountFromBookKeepingWithNoCategories=Διαθέσιμος λογαριασμός που δεν έχει ακόμα εγγραφεί στην εξατομικευμένη ομάδα
-CategoryDeleted=Η κατηγορία για τον λογαριασμό λογιστηρίου έχει καταργηθεί
-AccountingJournals=Λογιστικά περιοδικά
-AccountingJournal=Λογιστικό περιοδικό
-NewAccountingJournal=Νέο λογιστικό περιοδικό
+BindingOptions=Επιλογές δέσμευσης
+ApplyMassCategories=Εφαρμογή μαζικών κατηγοριών
+AddAccountFromBookKeepingWithNoCategories=Ο διαθέσιμος λογαριασμός δεν ειναι ακόμα στην εξατομικευμένη ομάδα
+CategoryDeleted=Η κατηγορία για τον λογιστικό λογαριασμό έχει αφαιρεθεί
+AccountingJournals=Λογιστικά ημερολόγια
+AccountingJournal=Λογιστικό ημερολόγιο
+NewAccountingJournal=Νέο λογιστικό ημερολόγιο
 ShowAccountingJournal=Εμφάνιση ημερολογίου λογιστικής
-NatureOfJournal=Φύση του περιοδικού
+NatureOfJournal=Φύση του ημερολογίου
 AccountingJournalType1=Διάφορες εργασίες
 AccountingJournalType2=Πωλήσεις
 AccountingJournalType3=Αγορές
 AccountingJournalType4=Τράπεζα
-AccountingJournalType5=Έκθεση δαπανών
-AccountingJournalType8=Καταγραφή εμπορευμάτων
+AccountingJournalType5=Αναφορά εξόδων
+AccountingJournalType8=Απογραφή
 AccountingJournalType9=Έχει-νέο
-ErrorAccountingJournalIsAlreadyUse=Αυτό το περιοδικό χρησιμοποιείται ήδη
+ErrorAccountingJournalIsAlreadyUse=Αυτό το ημερολόγιο χρησιμοποιείται ήδη
 AccountingAccountForSalesTaxAreDefinedInto=Σημείωση: Ο λογαριασμός λογιστικής για τον φόρο πωλήσεων ορίζεται στο μενού <b>%s</b> - <b>%s</b>
 NumberOfAccountancyEntries=Αριθμός καταχωρήσεων
 NumberOfAccountancyMovements=Αριθμός κινήσεων
 ACCOUNTING_DISABLE_BINDING_ON_SALES=Απενεργοποίηση δέσμευσης και μεταφοράς των πωλήσεων στη λογιστική (τα τιμολόγια πελατών δεν θα λαμβάνονται υπόψη στη λογιστική)
 ACCOUNTING_DISABLE_BINDING_ON_PURCHASES=Απενεργοποίηση δέσμευσης και μεταφοράς των αγορών στη λογιστική (τα τιμολόγια προμηθευτών δεν θα λαμβάνονται υπόψη στη λογιστική)
-ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS=Απενεργοποίηση δέσμευσης και μεταφοράς των αναφορών εξόδων (στη λογιστική οι αναφορές δαπανών δεν θα ληφθούν υπόψη στη λογιστική)
+ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS=Απενεργοποίηση δέσμευσης και μεταφοράς των αναφορών εξόδων (στη λογιστική οι αναφορές εξόδων δεν θα ληφθούν υπόψη στη λογιστική)
 
 ## Export
 NotifiedExportDate=Επισημάνετε τις εξαγόμενες γραμμές ως Εξαγόμενες <span class="warning"> (για να τροποποιήσετε μια γραμμή, θα χρειαστεί να διαγράψετε ολόκληρη τη συναλλαγή και να τη μεταφέρετε ξανά στη λογιστική) </span>
-NotifiedValidationDate=Επικύρωση και Κλείδωμα των εξαγόμενων καταχωρήσεων <span class="warning"> (το ίδιο αποτέλεσμα με τη λειτουργία "Κλείσιμο", η τροποποίηση και η διαγραφή των γραμμών ΣΙΓΟΥΡΑ δεν θα είναι δυνατή) </span>
+NotifiedValidationDate=Επικύρωση και Κλείδωμα των εξαγόμενων καταχωρήσεων <span class="warning"> (το ίδιο αποτέλεσμα με τη δυνατότητα "%s", η τροποποίηση και η διαγραφή των γραμμών ΣΙΓΟΥΡΑ δεν θα είναι δυνατή) </span>
 DateValidationAndLock=Ημερομηνία επικύρωσης και κλειδώματος
 ConfirmExportFile=Επιβεβαίωση δημιουργίας του λογιστικού αρχείου εξαγωγής ;
-ExportDraftJournal=Εξαγωγή σχεδίου περιοδικού
-Modelcsv=Πρότυπο εξαγωγής
-Selectmodelcsv=Επιλέξτε ένα πρότυπο από την εξαγωγή
+ExportDraftJournal=Εξαγωγή προσχεδίου ημερολογίου
+Modelcsv=Υπόδειγμα εξαγωγής
+Selectmodelcsv=Επιλέξτε ένα υπόδειγμα εξαγωγής
 Modelcsv_normal=Κλασική εξαγωγή
 Modelcsv_CEGID=Εξαγωγή για CEGID Expert Comptabilité
 Modelcsv_COALA=Εξαγωγή για το Sage Coala
@@ -346,7 +349,7 @@ Modelcsv_ciel=Εξαγωγή για Sage50, Ciel Compta ή Compta Evo. (Μορφ
 Modelcsv_quadratus=Εξαγωγή για Quadratus QuadraCompta
 Modelcsv_ebp=Εξαγωγή για EBP
 Modelcsv_cogilog=Εξαγωγή για το Cogilog
-Modelcsv_agiris=Εξαγωγή για Agiris Isacompta
+Modelcsv_agiris=Εξαγωγή Agiris Isacompta
 Modelcsv_LDCompta=Εξαγωγή για LD Compta (v9) (Δοκιμή)
 Modelcsv_LDCompta10=Εξαγωγή για LD Compta (v10 και άνω)
 Modelcsv_openconcerto=Εξαγωγή για OpenConcerto (Test)
@@ -358,26 +361,26 @@ Modelcsv_winfic=Εξαγωγή για Winfic - eWinfic - WinSis Compta
 Modelcsv_Gestinumv3=Εξαγωγή για Gestinum (v3)
 Modelcsv_Gestinumv5=Εξαγωγή για Gestinum (v5)
 Modelcsv_charlemagne=Εξαγωγή για το Aplim Charlemagne
-ChartofaccountsId=Λογαριασμός Id
+ChartofaccountsId=Αναγνωριστικό λογιστικού σχεδίου 
 
 ## Tools - Init accounting account on product / service
 InitAccountancy=Έναρξη λογιστικής
-InitAccountancyDesc=Αυτή η σελίδα μπορεί να χρησιμοποιηθεί για την προετοιμασία ενός λογαριασμού λογιστικής σε προϊόντα και υπηρεσίες που δεν έχουν λογιστικό λογαριασμό που καθορίζεται για τις πωλήσεις και τις αγορές.
-DefaultBindingDesc=Αυτή η σελίδα μπορεί να χρησιμοποιηθεί για τον ορισμό ενός προεπιλεγμένου λογαριασμού που θα χρησιμοποιηθεί για να συνδέσει τις εγγραφές συναλλαγών σχετικά με τους μισθούς πληρωμής, τη δωρεά, τους φόρους και τις δεξαμενές όταν δεν έχει ήδη καθοριστεί συγκεκριμένος λογαριασμός λογιστικής.
+InitAccountancyDesc=Αυτή η σελίδα μπορεί να χρησιμοποιηθεί για την προετοιμασία ενός λογαριασμού λογιστικής σε προϊόντα και υπηρεσίες που δεν έχουν λογιστικό λογαριασμό για τις πωλήσεις και τις αγορές.
+DefaultBindingDesc=Αυτή η σελίδα μπορεί να χρησιμοποιηθεί για τον ορισμό ενός προεπιλεγμένου λογαριασμού που θα χρησιμοποιηθεί για να συνδέσει τις εγγραφές συναλλαγών σχετικά με την πληρωμή μισθών, δωρεές, τους φόρους και τον Φ.Π.Α. όταν δεν έχει ήδη καθοριστεί συγκεκριμένος λογαριασμός λογιστικής.
 DefaultClosureDesc=Αυτή η σελίδα μπορεί να χρησιμοποιηθεί για να ορίσετε τις παραμέτρους που χρησιμοποιούνται για τα λογιστικά κλεισίματα.
 Options=Επιλογές
 OptionModeProductSell=Λειτουργία πωλήσεων
-OptionModeProductSellIntra=Mode πωλήσεις που εξάγονται στην ΕΟΚ
-OptionModeProductSellExport=Mode πωλήσεις που εξάγονται σε άλλες χώρες
-OptionModeProductBuy=Κατάσταση αγορών
-OptionModeProductBuyIntra=Λειτουργίες που εισάγονται σε ΕΟΚ
-OptionModeProductBuyExport=Λειτουργία που αγοράστηκε εισαγόμενη από άλλες χώρες
+OptionModeProductSellIntra=Λειτουργία πωλήσεων/εξαγωγών στην Ε.Ε.
+OptionModeProductSellExport=Λειτουργία πωλήσεων/εξαγωγών σε άλλες χώρες
+OptionModeProductBuy=Λειτουργία αγορών
+OptionModeProductBuyIntra=Λειτουργία αγορών/εισαγωγών στην Ε.Ε.
+OptionModeProductBuyExport=Λειτουργία αγορών/εισαγωγών από άλλες χώρες
 OptionModeProductSellDesc=Εμφάνιση όλων των προϊόντων με λογιστικό λογαριασμό για πωλήσεις.
-OptionModeProductSellIntraDesc=Εμφάνιση όλων των προϊόντων με λογιστική καταγραφή πωλήσεων στην ΕΟΚ.
-OptionModeProductSellExportDesc=Εμφάνιση όλων των προϊόντων με λογαρια σμό για άλλες ξένες πωλήσεις.
+OptionModeProductSellIntraDesc=Εμφάνιση όλων των προϊόντων με λογιστικό λογαριασμό πωλήσεων στην Ε.Ε..
+OptionModeProductSellExportDesc=Εμφάνιση όλων των προϊόντων με λογιστικό λογαριασμό για άλλες ξένες πωλήσεις.
 OptionModeProductBuyDesc=Εμφάνιση όλων των προϊόντων με λογιστικό λογαριασμό για αγορές.
-OptionModeProductBuyIntraDesc=Εμφάνιση όλων των προϊόντων με λογιστικό λογαριασμό για αγορές σε ΕΟΚ.
-OptionModeProductBuyExportDesc=Εμφάνιση όλων των προϊόντων με λογιστικό λογαριασμό για άλλες αγορές στο εξωτερικό.
+OptionModeProductBuyIntraDesc=Εμφάνιση όλων των προϊόντων με λογιστικό λογαριασμό για αγορές στην Ε.Ε.
+OptionModeProductBuyExportDesc=Εμφάνιση όλων των προϊόντων με λογιστικό λογαριασμό για άλλες αγορές από το εξωτερικό.
 CleanFixHistory=Αφαιρέστε τον κωδικό λογιστικής από γραμμές που δεν υπάρχουν στο λογιστικό σχέδιο
 CleanHistory=Επαναφέρετε όλες τις δεσμεύσεις για το επιλεγμένο έτος
 PredefinedGroups=Προκαθορισμένες ομάδες
@@ -389,7 +392,7 @@ SaleLocal=Τοπική πώληση
 SaleExport=Εξαγωγική πώληση
 SaleEEC=Πώληση στην Ε.Ε.
 SaleEECWithVAT=Πώληση στην Ε.Ε. με μη μηδενικό ΦΠΑ, άρα υποθέτουμε ότι ΔΕΝ πρόκειται για ενδοκοινοτική πώληση και ο προτεινόμενος λογαριασμός είναι ο τυπικός λογαριασμός προϊόντος.
-SaleEECWithoutVATNumber=Πώληση στην Ε.Ε. χωρίς ΦΠΑ αλλά δεν έχει οριστεί το ΑΦΜ του τρίτου μερους. Επιστρέφουμε στον λογαριασμό προϊόντος για τυπικές πωλήσεις. Μπορείτε να διορθώσετε το ΑΦΜ τρίτου μέρους ή τον λογαριασμό προϊόντος εάν χρειάζεται.
+SaleEECWithoutVATNumber=Πώληση στην Ε.Ε. χωρίς ΦΠΑ αλλά δεν έχει οριστεί το ΑΦΜ του τρίτου μέρους. Επιστρέφουμε στον λογαριασμό προϊόντος για τυπικές πωλήσεις. Μπορείτε να διορθώσετε το ΑΦΜ τρίτου μέρους ή τον λογαριασμό προϊόντος εάν χρειάζεται.
 ForbiddenTransactionAlreadyExported=Απαγορευμένο: Η συναλλαγή έχει επικυρωθεί ή/και έχει εξαχθεί.
 ForbiddenTransactionAlreadyValidated=Απαγορευμένο: Η συναλλαγή έχει επικυρωθεί.
 ## Dictionary
@@ -398,34 +401,34 @@ Calculated=Υπολογίστηκε
 Formula=Τύπος
 
 ## Reconcile
-Unlettering=Ασυμβίβαστο
+Unlettering=Αναίρεση λογιστικής συμφωνίας
 AccountancyNoLetteringModified=Δεν τροποποιήθηκε η συμφωνία
 AccountancyOneLetteringModifiedSuccessfully=Μία συμφωνία τροποποιήθηκε με επιτυχία
 AccountancyLetteringModifiedSuccessfully=Η συμφωνία %s τροποποιήθηκε επιτυχώς
-AccountancyNoUnletteringModified=Κανένα ασυμβίβαστο δεν τροποποιήθηκε
-AccountancyOneUnletteringModifiedSuccessfully=Ένα ασυμβίβαστο τροποποιήθηκε με επιτυχία
-AccountancyUnletteringModifiedSuccessfully=%s ασυμβιβαστο τροποποιήθηκε επιτυχώς
+AccountancyNoUnletteringModified=Κανένα μη συμφωνημένο δεν τροποποιήθηκε
+AccountancyOneUnletteringModifiedSuccessfully=Ένα μη συμφωνηθέν τροποποιήθηκε με επιτυχία
+AccountancyUnletteringModifiedSuccessfully=%s μη συμφωνηθέντα τροποποιήθηκαν επιτυχώς
 
 ## Confirm box
-ConfirmMassUnlettering=Επιβεβαίωση μαζικής ασυμφωνίας
-ConfirmMassUnletteringQuestion=Είστε βέβαιοι ότι θέλετε να καταργήσετε την εναρμόνιση των επιλεγμένων εγγραφών %s;
+ConfirmMassUnlettering=Επιβεβαίωση μαζικής αναίρεσης λογιστικής συμφωνίας
+ConfirmMassUnletteringQuestion=Είστε σίγουροι ότι θέλετε να αναιρέσετε την συμφωνία των επιλεγμένων εγγραφών %s;
 ConfirmMassDeleteBookkeepingWriting=Επιβεβαίωση μαζικής διαγραφής
 ConfirmMassDeleteBookkeepingWritingQuestion=Αυτό θα διαγράψει τη συναλλαγή από τη λογιστική (όλες οι γραμμές που σχετίζονται με την ίδια συναλλαγή θα διαγραφούν) Είστε σίγουροι ότι θέλετε να διαγράψετε τις επιλεγμένες εγγραφές %s;
 
 ## Error
 SomeMandatoryStepsOfSetupWereNotDone=Ορισμένα υποχρεωτικά βήματα της ρύθμισης δεν έγιναν, παρακαλούμε ολοκληρώστε τα
 ErrorNoAccountingCategoryForThisCountry=Δεν υπάρχει διαθέσιμη ομάδα λογαριασμών λογιστικής για τη χώρα %s (Δες Αρχική - Ρυθμίσεις - Λεξικά)
-ErrorInvoiceContainsLinesNotYetBounded=Προσπαθείτε να κάνετε περιοδικές <strong>εκδόσεις</strong> ορισμένων γραμμών του τιμολογίου <strong>%s</strong> , αλλά ορισμένες άλλες γραμμές δεν έχουν ακόμη οριοθετηθεί στον λογαριασμό λογιστικής. Η δημοσίευση όλων των γραμμών τιμολογίου για αυτό το τιμολόγιο απορρίπτεται.
+ErrorInvoiceContainsLinesNotYetBounded=Προσπαθείτε να καταχωρήσετε στο ημερολόγιο ορισμένες γραμμές του τιμολογίου <strong> %s </strong> , αλλά ορισμένες άλλες γραμμές δεν είναι ακόμη δεσμευμένες στον λογιστικό λογαριασμό. Η καταχώρηση στο ημερολόγιο όλων των γραμμών τιμολογίων για αυτό το τιμολόγιο απορρίπτεται.
 ErrorInvoiceContainsLinesNotYetBoundedShort=Ορισμένες γραμμές στο τιμολόγιο δεν δεσμεύονται στο λογαριασμό λογιστικής.
 ExportNotSupported=Η διαμορφωμένη μορφή εξαγωγής δεν υποστηρίζεται σε αυτή τη σελίδα
 BookeppingLineAlreayExists=Γραμμές που υπάρχουν ήδη στη λογιστική
-NoJournalDefined=Δεν έχει οριστεί περιοδικό
-Binded=Γραμμές δεσμευμένες
-ToBind=Γραμμές που δεσμεύουν
-UseMenuToSetBindindManualy=Οι γραμμές που δεν έχουν ακόμη δεσμευτεί, χρησιμοποιήστε το μενού <a href="%s">%s</a> για να κάνετε τη σύνδεση μη αυτόματα
+NoJournalDefined=Δεν βρέθηκε ημερολόγιο
+Binded=Δεσμευμένες γραμμές 
+ToBind=Γραμμές προς δέσμευση
+UseMenuToSetBindindManualy=Γραμμές που δεν έχουν ακόμη δεσμευτεί, χρησιμοποιήστε το μενού <a href="%s">%s</a> για να κάνετε τη δέσμευση χειροκίνητα
 SorryThisModuleIsNotCompatibleWithTheExperimentalFeatureOfSituationInvoices=Λυπούμαστε, αυτή η ενότητα δεν είναι συμβατή με την πειραματική λειτουργία των τιμολογίων κατάστασης
-AccountancyErrorMismatchLetterCode=Αναντιστοιχία στον κώδικα συμφιλίωσης
-AccountancyErrorMismatchBalanceAmount=Το υπόλοιπο (%s) δεν είναι ίσο με 0
+AccountancyErrorMismatchLetterCode=Αναντιστοιχία στον κώδικο συμφωνίας
+AccountancyErrorMismatchBalanceAmount=Το ισοζύγιο (%s) δεν είναι ίσο με 0
 AccountancyErrorLetteringBookkeeping=Παρουσιάστηκαν σφάλματα σχετικά με τις συναλλαγές: %s
 ErrorAccountNumberAlreadyExists=Ο λογιστικός αριθμός %s υπάρχει ήδη
 
@@ -443,17 +446,17 @@ FECFormatSubledgerAccountLabel=Αριθμός λογαριασμού Βοηθη
 FECFormatPieceRef=Αναφορά καταχώρησης (PieceRef)
 FECFormatPieceDate=Δημιουργία ημερομηνίας καταχώρησης (PieceDate)
 FECFormatLabelOperation=Λειτουργία ετικέτας (EcritureLib)
-FECFormatDebit=Χρεωστική (Χρεωστική)
+FECFormatDebit=Χρέωση (Χρέωση)
 FECFormatCredit=Πίστωση (Πίστωση)
-FECFormatReconcilableCode=Κωδικός συμβιβασμού (EcritureLet)
-FECFormatReconcilableDate=Ημερομηνία συμβιβασμού (DateLet)
-FECFormatValidateDate=Ημερομηνία επικύρωσης τεμαχίου (ValidDate)
+FECFormatReconcilableCode=Κωδικός συμφωνίας (EcritureLet)
+FECFormatReconcilableDate=Ημερομηνία συμφωνίας (DateLet)
+FECFormatValidateDate=Ημερομηνία επικύρωσης καταχώρησης (ValidDate)
 FECFormatMulticurrencyAmount=Ποσό πολλαπλών νομισμάτων (Montantdevise)
 FECFormatMulticurrencyCode=Κωδικός πολλαπλών νομισμάτων (Idevise)
 
 DateExport=Ημερομηνία εξαγωγής
-WarningReportNotReliable=Προειδοποίηση, αυτή η αναφορά δεν βασίζεται στο Καθολικό, επομένως δεν περιέχει συναλλαγή που τροποποιήθηκε χειροκίνητα στο Καθολικό. Εάν η περιοδική σας έκδοση είναι ενημερωμένη, η προβολή της λογιστικής είναι πιο ακριβής.
-ExpenseReportJournal=Ημερολόγιο Έκθεσης Εξόδων
-InventoryJournal=Απογραφή Αποθέματος
+WarningReportNotReliable=Προειδοποίηση, αυτή η αναφορά δεν βασίζεται στο Καθολικό, επομένως δεν περιέχει συναλλαγή που τροποποιήθηκε χειροκίνητα στο Καθολικό. Εάν τα ημερολόγια σας είναι ενημερωμένα, η προβολή της λογιστικής είναι πιο ακριβής.
+ExpenseReportJournal=Ημερολόγιο Αναφοράς Εξόδων
+InventoryJournal=Ημερολόγιο απογραφής
 
 NAccounts= %s  λογαριασμοί
diff --git a/htdocs/langs/el_GR/admin.lang b/htdocs/langs/el_GR/admin.lang
index 003d5fd12a6..f1724e96989 100644
--- a/htdocs/langs/el_GR/admin.lang
+++ b/htdocs/langs/el_GR/admin.lang
@@ -163,7 +163,7 @@ PurgeAreaDesc=Αυτή η σελίδα σάς επιτρέπει να διαγρ
 PurgeDeleteLogFile=Διαγράψτε τα αρχεία καταγραφής, συμπεριλαμβανομένων αυτών<b>%s</b> που είναι ορισμένα για τη χρήση της ενότητας Syslog (χωρίς κίνδυνο απώλειας δεδομένων)
 PurgeDeleteTemporaryFiles=Διαγράψτε όλα τα αρχεία καταγραφής και τα προσωρινά αρχεία (χωρίς κίνδυνος απώλειας δεδομένων). Η παράμετρος μπορεί να είναι 'tempfilesold', 'logfiles' ή και τα δύο 'tempfilesold+logfiles'. Σημείωση: Η διαγραφή των προσωρινών αρχείων γίνεται μόνο εάν ο κατάλογος temp δημιουργήθηκε πριν από περισσότερες από 24 ώρες.
 PurgeDeleteTemporaryFilesShort=Διαγραφή αρχείων καταγραφής και προσωρινών αρχείων (χωρίς κίνδυνο απώλειας δεδομένων)
-PurgeDeleteAllFilesInDocumentsDir=Διαγράψτε όλα τα αρχεία στον κατάλογο: <b>%s</b> . <br> Αυτό θα διαγράψει όλα τα παραγόμενα έγγραφα που σχετίζονται με στοιχεία (τρίτα μέρη, τιμολόγια κ.λ.π.), αρχεία που έχουν μεταφορτωθεί στη μονάδα ECM, αρχεία από αντίγραφα ασφαλείας βάσεων δεδομένων και προσωρινά αρχεία.
+PurgeDeleteAllFilesInDocumentsDir=Διαγράψτε όλα τα αρχεία στον κατάλογο: <b>%s</b> . <br> Αυτό θα διαγράψει όλα τα παραγόμενα έγγραφα που σχετίζονται με στοιχεία (τρίτα μέρη, τιμολόγια κ.λ.π.), αρχεία που έχουν μεταφορτωθεί στην ενότητα ECM, αρχεία από αντίγραφα ασφαλείας βάσεων δεδομένων και προσωρινά αρχεία.
 PurgeRunNow=Εκκαθάριση τώρα
 PurgeNothingToDelete=Δεν υπάρχει κατάλογος ή αρχείο για διαγραφή.
 PurgeNDirectoriesDeleted=<b>%s</b> αρχεία ή κατάλογοι που διαγραφήκαν.
@@ -477,7 +477,7 @@ InstalledInto=Εγκαταστάθηκε στον κατάλογο %s
 BarcodeInitForThirdparties=Μαζική έναρξη γραμμικού κώδικα για Πελάτες/Προμηθευτές 
 BarcodeInitForProductsOrServices=Μαζική έναρξη ή επαναφορά barcode για προϊόντα ή υπηρεσίες
 CurrentlyNWithoutBarCode=Επί του παρόντος, έχετε <strong>%s</strong> εγγραφές <strong>%s</strong> %s χωρίς barcode.
-InitEmptyBarCode=Τιμή έναρξης για τις επόμενες %sκενές εγγραφές 
+InitEmptyBarCode=Τιμή έναρξης για τους %s κενούς γραμμικούς κώδικες 
 EraseAllCurrentBarCode=Διαγράψτε όλες τις τρέχουσες τιμές barcode
 ConfirmEraseAllCurrentBarCode=Είστε σίγουροι ότι θέλετε να διαγράψετε όλες τις τρέχουσες τιμές barcode;
 AllBarcodeReset=Όλες οι τιμές barcode έχουν αφαιρεθεί
@@ -665,7 +665,7 @@ Module4000Desc=Διαχείριση ανθρώπινου δυναμικού (δ
 Module5000Name=Multi-company
 Module5000Desc=Σας επιτρέπει να διαχειρίζεστε πολλές εταιρείες
 Module6000Name=Ροή εργασίας μεταξύ ενοτήτων
-Module6000Desc=Διαχείριση ροής εργασιών μεταξύ διαφορετικών μονάδων (αυτόματη δημιουργία αντικειμένου και/ή αυτόματη αλλαγή κατάστασης)
+Module6000Desc=Διαχείριση ροής εργασιών μεταξύ διαφορετικών ενοτήτων (αυτόματη δημιουργία αντικειμένου και/ή αυτόματη αλλαγή κατάστασης)
 Module10000Name=Ιστοσελίδες
 Module10000Desc=Δημιουργείστε ιστότοπους (δημόσιους) με έναν κειμενογράφο WYSIWYG. Πρόκειται για ένα CMS για webmaster ή προγραμματιστές (είναι καλύτερο να γνωρίζετε τη γλώσσα HTML και CSS). Απλά ρυθμίστε τον διακομιστή ιστού σας (Apache, Nginx, ...) να δείχνει στον κατάλογο που είναι εγκατεστημένο το Dolibarr ώστε να ειναι online στο διαδίκτυο με το δικό σας όνομα τομέα.
 Module20000Name=Διαχείριση αιτήματος άδειας
@@ -714,6 +714,7 @@ Permission27=Διαγραφή εμπορικών προτάσεων
 Permission28=Εξαγωγή εμπορικών προτάσεων
 Permission31=Ανάγνωση προϊόντων
 Permission32=Δημιουργία / τροποποίηση προϊόντων
+Permission33=Ανάγνωση τιμών προϊόντων
 Permission34=Διαγραφή προϊόντων
 Permission36=Έλεγχος/διαχείριση κρυφών προϊόντων
 Permission38=Εξαγωγή προϊόντων
@@ -739,6 +740,7 @@ Permission79=Δημιουργία / τροποποίηση συνδρομών
 Permission81=Ανάγνωση παραγγελιών πελατών
 Permission82=Δημιουργία / τροποποίηση παραγγελιών πελατών
 Permission84=Επικύρωση παραγγελιών πελατών
+Permission85=Δημιουργία εγγράφων εντολών πωλήσεων
 Permission86=Αποστολή παραγγελιών πελατών
 Permission87=Κλείσιμο παραγγελιών πελατών
 Permission88=Ακύρωση παραγγελιών πελατών
@@ -874,6 +876,7 @@ Permission525=Πρόσβαση στον υπολογιστή δανείου
 Permission527=Εξαγωγή δανείων
 Permission531=Ανάγνωση υπηρεσιών
 Permission532=Δημιουργία / τροποποίηση υπηρεσιών
+Permission533=Ανάγνωση τιμών υπηρεσιών
 Permission534=Διαγραφή υπηρεσιών
 Permission536=Εμφάνιση / διαχείριση κρυφών υπηρεσιών
 Permission538=Εξαγωγή υπηρεσιών
@@ -1060,7 +1063,7 @@ DictionaryAvailability=Καθυστέρηση παράδοσης
 DictionaryOrderMethods=Μέθοδοι παραγγελίας
 DictionarySource=Προέλευση των προσφορών/παραγγελιών
 DictionaryAccountancyCategory=Εξατομικευμένες ομάδες για αναφορές
-DictionaryAccountancysystem=Μοντέλα λογιστικού σχεδίου
+DictionaryAccountancysystem=Υποδείγματα λογιστικού σχεδίου
 DictionaryAccountancyJournal=Λογιστικά ημερολόγια
 DictionaryEMailTemplates=Πρότυπα ηλεκτρονικού ταχυδρομείου
 DictionaryUnits=Μονάδες
@@ -1194,7 +1197,7 @@ BankModuleNotActive=Η ενότητα τραπεζικών λογαριασμώ
 ShowBugTrackLink=Εμφάνιση του συνδέσμου " <strong> %s </strong> "
 ShowBugTrackLinkDesc=Διατηρήστε το κενό για να μην εμφανίζεται αυτός ο σύνδεσμος, χρησιμοποιήστε την τιμή "github" για τον σύνδεσμο προς το έργο Dolibarr ή ορίστε απευθείας μια διεύθυνση url "https://..."
 Alerts=Ειδοποιήσεις
-DelaysOfToleranceBeforeWarning=Εμφάνιση προειδοποιητικής ειδοποίησης για...
+DelaysOfToleranceBeforeWarning=Εμφάνιση προειδοποίησης για...
 DelaysOfToleranceDesc=Ρυθμίστε την καθυστέρηση προτού εμφανιστεί στην οθόνη ένα εικονίδιο ειδοποίησης %s για το στοιχείο που έχει καθυστερήσει.
 Delays_MAIN_DELAY_ACTIONS_TODO=Τα προγραμματισμένα συμβάντα (γεγονότα της ατζέντας) που δεν ολοκληρώθηκαν
 Delays_MAIN_DELAY_PROJECT_TO_CLOSE=Το έργο δεν έκλεισε εγκαίρως
@@ -1235,6 +1238,7 @@ BrowserName=Όνομα φυλλομετρητή
 BrowserOS=Λειτουργικό σύστημα φυλλομετρητή
 ListOfSecurityEvents=Λίστα συμβάντων ασφαλείας Dolibarr
 SecurityEventsPurged=Εκκαθαρίστηκαν τα συμβάντα ασφαλείας
+TrackableSecurityEvents=Συμβάντα ασφαλείας με δυνατότητα παρακολούθησης
 LogEventDesc=Ενεργοποιήστε την καταγραφή για συγκεκριμένα συμβάντα ασφαλείας. Οι διαχειριστές μέσω του μενού <b>%s - %s</b> . Προειδοποίηση, αυτή η δυνατότητα μπορεί να δημιουργήσει ένα μεγάλο όγκο δεδομένων στη βάση δεδομένων.
 AreaForAdminOnly=Οι παράμετροι εγκατάστασης μπορούν να οριστούν μόνο <b> από διαχειριστές </b> .
 SystemInfoDesc=Οι πληροφορίες συστήματος είναι διάφορες τεχνικές πληροφορίες που λαμβάνετε μόνο σε λειτουργία ανάγνωσης και είναι ορατές μόνο για τους διαχειριστές.
@@ -1246,7 +1250,7 @@ DisplayDesc=Οι παράμετροι που επηρεάζουν την εμφ
 AvailableModules=Διαθέσιμες εφαρμογές / ενότητες
 ToActivateModule=Για να ενεργοποιήσετε ενότητες, μεταβείτε στην Περιοχή εγκατάστασης (Αρχική-> Ρυθμίσεις-> Ενότητες/Εφαρμογές).
 SessionTimeOut=Λήξη χρόνου για τη συνεδρία
-SessionExplanation=Αυτός ο αριθμός εγγυάται ότι η σύνοδος δεν θα λήξει ποτέ πριν από αυτήν την καθυστέρηση, εάν το πρόγραμμα καθαρισμού συνεδριών γίνεται από εσωτερικό πρόγραμμα καθαρισμού συνεδριών PHP (και τίποτα άλλο). Το εσωτερικό καθαριστικό συνεδρίας της PHP δεν εγγυάται ότι η περίοδος λήξης θα λήξει μετά από αυτήν την καθυστέρηση. Θα λήξει μετά από αυτή την καθυστέρηση και όταν εκτελείται το πρόγραμμα καθαρισμού συνεδριών, έτσι ώστε κάθε <b>%s / %s να έχει</b> πρόσβαση, αλλά μόνο κατά την πρόσβαση από άλλες συνεδρίες (εάν η τιμή είναι 0, σημαίνει ότι η εκκαθάριση της περιόδου λειτουργίας γίνεται μόνο από μια εξωτερική διαδικασία) . <br> Σημείωση: Σε ορισμένους διακομιστές με μηχανισμό εξωτερικού καθαρισμού συνεδριών (cron κάτω από debian, ubuntu ...), οι συνεδρίες μπορούν να καταστραφούν μετά από μια περίοδο που ορίζεται από μια εξωτερική ρύθμιση, ανεξάρτητα από την αξία που εισάγεται εδώ.
+SessionExplanation=Αυτός ο αριθμός εγγυάται ότι η περίοδος λειτουργίας δεν λήγει πριν από αυτό το χρονικό διάστημα, όταν παρέχεται εκκαθάριση περιόδου λειτουργίας από τον εσωτερικό μηχανισμό καθαρισμού της PHP (και κανένας άλλος). Η εκκαθάριση της εσωτερικής περιόδου λειτουργίας PHP δεν εγγυάται ότι η περίοδος λειτουργίας λήγει ακριβώς αυτήν τη στιγμή. Θα λήξει μετά από αυτό το χρονικό διάστημα, αλλά όταν εκκαθαριστούν οι περίοδοι λειτουργίας, που πραγματοποιείται περίπου κάθε <b>%s/%s</b> προσβάσεις, , αλλά μόνο κατά τις προσβάσεις που πραγματοποιούνται από άλλες περιόδους σύνδεσης (εάν η τιμή είναι 0, αυτό σημαίνει ότι ο καθαρισμός της περιόδου σύνδεσης γίνεται με μια εξωτερική διαδικασία). <br>\nΣημείωση: σε ορισμένους διακομιστές που είναι εξοπλισμένοι με μηχανισμό καθαρισμού εξωτερικής συνεδρίας (cron στο Debian, Ubuntu…), οι συνεδρίες μπορούν να καταστραφούν μετά από καθυστέρηση, που ορίζεται από μια εξωτερική διαμόρφωση, ανεξάρτητα από την τιμή που εισάγεται εδώ.
 SessionsPurgedByExternalSystem=Οι περίοδοι σύνδεσης σε αυτόν τον διακομιστή φαίνεται να καθαρίζονται από έναν εξωτερικό μηχανισμό (cron υπό debian, ubuntu ...), πιθανώς κάθε <b> %s </b> δευτερόλεπτα (= η τιμή της παραμέτρου <b>session.gc_maxlifetime</b>). Η Αλλαγή της τιμή της παραμέτρου από εδώ δεν θα έχει κάποιο αποτέλεσμα. Πρέπει να ζητήσετε από τον διαχειριστή του διακομιστή να αλλάξει την καθυστέρηση συνεδρίας.
 TriggersAvailable=Διαθέσιμα triggers
 TriggersDesc=Τα triggers είναι αρχεία που θα τροποποιήσουν τη συμπεριφορά της ροής εργασίας Dolibarr μόλις αντιγραφουν στον κατάλογο <b>htdocs/core/triggers</b> . Πραγματοποιούν νέες ενέργειες που ενεργοποιούνται σε συμβάντα Dolibarr (δημιουργία νέας εταιρείας, επικύρωση τιμολογίου, ...).
@@ -1264,7 +1268,7 @@ MAIN_MAX_DECIMALS_UNIT=Μέγιστος αριθμός δεκαδικών για
 MAIN_MAX_DECIMALS_TOT=Μέγιστος αριθμός δεκαδικών για τις συνολικές τιμές
 MAIN_MAX_DECIMALS_SHOWN=Μέγιστος αριθμός δεκαδικών για τις τιμές που<b> εμφανίζονται στην οθόνη </b> . Προσθέστε μια έλλειψη <b> ... </b> μετά από αυτήν την παράμετρο (π.χ. "2...") εάν θέλετε να δείτε το "<b> ... </b>" με την κατάληξη στην τιμή.
 MAIN_ROUNDING_RULE_TOT=Βήμα στρογγυλοποίησης (για χώρες όπου η στρογγυλοποίηση γίνεται σε κάτι διαφορετικό από τη βάση 10. Για παράδειγμα, βάλτε 0,05 αν η στρογγυλοποίηση γίνεται με 0,05 βήματα)
-UnitPriceOfProduct=Καθαρή τιμή επί του προϊόντος
+UnitPriceOfProduct=Καθαρή τιμή προϊόντος
 TotalPriceAfterRounding=Συνολική τιμή (με ή χωρίς Φ.Π.Α.) μετά από στρογγυλοποίηση
 ParameterActiveForNextInputOnly=Η παράμετρος ισχύει μόνο για την επόμενη είσοδο
 NoEventOrNoAuditSetup=Δεν έχει καταγραφεί κανένα συμβάν ασφαλείας. Αυτό είναι φυσιολογικό εάν ο Έλεγχος δεν έχει ενεργοποιηθεί στη σελίδα "Ρυθμίσεις - Ασφάλεια - Συμβάντα ασφαλείας".
@@ -1374,7 +1378,7 @@ FieldEdition=Έκδοση στο πεδίο %s
 FillThisOnlyIfRequired=Παράδειγμα: +2 (συμπλήρωση μόνο εάν παρουσιαστούν προβλήματα μετατόπισης ζώνης ώρας)
 GetBarCode=Πάρτε barcode
 NumberingModules=Μοντέλα αρίθμησης
-DocumentModules=Μοντέλα εγγράφων
+DocumentModules=Υποδείγματα εγγράφων
 ##### Module password generation
 PasswordGenerationStandard=Επιστρέφει έναν κωδικό πρόσβασης που δημιουργήθηκε σύμφωνα με τον εσωτερικό αλγόριθμο του Dolibarr: %s χαρακτήρες που περιέχουν κοινόχρηστους αριθμούς και χαρακτήρες με πεζά.
 PasswordGenerationNone=Μην προτείνετε έναν κωδικό πρόσβασης που δημιουργείται. Ο κωδικός πρόσβασης πρέπει να πληκτρολογηθεί μη αυτόματα.
@@ -1415,25 +1419,25 @@ WebDavServer=URL ρίζας του %sδιακομιστή : %s
 WebCalUrlForVCalExport=Ένας σύνδεσμος εξαγωγής στη μορφή <b> %s </b> είναι διαθέσιμος στον ακόλουθο σύνδεσμο: %s
 ##### Invoices #####
 BillsSetup=Ρύθμιση ενότητας τιμολογίων
-BillsNumberingModule=Μοντέλο αρίθμησης τιμολογίων και πιστωτικών σημειωμάτων
-BillsPDFModules=Μοντέλα εγγράφων τιμολογίου
-BillsPDFModulesAccordindToInvoiceType=Μοντέλα παραστατικών τιμολογίων σύμφωνα με τον τύπο τιμολογίου
-PaymentsPDFModules=Μοντέλα εγγράφων πληρωμής
+BillsNumberingModule=Υπόδειγμα αρίθμησης τιμολογίων και πιστωτικών σημειωμάτων
+BillsPDFModules=Υποδείγματα εγγράφων τιμολογίου
+BillsPDFModulesAccordindToInvoiceType=Υποδείγματα παραστατικών τιμολογίων ανάλογα με τον τύπο τιμολογίου
+PaymentsPDFModules=Υποδείγματα εγγράφων πληρωμής
 ForceInvoiceDate=Επιβολή ημερομηνίας ισχύος τιμολογίου σε ημερομηνία επικύρωσης
 SuggestedPaymentModesIfNotDefinedInInvoice=Προτεινόμενη μέθοδος πληρωμής στο τιμολόγιο από προεπιλογή, εάν δεν ορίζεται στο τιμολόγιο
 SuggestPaymentByRIBOnAccount=Προτείνετε πληρωμή με ανάληψη από τον λογαριασμό
 SuggestPaymentByChequeToAddress=Προτείνετε πληρωμή με επιταγή προς
 FreeLegalTextOnInvoices=Ελεύθερο κείμενο στα τιμολόγια
 WatermarkOnDraftInvoices=Υδατογράφημα σε πρόχειρα τιμολόγια (κανένα αν είναι κενό)
-PaymentsNumberingModule=Μοντέλο αρίθμησης πληρωμών
+PaymentsNumberingModule=Πρότυπο αρίθμησης πληρωμών
 SuppliersPayment=Πληρωμές προμηθευτών
 SupplierPaymentSetup=Ρύθμιση πληρωμών προμηθευτή
 InvoiceCheckPosteriorDate=Ελέγξτε την ημερομηνία του παραστατικού πριν από την επικύρωση
 InvoiceCheckPosteriorDateHelp=Η επικύρωση ενός τιμολογίου θα απαγορεύεται εάν η ημερομηνία του είναι προγενέστερη από την ημερομηνία του τελευταίου τιμολογίου του ίδιου τύπου.
 ##### Proposals #####
 PropalSetup=Ρύθμιση ενότητας εμπορικών προσφορών
-ProposalsNumberingModules=Μοντέλα αρίθμησης εμπορικών προσφορών
-ProposalsPDFModules=Μοντέλα εγγράφων εμπορικών προσφορών
+ProposalsNumberingModules=Υποδείγματα αρίθμησης εμπορικών προσφορών
+ProposalsPDFModules=Υποδείγματα εγγράφων εμπορικών προσφορών
 SuggestedPaymentModesIfNotDefinedInProposal=Προτεινόμενος τρόπος πληρωμής στην προσφορά από προεπιλογή, εάν δεν ορίζεται στην  προσφορά
 FreeLegalTextOnProposal=Ελεύθερο κείμενο στις προσφορές
 WatermarkOnDraftProposal=Υδατογράφημα σε προσχέδια εμπορικών  προσφορών (κανένα εάν δεν είναι κενό)
@@ -1441,7 +1445,7 @@ BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ζητήστε τον τραπεζικό 
 ##### SupplierProposal #####
 SupplierProposalSetup=Ρύθμιση ενότητας αιτημάτων τιμής προμηθευτών 
 SupplierProposalNumberingModules=Μοντέλα αρίθμησης των αιτημάτων τιμής προμηθευτών 
-SupplierProposalPDFModules=Μοντέλα εγγράφων αιτημάτων τιμής προμηθευτών 
+SupplierProposalPDFModules=Υποδείγματα εγγράφων αιτημάτων τιμής προμηθευτών 
 FreeLegalTextOnSupplierProposal=Ελεύθερο κείμενο για αιτήματα τιμών προμηθευτών
 WatermarkOnDraftSupplierProposal=Υδατογράφημα σε προσχέδια αιτημάτων τιμής προμηθευτών  (κανένα αν είναι κενό)
 BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_PROPOSAL=Ζητήστε τον τραπεζικό λογαριασμό για το αίτημα τιμής
@@ -1451,8 +1455,8 @@ BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDER=Ζητήστε τον τραπεζι
 ##### Orders #####
 SuggestedPaymentModesIfNotDefinedInOrder=Προτεινόμενη μέθοδος πληρωμής για παραγγελία πώλησης από προεπιλογή, εάν δεν καθορίζεται στην παραγγελία
 OrdersSetup=Ρύθμιση διαχείρισης παραγγελιών πωλήσεων
-OrdersNumberingModules=Μοντέλα αρίθμησης παραγγελιών
-OrdersModelModule=Μοντέλα εγγράφων παραγγελίας
+OrdersNumberingModules=Υποδείγματα αρίθμησης παραγγελιών
+OrdersModelModule=Υποδείγματα εγγράφων παραγγελίας
 FreeLegalTextOnOrders=Ελεύθερο κείμενο στις παραγγελίες
 WatermarkOnDraftOrders=Υδατογράφημα σε προσχέδια παραγγελίας (κανένα εάν δεν είναι κενό)
 ShippableOrderIconInList=Προσθήκη εικονιδίου στις Παραγγελίες που δείχνει ότι η παραγγελία μπορεί να αποσταλεί
@@ -1460,13 +1464,13 @@ BANK_ASK_PAYMENT_BANK_DURING_ORDER=Ζητήστε τον τραπεζικό λο
 ##### Interventions #####
 InterventionsSetup=Ρύθμιση ενότητας παρεμβάσεων
 FreeLegalTextOnInterventions=Ελεύθερο κείμενο στα έντυπα παρέμβασης
-FicheinterNumberingModules=Μοντέλα αρίθμησης παρέμβασης
-TemplatePDFInterventions=Μοντέλα εγγράφων καρτών παρέμβασης
+FicheinterNumberingModules=Υποδείγματα αρίθμησης παρέμβασης
+TemplatePDFInterventions=Υποδείγματα εγγράφων καρτών παρέμβασης
 WatermarkOnDraftInterventionCards=Υδατογράφημα στα έγγραφα της κάρτας παρέμβασης (κανένα αν είναι κενό)
 ##### Contracts #####
 ContractsSetup=Ρύθμιση ενότητας Συμβάσεις/Συνδρομές
 ContractsNumberingModules=Ενότητες αρίθμησης συμβάσεων
-TemplatePDFContracts=Μοντέλα εγγράφων συμβάσεων
+TemplatePDFContracts=Υποδείγματα εγγράφων συμβάσεων
 FreeLegalTextOnContracts=Ελεύθερο κείμενο για τις συμβάσεις
 WatermarkOnDraftContractCards=Υδατογράφημα σε προσχέδια συμβάσεων (κανένα αν είναι άδειο)
 ##### Members #####
@@ -1477,7 +1481,7 @@ AdherentMailRequired=Απαιτείται email για τη δημιουργία
 MemberSendInformationByMailByDefault=Το πλαίσιο ελέγχου για την αποστολή επιβεβαίωσης αλληλογραφίας στα μέλη (επικύρωση ή νέα συνδρομή) είναι ενεργοποιημένο από προεπιλογή
 MemberCreateAnExternalUserForSubscriptionValidated=Δημιουργήστε στοιχεία σύνδεσης εξωτερικού χρήστη για κάθε επικυρωμένη συνδρομή νέου μέλους
 VisitorCanChooseItsPaymentMode=Ο επισκέπτης μπορεί να επιλέξει μεταξύ των διαθέσιμων τρόπων πληρωμής
-MEMBER_REMINDER_EMAIL=Ενεργοποιήστε την αυτόματη υπενθύμιση <b> μέσω email </b> των ληγμένων συνδρομών. Σημείωση: Η μονάδα <strong> %s </strong> πρέπει να είναι ενεργοποιημένη και να ρυθμιστεί σωστά για την αποστολή υπενθυμίσεων.
+MEMBER_REMINDER_EMAIL=Ενεργοποιήστε την αυτόματη υπενθύμιση <b> μέσω email </b> των ληγμένων συνδρομών. Σημείωση: Η ενότητα <strong> %s </strong> πρέπει να είναι ενεργοποιημένη και να ρυθμιστεί σωστά για την αποστολή υπενθυμίσεων.
 MembersDocModules=Πρότυπα εγγράφων για έγγραφα που δημιουργούνται από εγγραφή μέλους
 ##### LDAP setup #####
 LDAPSetup=Ρύθμιση LDAP
@@ -1608,15 +1612,15 @@ LDAPFieldGroupid=Αναγνωριστικό ομάδας
 LDAPFieldGroupidExample=Παράδειγμα: gidnumber
 LDAPFieldUserid=Αναγνωριστικό χρήστη
 LDAPFieldUseridExample=Παραδείγματα: uidnumber
-LDAPFieldHomedirectory=Αρχική σελίδα
+LDAPFieldHomedirectory=Home directory
 LDAPFieldHomedirectoryExample=Παράδειγμα: homedirectory
-LDAPFieldHomedirectoryprefix=Πρόθεμα καταλόγου αρχικής σελίδας
+LDAPFieldHomedirectoryprefix=Πρόθεμα Home directory
 LDAPSetupNotComplete=Η ρύθμιση του LDAP δεν ολοκληρώθηκε (πηγαίνετε σε άλλες καρτέλες)
 LDAPNoUserOrPasswordProvidedAccessIsReadOnly=Δεν δόθηκε διαχειριστής ή κωδικός πρόσβασης . Η πρόσβαση LDAP θα είναι ανώνυμη και σε λειτουργία μόνο για ανάγνωση.
 LDAPDescContact=Αυτή η σελίδα σάς επιτρέπει να ορίσετε το όνομα των χαρακτηριστικών LDAP στο δέντρο LDAP για κάθε δεδομένο που βρέθηκε στις επαφές Dolibarr.
 LDAPDescUsers=Αυτή η σελίδα σάς επιτρέπει να ορίσετε το όνομα των χαρακτηριστικών LDAP στο δέντρο LDAP για κάθε δεδομένο που βρέθηκε στους χρήστες του Dolibarr.
 LDAPDescGroups=Αυτή η σελίδα σάς επιτρέπει να ορίσετε το όνομα των χαρακτηριστικών LDAP στο δέντρο LDAP για κάθε δεδομένο που βρέθηκε στις ομάδες Dolibarr.
-LDAPDescMembers=Αυτή η σελίδα σάς επιτρέπει να ορίσετε το όνομα των χαρακτηριστικών LDAP στο δέντρο LDAP για κάθε στοιχείο που βρίσκεται στη μονάδα μελών Dolibarr.
+LDAPDescMembers=Αυτή η σελίδα σάς επιτρέπει να ορίσετε το όνομα των χαρακτηριστικών LDAP στο δέντρο LDAP για κάθε στοιχείο που βρίσκεται στην ενότητα μελών Dolibarr.
 LDAPDescMembersTypes=Αυτή η σελίδα σάς επιτρέπει να ορίσετε το όνομα των χαρακτηριστικών LDAP στο δέντρο LDAP για κάθε στοιχείο που βρίσκεται σε τύπους μελών Dolibarr.
 LDAPDescValues=Οι παραδειγματικές τιμές έχουν σχεδιαστεί για το <b> OpenLDAP </b> με τα ακόλουθα φορτωμένα σχήματα: <b> core.schema, cosine.schema, inetorgperson.schema </b>). Εάν χρησιμοποιείτε αυτές τις τιμές και το OpenLDAP, τροποποιήστε το αρχείο διαμόρφωσης LDAP <b> slapd.conf </b> για να φορτωθούν όλα αυτά τα σχήματα.
 ForANonAnonymousAccess=Για μια επαληθευμένη πρόσβαση (για παράδειγμα, για πρόσβαση εγγραφής)
@@ -1722,28 +1726,28 @@ NotificationDisableConfirmMessageUser=Απόκρυψη της λίστας τω
 NotificationDisableConfirmMessageFix=Απόκρυψη της λίστας παραληπτών (που έχουν εγγραφεί ως καθολικό email) των ειδοποιήσεων στο μήνυμα επιβεβαίωσης
 ##### Sendings #####
 SendingsSetup=Ρύθμιση ενότητας αποστολών
-SendingsReceiptModel=Μοντέλο απόδειξης αποστολής
+SendingsReceiptModel=Υπόδειγμα απόδειξης αποστολής
 SendingsNumberingModules=Ενότητες αρίθμησης αποστόλων
 SendingsAbility=Υποστήριξη φύλλων αποστολής για παραδόσεις πελατών
 NoNeedForDeliveryReceipts=Στις περισσότερες περιπτώσεις, τα φύλλα αποστολής χρησιμοποιούνται τόσο ως φύλλα για παραδόσεις πελατών (κατάλογος προϊόντων προς αποστολή) όσο και ως φύλλα που παραλαμβάνονται και υπογράφονται από τον πελάτη. Ως εκ τούτου, η παραλαβή των παραδόσεων προϊόντων είναι διπλότυπο χαρακτηριστικό και σπάνια ενεργοποιείται.
 FreeLegalTextOnShippings=Ελεύθερο κείμενο στις αποστολές
 ##### Deliveries #####
 DeliveryOrderNumberingModules=Ενότητα αρίθμησης αποδείξεων παραδόσεων προϊόντων
-DeliveryOrderModel=Μοντέλο απόδειξης παράδοσης προϊόντων
+DeliveryOrderModel=Υπόδειγμα απόδειξης παράδοσης προϊόντων
 DeliveriesOrderAbility=Υποστήριξη αποδείξεων παραδόσεων προϊόντων
 FreeLegalTextOnDeliveryReceipts=Ελεύθερο κείμενο στις αποδείξεις παραλαβής
 ##### FCKeditor #####
 AdvancedEditor=Προηγμένος επεξεργαστής
 ActivateFCKeditor=Ενεργοποιήστε το προηγμένο πρόγραμμα επεξεργασίας για:
-FCKeditorForNotePublic=WYSIWIG δημιουργία/έκδοση του πεδίου «δημόσιες σημειώσεις» στοιχείων
-FCKeditorForNotePrivate=WYSIWIG δημιουργία/έκδοση του πεδίου "ιδιωτικές σημειώσεις" στοιχείων
-FCKeditorForCompany=WYSIWIG δημιουργία/έκδοση της περιγραφής πεδίου στοιχείων (εκτός προϊόντων/υπηρεσιών)
-FCKeditorForProduct=WYSIWIG δημιουργία/έκδοση της περιγραφής πεδίου προϊόντων/υπηρεσιών
-FCKeditorForProductDetails=WYSIWIG δημιουργία/έκδοση γραμμών λεπτομερειών προϊόντων για όλες τις οντότητες (προσφορές, παραγγελίες, τιμολόγια κ.λ.π...). <span class="warning"> Προειδοποίηση: Η χρήση αυτής της επιλογής για αυτήν την περίπτωση δεν συνιστάται, καθώς μπορεί να δημιουργήσει προβλήματα με ειδικούς χαρακτήρες και τη μορφοποίηση σελίδων κατά τη δημιουργία αρχείων PDF. </span>
-FCKeditorForMailing= Δημιουργία / έκδοση WYSIWIG για μαζικά eMailings (Εργαλεία-> eMailing)
-FCKeditorForUserSignature=WYSIWIG δημιουργία/έκδοση υπογραφής χρήστη
-FCKeditorForMail=Δημιουργία/έκδοση WYSIWIG για όλη την αλληλογραφία (εκτός από Εργαλεία->EMailing)
-FCKeditorForTicket=Δημιουργία / έκδοση WYSIWIG για εισιτήρια
+FCKeditorForNotePublic=WYSIWYG δημιουργία/έκδοση του πεδίου «δημόσιες σημειώσεις» στοιχείων
+FCKeditorForNotePrivate=WYSIWYG δημιουργία/έκδοση του πεδίου "ιδιωτικές σημειώσεις" στοιχείων
+FCKeditorForCompany=WYSIWYG δημιουργία/έκδοση της περιγραφής πεδίου στοιχείων (εκτός προϊόντων/υπηρεσιών)
+FCKeditorForProduct=WYSIWYG δημιουργία/έκδοση της περιγραφής πεδίου προϊόντων/υπηρεσιών
+FCKeditorForProductDetails=WYSIWYG δημιουργία/έκδοση γραμμών λεπτομερειών προϊόντων για όλες τις οντότητες (προσφορές, παραγγελίες, τιμολόγια κ.λ.π...). <span class="warning"> Προειδοποίηση: Η χρήση αυτής της επιλογής για αυτήν την περίπτωση δεν συνιστάται, καθώς μπορεί να δημιουργήσει προβλήματα με ειδικούς χαρακτήρες και τη μορφοποίηση σελίδων κατά τη δημιουργία αρχείων PDF. </span>
+FCKeditorForMailing= Δημιουργία / έκδοση WYSIWYG για μαζικά eMailings (Εργαλεία-> eMailing)
+FCKeditorForUserSignature=WYSIWYG δημιουργία/έκδοση υπογραφής χρήστη
+FCKeditorForMail=Δημιουργία/έκδοση WYSIWYG για όλη την αλληλογραφία (εκτός από Εργαλεία->EMailing)
+FCKeditorForTicket=Δημιουργία / έκδοση WYSIWYG για εισιτήρια
 ##### Stock #####
 StockSetup=Ρύθμιση ενότητας αποθέματος
 IfYouUsePointOfSaleCheckModule=Εάν χρησιμοποιείτε τη μονάδα Point of Sale (POS) που παρέχεται από προεπιλογή ή μια εξωτερική ενότητα, αυτή η ρύθμιση ενδέχεται να αγνοηθεί από τη ενότητα POS σας. Οι περισσότερες ενότητες POS έχουν σχεδιαστεί από προεπιλογή για να δημιουργούν ένα τιμολόγιο αμέσως και να μειώνουν το απόθεμα ανεξάρτητα από τις επιλογές εδώ. Επομένως, εάν θέλετε ή όχι να έχετε μείωση αποθεμάτων κατά την εγγραφή μιας πώλησης από το POS σας, ελέγξτε επίσης τη ρύθμιση της ενότητας POS.
@@ -1767,7 +1771,7 @@ DetailEnabled=Προϋπόθεση εμφάνισης ή μη εγγραφής
 DetailRight=Συνθήκη για την εμφάνιση γκρι μενού μη εξουσιοδοτημένων
 DetailLangs=Όνομα αρχείου Lang για μετάφραση κώδικα ετικέτας
 DetailUser=Intern / Extern / All
-Target=Target
+Target=Στόχος
 DetailTarget=Στόχευση συνδέσμων (_blank top ανοίγει ένα νέο παράθυρο)
 DetailLevel=Επίπεδο (-1: επάνω μενού, 0: μενού κεφαλίδας, >0 μενού και υπομενού)
 ModifMenu=Αλλαγή μενού
@@ -1850,7 +1854,7 @@ ApiProductionMode=Ενεργοποιήστε τη λειτουργία παρα
 ApiExporerIs=Μπορείτε να εξερευνήσετε και να δοκιμάσετε τα API στη διεύθυνση URL
 OnlyActiveElementsAreExposed=Εκτίθενται μόνο στοιχεία από ενεργοποιημένες ενότητες
 ApiKey=Κλειδί για το API
-WarningAPIExplorerDisabled=Ο εξερευνητής API έχει απενεργοποιηθεί. Ο εξερευνητής API δεν απαιτείται να παρέχει υπηρεσίες API. Είναι ένα εργαλείο για τον προγραμματιστή να εντοπίσει / δοκιμάσει τα API REST. Αν χρειάζεστε αυτό το εργαλείο, μεταβείτε στη ρύθμιση API REST για να το ενεργοποιήσετε.
+WarningAPIExplorerDisabled=Ο εξερευνητής API έχει απενεργοποιηθεί. Ο εξερευνητής API δεν απαιτείται να παρέχει υπηρεσίες API. Είναι ένα εργαλείο για τον προγραμματιστή να εντοπίσει / δοκιμάσει τα API REST. Αν χρειάζεστε αυτό το εργαλείο, μεταβείτε στη ρύθμιση της ενότητας API REST για να το ενεργοποιήσετε.
 ##### Bank #####
 BankSetupModule=Ρύθμιση ενότητας τράπεζας
 FreeLegalTextOnChequeReceipts=Ελευθερο κείμενο στις αποδείξεις επιταγών
@@ -1867,7 +1871,7 @@ SuppliersSetup=Ρύθμιση ενότητας προμηθευτή
 SuppliersCommandModel=Πλήρες πρότυπο παραγγελιών αγοράς
 SuppliersCommandModelMuscadet=Πλήρες πρότυπο παραγγελιών αγοράς (παλιά εφαρμογή του προτύπου cornas)
 SuppliersInvoiceModel=Πλήρες πρότυπο τιμολογίου προμηθευτή
-SuppliersInvoiceNumberingModel=Αριθμητικά μοντέλα τιμολογίων προμηθευτών
+SuppliersInvoiceNumberingModel=Υποδείγματα Αρίθμησης τιμολογίων προμηθευτών
 IfSetToYesDontForgetPermission=Αν είναι ρυθμισμένη σε μη μηδενική τιμή, μην ξεχάσετε να δώσετε δικαιώματα σε ομάδες ή χρήστες που επιτρέπονται για τη δεύτερη έγκριση
 ##### GeoIPMaxmind #####
 GeoIPMaxmindSetup=Ρύθμιση ενότητας GeoIP Maxmind
@@ -1879,9 +1883,9 @@ TestGeoIPResult=Δοκιμή μετατροπής IP  -> χώρα
 ##### Projects #####
 ProjectsNumberingModules=Ενότητα αρίθμησης έργων
 ProjectsSetup=Ρύθμιση ενότητας έργου
-ProjectsModelModule=Μοντέλο εγγράφου αναφορών έργου
+ProjectsModelModule=Υπόδειγμα εγγράφου αναφορών έργου
 TasksNumberingModules=Ενότητα αρίθμησης εργασιών
-TaskModelModule=Μοντέλο εγγράφου αναφορών εργασιών
+TaskModelModule=Υπόδειγμα εγγράφου αναφορών εργασιών
 UseSearchToSelectProject=Περιμένετε μέχρι να πατηθεί ένα πλήκτρο πριν φορτώσετε το περιεχόμενο της σύνθετης λίστας έργου. <br> Αυτό μπορεί να βελτιώσει την απόδοση εάν έχετε μεγάλο αριθμό έργων, αλλά είναι λιγότερο βολικό.
 ##### ECM (GED) #####
 ##### Fiscal Year #####
@@ -1926,7 +1930,7 @@ InstallModuleFromWebHasBeenDisabledByFile=Η εγκατάσταση εξωτερ
 ConfFileMustContainCustom=Κατά την εγκατάσταση ή τη δημιουργία μιας εξωτερικής ενότητας από την εφαρμογή πρέπει να αποθηκεύσετε τα αρχεία της ενότητας στον κατάλογο <strong> %s </strong>. Για να υποβληθεί σε επεξεργασία αυτού ο κατάλογος από το Dolibarr, πρέπει να ρυθμίσετε το <strong> conf/conf.php </strong> και να προσθέσετε τις 2 γραμμές οδηγιών: <br><strong> $dolibarr_main_url_root_alt='/custom';</strong><br><strong>$dolibarr_main_document_root_alt='%s/custom';</strong>
 HighlightLinesOnMouseHover=Επισήμανση των γραμμών του πίνακα όταν περνάει ο δρομέας του ποντικιού από πάνω
 HighlightLinesColor=Επισήμανση του χρώματος της γραμμής όταν περνάει ο δρομέας του ποντικιού από πάνω (χρησιμοποιήστε 'ffffff' για να μην γίνει επισήμανση)
-HighlightLinesChecked=Επισήμανση του χρώματος της γραμμής όταν επιλέγεται (χρησιμοποιήστε 'ffffff' για να μην επισημανθεί)
+HighlightLinesChecked=Χρώμα επισήμανσης γραμμής όταν αυτή επιλέγεται (χρησιμοποιήστε 'ffffff' για να μην επισημανθεί)
 UseBorderOnTable=Εμφάνιση περιγραμμάτων αριστερά-δεξιά στους πίνακες
 BtnActionColor=Χρώμα του κουμπιού ενέργειας
 TextBtnActionColor=Χρώμα κειμένου του κουμπιού ενέργειας
@@ -1943,7 +1947,7 @@ BackgroundTableTitleTextColor=Χρώμα κειμένου για τη γραμμ
 BackgroundTableTitleTextlinkColor=Χρώμα κειμένου για τη γραμμή συνδέσμου τίτλου πίνακα
 BackgroundTableLineOddColor=Χρώμα φόντου για τις περιττές (μονές) γραμμές του πίνακα
 BackgroundTableLineEvenColor=Χρώμα φόντου για τις άρτιες (ζυγές) γραμμές του πίνακα
-MinimumNoticePeriod=Ελάχιστη περίοδος προειδοποίησης (Η αίτησή σας πρέπει να γίνει πριν από αυτή την καθυστέρηση)
+MinimumNoticePeriod=Ελάχιστη περίοδος προειδοποίησης (Η αίτηση σας για άδεια πρέπει να υποβληθεί πριν από αυτό το διάστημα)
 NbAddedAutomatically=Αριθμός ημερών που προστίθενται στους μετρητές χρηστών (αυτόματα) κάθε μήνα
 EnterAnyCode=Αυτό το πεδίο περιέχει μια αναφορά για τον προσδιορισμό της γραμμής. Εισάγετε οποιαδήποτε τιμή της επιλογής σας, αλλά χωρίς ειδικούς χαρακτήρες.
 Enter0or1=Εισαγωγή 0 ή 1
@@ -1977,11 +1981,12 @@ MailToSendSupplierOrder=Εντολές αγοράς
 MailToSendSupplierInvoice=Τιμολόγια προμηθευτή
 MailToSendContract=Συμβόλαια
 MailToSendReception=Παραλαβές
+MailToExpenseReport=Αναφορές εξόδων
 MailToThirdparty=Τρίτα μέρη
 MailToMember=Μέλη
 MailToUser=Χρήστες
 MailToProject=Έργα
-MailToTicket=Εισιτήρια
+MailToTicket=Tickets
 ByDefaultInList=Εμφάνιση από προεπιλογή στην προβολή λίστας
 YouUseLastStableVersion=Χρησιμοποιείτε την πιο πρόσφατη σταθερή έκδοση
 TitleExampleForMajorRelease=Παράδειγμα μηνύματος που μπορείτε να χρησιμοποιήσετε για να ανακοινώσετε αυτή τη σημαντική έκδοση (μην διστάσετε να το χρησιμοποιήσετε στις ιστοσελίδες σας)
@@ -1996,10 +2001,10 @@ SeeSubstitutionVars=Δείτε τη σημείωση * για τη λίστα π
 SeeChangeLog=Δείτε το αρχείο ChangeLog (μόνο στα αγγλικά)
 AllPublishers=Όλοι οι εκδότες
 UnknownPublishers=Άγνωστοι εκδότες
-AddRemoveTabs=Προσθέστε ή καταργήστε καρτέλες
+AddRemoveTabs=Προσθήκη ή κατάργηση καρτέλων
 AddDataTables=Προσθήκη πινάκων αντικειμένων
-AddDictionaries=Προσθέστε πίνακες λεξικών
-AddData=Προσθέστε δεδομένα αντικειμένων ή λεξικών
+AddDictionaries=Προσθήκη πινάκων λεξικών
+AddData=Προσθήκη δεδομένων αντικειμένων ή λεξικών
 AddBoxes=Προσθήκη γραφικών στοιχείων
 AddSheduledJobs=Προσθήκη προγραμματισμένων εργασιών
 AddHooks=Προσθήκη hooks
@@ -2017,10 +2022,10 @@ ListOfAvailableAPIs=Λίστα διαθέσιμων API
 activateModuleDependNotSatisfied=Η ενότητα "%s" εξαρτάται από την ενότητα "%s", η οποία λείπει, επομένως η ενότητα "%1$s" ενδέχεται να μην λειτουργεί σωστά. Εγκαταστήστε την ενότητα "%2$s" ή απενεργοποιήστε την ενότητα "%1$s" για να αποφύγετε ενδεχόμενα προβλήματα
 CommandIsNotInsideAllowedCommands=Η εντολή που προσπαθείτε να εκτελέσετε δεν βρίσκεται στη λίστα επιτρεπόμενων εντολών που ορίζονται στην παράμετρο <strong>$ dolibarr_main_restrict_os_commands</strong> στο αρχείο <strong>conf.php</strong> .
 LandingPage=Σελίδα προορισμού
-SamePriceAlsoForSharedCompanies=Εάν χρησιμοποιείτε μια μονάδα πολλαπλών εταιρειών, με την επιλογή "Ενιαία τιμή", η τιμή θα είναι επίσης η ίδια για όλες τις εταιρείες εάν τα προϊόντα μοιράζονται μεταξύ περιβαλλόντων
+SamePriceAlsoForSharedCompanies=Εάν χρησιμοποιείτε μια ενότητα πολλαπλών εταιρειών, με την επιλογή "Ενιαία τιμή", η τιμή θα είναι επίσης η ίδια για όλες τις εταιρείες εάν τα προϊόντα μοιράζονται μεταξύ περιβαλλόντων
 ModuleEnabledAdminMustCheckRights=Η ενότητα έχει ενεργοποιηθεί. Τα δικαιώματα για ενεργοποιημένες ενότητες δόθηκαν μόνο σε διαχειριστές. Ίσως χρειαστεί να εκχωρήσετε δικαιώματα σε άλλους χρήστες ή ομάδες χειροκίνητα, εάν το κρίνετε απαραίτητο.
 UserHasNoPermissions=Αυτός ο χρήστης δεν έχει καθορισμένα δικαιώματα
-TypeCdr=Χρησιμοποιήστε το &quot;Κανένας&quot; εάν η ημερομηνία πληρωμής είναι η ημερομηνία του τιμολογίου συν ένα δέλτα σε ημέρες (δέλτα είναι πεδίο &quot;%s&quot;) <br> Χρησιμοποιήστε το &quot;Στο τέλος του μήνα&quot;, εάν, μετά το δέλτα, η ημερομηνία πρέπει να αυξηθεί για να φτάσει στο τέλος του μήνα (+ ένα προαιρετικό &quot;%s&quot; σε ημέρες) <br> Χρησιμοποιήστε το &quot;Τρέχουσα / Επόμενη&quot; για να έχετε την ημερομηνία πληρωμής ως το πρώτο Nth του μήνα μετά το δέλτα (το delta είναι πεδίο &quot;%s&quot;, το N αποθηκεύεται στο πεδίο &quot;%s&quot;)
+TypeCdr=Χρησιμοποιήστε "Καμία" εάν η ημερομηνία προθεσμίας πληρωμής είναι η ημερομηνία του τιμολογίου συν ένα δέλτα σε ημέρες (το δέλτα είναι το πεδίο "%s") <br> Χρησιμοποιήστε "Στο τέλος του μήνα", εάν, μετά το δέλτα, η ημερομηνία πρέπει να αυξηθεί για να φτάσετε στο τέλος του μήνα (+ ένα προαιρετικό "%s" σε ημέρες) <br> Χρησιμοποιήστε το "Τρέχον/Επόμενο" για να έχετε την ημερομηνία προθεσμίας πληρωμής το πρώτο Ν του μήνα μετά το δέλτα (το δέλτα είναι το πεδίο "%s", το N αποθηκεύεται στο πεδίο "%s")
 BaseCurrency=Νόμισμα αναφοράς της εταιρείας (πηγαίνετε στη ρύθμιση της εταιρείας για να το αλλάξετε)
 WarningNoteModuleInvoiceForFrenchLaw=Αυτή η ενότητα %s συμμορφώνεται με τους γαλλικούς νόμους (Loi Finance 2016).
 WarningNoteModulePOSForFrenchLaw=Αυτή η ενότητα %s συμμορφώνεται με τους γαλλικούς νόμους (Loi Finance 2016), επειδή η ενότητα Μη αναστρέψιμες καταγραφές ενεργοποιείται αυτόματα.
@@ -2030,6 +2035,7 @@ MAIN_PDF_MARGIN_RIGHT=Δεξί περιθώριο στο PDF
 MAIN_PDF_MARGIN_TOP=Πάνω περιθώριο στο PDF
 MAIN_PDF_MARGIN_BOTTOM=Κάτω περιθώριο στο PDF
 MAIN_DOCUMENTS_LOGO_HEIGHT=Ύψος λογότυπου στο PDF
+DOC_SHOW_FIRST_SALES_REP=Εμφάνιση πρώτου αντιπροσώπου πωλήσεων
 MAIN_GENERATE_PROPOSALS_WITH_PICTURE=Προσθήκη στήλης για εικόνα στις γραμμές προσφορών
 MAIN_DOCUMENTS_WITH_PICTURE_WIDTH=Το πλάτος της στήλης εάν προστεθεί μια εικόνα σε γραμμές
 MAIN_PDF_NO_SENDER_FRAME=Απόκρυψη περιγραμμάτων στο πλαίσιο διεύθυνσης αποστολέα
@@ -2063,13 +2069,19 @@ EmailCollectors=Συλλέκτες email
 EmailCollectorDescription=Προσθέστε μια προγραμματισμένη εργασία και μια σελίδα ρύθμισης για να σαρώνετε τακτικά τα email (χρησιμοποιώντας το πρωτόκολλο IMAP) και να καταγράφετε τα email που λαμβάνονται στην εφαρμογή σας, στο σωστό μέρος ή/και να δημιουργείτε ορισμένες εγγραφές αυτόματα (όπως δυνητικούς πελάτες).
 NewEmailCollector=Νέος Συλλέκτης Email
 EMailHost=Κεντρικός υπολογιστής διακομιστή IMAP email
+EMailHostPort=Θύρα email διακομιστή IMAP
+loginPassword=Όνομα σύνδεσης/Κωδικός πρόσβασης
+oauthToken=Oauth2 token
+accessType=Τύπος πρόσβασης
+oauthService=Υπηρεσία Oauth
+TokenMustHaveBeenCreated=Η ενότητα OAuth2 πρέπει να είναι ενεργοποιημένη και να έχει δημιουργηθεί ένα διακριτικό oauth2 με τα σωστά δικαιώματα (για παράδειγμα, το πεδίο "gmail_full" με το OAuth για το Gmail).
 MailboxSourceDirectory=Κατάλογος προέλευσης γραμματοκιβωτίου
 MailboxTargetDirectory=Κατάλογος προορισμού γραμματοκιβωτίου
 EmailcollectorOperations=Λειτουργίες συλλέκτη
 EmailcollectorOperationsDesc=Οι λειτουργίες εκτελούνται με σειρά από πάνω προς τα κάτω
 MaxEmailCollectPerCollect=Μέγιστος αριθμός μηνυμάτων ηλεκτρονικού ταχυδρομείου που συλλέγονται
 CollectNow=Συλλέξτε τώρα
-ConfirmCloneEmailCollector=Είστε βέβαιοι ότι θέλετε να αντιγράψετε τον συλλέκτη email %s;
+ConfirmCloneEmailCollector=Είστε σίγουροι ότι θέλετε να αντιγράψετε τον συλλέκτη email %s;
 DateLastCollectResult=Ημερομηνία τελευταίας προσπάθειας συλλογής
 DateLastcollectResultOk=Ημερομηνία τελευταίας επιτυχούς συλλογής
 LastResult=Τελευταίο αποτέλεσμα
@@ -2106,7 +2118,7 @@ CreateCandidature=Δημιουργία αίτησης εργασίας
 FormatZip=Zip
 MainMenuCode=Κωδικός εισόδου μενού (mainmenu)
 ECMAutoTree=Εμφάνιση αυτόματης δομής ECM
-OperationParamDesc=Καθορίστε τους κανόνες που θα χρησιμοποιηθούν για την εξαγωγή ή τον ορισμό τιμών.  <br>Παράδειγμα για λειτουργίες που χρειάζονται εξαγωγή ονόματος από το θέμα του email: <br> name=EXTRACT:SUBJECT:Μήνυμα από την εταιρεία ([^\n] *) <br> Παράδειγμα για λειτουργίες που δημιουργούν αντικείμενα: <br>objproperty1 = SET: η τιμή για σύνολο<br>objproperty2 = SET: μια τιμή περιλαμβανομένης αξία των __objproperty1__<br> objproperty3 = SETIFEMPTY: αξία χρησιμοποιείται αν το objproperty3 δεν έχει ήδη οριστεί<br> objproperty4 = EXTRACT: HEADER :X-Myheaderkey:\\s*([^\\s]*)<br> options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br> object.objproperty5=EXTRACT:BODY:M [^\\s]*)<br> <br> Χρησιμοποιήστε ένα ; char ως διαχωριστικό για εξαγωγή ή ρύθμιση πολλών ιδιοτήτων.
+OperationParamDesc=Καθορίστε τους κανόνες που θα χρησιμοποιηθούν για την εξαγωγή ορισμένων δεδομένων ή ορίστε τιμές που θα χρησιμοποιηθούν για την λειτουργία. <br> <br> Παράδειγμα εξαγωγής ονόματος εταιρείας από το θέμα του email σε μια προσωρινή μεταβλητή: <br> tmp_var=EXTRACT:SUBJECT:Μήνυμα από την εταιρεία ([^\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> Χρησιμοποιήστε ένα ; char ως διαχωριστικό για εξαγωγή ή ρύθμιση πολλών ιδιοτήτων.
 OpeningHours=Ώρες λειτουργίας
 OpeningHoursDesc=Εισάγετε εδώ το κανονικό ωράριο λειτουργίας της εταιρείας σας.
 ResourceSetup=Διαμόρφωση της ενότητας πόρων
@@ -2146,7 +2158,7 @@ SomeFilesOrDirInRootAreWritable=Ορισμένα αρχεία ή κατάλογ
 EXPORTS_SHARE_MODELS=Τα μοντέλα εξαγωγής είναι κοινά σε όλους
 ExportSetup=Ρύθμιση ενότητας Εξαγωγή
 ImportSetup=Ρύθμιση ενότητας Εισαγωγή
-InstanceUniqueID=Μοναδικό αναγνωριστικό της παρουσίας
+InstanceUniqueID=Μοναδικό αναγνωριστικό της συνεδρίας
 SmallerThan=Μικρότερη από
 LargerThan=Μεγαλύτερη από
 IfTrackingIDFoundEventWillBeLinked=Λάβετε υπόψη ότι εάν ένα αναγνωριστικό παρακολούθησης ενός αντικειμένου βρεθεί στο ηλεκτρονικό ταχυδρομείο ή εάν το μήνυμα ηλεκτρονικού ταχυδρομείου είναι απάντηση σε ένα email που έχει ήδη παραληφθεί και συνδέεται με ένα αντικείμενο, το συμβάν που δημιουργήθηκε θα συνδεθεί αυτόματα με το γνωστό σχετικό αντικείμενο.
@@ -2211,9 +2223,10 @@ ModuleUpdateAvailable=Υπάρχει διαθέσιμη ενημέρωση
 NoExternalModuleWithUpdate=Δεν βρέθηκαν ενημερώσεις για εξωτερικές ενότητες
 SwaggerDescriptionFile=Αρχείο περιγραφής Swagger API (για χρήση με redoc για παράδειγμα)
 YouEnableDeprecatedWSAPIsUseRESTAPIsInstead=Ενεργοποιήσατε το ξεπερασμένο πλέον WS API. Αντ' αυτού πρέπει να χρησιμοποιήσετε το REST API
-RandomlySelectedIfSeveral=Τυχαία επιλεγμένη αν είναι διαθέσιμες αρκετές φωτογραφίες
-DatabasePasswordObfuscated=Ο κωδικός πρόσβασης βάσης δεδομένων είναι ασαφής στο αρχείο conf
-DatabasePasswordNotObfuscated=Ο κωδικός πρόσβασης της βάσης δεδομένων ΔΕΝ είναι ασαφής στο αρχείο conf
+RandomlySelectedIfSeveral=Τυχαία επιλεγμένη αν είναι διαθέσιμες αρκετές εικόνες
+SalesRepresentativeInfo=Για Προσφορές, Παραγγελίες, Τιμολόγια.
+DatabasePasswordObfuscated=Ο κωδικός πρόσβασης βάσης δεδομένων είναι μη αναγνωρίσιμος(obfuscated) στο αρχείο conf
+DatabasePasswordNotObfuscated=Ο κωδικός πρόσβασης της βάσης δεδομένων ΔΕΝ είναι μη αναγνωρίσιμος(obfuscated) στο αρχείο conf
 APIsAreNotEnabled=Οι ενότητες API δεν είναι ενεργοποιημένες
 YouShouldSetThisToOff=Θα πρέπει να το ρυθμίσετε στο 0 ή off
 InstallAndUpgradeLockedBy=Η εγκατάσταση και οι αναβαθμίσεις είναι κλειδωμένες από το αρχείο <b> %s </b>
@@ -2251,7 +2264,7 @@ LateWarningAfter=Προειδοποίηση μετά την "καθυστέρη
 TemplateforBusinessCards=Πρότυπο για μια επαγγελματική κάρτα σε διαφορετικό μέγεθος
 InventorySetup= Ρύθμιση αποθέματος
 ExportUseLowMemoryMode=Χρησιμοποιήστε low memory mode
-ExportUseLowMemoryModeHelp=Χρησιμοποιήστε low memory mode για να εκτελέσετε το exec του dump (η συμπίεση γίνεται μέσω ενός pipe αντί στη μνήμη PHP). Αυτή η μέθοδος δεν επιτρέπει τον έλεγχο ολοκλήρωσης του αρχείου και δεν θα αναφερθεί μήνυμα σφάλματος εάν αποτύχει.
+ExportUseLowMemoryModeHelp=Χρησιμοποιήστε τη λειτουργία χαμηλής μνήμης για να εκτελέσετε το εκτελέσιμο του αρχείου αντιγράφου ασφαλείας (η συμπίεση γίνεται μέσω ενός pipe αντί στη μνήμη PHP). Αυτή η μέθοδος δεν επιτρέπει τον έλεγχο ότι το αρχείο έχει ολοκληρωθεί και δεν μπορεί να αναφερθεί το μήνυμα σφάλματος εάν αποτύχει.
 
 ModuleWebhookName = Webhook
 ModuleWebhookDesc = Διεπαφή για αποστολή σε μια διεύθυνση URL ενεργειών του Dolibarr
@@ -2265,7 +2278,7 @@ ReadOnlyMode=Σε λειτουργία "Μόνο για ανάγνωση".
 DEBUGBAR_USE_LOG_FILE=Χρησιμοποιήστε το αρχείο <b> dolibarr.log </b> για να παγιδεύσετε αρχεία καταγραφής
 UsingLogFileShowAllRecordOfSubrequestButIsSlower=Χρησιμοποιήστε το αρχείο dolibarr.log για να παγιδεύσετε τα αρχεία καταγραφής αντί για τη σύλληψη ζωντανής μνήμης. Επιτρέπει τη σύλληψη όλων των αρχείων καταγραφής αντί μόνο του αρχείου καταγραφής της τρέχουσας διαδικασίας (συμπεριλαμβανομένου αυτού των σελίδων υποαιτημάτων ajax), αλλά θα κάνει την παρουσία σας πολύ πολύ αργή. Δεν προτείνεται.
 FixedOrPercent=Σταθερό (χρησιμοποιήστε λέξη-κλειδί "σταθερό") ή ποσοστό (χρησιμοποιήστε λέξη-κλειδί "ποσοστό")
-DefaultOpportunityStatus=Προεπιλεγμένη κατάσταση ευκαιρίας (πρώτη κατάσταση όταν δημιουργείται υποψήφιος πελάτης)
+DefaultOpportunityStatus=Προεπιλεγμένη κατάσταση ευκαιρίας (πρώτη κατάσταση όταν δημιουργείται μια προοπτική)
 
 IconAndText=Εικονίδιο και κείμενο
 TextOnly=Μόνο Κείμενο
@@ -2277,5 +2290,20 @@ INVOICE_ADD_ZATCA_QR_CODEMore=Ορισμένες αραβικές χώρες χ
 INVOICE_ADD_SWISS_QR_CODE=Εμφάνιση του ελβετικού κωδικού QR-Bill στα τιμολόγια
 UrlSocialNetworksDesc=Σύνδεσμος URL του κοινωνικού δικτύου. Χρησιμοποιήστε το {socialid} για το τμήμα της μεταβλητής που περιέχει το αναγνωριστικό του κοινωνικού δικτύου.
 IfThisCategoryIsChildOfAnother=Αν αυτή η κατηγορία είναι θυγατρική μιας άλλης
+DarkThemeMode=Λειτουργία σκούρου θέματος(Dark theme)
+AlwaysDisabled=Πάντα απενεργοποιημένο
+AccordingToBrowser=Ανάλογα με το πρόγραμμα περιήγησης
+AlwaysEnabled=Πάντα ενεργοποιημένο
+DoesNotWorkWithAllThemes=Δεν ειναι συμβατό με όλα τα θέματα
 NoName=Χωρίς Όνομα
+ShowAdvancedOptions= Εμφάνιση σύνθετων επιλογών
+HideAdvancedoptions= Απόκρυψη σύνθετων επιλογών
 CIDLookupURL=Η ενότητα φέρνει μια διεύθυνση URL που μπορεί να χρησιμοποιηθεί από ένα εξωτερικό εργαλείο για τη λήψη του ονόματος ενός τρίτου μέρους ή μιας επαφής από τον αριθμό τηλεφώνου του. Η διεύθυνση URL προς χρήση είναι:
+OauthNotAvailableForAllAndHadToBeCreatedBefore=Ο έλεγχος ταυτότητας OAUTH2 δεν είναι διαθέσιμος για όλους τους κεντρικούς υπολογιστές και ένα token με τα σωστά δικαιώματα έπρεπε να έχει δημιουργηθεί με τη ενότητα OAUTH
+MAIN_MAIL_SMTPS_OAUTH_SERVICE=Υπηρεσία ελέγχου ταυτότητας OAUTH2
+DontForgetCreateTokenOauthMod=Ένα token με τα σωστά δικαιώματα έπρεπε να έχει δημιουργηθεί με τη ενότητα OAUTH
+MAIN_MAIL_SMTPS_AUTH_TYPE=Μέθοδος πιστοποίησης
+UsePassword=Χρησιμοποιήστε έναν κωδικό πρόσβασης
+UseOauth=Χρησιμοποιήστε ένα token OAUTH
+Images=Eικόνες
+MaxNumberOfImagesInGetPost=Μέγιστος επιτρεπόμενος αριθμός εικόνων προς υποβολή σε ένα πεδίο HTML μιας φόρμας
diff --git a/htdocs/langs/el_GR/agenda.lang b/htdocs/langs/el_GR/agenda.lang
index 4f901fa2a2f..5877db8fb3c 100644
--- a/htdocs/langs/el_GR/agenda.lang
+++ b/htdocs/langs/el_GR/agenda.lang
@@ -57,6 +57,7 @@ MemberValidatedInDolibarr=Το μέλος %s επικυρώθηκε
 MemberModifiedInDolibarr=Το μέλος %s τροποποιήθηκε
 MemberResiliatedInDolibarr=Το μέλος %s διαγράφηκε
 MemberDeletedInDolibarr=Το μέλος %s διαγράφηκε
+MemberExcludedInDolibarr=Το μέλος %sεξαιρέθηκε 
 MemberSubscriptionAddedInDolibarr=Προστέθηκε συνδρομή %s για το μέλος %s
 MemberSubscriptionModifiedInDolibarr=Η συνδρομή %s για το μέλος %s τροποποιήθηκε
 MemberSubscriptionDeletedInDolibarr=Η συνδρομή %s για το μέλος %s διαγράφηκε
@@ -109,11 +110,11 @@ EXPENSE_REPORT_REFUSEDInDolibarr=Η αναφορά εξόδων %s απορρί
 PROJECT_CREATEInDolibarr=Το έργο %s δημιουργήθηκε
 PROJECT_MODIFYInDolibarr=Το έργο %s τροποποιήθηκε
 PROJECT_DELETEInDolibarr=Το έργο %s διαγράφηκε
-TICKET_CREATEInDolibarr=Το εισιτήριο %s δημιουργήθηκε
-TICKET_MODIFYInDolibarr=Το εισιτήριο %s τροποποιήθηκε
-TICKET_ASSIGNEDInDolibarr=Το εισιτήριο %s ανατέθηκε
-TICKET_CLOSEInDolibarr=Το εισιτήριο %s έκλεισε
-TICKET_DELETEInDolibarr=Το εισιτήριο %s διαγράφηκε
+TICKET_CREATEInDolibarr=Το ticket %s δημιουργήθηκε
+TICKET_MODIFYInDolibarr=Το ticket %s τροποποιήθηκε
+TICKET_ASSIGNEDInDolibarr=Το ticket %s ανατέθηκε
+TICKET_CLOSEInDolibarr=Το ticket %s έκλεισε
+TICKET_DELETEInDolibarr=Το ticket %s διαγράφηκε
 BOM_VALIDATEInDolibarr=Το BOM επικυρώθηκε
 BOM_UNVALIDATEInDolibarr=Το BOM δεν είναι επικυρωμένο
 BOM_CLOSEInDolibarr=Το BOM απενεργοποιήθηκε
@@ -159,6 +160,7 @@ DateActionBegin=Ημερομηνία έναρξης ενέργειας
 ConfirmCloneEvent=Είστε σίγουροι πως θέλετε να αντιγράψετε το συμβάν <b>%s</b>;
 RepeatEvent=Επανάληψη ενέργειας
 OnceOnly=Μόνο μία φορά
+EveryDay=Κάθε μέρα
 EveryWeek=Κάθε εβδομάδα
 EveryMonth=Κάθε μήνα
 DayOfMonth=Ημέρα του Μήνα
@@ -174,3 +176,4 @@ AddReminder=Δημιουργήστε μια αυτόματη ειδοποίησ
 ErrorReminderActionCommCreation=Σφάλμα κατά τη δημιουργία της ειδοποίησης υπενθύμισης για αυτή την ενέργεια
 BrowserPush=Αναδυόμενη ειδοποίηση προγράμματος περιήγησης
 ActiveByDefault=Ενεργοποιημένο από προεπιλογή
+Until=μέχρι
diff --git a/htdocs/langs/el_GR/assets.lang b/htdocs/langs/el_GR/assets.lang
index c22f6a43f92..42f57f2be23 100644
--- a/htdocs/langs/el_GR/assets.lang
+++ b/htdocs/langs/el_GR/assets.lang
@@ -23,7 +23,7 @@ AccountancyCodeDepreciationExpense=Λογιστικός κωδικός (λογα
 AssetsLines=Περιουσιακά στοιχεία
 DeleteType=Διαγραφή
 DeleteAnAssetType=Διαγραφή ενός τύπου ενεργητικού
-ConfirmDeleteAssetType=Είστε βέβαιοι ότι θέλετε να διαγράψετε αυτό τον τύπο ενεργητικού;
+ConfirmDeleteAssetType=Είστε σίγουροι ότι θέλετε να διαγράψετε αυτό τον τύπο ενεργητικού;
 ShowTypeCard=Εμφάνιση τύπου "%s"
 
 # Module label 'ModuleAssetsName'
@@ -79,16 +79,16 @@ AssetDateAcquisition=Ημερομηνία Απόκτησης
 AssetDateStart=Ημερομηνία έναρξης λειτουργίας
 AssetAcquisitionType=Τρόπος απόκτησης
 AssetAcquisitionTypeNew=Νέο
-AssetAcquisitionTypeOccasion=Μεταχειρισμένο
-AssetType=Τύπος περιουσιακού στοιχείου
+AssetAcquisitionTypeOccasion=Μεταχειρισμένα
+AssetType=Τύπος ενεργητικού
 AssetTypeIntangible=Αϋλο
 AssetTypeTangible=Απτό
 AssetTypeInProgress=Σε εξέλιξη
 AssetTypeFinancial=Χρηματοοικονομικό
 AssetNotDepreciated=Δεν αποσβέστηκε
 AssetDisposal=Διάθεση
-AssetConfirmDisposalAsk=Είστε βέβαιοι ότι θέλετε να διαθέσετε το περιουσιακό στοιχείο <b> %s </b>;
-AssetConfirmReOpenAsk=Είστε βέβαιοι ότι θέλετε να ανοίξετε ξανά το στοιχείο <b> %s </b>;
+AssetConfirmDisposalAsk=Είστε σίγουροι ότι θέλετε να διαθέσετε αυτό το περιουσιακό στοιχείο <b> %s </b>;
+AssetConfirmReOpenAsk=Είστε βέβαιοι ότι θέλετε να ανοίξετε ξανά αυτό το στοιχείο <b> %s </b>;
 
 #
 # Asset status
@@ -102,15 +102,15 @@ AssetRecorded=Καταγεγραμμένο
 #
 AssetDisposalDate=Ημερομηνία διάθεσης
 AssetDisposalAmount=Αξία διάθεσης
-AssetDisposalType=Είδος διάθεσης
+AssetDisposalType=Τύπος διάθεσης
 AssetDisposalDepreciated=Απόσβεση του έτους μεταφοράς
 AssetDisposalSubjectToVat=Η διάθεση υπόκειται σε ΦΠΑ
 
 #
 # Asset model
 #
-AssetModel=Μοντέλο περιουσιακού στοιχείου
-AssetModels=Μοντέλα περιουσιακών στοιχείων
+AssetModel=Τύπος ενεργητικού
+AssetModels=Τύποι ενεργητικού
 
 #
 # Asset depreciation options
@@ -121,7 +121,7 @@ AssetDepreciationOptionDepreciationType=Μέθοδος απόσβεσης
 AssetDepreciationOptionDepreciationTypeLinear=Γραμμική
 AssetDepreciationOptionDepreciationTypeDegressive=Προοδευτική
 AssetDepreciationOptionDepreciationTypeExceptional=Εξαιρετική
-AssetDepreciationOptionDegressiveRate=Φθίνουσα απόσβεση
+AssetDepreciationOptionDegressiveRate=Φθίνων συντελεστής
 AssetDepreciationOptionAcceleratedDepreciation=Ταχεία απόσβεση (φόρος)
 AssetDepreciationOptionDuration=Διάρκεια
 AssetDepreciationOptionDurationType=Τύπος διάρκειας
@@ -168,7 +168,7 @@ AssetDepreciationReversal=Αντιστροφή
 #
 # Errors
 #
-AssetErrorAssetOrAssetModelIDNotProvide=Το αναγνωριστικό του στοιχείου ή ο ήχος του μοντέλου δεν έχει παρασχεθεί
+AssetErrorAssetOrAssetModelIDNotProvide=Το αναγνωριστικό του στοιχείου ή του τύπου δεν έχει παρασχεθεί
 AssetErrorFetchAccountancyCodesForMode=Σφάλμα κατά την ανάκτηση των λογιστικών λογαριασμών για τη λειτουργία απόσβεσης '%s'
 AssetErrorDeleteAccountancyCodesForMode=Σφάλμα κατά τη διαγραφή λογιστικών λογαριασμών από τη λειτουργία απόσβεσης '%s'
 AssetErrorInsertAccountancyCodesForMode=Σφάλμα κατά την εισαγωγή των λογιστικών λογαριασμών του τρόπου απόσβεσης '%s'
diff --git a/htdocs/langs/el_GR/banks.lang b/htdocs/langs/el_GR/banks.lang
index 86bf2c3ad7a..b94c14f4b1c 100644
--- a/htdocs/langs/el_GR/banks.lang
+++ b/htdocs/langs/el_GR/banks.lang
@@ -1,21 +1,21 @@
 # Dolibarr language file - Source file is en_US - banks
 Bank=Τράπεζα
 MenuBankCash=Τράπεζες | Μετρητά
-MenuVariousPayment=Διάφορες πληρωμές
-MenuNewVariousPayment=Νέα Διάφορα πληρωμή
+MenuVariousPayment=Άλλου τύπου πληρωμές
+MenuNewVariousPayment=Νέα άλλου τύπου πληρωμή
 BankName=Όνομα Τράπεζας
 FinancialAccount=Λογαριασμός
 BankAccount=Τραπεζικός Λογαριασμός
 BankAccounts=Τραπεζικοί Λογαριασμοί
-BankAccountsAndGateways=Τραπεζικοί λογαριασμοί θυρίδες
+BankAccountsAndGateways=Τραπεζικοί λογαριασμοί | Πύλες πληρωμών
 ShowAccount=Εμφάνιση λογαριασμού
-AccountRef=Αναγνωριστικό Λογιστικού Λογαριασμού
-AccountLabel=Ετικέτα Λογιστικού Λογαριασμού
+AccountRef=Αναγνωριστικό λογαριασμού
+AccountLabel=Ετικέτα λογαριασμού
 CashAccount=Λογαριασμός Μετρητών
 CashAccounts=Λογαριασμοί Μετρητών
 CurrentAccounts=Λογαριασμοί Όψεως
 SavingAccounts=Λογαριασμοί ταμιευτηρίου
-ErrorBankLabelAlreadyExists=Η ετικέτα για αυτόν τον Λογιστικό Λογαριασμό, υπάρχει ήδη
+ErrorBankLabelAlreadyExists=Η ετικέτα για αυτόν τον λογαριασμό, υπάρχει ήδη
 BankBalance=Υπόλοιπο
 BankBalanceBefore=Υπόλοιπο πριν
 BankBalanceAfter=Υπόλοιπο μετά
@@ -23,24 +23,24 @@ BalanceMinimalAllowed=Ελάχιστο Επιτρεπτό Υπόλοιπο
 BalanceMinimalDesired=Ελάχιστο Επιθυμητό Υπόλοιπο
 InitialBankBalance=Αρχικό Υπόλοιπο
 EndBankBalance=Τελικό Υπόλοιπο
-CurrentBalance=Τρέχων Υπόλοιπο
+CurrentBalance=Τρέχον Υπόλοιπο
 FutureBalance=Μελλοντικό Υπόλοιπο
 ShowAllTimeBalance=Εμφάνιση Υπολοίπου από την αρχή
 AllTime=Από την αρχή
-Reconciliation=Πραγματοποίηση Συναλλαγών
+Reconciliation=Συμφωνία
 RIB=Αριθμός Τραπ. Λογαριασμού
 IBAN=IBAN
 BIC=Κωδικός BIC / SWIFT
-SwiftValid=Κωδικός BIC / SWIFT έγκυρος
+SwiftValid=Έγκυρος κωδικός BIC / SWIFT 
 SwiftNotValid=Κωδικός BIC / SWIFT μη έγκυρος
 IbanValid=Έγκυρο IBAN
 IbanNotValid=Μη έγκυρο IBAN
 StandingOrders=Εντολές άμεσης χρέωσης
 StandingOrder=Εντολή άμεσης χρέωσης
 PaymentByDirectDebit=Πληρωμή με άμεση χρέωση
-PaymentByBankTransfers=Πληρωμές μέσω μεταφοράς πιστώσεως
-PaymentByBankTransfer=Πληρωμή μέσω μεταφοράς πιστώσεως
-AccountStatement=Κίνηση Λογαριασμού
+PaymentByBankTransfers=Πληρωμές μέσω μεταφοράς πίστωσης
+PaymentByBankTransfer=Πληρωμή μέσω μεταφοράς πίστωσης
+AccountStatement=Αντίγραφο κίνησης λογαριασμού
 AccountStatementShort=Κίνηση
 AccountStatements=Κινήσεις Λογαριασμού
 LastAccountStatements=Τελευταίες Κινήσεις Λογαριασμού
@@ -48,65 +48,65 @@ IOMonthlyReporting=Μηνιαία Αναφορά
 BankAccountDomiciliation=Διεύθυνση τράπεζας
 BankAccountCountry=Χώρα λογαριασμού
 BankAccountOwner=Ιδιοκτήτης Λογαριασμού
-BankAccountOwnerAddress=Διεύθυνση Ιδιοκτήτη
+BankAccountOwnerAddress=Διεύθυνση Ιδιοκτήτη λογαριασμού
 CreateAccount=Δημιουργία Λογαριασμού
 NewBankAccount=Νέος Λογαριασμός
-NewFinancialAccount=Νέος Λογιστικός Λογαριασμός
-MenuNewFinancialAccount=Νέος Λογιστικός Λογαριασμός
+NewFinancialAccount=Νέος λογαριασμός
+MenuNewFinancialAccount=Νέος λογαριασμός
 EditFinancialAccount=Επεξεργασία Λογαριασμού
-LabelBankCashAccount=Τράπεζα ή την ετικέτα μετρητών
+LabelBankCashAccount=Ετικέτα τράπεζας ή μετρητών
 AccountType=Τύπος Λογαριασμού
-BankType0=Ταμιευτηρίου Λογαριασμός
-BankType1=Λογαριασμός Όψεως
+BankType0=Λογαριασμός ταμιευτηρίου
+BankType1=Λογαριασμός Όψεως ή πιστωτικής κάρτας
 BankType2=Λογαριασμός Μετρητών
-AccountsArea=Περιοχή Τραπεζικών Λογαριασμών
+AccountsArea=Τομέας λογαριασμών
 AccountCard=Καρτέλα Λογαριασμού
 DeleteAccount=Διαγραφή Λογαριασμού
 ConfirmDeleteAccount=Είστε σίγουροι ότι θέλετε να διαγράψετε αυτόν τον λογαριασμό;
 Account=Λογαριασμός
-BankTransactionByCategories=Καταχωρήσεις τραπεζών ανά κατηγορίες
-BankTransactionForCategory=Καταχωρήσεις τραπεζών για την κατηγορία <b>%s</b>
-RemoveFromRubrique=Αφαίρεση του συνδέσμου με κατηγορία
+BankTransactionByCategories=Τραπεζικές συναλλαγές ανά κατηγορίες
+BankTransactionForCategory=Τραπεζικές συναλλαγές για την κατηγορία <b>%s</b>
+RemoveFromRubrique=Αφαίρεση συνδέσμου με κατηγορία
 RemoveFromRubriqueConfirm=Είστε σίγουροι ότι θέλετε να καταργήσετε τη σύνδεση μεταξύ της καταχώρισης και της κατηγορίας αυτής;
-ListBankTransactions=Λίστα Τραπεζικών καταχωρήσεων
-IdTransaction=ID Συναλλαγής
-BankTransactions=Καταχωρήσεις τραπεζών
-BankTransaction=Τραπεζική εγγραφή
-ListTransactions=Λίστα εγγραφών
-ListTransactionsByCategory=Λίστα καταχωρίσεων / κατηγοριών
-TransactionsToConciliate=Εγγραφές για συμβιβασμό
-TransactionsToConciliateShort=Πραγματοποίηση Συναλλαγής
-Conciliable=Μπορεί να πραγματοποιηθεί
-Conciliate=Πραγματοποίηση Συναλλαγής
-Conciliation=Πραγματοποίηση Συναλλαγής
+ListBankTransactions=Λίστα Τραπεζικών συναλλαγών
+IdTransaction=Αναγνωριστικό συναλλαγής
+BankTransactions=Τραπεζικές συναλλαγές
+BankTransaction=Τραπεζική συναλλαγή
+ListTransactions=Λίστα συναλλαγών
+ListTransactionsByCategory=Λίστα συναλλαγών / κατηγοριών
+TransactionsToConciliate=Συναλλαγές προς συμφωνία
+TransactionsToConciliateShort=Προς συμφωνία
+Conciliable=Μπορεί να συμφωνηθεί
+Conciliate=Συμφωνία
+Conciliation=Συμφωνία
 SaveStatementOnly=Αποθήκευση δήλωσης μόνο
-ReconciliationLate=Πραγματοποίηση Συναλλαγής
+ReconciliationLate=Καθυστερημένη συμφωνία
 IncludeClosedAccount=Συμπερίληψη Κλειστών Λογαριασμών
 OnlyOpenedAccount=Μόνο ανοιχτοί λογαριασμοί
-AccountToCredit=Πίστωση στον Λογαριασμό
-AccountToDebit=Χρέωση στον Λογαριασμό
-DisableConciliation=Απενεργοποίηση της ιδιότητας συμφωνία από αυτό τον λογαριασμό
-ConciliationDisabled=Η ιδιότητα συμφωνία απενεργοποιήθηκε.
-LinkedToAConciliatedTransaction=Συνδέεται με μια συμβιβαστική είσοδο
+AccountToCredit=Λογαριασμός προς πίστωση
+AccountToDebit=Λογαριασμός προς χρέωση
+DisableConciliation=Απενεργοποίηση της λειτουργίας συμφωνίας από αυτό τον λογαριασμό
+ConciliationDisabled=Η λειτουργία συμφωνίας απενεργοποιήθηκε.
+LinkedToAConciliatedTransaction=Συνδέεται με μια συμφωνημένη συναλλαγή
 StatusAccountOpened=Ανοιχτός
 StatusAccountClosed=Κλειστός
 AccountIdShort=Αριθμός
 LineRecord=Συναλλαγή
 AddBankRecord=Προσθήκη καταχώρησης
 AddBankRecordLong=Προσθήκη εγγραφής με μη αυτόματο τρόπο 
-Conciliated=Συγχωρήθηκε
-ReConciliedBy=Πραγματοποίηση Συναλλαγής από
+Conciliated=Συμφωνήθηκε
+ReConciliedBy=Συμφωνήθηκε από
 DateConciliating=Ημερομ. Πραγματοποίησης Συναλλαγής
 BankLineConciliated=Η συναλλαγή συμφωνείται με την τραπεζική απόδειξη
-BankLineReconciled=Συγχωρήθηκε
-BankLineNotReconciled=Δεν ταιριάζουν
+BankLineReconciled=Συμφωνήθηκε
+BankLineNotReconciled=Δεν συμφωνήθηκε
 CustomerInvoicePayment=Πληρωμή Πελάτη
 SupplierInvoicePayment=Πληρωμή προμηθευτή
 SubscriptionPayment=Πληρωμή συνδρομής
-WithdrawalPayment=Debit payment order
-SocialContributionPayment=Σίγουρα θέλετε να μαρκάρετε αυτό το αξιόγραφο σαν απορριφθέν;
-BankTransfer=μεταφορά πιστώσεως
-BankTransfers=μεταφορές πιστώσεως
+WithdrawalPayment=Χρεωστική εντολή πληρωμής
+SocialContributionPayment=Πληρωμή κοινωνικού/φορολογικού φόρου
+BankTransfer=Μεταφορά πίστωσης
+BankTransfers=Μεταφορές πιστώσεων
 MenuBankInternalTransfer=Εσωτερική μεταφορά
 TransferDesc=Χρησιμοποιήστε εσωτερική μεταφορά για μεταφορά από έναν λογαριασμό σε άλλο, η εφαρμογή θα γράψει δύο εγγραφές: μια χρέωση στον λογαριασμό προέλευσης και μια πίστωση στον λογαριασμό προορισμού. Το ίδιο ποσό, ετικέτα και ημερομηνία θα χρησιμοποιηθούν για αυτήν τη συναλλαγή.
 TransferFrom=Από
@@ -114,21 +114,21 @@ TransferTo=Προς
 TransferFromToDone=Η μεταφορά από <b>%s</b> στον <b>%s</b> του <b>%s</b> %s έχει καταγραφεί.
 CheckTransmitter=Αποστολέας
 ValidateCheckReceipt=Επικύρωση αυτής της απόδειξης παραλαβής επιταγής;
-ConfirmValidateCheckReceipt=Είστε βέβαιοι ότι θέλετε να υποβάλετε αυτήν την απόδειξη επιταγής για επικύρωση; Καμία αλλαγή δεν θα είναι δυνατή μετά την επικύρωση.
-DeleteCheckReceipt=Διαγραφή απόδειξης παραλαβής επιταγής;
-ConfirmDeleteCheckReceipt=Είστε σίγουροι πως θέλετε να διαγράψετε αυτή την απόδειξη παραλαβής επιταγής;
+ConfirmValidateCheckReceipt=Είστε σίγουροι ότι θέλετε να υποβάλετε αυτήν την απόδειξη επιταγής για επικύρωση; Καμία αλλαγή δεν θα είναι δυνατή μετά την επικύρωση.
+DeleteCheckReceipt=Διαγραφή αυτής της απόδειξης επιταγής;
+ConfirmDeleteCheckReceipt=Είστε σίγουροι πως θέλετε να διαγράψετε αυτή την απόδειξη επιταγής;
 BankChecks=Τραπεζικές Επιταγές
-BankChecksToReceipt=Επιταγές που αναμένουν κατάθεση
-BankChecksToReceiptShort=Επιταγές που αναμένουν κατάθεση
-ShowCheckReceipt=Ελέγξτε την απόδειξη κατάθεσης
-NumberOfCheques=Αριθ. Ελέγχου
-DeleteTransaction=Διαγραφή καταχώρησης
-ConfirmDeleteTransaction=Είστε σίγουροι ότι θέλετε να διαγράψετε αυτήν την καταχώρηση;
-ThisWillAlsoDeleteBankRecord=Αυτό θα διαγράψει επίσης την εισερχόμενη είσοδο στην τράπεζα
+BankChecksToReceipt=Επιταγές σε αναμονή κατάθεσης
+BankChecksToReceiptShort=Επιταγές σε αναμονή κατάθεσης
+ShowCheckReceipt=Εμφάνιση απόδειξης κατάθεσης επιταγής
+NumberOfCheques=Αριθμός επιταγής
+DeleteTransaction=Διαγραφή συναλλαγής
+ConfirmDeleteTransaction=Είστε σίγουροι ότι θέλετε να διαγράψετε αυτήν την συναλλαγή;
+ThisWillAlsoDeleteBankRecord=Αυτό θα διαγράψει επίσης την δημιουργημένη τραπεζική καταχώριση
 BankMovements=Κινήσεις
-PlannedTransactions=Προγραμματισμένες καταχωρήσεις
+PlannedTransactions=Προγραμματισμένες συναλλαγές
 Graph=Γραφήματα
-ExportDataset_banque_1=Τραπεζικές εγγραφές και αποδείξεις κατάθεσης
+ExportDataset_banque_1=Τραπεζικές συναλλαγές και κίνηση λογαριασμού
 ExportDataset_banque_2=Απόδειξη κατάθεσης
 TransactionOnTheOtherAccount=Συναλλαγή σε άλλο λογαριασμό
 PaymentNumberUpdateSucceeded=Ο αριθμός πληρωμής ενημερώθηκε με επιτυχία
@@ -140,38 +140,38 @@ BankTransactionLine=Τραπεζική εγγραφή
 AllAccounts=Όλοι οι τραπεζικοί και ταμιακοί λογαριασμοί
 BackToAccount=Επιστροφή στον λογαριασμό
 ShowAllAccounts=Εμφάνιση Όλων των Λογαριασμών
-FutureTransaction=Μελλοντική συναλλαγή. Δεν μπορεί να συμφιλιωθεί.
+FutureTransaction=Μελλοντική συναλλαγή. Δεν μπορεί να συμφωνηθεί
 SelectChequeTransactionAndGenerate=Επιλέξτε/φιλτράρετε τις επιταγές που θα συμπεριληφθούν στην απόδειξη κατάθεσης επιταγών. Στη συνέχεια, κάντε κλικ στο "Δημιουργία".
-InputReceiptNumber=Επιλέξτε την κατάσταση των τραπεζών που συνδέονται με τη διαδικασία συνδιαλλαγής. Χρησιμοποιήστε μια σύντομη αριθμητική τιμή όπως: YYYYMM ή YYYYMMDD
+InputReceiptNumber=Επιλέξτε την τραπεζική κίνηση που σχετίζεται με τη συνδιαλλαγή. Χρησιμοποιήστε μια αριθμητική τιμή με δυνατότητα ταξινόμησης: ΕΕΕΕΜΜ ή ΕΕΕΕΜΜΗΗ
 EventualyAddCategory=Τέλος, καθορίστε μια κατηγορία στην οποία θα ταξινομηθούν οι εγγραφές
-ToConciliate=Για συνδιαλλαγή;
+ToConciliate=Για συμφωνία;
 ThenCheckLinesAndConciliate=Στη συνέχεια, ελέγξτε τις γραμμές που υπάρχουν στο αντίγραφο κίνησης του τραπεζικού λογαριασμού και κάντε κλικ
-DefaultRIB=Προεπιλογή BAN
+DefaultRIB=Προεπιλεγμένο BAN
 AllRIB=Όλα τα BAN
 LabelRIB=Ετικέτα BAN
 NoBANRecord=Καμία εγγραφή BAN
 DeleteARib=Διαγραφή BAN εγγραφή
 ConfirmDeleteRib=Είστε σίγουροι πως θέτε να διαγράψετε αυτό το IBAN;
-RejectCheck=Ελέγξτε την επιστροφή
+RejectCheck=Η επιταγή επιστράφηκε
 ConfirmRejectCheck=Είστε σίγουροι πως θέλετε να σημειώσετε αυτή την επιταγή ως απορριφθείσα;
-RejectCheckDate=Ημερομηνία ελέγχου επιστροφής
-CheckRejected=Ελέγξτε την επιστροφή
-CheckRejectedAndInvoicesReopened=Έλεγχος επιστρεφόμενων και άνοιγμα τιμολογίων
+RejectCheckDate=Ημερομηνία επιστροφής της επιταγής
+CheckRejected=Η επιταγή επιστράφηκε
+CheckRejectedAndInvoicesReopened=Η επιταγή επιστράφηκε και τα τιμολόγια ανοίγουν ξανά
 BankAccountModelModule=Πρότυπα εγγράφων για τραπεζικούς λογαριασμούς
-DocumentModelSepaMandate=Υπόδειγμα εντολής ΕΧΠΕ
+DocumentModelSepaMandate=Πρότυπο εντολής SEPA. Χρήσιμο μόνο για ευρωπαϊκές χώρες στην Ε.Ε.
 DocumentModelBan=Πρότυπο για εκτύπωση σελίδας με πληροφορίες BAN.
 NewVariousPayment=Νέα άλλου τύπου πληρωμή
 VariousPayment=Άλλου τύπου πληρωμή
 VariousPayments=Άλλου τύπου πληρωμές
 ShowVariousPayment=Εμφάνιση Άλλου τύπου πληρωμών
-AddVariousPayment=Προσθήκη Άλλου τύπου πληρωμών
+AddVariousPayment=Προσθήκη Άλλου τύπου πληρωμή
 VariousPaymentId=ID πληρωμής άλλου τύπου 
 VariousPaymentLabel=Ετικέτα πληρωμής άλλου τύπου 
-ConfirmCloneVariousPayment=Επιβεβαίωση του κλώνου μιας πληρωμής άλλου τύπου 
-SEPAMandate=Εντολές άμεσης χρέωσης
-YourSEPAMandate=Οι εντολές άμεσης χρέωσης σας.
-FindYourSEPAMandate=Αυτή είναι η εντολή ΕΧΠΕ για να εξουσιοδοτήσετε την εταιρεία μας να κάνει άμεση εντολή χρέωσης στην τράπεζά σας. Επιστρέψτε το υπογεγραμμένο (σάρωση του υπογεγραμμένου εγγράφου) ή στείλτε το ταχυδρομικώς η με mail
-AutoReportLastAccountStatement=Συμπληρώστε αυτόματα το πεδίο ' αριθμός τραπεζικού λογαριασμού ' με τον τελευταίο αριθμό τραπεζικής δήλωσης όταν κάνετε τη συμφωνία.
+ConfirmCloneVariousPayment=Επιβεβαίωση την αντιγραφή μιας πληρωμής άλλου τύπου 
+SEPAMandate=Εντολή SEPA
+YourSEPAMandate=Η εντολή σας στον SEPA
+FindYourSEPAMandate=Αυτή είναι η εντολή σας από τον SEPA για να εξουσιοδοτήσετε την εταιρεία μας να κάνει εντολή άμεσης χρέωσης στην τράπεζά σας. Επιστρέψτε το υπογεγραμμένο (σάρωση του υπογεγραμμένου εγγράφου) ή στείλτε το ταχυδρομικά στη διεύθυνση
+AutoReportLastAccountStatement=Συμπληρώστε αυτόματα το πεδίο «αριθμός κίνησης τραπεζικού λογαριασμού» με τον τελευταίο αριθμό κίνησης κατά τη συμφωνία
 CashControl=Έλεγχος μετρητών POS
 NewCashFence=Νέος έλεγχος μετρητών (άνοιγμα ή κλείσιμο)
 BankColorizeMovement=Χρωματισμός κινήσεων
@@ -180,8 +180,9 @@ BankColorizeMovementName1=Χρώμα φόντου για την κίνηση χ
 BankColorizeMovementName2=Χρώμα φόντου για την πιστωτική κίνηση
 IfYouDontReconcileDisableProperty=Εάν δεν πραγματοποιήσετε τις τραπεζικές συμφωνίες σε ορισμένους τραπεζικούς λογαριασμούς, απενεργοποιήστε την ιδιότητα "%s" σε αυτούς για να καταργήσετε αυτήν την προειδοποίηση.
 NoBankAccountDefined=Δεν έχει οριστεί τραπεζικός λογαριασμός
-NoRecordFoundIBankcAccount=Δεν βρέθηκε κανένα αρχείο σε τραπεζικό λογαριασμό. Συνήθως, αυτό συμβαίνει όταν μια εγγραφή έχει διαγραφεί με χειροκίνητο τρόπο από τη λίστα συναλλαγών στον τραπεζικό λογαριασμό (για παράδειγμα κατά τη διάρκεια συμφωνίας του τραπεζικού λογαριασμού). Άλλος λόγος είναι ότι η πληρωμή καταγράφηκε όταν η ενότητα/εφαρμογή "%s" ήταν απενεργοποιημένη.
+NoRecordFoundIBankcAccount=Δεν βρέθηκε κάποιο αρχείο στον τραπεζικό λογαριασμό. Συνήθως, αυτό συμβαίνει όταν μια εγγραφή έχει διαγραφεί με μη αυτόματο τρόπο από τη λίστα συναλλαγών στον τραπεζικό λογαριασμό (για παράδειγμα κατά τη διάρκεια συμφωνίας του τραπεζικού λογαριασμού). Ένας άλλος λόγος είναι ότι η πληρωμή καταγράφηκε όταν η ενότητα "%s" ήταν απενεργοποιημένη.
 AlreadyOneBankAccount=Έχει ήδη οριστεί ένας τραπεζικός λογαριασμός
 SEPAXMLPlacePaymentTypeInformationInCreditTransfertransactionInformation=Μεταφορά SEPA: 'Τύπος Πληρωμής' στο επίπεδο 'Μεταφορά Πίστωσης'
 SEPAXMLPlacePaymentTypeInformationInCreditTransfertransactionInformationHelp=Όταν δημιουργείτε ένα αρχείο SEPA XML για μεταφορές πίστωσης, η ενότητα "Πληροφορίες Τύπου πληρωμής" μπορεί τώρα να τοποθετηθεί στην ενότητα "Πληροφορίες Μεταφοράς Πίστωσης" (αντί της ενότητας "Πληρωμή"). Συνιστούμε ανεπιφύλακτα να μην το επιλέξετε ώστε να παραμείνουν η Πληροφορίες Τύπου πληρωμής σε επίπεδο πληρωμής, καθώς όλες οι τράπεζες δεν θα το αποδεχτούν απαραίτητα σε επίπεδο Πληροφοριών Μεταφοράς Πίστωσης. Επικοινωνήστε με την τράπεζά σας προτού τοποθετήσετε το Πληροφορίες Τύπου πληρωμής σε επίπεδο Πληροφοριών Μεταφοράς Πίστωσης.
 ToCreateRelatedRecordIntoBank=Για να δημιουργήσετε σχετικό τραπεζικό αρχείο που λείπει
+BanklineExtraFields=Επιπλέον πεδία τραπεζικής γραμμής
diff --git a/htdocs/langs/el_GR/bills.lang b/htdocs/langs/el_GR/bills.lang
index 575e1334576..09c984f4ece 100644
--- a/htdocs/langs/el_GR/bills.lang
+++ b/htdocs/langs/el_GR/bills.lang
@@ -8,12 +8,12 @@ BillsCustomersUnpaid=Ανεξόφλητα τιμολόγια πελάτη
 BillsCustomersUnpaidForCompany=Ανεξόφλητα τιμολόγια πελατών για %s
 BillsSuppliersUnpaid=Ανεξόφλητα τιμολόγια προμηθευτή
 BillsSuppliersUnpaidForCompany=Ανεξόφλητα τιμολόγια προμηθευτών για %s
-BillsLate=Καθυστερημένες Πληρωμές
-BillsStatistics=Στατιστικά για τα τιμολόγια των πελατών
+BillsLate=Καθυστερημένες πληρωμές
+BillsStatistics=Στατιστικά τιμολογίων πελατών
 BillsStatisticsSuppliers=Στατιστικά τιμολογίων προμηθευτών
 DisabledBecauseDispatchedInBookkeeping=Απενεργοποιήθηκε επειδή το τιμολόγιο καταχωρήθηκε στη λογιστική
 DisabledBecauseNotLastInvoice=Απενεργοποιημένο επειδή το τιμολόγιο δεν μπορεί να διαγράφει. Ορισμένα τιμολόγια καταγράφηκαν μετά από αυτό και θα χαλάσει τη σειρά της αυτόματης αρίθμησης.
-DisabledBecauseNotErasable=Απενεργοποιημένο επειδή δεν μπορεί να διαγραφή
+DisabledBecauseNotErasable=Απενεργοποιημένο επειδή δεν μπορεί να διαγραφεί
 InvoiceStandard=Τυπικό Τιμολόγιο
 InvoiceStandardAsk=Τυπικό Τιμολόγιο
 InvoiceStandardDesc=Αυτό το είδος τιμολογίου είναι το τυπικό τιμολόγιο.
@@ -22,13 +22,13 @@ InvoiceDepositAsk=Απόδειξη είσπραξης προκαταβολής.
 InvoiceDepositDesc=Αυτός ο τύπος απόδειξης χρησιμοποιείται όταν λαμβάνετε μια προκαταβολή.
 InvoiceProForma=Προτιμολόγιο
 InvoiceProFormaAsk=Προτιμολόγιο
-InvoiceProFormaDesc=Το <b>Προτιμολόγιο</b> είναι η εικόνα ενός πραγματικού τιμολογίου, χωρίς όμως να έχει χρηματική αξία
+InvoiceProFormaDesc=Το <b> Προτιμολόγιο </b> είναι μια εικόνα ενός πραγματικού τιμολογίου αλλά δεν έχει λογιστική αξία.
 InvoiceReplacement=Τιμολόγιο Αντικατάστασης
-InvoiceReplacementAsk=Αντικατάσταση τιμολογίου με
-InvoiceReplacementDesc=<b>Το τιμολόγιο αντικατάστασης</b> χρησιμοποιείται για την πλήρη αντικατάσταση ενός τιμολογίου χωρίς πληρωμή που έχει ήδη παραληφθεί. <br><br> Σημείωση: Μπορούν να αντικατασταθούν μόνο τιμολόγια χωρίς πληρωμή. Εάν το τιμολόγιο που αντικαταστήσατε δεν έχει κλείσει ακόμα, θα κλείσει αυτόματα για να «εγκαταλειφθεί».
+InvoiceReplacementAsk=Τιμολόγιο αντικατάστασης για το τιμολόγιο
+InvoiceReplacementDesc=Το<b>τιμολόγιο αντικατάστασης</b> χρησιμοποιείται για την πλήρη αντικατάσταση ενός τιμολογίου που έχει παραληφθεί από τον πελάτη αλλά δεν έχει πληρωθεί. <br><br> Σημείωση: Μπορούν να αντικατασταθούν μόνο τιμολόγια χωρίς πληρωμή. Εάν το τιμολόγιο που αντικαταστήσατε δεν έχει κλείσει ακόμα, θα κλείσει αυτόματα ως «εγκαταλειμμένο».
 InvoiceAvoir=Πιστωτικό τιμολόγιο
 InvoiceAvoirAsk=Πιστωτικό τιμολόγιο για την διόρθωση τιμολογίου
-InvoiceAvoirDesc=Το <b>πιστωτικό σημείωμα</b> είναι ένα αρνητικό τιμολόγιο που χρησιμοποιείται για να διορθωθεί το γεγονός ότι ένα τιμολόγιο εμφανίζει ένα ποσό που διαφέρει από το ποσό που έχει πράγματι καταβληθεί (π.χ. ο πελάτης κατέβαλε πάρα πολύ κατά λάθος ή δεν θα πληρώσει το πλήρες ποσό από την επιστροφή ορισμένων προϊόντων).
+InvoiceAvoirDesc=Το <b>πιστωτικό τιμολόγιο</b> είναι ένα αρνητικό τιμολόγιο που χρησιμοποιείται για να διορθωθεί το γεγονός ότι ένα τιμολόγιο εμφανίζει ένα ποσό που διαφέρει από το ποσό που έχει πράγματι καταβληθεί (π.χ. ο πελάτης κατέβαλε περισσότερα κατά λάθος ή δεν θα πληρώσει το πλήρες ποσό από την επιστροφή ορισμένων προϊόντων).
 invoiceAvoirWithLines=Δημιουργία Πιστωτικού τιμολογίου με γραμμές από το τιμολόγιο προέλευσης.
 invoiceAvoirWithPaymentRestAmount=Δημιουργήστε Πιστωτικό Τιμολόγιο με το υπόλοιπο πριν από την καταβολή του τιμολογίου
 invoiceAvoirLineWithPaymentRestAmount=Πιστωτικό τιμολόγιο για το υπολειπόμενο ανεξόφλητο ποσό
@@ -39,11 +39,11 @@ ReplacementByInvoice=Αντικαταστάθηκε από τιμολόγιο
 CorrectInvoice=Διόρθωση Τιμολογίου %s
 CorrectionInvoice=Τιμολόγιο Διόρθωσης
 UsedByInvoice=Χρησιμοποιήθηκε στην πληρωμή του τιμολογίου %s
-ConsumedBy=Consumed by
-NotConsumed=Not consumed
-NoReplacableInvoice=Δεν μπορούν να αντικατασταθούν τιμολόγια
+ConsumedBy=Καταναλώθηκε από
+NotConsumed=Δεν καταναλώθηκε
+NoReplacableInvoice=Δεν υπάρχουν αντικαταστάσιμα τιμολόγια
 NoInvoiceToCorrect=Δεν υπάρχουν τιμολόγια προς διόρθωση
-InvoiceHasAvoir=Was source of one or several credit notes
+InvoiceHasAvoir=Ήταν πηγή ενός ή περισσότερων πιστωτικών σημειώσεων
 CardBill=Καρτέλα Τιμολογίου
 PredefinedInvoices=Προκαθορισμένα τιμολόγια
 Invoice=Τιμολόγιο
@@ -63,14 +63,14 @@ PaymentBack=Επιστροφή χρημάτων
 CustomerInvoicePaymentBack=Επιστροφή χρημάτων
 Payments=Πληρωμές
 PaymentsBack=Επιστροφές χρημάτων
-paymentInInvoiceCurrency=in invoices currency
-PaidBack=Αποζημιώθηκε
+paymentInInvoiceCurrency=σε νόμισμα τιμολογίων
+PaidBack=Επιστροφή χρημάτων
 DeletePayment=Διαγραφή Πληρωμής
 ConfirmDeletePayment=Είστε σίγουροι ότι θέλετε να διαγράψετε αυτή την πληρωμή;
 ConfirmConvertToReduc=Θέλετε να μετατρέψετε αυτό το %s σε διαθέσιμη πίστωση;
-ConfirmConvertToReduc2=Το ποσό θα αποθηκευτεί σε όλες τις εκπτώσεις και θα μπορούσε να χρησιμοποιηθεί ως έκπτωση για ένα τρέχον ή μελλοντικό τιμολόγιο για αυτόν τον πελάτη.
+ConfirmConvertToReduc2=Το ποσό θα αποθηκευτεί μεταξύ όλων των εκπτώσεων και θα μπορούσε να χρησιμοποιηθεί ως έκπτωση σε ένα τρέχον ή ένα μελλοντικό τιμολόγιο που αφορά αυτόν τον πελάτη.
 ConfirmConvertToReducSupplier=Θέλετε να μετατρέψετε αυτό το %s σε διαθέσιμη πίστωση;
-ConfirmConvertToReducSupplier2=Το ποσό θα αποθηκευτεί σε όλες τις εκπτώσεις και θα μπορούσε να χρησιμοποιηθεί ως έκπτωση για ένα τρέχον ή μελλοντικό τιμολόγιο για αυτόν τον προμηθευτή.
+ConfirmConvertToReducSupplier2=Το ποσό θα αποθηκευτεί μεταξύ όλων των εκπτώσεων και θα μπορούσε να χρησιμοποιηθεί ως έκπτωση σε ένα τρέχον ή ένα μελλοντικό τιμολόγιο για αυτόν τον προμηθευτή.
 SupplierPayments=Πληρωμές προμηθευτών
 ReceivedPayments=Ληφθείσες Πληρωμές
 ReceivedCustomersPayments=Ληφθείσες Πληρωμές από πελάτες
@@ -86,26 +86,26 @@ PaymentModes=Τρόποι Πληρωμής
 DefaultPaymentMode=Προκαθορισμένος τρόπος πληρωμής
 DefaultBankAccount=Προεπιλεγμένος τραπεζικός λογαριασμός
 IdPaymentMode=Τρόπος Πληρωμής (id)
-CodePaymentMode=Τρόπος Πληρωμής (code)
+CodePaymentMode=Τρόπος πληρωμής (κωδικός)
 LabelPaymentMode=Τρόπος Πληρωμής (label)
 PaymentModeShort=Τρόπος Πληρωμής
 PaymentTerm=Ορος πληρωμής
 PaymentConditions=Όροι πληρωμής
 PaymentConditionsShort=Όροι πληρωμής
-PaymentAmount=Σύνολο πληρωμής
-PaymentHigherThanReminderToPay=Η πληρωμή είναι μεγαλύτερη από το υπόλοιπο
+PaymentAmount=Ποσό πληρωμής
+PaymentHigherThanReminderToPay=Πληρωμή υψηλότερη από την υπενθύμιση πληρωμής
 HelpPaymentHigherThanReminderToPay=Προσοχή, το ποσό πληρωμής ενός ή περισσότερων λογαριασμών είναι μεγαλύτερο από το οφειλόμενο ποσό. <br> Επεξεργαστείτε την καταχώρησή σας, ή διαφορετικά επιβεβαιώστε και αναλογιστείτε αν πρέπει να δημιουργήσετε ένα πιστωτικό σημείωμα για το επιπλέον ποσό που λάβατε για κάθε τιμολόγιο.
 HelpPaymentHigherThanReminderToPaySupplier=Προσοχή, το ποσό πληρωμής ενός ή περισσότερων λογαριασμών είναι μεγαλύτερο από το οφειλόμενο ποσό. <br> Επεξεργαστείτε την καταχώρησή σας, διαφορετικά επιβεβαιώστε και σκεφτείτε να δημιουργήσετε ένα πιστωτικό σημείωμα για την επιπλέον πληρωμή για κάθε επιπλέον χρεωστικό τιμολόγιο.
-ClassifyPaid=Χαρακτηρισμός ως 'Πληρωμένο''
-ClassifyUnPaid=Χαρακτηρισμός ως "Απλήρωτο''
-ClassifyPaidPartially=Χαρακτηρισμός ως 'Μερικώς εξοφλημένο'
-ClassifyCanceled=Χαρακτηρισμός ως 'Εγκαταλελειμμένο'
-ClassifyClosed=Χαρακτηρισμός ως 'Κλειστό'
-ClassifyUnBilled=Ταξινομήστε τα «Μη τιμολογημένα»
+ClassifyPaid=Ταξινόμηση ως 'Πληρωμένο''
+ClassifyUnPaid=Ταξινόμηση ως "Απλήρωτο''
+ClassifyPaidPartially=Ταξινόμηση ως 'Μερικώς εξοφλημένο'
+ClassifyCanceled=Ταξινόμηση ως 'Εγκαταλελειμμένο'
+ClassifyClosed=Ταξινόμηση ως 'Κλειστό'
+ClassifyUnBilled=Ταξινόμηση ως 'Μη τιμολογημένο'
 CreateBill=Δημιουργία Τιμολογίου
 CreateCreditNote=Δημιουργία πιστωτικού τιμολογίου
-AddBill=Δημιουργία τιμολογίου ή δημιουργία σημείωσης
-AddToDraftInvoices=Προσθήκη στο πρόχειρο τιμολόγιο
+AddBill=Δημιουργία τιμολογίου ή πιστωτικού σημειώματος
+AddToDraftInvoices=Προσθήκη στο προσχέδιο τιμολογίου
 DeleteBill=Διαγραφή Τιμολογίου
 SearchACustomerInvoice=Αναζήτηση τιμολογίου πελάτη
 SearchASupplierInvoice=Αναζήτηση τιμολογίου προμηθευτή
@@ -113,19 +113,19 @@ CancelBill=Ακύρωση Τιμολογίου
 SendRemindByMail=Αποστολή υπενθύμισης με email
 DoPayment=Εισαγωγή πληρωμής
 DoPaymentBack=Εισαγωγή επιστροφής χρημάτων
-ConvertToReduc=Μαρκάρετε ως διαθέσιμη πίστωση
-ConvertExcessReceivedToReduc=Μετατρέψτε το επιπλέον ποσό που καταβλήθηκε σε διαθέσιμη πίστωση
+ConvertToReduc=Επισήμανση ως διαθέσιμη πίστωση
+ConvertExcessReceivedToReduc=Μετατρέψτε το πλεόνασμα που ελήφθη σε διαθέσιμη πίστωση
 ConvertExcessPaidToReduc=Μετατρέψτε το επιπλέον ποσό που καταβλήθηκε σε διαθέσιμη έκπτωση
 EnterPaymentReceivedFromCustomer=Εισαγωγή πληρωμής από πελάτη
-EnterPaymentDueToCustomer=Πληρωμή προς προμηθευτή
+EnterPaymentDueToCustomer=Πληρωμή οφειλής πελάτη
 DisabledBecauseRemainderToPayIsZero=Ανενεργό λόγο μηδενικού υπολοίπου πληρωμής
 PriceBase=Βασική τιμή
 BillStatus=Κατάσταση τιμολογίου
 StatusOfGeneratedInvoices=Κατάσταση δημιουργηθέντων τιμολογίων
-BillStatusDraft=Πρόχειρο (απαιτείται επικύρωση)
+BillStatusDraft=Προσχέδιο (πρέπει να επικυρωθεί)
 BillStatusPaid=Πληρωμένο
-BillStatusPaidBackOrConverted=Επιστροφή χρημάτων ή πιστωτική κάρτα
-BillStatusConverted=Καταβάλλεται (έτοιμο προς κατανάλωση στο τελικό τιμολόγιο)
+BillStatusPaidBackOrConverted=Επιστροφή χρημάτων πιστωτικού σημειώματος ή επισήμανση ως διαθέσιμης πίστωσης
+BillStatusConverted=Πληρωμένο (έτοιμο για κατανάλωση στο τελικό τιμολόγιο)
 BillStatusCanceled=Εγκαταλελειμμένο
 BillStatusValidated=Επικυρωμένο (χρήζει πληρωμής)
 BillStatusStarted=Ξεκίνησε
@@ -133,61 +133,61 @@ BillStatusNotPaid=Απλήρωτο
 BillStatusNotRefunded=Δεν έχει γίνει επιστροφή χρημάτων
 BillStatusClosedUnpaid=Κλειστό (απλήρωτο)
 BillStatusClosedPaidPartially=Πληρωμένο (μερικώς)
-BillShortStatusDraft=Πρόχειρο
+BillShortStatusDraft=Προσχέδιο
 BillShortStatusPaid=Πληρωμένο
 BillShortStatusPaidBackOrConverted=Επιστρέφονται ή μετατρέπονται
-Refunded=Επιστροφή χρημάτων
-BillShortStatusConverted=Επεξεργάστηκε
+Refunded=Έγινε επιστροφή χρημάτων
+BillShortStatusConverted=Πληρώθηκε
 BillShortStatusCanceled=Εγκαταλελειμμένο
 BillShortStatusValidated=Επικυρωμένο
 BillShortStatusStarted=Ξεκίνησε
 BillShortStatusNotPaid=Απλήρωτο
-BillShortStatusNotRefunded=Not refunded
+BillShortStatusNotRefunded=Δεν έγινε επιστροφή χρημάτων
 BillShortStatusClosedUnpaid=Κλειστό
 BillShortStatusClosedPaidPartially=Πληρωμένο (μερικώς)
 PaymentStatusToValidShort=Προς επικύρωση
 ErrorVATIntraNotConfigured=Ο ενδοκοινοτικός αριθμός ΦΠΑ δεν έχει καθοριστεί ακόμη
-ErrorNoPaiementModeConfigured=Δεν έχει οριστεί προεπιλεγμένος τύπος πληρωμής. Μεταβείτε στην επιλογή ενότητας Τιμολόγιο για να διορθώσετε αυτό το θέμα.
-ErrorCreateBankAccount=Δημιουργήστε έναν τραπεζικό λογαριασμό και, στη συνέχεια, μεταβείτε στο πλαίσιο εγκατάστασης της ενότητας Τιμολόγιο για να ορίσετε τους τύπους πληρωμής
+ErrorNoPaiementModeConfigured=Δεν έχει οριστεί προεπιλεγμένος τύπος πληρωμής. Μεταβείτε στη ρύθμιση της ενότητας τιμολογίου για να το διορθώσετε.
+ErrorCreateBankAccount=Δημιουργήστε έναν τραπεζικό λογαριασμό και, στη συνέχεια, μεταβείτε στη ρύθμιση της ενότητας Τιμολόγιο για να ορίσετε τους τύπους πληρωμής
 ErrorBillNotFound=Το τιμολόγιο %s δεν υπάρχει
 ErrorInvoiceAlreadyReplaced=Σφάλμα, προσπαθήσατε να επικυρώσετε ένα τιμολόγιο για να αντικαταστήσετε το τιμολόγιο %s. Αλλά αυτό έχει ήδη αντικατασταθεί από το τιμολόγιο %s.
-ErrorDiscountAlreadyUsed=Error, discount already used
-ErrorInvoiceAvoirMustBeNegative=Error, correct invoice must have a negative amount
-ErrorInvoiceOfThisTypeMustBePositive=Σφάλμα, αυτός ο τύπος τιμολογίου πρέπει να έχει ένα ποσό εκτός του φόρου θετικό (ή null)
+ErrorDiscountAlreadyUsed=Σφάλμα, η έκπτωση έχει ήδη χρησιμοποιηθεί
+ErrorInvoiceAvoirMustBeNegative=Σφάλμα, το σωστό τιμολόγιο πρέπει να έχει αρνητικό ποσό
+ErrorInvoiceOfThisTypeMustBePositive=Σφάλμα, αυτός ο τύπος τιμολογίου πρέπει να έχει ένα θετικό ποσό εκτός του φόρου θετικό (ή μηδέν)
 ErrorCantCancelIfReplacementInvoiceNotValidated=Σφάλμα, δεν μπορείτε να ακυρώσετε ένα τιμολόγιο που έχει αντικατασταθεί από ένα άλλο που είναι ακόμα σε κατάσταση προχείρου
-ErrorThisPartOrAnotherIsAlreadyUsedSoDiscountSerieCantBeRemoved=Αυτό το μέρος ή άλλο χρησιμοποιείται ήδη οπότε οι σειρές έκπτωσης δεν μπορούν να καταργηθούν.
+ErrorThisPartOrAnotherIsAlreadyUsedSoDiscountSerieCantBeRemoved=Αυτό ή ένα άλλο μέρος χρησιμοποιείται ήδη, επομένως η σειρά εκπτώσεων δεν μπορεί να αφαιρεθεί.
 ErrorInvoiceIsNotLastOfSameType=Σφάλμα: Η ημερομηνία του τιμολογίου %s είναι %s. Θα πρέπει να είναι παλαιότερη η ίδια με την τελευταία καταχωρημένη ημερομηνία για τον ίδιο τύπο τιμολογίων (%s). Παρακαλώ αλλάξτε την ημερομηνία του τιμολογίου
 BillFrom=Από
 BillTo=Στοιχεία Πελάτη
 ActionsOnBill=Ενέργειες στο τιμολόγιο
 RecurringInvoiceTemplate=Πρότυπο / Επαναλαμβανόμενο τιμολόγιο
-NoQualifiedRecurringInvoiceTemplateFound=No recurring template invoice qualified for generation.
-FoundXQualifiedRecurringInvoiceTemplate=Found %s recurring template invoice(s) qualified for generation.
-NotARecurringInvoiceTemplate=Not a recurring template invoice
+NoQualifiedRecurringInvoiceTemplateFound=Κανένα πρότυπο επαναλαμβανόμενου τιμολογίου δεν είναι κατάλληλο για δημιουργία.
+FoundXQualifiedRecurringInvoiceTemplate=Βρέθηκαν %s πρότυπα επαναλαμβανόμενων τιμολογίων κατάλληλα για δημιουργία.
+NotARecurringInvoiceTemplate=Δεν είναι πρότυπο επαναλαμβανόμενου τιμολογίου
 NewBill=Νέο τιμολόγιο
-LastBills=Latest %s invoices
-LatestTemplateInvoices=Τα τελευταία τιμολόγια προτύπων %s
-LatestCustomerTemplateInvoices=Τελευταία τιμολόγια προτύπου πελάτη %s
-LatestSupplierTemplateInvoices=Τελευταία τιμολόγια προτύπου προμηθευτή %s
-LastCustomersBills=Latest %s customer invoices
-LastSuppliersBills=Τελευταία τιμολόγια προμηθευτών %s
+LastBills=Τελευταία %s τιμολόγια 
+LatestTemplateInvoices=Τελευταία %s πρότυπα τιμολογίων
+LatestCustomerTemplateInvoices=Τελευταία %s πρότυπα τιμολογίων πελατών 
+LatestSupplierTemplateInvoices=Τελευταία %s πρότυπα τιμολογίων προμηθευτή 
+LastCustomersBills=Τελευταία %s τιμολόγια πελατών 
+LastSuppliersBills=Τελευταία %s τιμολόγια προμηθευτών 
 AllBills=Όλα τα τιμολόγια
-AllCustomerTemplateInvoices=Όλα τα τιμολόγια προτύπων
+AllCustomerTemplateInvoices=Όλα τα πρότυπα τιμολογίων 
 OtherBills=Άλλα τιμολόγια
 DraftBills=Προσχέδια τιμολογίων
-CustomersDraftInvoices=Customer draft invoices
-SuppliersDraftInvoices=Σχέδιο τιμολόγια προμηθευτή
+CustomersDraftInvoices=Προσχέδια τιμολογίων πελατών
+SuppliersDraftInvoices=Προσχέδια τιμολογίων προμηθευτων
 Unpaid=Απλήρωτο
 ErrorNoPaymentDefined=Σφάλμα Δεν έχει οριστεί πληρωμή
-ConfirmDeleteBill=Είσαστε σίγουρος ότι θέλετε να διαγράψετε αυτό το τιμολόγιο;
+ConfirmDeleteBill=Είσαστε σίγουροι ότι θέλετε να διαγράψετε αυτό το τιμολόγιο;
 ConfirmValidateBill=Είστε σίγουροι πως θέλετε να επικυρώσετε αυτό το τιμολόγιο με αριθμό παραστατικού <b>%s</b>;
-ConfirmUnvalidateBill=Are you sure you want to change invoice <b>%s</b> to draft status?
-ConfirmClassifyPaidBill=Are you sure you want to change invoice <b>%s</b> to status paid?
-ConfirmCancelBill=Are you sure you want to cancel invoice <b>%s</b>?
-ConfirmCancelBillQuestion=Why do you want to classify this invoice 'abandoned'?
-ConfirmClassifyPaidPartially=Are you sure you want to change invoice <b>%s</b> to status paid?
-ConfirmClassifyPaidPartiallyQuestion=Αυτό το τιμολόγιο δεν έχει καταβληθεί πλήρως. Ποιος είναι ο λόγος για το κλείσιμο αυτού του τιμολογίου;
-ConfirmClassifyPaidPartiallyReasonAvoir=Το υπόλοιπο που δεν πληρώθηκε <b>(%s %s)</b> είναι μια έκπτωση που δόθηκε επειδή η πληρωμή έγινε πριν από τη λήξη. Κανονίζω τον ΦΠΑ με πιστωτικό σημείωμα.
+ConfirmUnvalidateBill=Είστε σίγουροι ότι θέλετε να αλλάξετε το τιμολόγιο <b> %s </b> σε κατάσταση προσχεδίου;
+ConfirmClassifyPaidBill=Είστε σίγουροι ότι θέλετε να ορισετε το τιμολόγιο <b> %s </b> ως πληρωμένο;
+ConfirmCancelBill=Είστε σίγουροι ότι θέλετε να ακυρώσετε το τιμολόγιο <b>%s</b>;
+ConfirmCancelBillQuestion=Για πιο λόγο θέλετε να Ταξινομήσετε αυτό το τιμολόγιο ως "εγκαταλελειμμένο";
+ConfirmClassifyPaidPartially=Είστε σίγουροι ότι θέλετε να ορίσετε το τιμολόγιο <b>%s</b> ως πληρωμένο;
+ConfirmClassifyPaidPartiallyQuestion=Αυτό το τιμολόγιο δεν έχει εξοφληθεί πλήρως. Ποιος είναι ο λόγος για το κλείσιμο αυτού του τιμολογίου;
+ConfirmClassifyPaidPartiallyReasonAvoir=Το υπόλοιπο που δεν πληρώθηκε <b>(%s %s)</b> είναι μια έκπτωση που δόθηκε επειδή η πληρωμή έγινε πριν από τη λήξη. Τακτοποιώ τον Φ.Π.Α. με πιστωτικό σημείωμα.
 ConfirmClassifyPaidPartiallyReasonDiscount=Το υπόλοιπο που δεν πληρώθηκε <b>(%s %s)</b> είναι μια έκπτωση που δόθηκε επειδή η πληρωμή έγινε πριν από τη λήξη.
 ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Παραμένουν απλήρωτα <b>(%s %s)</b> έχει μια έκπτωση που χορηγήθηκε επειδή η πληρωμή έγινε πριν από την περίοδο. Δέχομαι να χάσω το ΦΠΑ για την έκπτωση αυτή.
 ConfirmClassifyPaidPartiallyReasonDiscountVat=Παραμένουν απλήρωτα <b>(%s %s)</b> έχει μια έκπτωση που χορηγήθηκε επειδή η πληρωμή έγινε πριν από την περίοδο. Έχω την επιστροφή του ΦΠΑ για την έκπτωση αυτή χωρίς πιστωτικό τιμολόγιο.
@@ -195,89 +195,89 @@ ConfirmClassifyPaidPartiallyReasonBadCustomer=Κακός πελάτης
 ConfirmClassifyPaidPartiallyReasonBankCharge=Παρακράτηση από τράπεζα (ενδιάμεσες τραπεζικές προμήθειες)
 ConfirmClassifyPaidPartiallyReasonProductReturned=Τα προϊόντα επιστράφηκαν μερικώς
 ConfirmClassifyPaidPartiallyReasonOther=Ποσό εγκαταλελειμμένο για άλλους λόγους
-ConfirmClassifyPaidPartiallyReasonDiscountNoVatDesc=Αυτή η επιλογή είναι δυνατή αν έχουν δοθεί κατάλληλα σχόλια στο τιμολόγιό σας. (Παράδειγμα «Μόνο ο φόρος που αντιστοιχεί στην πράγματι καταβληθείσα τιμή παρέχει δικαίωμα προς έκπτωση»)
-ConfirmClassifyPaidPartiallyReasonDiscountVatDesc=Σε ορισμένες χώρες, αυτή η επιλογή μπορεί να είναι δυνατή μόνο εάν το τιμολόγιό σας περιέχει σωστές σημειώσεις.
+ConfirmClassifyPaidPartiallyReasonDiscountNoVatDesc=Αυτή η επιλογή είναι δυνατή αν έχουν δοθεί κατάλληλα σχόλια στο τιμολόγιο σας. (Παράδειγμα «Μόνο ο φόρος που αντιστοιχεί στην πραγματικά καταβληθείσα τιμή παρέχει δικαίωμα προς παρακράτηση»)
+ConfirmClassifyPaidPartiallyReasonDiscountVatDesc=Σε ορισμένες χώρες, αυτή η επιλογή μπορεί να είναι δυνατή μόνο εάν το τιμολόγιο σας περιέχει σωστές σημειώσεις.
 ConfirmClassifyPaidPartiallyReasonAvoirDesc=Επιλέξτε αυτή την επιλογή αν οι υπόλοιπες δεν ταιριάζουν
 ConfirmClassifyPaidPartiallyReasonBadCustomerDesc=Ένας <b>κακός πελάτης</b> είναι ένας πελάτης που αρνείται να πληρώσει το χρέος του.
-ConfirmClassifyPaidPartiallyReasonProductReturnedDesc=This choice is used when payment is not complete because some of products were returned
+ConfirmClassifyPaidPartiallyReasonProductReturnedDesc=Αυτή η επιλογή χρησιμοποιείται όταν η πληρωμή δεν έχει ολοκληρωθεί επειδή ορισμένα από τα προϊόντα επιστράφηκαν
 ConfirmClassifyPaidPartiallyReasonBankChargeDesc=Το μη καταβληθέν ποσό είναι <b> προμήθειες μεσάζουσας τράπεζας </b> , που αφαιρούνται απευθείας από το <b>σωστό ποσό </b> που κατέβαλε ο Πελάτης.
-ConfirmClassifyPaidPartiallyReasonOtherDesc=Χρησιμοποιήστε αυτήν την επιλογή αν δεν είναι κατάλληλες όλες οι άλλες, για παράδειγμα στην ακόλουθη περίπτωση: <br> - η πληρωμή δεν ολοκληρώθηκε επειδή ορισμένα προϊόντα αποστέλλονται πίσω <br> - το ποσό που ζητήθηκε είναι πολύ σημαντικό επειδή μια έκπτωση ξεχάστηκε <br> Σε όλες τις περιπτώσεις, η υπέρμετρη αξίωση πρέπει να διορθωθεί στο λογιστικό σύστημα δημιουργώντας ένα πιστωτικό σημείωμα.
+ConfirmClassifyPaidPartiallyReasonOtherDesc=Χρησιμοποιήστε αυτήν την επιλογή αν όλες οι άλλες δεν είναι κατάλληλες, για παράδειγμα στην ακόλουθη περίπτωση: <br> - η πληρωμή δεν ολοκληρώθηκε επειδή ορισμένα προϊόντα επιστράφηκαν <br> - το ποσό που ζητήθηκε είναι πολύ μεγάλο επειδή μια έκπτωση ξεχάστηκε <br> Σε όλες τις περιπτώσεις, η υπέρμετρη αξίωση πρέπει να διορθωθεί στο λογιστικό σύστημα δημιουργώντας ένα πιστωτικό σημείωμα.
 ConfirmClassifyAbandonReasonOther=Άλλος
-ConfirmClassifyAbandonReasonOtherDesc=This choice will be used in all other cases. For example because you plan to create a replacing invoice.
-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.
+ConfirmClassifyAbandonReasonOtherDesc=Αυτή η επιλογή θα χρησιμοποιηθεί σε όλες τις άλλες περιπτώσεις. Για παράδειγμα, επειδή σκοπεύετε να δημιουργήσετε ένα τιμολόγιο αντικατάστασης.
+ConfirmCustomerPayment=Επιβεβαιώνετε αυτήν την καταχώριση πληρωμής για <b> %s </b> %s;
+ConfirmSupplierPayment=Επιβεβαιώνετε αυτήν την καταχώριση πληρωμής για <b> %s </b> %s;
+ConfirmValidatePayment=Είστε σίγουροι ότι θέλετε να επικυρώσετε αυτήν την πληρωμή; Καμία αλλαγή δεν θα μπορεί να γίνει μετά την επικύρωση της πληρωμής.
 ValidateBill=Επικύρωση τιμολογίου
-UnvalidateBill=Μη επαληθευμένο τιμολόγιο
+UnvalidateBill=Κατάργηση επικύρωσης τιμολογίου
 NumberOfBills=Αριθμός τιμολογίων
 NumberOfBillsByMonth=Αριθμός τιμολογίων ανά μήνα
 AmountOfBills=Ποσό τιμολογίων
 AmountOfBillsHT=Ποσό τιμολογίων (καθαρό από φόρο)
-AmountOfBillsByMonthHT=Ποσό των τιμολογίων ανά μήνα (μετά από φόρους)
+AmountOfBillsByMonthHT=Ποσό των τιμολογίων ανά μήνα (καθαρό από φόρους)
 UseSituationInvoices=Να επιτρέπεται το τιμολόγιο κατάστασης
 UseSituationInvoicesCreditNote=Επιτρέψτε το πιστωτικό σημείωμα τιμολογίου κατάστασης
-Retainedwarranty=Διατηρημένη εγγύηση
-AllowedInvoiceForRetainedWarranty=Διατηρούμενη εγγύηση που μπορεί να χρησιμοποιηθεί στους ακόλουθους τύπους τιμολογίων
-RetainedwarrantyDefaultPercent=Διατηρημένο ποσοστό εξόφλησης εγγύησης
-RetainedwarrantyOnlyForSituation=Διαθέστε την "διατηρούμενη εγγύηση" διαθέσιμη μόνο για τιμολόγια κατάστασης
-RetainedwarrantyOnlyForSituationFinal=Σε τιμολόγια κατάστασης, η παγκόσμια έκπτωση "διατηρούμενη εγγύηση" εφαρμόζεται μόνο στην τελική κατάσταση
-ToPayOn=Να πληρώσετε για %s
-toPayOn=να πληρώσει για %s
-RetainedWarranty=Διατηρημένη εγγύηση
-PaymentConditionsShortRetainedWarranty=Διατηρημένοι όροι πληρωμής εγγύησης
+Retainedwarranty=Κρατημένη εγγύηση
+AllowedInvoiceForRetainedWarranty=Κρατημένη εγγύηση που μπορεί να χρησιμοποιηθεί στους ακόλουθους τύπους τιμολογίων
+RetainedwarrantyDefaultPercent=Προκαθορισμένο ποσοστό κρατημένης εγγύησης
+RetainedwarrantyOnlyForSituation=Κάντε την "Κρατημένη εγγύηση" διαθέσιμη μόνο για τιμολόγια κατάστασης
+RetainedwarrantyOnlyForSituationFinal=Στα τιμολόγια κατάστασης η συνολική έκπτωση της "Κρατημένης εγγύησης" εφαρμόζεται μόνο στην τελική κατάσταση
+ToPayOn=Για πληρωμή στο %s
+toPayOn=Για πληρωμή στο %s
+RetainedWarranty=Κρατημένη εγγύηση
+PaymentConditionsShortRetainedWarranty=Όροι πληρωμής Κρατημένης εγγύησης
 DefaultPaymentConditionsRetainedWarranty=Προεπιλεγμένοι όροι πληρωμής της εγγύησης
 setPaymentConditionsShortRetainedWarranty=Ορίστε τους όρους πληρωμής της εγγύησης
-setretainedwarranty=Ορίστε την παραληφθείσα εγγύηση
-setretainedwarrantyDateLimit=Ορίστε το όριο ημερομηνίας εγγύησης που διατηρήθηκε
-RetainedWarrantyDateLimit=Διατηρημένο όριο ημερομηνίας εγγύησης
+setretainedwarranty=Ορίστε την εγγύηση
+setretainedwarrantyDateLimit=Ορίστε το όριο ημερομηνίας της εγγύησης
+RetainedWarrantyDateLimit=Όριο ημερομηνίας εγγύησης
 RetainedWarrantyNeed100Percent=Το τιμολόγιο κατάστασης πρέπει να είναι στο 100%% για να εμφανίζεται σε PDF
 AlreadyPaid=Ήδη πληρωμένο
-AlreadyPaidBack=Already paid back
-AlreadyPaidNoCreditNotesNoDeposits=Ήδη πληρωμένο (χωρίς πιστώσεις ή καταθέσεις)
+AlreadyPaidBack=Έχουν ήδη επιστραφεί
+AlreadyPaidNoCreditNotesNoDeposits=Έχει ήδη πληρωθεί (χωρίς πιστωτικές σημειώσεις και προκαταβολές)
 Abandoned=Εγκαταλελειμμένο
 RemainderToPay=Παραμένουν απλήρωτα
 RemainderToPayMulticurrency=Παραμένει απλήρωτο, αρχικό νόμισμα
 RemainderToTake=Υπόλοιπο ποσό να ληφθεί
 RemainderToTakeMulticurrency=Υπολειπόμενο ποσό προς λήψη, αρχικό νόμισμα
-RemainderToPayBack=Remaining amount to refund
-RemainderToPayBackMulticurrency=Υπόλοιπο ποσό για επιστροφή χρημάτων, αρχικό νόμισμα
-NegativeIfExcessRefunded=αρνητικό εάν επιστραφεί επιπλέον ποσό
+RemainderToPayBack=Το υπόλοιπο ποσό για επιστροφή χρημάτων
+RemainderToPayBackMulticurrency=Υπόλοιπο για επιστροφή χρημάτων, αρχικό νόμισμα
+NegativeIfExcessRefunded=αρνητικό εάν επιστραφεί το επιπλέον ποσό
 Rest=Εκκρεμής
 AmountExpected=Ποσό που ζητήθηκε
-ExcessReceived=Περίσσεια που λήφθηκε
-ExcessReceivedMulticurrency=Επιπλέον ποσό που ελήφθη, αρχικό νόμισμα
-NegativeIfExcessReceived=αρνητικό εάν ληφθεί πλεονάζων
-ExcessPaid=Πληρωμή υπέρβασης
-ExcessPaidMulticurrency=Επιπλέον ποσό πληρωμένο, αρχικό νόμισμα
-EscompteOffered=Discount offered (payment before term)
+ExcessReceived=Επιπλέον ποσό που εισπράχθηκε
+ExcessReceivedMulticurrency=Επιπλέον ποσό που εισπράχθηκε, αρχικό νόμισμα
+NegativeIfExcessReceived=αρνητικό εάν εισπράχθηκε παραπάνω
+ExcessPaid=Πληρώθηκε το επιπλέον ποσό
+ExcessPaidMulticurrency=Πληρώθηκε το επιπλέον ποσό, αρχικό νόμισμα
+EscompteOffered=Προσφέρθηκε έκπτωση (πληρωμή πριν από την προθεσμία)
 EscompteOfferedShort=Έκπτωση
 SendBillRef=Υποβολή των τιμολογίων %s
 SendReminderBillRef=Υποβολή των τιμολογίων %s (υπενθύμιση)
 SendPaymentReceipt=Υποβολή απόδειξης πληρωμής %s
-NoDraftBills=Δεν υπάρχουν προσχέδια
-NoOtherDraftBills=Δεν υπάρχουν άλλα προσχέδια
+NoDraftBills=Δεν υπάρχουν προσχέδια τιμολογίων
+NoOtherDraftBills=Δεν υπάρχουν άλλα προσχέδια τιμολογίων
 NoDraftInvoices=Δεν υπάρχουν προσχέδια τιμολογίων
-RefBill=Κωδ. τιμολογίου
+RefBill=Αναφ. τιμολογίου
 ToBill=Προς τιμολόγηση
 RemainderToBill=Υπόλοιπο προς χρέωση
 SendBillByMail=Αποστολή τιμολογίου με email
 SendReminderBillByMail=Αποστολή υπενθύμισης με email
 RelatedCommercialProposals=Σχετικές προσφορές
-RelatedRecurringCustomerInvoices=Related recurring customer invoices
+RelatedRecurringCustomerInvoices=Σχετικά επαναλαμβανόμενα τιμολόγια πελατών
 MenuToValid=Προς επικύρωση
-DateMaxPayment=Προθεσμία Πληρωμής
+DateMaxPayment=Προθεσμία Πληρωμής ως
 DateInvoice=Ημερομηνία τιμολογίου
-DatePointOfTax=Point of tax
+DatePointOfTax=Ημερομηνία φορολογικής επιλεξιμότητας
 NoInvoice=Δεν υπάρχει τιμολόγιο
 NoOpenInvoice=Χωρίς ανοιχτό τιμολόγιο
 NbOfOpenInvoices=Αριθμός ανοιχτών τιμολογίων
-ClassifyBill=Κατηγοριοποίηση Τιμολογίου
+ClassifyBill=Ταξινόμηση Τιμολογίου
 SupplierBillsToPay=Μη πληρωθέντα τιμολόγια προμηθευτή
 CustomerBillsUnpaid=Ανεξόφλητα τιμολόγια πελάτη
-NonPercuRecuperable=Non-recoverable
+NonPercuRecuperable=Μη ανακτήσιμο
 SetConditions=Ορίστε τους όρους πληρωμής
 SetMode=Ορίστε τον τύπο πληρωμής
-SetRevenuStamp=Set revenue stamp
+SetRevenuStamp=Ορισμός χαρτοσήμου εσόδων
 Billed=Τιμολογημένο
 RecurringInvoices=Επαναλαμβανόμενα τιμολόγια
 RecurringInvoice=Επαναλαμβανόμενο τιμολόγιο
@@ -285,128 +285,128 @@ RepeatableInvoice=Πρότυπο τιμολογίου
 RepeatableInvoices=Πρότυπο τιμολόγιο
 RecurringInvoicesJob=Δημιουργία επαναλαμβανόμενων τιμολογίων ( τιμολόγια πωλήσεων)
 RecurringSupplierInvoicesJob=Δημιουργία επαναλαμβανόμενων τιμολογίων ( τιμολόγια αγορών)
-Repeatable=Πρώτυπο
-Repeatables=Πρώτυπα
+Repeatable=Πρότυπο
+Repeatables=Πρότυπα
 ChangeIntoRepeatableInvoice=Μετατροπή σε πρότυπο τιμολόγιο
-CreateRepeatableInvoice=Δημιουργία πρότυπο τιμολόγιο
+CreateRepeatableInvoice=Δημιουργία πρότυπου τιμολογίου
 CreateFromRepeatableInvoice=Δημιουργία από πρότυπο τιμολόγιο
 CustomersInvoicesAndInvoiceLines=Τιμολόγια πελατών και λεπτομέρειες τιμολογίου
-CustomersInvoicesAndPayments=Πληρωμές και τιμολόγια πελατών
+CustomersInvoicesAndPayments=Τιμολόγια και πληρωμές πελατών
 ExportDataset_invoice_1=Τιμολόγια πελατών και λεπτομέρειες τιμολογίου
-ExportDataset_invoice_2=Πληρωμές και τιμολόγια πελατών
-ProformaBill=Proforma Bill:
+ExportDataset_invoice_2=Τιμολόγια και πληρωμές πελατών
+ProformaBill=Προτιμολόγιο:
 Reduction=Μείωση
 ReductionShort=Έκπτωση
 Reductions=Μειώσεις
 ReductionsShort=Έκπτωση
 Discounts=Εκπτώσεις
-AddDiscount=Δημιουργία απόλυτη έκπτωση
-AddRelativeDiscount=Δημιουργία σχετική έκπτωση
+AddDiscount=Δημιουργία έκπτωσης
+AddRelativeDiscount=Δημιουργία σχετικής έκπτωσης
 EditRelativeDiscount=Επεξεργασία σχετικής έκπτωσης
 AddGlobalDiscount=Προσθήκη έκπτωσης
 EditGlobalDiscounts=Επεξεργασία απόλυτη εκπτώσεις
 AddCreditNote=Δημιουργία πιστωτικού τιμολογίου
-ShowDiscount=Εμφάνιση εκπτώσεων
-ShowReduc=Δείξτε την έκπτωση
+ShowDiscount=Εμφάνιση έκπτωσης
+ShowReduc=Εμφάνιση έκπτωσης
 ShowSourceInvoice=Εμφάνιση του τιμολογίου προέλευσης
 RelativeDiscount=Σχετική έκπτωση
 GlobalDiscount=Συνολική έκπτωση
-CreditNote=Πίστωση
-CreditNotes=Πιστώσεις
-CreditNotesOrExcessReceived=Πιστωτικές σημειώσεις ή υπερβολική παραλαβή
-Deposit=Κατάθεση
-Deposits=Καταθέσεις
+CreditNote=Πιστωτικό σημείωμα
+CreditNotes=Πιστωτικές σημειώσεις
+CreditNotesOrExcessReceived=Πιστωτικές σημειώσεις ή επιπλέον εισπραχθέν
+Deposit=Προκαταβολή
+Deposits=Προκαταβολές
 DiscountFromCreditNote=Έκπτωση από το πιστωτικό τιμολόγιο %s
-DiscountFromDeposit=Πληρωμές από το τιμολόγιο κατάθεσης %s
-DiscountFromExcessReceived=Πληρωμές που υπερβαίνουν το τιμολόγιο %s
-DiscountFromExcessPaid=Πληρωμές που υπερβαίνουν το τιμολόγιο %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
+DiscountFromDeposit=Προκαταβολές από τιμολόγιο %s
+DiscountFromExcessReceived=Πληρωμές πάνω από την αξία του τιμολογίου %s
+DiscountFromExcessPaid=Πληρωμές πάνω από την αξία του τιμολογίου %s
+AbsoluteDiscountUse=Αυτό το είδος πίστωσης μπορεί να χρησιμοποιηθεί στο τιμολόγιο πριν από την επικύρωσή του
+CreditNoteDepositUse=Το τιμολόγιο πρέπει να επικυρωθεί για να χρησιμοποιήσετε αυτού του είδους τις πιστώσεις
 NewGlobalDiscount=Νέα απόλυτη έκπτωση
 NewRelativeDiscount=Νέα σχετική έκπτωση
 DiscountType=Τύπος έκπτωσης
 NoteReason=Σημείωση/Αιτία
 ReasonDiscount=Αιτία
-DiscountOfferedBy=Παραχωρούνται από
-DiscountStillRemaining=Εκπτώσεις ή διαθέσιμες πιστώσεις
+DiscountOfferedBy=Εγκρίθηκε από
+DiscountStillRemaining=Διαθέσιμες εκπτώσεις ή πιστώσεις
 DiscountAlreadyCounted=Εκπτώσεις ή πιστώσεις που έχουν ήδη καταναλωθεί
 CustomerDiscounts=Εκπτώσεις πελατών
 SupplierDiscounts=Εκπτώσεις προμηθευτών
 BillAddress=Διεύθυνση χρέωσης
 HelpEscompte=Αυτή η έκπτωση είναι μια έκπτωση που παραχωρήθηκε στον πελάτη, επειδή η πληρωμή έγινε πριν από την ημερομηνία λήξης.
 HelpAbandonBadCustomer=Το ποσό αυτό έχει εγκαταλειφθεί (ο πελάτης λέγεται ότι είναι κακός πελάτης) και θεωρείται εξαιρετική ζημία.
-HelpAbandonOther=Το ποσό αυτό έχει εγκαταλειφθεί επειδή ήταν λάθος (λάθος πελάτης ή τιμολόγιο αντικαταστάθηκε από άλλο, για παράδειγμα)
+HelpAbandonOther=Το ποσό αυτό έχει εγκαταλειφθεί επειδή ήταν λάθος (για παράδειγμα λάθος πελάτης ή τιμολόγιο που αντικαταστάθηκε από άλλο, )
 IdSocialContribution=Κοινωνική εισφορά / Φορολογικά id πληρωμής
 PaymentId=Κωδ. Πληρωμής
 PaymentRef=Αναφ. πληρωμής
-InvoiceId=Κωδ. Τιμολογίου
+InvoiceId=Αναγνωριστικό τιμολογίου
 InvoiceRef=Αρ. Τιμολογίου
-InvoiceDateCreation=Ημερ. δημιουργίας τιμολογίου
+InvoiceDateCreation=Ημερομηνία δημιουργίας τιμολογίου
 InvoiceStatus=Κατάσταση τιμολογίου
 InvoiceNote=Σημείωση τιμολογίου
 InvoicePaid=Το τιμολόγιο εξοφλήθηκε
-InvoicePaidCompletely=Πληρωμή Εξ'ολοκλήρου
-InvoicePaidCompletelyHelp=Τιμολόγιο που πληρώθηκε εξ' ολοκλήρου. Αυτό εξαιρεί τα τιμολόγια που πληρώθηκαν τμηματικά. Για να λάβετε τον κατάλογο όλων των τιμολογίων «κλειστών» ή μη κλειστών, προτιμήστε να χρησιμοποιήσετε ένα φίλτρο στην κατάσταση του τιμολογίου.
-OrderBilled=Παραγγελία χρεώνεται
+InvoicePaidCompletely=Πληρώθηκε πλήρως
+InvoicePaidCompletelyHelp=Τιμολόγιο που πληρώθηκε εξ' ολοκλήρου. Αυτό εξαιρεί τα τιμολόγια που πληρώθηκαν τμηματικά. Για να λάβετε τον κατάλογο όλων των ¨κλειστών" ή μη "κλειστών" τιμολογίων , προτιμήστε να χρησιμοποιήσετε ένα φίλτρο στην κατάσταση του τιμολογίου.
+OrderBilled=Η παραγγελία τιμολογήθηκε
 DonationPaid=Η δωρεά πληρώθηκε
 PaymentNumber=Αριθμός πληρωμής
-RemoveDiscount=Αφαίρεση έκπτωσης
-WatermarkOnDraftBill=Υδατογράφημα σε προσχέδια
+RemoveDiscount=Κατάργηση της έκπτωσης
+WatermarkOnDraftBill=Υδατογράφημα σε πρόχειρα τιμολόγια (τίποτα αν είναι κενό)
 InvoiceNotChecked=Δεν έχει επιλεγεί τιμολόγιο
-ConfirmCloneInvoice=Are you sure you want to clone this invoice <b>%s</b>?
-DisabledBecauseReplacedInvoice=Action disabled because invoice has been replaced
+ConfirmCloneInvoice=Είστε σίγουροι ότι θέλετε να αντιγράψετε αυτό το τιμολόγιο <b> %s </b>;
+DisabledBecauseReplacedInvoice=Η ενέργεια απενεργοποιήθηκε επειδή το τιμολόγιο έχει αντικατασταθεί
 DescTaxAndDividendsArea=Ο τομέας αυτός παρουσιάζει μια σύνοψη όλων των πληρωμών που έγιναν για ειδικά έξοδα. Εδώ περιλαμβάνονται μόνο οι εγγραφές με πληρωμές κατά τη διάρκεια του καθορισμένου έτους.
 NbOfPayments=Αριθμός πληρωμών
 SplitDiscount=Χωρισμός έκπτωσης σε δύο μέρη
-ConfirmSplitDiscount=Είστε βέβαιοι ότι θέλετε να χωρίσετε αυτή την έκπτωση <b>%s</b> %s σε δύο μικρότερες εκπτώσεις;
-TypeAmountOfEachNewDiscount=Μέγεθος εισόδου για κάθε ένα από τα δύο μέρη:
+ConfirmSplitDiscount=Είστε σίγουροι ότι θέλετε να χωρίσετε αυτή την έκπτωση <b>%s</b> %s σε δύο μικρότερες εκπτώσεις;
+TypeAmountOfEachNewDiscount=Καταχωρίστε το ποσό για καθένα από τα δύο μέρη:
 TotalOfTwoDiscountMustEqualsOriginal=Το σύνολο των δύο νέων εκπτώσεων πρέπει να είναι ίσο με το αρχικό ποσό έκπτωσης.
-ConfirmRemoveDiscount=Are you sure you want to remove this discount?
-RelatedBill=Σχετιζόμενο τιμολόγιο
-RelatedBills=Σχετιζόμενα τιμολόγια
+ConfirmRemoveDiscount=Είστε σίγουροι ότι θέλετε να καταργήσετε αυτήν την έκπτωση;
+RelatedBill=Σχετικό τιμολόγιο
+RelatedBills=Σχετικά τιμολόγια
 RelatedCustomerInvoices=Σχετικά τιμολόγια πελατών
 RelatedSupplierInvoices=Σχετικά τιμολόγια προμηθευτή
 LatestRelatedBill=Τελευταίο σχετικό τιμολόγιο
-WarningBillExist=Προειδοποίηση, υπάρχει ένα ή περισσότερα τιμολόγια
+WarningBillExist=Προειδοποίηση, υπάρχουν ήδη ένα ή περισσότερα τιμολόγια
 MergingPDFTool=Συγχώνευση εργαλείο PDF
 AmountPaymentDistributedOnInvoice=Ποσό πληρωμής κατανεμημένο στο τιμολόγιο
 PaymentOnDifferentThirdBills=Επιτρέψτε πληρωμές σε διαφορετικούς λογαριασμούς τρίτων, αλλά στην ίδια μητρική εταιρεία
-PaymentNote=Σημείωση πληρωμής
-ListOfPreviousSituationInvoices=List of previous situation invoices
-ListOfNextSituationInvoices=List of next situation invoices
+PaymentNote=Σημείωμα πληρωμής
+ListOfPreviousSituationInvoices=Λίστα προηγούμενων τιμολογίων κατάστασης
+ListOfNextSituationInvoices=Λίστα επόμενων τιμολογίων κατάστασης
 ListOfSituationInvoices=Λίστα τιμολογίων κατάστασης
 CurrentSituationTotal=Συνολική τρέχουσα κατάσταση
-DisabledBecauseNotEnouthCreditNote=Για να καταργήσετε ένα τιμολόγιο κατάστασης από τον κύκλο, αυτό το πιστωτικό σημείωμα του τιμολογίου πρέπει να καλύπτει αυτό το σύνολο τιμολογίων
+DisabledBecauseNotEnouthCreditNote=Για να καταργήσετε ένα τιμολόγιο κατάστασης από τον κύκλο, το σύνολο αυτού του πιστωτικού τιμολογίου πρέπει να καλύπτει το σύνολο αυτού του τιμολογίου
 RemoveSituationFromCycle=Καταργήστε αυτό το τιμολόγιο από τον κύκλο
-ConfirmRemoveSituationFromCycle=Καταργήστε αυτό το τιμολόγιο %s από τον κύκλο;
+ConfirmRemoveSituationFromCycle=Θέλετε να καταργήστε αυτό το τιμολόγιο %s από τον κύκλο;
 ConfirmOuting=Επιβεβαιώστε την έξοδο
 FrequencyPer_d=Κάθε %s ημέρες
 FrequencyPer_m=Κάθε %s μήνες
 FrequencyPer_y=Κάθε %s χρόνια
 FrequencyUnit=Μονάδα συχνότητας
-toolTipFrequency=Παραδείγματα: <br> <b>Set 7, Day</b> : δώστε ένα νέο τιμολόγιο κάθε 7 ημέρες <br> <b>Ορίστε 3, Μήνας</b> : δώστε ένα νέο τιμολόγιο κάθε 3 μήνες
+toolTipFrequency=Παραδείγματα: <br> <b> Ορισμός 7, Ημέρα </b> :δινει ένα νέο τιμολόγιο κάθε 7 ημέρες <br> <b> Ορισμός 3, μήνα</b>: δίνει ένα νέο τιμολόγιο ανά 3 μηνες
 NextDateToExecution=Ημερομηνία δημιουργίας του επόμενου τιμολογίου
-NextDateToExecutionShort=Ημερομηνία επόμενης γεν.
+NextDateToExecutionShort=Ημερομηνία επόμενης δημ.
 DateLastGeneration=Ημερομηνία τελευταίας δημιουργίας
-DateLastGenerationShort=Ημερομηνία τελευταίας γεν.
-MaxPeriodNumber=Μέγιστη. αριθμός δημιουργίας τιμολογίου
-NbOfGenerationDone=Αριθμός γεννήσεων τιμολογίων που έχουν ήδη γίνει
+DateLastGenerationShort=Ημερομηνία τελευταίας δημ.
+MaxPeriodNumber=Μέγιστος αριθμός δημιουργίας τιμολογίων
+NbOfGenerationDone=Αριθμός τιμολογίων που έχουν ήδη δημιουργηθει
 NbOfGenerationOfRecordDone=Αριθμός δημιουργίας εγγραφών που έχουν ήδη γίνει
-NbOfGenerationDoneShort=Αριθμός γενεάς που έγινε
-MaxGenerationReached=Ο μέγιστος αριθμός γενεών έφτασε
+NbOfGenerationDoneShort=Αριθμός δημιουργιών που έχουν γίνει
+MaxGenerationReached=Συμπληρώθηκε ο μέγιστος αριθμός δημιουργιών
 InvoiceAutoValidate=Αυτόματη επικύρωση τιμολογίων
-GeneratedFromRecurringInvoice=Generated from template recurring invoice %s
-DateIsNotEnough=Date not reached yet
-InvoiceGeneratedFromTemplate=Invoice %s generated from recurring template invoice %s
-GeneratedFromTemplate=Δημιουργήθηκε από το τιμολόγιο προτύπου %s
+GeneratedFromRecurringInvoice=Δημιουργήθηκε από το πρότυπο επαναλαμβανόμενο τιμολόγιο %s
+DateIsNotEnough=Η ημερομηνία δεν έχει φτάσει ακόμα
+InvoiceGeneratedFromTemplate=Τιμολόγιο %s που δημιουργήθηκε από το επαναλαμβανόμενο πρότυπο τιμολόγιο %s
+GeneratedFromTemplate=Δημιουργήθηκε από το πρότυπο τιμολόγιο %s
 WarningInvoiceDateInFuture=Προειδοποίηση, η ημερομηνία τιμολογίου είναι μεγαλύτερη από την τρέχουσα ημερομηνία
-WarningInvoiceDateTooFarInFuture=Warning, the invoice date is too far from current date
+WarningInvoiceDateTooFarInFuture=Προειδοποίηση, η ημερομηνία τιμολογίου είναι αρκετά μεταγενέστερη από την τρέχουσα ημερομηνία
 ViewAvailableGlobalDiscounts=Δείτε τις διαθέσιμες εκπτώσεις
-GroupPaymentsByModOnReports=Ομαδικές πληρωμές κατά τρόπο λειτουργίας στις αναφορές 
+GroupPaymentsByModOnReports=Ομαδικές πληρωμές ανά τρόπο λειτουργίας στις αναφορές 
 # PaymentConditions
 Statut=Κατάσταση
-PaymentConditionShortRECEP=Due Upon Receipt
-PaymentConditionRECEP=Due Upon Receipt
+PaymentConditionShortRECEP=Άμεσα Πληρωτέο
+PaymentConditionRECEP=Άμεσα Πληρωτέο
 PaymentConditionShort30D=30 ημέρες
 PaymentCondition30D=30 ημέρες
 PaymentConditionShort30DENDMONTH=30 ημέρες από το τέλος του μήνα
@@ -416,111 +416,112 @@ PaymentCondition60D=60 ημέρες
 PaymentConditionShort60DENDMONTH=60 ημέρες από το τέλος του μήνα
 PaymentCondition60DENDMONTH=Μέσα στις 60 ημέρες που ακολουθούν από το τέλος του μήνα
 PaymentConditionShortPT_DELIVERY=Αποστολή
-PaymentConditionPT_DELIVERY=Με αντικαταβολή
+PaymentConditionPT_DELIVERY=Κατά την παράδοση
 PaymentConditionShortPT_ORDER=Παραγγελία
 PaymentConditionPT_ORDER=Κατόπιν παραγγελίας
 PaymentConditionShortPT_5050=50-50
 PaymentConditionPT_5050=50%% προκαταβολικά, 50%% κατά την παράδοση
-PaymentConditionShort10D=10 days
-PaymentCondition10D=10 days
-PaymentConditionShort10DENDMONTH=10 days of month-end
-PaymentCondition10DENDMONTH=Within 10 days following the end of the month
-PaymentConditionShort14D=14 days
-PaymentCondition14D=14 days
-PaymentConditionShort14DENDMONTH=14 days of month-end
-PaymentCondition14DENDMONTH=Within 14 days following the end of the month
-PaymentConditionShortDEP30PCTDEL=__DEPOSIT_PERCENT__%% κατάθεση
-PaymentConditionDEP30PCTDEL=__DEPOSIT_PERCENT__%% κατάθεση, υπόλοιπο κατά την παράδοση
+PaymentConditionShort10D=10 μέρες
+PaymentCondition10D=10 μέρες
+PaymentConditionShort10DENDMONTH=10 ημέρες από το τέλος του μήνα
+PaymentCondition10DENDMONTH=Εντός 10 ημερών από το τέλος του μήνα
+PaymentConditionShort14D=14 ημέρες
+PaymentCondition14D=14 ημέρες
+PaymentConditionShort14DENDMONTH=14 ημέρες από το τέλος του μήνα
+PaymentCondition14DENDMONTH=Εντός 14 ημερών από το τέλος του μήνα
+PaymentConditionShortDEP30PCTDEL=__ΠΟΣΟΣΤΟ_ΚΑΤΑΘΕΣΗΣ__%% κατάθεση
+PaymentConditionDEP30PCTDEL=__ΠΟΣΟΣΤΟ_ΚΑΤΑΘΕΣΗΣ__%% κατάθεση, υπόλοιπο κατά την παράδοση
 FixAmount=Σταθερό ποσό - 1 γραμμή με την ετικέτα '%s'
-VarAmount=Μεταβλητή ποσού (%% tot.)
-VarAmountOneLine=Μεταβλητή ποσότητα (%% tot.) - 1 γραμμή με την ετικέτα &#39;%s&#39;
-VarAmountAllLines=Μεταβλητό ποσό (%% συνολικά) - όλες οι γραμμές από τις αρχικές
+VarAmount=Μεταβλητό ποσό (%% συνολικά)
+VarAmountOneLine=Μεταβλητό ποσό (%% συνολικά) - 1 γραμμή με ετικέτα "%s"
+VarAmountAllLines=Μεταβλητό ποσό (%% συνολικά) - όλες οι γραμμές
 DepositPercent=Κατάθεση %%
 DepositGenerationPermittedByThePaymentTermsSelected=Αυτό επιτρέπεται βάση των επιλεγμένων όρων πληρωμής
 GenerateDeposit=Δημιουργήστε μια %s%%απόδειξη κατάθεσης 
-ValidateGeneratedDeposit=Επικυρώστε την κατάθεση που δημιουργήθηκε
-DepositGenerated=Δημιουργήθηκε κατάθεση
+ValidateGeneratedDeposit=Επικύρωση της κατάθεσης που δημιουργήθηκε
+DepositGenerated=Η κατάθεση δημιουργήθηκε 
 ErrorCanOnlyAutomaticallyGenerateADepositFromProposalOrOrder=Μπορείτε να δημιουργήσετε αυτόματα μια κατάθεση μόνο από μια πρόσφορα ή μια παραγγελία
-ErrorPaymentConditionsNotEligibleToDepositCreation=Οι επιλεγμένοι όροι πληρωμής δεν είναι κατάλληλοι για αυτόματη δημιουργία καταθέσεων
+ErrorPaymentConditionsNotEligibleToDepositCreation=Οι επιλεγμένοι όροι πληρωμής δεν είναι κατάλληλοι για αυτόματη δημιουργία κατάθεσης
 # PaymentType
 PaymentTypeVIR=Τραπεζική μεταφορά
 PaymentTypeShortVIR=Τραπεζική μεταφορά
-PaymentTypePRE=Direct debit payment order
-PaymentTypeShortPRE=Debit payment order
+PaymentTypePRE=Εντολή πληρωμής άμεσης χρέωσης
+PaymentTypePREdetails=(στο λογαριασμό *-%s)
+PaymentTypeShortPRE=Χρεωστική εντολή πληρωμής
 PaymentTypeLIQ=Μετρητά
 PaymentTypeShortLIQ=Μετρητά
 PaymentTypeCB=Πιστωτική κάρτα
 PaymentTypeShortCB=Πιστωτική κάρτα
 PaymentTypeCHQ=Επιταγή
 PaymentTypeShortCHQ=Επιταγή
-PaymentTypeTIP=TIP (Documents against Payment)
-PaymentTypeShortTIP=TIP Payment
+PaymentTypeTIP=TIP (Έγγραφα έναντι πληρωμής)
+PaymentTypeShortTIP=Πληρωμή TIP
 PaymentTypeVAD=Διαδικτυακή πληρωμή
 PaymentTypeShortVAD=Διαδικτυακή πληρωμή
-PaymentTypeTRA=Bank draft
-PaymentTypeShortTRA=Πρόχειρο
+PaymentTypeTRA=Προσχέδιο
+PaymentTypeShortTRA=Προσχέδιο
 PaymentTypeFAC=Παράγοντας
 PaymentTypeShortFAC=Παράγοντας
 PaymentTypeDC=Χρεωστική/Πιστωτική κάρτα
 PaymentTypePP=PayPal
-BankDetails=Πληροφορίες τράπεζας
+BankDetails=Στοιχεία τράπεζας
 BankCode=Κωδικός τράπεζας
 DeskCode=Κωδικός υποκαταστήματος
 BankAccountNumber=Αριθμός Λογαριασμού
-BankAccountNumberKey=Αθροιστικό Checksum
+BankAccountNumberKey=Checksum(άθροισμα ελέγχου)
 Residence=Διεύθυνση
-IBANNumber=Αριθμός λογαριασμού IBAN
+IBANNumber=IBAN Αριθμού λογαριασμού 
 IBAN=IBAN
 CustomerIBAN=IBAN πελάτη
 SupplierIBAN=IBAN προμηθευτή
 BIC=BIC/SWIFT
 BICNumber=Κωδικός BIC / SWIFT
 ExtraInfos=Επιπρόσθετες Πληροφορίες
-RegulatedOn=Ρυθμιζόμενη για
+RegulatedOn=Ρυθμίστηκαν την
 ChequeNumber=Αριθμός Επιταγής
 ChequeOrTransferNumber=Αρ. Επιταγής/Μεταφοράς
-ChequeBordereau=Check schedule
-ChequeMaker=Έλεγχος/Μεταφορά αποστολέα
+ChequeBordereau=Κατάσταση(λίστα) επιταγών
+ChequeMaker=Αποστολέας Επιταγής/Μεταφοράς
 ChequeBank=Τράπεζα Επιταγής
 CheckBank=Επιταγή
-NetToBePaid=Φόρος προς πληρωμή
+NetToBePaid=Καθαρό προς πληρωμή
 PhoneNumber=Τηλ
 FullPhoneNumber=Τηλέφωνο
-TeleFax=Φαξ
-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.
+TeleFax=Fax
+PrettyLittleSentence=Αποδεχτείτε το ποσό των πληρωμών που οφείλονται με επιταγές που εκδόθηκαν στο όνομά μου ως Μέλος λογιστικού συλλόγου εγκεκριμένου από τη Δημοσιονομική Διοίκηση.
 IntracommunityVATNumber=Ενδοκοινοτικό ΑΦΜ
-PaymentByChequeOrderedTo=Ελέγξτε τις πληρωμές (συμπεριλαμβανομένου του φόρου) καταβάλλονται στο %s, στείλτε στο
-PaymentByChequeOrderedToShort=Έλεγχος πληρωμών (συμπεριλαμβανομένου του φόρου) καταβάλλονται σε
+PaymentByChequeOrderedTo=Οι πληρωμές με επιταγή (συμπεριλαμβανομένου του φόρου) είναι πληρωτέες σε %s, αποστολή στο
+PaymentByChequeOrderedToShort=Οι πληρωμές με επιταγή (συμπεριλαμβανομένου του φόρου) ειναι καταβλητέες προς
 SendTo=Αποστολή σε
 PaymentByTransferOnThisBankAccount=Πληρωμή με μεταφορά στον ακόλουθο τραπεζικό λογαριασμό
-VATIsNotUsedForInvoice=* Non applicable VAT art-293B of CGI
-VATIsNotUsedForInvoiceAsso=* Μη εφαρμόσιμος Φ.Π.Α. art-261-7 of CGI
-LawApplicationPart1=By application of the law 80.335 of 12/05/80
+VATIsNotUsedForInvoice=* Μη εφαρμοστέο ΦΠΑ άρθρο-293B του CGI
+VATIsNotUsedForInvoiceAsso=* Μη εφαρμοστέο ΦΠΑ άρθρο-261-7 του CGI
+LawApplicationPart1=Με εφαρμογή του νόμου 80.335 της 12/05/80
 LawApplicationPart2=τα εμπορεύματα παραμένουν στην κυριότητα του
-LawApplicationPart3=ο πωλητής μέχρι την πλήρη πληρωμή του
+LawApplicationPart3=πωλητή μέχρι την πλήρη πληρωμή του
 LawApplicationPart4=η τιμή τους.
-LimitedLiabilityCompanyCapital=SARL with Capital of
+LimitedLiabilityCompanyCapital=SARL με Κεφάλαιο
 UseLine=Εφαρμογή
 UseDiscount=Χρήση έκπτωσης
 UseCredit=Χρήση πίστωσης
 UseCreditNoteInInvoicePayment=Μείωση ποσού πληρωμής με αυτή την πίστωση
-MenuChequeDeposits=Ελέγξτε τις καταθέσεις
+MenuChequeDeposits=Πληρωμές με επιταγή
 MenuCheques=Επιταγές
-MenuChequesReceipts=Ελέγξτε τις αποδείξεις
+MenuChequesReceipts=Αποδείξεις επιταγών
 NewChequeDeposit=Νέα κατάθεση
-ChequesReceipts=Ελέγξτε τις αποδείξεις
+ChequesReceipts=Αποδείξεις επιταγών
 ChequesArea=Τομέας επιταγών
-ChequeDeposits=Ελέγξτε τις καταθέσεις
+ChequeDeposits=Πληρωμές με επιταγή
 Cheques=Επιταγές
-DepositId=Id Κατάθεση
+DepositId=Αναγνωριστικό Κατάθεσης
 NbCheque=Αριθμός επιταγών
-CreditNoteConvertedIntoDiscount=This %s has been converted into %s
-UsBillingContactAsIncoiveRecipientIfExist=Χρησιμοποιήστε την επαφή / διεύθυνση με τον τύπο &quot;επαφή χρέωσης&quot; αντί για τη διεύθυνση τρίτων ως παραλήπτη τιμολογίων
+CreditNoteConvertedIntoDiscount=Αυτό το %s έχει μετατραπεί σε %s
+UsBillingContactAsIncoiveRecipientIfExist=Χρησιμοποιήστε επαφή/διεύθυνση με τον τύπο "επαφή χρέωσης" αντί για διεύθυνση τρίτου μέρους ως παραλήπτη για τα τιμολόγια
 ShowUnpaidAll=Εμφάνιση όλων των απλήρωτων τιμολογίων
 ShowUnpaidLateOnly=Εμφάνιση μόνο των καθυστερημένων απλήρωτων τιμολογίων
 PaymentInvoiceRef=Πληρωμή τιμολογίου %s
 ValidateInvoice=Επικύρωση τιμολογίου
-ValidateInvoices=Validate invoices
+ValidateInvoices=Επικύρωση τιμολογίων
 Cash=Μετρητά
 Reported=Με καθυστέρηση
 DisabledBecausePayments=Δεν είναι δυνατόν, δεδομένου ότι υπάρχουν ορισμένες πληρωμές
@@ -528,81 +529,81 @@ CantRemovePaymentWithOneInvoicePaid=Δεν μπορείτε να καταργή
 CantRemovePaymentVATPaid=Δεν είναι δυνατή η κατάργηση της πληρωμής, καθώς η δήλωση ΦΠΑ έχει ταξινομηθεί ως πληρωμένη
 CantRemovePaymentSalaryPaid=Δεν είναι δυνατή η κατάργηση της πληρωμής, καθώς ο μισθός ταξινομήθηκε ως πληρωμένος
 ExpectedToPay=Αναμενόμενη Πληρωμή
-CantRemoveConciliatedPayment=Δεν είναι δυνατή η κατάργηση της κοινής πληρωμής
+CantRemoveConciliatedPayment=Δεν είναι δυνατή η κατάργηση της συμφωνημένης πληρωμής
 PayedByThisPayment=Πληρωθείτε αυτό το ποσό
-ClosePaidInvoicesAutomatically=Ταξινόμηση αυτόματα όλα τα τυποποιημένα, προκαθορισμένα ή αντικαταστατικά τιμολόγια ως &quot;Πληρωμένα&quot; όταν η πληρωμή γίνει εξ ολοκλήρου.
-ClosePaidCreditNotesAutomatically=Ταξινόμηση αυτόματα όλες τις πιστωτικές σημειώσεις ως &quot;Πληρωθεί&quot; όταν η επιστροφή γίνεται εξ ολοκλήρου.
-ClosePaidContributionsAutomatically=Ταξινόμηση αυτόματα όλες τις κοινωνικές ή φορολογικές εισφορές ως &quot;Πληρωθεί&quot; όταν η πληρωμή γίνει εξ ολοκλήρου.
-ClosePaidVATAutomatically=Ταξινομήστε αυτόματα τη δήλωση ΦΠΑ ως «Εξοφλημένο» όταν η πληρωμή γίνει εξ ολοκλήρου.
+ClosePaidInvoicesAutomatically=Ταξινομήστε αυτόματα όλα τα τυπικά τιμολόγια, τα τιμολόγια προκαταβολής ή αντικατάστασης ως "Πληρωμένα" όταν η πληρωμή γίνει εξ ολοκλήρου.
+ClosePaidCreditNotesAutomatically=Ταξινομήστε αυτόματα όλα τα πιστωτικά σημειώματα ως "Πληρωμένα" όταν ολοκληρωθεί η επιστροφή χρημάτων.
+ClosePaidContributionsAutomatically=Αυτόματη ταξινόμηση όλων των κοινωνικών ή φορολογικών εισφορών ως "Πληρωμένες" όταν η πληρωμή γίνεται εξ ολοκλήρου.
+ClosePaidVATAutomatically=Ταξινομήστε αυτόματα τη δήλωση ΦΠΑ ως "Πληρωμένο" όταν η πληρωμή γίνει εξ ολοκλήρου.
 ClosePaidSalaryAutomatically=Ταξινομήστε αυτόματα τον μισθό ως "Πληρωμένο" όταν η πληρωμή γίνει εξ ολοκλήρου.
-AllCompletelyPayedInvoiceWillBeClosed=Όλα τα τιμολόγια που δεν πληρώνουν υπόλοιπο θα κλείσουν αυτόματα με την κατάσταση &quot;Πληρωμή&quot;.
+AllCompletelyPayedInvoiceWillBeClosed=Όλα τα τιμολόγια χωρίς υπόλοιπο προς πληρωμή θα κλείσουν αυτόματα στην κατάσταση "Πληρωμένο".
 ToMakePayment=Πληρωμή
-ToMakePaymentBack=Pay back
-ListOfYourUnpaidInvoices=Κατάλογος των απλήρωτων τιμολογίων
-NoteListOfYourUnpaidInvoices=Σημείωση: Αυτή η λίστα περιέχει μόνο τα τιμολόγια για λογαριασμό Πελ./Προμ. που συνδέονται με τον εκπρόσωπο πώλησης.
-RevenueStamp=Φορόσημο
-YouMustCreateInvoiceFromThird=Αυτή η επιλογή είναι διαθέσιμη μόνο όταν δημιουργείτε τιμολόγιο από την καρτέλα &quot;Πελάτης&quot; τρίτου μέρους
-YouMustCreateInvoiceFromSupplierThird=Αυτή η επιλογή είναι διαθέσιμη μόνο κατά τη δημιουργία τιμολογίου από την καρτέλα &quot;Προμηθευτής&quot; τρίτου μέρους
-YouMustCreateStandardInvoiceFirstDesc=You have to create a standard invoice first and convert it to "template" to create a new template invoice
-PDFCrabeDescription=Πρότυπο τιμολόγιο PDF Crabe. Ένα πλήρες πρότυπο τιμολογίου (παλιά εφαρμογή του προτύπου Sponge)
-PDFSpongeDescription=Τιμολόγιο πρότυπο PDF Σφουγγάρι. Ένα πλήρες πρότυπο τιμολογίου
-PDFCrevetteDescription=Invoice PDF template Crevette. A complete invoice template for situation invoices
-TerreNumRefModelDesc1=Επιστρέφει τη μορφή %syymm-nnnn για τυπικά τιμολόγια και %syymm-nnnn για πιστωτικές σημειώσεις όπου yy είναι έτος, mm είναι μήνας και nnnn είναι ένας διαδοχικός αριθμός αυτόματης αύξησης χωρίς διακοπή και χωρίς επιστροφή στο 0
-MarsNumRefModelDesc1=Επιστρέφει τη μορφή %syymm-nnnn για τυπικά τιμολόγια, %syymm-nnnn για τιμολόγια αντικατάστασης, %syymm-nnnn για τιμολόγια προκαταβολής και %syymm-nnnn για τιμολόγια αντικατάστασης, %syymm-nnnn για πιστωτικά τιμολόγια όπου yy είναι το έτος,mm ο μήνας και nnnn είναι ένας διαδοχικός αριθμός αυτόματης αύξησης χωρίς διακοπή και χωρίς επιστροφή στο 0
-TerreNumRefModelError=A bill starting with $syymm already exists and is not compatible with this model of sequence. Remove it or rename it to activate this module.
-CactusNumRefModelDesc1=Αριθμός επιστροφής με τη μορφή %syymm-nnnn για τυπικά τιμολόγια, %syymm-nnnn για πιστωτικά σημειώματα και %syymm-nnnn για τιμολόγια προκαταβολής όπου το yy είναι το έτος,mm ο μήνας και nnnn ένας διαδοχικός αριθμός αυτόματης αύξησης χωρίς διακοπή χωρίς επιστροφή στο 0
-EarlyClosingReason=Πρώιμος λόγος κλεισίματος
-EarlyClosingComment=Πρώιμο σημείωμα κλεισίματος
+ToMakePaymentBack=Επιστροφή χρημάτων
+ListOfYourUnpaidInvoices=Λίστα απλήρωτων τιμολογίων
+NoteListOfYourUnpaidInvoices=Σημείωση: Αυτή η λίστα περιέχει μόνο τιμολόγια για τρίτα μέρη με τα οποία είστε συνδεδεμένοι ως εκπρόσωπος πωλήσεων.
+RevenueStamp=Φορολογικό χαρτόσημο
+YouMustCreateInvoiceFromThird=Αυτή η επιλογή είναι διαθέσιμη μόνο κατά τη δημιουργία τιμολογίου από την καρτέλα "Πελάτης" τρίτου μέρους
+YouMustCreateInvoiceFromSupplierThird=Αυτή η επιλογή είναι διαθέσιμη μόνο κατά τη δημιουργία τιμολογίου από την καρτέλα "Προμηθευτής" τρίτου μέρους
+YouMustCreateStandardInvoiceFirstDesc=Πρέπει πρώτα να δημιουργήσετε ένα τυπικό τιμολόγιο και μετά να το μετατρέψετε σε "πρότυπο" για να δημιουργήσετε ένα νέο πρότυπο τιμολόγιο
+PDFCrabeDescription=Πρότυπο τιμολόγιο PDF Crabe. Ένα πλήρες πρότυπο τιμολογίου (παλιά υλοποίηση του προτύπου Sponge)
+PDFSpongeDescription=Πρότυπο PDF τιμολογίου Sponge. Ένα πλήρες πρότυπο τιμολογίου
+PDFCrevetteDescription=Πρότυπο PDF τιμολογίου Crevette. Ένα πλήρες πρότυπο τιμολογίου για τιμολόγια κατάστασης
+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=Επιστρέφει αριθμό της μορφής %syymm-nnnn για τυπικά τιμολόγια, %syymm-nnnn για πιστωτικά σημειώματα και %syymm-nnnn για αποδείξεις προκαταβολής όπου το yy είναι το έτος,mm ο μήνας και nnnn ένας διαδοχικός αριθμός αυτόματης αύξησης χωρίς διακοπή και χωρίς επιστροφή στο 0
+EarlyClosingReason=Λόγος πρόωρου κλεισίματος
+EarlyClosingComment=Σημείωση πρόωρου κλεισίματος
 ##### Types de contacts #####
-TypeContact_facture_internal_SALESREPFOLL=Representative following-up customer invoice
-TypeContact_facture_external_BILLING=Αντιπρόσωπος τιμολογίου πελάτη
-TypeContact_facture_external_SHIPPING=Αντιπρόσωπος αποστολής πελάτη
-TypeContact_facture_external_SERVICE=Αντιπρόσωπος υπηρεσίας πελάτη
-TypeContact_invoice_supplier_internal_SALESREPFOLL=Αντιπροσωπευτικό τιμολόγιο πωλητή
+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=Κατάσταση πρώτου τιμολογίου
-InvoiceFirstSituationDesc=Η <b>κατάσταση τιμολογίων</b> συνδέονται με καταστάσεις που σχετίζονται σε πρόοδο, για παράδειγμα, της προόδου μιας κατασκευής. Κάθε κατάσταση είναι συνδεδεμένη με ένα τιμολόγιο.
-InvoiceSituation=Κατάσταση τιμολογίου
-PDFInvoiceSituation=Κατάσταση τιμολογίου
+InvoiceFirstSituationDesc=Τα τιμολόγια καταστάσεων <b>τιμολόγια καταστάσεων </b> συνδέονται με καταστάσεις που σχετίζονται με μια εξέλιξη, για παράδειγμα την εξέλιξη μιας κατασκευής. Κάθε κατάσταση συνδέεται με ένα τιμολόγιο.
+InvoiceSituation=Τιμολόγιο κατάστασης
+PDFInvoiceSituation=Τιμολόγιο κατάστασης
 InvoiceSituationAsk=Τιμολόγιο που έπεται της κατάστασης
 InvoiceSituationDesc=Δημιουργία μιας νέας κατάστασης μετά από μια ήδη υπάρχουσα
-SituationAmount=Κατάσταση τιμολογίου ποσό (καθαρό)
+SituationAmount=Ποσό τιμολογίου κατάστασης (καθαρό)
 SituationDeduction=Αφαίρεση κατάστασης
-ModifyAllLines=Τροποποίηση σε όλες τις γραμμές
+ModifyAllLines=Τροποποίηση όλων των γραμμών
 CreateNextSituationInvoice=Δημιουργήστε την επόμενη κατάσταση
-ErrorFindNextSituationInvoice=Σφάλμα αδύνατο να βρεθεί ο επόμενος κύκλος περιπτ
-ErrorOutingSituationInvoiceOnUpdate=Δεν είναι δυνατή η εξόρυξη αυτού του τιμολογίου κατάστασης.
-ErrorOutingSituationInvoiceCreditNote=Δεν είναι δυνατή η εξόρυξη συνδεδεμένου πιστωτικού σημείου.
+ErrorFindNextSituationInvoice=Σφάλμα, αδυναμία εύρεσης αναφοράς κύκλου επόμενης κατάστασης
+ErrorOutingSituationInvoiceOnUpdate=Δεν είναι δυνατή η έκδοση αυτού του τιμολογίου κατάστασης.
+ErrorOutingSituationInvoiceCreditNote=Δεν είναι δυνατή η έξοδος συνδεδεμένου πιστωτικού σημειώματος.
 NotLastInCycle=Το τιμολόγιο δεν είναι το τελευταίο της σειράς και δεν πρέπει να τροποποιηθεί
 DisabledBecauseNotLastInCycle=Η επόμενη κατάσταση υπάρχει ήδη.
 DisabledBecauseFinal=Η κατάσταση αυτή είναι οριστική.
-situationInvoiceShortcode_AS=ΟΠΩΣ ΚΑΙ
+situationInvoiceShortcode_AS=ΤΚ
 situationInvoiceShortcode_S=Κ
 CantBeLessThanMinPercent=Η πρόοδος δεν μπορεί να είναι μικρότερη από την αξία του στην προηγούμενη κατάσταση.
 NoSituations=Δεν υπάρχουν ανοικτές καταστάσεις
 InvoiceSituationLast=Τελικό και γενικό τιμολόγιο
 PDFCrevetteSituationNumber=Κατάσταση N°%s
-PDFCrevetteSituationInvoiceLineDecompte=Situation invoice - COUNT
-PDFCrevetteSituationInvoiceTitle=Κατάσταση τιμολογίου
-PDFCrevetteSituationInvoiceLine=Κατάσταση Αριθ. %s: Inv. Αριθ. %s για %s
-TotalSituationInvoice=Συνολική κατάσταση
-invoiceLineProgressError=Invoice line progress can't be greater than or equal to the next invoice line
+PDFCrevetteSituationInvoiceLineDecompte=Τιμολόγιο κατάστασης - COUNT
+PDFCrevetteSituationInvoiceTitle=Τιμολόγιο κατάστασης
+PDFCrevetteSituationInvoiceLine=Κατάσταση N°%s: Τιμ. N°%s σε %s
+TotalSituationInvoice=Σύνολο κατάστασης
+invoiceLineProgressError=Η πρόοδος της γραμμής τιμολογίου δεν μπορεί να είναι μεγαλύτερη ή ίση με την επόμενη γραμμή τιμολογίου
 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>.
+ToCreateARecurringInvoice=Για να δημιουργήσετε ένα επαναλαμβανόμενο τιμολόγιο για αυτήν τη σύμβαση, δημιουργήστε πρώτα αυτό το προσχέδιο τιμολογίου, στη συνέχεια μετατρέψτε το σε πρότυπο τιμολογίου και καθορίστε τη συχνότητα δημιουργίας μελλοντικών τιμολογίων.
+ToCreateARecurringInvoiceGene=Για να δημιουργείτε μελλοντικά τιμολόγια τακτικά και μη αυτόματα, απλώς μεταβείτε στο μενού <strong> %s - %s - %s </strong> .
 ToCreateARecurringInvoiceGeneAuto=Αν χρειαστεί να δημιουργήσετε αυτομάτως τέτοιου είδους τιμολόγια, ζητήστε από τον διαχειριστή σας να ενεργοποιήσει και να ρυθμίσει την ενότητα <strong>%s</strong> . Λάβετε υπόψη ότι και οι δύο μέθοδοι (χειροκίνητες και αυτόματες) μπορούν να χρησιμοποιηθούν χωρίς να υπάρχει κίνδυνος επανάληψης.
-DeleteRepeatableInvoice=Delete template invoice
-ConfirmDeleteRepeatableInvoice=Are your sure you want to delete the template invoice?
+DeleteRepeatableInvoice=Διαγραφή προτύπου τιμολογίου
+ConfirmDeleteRepeatableInvoice=Είστε σίγουροι ότι θέλετε να διαγράψετε το πρότυπο τιμολόγιο;
 CreateOneBillByThird=Δημιουργία ενός τιμολογίου ανά τρίτο μέρος (διαφορετικά, ένα τιμολόγιο ανά επιλεγμένο αντικείμενο)
-BillCreated=%s τιμολόγιο(α) δημιουργήθηκε(αν)
+BillCreated=Δημιουργία %s τιμολογίου(ων)
 BillXCreated=Δημιουργήθηκε το τιμολόγιο %s
 StatusOfGeneratedDocuments=Κατάσταση δημιουργίας εγγράφων
-DoNotGenerateDoc=Μην δημιουργείτε αρχείο εγγράφων
+DoNotGenerateDoc=Μην δημιουργείτε αρχείο εγγράφου
 AutogenerateDoc=Αυτόματη δημιουργία αρχείου εγγράφου
-AutoFillDateFrom=Ορίστε την ημερομηνία έναρξης για γραμμή υπηρεσιών με ημερομηνία τιμολόγησης
+AutoFillDateFrom=Ορίστε ως ημερομηνία έναρξης για τη γραμμή εξυπηρέτησης την ημερομηνία τιμολογίου
 AutoFillDateFromShort=Ορίστε την ημερομηνία έναρξης
 AutoFillDateTo=Ορίστε την ημερομηνία λήξης της γραμμής εξυπηρέτησης με την επόμενη ημερομηνία τιμολόγησης
 AutoFillDateToShort=Ορίστε την ημερομηνία λήξης
@@ -612,7 +613,7 @@ BILL_SUPPLIER_DELETEInDolibarr=Το τιμολόγιο προμηθευτή δι
 UnitPriceXQtyLessDiscount=Τιμή μονάδας x Ποσότητα - Έκπτωση
 CustomersInvoicesArea=Τομέας τιμολόγησης πελατών
 SupplierInvoicesArea=Τομέας τιμολόγησης προμηθευτών
-SituationTotalRayToRest=Υπενθύμιση πληρωμής χωρίς φόρο
+SituationTotalRayToRest=Το υπόλοιπο προς πληρωμή χωρίς Φ.Π.Α.
 PDFSituationTitle=Κατάσταση αρ. %d
 SituationTotalProgress=Συνολική πρόοδος %d %%
 SearchUnpaidInvoicesWithDueDate=Αναζήτηση απλήρωτων τιμολογίων με ημερομηνία λήξης = %s
diff --git a/htdocs/langs/en_GB/admin.lang b/htdocs/langs/en_GB/admin.lang
index d185f42b80b..40504938dbe 100644
--- a/htdocs/langs/en_GB/admin.lang
+++ b/htdocs/langs/en_GB/admin.lang
@@ -39,11 +39,12 @@ UMaskExplanation=This parameter allows you to define permissions set by default
 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:
+InitEmptyBarCode=Init value for the %s empty barcodes
 Module50200Name=PayPal
 DictionaryAccountancyJournal=Finance journals
 CompanyZip=Postcode
 LDAPFieldZip=Postcode
 GenbarcodeLocation=Barcode generation command line tool (used by internal engine for some bar code types). Must be compatible with "genbarcode".<br>For example: /usr/local/bin/genbarcode
 FormatZip=Postcode
-OperationParamDesc=Define the rules to use to extract or set values.<br>Example for operations that need to extract a name from email subject:<br>name=EXTRACT:SUBJECT:Message from company ([^\n]*)<br>Example for operations that create objects:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value including value of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
+OperationParamDesc=Define the rules to use to extract some data or set values to use for operation.<br><br>Example to extract a company name from email subject into a temporary variable:<br>tmp_var=EXTRACT:SUBJECT:Message from company ([^\n]*)<br><br>Examples to set the properties of an object to create:<br>objproperty1=SET:a hard coded value<br>objproperty2=SET:__tmp_var__<br>objproperty3=SETIFEMPTY:a value (value is set only if property is not already defined)<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
 EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it.<br>For example, if you want to create a thirdparty with a name extracted from a string 'Name: name to find' present into the body, use the sender email as email, you can set the parameter field like this:<br>'email=HEADER:^From:(.*);name=EXTRACT:BODY:Name:\\s([^\\s]*);client=SET:2;'<br>
diff --git a/htdocs/langs/es_AR/admin.lang b/htdocs/langs/es_AR/admin.lang
index d4c97462b25..76c93629d16 100644
--- a/htdocs/langs/es_AR/admin.lang
+++ b/htdocs/langs/es_AR/admin.lang
@@ -252,6 +252,7 @@ UpdateServerOffline=Actualizar servidor fuera de línea
 WithCounter=Administrar un contador
 AddCRIfTooLong=No hay ajuste de texto automático. El texto que es demasiado largo no será mostrado en el documento.  Por favor agregar saltos de línea en el área de texto si es necesario.
 String=Cuerda
+InitEmptyBarCode=Init value for the %s empty barcodes
 Module30Name=Facturas
 Module40Desc=Gestión de proveedores y compras (órdenes de compra y facturas de proveedores)
 Module52Name=Inventarios(Stocks)
@@ -532,6 +533,7 @@ MailToSendSupplierRequestForQuotation=Solicitud de presupuesto
 MailToSendSupplierOrder=Ordenes de compra
 MailToSendSupplierInvoice=Facturas de proveedores
 MailToSendContract=Los contratos
+MailToExpenseReport=Informe de gastos
 MailToProject=Projectos
 ByDefaultInList=Mostrar por defecto en la vista de lista
 YouUseLastStableVersion=Usas la última versión estable
@@ -588,7 +590,7 @@ EmailCollectorConfirmCollectTitle=Correo electrónico recoger confirmación
 NoNewEmailToProcess=No hay correo electrónico nuevo (filtros coincidentes) para procesar
 CodeLastResult=Último código de resultado
 ECMAutoTree=Mostrar arbol ECM automatico
-OperationParamDesc=Define the rules to use to extract or set values.<br>Example for operations that need to extract a name from email subject:<br>name=EXTRACT:SUBJECT:Message from company ([^\n]*)<br>Example for operations that create objects:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value including value of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
+OperationParamDesc=Define the rules to use to extract some data or set values to use for operation.<br><br>Example to extract a company name from email subject into a temporary variable:<br>tmp_var=EXTRACT:SUBJECT:Message from company ([^\n]*)<br><br>Examples to set the properties of an object to create:<br>objproperty1=SET:a hard coded value<br>objproperty2=SET:__tmp_var__<br>objproperty3=SETIFEMPTY:a value (value is set only if property is not already defined)<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
 ResourceSetup=Configuración del módulo de recursos
 UseSearchToSelectResource=Use un formulario de búsqueda para elegir un recurso (en lugar de una lista desplegable).
 DisabledResourceLinkUser=Deshabilitar la función para vincular un recurso a los usuarios
diff --git a/htdocs/langs/es_CL/admin.lang b/htdocs/langs/es_CL/admin.lang
index 9c16cf60e83..aa792dc23db 100644
--- a/htdocs/langs/es_CL/admin.lang
+++ b/htdocs/langs/es_CL/admin.lang
@@ -340,6 +340,7 @@ DefaultLink=Enlace predeterminado
 ValueOverwrittenByUserSetup=Advertencia, este valor puede ser sobrescrito por la configuración específica del usuario (cada usuario puede establecer su propia URL de clicktodial)
 BarcodeInitForProductsOrServices=Inicialización o reinicio masivo del código de barras para productos o servicios
 CurrentlyNWithoutBarCode=Actualmente, tiene <strong>%s</strong> registros en <strong>%s</strong> %s sin código de barras definido.
+InitEmptyBarCode=Init value for the %s empty barcodes
 EraseAllCurrentBarCode=Borrar todos los valores actuales del código de barras
 ConfirmEraseAllCurrentBarCode=¿Seguro que quieres borrar todos los valores actuales del código de barras?
 AllBarcodeReset=Todos los valores del código de barras han sido eliminados
@@ -1276,6 +1277,7 @@ MailToSendInvoice=Facturas de cliente
 MailToSendSupplierRequestForQuotation=Solicitud de presupuesto
 MailToSendSupplierOrder=Ordenes de compra
 MailToSendSupplierInvoice=Facturas del vendedor
+MailToExpenseReport=Reporte de gastos
 ByDefaultInList=Mostrar de forma predeterminada en la vista de lista
 YouUseLastStableVersion=Usas la última versión estable
 TitleExampleForMajorRelease=Ejemplo de mensaje que puede usar para anunciar esta versión principal (no dude en utilizarla en sus sitios web)
@@ -1339,7 +1341,7 @@ NbOfEmailsInInbox=Número de correos electrónicos en el directorio de origen
 LoadThirdPartyFromName=Cargar búsqueda de terceros en %s (solo carga)
 LoadThirdPartyFromNameOrCreate=Cargar búsqueda de terceros en %s (crear si no se encuentra)
 ECMAutoTree=Mostrar arbol ECM automatico
-OperationParamDesc=Define the rules to use to extract or set values.<br>Example for operations that need to extract a name from email subject:<br>name=EXTRACT:SUBJECT:Message from company ([^\n]*)<br>Example for operations that create objects:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value including value of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
+OperationParamDesc=Define the rules to use to extract some data or set values to use for operation.<br><br>Example to extract a company name from email subject into a temporary variable:<br>tmp_var=EXTRACT:SUBJECT:Message from company ([^\n]*)<br><br>Examples to set the properties of an object to create:<br>objproperty1=SET:a hard coded value<br>objproperty2=SET:__tmp_var__<br>objproperty3=SETIFEMPTY:a value (value is set only if property is not already defined)<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
 OpeningHoursDesc=Introduzca aquí el horario habitual de apertura de su empresa.
 ResourceSetup=Configuración del módulo de recursos
 UseSearchToSelectResource=Use un formulario de búsqueda para elegir un recurso (en lugar de una lista desplegable).
diff --git a/htdocs/langs/es_CL/install.lang b/htdocs/langs/es_CL/install.lang
index e78c1cc8aea..9bc3060c806 100644
--- a/htdocs/langs/es_CL/install.lang
+++ b/htdocs/langs/es_CL/install.lang
@@ -34,7 +34,6 @@ ServerAddressDescription=Nombre o dirección IP para el servidor de la base de d
 ServerPortDescription=Puerto del servidor de base de datos Mantente vacío si desconocido.
 DatabasePrefix=Prefijo de tabla de base de datos
 AdminLogin=Cuenta de usuario para el propietario de la base de datos Dolibarr.
-PasswordAgain=Vuelva a escribir la confirmación de la contraseña
 AdminPassword=Contraseña para el propietario de la base de datos Dolibarr.
 CreateDatabase=Crear base de datos
 CreateUser=Cree una cuenta de usuario o otorgue permiso de cuenta de usuario en la base de datos de Dolibarr
diff --git a/htdocs/langs/es_CO/admin.lang b/htdocs/langs/es_CO/admin.lang
index 91a01d2e5db..d6fec62304b 100644
--- a/htdocs/langs/es_CO/admin.lang
+++ b/htdocs/langs/es_CO/admin.lang
@@ -362,6 +362,7 @@ ValueOverwrittenByUserSetup=Advertencia, este valor puede ser sobrescrito por la
 BarcodeInitForThirdparties=init para código de barras masivo para terceros
 BarcodeInitForProductsOrServices=Código de barras masivo de inicio o reinicio para productos o servicios.
 CurrentlyNWithoutBarCode=Actualmente, tienes el registro <strong> %s </strong> en <strong> %s </strong> %s sin un código de barras definido.
+InitEmptyBarCode=Init value for the %s empty barcodes
 EraseAllCurrentBarCode=Borrar todos los valores de código de barras actuales
 ConfirmEraseAllCurrentBarCode=¿Está seguro de que desea borrar todos los valores de código de barras actuales?
 AllBarcodeReset=Todos los valores de código de barras han sido eliminados
@@ -1493,6 +1494,7 @@ MailToSendSupplierRequestForQuotation=Solicitud de presupuesto
 MailToSendSupplierOrder=Ordenes de compra
 MailToSendSupplierInvoice=Facturas de proveedores
 MailToSendContract=Los contratos
+MailToExpenseReport=Reporte de gastos
 ByDefaultInList=Mostrar por defecto en la vista de lista
 YouUseLastStableVersion=Usas la última versión estable
 TitleExampleForMajorRelease=Ejemplo de mensaje que puede usar para anunciar esta versión principal (siéntase libre de usarlo en sus sitios web)
@@ -1572,7 +1574,7 @@ WithDolTrackingID=Mensaje de una conversación iniciada por un primer correo ele
 WithoutDolTrackingID=Mensaje de una conversación iniciada por un primer correo electrónico NO enviado desde Dolibarr
 MainMenuCode=Código de entrada de menú (menú principal)
 ECMAutoTree=Mostrar árbol ECM automático
-OperationParamDesc=Defina las reglas que se utilizarán para extraer o establecer valores. <br> Ejemplo de operaciones que necesitan extraer un nombre del asunto del correo electrónico: <br> nombre=EXTRACT:SUBJECT:Mensaje de la empresa ([^\n] *) <br> Ejemplo para las operaciones que crean objetos: <br>objproperty1=SET: el valor puesto <br>objproperty2=SET: un valor incluyendo el valor de __objproperty1__ <br> objproperty3=SETIFEMPTY: valor utilizado si objproperty3 no está ya definido <br> objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*) <br> options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*) <br> object.objproperty5=EXTRACT:BODY:El nombre de mi empresa es\\s( [^\\s]*) <br> <br> Use un ; char como separador para extraer o establecer varias propiedades.
+OperationParamDesc=Define the rules to use to extract some data or set values to use for operation.<br><br>Example to extract a company name from email subject into a temporary variable:<br>tmp_var=EXTRACT:SUBJECT:Message from company ([^\n]*)<br><br>Examples to set the properties of an object to create:<br>objproperty1=SET:a hard coded value<br>objproperty2=SET:__tmp_var__<br>objproperty3=SETIFEMPTY:a value (value is set only if property is not already defined)<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
 OpeningHours=Horario de oficina
 OpeningHoursDesc=Introduzca aquí el horario habitual de trabajo/servicio de su empresa.
 ResourceSetup=Configuración del módulo de recursos
diff --git a/htdocs/langs/es_CO/install.lang b/htdocs/langs/es_CO/install.lang
index 137155f8791..aa4def46f84 100644
--- a/htdocs/langs/es_CO/install.lang
+++ b/htdocs/langs/es_CO/install.lang
@@ -37,7 +37,6 @@ ServerAddressDescription=Nombre o dirección IP para el servidor de base de dato
 ServerPortDescription=Puerto del servidor de base de datos. Mantener vacío si se desconoce.
 DatabasePrefix=Prefijo de tabla de base de datos
 AdminLogin=Cuenta de usuario para el propietario de la base de datos Dolibarr.
-PasswordAgain=Vuelva a escribir la confirmación de la contraseña
 AdminPassword=Contraseña para el propietario de la base de datos Dolibarr.
 CreateDatabase=Crear base de datos
 CreateUser=Cree una cuenta de usuario o otorgue permiso de cuenta de usuario en la base de datos de Dolibarr
diff --git a/htdocs/langs/es_EC/admin.lang b/htdocs/langs/es_EC/admin.lang
index db2124e23b8..96820c4587e 100644
--- a/htdocs/langs/es_EC/admin.lang
+++ b/htdocs/langs/es_EC/admin.lang
@@ -335,7 +335,7 @@ ValueOverwrittenByUserSetup=Advertencia: este valor puede ser sobrescrito por la
 BarcodeInitForThirdparties=Inicio masivo de código de barras para terceros.
 BarcodeInitForProductsOrServices=Inicio de código de barras masivo o restablecimiento de productos o servicios
 CurrentlyNWithoutBarCode=Actualmente, tiene <strong> %s </strong> registrado en <strong> %s </strong> %s sin código de barras definido.
-InitEmptyBarCode=init valor para el siguiente %s registro vacío
+InitEmptyBarCode=Init value for the %s empty barcodes
 EraseAllCurrentBarCode=Borrar todos los valores de códigos de barras actuales
 ConfirmEraseAllCurrentBarCode=¿Está seguro de que desea borrar todos los valores de códigos de barras actuales?
 AllBarcodeReset=Todos los valores de código de barras se han eliminado
@@ -1333,6 +1333,7 @@ MailToSendShipment=Envios
 MailToSendSupplierRequestForQuotation=Solicitud de presupuesto / cotización
 MailToSendSupplierOrder=Ordenes de compra
 MailToSendSupplierInvoice=Facturas del vendedor / proveedor
+MailToExpenseReport=Reporte de gastos
 MailToThirdparty=Clientes / Proveedores
 ByDefaultInList=Mostrar de forma predeterminada en la vista de lista
 YouUseLastStableVersion=Utiliza la última versión estable
@@ -1397,7 +1398,7 @@ NbOfEmailsInInbox=Número de correos electrónicos en el directorio de origen
 LoadThirdPartyFromName=Cargue la búsqueda de terceros en %s (solo carga)
 LoadThirdPartyFromNameOrCreate=Cargue la búsqueda de terceros en %s (crear si no se encuentra)
 ECMAutoTree=Mostrar arbol ECM automatico
-OperationParamDesc=Define the rules to use to extract or set values.<br>Example for operations that need to extract a name from email subject:<br>name=EXTRACT:SUBJECT:Message from company ([^\n]*)<br>Example for operations that create objects:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value including value of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
+OperationParamDesc=Define the rules to use to extract some data or set values to use for operation.<br><br>Example to extract a company name from email subject into a temporary variable:<br>tmp_var=EXTRACT:SUBJECT:Message from company ([^\n]*)<br><br>Examples to set the properties of an object to create:<br>objproperty1=SET:a hard coded value<br>objproperty2=SET:__tmp_var__<br>objproperty3=SETIFEMPTY:a value (value is set only if property is not already defined)<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
 OpeningHoursDesc=Ingrese aquí los horarios regulares de su empresa.
 ResourceSetup=Configuración del módulo de recursos
 UseSearchToSelectResource=Use un formulario de búsqueda para elegir un recurso (en lugar de una lista desplegable).
diff --git a/htdocs/langs/es_EC/install.lang b/htdocs/langs/es_EC/install.lang
index 97e3b8346ca..f50b423e828 100644
--- a/htdocs/langs/es_EC/install.lang
+++ b/htdocs/langs/es_EC/install.lang
@@ -37,7 +37,6 @@ ServerAddressDescription=Nombre o dirección IP para el servidor de base de dato
 ServerPortDescription=Puerto del servidor de base de datos. Manténgase vacío si es desconocido.
 DatabasePrefix=Prefijo de tabla de base de datos
 AdminLogin=Cuenta de usuario para el propietario de la base de datos Dolibarr.
-PasswordAgain=Vuelva a escribir la confirmación de la contraseña
 AdminPassword=Contraseña para el propietario de la base de datos de Dolibarr.
 CreateDatabase=Crear base de datos
 CreateUser=Cree una cuenta de usuario o otorgue permiso de cuenta de usuario en la base de datos de Dolibarr
diff --git a/htdocs/langs/es_ES/accountancy.lang b/htdocs/langs/es_ES/accountancy.lang
index 31819bb6355..93133071f7b 100644
--- a/htdocs/langs/es_ES/accountancy.lang
+++ b/htdocs/langs/es_ES/accountancy.lang
@@ -48,8 +48,9 @@ CountriesNotInEEC=Países no incluidos en la CEE
 CountriesInEECExceptMe=Países en la CEE excepto %s
 CountriesExceptMe=Todos los países excepto %s
 AccountantFiles=Exportar documentos de origen
-ExportAccountingSourceDocHelp=Con esta herramienta, puede exportar los eventos de origen (lista en CSV y PDF) que se utilizan para generar su contabilidad.
+ExportAccountingSourceDocHelp=Con esta herramienta, puede buscar y exportar los eventos de origen que se utilizan para generar su contabilidad. <br> El archivo ZIP exportado contendrá las listas de artículos solicitados en CSV, así como sus archivos adjuntos en su formato original (PDF, ODT, DOCX...).
 ExportAccountingSourceDocHelp2=Para exportar sus diarios, use la entrada de menú %s - %s.
+ExportAccountingProjectHelp=Especifique un proyecto si necesita un informe contable solo para un proyecto específico. Los informes de gastos y los pagos de préstamos no se incluyen en los informes de proyectos.
 VueByAccountAccounting=Ver por cuenta contable
 VueBySubAccountAccounting=Ver por subcuenta contable
 
@@ -183,6 +184,8 @@ ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT=Cuenta contable para registrar subscripc
 
 ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT=Cuenta contable por defecto para registrar el anticipo del cliente
 UseAuxiliaryAccountOnCustomerDeposit=Almacene la cuenta del cliente como cuenta individual en el libro mayor auxiliar para las líneas de anticipos (si está deshabilitada, la cuenta individual para las líneas de anticipos permanecerá vacía)
+ACCOUNTING_ACCOUNT_SUPPLIER_DEPOSIT=Cuenta contable por defecto para registrar depósito de proveedor
+UseAuxiliaryAccountOnSupplierDeposit=Almacene la cuenta del proveedor como cuenta individual en el libro mayor auxiliar para las líneas de anticipos (si está deshabilitada, la cuenta individual para las líneas de anticipos permanecerá vacía)
 
 ACCOUNTING_PRODUCT_BUY_ACCOUNT=Cuenta contable predeterminada para los productos comprados (usada si no se define en el producto)
 ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT=Cuenta contable por defecto para los productos comprados en CEE (usada si no se define en el producto)
@@ -332,7 +335,7 @@ ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS=Desactive la vinculación y transfe
 
 ## Export
 NotifiedExportDate=Marcar las líneas exportadas como Exportadas <span class="warning"> (para modificar una línea, deberá eliminar toda la transacción y volver a transferirla a contabilidad) </span>
-NotifiedValidationDate=Validar y bloquear las entradas exportadas <span class="warning">(mismo efecto que la función "Cierre", no será posible DEFINITIVAMENTE la modificación y eliminación de las líneas)</span>
+NotifiedValidationDate=Valide y bloquee las entradas exportadas <span class="warning"> (mismo efecto que la función "%s", la modificación y eliminación de las líneas DEFINITIVAMENTE no será posible) </span>
 DateValidationAndLock=Validación de fecha y bloqueo
 ConfirmExportFile=¿Confirmación de la generación del archivo de exportación contable?
 ExportDraftJournal=Exportar libro borrador
diff --git a/htdocs/langs/es_ES/admin.lang b/htdocs/langs/es_ES/admin.lang
index de25207efd4..224ab677fd3 100644
--- a/htdocs/langs/es_ES/admin.lang
+++ b/htdocs/langs/es_ES/admin.lang
@@ -477,7 +477,7 @@ InstalledInto=Instalado en el directorio %s
 BarcodeInitForThirdparties=Inicialización masiva de códigos de barras para terceros
 BarcodeInitForProductsOrServices=Inicio masivo de código de barras para productos o servicios
 CurrentlyNWithoutBarCode=Actualmente tiene <strong>%s</strong> registros de <strong>%s</strong> %s sin código de barras definido.
-InitEmptyBarCode=Iniciar valor para los %s registros vacíos
+InitEmptyBarCode=Valor inicial para los códigos de barras vacíos %s
 EraseAllCurrentBarCode=Eliminar todos los valores actuales de códigos de barras
 ConfirmEraseAllCurrentBarCode=¿Está seguro de querer eliminar todos los registros actuales de códigos de barras?
 AllBarcodeReset=Todos los códigos de barras han sido eliminados
@@ -714,6 +714,7 @@ Permission27=Eliminar presupuestos
 Permission28=Exportar los presupuestos
 Permission31=Consultar productos
 Permission32=Crear/modificar productos
+Permission33=Leer precios de productos
 Permission34=Eliminar productos
 Permission36=Ver/gestionar los productos ocultos
 Permission38=Exportar productos
@@ -739,6 +740,7 @@ Permission79=Crear/modificar cotizaciones
 Permission81=Consultar pedidos de clientes
 Permission82=Crear/modificar pedidos de clientes
 Permission84=Validar pedidos de clientes
+Permission85=Generar los documentos de órdenes de venta.
 Permission86=Enviar pedidos de clientes
 Permission87=Cerrar pedidos de clientes
 Permission88=Anular pedidos de clientes
@@ -874,6 +876,7 @@ Permission525=Calculadora de crédito
 Permission527=Exportar crédito
 Permission531=Consultar servicios
 Permission532=Crear/modificar servicios
+Permission533=Leer precios de servicios
 Permission534=Eliminar servicios
 Permission536=Ver/gestionar los servicios ocultos
 Permission538=Exportar servicios
@@ -1235,6 +1238,7 @@ BrowserName=Nombre del navegador
 BrowserOS=S.O. del navegador
 ListOfSecurityEvents=Listado de eventos de seguridad Dolibarr
 SecurityEventsPurged=Eventos de seguridad purgados
+TrackableSecurityEvents=Eventos de seguridad rastreables
 LogEventDesc=Activa el registro de eventos de seguridad aquí. Los administradores pueden ver su contenido a través de menú <b>%s-%s</b>.Atención, esta característica puede consumir una gran cantidad de datos en la base de datos.
 AreaForAdminOnly=Los parámetros de configuración solamente pueden ser tratados por <b>usuarios administrador</b>
 SystemInfoDesc=La información del sistema es información técnica accesible solamente en solo lectura a los administradores.
@@ -1977,6 +1981,7 @@ MailToSendSupplierOrder=Pedidos a proveedor
 MailToSendSupplierInvoice=Facturas proveedor
 MailToSendContract=Contratos
 MailToSendReception=Recepciones
+MailToExpenseReport=Gastos
 MailToThirdparty=Terceros
 MailToMember=Miembros
 MailToUser=Usuarios
@@ -2030,6 +2035,7 @@ MAIN_PDF_MARGIN_RIGHT=Margen derecho en PDF
 MAIN_PDF_MARGIN_TOP=Margen superior en PDF
 MAIN_PDF_MARGIN_BOTTOM=Margen inferior en PDF
 MAIN_DOCUMENTS_LOGO_HEIGHT=Altura del logo en PDF
+DOC_SHOW_FIRST_SALES_REP=Mostrar primer representante de ventas
 MAIN_GENERATE_PROPOSALS_WITH_PICTURE=Añadir una columna para una imagen en las líneas de presupuesto
 MAIN_DOCUMENTS_WITH_PICTURE_WIDTH=Ancho de la columna si se añade una imagen en las líneas
 MAIN_PDF_NO_SENDER_FRAME=Ocultar bordes en el marco de la dirección del emisor
@@ -2063,6 +2069,12 @@ EmailCollectors=Recolectores de correo electrónico
 EmailCollectorDescription=Añade una tarea programada y una página de configuración para escanear los buzones de e-mail con regularidad (utilizando el protocolo IMAP) y registra los e-mails recibidos en su aplicación, en el lugar correcto y/o crea registros automáticamente (como leads).
 NewEmailCollector=Nuevo recolector de e-mail
 EMailHost=Host del servidor de e-mail IMAP
+EMailHostPort=Puerto de correo electrónico servidor IMAP
+loginPassword=Contraseña de inicio de sesión
+oauthToken=Token Oauth2
+accessType=Tipo de acceso
+oauthService=Servicio de autenticación
+TokenMustHaveBeenCreated=El módulo OAuth2 debe estar habilitado y se debe haber creado un token oauth2 con los permisos correctos (por ejemplo, alcance "gmail_full" con OAuth para Gmail).
 MailboxSourceDirectory=Directorio fuente del buzón
 MailboxTargetDirectory=Directorio de destino del buzón
 EmailcollectorOperations=Operaciones a realizar por el colector
@@ -2106,7 +2118,7 @@ CreateCandidature=Crear solicitud de empleo
 FormatZip=Código postal
 MainMenuCode=Código de entrada del menú (menú principal)
 ECMAutoTree=Mostrar arbol automático GED
-OperationParamDesc=Defina las reglas que se utilizarán para extraer o establecer valores. <br> Ejemplo de operaciones que necesitan extraer un nombre del asunto del correo electrónico: <br> name=EXTRACT:SUBJECT:Mensaje de la empresa([^\n] *) <br>Ejemplo para las operaciones que crean objetos: <br>objproperty1=SET: el valor a establecer <br> objproperty2=SET: un valor incluyendo el valor de __objproperty1__<br>objproperty3=SETIFEMPTY: valor utilizado si objproperty3 no está ya definido <br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:El nombre de mi empresa es\\s( [^\\s]*) <br><br> Use un ; como separador para extraer o establecer varias propiedades.
+OperationParamDesc=Defina las reglas que se utilizarán para extraer algunos datos o establecer los valores que se utilizarán para la operación. <br> <br> Ejemplo para extraer el nombre de una empresa del asunto del correo electrónico en una variable temporal: <br> tmp_var=EXTRACT:ASUNTO:Mensaje de la empresa ([^\n]*) <br> <br> Ejemplos para establecer las propiedades de un objeto para crear: <br> objproperty1=SET:un valor codificado de forma rígida <br> objproperty2=SET:__tmp_var__ <br> objproperty3=SETIFEMPTY: valor solo si la propiedad no está definida <br> objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*) <br> options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*) <br> object.objproperty5=EXTRACT:BODY: El nombre de la empresa es\\s([^\\s]*) <br> <br> Utilice el caracter ; como separador para extraer o establecer varias propiedades.
 OpeningHours=Horario de apertura
 OpeningHoursDesc=Teclea el horario normal de apertura de tu compañía.
 ResourceSetup=Configuración del módulo Recursos
@@ -2212,6 +2224,7 @@ NoExternalModuleWithUpdate=No se encontraron actualizaciones para módulos exter
 SwaggerDescriptionFile=Archivo de descripción de la API de Swagger (para usar con redoc, por ejemplo)
 YouEnableDeprecatedWSAPIsUseRESTAPIsInstead=Habilitó la API WS obsoleta. En su lugar, debería utilizar la API REST.
 RandomlySelectedIfSeveral=Seleccionado aleatoriamente si hay varias imágenes disponibles
+SalesRepresentativeInfo=Para Propuestas, Pedidos, Facturas.
 DatabasePasswordObfuscated=La contraseña de la base de datos está oculta en el archivo conf
 DatabasePasswordNotObfuscated=La contraseña de la base de datos NO está oculta en el archivo conf
 APIsAreNotEnabled=Los módulos de API no están habilitados
@@ -2277,5 +2290,20 @@ INVOICE_ADD_ZATCA_QR_CODEMore=Algunos países árabes necesitan este código QR
 INVOICE_ADD_SWISS_QR_CODE=Mostrar el código QR-Bill suizo en las facturas
 UrlSocialNetworksDesc=Enlace URL de la red social. Use {socialid} para la parte variable que contiene la identificación de la red social.
 IfThisCategoryIsChildOfAnother=Si esta categoría es hija de otra
+DarkThemeMode=Modo de tema oscuro
+AlwaysDisabled=Siempre deshabilitado
+AccordingToBrowser=Según navegador
+AlwaysEnabled=Siempre habilitado
+DoesNotWorkWithAllThemes=No funcionará con todos los temas.
 NoName=Sin nombre
+ShowAdvancedOptions= Mostrar opciones avanzadas
+HideAdvancedoptions= Ocultar opciones avanzadas
 CIDLookupURL=El módulo trae una URL que puede ser utilizada por una herramienta externa para obtener el nombre de un tercero o contacto a partir de su número de teléfono. La URL a utilizar es:
+OauthNotAvailableForAllAndHadToBeCreatedBefore=La autenticación OAUTH2 no está disponible para todos los hosts, y se debe haber creado un token con los permisos correctos en sentido ascendente con el módulo OAUTH
+MAIN_MAIL_SMTPS_OAUTH_SERVICE=Servicio de autenticación OAUTH2
+DontForgetCreateTokenOauthMod=Se debe haber creado un token con los permisos correctos en sentido ascendente con el módulo OAUTH
+MAIN_MAIL_SMTPS_AUTH_TYPE=Método de autenticación
+UsePassword=Utiliza una contraseña
+UseOauth=Utiliza un token OAUTH
+Images=Imágenes
+MaxNumberOfImagesInGetPost=Número máximo de imágenes permitidas en un campo HTML enviado en un formulario
diff --git a/htdocs/langs/es_ES/agenda.lang b/htdocs/langs/es_ES/agenda.lang
index 277678721a4..c30e322d064 100644
--- a/htdocs/langs/es_ES/agenda.lang
+++ b/htdocs/langs/es_ES/agenda.lang
@@ -57,6 +57,7 @@ MemberValidatedInDolibarr=Miembro %s validado
 MemberModifiedInDolibarr=Miembro %s modificado
 MemberResiliatedInDolibarr=Miembro %s terminado
 MemberDeletedInDolibarr=Miembro %s eliminado
+MemberExcludedInDolibarr=Miembro %s excluido
 MemberSubscriptionAddedInDolibarr=Subscripción %s del miembro %s añadida
 MemberSubscriptionModifiedInDolibarr=Suscripción %s del miembro %s modificada
 MemberSubscriptionDeletedInDolibarr=Suscripción %s del miembro %s eliminada
@@ -159,6 +160,7 @@ DateActionBegin=Fecha de inicio del evento
 ConfirmCloneEvent=¿Esta seguro de querer clonar el evento <b>%s</b>?
 RepeatEvent=Repetir evento
 OnceOnly=Una sola vez
+EveryDay=Todos los días
 EveryWeek=Cada semana
 EveryMonth=Cada mes
 DayOfMonth=Día del mes
@@ -174,3 +176,4 @@ AddReminder=Crea una notificación de recordatorio automática para este evento
 ErrorReminderActionCommCreation=Error al crear la notificación de recordatorio para este evento
 BrowserPush=Notificación emergente del navegador
 ActiveByDefault=Activado por defecto
+Until=Hasta que
diff --git a/htdocs/langs/es_ES/banks.lang b/htdocs/langs/es_ES/banks.lang
index 71f4fe82367..cf9b1648f10 100644
--- a/htdocs/langs/es_ES/banks.lang
+++ b/htdocs/langs/es_ES/banks.lang
@@ -172,8 +172,8 @@ SEPAMandate=Mandato SEPA
 YourSEPAMandate=Su mandato SEPA
 FindYourSEPAMandate=Este es su mandato SEPA para autorizar a nuestra empresa a realizar un petición de débito directo a su banco. Gracias por devolverlo firmado (escaneo del documento firmado) o enviado por correo a
 AutoReportLastAccountStatement=Rellenar automáticamente el campo 'número de extracto bancario' con el último número de extracto cuando realice la conciliación
-CashControl=POS cash control
-NewCashFence=New cash control (opening or closing)
+CashControl=Control de efectivo en punto de venta
+NewCashFence=Nuevo control de caja (apertura o cierre)
 BankColorizeMovement=Colorear movimientos
 BankColorizeMovementDesc=Si esta función está activada, puede elegir un color de fondo específico para los movimientos de débito o crédito
 BankColorizeMovementName1=Color de fondo para el movimiento de débito
@@ -183,5 +183,6 @@ NoBankAccountDefined=Sin cuenta bancaria definida
 NoRecordFoundIBankcAccount=No se encontró ningún registro en la cuenta bancaria. Por lo general, esto ocurre cuando un registro se ha eliminado manualmente de la lista de transacciones en la cuenta bancaria (por ejemplo, durante una conciliación de la cuenta bancaria). Otra razón es que el pago se registró cuando el módulo "%s" estaba deshabilitado.
 AlreadyOneBankAccount=Ya se ha definido una cuenta bancaria
 SEPAXMLPlacePaymentTypeInformationInCreditTransfertransactionInformation=Transferencia SEPA: 'Tipo de pago' a nivel de 'Transferencia de crédito'
-SEPAXMLPlacePaymentTypeInformationInCreditTransfertransactionInformationHelp=When generatin 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.
+SEPAXMLPlacePaymentTypeInformationInCreditTransfertransactionInformationHelp=Al generar un archivo SEPA XML para transferencias de crédito, la sección "PaymentTypeInformation" ahora se puede colocar dentro de la sección "CreditTransferTransactionInformation" (en lugar de la sección "Pago"). Recomendamos enfáticamente dejar esto sin marcar para colocar la información de tipo de pago en el nivel de pago, ya que no todos los bancos la aceptarán necesariamente en el nivel de información de transacción de transferencia de crédito. Comuníquese con su banco antes de colocar PaymentTypeInformation en el nivel CreditTransferTransactionInformation.
 ToCreateRelatedRecordIntoBank=Para crear un registro bancario relacionado faltante
+BanklineExtraFields=Campos adicionales de línea bancaria
diff --git a/htdocs/langs/es_ES/bills.lang b/htdocs/langs/es_ES/bills.lang
index cf5fc6626cf..55debd7c8d7 100644
--- a/htdocs/langs/es_ES/bills.lang
+++ b/htdocs/langs/es_ES/bills.lang
@@ -81,7 +81,7 @@ PaymentsReports=Informes de pagos
 PaymentsAlreadyDone=Pagos efectuados
 PaymentsBackAlreadyDone=Reembolsos ya realizados
 PaymentRule=Forma de pago
-PaymentMode=Método de pago
+PaymentMode=Forma de pago
 PaymentModes=Métodos de pago
 DefaultPaymentMode=Método de pago por defecto
 DefaultBankAccount=Cuenta bancaria predeterminada
@@ -156,7 +156,7 @@ ErrorInvoiceAvoirMustBeNegative=Error, una factura de tipo Abono debe tener un i
 ErrorInvoiceOfThisTypeMustBePositive=Error, este tipo de factura debe tener una ase imponible positiva (o nula)
 ErrorCantCancelIfReplacementInvoiceNotValidated=Error, no es posible cancelar una factura que ha sido sustituida por otra que se encuentra en el estado 'borrador '.
 ErrorThisPartOrAnotherIsAlreadyUsedSoDiscountSerieCantBeRemoved=Esta parte u otra ya ha sido usada,  la serie de descuento no se puede eliminar.
-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=Error: La fecha de la factura %s es %s. Debe ser posterior o igual a la última fecha para facturas del mismo tipo (%s). Por favor cambie la fecha de la factura.
 BillFrom=Emisor
 BillTo=Enviar a
 ActionsOnBill=Eventos sobre la factura
@@ -283,8 +283,8 @@ RecurringInvoices=Facturas recurrentes
 RecurringInvoice=Factura recurrente
 RepeatableInvoice=Plantilla de factura
 RepeatableInvoices=Plantilla de facturas
-RecurringInvoicesJob=Generation of recurring invoices (sales invoices)
-RecurringSupplierInvoicesJob=Generation of recurring invoices (purchase invoices)
+RecurringInvoicesJob=Generación de facturas recurrentes (facturas de venta)
+RecurringSupplierInvoicesJob=Generación de facturas recurrentes (facturas de compra)
 Repeatable=Plantilla
 Repeatables=Plantillas
 ChangeIntoRepeatableInvoice=Convertir en plantilla
@@ -429,14 +429,24 @@ PaymentConditionShort14D=14 días
 PaymentCondition14D=14 días
 PaymentConditionShort14DENDMONTH=14 días fin de mes
 PaymentCondition14DENDMONTH=14 días a fin de més
+PaymentConditionShortDEP30PCTDEL=__DEPOSIT_PERCENT__%% depósito
+PaymentConditionDEP30PCTDEL=__DEPOSIT_PERCENT__%% depósito, resto contra entrega
 FixAmount=Cantidad fija -1 línea con la etiqueta '%s'
 VarAmount=Importe variable (%% total)
 VarAmountOneLine=Cantidad variable (%% tot.) - 1 línea con la etiqueta '%s'
 VarAmountAllLines=Cantidad variable (%% tot.) - todas las líneas desde el origen
+DepositPercent=Depósito %%
+DepositGenerationPermittedByThePaymentTermsSelected=Esto está permitido por las condiciones de pago seleccionadas
+GenerateDeposit=Genere una factura de depósito %s%%
+ValidateGeneratedDeposit=Validar el depósito generado
+DepositGenerated=Depósito generado
+ErrorCanOnlyAutomaticallyGenerateADepositFromProposalOrOrder=Solo puede generar automáticamente un depósito a partir de una propuesta o un pedido
+ErrorPaymentConditionsNotEligibleToDepositCreation=Las condiciones de pago elegidas no son elegibles para la generación automática de depósitos
 # PaymentType
 PaymentTypeVIR=Transferencia bancaria
 PaymentTypeShortVIR=Transferencia bancaria
 PaymentTypePRE=Domiciliación
+PaymentTypePREdetails=(a cuenta *-%s)
 PaymentTypeShortPRE=Domiciliación
 PaymentTypeLIQ=Efectivo
 PaymentTypeShortLIQ=Efectivo
diff --git a/htdocs/langs/es_ES/bookmarks.lang b/htdocs/langs/es_ES/bookmarks.lang
index a147978b0d1..61b91326927 100644
--- a/htdocs/langs/es_ES/bookmarks.lang
+++ b/htdocs/langs/es_ES/bookmarks.lang
@@ -20,3 +20,4 @@ ChooseIfANewWindowMustBeOpenedOnClickOnBookmark=Elija si la página enlazada deb
 BookmarksManagement=Gestión de marcadores
 BookmarksMenuShortCut=Ctrl + shift + m
 NoBookmarks=No hay marcadores definidos
+NoBookmarkFound=No se encontró ningún marcador
diff --git a/htdocs/langs/es_MX/admin.lang b/htdocs/langs/es_MX/admin.lang
index 080b427cb40..8c57272b7ea 100644
--- a/htdocs/langs/es_MX/admin.lang
+++ b/htdocs/langs/es_MX/admin.lang
@@ -238,6 +238,7 @@ ExtrafieldSelectList =Seleccionar de la tabla
 ComputedFormula=Campo calculado
 Computedpersistent=Almacenar campo calculado
 SetAsDefault=Establecer como predeterminado
+InitEmptyBarCode=Init value for the %s empty barcodes
 ClickToShowDescription=Haga clic para mostrar la descripción
 DependsOn=Este módulo necesita los módulo(s)
 WarningSettingSortOrder=Advertencia, establecer un orden predeterminado puede resultar en un error técnico al pasar a la página de lista si "campo" es un campo desconocido. Si experimenta un error de este tipo, vuelva a esta página para eliminar el orden predeterminado y restaurar el comportamiento predeterminado.
@@ -267,11 +268,12 @@ MailToSendProposal=Propuestas de clientes
 MailToSendInvoice=Facturas de clientes
 MailToSendSupplierOrder=Ordenes de compra
 MailToSendSupplierInvoice=Facturas de proveedor
+MailToExpenseReport=Reporte de gastos
 AllPublishers=Todos los editores
 AddMenus=Añadir menús
 AddPermissions=Añadir permisos
 CodeLastResult=Último código de resultado
-OperationParamDesc=Define the rules to use to extract or set values.<br>Example for operations that need to extract a name from email subject:<br>name=EXTRACT:SUBJECT:Message from company ([^\n]*)<br>Example for operations that create objects:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value including value of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
+OperationParamDesc=Define the rules to use to extract some data or set values to use for operation.<br><br>Example to extract a company name from email subject into a temporary variable:<br>tmp_var=EXTRACT:SUBJECT:Message from company ([^\n]*)<br><br>Examples to set the properties of an object to create:<br>objproperty1=SET:a hard coded value<br>objproperty2=SET:__tmp_var__<br>objproperty3=SETIFEMPTY:a value (value is set only if property is not already defined)<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
 EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it.<br>For example, if you want to create a thirdparty with a name extracted from a string 'Name: name to find' present into the body, use the sender email as email, you can set the parameter field like this:<br>'email=HEADER:^From:(.*);name=EXTRACT:BODY:Name:\\s([^\\s]*);client=SET:2;'<br>
 ShowProjectLabel=Etiqueta de proyecto
 TemplateAdded=Plantilla agregada
diff --git a/htdocs/langs/es_VE/admin.lang b/htdocs/langs/es_VE/admin.lang
index f011f5e634c..33ac1c8513d 100644
--- a/htdocs/langs/es_VE/admin.lang
+++ b/htdocs/langs/es_VE/admin.lang
@@ -5,6 +5,7 @@ ConfirmPurgeSessions=¿De verdad quieres purgar todas las sesiones? Esto descone
 SetupArea=Parametrizaje
 NotConfigured=Módulo / Aplicación no configurada
 GenericMaskCodes3=Cualquier otro carácter en la máscara se quedará sin cambios. <br>No se permiten espacios <br>
+InitEmptyBarCode=Init value for the %s empty barcodes
 Module1780Desc=Crear etiquetas/Categoría (Productos, clientes, proveedores, contactos y miembros)
 Permission254=Modificar la contraseña de otros usuarios
 Permission255=Eliminar o desactivar otros usuarios
@@ -31,5 +32,5 @@ WatermarkOnDraftSupplierProposal=Marca de agua en solicitudes de precios a prove
 LDAPMemberObjectClassListExample=Lista de ObjectClass que definen los atributos de un registro (ej: top,inetOrgPerson o top,user for active directory)
 LDAPUserObjectClassListExample=Lista de ObjectClass que definen los atributos de un registro (ej: top,inetOrgPerson o top,user for active directory)
 LDAPContactObjectClassListExample=Lista de objectClass que definen los atributos de un registro (ej: top,inetOrgPerson o top,user for active directory)
-OperationParamDesc=Define the rules to use to extract or set values.<br>Example for operations that need to extract a name from email subject:<br>name=EXTRACT:SUBJECT:Message from company ([^\n]*)<br>Example for operations that create objects:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value including value of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
+OperationParamDesc=Define the rules to use to extract some data or set values to use for operation.<br><br>Example to extract a company name from email subject into a temporary variable:<br>tmp_var=EXTRACT:SUBJECT:Message from company ([^\n]*)<br><br>Examples to set the properties of an object to create:<br>objproperty1=SET:a hard coded value<br>objproperty2=SET:__tmp_var__<br>objproperty3=SETIFEMPTY:a value (value is set only if property is not already defined)<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
 EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it.<br>For example, if you want to create a thirdparty with a name extracted from a string 'Name: name to find' present into the body, use the sender email as email, you can set the parameter field like this:<br>'email=HEADER:^From:(.*);name=EXTRACT:BODY:Name:\\s([^\\s]*);client=SET:2;'<br>
diff --git a/htdocs/langs/et_EE/admin.lang b/htdocs/langs/et_EE/admin.lang
index 84f2efe5f71..3ca9ddef1cc 100644
--- a/htdocs/langs/et_EE/admin.lang
+++ b/htdocs/langs/et_EE/admin.lang
@@ -477,7 +477,7 @@ InstalledInto=Installed into directory %s
 BarcodeInitForThirdparties=Mass-vöötkoodi loomine kolmandatele osapooltele
 BarcodeInitForProductsOrServices=Toodete/teenuste jaoks massiline vöötkoodide loomine või lähtestamine
 CurrentlyNWithoutBarCode=Praegu on teil <strong>%s</strong> kirje <strong>%s</strong> %s kohta ilma vöötkoodi määramata.
-InitEmptyBarCode=Järgmise %s tühja kirje lähtestamise väärtus
+InitEmptyBarCode=Init value for the %s empty barcodes
 EraseAllCurrentBarCode=Kustuta kõik hetkel kasutatavad vöötkoodide väärtused
 ConfirmEraseAllCurrentBarCode=Kas soovite kindlasti kõik praegused vöötkoodi väärtused kustutada?
 AllBarcodeReset=Kõik triipkoodi väärtused on eemaldatud
@@ -714,6 +714,7 @@ Permission27=Pakkumiste kustutamine
 Permission28=Pakkumiste ekspor
 Permission31=Toodete vaatamine
 Permission32=Toodete loomine/muutmine
+Permission33=Read prices products
 Permission34=Toodete kustutamine
 Permission36=Peidetud toodete vaatamine/haldamine
 Permission38=Toodete eksport
@@ -739,6 +740,7 @@ Permission79=Tellimuste loomine/muutmine
 Permission81=Müügitellimuste vaatamine
 Permission82=Müügitellimuste loomine/muutmine
 Permission84=Müügitellimuste kinnitamine
+Permission85=Generate the documents sales orders
 Permission86=Müügitellimuste saatmine
 Permission87=Müügitellimuste sulgemine
 Permission88=Müügitellimuste tühistamine
@@ -874,6 +876,7 @@ Permission525=Access loan calculator
 Permission527=Export loans
 Permission531=Teenuste vaatamine
 Permission532=Teenuste loomine/muutmine
+Permission533=Read prices services
 Permission534=Teenuste kustutamine
 Permission536=Peidetud teenuste vaatamine/haldamine
 Permission538=Teenuste eksport
@@ -1235,6 +1238,7 @@ BrowserName=Sirvija nimi
 BrowserOS=Sirvija operatsioonisüsteem
 ListOfSecurityEvents=Dolibarri turvasündmuste nimekiri
 SecurityEventsPurged=Turvasündmused tühjendatud
+TrackableSecurityEvents=Trackable security events
 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=Süsteemi info sisaldab mitmesugust tehnilist infot, mida ei saa muuta ning mis on nähtav vaid administraatoritele.
@@ -1977,6 +1981,7 @@ MailToSendSupplierOrder=Purchase orders
 MailToSendSupplierInvoice=Tarnija arved
 MailToSendContract=Lepingud
 MailToSendReception=Receptions
+MailToExpenseReport=Expense reports
 MailToThirdparty=Kolmandad isikud
 MailToMember=Liikmed
 MailToUser=Kasutajad
@@ -2030,6 +2035,7 @@ MAIN_PDF_MARGIN_RIGHT=Right margin on PDF
 MAIN_PDF_MARGIN_TOP=Top margin on PDF
 MAIN_PDF_MARGIN_BOTTOM=Bottom margin on PDF
 MAIN_DOCUMENTS_LOGO_HEIGHT=Height for logo on PDF
+DOC_SHOW_FIRST_SALES_REP=Show first sales representative
 MAIN_GENERATE_PROPOSALS_WITH_PICTURE=Add column for picture on proposal lines
 MAIN_DOCUMENTS_WITH_PICTURE_WIDTH=Width of the column if a picture is added on lines
 MAIN_PDF_NO_SENDER_FRAME=Hide borders on sender address frame
@@ -2063,6 +2069,12 @@ EmailCollectors=Email collectors
 EmailCollectorDescription=Add a scheduled job and a setup page to scan regularly email boxes (using IMAP protocol) and record emails received into your application, at the right place and/or create some records automatically (like leads).
 NewEmailCollector=New Email Collector
 EMailHost=Host of email IMAP server
+EMailHostPort=Port of email IMAP server
+loginPassword=Login/Password
+oauthToken=Oauth2 token
+accessType=Acces type
+oauthService=Oauth service
+TokenMustHaveBeenCreated=Module OAuth2 must be enabled and an oauth2 token must have been created with the correct permissions (for example scope "gmail_full" with OAuth for Gmail).
 MailboxSourceDirectory=Mailbox source directory
 MailboxTargetDirectory=Mailbox target directory
 EmailcollectorOperations=Operations to do by collector
@@ -2106,7 +2118,7 @@ CreateCandidature=Create job application
 FormatZip=Postiindeks
 MainMenuCode=Menu entry code (mainmenu)
 ECMAutoTree=Show automatic ECM tree
-OperationParamDesc=Define the rules to use to extract or set values.<br>Example for operations that need to extract a name from email subject:<br>name=EXTRACT:SUBJECT:Message from company ([^\n]*)<br>Example for operations that create objects:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value including value of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
+OperationParamDesc=Define the rules to use to extract some data or set values to use for operation.<br><br>Example to extract a company name from email subject into a temporary variable:<br>tmp_var=EXTRACT:SUBJECT:Message from company ([^\n]*)<br><br>Examples to set the properties of an object to create:<br>objproperty1=SET:a hard coded value<br>objproperty2=SET:__tmp_var__<br>objproperty3=SETIFEMPTY:a value (value is set only if property is not already defined)<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
 OpeningHours=Opening hours
 OpeningHoursDesc=Enter here the regular opening hours of your company.
 ResourceSetup=Configuration of Resource module
@@ -2212,6 +2224,7 @@ NoExternalModuleWithUpdate=No updates found for external modules
 SwaggerDescriptionFile=Swagger API description file (for use with redoc for example)
 YouEnableDeprecatedWSAPIsUseRESTAPIsInstead=You enabled deprecated WS API. You should use REST API instead.
 RandomlySelectedIfSeveral=Randomly selected if several pictures are available
+SalesRepresentativeInfo=For Proposals, Orders, Invoices.
 DatabasePasswordObfuscated=Database password is obfuscated in conf file
 DatabasePasswordNotObfuscated=Database password is NOT obfuscated in conf file
 APIsAreNotEnabled=APIs modules are not enabled
@@ -2277,5 +2290,20 @@ INVOICE_ADD_ZATCA_QR_CODEMore=Some Arabic countries need this QR Code on their i
 INVOICE_ADD_SWISS_QR_CODE=Show the swiss QR-Bill code on invoices
 UrlSocialNetworksDesc=Url link of social network. Use {socialid} for the variable part that contains the social network ID.
 IfThisCategoryIsChildOfAnother=If this category is a child of another one
+DarkThemeMode=Dark theme mode
+AlwaysDisabled=Always disabled
+AccordingToBrowser=According to browser
+AlwaysEnabled=Always Enabled
+DoesNotWorkWithAllThemes=Will not work with all themes
 NoName=No name
+ShowAdvancedOptions= Show advanced options
+HideAdvancedoptions= Hide advanced options
 CIDLookupURL=The module brings an URL that can be used by an external tool to get the name of a thirdparty or contact from its phone number. URL to use is:
+OauthNotAvailableForAllAndHadToBeCreatedBefore=OAUTH2 authentication is not available for all hosts, and a token with the right permissions must have been created upstream with the OAUTH module
+MAIN_MAIL_SMTPS_OAUTH_SERVICE=OAUTH2 authentication service
+DontForgetCreateTokenOauthMod=A token with the right permissions must have been created upstream with the OAUTH module
+MAIN_MAIL_SMTPS_AUTH_TYPE=Authentification method
+UsePassword=Use a password
+UseOauth=Use a OAUTH token
+Images=Images
+MaxNumberOfImagesInGetPost=Max number of images allowed in a HTML field submitted in a form
diff --git a/htdocs/langs/fa_IR/admin.lang b/htdocs/langs/fa_IR/admin.lang
index 4c0b6d79043..51c5101f3f2 100644
--- a/htdocs/langs/fa_IR/admin.lang
+++ b/htdocs/langs/fa_IR/admin.lang
@@ -477,7 +477,7 @@ InstalledInto=Installed into directory %s
 BarcodeInitForThirdparties=ایجاد دستجمعی بارکد برای اشخاص‌سوم
 BarcodeInitForProductsOrServices=ایجاد یا بازسازی بارکد برای محصولات یا خدمات
 CurrentlyNWithoutBarCode=در حال حاضر شما  <strong>%s</strong> ردیف در  <strong>%s</strong> %s دارید که برای آن‌ها بارکد تعریف نشده.
-InitEmptyBarCode=مقدار ابتدائی برای %s ردیف خالی بعدی
+InitEmptyBarCode=Init value for the %s empty barcodes
 EraseAllCurrentBarCode=حذف همۀ مقادیر کنونی بارکدها
 ConfirmEraseAllCurrentBarCode=آیا مطمئن هستید می‌خواهید همۀ مقادیر فعلی بارکدها را حذف کنید؟
 AllBarcodeReset=همۀ مقادیر بارکدها حذف شدند
@@ -714,6 +714,7 @@ Permission27=حذف پیشنهادات تجاری
 Permission28=صادرات پیشنهادات تجاری
 Permission31=ملاحظۀ محصولات
 Permission32=ساخت/ویرایش محصولات
+Permission33=Read prices products
 Permission34=حذف محصول
 Permission36=مشاهده/مدیریت محصولات پنهان
 Permission38=صادرکردن محصولات
@@ -739,6 +740,7 @@ Permission79=ساخت/ویراش عضویت‌ها
 Permission81=ملاحظۀ سفارشات مشتریان
 Permission82=ساخت/ویرایش سفارشات مشتریان
 Permission84=اعتباردهی به سفارشات مشتریان
+Permission85=Generate the documents sales orders
 Permission86=ارسال سفارشات مشتریان
 Permission87=بستن سفارشات مشتریان
 Permission88=لغو سفارشات مشتریان
@@ -874,6 +876,7 @@ Permission525=دسترسی به محاسبه‌گر وام
 Permission527=صادرکردن وام‌ها
 Permission531=ملاحظۀ خدمات
 Permission532=ایجاد/ویرایش خدمات
+Permission533=Read prices services
 Permission534=حذف خدمات
 Permission536=مشاهده/مدیریت خدمات پنهان
 Permission538=صادرکردن خدمات
@@ -1235,6 +1238,7 @@ BrowserName=نام مرورگر
 BrowserOS=سیستم عامل مرورگر
 ListOfSecurityEvents=فهرست رویدادهای امنیتی Dolibarr
 SecurityEventsPurged=رویدادهای امنیتی پاکسازی شد
+TrackableSecurityEvents=Trackable security events
 LogEventDesc=فعال کردن گزارش‌گیری برای روی‌دادهای امنیتی خاص. دسترسی مدیران به گزارش توسط فهرست <b>%s - %s</b>. هشدار، این قابلیت می‌تواند حجم زیادی داده در پایگاه‌داده ذخیره کند.
 AreaForAdminOnly=مقادیر برپاسازی تنها توسط <b>کاربران مدیر</b> قابل تنظیم است.
 SystemInfoDesc=اطلاعات سامانه، اطلاعاتی فنی است که در حالت فقط خواندنی است و تنها برای مدیران قابل نمایش است.
@@ -1977,6 +1981,7 @@ MailToSendSupplierOrder=سفارشات خرید
 MailToSendSupplierInvoice=صورت‌حساب‌های فروشندگان
 MailToSendContract=قراردادها
 MailToSendReception=دریافت‌های کالا
+MailToExpenseReport=گزارش‌هزینه‌ها
 MailToThirdparty=طرف‌های سوم
 MailToMember=اعضا
 MailToUser=کاربران
@@ -2030,6 +2035,7 @@ MAIN_PDF_MARGIN_RIGHT=فاصلۀحاشیۀ راست PDF
 MAIN_PDF_MARGIN_TOP=فاصلۀحاشیۀ بالای PDF
 MAIN_PDF_MARGIN_BOTTOM=فاصلۀحاشیۀ پائین PDF
 MAIN_DOCUMENTS_LOGO_HEIGHT=Height for logo on PDF
+DOC_SHOW_FIRST_SALES_REP=Show first sales representative
 MAIN_GENERATE_PROPOSALS_WITH_PICTURE=Add column for picture on proposal lines
 MAIN_DOCUMENTS_WITH_PICTURE_WIDTH=Width of the column if a picture is added on lines
 MAIN_PDF_NO_SENDER_FRAME=Hide borders on sender address frame
@@ -2063,6 +2069,12 @@ EmailCollectors=Email collectors
 EmailCollectorDescription=افزودن یک وظیفۀ زمان‌بندی شده و یک صفحۀ برپاسازی برای پویش منظم بخش‌های رایانامه (با استفاده از از پرتکل IMAP) و ثبت رایانامه‌هائی که در برنامۀ شما دریافت شده در محل درست و/یا ایجاد خودکار چند ردیف (مثل سرنخ‌ها).
 NewEmailCollector=یک جمع‌کنندۀ رایانامۀ جدید
 EMailHost=میزبان سرور IMAP رایانامه
+EMailHostPort=Port of email IMAP server
+loginPassword=Login/Password
+oauthToken=Oauth2 token
+accessType=Acces type
+oauthService=Oauth service
+TokenMustHaveBeenCreated=Module OAuth2 must be enabled and an oauth2 token must have been created with the correct permissions (for example scope "gmail_full" with OAuth for Gmail).
 MailboxSourceDirectory=پوشۀ منبع صندوق‌پستی
 MailboxTargetDirectory=پوشۀ مقصد صندوق‌پستی
 EmailcollectorOperations=عملیات قابل انجام جمع‌کننده
@@ -2106,7 +2118,7 @@ CreateCandidature=Create job application
 FormatZip=کدپستی
 MainMenuCode=کد ورودی فهرست (فهرست اصلی)
 ECMAutoTree=نمایش ساختاردرختی خودکار ECM
-OperationParamDesc=Define the rules to use to extract or set values.<br>Example for operations that need to extract a name from email subject:<br>name=EXTRACT:SUBJECT:Message from company ([^\n]*)<br>Example for operations that create objects:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value including value of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
+OperationParamDesc=Define the rules to use to extract some data or set values to use for operation.<br><br>Example to extract a company name from email subject into a temporary variable:<br>tmp_var=EXTRACT:SUBJECT:Message from company ([^\n]*)<br><br>Examples to set the properties of an object to create:<br>objproperty1=SET:a hard coded value<br>objproperty2=SET:__tmp_var__<br>objproperty3=SETIFEMPTY:a value (value is set only if property is not already defined)<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
 OpeningHours=ساعات کار
 OpeningHoursDesc=ساعات کاری معمول شرکت خود را در این بخش وارد نمائید
 ResourceSetup=پیکربندی واحد منابع
@@ -2212,6 +2224,7 @@ NoExternalModuleWithUpdate=No updates found for external modules
 SwaggerDescriptionFile=Swagger API description file (for use with redoc for example)
 YouEnableDeprecatedWSAPIsUseRESTAPIsInstead=You enabled deprecated WS API. You should use REST API instead.
 RandomlySelectedIfSeveral=Randomly selected if several pictures are available
+SalesRepresentativeInfo=For Proposals, Orders, Invoices.
 DatabasePasswordObfuscated=Database password is obfuscated in conf file
 DatabasePasswordNotObfuscated=Database password is NOT obfuscated in conf file
 APIsAreNotEnabled=APIs modules are not enabled
@@ -2277,5 +2290,20 @@ INVOICE_ADD_ZATCA_QR_CODEMore=Some Arabic countries need this QR Code on their i
 INVOICE_ADD_SWISS_QR_CODE=Show the swiss QR-Bill code on invoices
 UrlSocialNetworksDesc=Url link of social network. Use {socialid} for the variable part that contains the social network ID.
 IfThisCategoryIsChildOfAnother=If this category is a child of another one
+DarkThemeMode=Dark theme mode
+AlwaysDisabled=Always disabled
+AccordingToBrowser=According to browser
+AlwaysEnabled=Always Enabled
+DoesNotWorkWithAllThemes=Will not work with all themes
 NoName=No name
+ShowAdvancedOptions= Show advanced options
+HideAdvancedoptions= Hide advanced options
 CIDLookupURL=The module brings an URL that can be used by an external tool to get the name of a thirdparty or contact from its phone number. URL to use is:
+OauthNotAvailableForAllAndHadToBeCreatedBefore=OAUTH2 authentication is not available for all hosts, and a token with the right permissions must have been created upstream with the OAUTH module
+MAIN_MAIL_SMTPS_OAUTH_SERVICE=OAUTH2 authentication service
+DontForgetCreateTokenOauthMod=A token with the right permissions must have been created upstream with the OAUTH module
+MAIN_MAIL_SMTPS_AUTH_TYPE=Authentification method
+UsePassword=Use a password
+UseOauth=Use a OAUTH token
+Images=Images
+MaxNumberOfImagesInGetPost=Max number of images allowed in a HTML field submitted in a form
diff --git a/htdocs/langs/fi_FI/admin.lang b/htdocs/langs/fi_FI/admin.lang
index e88c94cb448..58ce91f6e44 100644
--- a/htdocs/langs/fi_FI/admin.lang
+++ b/htdocs/langs/fi_FI/admin.lang
@@ -477,7 +477,7 @@ InstalledInto=Asennettu hakemistoon %s
 BarcodeInitForThirdparties=Mass barcode init for third-parties
 BarcodeInitForProductsOrServices=Mass barcode init or reset for products or services
 CurrentlyNWithoutBarCode=Currently, you have <strong>%s</strong> record on <strong>%s</strong> %s without barcode defined.
-InitEmptyBarCode=Init value for next %s empty records
+InitEmptyBarCode=Init value for the %s empty barcodes
 EraseAllCurrentBarCode=Poista kaikki nykyiset viivakoodi arvot
 ConfirmEraseAllCurrentBarCode=Haluatko varmasti poistaa kaikki nykyiset viivakoodiarvot?
 AllBarcodeReset=Kaikki viivakoodi arvot on poistettu
@@ -714,6 +714,7 @@ Permission27=Poista kaupallinen ehdotuksia
 Permission28=Vie kauppaoikeuden ehdotuksia
 Permission31=Lue tuotetta / palvelua
 Permission32=Luoda / muuttaa tuotetta / palvelua
+Permission33=Read prices products
 Permission34=Poista tuotteita / palveluita
 Permission36=Vienti tuotteet / palvelut
 Permission38=Vie tuotteita
@@ -739,6 +740,7 @@ Permission79=Luoda / muuttaa tilaukset
 Permission81=Lue asiakkaiden tilauksia
 Permission82=Luoda / muuttaa asiakkaiden tilauksia
 Permission84=Validate asiakkaiden tilauksia
+Permission85=Generate the documents sales orders
 Permission86=Lähetä asiakkaiden tilauksia
 Permission87=Sulje asiakkaiden tilauksia
 Permission88=Peruuta asiakkaiden tilauksia
@@ -874,6 +876,7 @@ Permission525=Pääsy lainalaskimelle
 Permission527=Vie Lainat
 Permission531=Lue palvelut
 Permission532=Luo/Muokkaa palveluita
+Permission533=Read prices services
 Permission534=Poista palvelut
 Permission536=Katso / hoitaa piilotettu palvelut
 Permission538=Vienti palvelut
@@ -1235,6 +1238,7 @@ BrowserName=Selaimen nimi
 BrowserOS=Selaimen OS
 ListOfSecurityEvents=Luettelo Dolibarr turvallisuus tapahtumat
 SecurityEventsPurged=Turvallisuus tapahtumia puhdistettava
+TrackableSecurityEvents=Trackable security events
 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=Järjestelmän tiedot ovat erinäiset tekniset tiedot saavat lukea vain tila ja näkyvissä vain järjestelmänvalvojat.
@@ -1977,6 +1981,7 @@ MailToSendSupplierOrder=Ostotilaukset
 MailToSendSupplierInvoice=Toimittajan laskut
 MailToSendContract=Sopimukset
 MailToSendReception=Receptions
+MailToExpenseReport=Kulutositteet
 MailToThirdparty=Sidosryhmät
 MailToMember=Jäsenet
 MailToUser=Käyttäjät
@@ -2030,6 +2035,7 @@ MAIN_PDF_MARGIN_RIGHT=PDF:n oikea marginaali
 MAIN_PDF_MARGIN_TOP=PDF:n ylämarginaali
 MAIN_PDF_MARGIN_BOTTOM=PDF:n alamarginaali
 MAIN_DOCUMENTS_LOGO_HEIGHT=Logon korkeus PDF-muodossa
+DOC_SHOW_FIRST_SALES_REP=Show first sales representative
 MAIN_GENERATE_PROPOSALS_WITH_PICTURE=Add column for picture on proposal lines
 MAIN_DOCUMENTS_WITH_PICTURE_WIDTH=Width of the column if a picture is added on lines
 MAIN_PDF_NO_SENDER_FRAME=Hide borders on sender address frame
@@ -2063,6 +2069,12 @@ EmailCollectors=Email collectors
 EmailCollectorDescription=Add a scheduled job and a setup page to scan regularly email boxes (using IMAP protocol) and record emails received into your application, at the right place and/or create some records automatically (like leads).
 NewEmailCollector=Uusi postinkerääjä
 EMailHost=IMAP-palvelin
+EMailHostPort=Port of email IMAP server
+loginPassword=Login/Password
+oauthToken=Oauth2 token
+accessType=Acces type
+oauthService=Oauth service
+TokenMustHaveBeenCreated=Module OAuth2 must be enabled and an oauth2 token must have been created with the correct permissions (for example scope "gmail_full" with OAuth for Gmail).
 MailboxSourceDirectory=Sähköpostin lähdehakemisto
 MailboxTargetDirectory=Postilaatikon kohdehakemisto
 EmailcollectorOperations=Keräilijän tehtävät toiminnot
@@ -2106,7 +2118,7 @@ CreateCandidature=Luo työhakemus
 FormatZip=Postinumero
 MainMenuCode=Valikkokoodi (päävalikko)
 ECMAutoTree=Näytä automaattinen ECM-puu
-OperationParamDesc=Define the rules to use to extract or set values.<br>Example for operations that need to extract a name from email subject:<br>name=EXTRACT:SUBJECT:Message from company ([^\n]*)<br>Example for operations that create objects:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value including value of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
+OperationParamDesc=Define the rules to use to extract some data or set values to use for operation.<br><br>Example to extract a company name from email subject into a temporary variable:<br>tmp_var=EXTRACT:SUBJECT:Message from company ([^\n]*)<br><br>Examples to set the properties of an object to create:<br>objproperty1=SET:a hard coded value<br>objproperty2=SET:__tmp_var__<br>objproperty3=SETIFEMPTY:a value (value is set only if property is not already defined)<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
 OpeningHours=Aukioloajat
 OpeningHoursDesc=Yrityksen tavalliset aukioloajat
 ResourceSetup=Resurssimoduulin määritys
@@ -2212,6 +2224,7 @@ NoExternalModuleWithUpdate=No updates found for external modules
 SwaggerDescriptionFile=Swagger API description file (for use with redoc for example)
 YouEnableDeprecatedWSAPIsUseRESTAPIsInstead=You enabled deprecated WS API. You should use REST API instead.
 RandomlySelectedIfSeveral=Randomly selected if several pictures are available
+SalesRepresentativeInfo=For Proposals, Orders, Invoices.
 DatabasePasswordObfuscated=Database password is obfuscated in conf file
 DatabasePasswordNotObfuscated=Database password is NOT obfuscated in conf file
 APIsAreNotEnabled=APIs modules are not enabled
@@ -2277,5 +2290,20 @@ INVOICE_ADD_ZATCA_QR_CODEMore=Some Arabic countries need this QR Code on their i
 INVOICE_ADD_SWISS_QR_CODE=Show the swiss QR-Bill code on invoices
 UrlSocialNetworksDesc=Url link of social network. Use {socialid} for the variable part that contains the social network ID.
 IfThisCategoryIsChildOfAnother=If this category is a child of another one
+DarkThemeMode=Dark theme mode
+AlwaysDisabled=Always disabled
+AccordingToBrowser=According to browser
+AlwaysEnabled=Always Enabled
+DoesNotWorkWithAllThemes=Will not work with all themes
 NoName=No name
+ShowAdvancedOptions= Show advanced options
+HideAdvancedoptions= Hide advanced options
 CIDLookupURL=The module brings an URL that can be used by an external tool to get the name of a thirdparty or contact from its phone number. URL to use is:
+OauthNotAvailableForAllAndHadToBeCreatedBefore=OAUTH2 authentication is not available for all hosts, and a token with the right permissions must have been created upstream with the OAUTH module
+MAIN_MAIL_SMTPS_OAUTH_SERVICE=OAUTH2 authentication service
+DontForgetCreateTokenOauthMod=A token with the right permissions must have been created upstream with the OAUTH module
+MAIN_MAIL_SMTPS_AUTH_TYPE=Authentification method
+UsePassword=Use a password
+UseOauth=Use a OAUTH token
+Images=Images
+MaxNumberOfImagesInGetPost=Max number of images allowed in a HTML field submitted in a form
diff --git a/htdocs/langs/fr_CA/admin.lang b/htdocs/langs/fr_CA/admin.lang
index ebfa1d5ffc5..a04f84af674 100644
--- a/htdocs/langs/fr_CA/admin.lang
+++ b/htdocs/langs/fr_CA/admin.lang
@@ -72,6 +72,7 @@ ExtrafieldCheckBoxFromList=Les cases à cocher du tableau
 ExtrafieldLink=Lier à un objet
 LibraryToBuildPDF=Bibliothèque utilisée pour la génération de PDF
 CurrentlyNWithoutBarCode=Actuellement, vous avez <strong>%s</strong> enregistrements sur <strong>%s</strong> %s sans code à barres défini.
+InitEmptyBarCode=Init value for the %s empty barcodes
 ConfirmEraseAllCurrentBarCode=Êtes-vous sûr de vouloir effacer toutes les valeurs actuelles du code-barres?
 EnableFileCache=Activer le cache de fichiers
 DisplayCompanyManagers=Afficher les noms des gestionnaires
@@ -210,6 +211,7 @@ FillFixTZOnlyIfRequired=Exemple: +2 (remplir seulement si le problème est connu
 ExpectedChecksum=Somme attendue
 CurrentChecksum=Somme actuel
 ForcedConstants=Valeurs constantes requises
+MailToExpenseReport=Note de frais
 MailToMember=Membres
 ByDefaultInList=Afficher par défaut sur la liste vue
 TitleExampleForMajorRelease=Exemple de message que vous pouvez utiliser pour annoncer cette version majeure ( se sentir libre de l'utiliser sur vos sites web )
@@ -235,6 +237,6 @@ LandingPage=Page d'atterrissage
 ModuleEnabledAdminMustCheckRights=Le module a été activé. Les autorisations pour les modules activés ont été données uniquement aux utilisateurs administratifs. Vous devrez peut-être accorder des autorisations aux autres utilisateurs ou groupes manuellement si nécessaire.
 BaseCurrency=Monnaie de référence de la société (entrer dans la configuration de l'entreprise pour modifier cela)
 FormatZip=Code postal
-OperationParamDesc=Define the rules to use to extract or set values.<br>Example for operations that need to extract a name from email subject:<br>name=EXTRACT:SUBJECT:Message from company ([^\n]*)<br>Example for operations that create objects:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value including value of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
+OperationParamDesc=Define the rules to use to extract some data or set values to use for operation.<br><br>Example to extract a company name from email subject into a temporary variable:<br>tmp_var=EXTRACT:SUBJECT:Message from company ([^\n]*)<br><br>Examples to set the properties of an object to create:<br>objproperty1=SET:a hard coded value<br>objproperty2=SET:__tmp_var__<br>objproperty3=SETIFEMPTY:a value (value is set only if property is not already defined)<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
 UseSearchToSelectResource=Utilisez un formulaire de recherche pour choisir une ressource (plutôt qu'une liste déroulante).
 EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it.<br>For example, if you want to create a thirdparty with a name extracted from a string 'Name: name to find' present into the body, use the sender email as email, you can set the parameter field like this:<br>'email=HEADER:^From:(.*);name=EXTRACT:BODY:Name:\\s([^\\s]*);client=SET:2;'<br>
diff --git a/htdocs/langs/fr_CA/assets.lang b/htdocs/langs/fr_CA/assets.lang
index 71a627cf93f..1bf0b2bbbc4 100644
--- a/htdocs/langs/fr_CA/assets.lang
+++ b/htdocs/langs/fr_CA/assets.lang
@@ -1,3 +1,3 @@
 # Dolibarr language file - Source file is en_US - assets
-AssetsLines=Atouts
 NewAsset=Nouvel Atout
+AssetsLines=Atouts
diff --git a/htdocs/langs/fr_FR/accountancy.lang b/htdocs/langs/fr_FR/accountancy.lang
index a5ef675c2ca..83d10982ca2 100644
--- a/htdocs/langs/fr_FR/accountancy.lang
+++ b/htdocs/langs/fr_FR/accountancy.lang
@@ -48,8 +48,9 @@ CountriesNotInEEC=Pays hors CEE
 CountriesInEECExceptMe=Pays de la CEE sauf %s
 CountriesExceptMe=Tous les pays sauf %s
 AccountantFiles=Exporter les documents sources
-ExportAccountingSourceDocHelp=Avec cet outil, vous pouvez exporter les événements sources (liste en CSV et PDF) qui servent à générer votre comptabilité.
+ExportAccountingSourceDocHelp=Avec cet outil, vous pouvez rechercher et exporter les événements sources qui servent à générer votre comptabilité. <br> Le fichier ZIP exporté contiendra les listes des éléments demandés au format CSV, ainsi que leurs fichiers joints dans leur format d'origine (PDF, ODT, DOCX...).
 ExportAccountingSourceDocHelp2=Pour exporter vos journaux, utilisez l'entrée de menu %s - %s.
+ExportAccountingProjectHelp=Spécifiez un projet si vous avez besoin d'un rapport uniquement pour un projet spécifique. Les notes de frais et les remboursements de prêts ne sont pas inclus dans les rapports de projet.
 VueByAccountAccounting=Vue par comptes comptables
 VueBySubAccountAccounting=Affichage par compte auxiliaire
 
@@ -183,6 +184,8 @@ ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT=Compte comptable pour enregistrer les ad
 
 ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT=Compte comptable par défaut pour les acomptes clients
 UseAuxiliaryAccountOnCustomerDeposit=Enregistrer le compte client comme compte individuel dans le grand livre auxiliaire pour les lignes d'acompte (si désactivé, le compte individuel pour les lignes d'acompte restera vide)
+ACCOUNTING_ACCOUNT_SUPPLIER_DEPOSIT=Compte comptable par défaut pour enregistrer l'acompte fournisseur
+UseAuxiliaryAccountOnSupplierDeposit=Store supplier account as individual account in subsidiary ledger for lines of down payments (if disabled, individual account for down payment lines will remain empty)
 
 ACCOUNTING_PRODUCT_BUY_ACCOUNT=Compte comptable par défaut pour les produits achetés (utilisé si non défini dans la fiche produit)
 ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT=Compte comptable par défaut pour les produits achetés dans la CEE (utilisé si non défini dans la fiche produit)
@@ -332,7 +335,7 @@ ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS=Désactiver la liaison et le transf
 
 ## Export
 NotifiedExportDate=Marquer les lignes exportées comme Exportées <span class="warning"> (pour modifier une ligne, vous devrez supprimer toute la transaction et la retransférer en comptabilité) </span>
-NotifiedValidationDate=Validate and Lock the exported entries <span class="warning">(same effect than the "Closure" feature, modification and deletion of the lines will DEFINITELY not be possible)</span>
+NotifiedValidationDate=Validez et verrouillez les entrées exportées <span class="warning"> (même effet que la fonctionnalité "%s", la modification et la suppression des lignes ne seront définitivement plus possibles) </span>
 DateValidationAndLock=Validation et verrouillage de la date
 ConfirmExportFile=Confirmation de la génération du fichier d'export comptable ?
 ExportDraftJournal=Exporter le journal brouillon
diff --git a/htdocs/langs/fr_FR/admin.lang b/htdocs/langs/fr_FR/admin.lang
index cbdb284af56..ed427b72ff1 100644
--- a/htdocs/langs/fr_FR/admin.lang
+++ b/htdocs/langs/fr_FR/admin.lang
@@ -477,7 +477,7 @@ InstalledInto=Installé dans le répertoire %s
 BarcodeInitForThirdparties=Initialisation du code-barre en masse pour les tiers
 BarcodeInitForProductsOrServices=Initialisation ou purge en masse des codes-barre des produits ou services
 CurrentlyNWithoutBarCode=Actuellement, vous avez <strong>%s</strong> enregistrements sur <strong>%s</strong> %s sans code barre défini.
-InitEmptyBarCode=Initialisez les valeurs pour les %s enregistrements vides suivant
+InitEmptyBarCode=Valeur d'initialisation pour les %s codes à barres vides
 EraseAllCurrentBarCode=Efface toutes les valeurs de code-barre
 ConfirmEraseAllCurrentBarCode=Etes-vous sur de vouloir effacer toutes les valeurs de code-barre ?
 AllBarcodeReset=Tous les codes-barre ont été supprimés
@@ -714,6 +714,7 @@ Permission27=Supprimer les propositions commerciales
 Permission28=Exporter les propositions commerciales
 Permission31=Consulter les produits
 Permission32=Créer/modifier les produits
+Permission33=Lire les prix des produits
 Permission34=Supprimer les produits
 Permission36=Voir/gérer les produits cachés
 Permission38=Exporter les produits
@@ -739,6 +740,7 @@ Permission79=Créer/modifier les cotisations
 Permission81=Consulter les commandes clients
 Permission82=Créer/modifier les commandes clients
 Permission84=Valider les commandes clients
+Permission85=Générer les documents de commandes clients
 Permission86=Envoyer les commandes clients
 Permission87=Clôturer les commandes clients
 Permission88=Annuler les commandes clients
@@ -874,6 +876,7 @@ Permission525=Utiliser le calculateur d'emprunts
 Permission527=Exporter les emprunts
 Permission531=Consulter les services
 Permission532=Créer/modifier les services
+Permission533=Lire les prix des services
 Permission534=Supprimer les services
 Permission536=Voir/gérer les services cachés
 Permission538=Exporter les services
@@ -1235,6 +1238,7 @@ BrowserName=Nom du navigateur
 BrowserOS=OS du navigateur
 ListOfSecurityEvents=Liste des événements de sécurité Dolibarr
 SecurityEventsPurged=Evenement de sécurité purgés
+TrackableSecurityEvents=Trackable security events
 LogEventDesc=Vous pouvez activer ici l'historique des événements d'audit de sécurité. Cet historique est consultable par les administrateurs dans le menu <b>%s - %s</b>. Attention, cette fonctionnalité peut générer un gros volume de données.
 AreaForAdminOnly=Les paramètres d'installation ne peuvent être remplis que par les <b>utilisateurs administrateurs</b> uniquement.
 SystemInfoDesc=Les informations systèmes sont des informations techniques diverses accessibles en lecture seule aux administrateurs uniquement.
@@ -1977,6 +1981,7 @@ MailToSendSupplierOrder=Commandes fournisseurs
 MailToSendSupplierInvoice=Factures fournisseur
 MailToSendContract=Contrats
 MailToSendReception=Réceptions
+MailToExpenseReport=Notes de frais
 MailToThirdparty=Tiers
 MailToMember=Adhérents
 MailToUser=Utilisateurs
@@ -2030,6 +2035,7 @@ MAIN_PDF_MARGIN_RIGHT=Marge droite sur les PDF
 MAIN_PDF_MARGIN_TOP=Marge haute sur les PDF
 MAIN_PDF_MARGIN_BOTTOM=Marge bas sur les PDF
 MAIN_DOCUMENTS_LOGO_HEIGHT=Hauteur du logo sur les PDFs
+DOC_SHOW_FIRST_SALES_REP=Afficher le premier commercial
 MAIN_GENERATE_PROPOSALS_WITH_PICTURE=Ajouter une colonne pour les images dans les propositions commerciales
 MAIN_DOCUMENTS_WITH_PICTURE_WIDTH=Largeur de la colonne si une image est ajoutée sur les lignes
 MAIN_PDF_NO_SENDER_FRAME=Masquer les bordures dans le cadre de l'adresse de l'expéditeur
@@ -2063,6 +2069,12 @@ EmailCollectors=Collecteurs d'e-mails
 EmailCollectorDescription=Ajoute un travail planifié et une page de configuration pour analyser régulièrement les boîtes aux lettres (à l'aide du protocole IMAP) et enregistrer les courriers électroniques reçus dans votre application, au bon endroit et/ou créer automatiquement certains enregistrements (comme des opportunités).
 NewEmailCollector=Nouveau collecteur d'email
 EMailHost=Hôte du serveur de messagerie IMAP
+EMailHostPort=Port du serveur de messagerie IMAP
+loginPassword=Mot de passe
+oauthToken=Jeton Oauth2
+accessType=Type d'accès
+oauthService=Service Oauth
+TokenMustHaveBeenCreated=Module OAuth2 must be enabled and an oauth2 token must have been created with the correct permissions (for example scope "gmail_full" with OAuth for Gmail).
 MailboxSourceDirectory=Répertoire source de la boîte aux lettres
 MailboxTargetDirectory=Répertoire cible de la boîte aux lettres
 EmailcollectorOperations=Opérations à effectuer par le collecteur
@@ -2106,7 +2118,7 @@ CreateCandidature=Créer une candidature
 FormatZip=Zip
 MainMenuCode=Code d'entrée du menu (mainmenu)
 ECMAutoTree=Afficher l'arborescence GED automatique
-OperationParamDesc=Définissez les règles à utiliser pour extraire ou définir des valeurs. <br> Exemple d'opérations nécessitant d'extraire un nom de l'objet d'un e-mail : <br> name=EXTRACT:SUBJECT:Message from company ([^\n] *) <br> exemple pour des opérations qui créent des objets: <br> objproperty1=SET:la valeur d'ensemble <br> objproperty2=SET:une valeur incluant __objproperty1__ <br> objproperty3 = SETIFEMPTY:valeur utilisée si objproperty3 est non déjà défini <br> objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*) <br> options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*) <br> object.objproperty5=EXTRACT:BODY:Le nom de ma société est\\s( [^\\s]*) <br> <br> Utilisez un caractère ; comme séparateur pour extraire ou définir plusieurs propriétés.
+OperationParamDesc=Définissez les règles à utiliser pour extraire certaines données ou définissez les valeurs à utiliser pour l'opération. <br><br> Exemple pour extraire un nom d'entreprise du sujet d'un e-mail dans une variable temporaire : <br> tmp_var=EXTRACT:SUBJECT:Message from company ([^\n]*) <br> <br> Exemples pour définir les propriétés d'un objet à créer : <br> objproperty1=SET:une valeur codée en dur <br> objproperty2=SET:__tmp_var__ <br> objproperty3=SETIFEMPTY:une valeur (la valeur sera définie uniquement si la valeur de la propriété n'est pas déjà définie) <br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*) <br> options_myextrafield1=EXTRACT:OBJET:([^&#92;n]*) <br> object.objproperty5=EXTRACT:BODY:Mon nom de la société est\\s([^\\s]*) <br> <br> Utilisez un ; char comme séparateur pour extraire ou définir plusieurs propriétés.
 OpeningHours=Heures d'ouverture
 OpeningHoursDesc=Entrez ici les heures d'ouverture régulières de votre entreprise.
 ResourceSetup=Configuration du module Ressource
@@ -2212,6 +2224,7 @@ NoExternalModuleWithUpdate=Aucune mise à jour trouvée pour les modules externe
 SwaggerDescriptionFile=Fichier de description de l’API Swagger (à utiliser avec redoc par exemple)
 YouEnableDeprecatedWSAPIsUseRESTAPIsInstead=Vous avez activé l'API WS qui est dépréciée. Vous devriez utiliser l'API REST à la place.
 RandomlySelectedIfSeveral=Sélectionnée au hasard si plusieurs images sont disponibles
+SalesRepresentativeInfo=For Proposals, Orders, Invoices.
 DatabasePasswordObfuscated=Le mot de passe de la base de données est masqué dans le fichier de configuration
 DatabasePasswordNotObfuscated=Le mot de passe de la base de données n'est PAS masqué dans le fichier de configuration
 APIsAreNotEnabled=Les modules API ne sont pas activés
@@ -2277,5 +2290,20 @@ INVOICE_ADD_ZATCA_QR_CODEMore=Certains pays arabes ont besoin de ce code QR sur
 INVOICE_ADD_SWISS_QR_CODE=Afficher la QR-facture suisse sur les factures
 UrlSocialNetworksDesc=Lien url du réseau social. Utilisez {socialid} pour la partie variable qui contient l'identifiant du réseau social.
 IfThisCategoryIsChildOfAnother=Si cette catégorie est un enfant d'une autre
+DarkThemeMode=Mode thème sombre
+AlwaysDisabled=Toujours désactivé
+AccordingToBrowser=Selon navigateur
+AlwaysEnabled=Toujours activé
+DoesNotWorkWithAllThemes=Ne fonctionnera pas avec tous les thèmes
 NoName=Sans nom
+ShowAdvancedOptions= Afficher les options avancées
+HideAdvancedoptions= Cacher les options avancées
 CIDLookupURL=Le module apporte une URL qui peut être utilisée par un outil externe pour obtenir le nom d'un tiers ou d'un contact à partir de son numéro de téléphone. L'URL à utiliser est :
+OauthNotAvailableForAllAndHadToBeCreatedBefore=L'authentification OAUTH2 n'est pas disponible pour tous les hôtes, et un token avec les bonnes permissions doit avoir été créé auparavant dans le module OAUTH
+MAIN_MAIL_SMTPS_OAUTH_SERVICE=Service d'authentification OAUTH2
+DontForgetCreateTokenOauthMod=Un token avec les bonnes permissions doit avoir été créé auparavant dans le module OAUTH
+MAIN_MAIL_SMTPS_AUTH_TYPE=Méthode d'authentification
+UsePassword=Utiliser mot de passe
+UseOauth=Utiliser un token OAUTH
+Images=Images
+MaxNumberOfImagesInGetPost=Nombre maximum d'images autorisées dans un champ HTML soumis dans un formulaire
diff --git a/htdocs/langs/fr_FR/agenda.lang b/htdocs/langs/fr_FR/agenda.lang
index 78d12bd4839..62fc347e802 100644
--- a/htdocs/langs/fr_FR/agenda.lang
+++ b/htdocs/langs/fr_FR/agenda.lang
@@ -57,6 +57,7 @@ MemberValidatedInDolibarr=Adhérent %s validé
 MemberModifiedInDolibarr=Adhérent %s modifié
 MemberResiliatedInDolibarr=Adhérent %s résilié
 MemberDeletedInDolibarr=Adhérent %s supprimé
+MemberExcludedInDolibarr=Adhérent %s exclu
 MemberSubscriptionAddedInDolibarr=Cotisation %s pour l'adhérent %s ajoutée
 MemberSubscriptionModifiedInDolibarr=Cotisation %s pour l'adhérent %s modifié
 MemberSubscriptionDeletedInDolibarr=Cotisation %s pour l'adhérent %s supprimé
@@ -159,6 +160,7 @@ DateActionBegin=Date début événément
 ConfirmCloneEvent=Êtes-vous sûr de vouloir cloner cet événement <b>%s</b> ?
 RepeatEvent=Evénement répétitif
 OnceOnly=Une seule fois
+EveryDay=Chaque jour
 EveryWeek=Chaque semaine
 EveryMonth=Chaque mois
 DayOfMonth=Jour du mois
@@ -174,3 +176,4 @@ AddReminder=Créer une notification de rappel automatique pour cet événement
 ErrorReminderActionCommCreation=Erreur lors de la création de la notification de rappel pour cet événement
 BrowserPush=Notification par Popup navigateur
 ActiveByDefault=Activé par défaut
+Until=jusqu'à
diff --git a/htdocs/langs/fr_FR/assets.lang b/htdocs/langs/fr_FR/assets.lang
index d93545cb6a4..a03327da420 100644
--- a/htdocs/langs/fr_FR/assets.lang
+++ b/htdocs/langs/fr_FR/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,52 +16,171 @@
 #
 # Generic
 #
-Assets = Immobilisations
-NewAsset = Nouvelle immobilisation
-AccountancyCodeAsset = Code comptable (immobilisation)
-AccountancyCodeDepreciationAsset = Code comptable (compte d'amortissement)
-AccountancyCodeDepreciationExpense = Code comptable (compte de charges d'amortissement)
-NewAssetType=Nouveau type d'immobilisation
-AssetsTypeSetup=Configuration du type d'actifs
-AssetTypeModified=Type d'actif modifié
-AssetType=Type d'immobilisations
+NewAsset=Nouvelle immobilisation
+AccountancyCodeAsset=Code comptable (immobilisation)
+AccountancyCodeDepreciationAsset=Code comptable (compte d'amortissement)
+AccountancyCodeDepreciationExpense=Code comptable (compte de charges d'amortissement)
 AssetsLines=Immobilisations
 DeleteType=Supprimer
-DeleteAnAssetType=Supprimer un type d'actif
-ConfirmDeleteAssetType=Êtes-vous sûr de vouloir supprimer ce type d'actif?
-ShowTypeCard=Voir type '%s'
+DeleteAnAssetType=Supprimer un modèle d'actif
+ConfirmDeleteAssetType=Voulez-vous vraiment supprimer ce modèle d'actif ?
+ShowTypeCard=Afficher le modèle '%s'
 
 # Module label 'ModuleAssetsName'
-ModuleAssetsName = Immobilisations
+ModuleAssetsName=Immobilisations
 # Module description 'ModuleAssetsDesc'
-ModuleAssetsDesc = Module pour suivre vos immobilisations
+ModuleAssetsDesc=Module pour suivre vos immobilisations
 
 #
 # Admin page
 #
-AssetsSetup = Configuration du module immobilisations
-Settings = Paramètres
-AssetsSetupPage = Page de configuration des actifs
-ExtraFieldsAssetsType = Attributs supplémentaires (type d'immobilisation)
-AssetsType=Type d'immobilisations
-AssetsTypeId=Id du type d'immobilisations
-AssetsTypeLabel=Libellé du type d'immobilisations
-AssetsTypes=Types d'immobilisations
+AssetSetup=Configuration du module immobilisations
+AssetSetupPage=Page de configuration des actifs
+ExtraFieldsAssetModel=Attributs complémentaires (modèle d'Asset)
+
+AssetsType=Modèle d'actif
+AssetsTypeId=ID du modèle d'actif
+AssetsTypeLabel=Libellé du modèle d'actif
+AssetsTypes=Modèles d'actifs
+ASSET_ACCOUNTANCY_CATEGORY=Groupe de comptabilité des immobilisations
 
 #
 # Menu
 #
-MenuAssets = Immobilisations
-MenuNewAsset = Nouvelle immobilisation
-MenuTypeAssets = Type d'immobilisations
-MenuListAssets = Liste
-MenuNewTypeAssets = Nouveau type
-MenuListTypeAssets = Liste
+MenuAssets=Immobilisations
+MenuNewAsset=Nouvelle immobilisation
+MenuAssetModels=Actifs du modèle
+MenuListAssets=Liste
+MenuNewAssetModel=Nouveau modèle d'actif
+MenuListAssetModels=Liste
 
 #
 # Module
 #
+ConfirmDeleteAsset=Voulez-vous vraiment supprimer cet élément ?
+
+#
+# Tab
+#
+AssetDepreciationOptions=Options d'amortissement
+AssetAccountancyCodes=Comptes comptables
+AssetDepreciation=Dépréciation
+
+#
+# Asset
+#
 Asset=Immobilisations
-NewAssetType=Nouveau type d'immobilisation
-NewAsset=Nouvelle immobilisation
-ConfirmDeleteAsset=Voulez-vous vraiment supprimer cet élément?
+Assets=Immobilisations
+AssetReversalAmountHT=Montant de l'annulation (hors taxes)
+AssetAcquisitionValueHT=Montant de l'acquisition (hors taxes)
+AssetRecoveredVAT=TVA récupérée
+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
+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> ?
+
+#
+# Asset status
+#
+AssetInProgress=En cours
+AssetDisposed=Disposé
+AssetRecorded=Comptabilisé
+
+#
+# Asset disposal
+#
+AssetDisposalDate=Date de cession
+AssetDisposalAmount=Valeur de cession
+AssetDisposalType=Type d'élimination
+AssetDisposalDepreciated=Amortir l'année du transfert
+AssetDisposalSubjectToVat=Cession soumise à TVA
+
+#
+# Asset model
+#
+AssetModel=Modèle d'actif
+AssetModels=Modèles d'actifs
+
+#
+# Asset depreciation options
+#
+AssetDepreciationOptionEconomic=Amortissement économique
+AssetDepreciationOptionAcceleratedDepreciation=Amortissement accéléré (impôt)
+AssetDepreciationOptionDepreciationType=Type d'amortissement
+AssetDepreciationOptionDepreciationTypeLinear=Linéaire
+AssetDepreciationOptionDepreciationTypeDegressive=Dégressif
+AssetDepreciationOptionDepreciationTypeExceptional=Exceptionnel
+AssetDepreciationOptionDegressiveRate=Tarif dégressif
+AssetDepreciationOptionAcceleratedDepreciation=Amortissement accéléré (impôt)
+AssetDepreciationOptionDuration=Durée
+AssetDepreciationOptionDurationType=Tapez la durée
+AssetDepreciationOptionDurationTypeAnnual=Annuel
+AssetDepreciationOptionDurationTypeMonthly=Mensuel
+AssetDepreciationOptionDurationTypeDaily=du quotidien
+AssetDepreciationOptionRate=Taux (%%)
+AssetDepreciationOptionAmountBaseDepreciationHT=Base d'amortissement (hors TVA)
+AssetDepreciationOptionAmountBaseDeductibleHT=Base déductible (hors TVA)
+AssetDepreciationOptionTotalAmountLastDepreciationHT=Montant total dernier amortissement (hors TVA)
+
+#
+# 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
+AssetAccountancyCodeVatCollected=TVA collectée
+AssetAccountancyCodeVatDeductible=TVA récupérée sur les actifs
+AssetAccountancyCodeDepreciationAcceleratedDepreciation=Amortissement accéléré (impôt)
+AssetAccountancyCodeAcceleratedDepreciation=Compte
+AssetAccountancyCodeEndowmentAcceleratedDepreciation=La charge d'amortissement
+AssetAccountancyCodeProvisionAcceleratedDepreciation=Reprise/Fourniture
+
+#
+# Asset depreciation
+#
+AssetBaseDepreciationHT=Base d'amortissement (hors TVA)
+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
+
+#
+# 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'
+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)
+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
+AssetErrorSetLastCumulativeDepreciation=Erreur lors de l'enregistrement du dernier montant d'amortissement cumulé
diff --git a/htdocs/langs/fr_FR/banks.lang b/htdocs/langs/fr_FR/banks.lang
index 6260827ae27..af88349f585 100644
--- a/htdocs/langs/fr_FR/banks.lang
+++ b/htdocs/langs/fr_FR/banks.lang
@@ -172,8 +172,8 @@ SEPAMandate=Mandat SEPA
 YourSEPAMandate=Votre mandat SEPA
 FindYourSEPAMandate=Voici votre mandat SEPA pour autoriser notre société à réaliser les prélèvements depuis votre compte bancaire. Merci de retourner ce mandat signé (scan du document signé) ou en l'envoyant par courrier à 
 AutoReportLastAccountStatement=Remplissez automatiquement le champ 'numéro de relevé bancaire' avec le dernier numéro lors du rapprochement
-CashControl=POS cash control
-NewCashFence=New cash control (opening or closing)
+CashControl=Contrôle de caisse POS
+NewCashFence=Nouveau contrôle de caisse (ouverture ou fermeture)
 BankColorizeMovement=Coloriser les mouvements
 BankColorizeMovementDesc=Si cette fonction est activée, vous pouvez choisir une couleur de fond spécifique pour les mouvements de débit ou de crédit.
 BankColorizeMovementName1=Couleur de fond pour les mouvements de débit
@@ -185,3 +185,4 @@ AlreadyOneBankAccount=un compte bancaire est déjà défini
 SEPAXMLPlacePaymentTypeInformationInCreditTransfertransactionInformation=Virement SEPA : 'Type de paiement' au niveau 'Virement'
 SEPAXMLPlacePaymentTypeInformationInCreditTransfertransactionInformationHelp=A la génération d'un fichier SEPA XML pour les virements, la section "PaymentTypeInformation" peut maintenant être placée dans la section "CreditTransferTransactionInformation" (à la place de la section "Payment").\nNous recommandons fortement de ne pas cocher cette case pour conserver "PaymentTypeInformation" dans "Payment level" car toutes les banques ne l'accepterons pas obligatoirement au niveau de "CreditTransferTransactionInformation". Contactez votre banque avant de modifier ce paramètre.
 ToCreateRelatedRecordIntoBank=Pour créer un enregistrement bancaire associé manquant
+BanklineExtraFields=Bank Line Extrafields
diff --git a/htdocs/langs/fr_FR/bills.lang b/htdocs/langs/fr_FR/bills.lang
index 21163098b48..a764b511920 100644
--- a/htdocs/langs/fr_FR/bills.lang
+++ b/htdocs/langs/fr_FR/bills.lang
@@ -221,8 +221,8 @@ AllowedInvoiceForRetainedWarranty=Garantie conservée utilisable sur les types d
 RetainedwarrantyDefaultPercent=Pourcentage par défaut de la retenue de garantie
 RetainedwarrantyOnlyForSituation=Rendre la "retenue de garantie" disponible uniquement pour les factures de situation
 RetainedwarrantyOnlyForSituationFinal=Sur les factures de situation, la déduction globale pour "retenue de garantie" n'est appliquée que sur la facture de situation finale
-ToPayOn=A payer sur %s
-toPayOn=à payer sur %s
+ToPayOn=À payer le %s
+toPayOn=à payer le %s
 RetainedWarranty=Retenue de garantie
 PaymentConditionsShortRetainedWarranty=Conditions de réglement de la retenue de garantie
 DefaultPaymentConditionsRetainedWarranty=Conditions de paiement par défaut des retenues de garantie
@@ -429,14 +429,24 @@ PaymentConditionShort14D=14 jours
 PaymentCondition14D=14 jours
 PaymentConditionShort14DENDMONTH=14 jours fin de mois
 PaymentCondition14DENDMONTH=Sous 14 jours suivant la fin du mois
+PaymentConditionShortDEP30PCTDEL=__DEPOSIT_PERCENT__%% acompte
+PaymentConditionDEP30PCTDEL=__DEPOSIT_PERCENT__%% acompte, reste à la livraison
 FixAmount=Montant Fixe - 1 ligne avec le libellé '%s'
 VarAmount=Montant variable (%% tot.)
 VarAmountOneLine=Montant variable (%% tot.) - 1 ligne avec le libellé '%s'
 VarAmountAllLines=Montant variable (%% tot.) - toutes les lignes identiques
+DepositPercent=Acompte %%
+DepositGenerationPermittedByThePaymentTermsSelected=Ceci est autorisé par les conditions de paiement sélectionnées
+GenerateDeposit=Générer une facture d'acompte de %s%%
+ValidateGeneratedDeposit=Valider l'acompte généré
+DepositGenerated=Acompte généré
+ErrorCanOnlyAutomaticallyGenerateADepositFromProposalOrOrder=Vous ne pouvez générer automatiquement un acompte qu'à partir d'une proposition ou d'une commande
+ErrorPaymentConditionsNotEligibleToDepositCreation=Les conditions de paiement choisies ne sont pas éligibles à la génération automatique de virements
 # PaymentType
 PaymentTypeVIR=Virement bancaire
 PaymentTypeShortVIR=Virement bancaire
 PaymentTypePRE=Ordre de prélèvement
+PaymentTypePREdetails=(sur compte *-%s)
 PaymentTypeShortPRE=Ordre de prélèvement
 PaymentTypeLIQ=Espèce
 PaymentTypeShortLIQ=Espèce
diff --git a/htdocs/langs/gl_ES/accountancy.lang b/htdocs/langs/gl_ES/accountancy.lang
index 5194834e74e..d6e220fea5b 100644
--- a/htdocs/langs/gl_ES/accountancy.lang
+++ b/htdocs/langs/gl_ES/accountancy.lang
@@ -48,8 +48,9 @@ CountriesNotInEEC=Países non CEE
 CountriesInEECExceptMe=Todos os paises incluidos na CEE excepto %s
 CountriesExceptMe=Todos os países excepto %s
 AccountantFiles=Exportar documentos contables
-ExportAccountingSourceDocHelp=Con esta ferramenta, pode exportar os eventos de orixe (listaxe en CSV e PDF) que se empregan para xerar a súa contabilidade.
+ExportAccountingSourceDocHelp=Con esta ferramenta, pode buscar e exportar os eventos de orixe que se utilizan para xerar a súa contabilidade. <br> O ficheiro ZIP exportado conterá as listas de elementos solicitados en CSV, así como os seus ficheiros anexos no seu formato orixinal (PDF, ODT, DOCX...).
 ExportAccountingSourceDocHelp2=Para exportar as súas revistas, use a entrada de menú %s - %s
+ExportAccountingProjectHelp=Especifique un proxecto se precisa un informe contable só para un proxecto específico. Os informes de gastos e pagamentos de préstamos non están incluídos nos informes do proxecto.
 VueByAccountAccounting=Ver por conta contable
 VueBySubAccountAccounting=Ver pos subconta contable
 
@@ -183,6 +184,8 @@ ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT=Conta contable de rexistro subscricións
 
 ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT=Conta contable por defecto para rexistrar os ingresos realizados polo cliente
 UseAuxiliaryAccountOnCustomerDeposit=Almacenar a conta do cliente como unha conta individual para as liñas de anicipo no Libro Maior subsidiario (se está desactivada, a conta individual para as liñas de anticipo permanecerá baleira)
+ACCOUNTING_ACCOUNT_SUPPLIER_DEPOSIT=Conta contable por defecto para rexistrar o depósito do provedor
+UseAuxiliaryAccountOnSupplierDeposit=Almacenar a conta do provedor como unha conta individual no libro maior subsidiario para as liñas de anticipo (se está desactivada, a conta individual para as liñas de anticipo permanecerá baleira)
 
 ACCOUNTING_PRODUCT_BUY_ACCOUNT=Conta contable predeterminada para os produtos comprados (usada se non está definida na folla de produtos)
 ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT=Conta contable predeterminada para os produtos comprados na CEE (usada se non está definida na folla de produto)
@@ -332,7 +335,7 @@ ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS=Desactivar a ligazón e transferenc
 
 ## Export
 NotifiedExportDate=Marcar as liñas exportadas como Exportadas <span class="warning"> (para modificar unha liña, terá que eliminar toda a transacción e transferila de novo á contabilidade) </span>
-NotifiedValidationDate=Validar e bloquear as entradas exportadas <span class="warning"> (o mesmo efecto que a función "Peche", a modificación e eliminación das liñas DEFINITIVAMENTE non será posible) </span>
+NotifiedValidationDate=Validar e bloquear as entradas exportadas <span class="warning"> (o mesmo efecto que a función "%s", a modificación e eliminación das liñas DEFINITIVAMENTE non será posible) </span>
 DateValidationAndLock=Data validación e bloqueo
 ConfirmExportFile=Confirmación da xeración do ficheiro de exportación contable? 
 ExportDraftJournal=Exportar libro borrador
diff --git a/htdocs/langs/gl_ES/admin.lang b/htdocs/langs/gl_ES/admin.lang
index 2d1c533cd4b..d57c2241252 100644
--- a/htdocs/langs/gl_ES/admin.lang
+++ b/htdocs/langs/gl_ES/admin.lang
@@ -477,7 +477,7 @@ InstalledInto=Instalado no directory %s
 BarcodeInitForThirdparties=Inicio de código de barras masivo para terceiros
 BarcodeInitForProductsOrServices=Inicio masivo de código de barras para produtos ou servizos
 CurrentlyNWithoutBarCode=Actualmente ten <strong>%s</strong> rexistros de <strong>%s</strong> %s sen código de barras definido.
-InitEmptyBarCode=Iniciar valor para os %s rexistros baleiros.
+InitEmptyBarCode=Valor inicial para os códigos de barras baleiros %s
 EraseAllCurrentBarCode=Eliminar todos os valores actuais de códigos de barras
 ConfirmEraseAllCurrentBarCode=¿Está certo de querer eliminar todos os rexistros actuais de códigos de barras?
 AllBarcodeReset=Todos os códigos de barras foron eliminados
@@ -714,6 +714,7 @@ Permission27=Eliminar orzamentos comerciais
 Permission28=Exportar orzamentos comerciais
 Permission31=Consultar produtos
 Permission32=Crear/modificar produtos
+Permission33=Ler prezos dos produtos
 Permission34=Eliminar produtos
 Permission36=Ver/xestionar produtos ocultos
 Permission38=Exportar produtos
@@ -739,6 +740,7 @@ Permission79=Crear/modificar cotizacións
 Permission81=Consultar pedimentos de clientes
 Permission82=Crear/modificar pedimentos de clientes
 Permission84=Validar pedimentos de clientes
+Permission85=Xerar os documentos de pedimentos de cliente
 Permission86=Enviar pedimentos de clientes
 Permission87=Pechar pedimentos de clientes
 Permission88=Anular pedimentos de clientes
@@ -874,6 +876,7 @@ Permission525=Calculadora de crédito
 Permission527=Exportar crédito
 Permission531=Consultar servizos
 Permission532=Crear/modificar servizos
+Permission533=Ler prezos dos servizos
 Permission534=Eliminar servizos
 Permission536=Ver/xestionar os servizos ocultos
 Permission538=Exportar servizos
@@ -1235,6 +1238,7 @@ BrowserName=Nome do navegador
 BrowserOS=S.O. do navegador
 ListOfSecurityEvents=Listaxe de eventos de seguridade Dolibarr
 SecurityEventsPurged=Eventos de seguridade purgados
+TrackableSecurityEvents=Eventos de seguridade rastrexables
 LogEventDesc=Pode habilitar o rexistro de eventos de seguridade aquí. Os administradores poden ver o contido do rexistro ao través do menú <b>%s-%s</b>.Atención, esta característica pode xerar unha gran cantidade de datos na base de datos.
 AreaForAdminOnly=Os parámetros de configuración poden ser tratados por <b>usuarios administradores</b> exclusivamente.
 SystemInfoDesc=A información do sistema é información técnica accesible en modo lectura para administradores exclusivamente.
@@ -1977,6 +1981,7 @@ MailToSendSupplierOrder=Pedimentos a provedor
 MailToSendSupplierInvoice=Facturas provedor
 MailToSendContract=Contratos
 MailToSendReception=Recepcións
+MailToExpenseReport=Informes de gastos
 MailToThirdparty=Terceiros
 MailToMember=Membros
 MailToUser=Usuarios
@@ -2030,6 +2035,7 @@ MAIN_PDF_MARGIN_RIGHT=Marxe dereito en PDF
 MAIN_PDF_MARGIN_TOP=Marxe superior en PDF
 MAIN_PDF_MARGIN_BOTTOM=Marxe inferior en PDF
 MAIN_DOCUMENTS_LOGO_HEIGHT=Altura para logotipo en PDF
+DOC_SHOW_FIRST_SALES_REP=Amosar o primeiro representante de vendas
 MAIN_GENERATE_PROPOSALS_WITH_PICTURE=Engade unha columna para a imaxe nas liñas de orzamento á cliente
 MAIN_DOCUMENTS_WITH_PICTURE_WIDTH=Largura da columna se se engade unha imaxe nas liñas 
 MAIN_PDF_NO_SENDER_FRAME=Ocultar os bordos no marco do enderezo do remitente
@@ -2063,6 +2069,12 @@ EmailCollectors=Recolectores de correo electrónico
 EmailCollectorDescription=Engade unha tarefa programada e unha páxina de configuración para escanear regularmente caixas de correo electrónico (usando o protocolo IMAP) e gardarr os correos electrónicos recibidos na súa aplicación no lugar axeitado e/ou crear algúns rexistros automaticamente (como clientes potenciais).
 NewEmailCollector=Novo receptor de correo electrónico
 EMailHost=Anfitrión do servidor IMAP de correo electrónico
+EMailHostPort=Porto do servidor IMAP de correo electrónico
+loginPassword=Inicio de sesión/contrasinal
+oauthToken=Token Oauth2
+accessType=Tipo de acceso
+oauthService=Servizo de Auth
+TokenMustHaveBeenCreated=O módulo OAuth2 debe estar activado e debe crearse un token oauth2 cos permisos correctos (por exemplo, o ámbito "gmail_full" con OAuth para Gmail).
 MailboxSourceDirectory=Directorio fonte da caixa de correo
 MailboxTargetDirectory=Directorio de destino da caixa de correo
 EmailcollectorOperations=Operacións que debe facer o receptor
@@ -2106,7 +2118,7 @@ CreateCandidature=Crear solicitude de traballo
 FormatZip=Zip
 MainMenuCode=Código de entrada do menú (menú principal)
 ECMAutoTree=Amosar árbore automático GED
-OperationParamDesc=Define as regras a empregar para extraer ou establecer valores. <br> Exemplo de operacións que precisan extraer un nome do asunto do correo electrónico: <br> name=EXTRACT:SUBJECT:Mensaxe da empresa ([^\n] *) <br> Exemplo para operacións que crean obxectos: <br> objproperty1 = SET, o valor a establecer <br> objproperty2 = SET, un valor incluíndo valor de __objproperty1__ <br> objproperty3 = SETIFEMPTY: valor utilizado se objproperty3 se non foi definido <br> objproperty4 = EXTRACT: HEADER :X-Myheaderkey:\\s*([^\\s]*) <br> options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*) <br> object.objproperty5=EXTRACT:BODY:O nome da miña empresa é\\s( [^\\s]*) <br> <br> Use un ; char como separador para extraer ou establecer varias propiedades.
+OperationParamDesc=Defina as regras que se empregarán para extraer algúns datos ou establecer valores para utilizar na operación. <br> <br> Exemplo para extraer o nome dunha empresa do asunto do correo electrónico nunha variable temporal: <br> tmp_var=EXTRACT:SUBJECT:Mensaxe da empresa ([^\n]*) <br> <br> Exemplos para definir as propiedades dun obxecto a crear: <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 un ; char como separador para extraer propiedades
 OpeningHours=Horario de apertura
 OpeningHoursDesc=Introduza aquí o horario habitual da súa empresa.
 ResourceSetup=Configuración do módulo Recursos
@@ -2212,6 +2224,7 @@ NoExternalModuleWithUpdate=Non foron atopadas actualizacións para módulos exte
 SwaggerDescriptionFile=Ficheiro de descrición da API Swagger (para uso con redoc por exemplo)
 YouEnableDeprecatedWSAPIsUseRESTAPIsInstead=Activada a API WS obsoleta. No seu lugar debería usar a API REST. 
 RandomlySelectedIfSeveral=Selección aleatoria se hai varias imaxes dispoñibles
+SalesRepresentativeInfo=Para orzamentos, pedimentos, facturas.
 DatabasePasswordObfuscated=O contrasinal da base de datos está oculto no ficheiro conf
 DatabasePasswordNotObfuscated=O contrasinal da base de datos NON está oculto no ficheiro conf 
 APIsAreNotEnabled=Os módulos API non están activos
@@ -2277,5 +2290,20 @@ INVOICE_ADD_ZATCA_QR_CODEMore=Algúns países árabes necesitan este código QR
 INVOICE_ADD_SWISS_QR_CODE=Amosa o código suizo QR-Bill nas facturas
 UrlSocialNetworksDesc=Ligazón URL da rede social. Use {socialid} para a parte variable que contén o ID da rede social.
 IfThisCategoryIsChildOfAnother=Se esta categoría é filla doutra
+DarkThemeMode=Modo de tema escuro
+AlwaysDisabled=Sempre desactivado
+AccordingToBrowser=Segundo o navegador
+AlwaysEnabled=Sempre activado
+DoesNotWorkWithAllThemes=Non funcionará con todos os temas
 NoName=Sen nome
+ShowAdvancedOptions= Mostrar opcións avanzadas
+HideAdvancedoptions= Ocultar opcións avanzadas
 CIDLookupURL=O módulo trae un URL que pode ser usado por unha ferramenta externa para obter o nome dun terceiro ou contacto do seu número de teléfono. O URL a usar é:
+OauthNotAvailableForAllAndHadToBeCreatedBefore=A autenticación OAUTH2 non está dispoñible para todos os hosts e debe crearse un token cos permisos correctos subindo co módulo OAUTH
+MAIN_MAIL_SMTPS_OAUTH_SERVICE=Servizo de autenticación OAUTH2
+DontForgetCreateTokenOauthMod=Debe crearse un token cos permisos correctos co módulo OAUTH
+MAIN_MAIL_SMTPS_AUTH_TYPE=Método de autenticación
+UsePassword=Use un contrasinal
+UseOauth=Usa un token AUTH
+Images=Imaxes
+MaxNumberOfImagesInGetPost=Número máximo de imaxes permitidas nun campo HTML enviado nun formulario
diff --git a/htdocs/langs/gl_ES/agenda.lang b/htdocs/langs/gl_ES/agenda.lang
index 001480310bc..58c40160710 100644
--- a/htdocs/langs/gl_ES/agenda.lang
+++ b/htdocs/langs/gl_ES/agenda.lang
@@ -57,6 +57,7 @@ MemberValidatedInDolibarr=Membro %s validado
 MemberModifiedInDolibarr=Membro %s modificado
 MemberResiliatedInDolibarr=Membro %s rematado
 MemberDeletedInDolibarr=Membro %s eliminado
+MemberExcludedInDolibarr=Membro %s excluído
 MemberSubscriptionAddedInDolibarr=Subscrición %s do membro %s engadida
 MemberSubscriptionModifiedInDolibarr=Subscrición %s do membro %s modificada
 MemberSubscriptionDeletedInDolibarr=Subscrición %s do membro %s eliminada
@@ -159,6 +160,7 @@ DateActionBegin=Data de comezo do evento
 ConfirmCloneEvent=¿Esta certo de querer clonar o evento <b>%s</b>?
 RepeatEvent=Repetir evento
 OnceOnly=Só unha vez
+EveryDay=Tódolos días
 EveryWeek=Cada semana
 EveryMonth=Cada mes
 DayOfMonth=Día do mes
@@ -174,3 +176,4 @@ AddReminder=Crear unha notificación de lembranza automática para este evento
 ErrorReminderActionCommCreation=Erro ao crear a notificación de lembranza para este evento
 BrowserPush=Notificación emerxente no navegador
 ActiveByDefault=Activado por defecto
+Until=ata que
diff --git a/htdocs/langs/gl_ES/banks.lang b/htdocs/langs/gl_ES/banks.lang
index 47f0ce7f5fa..e21e90b021d 100644
--- a/htdocs/langs/gl_ES/banks.lang
+++ b/htdocs/langs/gl_ES/banks.lang
@@ -185,3 +185,4 @@ AlreadyOneBankAccount=Xa foi definida unha conta bancaria
 SEPAXMLPlacePaymentTypeInformationInCreditTransfertransactionInformation=Transferencia SEPA: "Tipo de pagamento" no nivel "Transferencia de crédito".
 SEPAXMLPlacePaymentTypeInformationInCreditTransfertransactionInformationHelp=Cando se xera un ficheiro XML SEPA para pagamento por transferencia, agora pódese colocar a sección "PaymentTypeInformation" dentro da sección "CreditTransferTransactionInformation" (en lugar da sección "Pagamento"). Recomendamos encarecidamente que non se marque esta opción para colocar PaymentTypeInformation a nivel de pagamento, xa que todos os bancos non a aceptarán necesariamente o nivel de CreditTransferTransactionInformation. Poñase en contacto co seu banco antes de colocar PaymentTypeInformation no nivel CreditTransferTransactionInformation.
 ToCreateRelatedRecordIntoBank=Para crear un rexistro bancario relacionado que falta
+BanklineExtraFields=Campos extra da liña bancaria
diff --git a/htdocs/langs/gl_ES/bills.lang b/htdocs/langs/gl_ES/bills.lang
index 4e949200842..dbb83e2c830 100644
--- a/htdocs/langs/gl_ES/bills.lang
+++ b/htdocs/langs/gl_ES/bills.lang
@@ -446,6 +446,7 @@ ErrorPaymentConditionsNotEligibleToDepositCreation=As condicións de pagamento e
 PaymentTypeVIR=Transferencia bancaria
 PaymentTypeShortVIR=Transferencia bancaria
 PaymentTypePRE=Domiciliación
+PaymentTypePREdetails=(na conta *-%s)
 PaymentTypeShortPRE=Domiciliación
 PaymentTypeLIQ=Efectivo
 PaymentTypeShortLIQ=Efectivo
diff --git a/htdocs/langs/hr_HR/accountancy.lang b/htdocs/langs/hr_HR/accountancy.lang
index 2a67266e2bc..5ea2c3b4248 100644
--- a/htdocs/langs/hr_HR/accountancy.lang
+++ b/htdocs/langs/hr_HR/accountancy.lang
@@ -48,8 +48,9 @@ CountriesNotInEEC=Zomlje koje nisu u EEC
 CountriesInEECExceptMe=Zemlje u EEC-u osim %s
 CountriesExceptMe=Sve zemlje osim %s
 AccountantFiles=Izvoz izvornih dokumenata
-ExportAccountingSourceDocHelp=Pomoću ovog alata možete izvesti izvorne događaje (popis u CSV-u i PDF-ovima) koji se koriste za generiranje vašeg računovodstva.
+ExportAccountingSourceDocHelp=With this tool, you can search and export the source events that are used to generate your accountancy. <br>The exported ZIP file will contain the lists of requested items in CSV, as well as their attached files in their original format (PDF, ODT, DOCX...).
 ExportAccountingSourceDocHelp2=To export your journals, use the menu entry %s - %s.
+ExportAccountingProjectHelp=Specify a project if you need an accounting report only for a specific project. Expense reports and loan payments are not included in project reports.
 VueByAccountAccounting=View by accounting account
 VueBySubAccountAccounting=View by accounting subaccount
 
@@ -183,6 +184,8 @@ ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT=Accounting account to register subscript
 
 ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT=Accounting account by default to register customer deposit
 UseAuxiliaryAccountOnCustomerDeposit=Store customer account as individual account in subsidiary ledger for lines of down payments (if disabled, individual account for down payment lines will remain empty)
+ACCOUNTING_ACCOUNT_SUPPLIER_DEPOSIT=Accounting account by default to register supplier deposit
+UseAuxiliaryAccountOnSupplierDeposit=Store supplier account as individual account in subsidiary ledger for lines of down payments (if disabled, individual account for down payment lines will remain empty)
 
 ACCOUNTING_PRODUCT_BUY_ACCOUNT=Accounting account by default for the bought products (used if not defined in the product sheet)
 ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT=Accounting account by default for the bought products in EEC (used if not defined in the product sheet)
@@ -332,7 +335,7 @@ ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS=Disable binding & transfer in accou
 
 ## Export
 NotifiedExportDate=Flag exported lines as Exported <span class="warning">(to modify a line, you will need to delete the whole transaction and re-transfert it into accounting)</span>
-NotifiedValidationDate=Validate and Lock the exported entries <span class="warning">(same effect than the "Closure" feature, modification and deletion of the lines will DEFINITELY not be possible)</span>
+NotifiedValidationDate=Validate and Lock the exported entries <span class="warning">(same effect than the "%s" feature, modification and deletion of the lines will DEFINITELY not be possible)</span>
 DateValidationAndLock=Potvrda datuma i zaključavanje
 ConfirmExportFile=Potvrda generiranja datoteke za izvoz računovodstva?
 ExportDraftJournal=Export draft journal
diff --git a/htdocs/langs/hr_HR/admin.lang b/htdocs/langs/hr_HR/admin.lang
index d3b008d537c..cd529749db1 100644
--- a/htdocs/langs/hr_HR/admin.lang
+++ b/htdocs/langs/hr_HR/admin.lang
@@ -477,7 +477,7 @@ InstalledInto=Instalirano u direktorij %s
 BarcodeInitForThirdparties=Mass barcode init for third-parties
 BarcodeInitForProductsOrServices=Masovno postavljanje ili promjena barkodova usluga i proizvoda
 CurrentlyNWithoutBarCode=Trenutno, imate <strong>%s</strong> podataka na <strong>%s</strong> %s bez definiranog barkoda.
-InitEmptyBarCode=Inicijalna vrijednost za sljedećih %s praznih podataka
+InitEmptyBarCode=Init value for the %s empty barcodes
 EraseAllCurrentBarCode=Obriše sve trenutne vrijednosti barkoda
 ConfirmEraseAllCurrentBarCode=Jeste li sigurni da želite obrisati sve trenutne barkod vrijednosti ?
 AllBarcodeReset=Sve barkod vrijednosti su obrisane
@@ -714,6 +714,7 @@ Permission27=Obriši ponudu
 Permission28=Izvezi ponude
 Permission31=Čitaj proizvode
 Permission32=Izradi/izmjeni proizvod
+Permission33=Read prices products
 Permission34=Obriši proizvod
 Permission36=Pregled/upravljanje skrivenim proizvodima
 Permission38=izvoz proizvoda
@@ -739,6 +740,7 @@ Permission79=Izradi/izmjeni pretplate
 Permission81=Čitaj narudžbe kupca
 Permission82=Izradi/izmjeni narudžbe kupaca
 Permission84=Ovjeri narudžbu kupca
+Permission85=Generate the documents sales orders
 Permission86=Pošalji narudžbu kupca
 Permission87=Zatvori narudžbu kupca
 Permission88=Otkaži potvrdu 
@@ -874,6 +876,7 @@ Permission525=Pristup kreditnom kalkulatoru
 Permission527=Izvoz kredita
 Permission531=Čitaj usluge
 Permission532=Izradi/izmjeni usluge
+Permission533=Read prices services
 Permission534=Obriši usluge
 Permission536=Vidi/upravljaj skrivenim uslugama
 Permission538=Izvezi usluge
@@ -1235,6 +1238,7 @@ BrowserName=Naziv preglednika
 BrowserOS=OS preglednika
 ListOfSecurityEvents=Popis Dolibarr sigurnosnih događaja
 SecurityEventsPurged=Sigurnosni događaji trajno obrisani
+TrackableSecurityEvents=Trackable security events
 LogEventDesc=Omogućite bilježenje određenih sigurnosnih događaja. Administratori bilježe zapisnik putem izbornika <b> %s - %s </b> . Upozorenje, ova značajka može generirati veliku količinu podataka u bazi podataka.
 AreaForAdminOnly=Parametre postavljanja mogu postaviti samo <b> administratorski korisnici </b>.
 SystemInfoDesc=Informacije o sustavu su razne tehničke informacije koje dobivate u načinu samo za čitanje i vidljive samo administratorima.
@@ -1977,6 +1981,7 @@ MailToSendSupplierOrder=Narudžbe dobavljačima
 MailToSendSupplierInvoice=Ulazni računi
 MailToSendContract=Ugovori
 MailToSendReception=Receptions
+MailToExpenseReport=Troškovnici
 MailToThirdparty=Treće osobe
 MailToMember=Članovi
 MailToUser=Korisnici
@@ -2030,6 +2035,7 @@ MAIN_PDF_MARGIN_RIGHT=Desna margina u PDF-u
 MAIN_PDF_MARGIN_TOP=Gornja margina u PDF-u
 MAIN_PDF_MARGIN_BOTTOM=Donja margina u PDF-u
 MAIN_DOCUMENTS_LOGO_HEIGHT=Visina za logo u PDF-u
+DOC_SHOW_FIRST_SALES_REP=Show first sales representative
 MAIN_GENERATE_PROPOSALS_WITH_PICTURE=Dodajte stupac za sliku u retke prijedloga
 MAIN_DOCUMENTS_WITH_PICTURE_WIDTH=Širina stupca ako se slika dodaje na redove
 MAIN_PDF_NO_SENDER_FRAME=Sakrij obrube na okviru adrese pošiljatelja
@@ -2063,6 +2069,12 @@ EmailCollectors=Email collectors
 EmailCollectorDescription=Dodajte zakazani posao i stranicu za postavljanje za redovito skeniranje sandučića e-pošte (pomoću IMAP protokola) i snimanje e-pošte primljenih u vašu aplikaciju, na pravom mjestu i/ili kreiranje nekih zapisa automatski (poput potencijalnih klijenata).
 NewEmailCollector=Novi sakupljač e-pošte
 EMailHost=Host IMAP poslužitelja e-pošte
+EMailHostPort=Port of email IMAP server
+loginPassword=Login/Password
+oauthToken=Oauth2 token
+accessType=Acces type
+oauthService=Oauth service
+TokenMustHaveBeenCreated=Module OAuth2 must be enabled and an oauth2 token must have been created with the correct permissions (for example scope "gmail_full" with OAuth for Gmail).
 MailboxSourceDirectory=Izvorni imenik poštanskog sandučića
 MailboxTargetDirectory=Ciljni direktorij poštanskog sandučića
 EmailcollectorOperations=Operations to do by collector
@@ -2106,7 +2118,7 @@ CreateCandidature=Napravite prijavu za posao
 FormatZip=PBR
 MainMenuCode=Kôd za unos izbornika (glavni izbornik)
 ECMAutoTree=Prikaži automatsko ECM stablo
-OperationParamDesc=Define the rules to use to extract or set values.<br>Example for operations that need to extract a name from email subject:<br>name=EXTRACT:SUBJECT:Message from company ([^\n]*)<br>Example for operations that create objects:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value including value of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
+OperationParamDesc=Define the rules to use to extract some data or set values to use for operation.<br><br>Example to extract a company name from email subject into a temporary variable:<br>tmp_var=EXTRACT:SUBJECT:Message from company ([^\n]*)<br><br>Examples to set the properties of an object to create:<br>objproperty1=SET:a hard coded value<br>objproperty2=SET:__tmp_var__<br>objproperty3=SETIFEMPTY:a value (value is set only if property is not already defined)<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
 OpeningHours=Radno vrijeme
 OpeningHoursDesc=Ovdje unesite redovno radno vrijeme Vaše tvrtke.
 ResourceSetup=Configuration of Resource module
@@ -2212,6 +2224,7 @@ NoExternalModuleWithUpdate=Nisu pronađena ažuriranja za vanjske module
 SwaggerDescriptionFile=Datoteka opisa Swagger API-ja (za korištenje s redoc, na primjer)
 YouEnableDeprecatedWSAPIsUseRESTAPIsInstead=Omogućili ste zastarjeli WS API. Umjesto toga trebali biste koristiti REST API.
 RandomlySelectedIfSeveral=Nasumično odaberi ako je dostupno nekoliko slika
+SalesRepresentativeInfo=For Proposals, Orders, Invoices.
 DatabasePasswordObfuscated=Lozinka baze podataka je prikrivena u conf datoteci
 DatabasePasswordNotObfuscated=Lozinka baze podataka NIJE prikrivena u conf datoteci
 APIsAreNotEnabled=API moduli nisu omogućeni
@@ -2277,5 +2290,20 @@ INVOICE_ADD_ZATCA_QR_CODEMore=Some Arabic countries need this QR Code on their i
 INVOICE_ADD_SWISS_QR_CODE=Show the swiss QR-Bill code on invoices
 UrlSocialNetworksDesc=Url link of social network. Use {socialid} for the variable part that contains the social network ID.
 IfThisCategoryIsChildOfAnother=If this category is a child of another one
+DarkThemeMode=Dark theme mode
+AlwaysDisabled=Always disabled
+AccordingToBrowser=According to browser
+AlwaysEnabled=Always Enabled
+DoesNotWorkWithAllThemes=Will not work with all themes
 NoName=No name
+ShowAdvancedOptions= Show advanced options
+HideAdvancedoptions= Hide advanced options
 CIDLookupURL=The module brings an URL that can be used by an external tool to get the name of a thirdparty or contact from its phone number. URL to use is:
+OauthNotAvailableForAllAndHadToBeCreatedBefore=OAUTH2 authentication is not available for all hosts, and a token with the right permissions must have been created upstream with the OAUTH module
+MAIN_MAIL_SMTPS_OAUTH_SERVICE=OAUTH2 authentication service
+DontForgetCreateTokenOauthMod=A token with the right permissions must have been created upstream with the OAUTH module
+MAIN_MAIL_SMTPS_AUTH_TYPE=Authentification method
+UsePassword=Use a password
+UseOauth=Use a OAUTH token
+Images=Images
+MaxNumberOfImagesInGetPost=Max number of images allowed in a HTML field submitted in a form
diff --git a/htdocs/langs/hu_HU/accountancy.lang b/htdocs/langs/hu_HU/accountancy.lang
index c0a9fb93a66..e42a9cc7505 100644
--- a/htdocs/langs/hu_HU/accountancy.lang
+++ b/htdocs/langs/hu_HU/accountancy.lang
@@ -48,8 +48,9 @@ CountriesNotInEEC=Az EGK-n kívüli országok
 CountriesInEECExceptMe=Az EGK országai, kivéve %s
 CountriesExceptMe=Minden ország, kivéve %s
 AccountantFiles=Forrásdokumentumok exportálása
-ExportAccountingSourceDocHelp=Ezzel az eszközzel exportálhatja azokat a forráseseményeket (listát CSV-ben és PDF-ben), amelyek a könyvelés létrehozására szolgálnak.
+ExportAccountingSourceDocHelp=Ezzel az eszközzel megkeresheti és exportálhatja a könyvelés generálásához használt forráseseményeket. <br> Az exportált ZIP fájl tartalmazza a kért elemek listáját CSV-ben, valamint a hozzájuk csatolt fájlokat eredeti formátumukban (PDF, ODT, DOCX...).
 ExportAccountingSourceDocHelp2=A naplók exportálásához használja a %s - %s menüpontot.
+ExportAccountingProjectHelp=Adjon meg egy projektet, ha csak egy adott projekthez van szüksége számviteli jelentésre. A költségjelentések és a hitelkifizetések nem szerepelnek a projektjelentésekben.
 VueByAccountAccounting=Megtekintés könyvelési fiók szerint
 VueBySubAccountAccounting=Megtekintés könyvelési alfiók szerint
 
@@ -183,6 +184,8 @@ ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT=Számviteli fiók az előfizetések regi
 
 ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT=Alapértelmezés szerint számlaszámla az ügyfél befizetésének regisztrálásához
 UseAuxiliaryAccountOnCustomerDeposit=Ügyfélszámla tárolása egyéni számlaként a leányfőkönyvben az előlegsorokhoz (ha le van tiltva, az előlegsorokhoz tartozó egyéni számla üres marad)
+ACCOUNTING_ACCOUNT_SUPPLIER_DEPOSIT=Alapértelmezett számviteli számla szállítói előleg nyilvántartásba vételére
+UseAuxiliaryAccountOnSupplierDeposit=Tárolja a szállítói számlát egyéni számlaként a alfőkönyvben az előlegsorokhoz (letiltás esetén az előlegsorok egyéni számla üresen marad)
 
 ACCOUNTING_PRODUCT_BUY_ACCOUNT=Alapértelmezés szerint a vásárolt termékek számviteli fiókja (használjuk, ha nincs megadva a terméklapon)
 ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT=Alapértelmezés szerint az EGK-ban vásárolt termékek számviteli fiókja (használjuk, ha nincs megadva a terméklapon)
@@ -332,7 +335,7 @@ ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS=A kötés és átvitel letiltása a
 
 ## Export
 NotifiedExportDate=Az exportált sorok megjelölése exportáltként (a sorok módosítása nem lehetséges)
-NotifiedValidationDate=Érvényesítse az exportált bejegyzéseket (a sorok módosítása vagy törlése nem lehetséges)
+NotifiedValidationDate=Érvényesítse és zárolja az exportált bejegyzéseket <span class="warning"> (ugyanaz a hatás, mint az "%s" funkciónál, a sorok módosítása és törlése BIZTOSAN nem lehetséges) </span>
 DateValidationAndLock=Dátumellenőrzés és zárolás
 ConfirmExportFile=A számviteli exportfájl létrehozásának megerősítése?
 ExportDraftJournal=Vázlatos napló exportálása
diff --git a/htdocs/langs/hu_HU/admin.lang b/htdocs/langs/hu_HU/admin.lang
index 2390421ecd1..1a119f91c09 100644
--- a/htdocs/langs/hu_HU/admin.lang
+++ b/htdocs/langs/hu_HU/admin.lang
@@ -477,7 +477,7 @@ InstalledInto=Telepítve az %s könyvtárba
 BarcodeInitForThirdparties=Tömeges vonalkód készítése partnereknek
 BarcodeInitForProductsOrServices=A termékek vagy szolgáltatások tömeges vonalkód-indítása vagy visszaállítása
 CurrentlyNWithoutBarCode=Jelenleg <strong>%s</strong> rekord van az <strong>%s</strong> %s vonalkód nélkül.
-InitEmptyBarCode=A következő %s üres rekord kezdeti értéke
+InitEmptyBarCode=A(z) %s üres vonalkód kezdőértéke
 EraseAllCurrentBarCode=Törölje az összes jelenlegi vonalkód-értéket
 ConfirmEraseAllCurrentBarCode=Biztosan törli az összes jelenlegi vonalkód-értéket?
 AllBarcodeReset=Az összes vonalkód-érték eltávolítva
@@ -714,6 +714,7 @@ Permission27=Törlés kereskedelmi javaslatok
 Permission28=Export üzleti ajánlatot
 Permission31=Olvassa termékek
 Permission32=Létrehozza / módosítja termékek
+Permission33=Olvassa el a termékek árait
 Permission34=Törlés termékek
 Permission36=Lásd / kezelhetik rejtett termékek
 Permission38=Export termékek
@@ -739,6 +740,7 @@ Permission79=Létrehozza / módosítja előfizetések
 Permission81=Olvassa el az ügyfelek megrendelések
 Permission82=Létrehozza / módosítja ügyfelek megrendelések
 Permission84=Érvényesítése az ügyfelek megrendelések
+Permission85=Az értékesítési rendelések dokumentumainak létrehozása
 Permission86=Küldje ügyfelek megrendelések
 Permission87=Bezár az ügyfelek megrendelések
 Permission88=Mégsem ügyfelek megrendelések
@@ -874,6 +876,7 @@ Permission525=Hozzáférés a hitelkalkulátorhoz
 Permission527=Export hitelek
 Permission531=Olvassa szolgáltatások
 Permission532=Létrehozza / módosítja szolgáltatások
+Permission533=Olvassa el a szolgáltatások árait
 Permission534=Törlés szolgáltatások
 Permission536=Lásd még: / szolgáltatások kezelésére rejtett
 Permission538=Export szolgáltatások
@@ -1235,6 +1238,7 @@ BrowserName=Böngésző neve
 BrowserOS=Böngésző operációs rendszere
 ListOfSecurityEvents=Listája Dolibarr biztonsági események
 SecurityEventsPurged=Biztonsági események kitisztítják
+TrackableSecurityEvents=Trackable security events
 LogEventDesc=Adott biztonsági események naplózásának engedélyezése. A napló adminisztrátora a <b>%s - %s</b> menün keresztül. Figyelmeztetés, ez a funkció nagy mennyiségű adatot generálhat az adatbázisban.
 AreaForAdminOnly=A beállítási paramétereket csak <b>rendszergazdai felhasználók</b> állíthatják be.
 SystemInfoDesc=Rendszer információk különféle műszaki információkat kapunk a csak olvasható módban, és csak rendszergazdák számára látható.
@@ -1737,10 +1741,10 @@ AdvancedEditor=Speciális szerkesztő
 ActivateFCKeditor=Aktiválja a fejlett szerkesztő:
 FCKeditorForNotePublic=Az elemek "nyilvános megjegyzései" mező WYSIWIG létrehozása/kiadása
 FCKeditorForNotePrivate=WYSIWIG létrehozása/kiadása az elemek "privát megjegyzései" mezőjének
-FCKeditorForCompany=Az elemek mezőleírásának WYSIWIG létrehozása/kiadása (kivéve a termékek/szolgáltatások)
+FCKeditorForCompany=Az elemek mező leírásának WYSIWIG létrehozása/kiadása (kivéve a termékek/szolgáltatások)
 FCKeditorForProduct=A termékek/szolgáltatások mező leírásának WYSIWIG létrehozása/kiadása
 FCKeditorForProductDetails=WYSIWIG termékrészletező sorok létrehozása/kiadása minden entitáshoz (ajánlatok, rendelések, számlák stb.). <span class="warning">Figyelmeztetés: Ebben az esetben ennek a lehetőségnek a használata komolyan nem javasolt, mivel problémákat okozhat a speciális karakterekkel és az oldalformázással a PDF-fájlok létrehozásakor.</span>
-FCKeditorForMailing= WYSIWIG létrehozása / kiadás levelek
+FCKeditorForMailing= WYSIWIG létrehozása/kiadása tömeges e-mailekhez (Eszközök->e-mailezés)
 FCKeditorForUserSignature=WYSIWIG felhasználói aláírás létrehozása/kiadása
 FCKeditorForMail=WYSIWIG létrehozása/kiadása minden levélhez (kivéve az Eszközök->e-mailezés)
 FCKeditorForTicket=WYSIWIG létrehozása/kiadása jegyekhez
@@ -1977,6 +1981,7 @@ MailToSendSupplierOrder=Beszerzési rendelések
 MailToSendSupplierInvoice=Szállítói számlák
 MailToSendContract=Szerződések
 MailToSendReception=Fogadások
+MailToExpenseReport=Költségjelentések
 MailToThirdparty=Partner
 MailToMember=Tagok
 MailToUser=Felhasználók
@@ -2030,6 +2035,7 @@ MAIN_PDF_MARGIN_RIGHT=PDF jobb margója
 MAIN_PDF_MARGIN_TOP=Felső margó a PDF-en
 MAIN_PDF_MARGIN_BOTTOM=Alsó margó a PDF-en
 MAIN_DOCUMENTS_LOGO_HEIGHT=A logó magassága PDF-ben
+DOC_SHOW_FIRST_SALES_REP=Mutasd meg az első értékesítési képviselőt
 MAIN_GENERATE_PROPOSALS_WITH_PICTURE=Oszlop hozzáadása a képhez az ajánlatsorokhoz
 MAIN_DOCUMENTS_WITH_PICTURE_WIDTH=Oszlop szélessége, ha kép van hozzáadva a sorokhoz
 MAIN_PDF_NO_SENDER_FRAME=Szegélyek elrejtése a küldő címkeretén
@@ -2063,6 +2069,12 @@ EmailCollectors=E-mail gyűjtők
 EmailCollectorDescription=Adjon hozzá egy ütemezett feladatot és egy beállítási oldalt az e-mail fiókok rendszeres ellenőrzéséhez (IMAP protokoll használatával), és rögzítse a kapott e-maileket az alkalmazásba, a megfelelő helyre, és/vagy automatikusan hozzon létre néhány rekordot (például leadeket).
 NewEmailCollector=Új e-mail gyűjtő
 EMailHost=E-mail IMAP szerver gazdája
+EMailHostPort=Az e-mail IMAP-kiszolgáló portja
+loginPassword=Bejelentkezés/Jelszó
+oauthToken=Oauth2 token
+accessType=Hozzáférés típusa
+oauthService=Oauth szolgáltatás
+TokenMustHaveBeenCreated=Engedélyezni kell az OAuth2 modult, és létre kell hozni egy oauth2 tokent a megfelelő jogosultságokkal (például „gmail_full” hatókörrel a Gmailhez készült OAuth segítségével).
 MailboxSourceDirectory=Postaláda forráskönyvtára
 MailboxTargetDirectory=Postaláda célkönyvtár
 EmailcollectorOperations=A gyűjtő által elvégzendő műveletek
@@ -2106,7 +2118,7 @@ CreateCandidature=Állással kapcsolatos jelentkezés létrehozása
 FormatZip=Zip
 MainMenuCode=Menü belépési kód (főmenü)
 ECMAutoTree=Automatikus ECM fa megjelenítése
-OperationParamDesc=Határozza meg az értékek kibontásához vagy beállításához használandó szabályokat.<br>Példa olyan műveletekre, amelyeknél nevet kell kivonni az e-mail tárgyából:<br>name=EXTRACT:SUBJECT:Üzenet a cégtől ([^\n]*)< br>Példa objektumokat létrehozó műveletekre:<br>objproperty1=SET:a beállítandó érték<br>objproperty2=SET:a __objproperty1__ értékét tartalmazó érték<br>objproperty3=SETIFEMPTY:érték akkor használatos, ha az objproperty3 még nincs megadva<br >objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT :BODY:A cégem neve\\s([^\\s]*)<br><br>Használjon egy ; char elválasztóként több tulajdonság kinyeréséhez vagy beállításához.
+OperationParamDesc=Határozza meg azokat a szabályokat, amelyek alapján bizonyos adatokat vagy értékeket szeretne kinyerni a működéshez. <br> <br> Példa egy cégnév kinyerésére az e-mail tárgyából egy ideiglenes változóba: <br> tmp_var=EXTRACT:SUBJECT:Üzenet a cégtől ([^\n]*) <br> <br> Példák egy létrehozandó objektum tulajdonságainak beállítására: <br> objproperty1=SET:egy keményen kódolt érték <br> objproperty2=SET:__tmp_var__<br>objproperty3=SETIFEMPTY:egy érték (az érték csak akkor van beállítva, ha a tulajdonság még nincs megadva)<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:A cégem neve\\s([^\\s]*) <br><br>  Használjon egy ; karaktert elválasztóként több tulajdonság kinyeréséhez vagy beállításához.
 OpeningHours=Nyitvatartási idő
 OpeningHoursDesc=Írja be a cége szokásos nyitvatartási idejét.
 ResourceSetup=Az erőforrás modul beállítása
@@ -2212,6 +2224,7 @@ NoExternalModuleWithUpdate=Nem találhatók frissítések a külső modulokhoz
 SwaggerDescriptionFile=Swagger API leíró fájl (például redoc-hoz)
 YouEnableDeprecatedWSAPIsUseRESTAPIsInstead=Engedélyezte az elavult WS API-t. Használja helyette a REST API-t.
 RandomlySelectedIfSeveral=Véletlenszerűen kiválasztott, ha több kép is elérhető
+SalesRepresentativeInfo=For Proposals, Orders, Invoices.
 DatabasePasswordObfuscated=Az adatbázis jelszava homályos a konf fájlban
 DatabasePasswordNotObfuscated=Az adatbázis jelszava NINCS homályos a conf fájlban
 APIsAreNotEnabled=Az API-modulok nincsenek engedélyezve
@@ -2277,5 +2290,20 @@ INVOICE_ADD_ZATCA_QR_CODEMore=Egyes arab országoknak szüksége van erre a QR-k
 INVOICE_ADD_SWISS_QR_CODE=Mutassa meg a svájci QR-Bill kódot a számlákon
 UrlSocialNetworksDesc=A közösségi hálózat URL-címe. Használja az {socialid} változót a közösségi hálózat azonosítóját tartalmazó változó részhez.
 IfThisCategoryIsChildOfAnother=Ha ez a kategória egy másik gyermeke
+DarkThemeMode=Sötét téma mód
+AlwaysDisabled=Mindig letiltva
+AccordingToBrowser=A böngésző szerint
+AlwaysEnabled=Mindig engedélyezve
+DoesNotWorkWithAllThemes=Nem fog működni minden témával
 NoName=Névtelen
+ShowAdvancedOptions= Speciális beállítások megjelenítése
+HideAdvancedoptions= Speciális beállítások elrejtése
 CIDLookupURL=A modul egy URL-t hoz, amelyet egy külső eszköz felhasználhat egy harmadik fél vagy kapcsolat nevének lekérésére a telefonszámából. A használandó URL:
+OauthNotAvailableForAllAndHadToBeCreatedBefore=Az OAUTH2 hitelesítés nem érhető el minden gazdagépen, és a megfelelő jogosultságokkal rendelkező tokent az OAUTH-modullal felfelé kell létrehozni.
+MAIN_MAIL_SMTPS_OAUTH_SERVICE=OAUTH2 hitelesítési szolgáltatás
+DontForgetCreateTokenOauthMod=A megfelelő jogosultságokkal rendelkező tokent az OAUTH modullal felfelé kell létrehozni
+MAIN_MAIL_SMTPS_AUTH_TYPE=Hitelesítési módszer
+UsePassword=Használjon jelszót
+UseOauth=Használjon OAUTH tokent
+Images=Képek
+MaxNumberOfImagesInGetPost=Egy űrlapon elküldött HTML-mezőben megengedett maximális képek száma
diff --git a/htdocs/langs/hu_HU/agenda.lang b/htdocs/langs/hu_HU/agenda.lang
index ff4cce05e2c..f5c667ac88d 100644
--- a/htdocs/langs/hu_HU/agenda.lang
+++ b/htdocs/langs/hu_HU/agenda.lang
@@ -57,6 +57,7 @@ MemberValidatedInDolibarr=%s tag jóváhagyva
 MemberModifiedInDolibarr=%s tag módosítva
 MemberResiliatedInDolibarr=%s tag megszűnt
 MemberDeletedInDolibarr=%s tag törölve
+MemberExcludedInDolibarr=%s tag kizárva
 MemberSubscriptionAddedInDolibarr=%s előfizetés hozzáadva %s taghoz
 MemberSubscriptionModifiedInDolibarr=%s tag előfizetése módosítva
 MemberSubscriptionDeletedInDolibarr=%s tag %s előfizetése törölve
@@ -159,6 +160,7 @@ DateActionBegin=Az esemény kezdő dátuma
 ConfirmCloneEvent=Biztosan klónozni szeretné a(z) <b>%s</b> eseményt?
 RepeatEvent=Esemény megismétlése
 OnceOnly=Csak egyszer
+EveryDay=Minden nap
 EveryWeek=Minden héten
 EveryMonth=Minden hónap
 DayOfMonth=A hónap napja
@@ -174,3 +176,4 @@ AddReminder=Hozzon létre egy automatikus emlékeztető értesítést ehhez az e
 ErrorReminderActionCommCreation=Hiba történt az esemény emlékeztető értesítésének létrehozásakor
 BrowserPush=A böngésző felugró értesítése
 ActiveByDefault=Alapértelmezés szerint engedélyezve
+Until=amíg
diff --git a/htdocs/langs/hu_HU/bills.lang b/htdocs/langs/hu_HU/bills.lang
index 2c16a652523..e0dd310975b 100644
--- a/htdocs/langs/hu_HU/bills.lang
+++ b/htdocs/langs/hu_HU/bills.lang
@@ -405,8 +405,8 @@ ViewAvailableGlobalDiscounts=Az elérhető kedvezmények megtekintése
 GroupPaymentsByModOnReports=A kifizetések csoportosítása mód szerint a jelentésekben
 # PaymentConditions
 Statut=Állapot
-PaymentConditionShortRECEP=Átvételkor esedékes
-PaymentConditionRECEP=Átvételkor esedékes
+PaymentConditionShortRECEP=Utánvétel
+PaymentConditionRECEP=Utánvétel
 PaymentConditionShort30D=30 nap
 PaymentCondition30D=30 nap
 PaymentConditionShort30DENDMONTH=30 nap a hónap végén
@@ -446,6 +446,7 @@ ErrorPaymentConditionsNotEligibleToDepositCreation=A választott fizetési felt
 PaymentTypeVIR=Banki átutalás
 PaymentTypeShortVIR=Banki átutalás
 PaymentTypePRE=Beszedési megbízás
+PaymentTypePREdetails=(a fiókban *-%s)
 PaymentTypeShortPRE=Teher fizetési megbízás
 PaymentTypeLIQ=Készpénz
 PaymentTypeShortLIQ=Kp
diff --git a/htdocs/langs/id_ID/assets.lang b/htdocs/langs/id_ID/assets.lang
index 3edb66e636f..d62317e748e 100644
--- a/htdocs/langs/id_ID/assets.lang
+++ b/htdocs/langs/id_ID/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,52 +16,171 @@
 #
 # Generic
 #
-Assets = Aset
-NewAsset = Aset baru
-AccountancyCodeAsset = Kode akuntansi (aset)
-AccountancyCodeDepreciationAsset = Kode akuntansi (akun penyusutan aset)
-AccountancyCodeDepreciationExpense = Kode akuntansi (akun penyusutan pengeluaran)
-NewAssetType=Jenis aset baru
-AssetsTypeSetup=Pengaturan jenis aset
-AssetTypeModified=Jenis aset diubah
-AssetType=Jenis aset
+NewAsset=Aset baru
+AccountancyCodeAsset=Kode akuntansi (aset)
+AccountancyCodeDepreciationAsset=Kode akuntansi (akun penyusutan aset)
+AccountancyCodeDepreciationExpense=Kode akuntansi (akun penyusutan pengeluaran)
 AssetsLines=Aset
 DeleteType=Hapus
-DeleteAnAssetType=Hapus jenis aset
-ConfirmDeleteAssetType=Anda yakin ingin menghapus jenis aset ini?
-ShowTypeCard=Tampilkan jenis '%s'
+DeleteAnAssetType=Hapus model aset
+ConfirmDeleteAssetType=Anda yakin ingin menghapus aset model ini?
+ShowTypeCard=Tampilkan model '1%s'
 
 # Module label 'ModuleAssetsName'
-ModuleAssetsName = Aset
+ModuleAssetsName=Aset
 # Module description 'ModuleAssetsDesc'
-ModuleAssetsDesc = Deskripsi Aset
+ModuleAssetsDesc=Deskripsi Aset
 
 #
 # Admin page
 #
-AssetsSetup = Pengaturan aset
-Settings = Pengaturan
-AssetsSetupPage = Halaman pengaturan aset
-ExtraFieldsAssetsType = Atribut pelengkap (jenis aset)
-AssetsType=Jenis aset
-AssetsTypeId=Id jenis aset
-AssetsTypeLabel=Label jenis aset
-AssetsTypes=Jenis aset
+AssetSetup=Pengaturan aset
+AssetSetupPage=Halaman pengaturan aset
+ExtraFieldsAssetModel=Complementary attributes (Asset's model)
+
+AssetsType=Asset model
+AssetsTypeId=Asset model id
+AssetsTypeLabel=Asset model label
+AssetsTypes=Assets models
+ASSET_ACCOUNTANCY_CATEGORY=Grup akuntansi aset tetap
 
 #
 # Menu
 #
-MenuAssets = Aset
-MenuNewAsset = Aset baru
-MenuTypeAssets = Ketikkan aset
-MenuListAssets = Daftar
-MenuNewTypeAssets = Baru
-MenuListTypeAssets = Daftar
+MenuAssets=Aset
+MenuNewAsset=Aset baru
+MenuAssetModels=Model assets
+MenuListAssets=Daftar
+MenuNewAssetModel=New asset's model
+MenuListAssetModels=Daftar
 
 #
 # Module
 #
-Asset=Aset
-NewAssetType=Jenis aset baru
-NewAsset=Aset baru
 ConfirmDeleteAsset=Anda yakin ingin menghapus aset ini?
+
+#
+# Tab
+#
+AssetDepreciationOptions=Pilihan depresiasi
+AssetAccountancyCodes=Akun akuntansi
+AssetDepreciation=Depresiasi
+
+#
+# Asset
+#
+Asset=Aset
+Assets=Aset
+AssetReversalAmountHT=Nilai pembalikan (tanpa pajak)
+AssetAcquisitionValueHT=Nilai akuisisi (tanpa pajak)
+AssetRecoveredVAT=Recovered VAT
+AssetReversalDate=Tanggal pembalikan
+AssetDateAcquisition=Tanggal perolehan
+AssetDateStart=Date of start-up
+AssetAcquisitionType=Jenis akuisisi
+AssetAcquisitionTypeNew=Baru
+AssetAcquisitionTypeOccasion=Digunakan
+AssetType=Jenis aset
+AssetTypeIntangible=Tidak berwujud
+AssetTypeTangible=Berwujud
+AssetTypeInProgress=Dalam proses
+AssetTypeFinancial=Finansial
+AssetNotDepreciated=Tidak terdepresiasi
+AssetDisposal=Pembuangan
+AssetConfirmDisposalAsk=Anda yakin ingin membuang aset <b> %s </b>?
+AssetConfirmReOpenAsk=Anda yakin ingin membuka kembali aset <b> %s </b> ?
+
+#
+# Asset status
+#
+AssetInProgress=Dalam proses
+AssetDisposed=Dibuang
+AssetRecorded=Diperhitungkan
+
+#
+# Asset disposal
+#
+AssetDisposalDate=Tanggal dibuang
+AssetDisposalAmount=Disposal value
+AssetDisposalType=Type of disposal
+AssetDisposalDepreciated=Depreciate the year of transfer
+AssetDisposalSubjectToVat=Disposal subject to VAT
+
+#
+# Asset model
+#
+AssetModel=Asset's model
+AssetModels=Asset's models
+
+#
+# Asset depreciation options
+#
+AssetDepreciationOptionEconomic=Depresiasi ekonomi
+AssetDepreciationOptionAcceleratedDepreciation=Accelerated depreciation (tax)
+AssetDepreciationOptionDepreciationType=Jenis depresiasi
+AssetDepreciationOptionDepreciationTypeLinear=Garis lurus
+AssetDepreciationOptionDepreciationTypeDegressive=Menurun
+AssetDepreciationOptionDepreciationTypeExceptional=Pengecualian
+AssetDepreciationOptionDegressiveRate=Tingkat penurunan
+AssetDepreciationOptionAcceleratedDepreciation=Accelerated depreciation (tax)
+AssetDepreciationOptionDuration=Durasi
+AssetDepreciationOptionDurationType=Jenis durasi
+AssetDepreciationOptionDurationTypeAnnual=Tahunan
+AssetDepreciationOptionDurationTypeMonthly=Bulanan
+AssetDepreciationOptionDurationTypeDaily=Harian
+AssetDepreciationOptionRate=Nilai (%%)
+AssetDepreciationOptionAmountBaseDepreciationHT=Dasar depresiasi (tanpa PPN)
+AssetDepreciationOptionAmountBaseDeductibleHT=Dasar pengurangan (tanpa PPN)
+AssetDepreciationOptionTotalAmountLastDepreciationHT=Total amount last depreciation (excl. VAT)
+
+#
+# Asset accountancy codes
+#
+AssetAccountancyCodeDepreciationEconomic=Depresiasi ekonomi
+AssetAccountancyCodeAsset=Aset
+AssetAccountancyCodeDepreciationAsset=Depresiasi
+AssetAccountancyCodeDepreciationExpense=Biaya depresiasi
+AssetAccountancyCodeValueAssetSold=Nilai aset dibuang
+AssetAccountancyCodeReceivableOnAssignment=Receivable on disposal
+AssetAccountancyCodeProceedsFromSales=Proceeds from disposal
+AssetAccountancyCodeVatCollected=PPN dipungut
+AssetAccountancyCodeVatDeductible=Recovered VAT on assets
+AssetAccountancyCodeDepreciationAcceleratedDepreciation=Accelerated depreciation (tax)
+AssetAccountancyCodeAcceleratedDepreciation=Akun
+AssetAccountancyCodeEndowmentAcceleratedDepreciation=Biaya depresiasi
+AssetAccountancyCodeProvisionAcceleratedDepreciation=Repossession/Provision
+
+#
+# Asset depreciation
+#
+AssetBaseDepreciationHT=Depreciation basis (excl. VAT)
+AssetDepreciationBeginDate=Mulai depresiasi pada
+AssetDepreciationDuration=Durasi
+AssetDepreciationRate=Nilai (1%%)
+AssetDepreciationDate=Tanggal depresiasi
+AssetDepreciationHT=Depresiasi (tanpa PPN)
+AssetCumulativeDepreciationHT=Cumulative depreciation (excl. VAT)
+AssetResidualHT=Residual value (excl. VAT)
+AssetDispatchedInBookkeeping=Depreciation recorded
+AssetFutureDepreciationLine=Future depreciation
+AssetDepreciationReversal=Reversal
+
+#
+# Errors
+#
+AssetErrorAssetOrAssetModelIDNotProvide=Id of the asset or the model sound has not been provided
+AssetErrorFetchAccountancyCodesForMode=Error when retrieving the accounting accounts for the '%s' depreciation mode
+AssetErrorDeleteAccountancyCodesForMode=Error when deleting accounting accounts from the '%s' depreciation mode
+AssetErrorInsertAccountancyCodesForMode=Error when inserting the accounting accounts of the depreciation mode '%s'
+AssetErrorFetchDepreciationOptionsForMode=Error when retrieving options for the '%s' depreciation mode
+AssetErrorDeleteDepreciationOptionsForMode=Error when deleting the '%s' depreciation mode options
+AssetErrorInsertDepreciationOptionsForMode=Error when inserting the '%s' depreciation mode options
+AssetErrorFetchDepreciationLines=Error when retrieving recorded depreciation lines
+AssetErrorClearDepreciationLines=Error when purging recorded depreciation lines (reversal and future)
+AssetErrorAddDepreciationLine=Error when adding a depreciation line
+AssetErrorCalculationDepreciationLines=Error when calculating the depreciation lines (recovery and future)
+AssetErrorReversalDateNotProvidedForMode=The reversal date is not provided for the '%s' depreciation method
+AssetErrorReversalDateNotGreaterThanCurrentBeginFiscalDateForMode=The reversal date must be greater than or equal to the beginning of the current fiscal year for the '%s' depreciation method
+AssetErrorReversalAmountNotProvidedForMode=The reversal amount is not provided for the depreciation mode '%s'.
+AssetErrorFetchCumulativeDepreciation=Error when retrieving the accumulated depreciation amount from the depreciation line
+AssetErrorSetLastCumulativeDepreciation=Error when recording the last accumulated depreciation amount
diff --git a/htdocs/langs/it_CH/accountancy.lang b/htdocs/langs/it_CH/accountancy.lang
new file mode 100644
index 00000000000..44c4229cd8b
--- /dev/null
+++ b/htdocs/langs/it_CH/accountancy.lang
@@ -0,0 +1,3 @@
+# Dolibarr language file - Source file is en_US - accountancy
+ExportAccountingSourceDocHelp=With this tool, you can search and export the source events that are used to generate your accountancy. <br>The exported ZIP file will contain the lists of requested items in CSV, as well as their attached files in their original format (PDF, ODT, DOCX...).
+NotifiedValidationDate=Validate and Lock the exported entries <span class="warning">(same effect than the "%s" feature, modification and deletion of the lines will DEFINITELY not be possible)</span>
diff --git a/htdocs/langs/it_IT/admin.lang b/htdocs/langs/it_IT/admin.lang
index 3ed46eda0f3..60d5e28d754 100644
--- a/htdocs/langs/it_IT/admin.lang
+++ b/htdocs/langs/it_IT/admin.lang
@@ -477,7 +477,7 @@ InstalledInto=Installato nella directory %s
 BarcodeInitForThirdparties=Mass barcode init for third-parties
 BarcodeInitForProductsOrServices=Mass barcode init or reset for products or services
 CurrentlyNWithoutBarCode=Currently, you have <strong>%s</strong> record on <strong>%s</strong> %s without barcode defined.
-InitEmptyBarCode=Init value for next %s empty records
+InitEmptyBarCode=Init value for the %s empty barcodes
 EraseAllCurrentBarCode=Erase all current barcode values
 ConfirmEraseAllCurrentBarCode=Vuoi davvero eliminare tutti i valori attuali dei codici a barre?
 AllBarcodeReset=All barcode values have been removed
@@ -714,6 +714,7 @@ Permission27=Eliminare proposte commerciali
 Permission28=Esportare proposte commerciali
 Permission31=Vedere prodotti
 Permission32=Creare/modificare  prodotti
+Permission33=Read prices products
 Permission34=Eliminare prodotti
 Permission36=Vedere/gestire prodotti nascosti
 Permission38=Esportare prodotti
@@ -739,6 +740,7 @@ Permission79=Creare/modificare gli abbonamenti
 Permission81=Vedere ordini clienti
 Permission82=Creare/modificare ordini clienti
 Permission84=Convalidare degli ordini clienti
+Permission85=Generate the documents sales orders
 Permission86=Inviare ordini clienti
 Permission87=Chiudere gli ordini clienti
 Permission88=Annullare ordini clienti
@@ -874,6 +876,7 @@ Permission525=Access loan calculator
 Permission527=Esporta prestiti
 Permission531=Vedere servizi
 Permission532=Creare/modificare servizi
+Permission533=Read prices services
 Permission534=Eliminare servizi
 Permission536=Vedere/gestire servizi nascosti
 Permission538=Esportare servizi
@@ -1235,6 +1238,7 @@ BrowserName=Browser
 BrowserOS=Sistema operativo
 ListOfSecurityEvents=Elenco degli eventi di sicurezza Dolibarr
 SecurityEventsPurged=Eventi di sicurezza eliminati
+TrackableSecurityEvents=Trackable security events
 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=I parametri di setup possono essere definiti solo da utenti di tipo <b>amministratore</b>.
 SystemInfoDesc=Le informazioni di sistema sono dati tecnici visibili in sola lettura e solo dagli amministratori.
@@ -1977,6 +1981,7 @@ MailToSendSupplierOrder=Ordini d'acquisto
 MailToSendSupplierInvoice=Fatture Fornitore
 MailToSendContract=Contratti
 MailToSendReception=Receptions
+MailToExpenseReport=Note spese
 MailToThirdparty=Soggetti terzi
 MailToMember=Membri
 MailToUser=Utenti
@@ -2030,6 +2035,7 @@ MAIN_PDF_MARGIN_RIGHT=Margine destro sul PDF
 MAIN_PDF_MARGIN_TOP=Margine superiore sul PDF
 MAIN_PDF_MARGIN_BOTTOM=Margine inferiore su PDF
 MAIN_DOCUMENTS_LOGO_HEIGHT=Altezza per logo in PDF
+DOC_SHOW_FIRST_SALES_REP=Show first sales representative
 MAIN_GENERATE_PROPOSALS_WITH_PICTURE=Aggiungi una colonna per l'immagine sulle righe della proposta
 MAIN_DOCUMENTS_WITH_PICTURE_WIDTH=Larghezza della colonna se viene aggiunta un'immagine su righe
 MAIN_PDF_NO_SENDER_FRAME=Nascondi i bordi sulla cornice dell'indirizzo del mittente
@@ -2063,6 +2069,12 @@ EmailCollectors=Collezionisti di posta elettronica
 EmailCollectorDescription=Aggiungi un lavoro programmato e una pagina di configurazione per scansionare regolarmente caselle di posta elettronica (usando il protocollo IMAP) e registrare le email ricevute nella tua applicazione, nel posto giusto e / o creare automaticamente alcuni record (come i lead).
 NewEmailCollector=New Email Collector
 EMailHost=Host of email IMAP server
+EMailHostPort=Port of email IMAP server
+loginPassword=Login/Password
+oauthToken=Oauth2 token
+accessType=Acces type
+oauthService=Oauth service
+TokenMustHaveBeenCreated=Module OAuth2 must be enabled and an oauth2 token must have been created with the correct permissions (for example scope "gmail_full" with OAuth for Gmail).
 MailboxSourceDirectory=Mailbox source directory
 MailboxTargetDirectory=Mailbox target directory
 EmailcollectorOperations=Operations to do by collector
@@ -2106,7 +2118,7 @@ CreateCandidature=Crea domanda di lavoro
 FormatZip=CAP
 MainMenuCode=Menu entry code (mainmenu)
 ECMAutoTree=Show automatic ECM tree
-OperationParamDesc=Define the rules to use to extract or set values.<br>Example for operations that need to extract a name from email subject:<br>name=EXTRACT:SUBJECT:Message from company ([^\n]*)<br>Example for operations that create objects:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value including value of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
+OperationParamDesc=Define the rules to use to extract some data or set values to use for operation.<br><br>Example to extract a company name from email subject into a temporary variable:<br>tmp_var=EXTRACT:SUBJECT:Message from company ([^\n]*)<br><br>Examples to set the properties of an object to create:<br>objproperty1=SET:a hard coded value<br>objproperty2=SET:__tmp_var__<br>objproperty3=SETIFEMPTY:a value (value is set only if property is not already defined)<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
 OpeningHours=Orari di apertura
 OpeningHoursDesc=Inserisci gli orari di apertura regolare della tua azienda.
 ResourceSetup=Configurazione del modulo Risorse
@@ -2212,6 +2224,7 @@ NoExternalModuleWithUpdate=Nessun aggiornamento trovato per i moduli esterni
 SwaggerDescriptionFile=File di descrizione dell'API Swagger (per l'uso con redoc, ad esempio)
 YouEnableDeprecatedWSAPIsUseRESTAPIsInstead=Hai abilitato l'API WS obsoleta. Dovresti invece usare l'API REST.
 RandomlySelectedIfSeveral=Selezionato casualmente se sono disponibili più immagini
+SalesRepresentativeInfo=For Proposals, Orders, Invoices.
 DatabasePasswordObfuscated=La password del database è offuscata nel file conf
 DatabasePasswordNotObfuscated=La password del database NON è offuscata nel file conf
 APIsAreNotEnabled=I moduli API non sono abilitati
@@ -2277,5 +2290,20 @@ INVOICE_ADD_ZATCA_QR_CODEMore=Alcuni paesi arabi necessitano di questo codice QR
 INVOICE_ADD_SWISS_QR_CODE=Mostra il codice QR-Bill svizzero sulle fatture
 UrlSocialNetworksDesc=Link URL del social network. Utilizza {socialid} per la parte variabile che contiene l'ID del social network.
 IfThisCategoryIsChildOfAnother=Se questa categoria è figlia di un'altra
+DarkThemeMode=Dark theme mode
+AlwaysDisabled=Always disabled
+AccordingToBrowser=According to browser
+AlwaysEnabled=Always Enabled
+DoesNotWorkWithAllThemes=Will not work with all themes
 NoName=Senza nome
+ShowAdvancedOptions= Show advanced options
+HideAdvancedoptions= Hide advanced options
 CIDLookupURL=Il modulo porta un URL che può essere utilizzato da uno strumento esterno per ottenere il nome di una terza parte o un contatto dal suo numero di telefono. L'URL da utilizzare è:
+OauthNotAvailableForAllAndHadToBeCreatedBefore=OAUTH2 authentication is not available for all hosts, and a token with the right permissions must have been created upstream with the OAUTH module
+MAIN_MAIL_SMTPS_OAUTH_SERVICE=OAUTH2 authentication service
+DontForgetCreateTokenOauthMod=A token with the right permissions must have been created upstream with the OAUTH module
+MAIN_MAIL_SMTPS_AUTH_TYPE=Authentification method
+UsePassword=Use a password
+UseOauth=Use a OAUTH token
+Images=Images
+MaxNumberOfImagesInGetPost=Max number of images allowed in a HTML field submitted in a form
diff --git a/htdocs/langs/it_IT/agenda.lang b/htdocs/langs/it_IT/agenda.lang
index 04d8bab70da..cffcc04059b 100644
--- a/htdocs/langs/it_IT/agenda.lang
+++ b/htdocs/langs/it_IT/agenda.lang
@@ -57,6 +57,7 @@ MemberValidatedInDolibarr=Membro %s convalidato
 MemberModifiedInDolibarr=Membro %s modificato
 MemberResiliatedInDolibarr=Membro %s terminato
 MemberDeletedInDolibarr=Membro %s eliminato
+MemberExcludedInDolibarr=Membro %s escluso
 MemberSubscriptionAddedInDolibarr=Adesione %s per membro %s aggiunta
 MemberSubscriptionModifiedInDolibarr=Adesione %s per membro %s modificata
 MemberSubscriptionDeletedInDolibarr=Adesione %s per membro %s eliminata
@@ -159,6 +160,7 @@ DateActionBegin=Data di inizio evento
 ConfirmCloneEvent=Sei sicuro che vuoi clonare l'evento <b>%s</b>?
 RepeatEvent=Ripeti evento
 OnceOnly=Solo una volta
+EveryDay=Every day
 EveryWeek=Ogni settimana
 EveryMonth=Ogni mese
 DayOfMonth=Giorno del mese
@@ -174,3 +176,4 @@ AddReminder=Crea una notifica di promemoria automatica per questo evento
 ErrorReminderActionCommCreation=Errore durante la creazione della notifica di promemoria per questo evento
 BrowserPush=Notifica a comparsa del browser
 ActiveByDefault=Abilitato per impostazione predefinita
+Until=until
diff --git a/htdocs/langs/ja_JP/accountancy.lang b/htdocs/langs/ja_JP/accountancy.lang
index bd1c799ef29..8eb9dd0b0cd 100644
--- a/htdocs/langs/ja_JP/accountancy.lang
+++ b/htdocs/langs/ja_JP/accountancy.lang
@@ -48,8 +48,9 @@ CountriesNotInEEC=EECにない国
 CountriesInEECExceptMe=%sを除くEECの国
 CountriesExceptMe=%sを除く全国
 AccountantFiles=ソースドキュメントのエクスポート
-ExportAccountingSourceDocHelp=このツールで、会計処理を生成するために使用されるソースイベント（CSVおよびPDFのリスト）をエクスポートできる。
+ExportAccountingSourceDocHelp=このツールを使用すると、アカウンティを生成するために使用されるソースイベントを検索およびエクスポートできる。 <br>エクスポートされたZIPファイルには、CSVで要求されたアイテムのリストと、元の形式（PDF、ODT、DOCX ...）の添付ファイルが含まれる。
 ExportAccountingSourceDocHelp2=仕訳日記帳をエクスポートするには、メニューエントリ%s --%sを使用。
+ExportAccountingProjectHelp=特定のプロジェクトについてのみアカウンティングレポートが必要な場合は、プロジェクトを指定する。経費報告書とローン支払いはプロジェクト報告書に含まれていない。
 VueByAccountAccounting=勘定科目順に表示
 VueBySubAccountAccounting=会計補助勘定科目で表示
 
@@ -183,6 +184,8 @@ ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT=サブスクリプションを登録す
 
 ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT=顧客入金を登録するためのデフォルトの勘定科目
 UseAuxiliaryAccountOnCustomerDeposit=顧客アカウントを頭金ラインの補助元帳に個人アカウントとして保存する（無効にした場合、頭金ラインの個人アカウントは空のままになる）
+ACCOUNTING_ACCOUNT_SUPPLIER_DEPOSIT=仕入先預金を登録するためのデフォルトの会計口座
+UseAuxiliaryAccountOnSupplierDeposit=仕入先勘定を、前払明細の補助元帳に個別勘定として保管する (無効にすると、前払明細の個別勘定は空のままになる)。
 
 ACCOUNTING_PRODUCT_BUY_ACCOUNT=購入した製品のデフォルトの勘定科目(製品シートで定義されていない場合に使用)
 ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT=EEC域内で購入した製品のデフォルト勘定科目(製品シートで定義されていない場合に使用)
@@ -332,7 +335,7 @@ ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS=経費報告書sの会計におけ
 
 ## Export
 NotifiedExportDate=エクスポートされた行にエクスポート済みのフラグを付ける<span class="warning">（行を変更するには、トランザクション全体を削除して、会計に再転送する必要がある）</span>
-NotifiedValidationDate=エクスポートされたエントリの検証とロック<span class="warning">（「閉鎖」機能と同じ効果、行の変更と削除は完全に不可能 ）</span>
+NotifiedValidationDate=エクスポートされたエントリ<span class="warning">を検証してロックする（「%s」機能と同じ効果、行の変更と削除は絶対に不可）</span>
 DateValidationAndLock=日付の検証とロック
 ConfirmExportFile=会計エクスポートファイルの生成を確定するか？
 ExportDraftJournal=下書き仕訳帳のエクスポート
diff --git a/htdocs/langs/ja_JP/admin.lang b/htdocs/langs/ja_JP/admin.lang
index a185416be61..8627254d779 100644
--- a/htdocs/langs/ja_JP/admin.lang
+++ b/htdocs/langs/ja_JP/admin.lang
@@ -477,7 +477,7 @@ InstalledInto=ディレクトリ%sにインストールされた
 BarcodeInitForThirdparties=取引先向けの大量バーコード初期化
 BarcodeInitForProductsOrServices=製品またはサービスの大量バーコードの初期化またはリセット
 CurrentlyNWithoutBarCode=現在、<strong>%s</strong>%sにバーコードが定義されていない<strong>%s</strong>レコードがある。
-InitEmptyBarCode=Init value for next %s empty records
+InitEmptyBarCode=%s 空バーコードの初期値
 EraseAllCurrentBarCode=現在のバーコード値をすべて消去する
 ConfirmEraseAllCurrentBarCode=現在のバーコード値をすべて消去してもよいか？
 AllBarcodeReset=全バーコード値が削除された
@@ -714,6 +714,7 @@ Permission27=商取引提案を削除する。
 Permission28=商取引提案をエクスポート
 Permission31=製品を読込む
 Permission32=製品を作成/変更
+Permission33=価格製品読込
 Permission34=製品を削除する。
 Permission36=隠された製品を参照すること/管理
 Permission38=製品をエクスポート
@@ -739,6 +740,7 @@ Permission79=サブスクリプションを作成/変更
 Permission81=お客様の注文を読込む
 Permission82=作成/変更、顧客の注文
 Permission84=お客様の注文を検証
+Permission85=ドキュメントの販売注文を生成する
 Permission86=お客様の注文を送る
 Permission87=顧客の注文を閉じる
 Permission88=お客様の注文を取り消す
@@ -874,6 +876,7 @@ Permission525=アクセスローン計算機
 Permission527=ローンをエクスポート
 Permission531=サービスを読込む
 Permission532=サービスを作成/変更
+Permission533=価格サービス読込
 Permission534=サービスを削除する
 Permission536=隠されたサービスを参照すること/管理
 Permission538=サービスをエクスポート
@@ -1235,6 +1238,7 @@ BrowserName=ブラウザ名
 BrowserOS=ブラウザOS
 ListOfSecurityEvents=Dolibarrセキュリティイベントのリスト
 SecurityEventsPurged=セキュリティイベントのパージ
+TrackableSecurityEvents=Trackable security events
 LogEventDesc=特定のセキュリティイベントのログを有効にする。管理者はメニュー<b>%s-%s</b>を介してログを記録する。警告、この機能はデータベースに大量のデータを生成する可能性がある。
 AreaForAdminOnly=設定パラメータは、<b>管理者ユーザ</b>のみが設定できる。
 SystemInfoDesc=システム情報では、読取り専用モードでのみ管理者の目に見える得るその他の技術情報。
@@ -1977,6 +1981,7 @@ MailToSendSupplierOrder=購買発注
 MailToSendSupplierInvoice=仕入先の請求書
 MailToSendContract=契約
 MailToSendReception=領収
+MailToExpenseReport=経費報告書s
 MailToThirdparty=取引先
 MailToMember=構成員
 MailToUser=ユーザ
@@ -2030,6 +2035,7 @@ MAIN_PDF_MARGIN_RIGHT=PDFの右マージン
 MAIN_PDF_MARGIN_TOP=PDFの上部マージン
 MAIN_PDF_MARGIN_BOTTOM=PDFの下マージン
 MAIN_DOCUMENTS_LOGO_HEIGHT=PDFのロゴの高さ
+DOC_SHOW_FIRST_SALES_REP=最初の営業担当者を表示
 MAIN_GENERATE_PROPOSALS_WITH_PICTURE=提案行に画像の列を追加
 MAIN_DOCUMENTS_WITH_PICTURE_WIDTH=画像が行に追加された場合の列の幅
 MAIN_PDF_NO_SENDER_FRAME=送信者アドレスフレームの境界線を非表示にする
@@ -2063,6 +2069,12 @@ EmailCollectors=メールコレクター
 EmailCollectorDescription=スケジュールされたジョブと設定ページを追加して、 ( IMAPプロトコルを使用して ) 定期的に電子メールボックスをスキャンし、アプリケーションに受信した電子メールを適切な場所で記録したり、いくつかの記録を自動的に作成したりする ( 引合など ) 。
 NewEmailCollector=新規Eメールコレクター
 EMailHost=電子メールIMAPサーバーのホスト
+EMailHostPort=メール IMAP サーバーのポート
+loginPassword=ログイン / パスワード
+oauthToken=Oauth2 トークン
+accessType=アクセス種別
+oauthService=Oauth サービス
+TokenMustHaveBeenCreated=モジュール OAuth2 が有効になっている必要があり、oauth2 トークンが正しいアクセス許可で作成されている必要がある (たとえば、Gmail の OAuth でスコープ "gmail_full")。
 MailboxSourceDirectory=メールボックスのソースディレクトリ
 MailboxTargetDirectory=メールボックスのターゲットディレクトリ
 EmailcollectorOperations=コレクターによる操作
@@ -2106,7 +2118,7 @@ CreateCandidature=求人応募を作成する
 FormatZip=郵便番号
 MainMenuCode=メニュー入力コード ( メインメニュー ) 
 ECMAutoTree=自動ECMツリーを表示する
-OperationParamDesc=値の抽出または設定に使用するルールを定義する。<br>電子メールの件名から名前を抽出する必要がある操作の例:<br>name=EXTRACT:SUBJECT:法人([^\n]*)からのお知らせ<br>オブジェクトを作成する操作の例:<br>objproperty1=SET:設定する値<br>objproperty2=SET:__objproperty1__の値を含む値<br>objproperty3=SETIFEMPTY:objproperty3 が未設定の場合に使われる値<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:法人名は\\s([^\\s]*)<br><br>いくつかのプロパティを抽出または設定するための区切り文字としての文字「;」を使う。
+OperationParamDesc=一部のデータを抽出するために使用するルールを定義するか、操作に使用する値を設定する。 <br> <br> メールの件名から法人名を一時変数に抽出する例: <br> tmp_var=EXTRACT:SUBJECT:【通知】  ([^\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:My当法人名は\\s([^\\s]*) <br> <br> 「;」文字をセパレータとして使用して、複数のプロパティを抽出または設定する。
 OpeningHours=営業時間
 OpeningHoursDesc=あなたの法人の通常の営業時間をここに入力すること。
 ResourceSetup=リソースモジュールの構成
@@ -2212,6 +2224,7 @@ NoExternalModuleWithUpdate=外部モジュールの更新が見つからない
 SwaggerDescriptionFile=Swagger API記述ファイル（たとえば、redocで使用するため）
 YouEnableDeprecatedWSAPIsUseRESTAPIsInstead=非推奨のWS APIが有効化された。それよりもREST APIを使用すべきである。
 RandomlySelectedIfSeveral=画像が複数ある場合はランダムに選択
+SalesRepresentativeInfo=For Proposals, Orders, Invoices.
 DatabasePasswordObfuscated=データベースのパスワードは conf ファイルで難読化されている
 DatabasePasswordNotObfuscated=データベースのパスワードは conf ファイルで難読化されていない
 APIsAreNotEnabled=APIモジュールが有効になっていない
@@ -2277,5 +2290,20 @@ INVOICE_ADD_ZATCA_QR_CODEMore=一部のアラビア語の国では、請求書
 INVOICE_ADD_SWISS_QR_CODE=請求書にスイスのQR-Billコードを表示する
 UrlSocialNetworksDesc=ソーシャルネットワークのURLリンク。ソーシャルネットワークIDを含む可変部分には{socialid}を使用する。
 IfThisCategoryIsChildOfAnother=このカテゴリが別カテゴリの子である場合
+DarkThemeMode=ダークテーマモード
+AlwaysDisabled=常に無効
+AccordingToBrowser=ブラウザによる
+AlwaysEnabled=常に有効
+DoesNotWorkWithAllThemes=すべてのテーマで機能するわけではない
 NoName=ノーネーム
+ShowAdvancedOptions= 高度なオプションを表示
+HideAdvancedoptions= 詳細オプションを非表示
 CIDLookupURL=このモジュールは、外部ツールがサードパーティの名前またはその電話番号から連絡先を取得するために使用できるURLを提供する。使用するURLは次のとおり。
+OauthNotAvailableForAllAndHadToBeCreatedBefore=OAUTH2 認証はすべてのホストで利用できるわけではなく、適切な権限を持つトークンが OAUTH モジュールでアップストリームにて作成されている必要がある
+MAIN_MAIL_SMTPS_OAUTH_SERVICE=OAUTH2 認証サービス
+DontForgetCreateTokenOauthMod=適切な権限を持つトークンが、OAUTH モジュールを使用してアップストリームにて作成されている必要がある
+MAIN_MAIL_SMTPS_AUTH_TYPE=認証方法
+UsePassword=パスワードを使用する
+UseOauth=OAUTH トークンを使用する
+Images=画像
+MaxNumberOfImagesInGetPost=フォームで送信される HTML フィールドで許可される画像の最大数
diff --git a/htdocs/langs/ja_JP/agenda.lang b/htdocs/langs/ja_JP/agenda.lang
index 52b9fe00edd..4cecfc858cd 100644
--- a/htdocs/langs/ja_JP/agenda.lang
+++ b/htdocs/langs/ja_JP/agenda.lang
@@ -57,6 +57,7 @@ MemberValidatedInDolibarr=構成員%sは承認済
 MemberModifiedInDolibarr=構成員%sが修正された
 MemberResiliatedInDolibarr=構成員%sが解除された
 MemberDeletedInDolibarr=構成員%sが削除された
+MemberExcludedInDolibarr=メンバー%sは除外された
 MemberSubscriptionAddedInDolibarr=構成員%sのサブスクリプション%sは追加済
 MemberSubscriptionModifiedInDolibarr=構成員%sのサブスクリプション%sは変更済
 MemberSubscriptionDeletedInDolibarr=構成員%sのサブスクリプション%sは削除済
@@ -159,6 +160,7 @@ DateActionBegin=イベント開始日
 ConfirmCloneEvent=イベント<b>%s </b>のクローンを作成してもよいか？
 RepeatEvent=イベントを繰り返す
 OnceOnly=一回だけ
+EveryDay=毎日
 EveryWeek=毎週
 EveryMonth=毎月
 DayOfMonth=曜日
@@ -174,3 +176,4 @@ AddReminder=このイベントの自動リマインダー通知を作成する
 ErrorReminderActionCommCreation=このイベントのリマインダー通知の作成中にエラーが発生した
 BrowserPush=ブラウザのポップアップ通知
 ActiveByDefault=デフォルトで有効
+Until=それまで
diff --git a/htdocs/langs/ja_JP/bills.lang b/htdocs/langs/ja_JP/bills.lang
index 306afe0b4b6..8e1cade94a6 100644
--- a/htdocs/langs/ja_JP/bills.lang
+++ b/htdocs/langs/ja_JP/bills.lang
@@ -446,6 +446,7 @@ ErrorPaymentConditionsNotEligibleToDepositCreation=選択した支払い条件
 PaymentTypeVIR=銀行振込
 PaymentTypeShortVIR=銀行振込
 PaymentTypePRE=口座振替の支払注文
+PaymentTypePREdetails=(アカウント *-%s)
 PaymentTypeShortPRE=デビット支払注文
 PaymentTypeLIQ=現金
 PaymentTypeShortLIQ=現金
diff --git a/htdocs/langs/ko_KR/admin.lang b/htdocs/langs/ko_KR/admin.lang
index 59377d0fe73..43cc111e5a0 100644
--- a/htdocs/langs/ko_KR/admin.lang
+++ b/htdocs/langs/ko_KR/admin.lang
@@ -109,7 +109,7 @@ 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=PHP 설정에서 한도가 설정되어 있지 않습니다. 
 MaxSizeForUploadedFiles=Maximum size for uploaded files (0 to disallow any upload)
-UseCaptchaCode=Use graphical code (CAPTCHA) on login page
+UseCaptchaCode=Use graphical code (CAPTCHA) on login page and some public pages
 AntiVirusCommand=Full path to antivirus command
 AntiVirusCommandExample=Example for ClamAv Daemon (require clamav-daemon): /usr/bin/clamdscan<br>Example for ClamWin (very very slow): c:\\Progra~1\\ClamWin\\bin\\clamscan.exe
 AntiVirusParam= More parameters on command line
@@ -477,7 +477,7 @@ InstalledInto=Installed into directory %s
 BarcodeInitForThirdparties=Mass barcode init for third-parties
 BarcodeInitForProductsOrServices=Mass barcode init or reset for products or services
 CurrentlyNWithoutBarCode=Currently, you have <strong>%s</strong> record on <strong>%s</strong> %s without barcode defined.
-InitEmptyBarCode=Init value for next %s empty records
+InitEmptyBarCode=Init value for the %s empty barcodes
 EraseAllCurrentBarCode=Erase all current barcode values
 ConfirmEraseAllCurrentBarCode=Are you sure you want to erase all current barcode values?
 AllBarcodeReset=All barcode values have been removed
@@ -504,7 +504,7 @@ WarningPHPMailC=- Using the SMTP server of your own Email Service Provider to se
 WarningPHPMailD=Also, it is therefore recommended to change the sending method of e-mails to the value "SMTP". If you really want to keep the default "PHP" method to send emails, just ignore this warning, or remove it by setting the MAIN_HIDE_WARNING_TO_ENCOURAGE_SMTP_SETUP constant to 1 in Home - Setup - Other.
 WarningPHPMail2=If your email SMTP provider need to restrict email client to some IP addresses (very rare), this is the IP address of the mail user agent (MUA) for your ERP CRM application: <strong>%s</strong>.
 WarningPHPMailSPF=If the domain name in your sender email address is protected by a SPF record (ask your domain name registar), you must add the following IPs in the SPF record of the DNS of your domain: <strong>%s</strong>.
-ActualMailSPFRecordFound=Actual SPF record found : %s
+ActualMailSPFRecordFound=Actual SPF record found (for email %s) : %s
 ClickToShowDescription=Click to show description
 DependsOn=This module needs the module(s)
 RequiredBy=This module is required by module(s)
@@ -714,13 +714,14 @@ Permission27=Delete commercial proposals
 Permission28=Export commercial proposals
 Permission31=Read products
 Permission32=Create/modify products
+Permission33=Read prices products
 Permission34=Delete products
 Permission36=See/manage hidden products
 Permission38=Export products
 Permission39=Ignore minimum price
-Permission41=Read projects and tasks (shared project and projects I'm contact for). Can also enter time consumed, for me or my hierarchy, on assigned tasks (Timesheet)
-Permission42=Create/modify projects (shared project and projects I'm contact for). Can also create tasks and assign users to project and tasks
-Permission44=Delete projects (shared project and projects I'm contact for)
+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=Delete projects (shared projects and projects of which I am a contact)
 Permission45=Export projects
 Permission61=Read interventions
 Permission62=Create/modify interventions
@@ -739,6 +740,7 @@ Permission79=Create/modify subscriptions
 Permission81=Read customers orders
 Permission82=Create/modify customers orders
 Permission84=Validate customers orders
+Permission85=Generate the documents sales orders
 Permission86=Send customers orders
 Permission87=Close customers orders
 Permission88=Cancel customers orders
@@ -766,9 +768,10 @@ Permission122=Create/modify third parties linked to user
 Permission125=Delete third parties linked to user
 Permission126=Export third parties
 Permission130=Create/modify third parties payment information
-Permission141=Read all projects and tasks (also private projects for which I am not a contact)
-Permission142=Create/modify all projects and tasks (also private projects for which I am not a contact)
-Permission144=Delete all projects and tasks (also private projects i am not contact for)
+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)
 Permission146=Read providers
 Permission147=Read stats
 Permission151=Read direct debit payment orders
@@ -873,6 +876,7 @@ Permission525=Access loan calculator
 Permission527=Export loans
 Permission531=Read services
 Permission532=Create/modify services
+Permission533=Read prices services
 Permission534=Delete services
 Permission536=See/manage hidden services
 Permission538=Export services
@@ -883,6 +887,9 @@ Permission564=Record Debits/Rejections of credit transfer
 Permission601=Read stickers
 Permission602=Create/modify stickers
 Permission609=Delete stickers
+Permission611=Read attributes of variants
+Permission612=Create/Update attributes of variants
+Permission613=Delete attributes of variants
 Permission650=Read Bills of Materials
 Permission651=Create/Update Bills of Materials
 Permission652=Delete Bills of Materials
@@ -969,6 +976,8 @@ Permission4021=Create/modify your evaluation
 Permission4022=Validate evaluation
 Permission4023=Delete evaluation
 Permission4030=See comparison menu
+Permission4031=Read personal information
+Permission4032=Write personal information
 Permission10001=Read website content
 Permission10002=Create/modify website content (html and javascript content)
 Permission10003=Create/modify website content (dynamic php code). Dangerous, must be reserved to restricted developers.
@@ -1068,6 +1077,7 @@ DictionaryExpenseTaxCat=Expense report - Transportation categories
 DictionaryExpenseTaxRange=Expense report - Range by transportation category
 DictionaryTransportMode=Intracomm report - Transport mode
 DictionaryBatchStatus=Product lot/serial Quality Control status
+DictionaryAssetDisposalType=Type of disposal of assets
 TypeOfUnit=Type of unit
 SetupSaved=Setup saved
 SetupNotSaved=Setup not saved
@@ -1122,7 +1132,7 @@ ValueOfConstantKey=Value of a configuration constant
 ConstantIsOn=Option %s is on
 NbOfDays=No. of days
 AtEndOfMonth=At end of month
-CurrentNext=Current/Next
+CurrentNext=A given day in month
 Offset=Offset
 AlwaysActive=Always active
 Upgrade=Upgrade
@@ -1187,7 +1197,7 @@ BankModuleNotActive=Bank accounts module not enabled
 ShowBugTrackLink=Show the link "<strong>%s</strong>"
 ShowBugTrackLinkDesc=Keep empty to not display this link, use value 'github' for the link to the Dolibarr project or define directly an url 'https://...'
 Alerts=알리미
-DelaysOfToleranceBeforeWarning=Delay before displaying a warning alert for:
+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=Project not closed in time
@@ -1228,6 +1238,7 @@ BrowserName=Browser name
 BrowserOS=Browser OS
 ListOfSecurityEvents=List of Dolibarr security events
 SecurityEventsPurged=Security events purged
+TrackableSecurityEvents=Trackable security events
 LogEventDesc=Enable logging for specific security events. Administrators the log via menu <b>%s - %s</b>. Warning, this feature can generate a large amount of data in the database.
 AreaForAdminOnly=Setup parameters can be set by <b>administrator users</b> only.
 SystemInfoDesc=System information is miscellaneous technical information you get in read only mode and visible for administrators only.
@@ -1339,6 +1350,7 @@ TransKeyWithoutOriginalValue=You forced a new translation for the translation ke
 TitleNumberOfActivatedModules=Activated modules
 TotalNumberOfActivatedModules=Activated modules: <b>%s</b> / <b>%s</b>
 YouMustEnableOneModule=You must at least enable 1 module
+YouMustEnableTranslationOverwriteBefore=You must first enable translation overwriting to be allowed to replace a translation
 ClassNotFoundIntoPathWarning=Class %s not found in PHP path
 YesInSummer=Yes in summer
 OnlyFollowingModulesAreOpenedToExternalUsers=Note, only the following modules are available to external users (irrespective of the permissions of such users) and only if permissions are granted:<br>
@@ -1420,6 +1432,8 @@ WatermarkOnDraftInvoices=Watermark on draft invoices (none if empty)
 PaymentsNumberingModule=Payments numbering model
 SuppliersPayment=Vendor payments
 SupplierPaymentSetup=Vendor payments setup
+InvoiceCheckPosteriorDate=Check facture date before validation
+InvoiceCheckPosteriorDateHelp=Validating an invoice will be forbidden if its date is anterior to the date of last invoice of same type.
 ##### Proposals #####
 PropalSetup=Commercial proposals module setup
 ProposalsNumberingModules=Commercial proposal numbering models
@@ -1917,6 +1931,7 @@ ConfFileMustContainCustom=Installing or building an external module from applica
 HighlightLinesOnMouseHover=Highlight table lines when mouse move passes over
 HighlightLinesColor=Highlight color of the line when the mouse passes over (use 'ffffff' for no highlight)
 HighlightLinesChecked=Highlight color of the line when it is checked (use 'ffffff' for no highlight)
+UseBorderOnTable=Show left-right borders on tables
 BtnActionColor=Color of the action button
 TextBtnActionColor=Text color of the action button
 TextTitleColor=Text color of Page title
@@ -1925,7 +1940,7 @@ PressF5AfterChangingThis=Press CTRL+F5 on keyboard or clear your browser cache a
 NotSupportedByAllThemes=Will works with core themes, may not be supported by external themes
 BackgroundColor=Background color
 TopMenuBackgroundColor=Background color for Top menu
-TopMenuDisableImages=Hide images in Top menu
+TopMenuDisableImages=Icon or Text in Top menu
 LeftMenuBackgroundColor=Background color for Left menu
 BackgroundTableTitleColor=Background color for Table title line
 BackgroundTableTitleTextColor=Text color for Table title line
@@ -1938,7 +1953,7 @@ EnterAnyCode=This field contains a reference to identify the line. Enter any val
 Enter0or1=Enter 0 or 1
 UnicodeCurrency=Enter here between braces, list of byte number that represent the currency symbol. For example: for $, enter [36] - for brazil real R$ [82,36] - for €, enter [8364]
 ColorFormat=The RGB color is in HEX format, eg: FF0000
-PictoHelp=Icon name in dolibarr format ('image.png' if into the current theme directory, 'image.png@nom_du_module' if into the directory /img/ of a module)
+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>- fonwtawesome_xxx_fa_color_size for a FontAwesome fa-xxx picto (with prefix, color and size set)
 PositionIntoComboList=Position of line into combo lists
 SellTaxRate=Sales tax rate
 RecuperableOnly=Yes for VAT "Not Perceived but Recoverable" dedicated for some state in France. Keep value to "No" in all other cases.
@@ -1966,6 +1981,7 @@ MailToSendSupplierOrder=Purchase orders
 MailToSendSupplierInvoice=Vendor invoices
 MailToSendContract=계약서
 MailToSendReception=Receptions
+MailToExpenseReport=경비 보고서
 MailToThirdparty=협력업체
 MailToMember=구성원
 MailToUser=사용자
@@ -2019,6 +2035,7 @@ MAIN_PDF_MARGIN_RIGHT=Right margin on PDF
 MAIN_PDF_MARGIN_TOP=Top margin on PDF
 MAIN_PDF_MARGIN_BOTTOM=Bottom margin on PDF
 MAIN_DOCUMENTS_LOGO_HEIGHT=Height for logo on PDF
+DOC_SHOW_FIRST_SALES_REP=Show first sales representative
 MAIN_GENERATE_PROPOSALS_WITH_PICTURE=Add column for picture on proposal lines
 MAIN_DOCUMENTS_WITH_PICTURE_WIDTH=Width of the column if a picture is added on lines
 MAIN_PDF_NO_SENDER_FRAME=Hide borders on sender address frame
@@ -2037,7 +2054,7 @@ COMPANY_AQUARIUM_CLEAN_REGEX=Regex filter to clean value (COMPANY_AQUARIUM_CLEAN
 COMPANY_DIGITARIA_CLEAN_REGEX=Regex filter to clean value (COMPANY_DIGITARIA_CLEAN_REGEX)
 COMPANY_DIGITARIA_UNIQUE_CODE=Duplicate not allowed
 GDPRContact=Data Protection Officer (DPO, Data Privacy or GDPR contact)
-GDPRContactDesc=If you store data about European companies/citizens, you can name the contact who is responsible for the General Data Protection Regulation here
+GDPRContactDesc=If you store personal data in your Information System, you can name the contact who is responsible for the General Data Protection Regulation here
 HelpOnTooltip=Help text to show on tooltip
 HelpOnTooltipDesc=Put text or a translation key here for the text to show in a tooltip when this field appears in a form
 YouCanDeleteFileOnServerWith=You can delete this file on the server with Command Line:<br>%s
@@ -2048,27 +2065,46 @@ VATIsUsedIsOff=Note: The option to use Sales Tax or VAT has been set to <strong>
 SwapSenderAndRecipientOnPDF=Swap sender and recipient address position on PDF documents
 FeatureSupportedOnTextFieldsOnly=Warning, feature supported on text fields and combo lists only. Also an URL parameter action=create or action=edit must be set OR page name must end with 'new.php' to trigger this feature.
 EmailCollector=Email collector
+EmailCollectors=Email collectors
 EmailCollectorDescription=Add a scheduled job and a setup page to scan regularly email boxes (using IMAP protocol) and record emails received into your application, at the right place and/or create some records automatically (like leads).
 NewEmailCollector=New Email Collector
 EMailHost=Host of email IMAP server
+EMailHostPort=Port of email IMAP server
+loginPassword=Login/Password
+oauthToken=Oauth2 token
+accessType=Acces type
+oauthService=Oauth service
+TokenMustHaveBeenCreated=Module OAuth2 must be enabled and an oauth2 token must have been created with the correct permissions (for example scope "gmail_full" with OAuth for Gmail).
 MailboxSourceDirectory=Mailbox source directory
 MailboxTargetDirectory=Mailbox target directory
 EmailcollectorOperations=Operations to do by collector
 EmailcollectorOperationsDesc=Operations are executed from top to bottom order
 MaxEmailCollectPerCollect=Max number of emails collected per collect
 CollectNow=Collect now
-ConfirmCloneEmailCollector=Are you sure you want to clone the Email collector %s ?
+ConfirmCloneEmailCollector=Are you sure you want to clone the Email collector %s?
 DateLastCollectResult=Date of latest collect try
 DateLastcollectResultOk=Date of latest collect success
 LastResult=Latest result
+EmailCollectorHideMailHeaders=Do not include the content of email header into the saved content of collected e-mails
+EmailCollectorHideMailHeadersHelp=When enabled, e-mail headers are not added at the end of the email content that is saved as an agenda event.
 EmailCollectorConfirmCollectTitle=Email collect confirmation
-EmailCollectorConfirmCollect=Do you want to run the collection for this collector now ?
+EmailCollectorConfirmCollect=Do you want to run this collector now?
+EmailCollectorExampleToCollectTicketRequestsDesc=Collect emails that match some rules and create automatically a ticket (Module Ticket must be enabled) with the email informations. You can use this collector if you provide some support by email, so your ticket request will be automatically generated. Activate also Collect_Responses to collect answers of your client directly on the ticket view (you must reply from Dolibarr).
+EmailCollectorExampleToCollectTicketRequests=Example collecting the ticket request (first message only)
+EmailCollectorExampleToCollectAnswersFromExternalEmailSoftwareDesc=Scan your mailbox "Sent" directory to find emails that was sent as an answer of another email directly from your email software and not from Dolibarr. If such an email is found, the event of answer is recorded into Dolibarr
+EmailCollectorExampleToCollectAnswersFromExternalEmailSoftware=Example collecting e-mail answers sent from an external e-mail software
+EmailCollectorExampleToCollectDolibarrAnswersDesc=Collect all emails that are an answer of an email sent from your application. An event (Module Agenda must be enabled) with the email response will be recorded at the good place. For example, if you send a commercial proposal, order, invoice or message for a ticket by email from the application, and the recipient answers your email, the system will automatically catch the answer and add it into your ERP.
+EmailCollectorExampleToCollectDolibarrAnswers=Example collecting all ingoing messages being answers to messages sent from Dolibarr'
+EmailCollectorExampleToCollectLeadsDesc=Collect emails that match some rules and create automatically a lead (Module Project must be enabled) with the email informations. 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 thirdparty can't be found in database (new customer), the lead will be attached to the thirdparty with ID 1.
+EmailCollectorExampleToCollectLeads=Example collecting leads
+EmailCollectorExampleToCollectJobCandidaturesDesc=Collect emails applying to job offers (Module Recruitment must be enabled). You can complete this collector if you want to automatically create a candidature for a job request. Note: With this initial example, the title of the candidature is generated including the email.
+EmailCollectorExampleToCollectJobCandidatures=Example collecting job candidatures received by e-mail
 NoNewEmailToProcess=No new email (matching filters) to process
 NothingProcessed=Nothing done
-XEmailsDoneYActionsDone=%s emails qualified, %s emails successfully processed (for %s record/actions done)
+XEmailsDoneYActionsDone=%s emails pre-qualified, %s emails successfully processed (for %s record/actions done)
 RecordEvent=Record an event in agenda (with type Email sent or received)
 CreateLeadAndThirdParty=Create a lead (and a third party if necessary)
-CreateTicketAndThirdParty=Create a ticket (linked to a third party if the third party was loaded by a previous operation, with no third party otherwise)
+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=Latest result code
 NbOfEmailsInInbox=Number of emails in source directory
 LoadThirdPartyFromName=Load third party searching on %s (load only)
@@ -2082,14 +2118,14 @@ CreateCandidature=Create job application
 FormatZip=Zip
 MainMenuCode=Menu entry code (mainmenu)
 ECMAutoTree=Show automatic ECM tree
-OperationParamDesc=Define the rules to use to extract or set values.<br>Example for operations that need to extract a name from email subject:<br>name=EXTRACT:SUBJECT:Message from company ([^\n]*)<br>Example for operations that create objects:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value including value of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
+OperationParamDesc=Define the rules to use to extract some data or set values to use for operation.<br><br>Example to extract a company name from email subject into a temporary variable:<br>tmp_var=EXTRACT:SUBJECT:Message from company ([^\n]*)<br><br>Examples to set the properties of an object to create:<br>objproperty1=SET:a hard coded value<br>objproperty2=SET:__tmp_var__<br>objproperty3=SETIFEMPTY:a value (value is set only if property is not already defined)<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
 OpeningHours=Opening hours
 OpeningHoursDesc=Enter here the regular opening hours of your company.
 ResourceSetup=Configuration of Resource module
 UseSearchToSelectResource=Use a search form to choose a resource (rather than a drop-down list).
 DisabledResourceLinkUser=Disable feature to link a resource to users
 DisabledResourceLinkContact=Disable feature to link a resource to contacts
-EnableResourceUsedInEventCheck=Enable feature to check if a resource is in use in an event
+EnableResourceUsedInEventCheck=Prohibit the use of the same resource at the same time in the agenda
 ConfirmUnactivation=Confirm module reset
 OnMobileOnly=On small screen (smartphone) only
 DisableProspectCustomerType=Disable the "Prospect + Customer" third party type (so third party must be "Prospect" or "Customer", but can't be both)
@@ -2134,7 +2170,7 @@ DeleteEmailCollector=Delete email collector
 ConfirmDeleteEmailCollector=Are you sure you want to delete this email collector?
 RecipientEmailsWillBeReplacedWithThisValue=Recipient emails will be always replaced with this value
 AtLeastOneDefaultBankAccountMandatory=At least 1 default bank account must be defined
-RESTRICT_ON_IP=Allow access to some host IP only (wildcard not allowed, use space between values). Empty means every hosts can access.
+RESTRICT_ON_IP=Allow API access to only certain client IPs (wildcard not allowed, use space between values). Empty means every clients can access.
 IPListExample=127.0.0.1 192.168.0.2 [::1]
 BaseOnSabeDavVersion=Based on the library SabreDAV version
 NotAPublicIp=Not a public IP
@@ -2144,6 +2180,9 @@ EmailTemplate=Template for email
 EMailsWillHaveMessageID=Emails will have a tag 'References' matching this syntax
 PDF_SHOW_PROJECT=Show project on document
 ShowProjectLabel=Project Label
+PDF_INCLUDE_ALIAS_IN_THIRDPARTY_NAME=Include alias in thirdparty name
+THIRDPARTY_ALIAS=Name thirdparty - Alias thirdparty
+ALIAS_THIRDPARTY=Alias thirdparty - Name thirdparty
 PDF_USE_ALSO_LANGUAGE_CODE=If you want to have some texts in your PDF duplicated in 2 different languages in the same generated PDF, you must set here this second language so generated PDF will contains 2 different languages in same page, the one chosen when generating PDF and this one (only few PDF templates support this). Keep empty for 1 language per PDF.
 PDF_USE_A=Gererate PDF documents with format PDF/A instead of defaut format PDF
 FafaIconSocialNetworksDesc=Enter here the code of a FontAwesome icon. If you don't know what is FontAwesome, you can use the generic value fa-address-book.
@@ -2185,6 +2224,7 @@ NoExternalModuleWithUpdate=No updates found for external modules
 SwaggerDescriptionFile=Swagger API description file (for use with redoc for example)
 YouEnableDeprecatedWSAPIsUseRESTAPIsInstead=You enabled deprecated WS API. You should use REST API instead.
 RandomlySelectedIfSeveral=Randomly selected if several pictures are available
+SalesRepresentativeInfo=For Proposals, Orders, Invoices.
 DatabasePasswordObfuscated=Database password is obfuscated in conf file
 DatabasePasswordNotObfuscated=Database password is NOT obfuscated in conf file
 APIsAreNotEnabled=APIs modules are not enabled
@@ -2206,12 +2246,12 @@ DashboardDisableBlockAdherent=Disable the thumb for memberships
 DashboardDisableBlockExpenseReport=Disable the thumb for expense reports
 DashboardDisableBlockHoliday=Disable the thumb for leaves
 EnabledCondition=Condition to have field enabled (if not enabled, visibility will always be off)
-IfYouUseASecondTaxYouMustSetYouUseTheMainTax=If you want to use a second tax, you must enable also the first sale tax
-IfYouUseAThirdTaxYouMustSetYouUseTheMainTax=If you want to use a third tax, you must enable also the first sale tax
+IfYouUseASecondTaxYouMustSetYouUseTheMainTax=If you want to use a second tax, you must enable also the first sales tax
+IfYouUseAThirdTaxYouMustSetYouUseTheMainTax=If you want to use a third tax, you must enable also the first sales tax
 LanguageAndPresentation=Language and presentation
 SkinAndColors=Skin and colors
-IfYouUseASecondTaxYouMustSetYouUseTheMainTax=If you want to use a second tax, you must enable also the first sale tax
-IfYouUseAThirdTaxYouMustSetYouUseTheMainTax=If you want to use a third tax, you must enable also the first sale tax
+IfYouUseASecondTaxYouMustSetYouUseTheMainTax=If you want to use a second tax, you must enable also the first sales tax
+IfYouUseAThirdTaxYouMustSetYouUseTheMainTax=If you want to use a third tax, you must enable also the first sales tax
 PDF_USE_1A=Generate PDF with PDF/A-1b format
 MissingTranslationForConfKey = Missing translation for %s
 NativeModules=Native modules
@@ -2220,3 +2260,50 @@ API_DISABLE_COMPRESSION=Disable compression of API responses
 EachTerminalHasItsOwnCounter=Each terminal use its own counter.
 FillAndSaveAccountIdAndSecret=Fill and save account ID and secret first
 PreviousHash=Previous hash
+LateWarningAfter="Late" warning after
+TemplateforBusinessCards=Template for a business card in different size
+InventorySetup= Inventory Setup
+ExportUseLowMemoryMode=Use a low memory mode
+ExportUseLowMemoryModeHelp=Use the low memory mode to execute the exec of the dump (compression is done through a pipe instead of into the PHP memory). This method does not allow to check that file is completed and error message can't be reported if it fails.
+
+ModuleWebhookName = Webhook
+ModuleWebhookDesc = Interface to catch dolibarr triggers and send it to an URL
+WebhookSetup = Webhook setup
+Settings = Settings
+WebhookSetupPage = Webhook setup page
+ShowQuickAddLink=Show a button to quickly add an element in top right menu
+
+HashForPing=Hash used for ping
+ReadOnlyMode=Is instance in "Read Only" mode
+DEBUGBAR_USE_LOG_FILE=Use the <b>dolibarr.log</b> file to trap Logs
+UsingLogFileShowAllRecordOfSubrequestButIsSlower=Use the dolibarr.log file to trap Logs instead of live memory catching. It allows to catch all logs instead of only log of current process (so including the one of ajax subrequests pages) but will make your instance very very slow. Not recommended.
+FixedOrPercent=Fixed (use keyword 'fixed') or percent (use keyword 'percent')
+DefaultOpportunityStatus=Default opportunity status (first status when lead is created)
+
+IconAndText=Icon and text
+TextOnly=Text only
+IconOnlyAllTextsOnHover=Icon only - All texts appears under icon on mouse hover menu bar
+IconOnlyTextOnHover=Icon only - Text of icon appears under icon on mouse hover the icon
+IconOnly=Icon only - Text on tooltip only
+INVOICE_ADD_ZATCA_QR_CODE=Show the ZATCA QR code on invoices
+INVOICE_ADD_ZATCA_QR_CODEMore=Some Arabic countries need this QR Code on their invoices
+INVOICE_ADD_SWISS_QR_CODE=Show the swiss QR-Bill code on invoices
+UrlSocialNetworksDesc=Url link of social network. Use {socialid} for the variable part that contains the social network ID.
+IfThisCategoryIsChildOfAnother=If this category is a child of another one
+DarkThemeMode=Dark theme mode
+AlwaysDisabled=Always disabled
+AccordingToBrowser=According to browser
+AlwaysEnabled=Always Enabled
+DoesNotWorkWithAllThemes=Will not work with all themes
+NoName=No name
+ShowAdvancedOptions= Show advanced options
+HideAdvancedoptions= Hide advanced options
+CIDLookupURL=The module brings an URL that can be used by an external tool to get the name of a thirdparty or contact from its phone number. URL to use is:
+OauthNotAvailableForAllAndHadToBeCreatedBefore=OAUTH2 authentication is not available for all hosts, and a token with the right permissions must have been created upstream with the OAUTH module
+MAIN_MAIL_SMTPS_OAUTH_SERVICE=OAUTH2 authentication service
+DontForgetCreateTokenOauthMod=A token with the right permissions must have been created upstream with the OAUTH module
+MAIN_MAIL_SMTPS_AUTH_TYPE=Authentification method
+UsePassword=Use a password
+UseOauth=Use a OAUTH token
+Images=Images
+MaxNumberOfImagesInGetPost=Max number of images allowed in a HTML field submitted in a form
diff --git a/htdocs/langs/lt_LT/admin.lang b/htdocs/langs/lt_LT/admin.lang
index b66dcb53ce0..4053f4b2161 100644
--- a/htdocs/langs/lt_LT/admin.lang
+++ b/htdocs/langs/lt_LT/admin.lang
@@ -477,7 +477,7 @@ InstalledInto=Installed into directory %s
 BarcodeInitForThirdparties=Mass barcode init for third-parties
 BarcodeInitForProductsOrServices=Masiniss brūkšninių kodų paleidimas arba atstatymas produktams ar paslaugoms
 CurrentlyNWithoutBarCode=Currently, you have <strong>%s</strong> record on <strong>%s</strong> %s without barcode defined.
-InitEmptyBarCode=Pažymėti vertę kitiems %s tuštiems įrašams
+InitEmptyBarCode=Init value for the %s empty barcodes
 EraseAllCurrentBarCode=Ištrinti visas esamas brūkšninių kodų reikšmes
 ConfirmEraseAllCurrentBarCode=Are you sure you want to erase all current barcode values?
 AllBarcodeReset=Visos brūkšninių kodų vertės buvo ištrintos
@@ -714,6 +714,7 @@ Permission27=Ištrinti komercinius pasiūlymus
 Permission28=Eksportuoti komercinius pasiūlymus
 Permission31=Skaityti produktus
 Permission32=Sukurti/pakeisti produktus
+Permission33=Read prices products
 Permission34=Ištrinti produktus
 Permission36=Žiūrėti/tvarkyti paslėptus produktus
 Permission38=Eksportuoti produktus
@@ -739,6 +740,7 @@ Permission79=Sukurti/pakeisti prenumeratas
 Permission81=Skaityti klientų užsakymus
 Permission82=Sukurti/keisti klientų užsakymus
 Permission84=Patvirtinti klientų užsakymus
+Permission85=Generate the documents sales orders
 Permission86=Siųsti klientų užsakymus
 Permission87=Uždaryti klientų užsakymus
 Permission88=Atšaukti klientų užsakymus
@@ -874,6 +876,7 @@ Permission525=Paskolos skaičiuoklė
 Permission527=Eksportuoti paskolas
 Permission531=Skaityti paslaugas
 Permission532=Sukurti/keisti paslaugas
+Permission533=Read prices services
 Permission534=Ištrinti paslaugas
 Permission536=Žiūrėti/tvarkyti paslėptas paslaugas
 Permission538=Eksportuoti paslaugas
@@ -1235,6 +1238,7 @@ BrowserName=Naršyklės pavadinimas
 BrowserOS=Naršyklės OS
 ListOfSecurityEvents=Dolibarr saugumo įvykių sąrašas
 SecurityEventsPurged=Saugumo įvykiai išvalyti
+TrackableSecurityEvents=Trackable security events
 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=Sistemos informacija yra įvairi techninė informacija, kurią gausite tik skaitymo režimu, ir bus matoma tik sistemos administratoriams.
@@ -1977,6 +1981,7 @@ MailToSendSupplierOrder=Purchase orders
 MailToSendSupplierInvoice=Vendor invoices
 MailToSendContract=Sutartys
 MailToSendReception=Receptions
+MailToExpenseReport=Išlaidų ataskaitos
 MailToThirdparty=Trečiosios šalys
 MailToMember=Nariai
 MailToUser=Vartotojai
@@ -2030,6 +2035,7 @@ MAIN_PDF_MARGIN_RIGHT=Right margin on PDF
 MAIN_PDF_MARGIN_TOP=Top margin on PDF
 MAIN_PDF_MARGIN_BOTTOM=Bottom margin on PDF
 MAIN_DOCUMENTS_LOGO_HEIGHT=Height for logo on PDF
+DOC_SHOW_FIRST_SALES_REP=Show first sales representative
 MAIN_GENERATE_PROPOSALS_WITH_PICTURE=Add column for picture on proposal lines
 MAIN_DOCUMENTS_WITH_PICTURE_WIDTH=Width of the column if a picture is added on lines
 MAIN_PDF_NO_SENDER_FRAME=Hide borders on sender address frame
@@ -2063,6 +2069,12 @@ EmailCollectors=Email collectors
 EmailCollectorDescription=Add a scheduled job and a setup page to scan regularly email boxes (using IMAP protocol) and record emails received into your application, at the right place and/or create some records automatically (like leads).
 NewEmailCollector=New Email Collector
 EMailHost=Host of email IMAP server
+EMailHostPort=Port of email IMAP server
+loginPassword=Login/Password
+oauthToken=Oauth2 token
+accessType=Acces type
+oauthService=Oauth service
+TokenMustHaveBeenCreated=Module OAuth2 must be enabled and an oauth2 token must have been created with the correct permissions (for example scope "gmail_full" with OAuth for Gmail).
 MailboxSourceDirectory=Mailbox source directory
 MailboxTargetDirectory=Mailbox target directory
 EmailcollectorOperations=Operations to do by collector
@@ -2106,7 +2118,7 @@ CreateCandidature=Create job application
 FormatZip=Pašto kodas
 MainMenuCode=Menu entry code (mainmenu)
 ECMAutoTree=Show automatic ECM tree
-OperationParamDesc=Define the rules to use to extract or set values.<br>Example for operations that need to extract a name from email subject:<br>name=EXTRACT:SUBJECT:Message from company ([^\n]*)<br>Example for operations that create objects:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value including value of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
+OperationParamDesc=Define the rules to use to extract some data or set values to use for operation.<br><br>Example to extract a company name from email subject into a temporary variable:<br>tmp_var=EXTRACT:SUBJECT:Message from company ([^\n]*)<br><br>Examples to set the properties of an object to create:<br>objproperty1=SET:a hard coded value<br>objproperty2=SET:__tmp_var__<br>objproperty3=SETIFEMPTY:a value (value is set only if property is not already defined)<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
 OpeningHours=Opening hours
 OpeningHoursDesc=Enter here the regular opening hours of your company.
 ResourceSetup=Configuration of Resource module
@@ -2212,6 +2224,7 @@ NoExternalModuleWithUpdate=No updates found for external modules
 SwaggerDescriptionFile=Swagger API description file (for use with redoc for example)
 YouEnableDeprecatedWSAPIsUseRESTAPIsInstead=You enabled deprecated WS API. You should use REST API instead.
 RandomlySelectedIfSeveral=Randomly selected if several pictures are available
+SalesRepresentativeInfo=For Proposals, Orders, Invoices.
 DatabasePasswordObfuscated=Database password is obfuscated in conf file
 DatabasePasswordNotObfuscated=Database password is NOT obfuscated in conf file
 APIsAreNotEnabled=APIs modules are not enabled
@@ -2277,5 +2290,20 @@ INVOICE_ADD_ZATCA_QR_CODEMore=Some Arabic countries need this QR Code on their i
 INVOICE_ADD_SWISS_QR_CODE=Show the swiss QR-Bill code on invoices
 UrlSocialNetworksDesc=Url link of social network. Use {socialid} for the variable part that contains the social network ID.
 IfThisCategoryIsChildOfAnother=If this category is a child of another one
+DarkThemeMode=Dark theme mode
+AlwaysDisabled=Always disabled
+AccordingToBrowser=According to browser
+AlwaysEnabled=Always Enabled
+DoesNotWorkWithAllThemes=Will not work with all themes
 NoName=No name
+ShowAdvancedOptions= Show advanced options
+HideAdvancedoptions= Hide advanced options
 CIDLookupURL=The module brings an URL that can be used by an external tool to get the name of a thirdparty or contact from its phone number. URL to use is:
+OauthNotAvailableForAllAndHadToBeCreatedBefore=OAUTH2 authentication is not available for all hosts, and a token with the right permissions must have been created upstream with the OAUTH module
+MAIN_MAIL_SMTPS_OAUTH_SERVICE=OAUTH2 authentication service
+DontForgetCreateTokenOauthMod=A token with the right permissions must have been created upstream with the OAUTH module
+MAIN_MAIL_SMTPS_AUTH_TYPE=Authentification method
+UsePassword=Use a password
+UseOauth=Use a OAUTH token
+Images=Images
+MaxNumberOfImagesInGetPost=Max number of images allowed in a HTML field submitted in a form
diff --git a/htdocs/langs/lv_LV/admin.lang b/htdocs/langs/lv_LV/admin.lang
index 911d8a152a8..52ab7d36c57 100644
--- a/htdocs/langs/lv_LV/admin.lang
+++ b/htdocs/langs/lv_LV/admin.lang
@@ -477,7 +477,7 @@ InstalledInto=Instalēta direktorijā %s
 BarcodeInitForThirdparties=Masveida svītru kodu veidošana trešajām personām
 BarcodeInitForProductsOrServices=Masveida svītrkodu veidošana produktu vai pakalpojumu atiestatīšana
 CurrentlyNWithoutBarCode=Pašlaik jums ir <strong>%s</strong> ierakstu <strong>%s</strong> %s bez definēta svītrukoda.
-InitEmptyBarCode=Sākotnējā vērtība nākamajiem %s tukšajiem ierakstiem
+InitEmptyBarCode=Init value for the %s empty barcodes
 EraseAllCurrentBarCode=Dzēst visas svītrkodu vērtības
 ConfirmEraseAllCurrentBarCode=Vai tiešām vēlaties dzēst visas svītrkodu vērtības ?
 AllBarcodeReset=Visas svītrkodu vērtības dzēstas
@@ -714,6 +714,7 @@ Permission27=Dzēst komerciālos priekšlikumus
 Permission28=Eksportēt tirdzniecības priekšlikumus
 Permission31=Lasīt produktus
 Permission32=Izveidot / mainīt produktus
+Permission33=Read prices products
 Permission34=Dzēst produktus
 Permission36=Skatīt/vadīt slēptos produktus
 Permission38=Eksportēt produktus
@@ -739,6 +740,7 @@ Permission79=Izveidot/mainīt abonementus
 Permission81=Lasīt klientu pasūtījumus
 Permission82=Izveidot/mainīt klientu pasūtījumus
 Permission84=Apstiprināt klientu pasūtījumus
+Permission85=Generate the documents sales orders
 Permission86=Sūtīt klientu pasūtījumus
 Permission87=Slēgt klientu pasūtījumus
 Permission88=Atcelt klientu pasūtījumus
@@ -874,6 +876,7 @@ Permission525=Piekļuves kredīta kalkulators
 Permission527=Eksportēt kredītus
 Permission531=Lasīt pakalpojumus
 Permission532=Izveidot/mainīt pakalpojumus
+Permission533=Read prices services
 Permission534=Dzēst pakalpojumus
 Permission536=Skatīt/vadīt slēptos pakalpojumus
 Permission538=Eksportēt pakalpojumus
@@ -1235,6 +1238,7 @@ BrowserName=Pārlūkprogrammas nosaukums
 BrowserOS=Pārlūkprogrammas OS
 ListOfSecurityEvents=Saraksts ar Dolibarr drošības pasākumiem
 SecurityEventsPurged=Drošības pasākumi dzēsti
+TrackableSecurityEvents=Trackable security events
 LogEventDesc=Iespējot konkrētu drošības notikumu reģistrēšanu. Administratori reģistrē izvēlni <b> %s - %s </b>. Brīdinājums: šī funkcija datu bāzē var radīt lielu datu apjomu.
 AreaForAdminOnly=Iestatīšanas parametrus var iestatīt tikai <b> administratora lietotāji </b>.
 SystemInfoDesc=Sistēmas informācija ir dažādi tehniskā informācija jums tikai lasīšanas režīmā un redzama tikai administratoriem.
@@ -1977,6 +1981,7 @@ MailToSendSupplierOrder=Pirkuma pasūtījumi
 MailToSendSupplierInvoice=Piegādātāja rēķini
 MailToSendContract=Līgumi
 MailToSendReception=Pieņemšanas
+MailToExpenseReport=Izdevumu atskaites
 MailToThirdparty=Trešās puses
 MailToMember=Dalībnieki
 MailToUser=Lietotāji
@@ -2030,6 +2035,7 @@ MAIN_PDF_MARGIN_RIGHT=Labā puse PDF failā
 MAIN_PDF_MARGIN_TOP=Galvene PDF failā
 MAIN_PDF_MARGIN_BOTTOM=Kājene PDF failā
 MAIN_DOCUMENTS_LOGO_HEIGHT=Logotipa augstums PDF formātā
+DOC_SHOW_FIRST_SALES_REP=Show first sales representative
 MAIN_GENERATE_PROPOSALS_WITH_PICTURE=Pievienojiet attēla kolonnu priekšlikuma rindām
 MAIN_DOCUMENTS_WITH_PICTURE_WIDTH=Kolonnas platums, ja līnijām ir pievienots attēls
 MAIN_PDF_NO_SENDER_FRAME=Slēpt adresāta rāmja robežas
@@ -2063,6 +2069,12 @@ EmailCollectors=E-pasta kolekcionāri
 EmailCollectorDescription=Pievienojiet ieplānoto darbu un iestatīšanas lapu, lai regulāri skenētu e-pasta kastes (izmantojot IMAP protokolu) un ierakstītu savā pieteikumā saņemtos e-pasta ziņojumus pareizajā vietā un / vai automātiski izveidotu ierakstus (piemēram, vadus).
 NewEmailCollector=Jauns e-pasta savācējs
 EMailHost=E-pasta IMAP serveris
+EMailHostPort=Port of email IMAP server
+loginPassword=Login/Password
+oauthToken=Oauth2 token
+accessType=Acces type
+oauthService=Oauth service
+TokenMustHaveBeenCreated=Module OAuth2 must be enabled and an oauth2 token must have been created with the correct permissions (for example scope "gmail_full" with OAuth for Gmail).
 MailboxSourceDirectory=Pastkastes avota katalogs
 MailboxTargetDirectory=Pastkastes mērķa direktorija
 EmailcollectorOperations=Darbi, ko veic savācējs
@@ -2106,7 +2118,7 @@ CreateCandidature=Izveidot darba pieteikumu
 FormatZip=Pasta indekss
 MainMenuCode=Izvēlnes ievades kods (mainmenu)
 ECMAutoTree=Rādīt automātisko ECM koku
-OperationParamDesc=Define the rules to use to extract or set values.<br>Example for operations that need to extract a name from email subject:<br>name=EXTRACT:SUBJECT:Message from company ([^\n]*)<br>Example for operations that create objects:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value including value of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
+OperationParamDesc=Define the rules to use to extract some data or set values to use for operation.<br><br>Example to extract a company name from email subject into a temporary variable:<br>tmp_var=EXTRACT:SUBJECT:Message from company ([^\n]*)<br><br>Examples to set the properties of an object to create:<br>objproperty1=SET:a hard coded value<br>objproperty2=SET:__tmp_var__<br>objproperty3=SETIFEMPTY:a value (value is set only if property is not already defined)<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
 OpeningHours=Darba laiks
 OpeningHoursDesc=Ievadiet šeit sava uzņēmuma pastāvīgo darba laiku.
 ResourceSetup=Resursu moduļa konfigurēšana
@@ -2212,6 +2224,7 @@ NoExternalModuleWithUpdate=Ārējiem moduļiem nav atrasti atjauninājumi
 SwaggerDescriptionFile=Swagger API apraksta fails (piemēram, lietošanai ar pārorientēšanu)
 YouEnableDeprecatedWSAPIsUseRESTAPIsInstead=Jūs iespējojāt novecojušu WS API. Tā vietā jums vajadzētu izmantot REST API.
 RandomlySelectedIfSeveral=Nejauši izvēlēts, ja ir pieejami vairāki attēli
+SalesRepresentativeInfo=For Proposals, Orders, Invoices.
 DatabasePasswordObfuscated=Datu bāzes parole ir neskaidra konf failā
 DatabasePasswordNotObfuscated=Datu bāzes parole NAV apmulsināta conf failā
 APIsAreNotEnabled=API moduļi nav iespējoti
@@ -2277,5 +2290,20 @@ INVOICE_ADD_ZATCA_QR_CODEMore=Dažām arābu valstīm šis QR kods ir nepiecieš
 INVOICE_ADD_SWISS_QR_CODE=Rādīt Šveices QR-rēķina kodu uz rēķiniem
 UrlSocialNetworksDesc=Sociālā tīkla URL saite. Mainīgajai daļai, kas satur sociālā tīkla ID, izmantojiet {socialid}.
 IfThisCategoryIsChildOfAnother=Ja šī kategorija ir citas kategorijas bērns
+DarkThemeMode=Dark theme mode
+AlwaysDisabled=Always disabled
+AccordingToBrowser=According to browser
+AlwaysEnabled=Always Enabled
+DoesNotWorkWithAllThemes=Will not work with all themes
 NoName=Nav vārda
+ShowAdvancedOptions= Show advanced options
+HideAdvancedoptions= Hide advanced options
 CIDLookupURL=Modulis nodrošina URL, ko var izmantot ārējs rīks, lai iegūtu trešās puses vai kontaktpersonas vārdu no tā tālruņa numura. Izmantojamais URL ir:
+OauthNotAvailableForAllAndHadToBeCreatedBefore=OAUTH2 authentication is not available for all hosts, and a token with the right permissions must have been created upstream with the OAUTH module
+MAIN_MAIL_SMTPS_OAUTH_SERVICE=OAUTH2 authentication service
+DontForgetCreateTokenOauthMod=A token with the right permissions must have been created upstream with the OAUTH module
+MAIN_MAIL_SMTPS_AUTH_TYPE=Authentification method
+UsePassword=Use a password
+UseOauth=Use a OAUTH token
+Images=Images
+MaxNumberOfImagesInGetPost=Max number of images allowed in a HTML field submitted in a form
diff --git a/htdocs/langs/nb_NO/accountancy.lang b/htdocs/langs/nb_NO/accountancy.lang
index 10311886263..8c9d8002207 100644
--- a/htdocs/langs/nb_NO/accountancy.lang
+++ b/htdocs/langs/nb_NO/accountancy.lang
@@ -48,8 +48,9 @@ CountriesNotInEEC=Land ikke i EEC
 CountriesInEECExceptMe=Land i EEC unntatt %s
 CountriesExceptMe=Alle land unntatt %s
 AccountantFiles=Eksporter kildedokumenter
-ExportAccountingSourceDocHelp=Med dette verktøyet kan du eksportere kildehendelsene (liste i CSV og PDF-er) som brukes til å generere regnskapet ditt.
+ExportAccountingSourceDocHelp=With this tool, you can search and export the source events that are used to generate your accountancy. <br>The exported ZIP file will contain the lists of requested items in CSV, as well as their attached files in their original format (PDF, ODT, DOCX...).
 ExportAccountingSourceDocHelp2=For å eksportere journalene dine, bruk menyoppføringen %s - %s.
+ExportAccountingProjectHelp=Specify a project if you need an accounting report only for a specific project. Expense reports and loan payments are not included in project reports.
 VueByAccountAccounting=Vis etter regnskapskonto
 VueBySubAccountAccounting=Vis etter regnskaps-subkonto
 
@@ -183,6 +184,8 @@ ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT=Regnskapskonto for å registrere abonnem
 
 ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT=Regnskapskonto som standard for å registrere kundeinnskudd
 UseAuxiliaryAccountOnCustomerDeposit=Store customer account as individual account in subsidiary ledger for lines of down payments (if disabled, individual account for down payment lines will remain empty)
+ACCOUNTING_ACCOUNT_SUPPLIER_DEPOSIT=Accounting account by default to register supplier deposit
+UseAuxiliaryAccountOnSupplierDeposit=Store supplier account as individual account in subsidiary ledger for lines of down payments (if disabled, individual account for down payment lines will remain empty)
 
 ACCOUNTING_PRODUCT_BUY_ACCOUNT=Regnskapskonto som standard for de kjøpte varene (brukt hvis ikke definert i produktarket)
 ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT=Regnskapskonto som standard for kjøpte produkter i EU (brukt hvis ikke definert i produktarket)
@@ -332,7 +335,7 @@ ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS=Deaktiver binding og overføring ti
 
 ## Export
 NotifiedExportDate=Flag exported lines as Exported <span class="warning">(to modify a line, you will need to delete the whole transaction and re-transfert it into accounting)</span>
-NotifiedValidationDate=Validate and Lock the exported entries <span class="warning">(same effect than the "Closure" feature, modification and deletion of the lines will DEFINITELY not be possible)</span>
+NotifiedValidationDate=Validate and Lock the exported entries <span class="warning">(same effect than the "%s" feature, modification and deletion of the lines will DEFINITELY not be possible)</span>
 DateValidationAndLock=Datovalidering og lås
 ConfirmExportFile=Bekreftelse på generering av regnskapseksportfilen ?
 ExportDraftJournal=Eksporter utkastjournal
diff --git a/htdocs/langs/nb_NO/admin.lang b/htdocs/langs/nb_NO/admin.lang
index 17d28118b68..fbda984841c 100644
--- a/htdocs/langs/nb_NO/admin.lang
+++ b/htdocs/langs/nb_NO/admin.lang
@@ -477,7 +477,7 @@ InstalledInto=Installert i mappen %s
 BarcodeInitForThirdparties=Masseinitiering av strekkoder for tredjeparter
 BarcodeInitForProductsOrServices=Masseinitiering eller sletting av strekkoder for varer og tjenester
 CurrentlyNWithoutBarCode=For øyeblikket har du <strong>%s</strong> poster på <strong>%s</strong> %s uten strekkode.
-InitEmptyBarCode=Startverdi for neste %s tomme post
+InitEmptyBarCode=Init value for the %s empty barcodes
 EraseAllCurrentBarCode=Slett alle gjeldende strekkode-verdier
 ConfirmEraseAllCurrentBarCode=Er du sikker på at du vil slette alle nåværende strekkodeverdier?
 AllBarcodeReset=Alle strekkode-verdier er blitt slettet
@@ -714,6 +714,7 @@ Permission27=Slett tilbud
 Permission28=Eksporter tilbud
 Permission31=Les varer
 Permission32=Opprett/endre varer
+Permission33=Read prices products
 Permission34=Slett varer
 Permission36=Se/administrer skjulte varer
 Permission38=Eksporter varer
@@ -739,6 +740,7 @@ Permission79=Opprett/endre abonnementer
 Permission81=Les kundeordre
 Permission82=Opprett/endre kundeordre
 Permission84=Valider kundeordre
+Permission85=Generate the documents sales orders
 Permission86=Send kundeordre
 Permission87=Lukk kundeordre
 Permission88=Avbryt kundeordre
@@ -874,6 +876,7 @@ Permission525=Gå til lånekalkulator
 Permission527=Eksporter lån
 Permission531=Vis tjenester
 Permission532=Opprett/endre tjenester
+Permission533=Read prices services
 Permission534=Slett tjenester
 Permission536=Administrer skjulte tjenester
 Permission538=Eksporter tjenester
@@ -1235,6 +1238,7 @@ BrowserName=Navn på nettleser
 BrowserOS=Nettleserens operativsystem
 ListOfSecurityEvents=Oversikt over sikkerhetshendelser i Dolibarr
 SecurityEventsPurged=Sikkerhetshendelser renset
+TrackableSecurityEvents=Trackable security events
 LogEventDesc=Aktiver logging av bestemte sikkerhetshendelser. Administratorer når loggen via menyen <b> %s - %s </b>. Advarsel, denne funksjonen kan generere store mengder data i databasen.
 AreaForAdminOnly=Oppsettparametere kan bare angis av <b> administratorbrukere </b>.
 SystemInfoDesc=Systeminformasjon er diverse teknisk informasjon som kun vises i skrivebeskyttet modus, og som kun er synlig for administratorer.
@@ -1977,6 +1981,7 @@ MailToSendSupplierOrder=Innkjøpsordrer
 MailToSendSupplierInvoice=Leverandørfakturaer
 MailToSendContract=Kontrakter
 MailToSendReception=Mottak
+MailToExpenseReport=Utgiftsrapporter
 MailToThirdparty=Tredjeparter
 MailToMember=Medlemmer
 MailToUser=Brukere
@@ -2030,6 +2035,7 @@ MAIN_PDF_MARGIN_RIGHT=Høyremarg på PDF
 MAIN_PDF_MARGIN_TOP=Toppmarg på PDF
 MAIN_PDF_MARGIN_BOTTOM=Bunnmarg på PDF
 MAIN_DOCUMENTS_LOGO_HEIGHT=Høyde for logo på PDF
+DOC_SHOW_FIRST_SALES_REP=Show first sales representative
 MAIN_GENERATE_PROPOSALS_WITH_PICTURE=Legg til kolonne for bilde på tilbudslinjer
 MAIN_DOCUMENTS_WITH_PICTURE_WIDTH=Kolonnenbredde hvis et bilde legges til på linjer
 MAIN_PDF_NO_SENDER_FRAME=Skjul kanter på rammen rundt avsenderadresse
@@ -2063,6 +2069,12 @@ EmailCollectors=Email collectors
 EmailCollectorDescription=Legg til en planlagt jobb og en oppsettside for å jevnlig skanne etter e-post (ved hjelp av IMAP-protokollen) og registrere e-postmeldinger mottatt i applikasjonen, på riktig sted og/eller opprett poster automatisk (som kundeemner).
 NewEmailCollector=Ny e-postsamler
 EMailHost=Vert for e-post IMAP-server
+EMailHostPort=Port of email IMAP server
+loginPassword=Login/Password
+oauthToken=Oauth2 token
+accessType=Acces type
+oauthService=Oauth service
+TokenMustHaveBeenCreated=Module OAuth2 must be enabled and an oauth2 token must have been created with the correct permissions (for example scope "gmail_full" with OAuth for Gmail).
 MailboxSourceDirectory=Postkasse kildemappe
 MailboxTargetDirectory=Postkasse målmappe
 EmailcollectorOperations=Operasjoner som skal utføres av samler
@@ -2106,7 +2118,7 @@ CreateCandidature=Opprett jobbsøknad
 FormatZip=Postnummer
 MainMenuCode=Meny-oppføringskode (hovedmeny)
 ECMAutoTree=Vis ECM-tre automatisk 
-OperationParamDesc=Definer reglene som skal brukes til å trekke ut eller angi verdier. 1 Eksempel på operasjoner som trenger å trekke ut et navn fra e-postemne: <br>name=EXTRACT:SUBJECT:Melding fra firma([^\n]*)<br>Eksempel på operasjoner som oppretter objekter:<br>objproperty1=SET:sett verdi<br>objproperty2=SET:en verdi som inkluderer verdien til __objproperty1__<br>objproperty3=SETIFEMPTY:verdi brukt hvis objproperty3 ikke allerede er definert<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:Mitt firmanavn er\\s([^\\s]*)<br><br>Bruk semikolon som separator for å hente ut eller sette flere egenskaper.
+OperationParamDesc=Define the rules to use to extract some data or set values to use for operation.<br><br>Example to extract a company name from email subject into a temporary variable:<br>tmp_var=EXTRACT:SUBJECT:Message from company ([^\n]*)<br><br>Examples to set the properties of an object to create:<br>objproperty1=SET:a hard coded value<br>objproperty2=SET:__tmp_var__<br>objproperty3=SETIFEMPTY:a value (value is set only if property is not already defined)<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
 OpeningHours=Åpningstider
 OpeningHoursDesc=Skriv inn de vanlige åpningstidene for bedriften din.
 ResourceSetup=Konfigurasjon av ressursmodulen
@@ -2212,6 +2224,7 @@ NoExternalModuleWithUpdate=Ingen oppdateringer funnet for eksterne moduler
 SwaggerDescriptionFile=Swagger API-beskrivelsesfil (for bruk med f.eks redoc)
 YouEnableDeprecatedWSAPIsUseRESTAPIsInstead=Du har aktivert utdatert WS API. Du bør bruke REST API i stedet.
 RandomlySelectedIfSeveral=Tilfeldig valgt hvis flere bilder er tilgjengelige
+SalesRepresentativeInfo=For Proposals, Orders, Invoices.
 DatabasePasswordObfuscated=Databasepassord er skjult i conf-filen
 DatabasePasswordNotObfuscated=Databasepassord er IKKE skjult i conf-filen
 APIsAreNotEnabled=API-moduler er ikke aktivert
@@ -2277,5 +2290,20 @@ INVOICE_ADD_ZATCA_QR_CODEMore=Noen arabiske land trenger denne QR-koden på fakt
 INVOICE_ADD_SWISS_QR_CODE=Show the swiss QR-Bill code on invoices
 UrlSocialNetworksDesc=URL-lenke til sosialt nettverk. Bruk {socialid} for den variable delen som inneholder ID-en for det sosiale nettverket.
 IfThisCategoryIsChildOfAnother=If this category is a child of another one
+DarkThemeMode=Dark theme mode
+AlwaysDisabled=Always disabled
+AccordingToBrowser=According to browser
+AlwaysEnabled=Always Enabled
+DoesNotWorkWithAllThemes=Will not work with all themes
 NoName=No name
+ShowAdvancedOptions= Show advanced options
+HideAdvancedoptions= Hide advanced options
 CIDLookupURL=The module brings an URL that can be used by an external tool to get the name of a thirdparty or contact from its phone number. URL to use is:
+OauthNotAvailableForAllAndHadToBeCreatedBefore=OAUTH2 authentication is not available for all hosts, and a token with the right permissions must have been created upstream with the OAUTH module
+MAIN_MAIL_SMTPS_OAUTH_SERVICE=OAUTH2 authentication service
+DontForgetCreateTokenOauthMod=A token with the right permissions must have been created upstream with the OAUTH module
+MAIN_MAIL_SMTPS_AUTH_TYPE=Authentification method
+UsePassword=Use a password
+UseOauth=Use a OAUTH token
+Images=Images
+MaxNumberOfImagesInGetPost=Max number of images allowed in a HTML field submitted in a form
diff --git a/htdocs/langs/nl_BE/admin.lang b/htdocs/langs/nl_BE/admin.lang
index 96b867163c0..29adcec7d4d 100644
--- a/htdocs/langs/nl_BE/admin.lang
+++ b/htdocs/langs/nl_BE/admin.lang
@@ -192,6 +192,7 @@ LibraryToBuildPDF=Bibliotheek om PDF bestanden te genereren.
 RefreshPhoneLink=Herladen link
 SetAsDefault=Instellen als standaard
 BarcodeInitForProductsOrServices=Mass barcode init of reset voor producten of diensten
+InitEmptyBarCode=Init value for the %s empty barcodes
 NoDetails=Geen aanvullende details in voettekst
 DisplayCompanyInfo=Bedrijfsadres weergeven
 DisplayCompanyManagers=Namen van beheerders weergeven
@@ -241,9 +242,10 @@ SalariesSetup=Setup van module salarissen
 MailToSendProposal=Klant voorstellen
 MailToSendInvoice=Klantfacturen
 MailToSendReception=Ontvangen
+MailToExpenseReport=Uitgaven rapporten
 MailToThirdparty=Klant
 AddBoxes=Widgets toevoegen
-OperationParamDesc=Define the rules to use to extract or set values.<br>Example for operations that need to extract a name from email subject:<br>name=EXTRACT:SUBJECT:Message from company ([^\n]*)<br>Example for operations that create objects:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value including value of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
+OperationParamDesc=Define the rules to use to extract some data or set values to use for operation.<br><br>Example to extract a company name from email subject into a temporary variable:<br>tmp_var=EXTRACT:SUBJECT:Message from company ([^\n]*)<br><br>Examples to set the properties of an object to create:<br>objproperty1=SET:a hard coded value<br>objproperty2=SET:__tmp_var__<br>objproperty3=SETIFEMPTY:a value (value is set only if property is not already defined)<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
 GeneralOptions=Algemene opties
 ExportSetup=Installatie van module Exporteren
 EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it.<br>For example, if you want to create a thirdparty with a name extracted from a string 'Name: name to find' present into the body, use the sender email as email, you can set the parameter field like this:<br>'email=HEADER:^From:(.*);name=EXTRACT:BODY:Name:\\s([^\\s]*);client=SET:2;'<br>
diff --git a/htdocs/langs/nl_NL/accountancy.lang b/htdocs/langs/nl_NL/accountancy.lang
index 9945045a4af..f8f6e23da4a 100644
--- a/htdocs/langs/nl_NL/accountancy.lang
+++ b/htdocs/langs/nl_NL/accountancy.lang
@@ -48,8 +48,9 @@ CountriesNotInEEC=Landen buiten de EU
 CountriesInEECExceptMe=EU landen behalve %s
 CountriesExceptMe=Alle landen behalve %s
 AccountantFiles=Bron-documenten exporteren
-ExportAccountingSourceDocHelp=Met deze tool kunt u de bron events (lijst in CSV en PDF) exporteren die zijn gebruikt om om uw boekhouding te genereren.
+ExportAccountingSourceDocHelp=Met deze tool kunt u de brongebeurtenissen zoeken en exporteren die worden gebruikt om uw boekhouding te genereren. <br>Het geëxporteerde ZIP-bestand bevat de lijsten met gevraagde items in CSV, evenals de bijgevoegde bestanden in hun oorspronkelijke formaat (PDF, ODT, DOCX...).
 ExportAccountingSourceDocHelp2=Gebruik het menu-item %s - %s om uw dagboeken te exporteren.
+ExportAccountingProjectHelp=Specify a project if you need an accounting report only for a specific project. Expense reports and loan payments are not included in project reports.
 VueByAccountAccounting=Overzicht per grootboekrekening
 VueBySubAccountAccounting=Overzicht op volgorde subrekening
 
@@ -183,6 +184,8 @@ ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT=Grootboekrekening om abonnementen te reg
 
 ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT=Standaard grootboekrekening voor storting door klant
 UseAuxiliaryAccountOnCustomerDeposit=Store customer account as individual account in subsidiary ledger for lines of down payments (if disabled, individual account for down payment lines will remain empty)
+ACCOUNTING_ACCOUNT_SUPPLIER_DEPOSIT=Accounting account by default to register supplier deposit
+UseAuxiliaryAccountOnSupplierDeposit=Store supplier account as individual account in subsidiary ledger for lines of down payments (if disabled, individual account for down payment lines will remain empty)
 
 ACCOUNTING_PRODUCT_BUY_ACCOUNT=Standaard grootboekrekening voor de gekochte producten (gebruikt indien niet gedefinieerd in de productfiche)
 ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT=Grootboekrekening standaard voor de gekochte producten binnen de EU (gebruikt indien niet gedefinieerd in het productblad)
@@ -332,7 +335,7 @@ ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS=Schakel het koppelen en doorboeken
 
 ## Export
 NotifiedExportDate=Geëxporteerde regels markeren als geëxporteerd <span class="warning">(om een regel te wijzigen, moet u de hele transactie verwijderen en opnieuw in de boekhouding opnemen)</span>
-NotifiedValidationDate=Valideer en vergrendel de geëxporteerde items <span class="warning">(hetzelfde effect als de functie "Sluiting", wijziging en verwijdering van de regels is ZEKER niet mogelijk)</span>
+NotifiedValidationDate=Validate and Lock the exported entries <span class="warning">(same effect than the "%s" feature, modification and deletion of the lines will DEFINITELY not be possible)</span>
 DateValidationAndLock=Datum validatie en vergrendelen
 ConfirmExportFile=Bevestiging van het genereren van het boekhoudkundige exportbestand ?
 ExportDraftJournal=Journaal exporteren
diff --git a/htdocs/langs/nl_NL/admin.lang b/htdocs/langs/nl_NL/admin.lang
index 4ccc5a9b7d0..ab201c44d23 100644
--- a/htdocs/langs/nl_NL/admin.lang
+++ b/htdocs/langs/nl_NL/admin.lang
@@ -109,7 +109,7 @@ NextValueForReplacements=Volgende waarde (vervangingen)
 MustBeLowerThanPHPLimit=Opmerking: uw PHP-configuratie beperkt momenteel de maximale bestandsgrootte voor uploaden tot <b> %s </b> %s, ongeacht de waarde van deze parameter
 NoMaxSizeByPHPLimit=Opmerking: Geen limiet ingesteld in uw PHP instellingen
 MaxSizeForUploadedFiles=Maximale grootte voor geüploade bestanden (0 om uploaden niet toe te staan)
-UseCaptchaCode=Use graphical code (CAPTCHA) on login page and some public pages
+UseCaptchaCode=Gebruik grafische code (CAPTCHA) op de inlogpagina en sommige openbare pagina's
 AntiVirusCommand=Het volledige pad naar het antiviruscommando
 AntiVirusCommandExample=Voorbeeld voor ClamAv Daemon (vereist clamav-daemon): / usr / bin / clamdscan<br>Voorbeeld voor ClamWin (erg langzaam): c: \\ Progra ~ 1 \\ ClamWin \\ bin \\ clamscan.exe
 AntiVirusParam= Aanvullende parameters op de opdrachtregel
@@ -477,7 +477,7 @@ InstalledInto=Geïnstalleerd in directory %s
 BarcodeInitForThirdparties=Massa streepjescode init voor derde partijen
 BarcodeInitForProductsOrServices=Massa barcode init of reset voor producten of diensten
 CurrentlyNWithoutBarCode=Momenteel hebt u een <strong>%s</strong> record op <strong>%s</strong>%s zonder gedefinieerde streepjescode.
-InitEmptyBarCode=Init waarde voor de volgende %s lege records
+InitEmptyBarCode=Init-waarde voor de %s lege barcodes
 EraseAllCurrentBarCode=Wis alle huidige barcode waarden
 ConfirmEraseAllCurrentBarCode=Weet u zeker dat u alle huidige streepjescode-waarden wilt wissen?
 AllBarcodeReset=Alle barcode waarden zijn verwijderd
@@ -504,7 +504,7 @@ WarningPHPMailC=- Het gebruik van de SMTP-server van uw eigen e-mailserviceprovi
 WarningPHPMailD=Ook is het daarom aan te raden om de verzendmethode van e-mails te wijzigen naar de waarde "SMTP". Als je echt de standaard "PHP"-methode wilt behouden om e-mails te verzenden, negeer deze waarschuwing dan, of verwijder hem door de constante MAIN_HIDE_WARNING_TO_ENCOURAGE_SMTP_SETUP op 1 te zetten in Startpagina - Instellingen - Overig.
 WarningPHPMail2=Als uw e-mail SMTP-provider de e-mailclient moet beperken tot bepaalde IP-adressen (zeer zeldzaam), is dit het IP-adres van de mail user agent (MUA) voor uw ERP CRM-toepassing: <strong>%s</strong>.
 WarningPHPMailSPF=Als de domeinnaam in je e-mailadres van de afzender beschermd is door een SPF record (vraag je domeinnaam registrar), dan moet je de volgende IP's toevoegen in het SPF record van de DNS van je domein: <strong> %s </strong> .
-ActualMailSPFRecordFound=Actual SPF record found (for email %s) : %s
+ActualMailSPFRecordFound=Werkelijk SPF-record gevonden (voor e-mail %s): %s
 ClickToShowDescription=Klik voor omschrijving
 DependsOn=Deze module heeft de module(s) nodig
 RequiredBy=Deze module is vereist bij module(s)
@@ -714,6 +714,7 @@ Permission27=Verwijder offertes
 Permission28=Exporteer offertes
 Permission31=Bekijk producten / diensten
 Permission32=Maak / wijzig producten en diensten
+Permission33=Lees prijzen producten
 Permission34=Verwijderen producten / diensten
 Permission36=Exporteer producten / diensten
 Permission38=Export producten
@@ -739,6 +740,7 @@ Permission79=Creëer / wijzigen abonnementen
 Permission81=Bekijk afnemersopdrachten
 Permission82=Creëer / wijzig afnemersopdrachten
 Permission84=Valideer afnemersopdrachten
+Permission85=Genereer de documenten verkooporders
 Permission86=Verzend afnemersopdrachten
 Permission87=Sluit afnemersopdrachten
 Permission88=Annuleer afnemersopdrachten
@@ -874,6 +876,7 @@ Permission525=Toegang lening calculator
 Permission527=Export leningen
 Permission531=Diensten inzien
 Permission532=Creëren / wijzigen van diensten
+Permission533=Lees prijzen diensten
 Permission534=Diensten verwijderen
 Permission536=Inzien / beheren van verborgen diensten
 Permission538=Diensten exporteren
@@ -1129,7 +1132,7 @@ ValueOfConstantKey=Waarde van een configuratieconstante
 ConstantIsOn=Optie %s is ingeschakeld
 NbOfDays=Aantal dagen
 AtEndOfMonth=Aan het einde van de maand
-CurrentNext=A given day in month
+CurrentNext=Een bepaalde dag in de maand
 Offset=Offset (afstand)
 AlwaysActive=Altijd actief
 Upgrade=Bijwerken
@@ -1235,6 +1238,7 @@ BrowserName=Browser naam
 BrowserOS=Browser OS
 ListOfSecurityEvents=Lijst van Dolibarr veiligheidgebeurtenisen
 SecurityEventsPurged=Beveiliging gebeurtenissen verwijderd
+TrackableSecurityEvents=Traceerbare beveiligingsgebeurtenissen
 LogEventDesc=Schakel logboekregistratie in voor specifieke beveiligingsgebeurtenissen. Administrators het logboek via menu <b>%s - %s</b> . Waarschuwing, deze functie kan een grote hoeveelheid gegevens in de database genereren.
 AreaForAdminOnly=Setup functies kunnen alleen door <b>Administrator gebruikers</b> worden ingesteld
 SystemInfoDesc=Systeeminformatie is technische informatie welke u in alleen-lezen modus krijgt en alleen door beheerders is in te zien.
@@ -1977,6 +1981,7 @@ MailToSendSupplierOrder=Inkooporders
 MailToSendSupplierInvoice=Inkoopfacturen
 MailToSendContract=Contracten
 MailToSendReception=Ontvangsten
+MailToExpenseReport=Declaraties
 MailToThirdparty=Derde partijen
 MailToMember=Leden
 MailToUser=Gebruikers
@@ -2030,6 +2035,7 @@ MAIN_PDF_MARGIN_RIGHT=Rechter marge op PDF
 MAIN_PDF_MARGIN_TOP=Bovenmarge op PDF
 MAIN_PDF_MARGIN_BOTTOM=Onder-marge op PDF
 MAIN_DOCUMENTS_LOGO_HEIGHT=Hoogte voor logo op PDF
+DOC_SHOW_FIRST_SALES_REP=Toon eerste vertegenwoordiger
 MAIN_GENERATE_PROPOSALS_WITH_PICTURE=Kolom toevoegen voor afbeelding op voorstelregels
 MAIN_DOCUMENTS_WITH_PICTURE_WIDTH=Breedte van de kolom als een afbeelding op lijnen is toegevoegd
 MAIN_PDF_NO_SENDER_FRAME=Verberg randen op frame van afzenderadres
@@ -2063,6 +2069,12 @@ EmailCollectors=E-mailverzamelaars
 EmailCollectorDescription=Voeg een geplande taak en een installatiepagina toe om regelmatig e-mailboxen te scannen (met het IMAP-protocol) en ontvangen e-mails op te nemen in uw toepassing, op de juiste plaats en / of maak automatisch enkele records aan (zoals leads).
 NewEmailCollector=Nieuwe e-mailverzamelaar
 EMailHost=Host van e-mail IMAP-server
+EMailHostPort=Poort van e-mail IMAP-server
+loginPassword=Login wachtwoord
+oauthToken=Oauth2-token
+accessType=Toegangstype:
+oauthService=Oauth-service
+TokenMustHaveBeenCreated=Module OAuth2 moet zijn ingeschakeld en er moet een OAuth2-token zijn gemaakt met de juiste machtigingen (bijvoorbeeld scope "gmail_full" met OAuth voor Gmail).
 MailboxSourceDirectory=Brondirectory van mailbox
 MailboxTargetDirectory=Doeldirectory voor mailbox
 EmailcollectorOperations=Operaties te doen door verzamelaar
@@ -2106,7 +2118,7 @@ CreateCandidature=Maak een sollicitatie
 FormatZip=Zip
 MainMenuCode=Menu toegangscode (hoofdmenu)
 ECMAutoTree=Toon automatische ECM-structuur
-OperationParamDesc=Definieer de regels die moeten worden gebruikt om waarden te extraheren of in te stellen.<br>Voorbeeld voor bewerkingen die een naam moeten extraheren uit het e-mailonderwerp:<br>name=EXTRACT:SUBJECT:Message from company ([^\n]*)<br>Voorbeeld voor bewerkingen die objecten maken:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value including value of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
+OperationParamDesc=Definieer de regels die moeten worden gebruikt om bepaalde gegevens te extraheren of stel waarden in die voor de bewerking moeten worden gebruikt. <br> <br> Voorbeeld om een bedrijfsnaam uit het onderwerp van een e-mail te extraheren in een tijdelijke variabele: <br> tmp_var=EXTRACT:SUBJECT:Bericht van bedrijf ([^\n]*) <br> <br> Voorbeelden om de eigenschappen van een te creëren object in te stellen: <br> objproperty1=SET:een hard gecodeerde waarde <br> objproperty2=SET:__tmp_var__ a0342fccfpropda19bty=objproperty1=SET:a hard coded value <br> objproperty2=SET:__tmp_var__ a0342fccfpropda19bty=objproperty1=SET:a hard gecodeerde waarde <br> objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*) <br> options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*) <br>-object.objproperty object.objproperty bedrijfsnaam is\\s([^\\s]*) <br> <br> Gebruik een ; char als scheidingsteken om verschillende eigenschappen te extraheren of in te stellen.
 OpeningHours=Openingstijden
 OpeningHoursDesc=Voer hier de reguliere openingstijden van uw bedrijf in.
 ResourceSetup=Configuratie van bronmodule
@@ -2212,6 +2224,7 @@ NoExternalModuleWithUpdate=Geen updates gevonden voor externe modules
 SwaggerDescriptionFile=Swagger API-beschrijvingsbestand (voor gebruik met bijvoorbeeld redoc)
 YouEnableDeprecatedWSAPIsUseRESTAPIsInstead=U hebt de verouderde WS API ingeschakeld. U moet in plaats daarvan REST API gebruiken.
 RandomlySelectedIfSeveral=Willekeurig geselecteerd als er meerdere foto's beschikbaar zijn
+SalesRepresentativeInfo=Voor voorstellen, bestellingen, facturen.
 DatabasePasswordObfuscated=Databasewachtwoord is versleuteld in conf-bestand
 DatabasePasswordNotObfuscated=Databasewachtwoord is NIET versleuteld in conf-bestand
 APIsAreNotEnabled=API-modules zijn niet ingeschakeld
@@ -2277,5 +2290,20 @@ INVOICE_ADD_ZATCA_QR_CODEMore=Sommige Arabische landen hebben deze QR-code nodig
 INVOICE_ADD_SWISS_QR_CODE=Toon de Zwitserse QR-factuurcode op facturen
 UrlSocialNetworksDesc=URL-link van sociaal netwerk. Gebruik {socialid} voor het variabele deel dat de sociale netwerk-ID bevat.
 IfThisCategoryIsChildOfAnother=Als deze categorie een kind is van een andere
-NoName=No name
-CIDLookupURL=The module brings an URL that can be used by an external tool to get the name of a thirdparty or contact from its phone number. URL to use is:
+DarkThemeMode=Donkere themamodus
+AlwaysDisabled=Altijd uitgeschakeld
+AccordingToBrowser=Volgens browser
+AlwaysEnabled=Altijd ingeschakeld
+DoesNotWorkWithAllThemes=Werkt niet met alle thema's
+NoName=Geen naam
+ShowAdvancedOptions= Toon geavanceerde opties
+HideAdvancedoptions= Geavanceerde opties verbergen
+CIDLookupURL=De module brengt een URL die door een externe tool kan worden gebruikt om de naam van een derde partij of contactpersoon van zijn telefoonnummer te krijgen. De te gebruiken URL is:
+OauthNotAvailableForAllAndHadToBeCreatedBefore=OAUTH2-authenticatie is niet voor alle hosts beschikbaar en er moet stroomopwaarts met de OAUTH-module een token met de juiste machtigingen zijn gemaakt
+MAIN_MAIL_SMTPS_OAUTH_SERVICE=OAUTH2-authenticatieservice
+DontForgetCreateTokenOauthMod=Een token met de juiste machtigingen moet stroomopwaarts zijn gemaakt met de OAUTH-module
+MAIN_MAIL_SMTPS_AUTH_TYPE=authenticatie methode:
+UsePassword=Gebruik een wachtwoord
+UseOauth=Gebruik een OAUTH-token
+Images=Afbeeldingen
+MaxNumberOfImagesInGetPost=Maximaal aantal afbeeldingen toegestaan in een HTML-veld ingediend in een formulier
diff --git a/htdocs/langs/pl_PL/admin.lang b/htdocs/langs/pl_PL/admin.lang
index 7312695b60f..df6680f4674 100644
--- a/htdocs/langs/pl_PL/admin.lang
+++ b/htdocs/langs/pl_PL/admin.lang
@@ -477,7 +477,7 @@ InstalledInto=Zainstalowany w katalogu %s
 BarcodeInitForThirdparties=Masowe inicjowanie kodu kreskowego dla kontrahentów
 BarcodeInitForProductsOrServices=Masowe generowanie kodów lub reset kodów kreskowych dla usług i produktów
 CurrentlyNWithoutBarCode=Obecnie masz rekord <strong> %s </strong> na <strong> %s </strong> %s bez kodu kreskowego.
-InitEmptyBarCode=Generuj wartość dla kolejnych %s pustych wpisów
+InitEmptyBarCode=Init value for the %s empty barcodes
 EraseAllCurrentBarCode=Usuń wszystkie aktualne kody kreskowe
 ConfirmEraseAllCurrentBarCode=Jesteś pewien, że chcesz usunąć wszystkie aktualne wartości kodów kreskowych?
 AllBarcodeReset=Wszystkie wartości kodów kreskowych zostały usunięte
@@ -714,6 +714,7 @@ Permission27=Usuń oferty reklam
 Permission28=Eksportuj oferty reklam
 Permission31=Czytaj produkty
 Permission32=Tworzenie / modyfikacja produktów
+Permission33=Read prices products
 Permission34=Usuwanie produktów
 Permission36=Podejrzyj / zarządzaj ukrytymi produktami
 Permission38=Eksport produktów
@@ -739,6 +740,7 @@ Permission79=Tworzenie / modyfikacja subskrypcji
 Permission81=Czytaj zamówienia klientów
 Permission82=Tworzenie / modyfikacja zamówień klientów
 Permission84=Walidacja zamówień klientów
+Permission85=Generate the documents sales orders
 Permission86=Wyślij zamówienia klientów
 Permission87=Zamknij zamówienia klientów
 Permission88=Anuluj zamówienia klientów
@@ -874,6 +876,7 @@ Permission525=Kalkulator kredytowy Dostęp
 Permission527=Kredyty eksportowe
 Permission531=Cztaj usługi
 Permission532=Tworzenie / modyfikacja usług
+Permission533=Read prices services
 Permission534=Usuwanie usług
 Permission536=Zobacz / zarządzaj ukrytymi usługami
 Permission538=Eksport usług
@@ -1235,6 +1238,7 @@ BrowserName=Nazwa przeglądarki
 BrowserOS=Przeglądarka OS
 ListOfSecurityEvents=Lista zdarzeń bezpieczeństwa Dolibarr
 SecurityEventsPurged=Zdarzenia dotyczące bezpieczeństwa oczyszczone
+TrackableSecurityEvents=Trackable security events
 LogEventDesc=Włącz rejestrowanie określonych zdarzeń związanych z bezpieczeństwem. Administratorzy dziennika za pośrednictwem menu <b> %s - %s </b>. Ostrzeżenie, ta funkcja może generować dużą ilość danych w bazie danych.
 AreaForAdminOnly=Parametry mogą być ustawiane tylko przez <b>użytkowników z prawami administratora</b>.
 SystemInfoDesc=System informacji jest różne informacje techniczne można uzyskać w trybie tylko do odczytu i widoczne tylko dla administratorów.
@@ -1977,6 +1981,7 @@ MailToSendSupplierOrder=Zamówienia zakupowe
 MailToSendSupplierInvoice=Faktury dostawcy
 MailToSendContract=Kontrakty
 MailToSendReception=Przyjęcia
+MailToExpenseReport=Raporty kosztów
 MailToThirdparty=Kontrahenci
 MailToMember=Członkowie
 MailToUser=Użytkownicy
@@ -2030,6 +2035,7 @@ MAIN_PDF_MARGIN_RIGHT=Prawy margines w pliku PDF
 MAIN_PDF_MARGIN_TOP=Górny margines w pliku PDF
 MAIN_PDF_MARGIN_BOTTOM=Dolny margines w pliku PDF
 MAIN_DOCUMENTS_LOGO_HEIGHT=Wysokość logo na dokumencie PDF
+DOC_SHOW_FIRST_SALES_REP=Show first sales representative
 MAIN_GENERATE_PROPOSALS_WITH_PICTURE=Add column for picture on proposal lines
 MAIN_DOCUMENTS_WITH_PICTURE_WIDTH=Width of the column if a picture is added on lines
 MAIN_PDF_NO_SENDER_FRAME=Hide borders on sender address frame
@@ -2063,6 +2069,12 @@ EmailCollectors=Email collectors
 EmailCollectorDescription=Dodaj zaplanowane zadanie i stronę konfiguracji, aby regularnie skanować skrzynki e-mail (przy użyciu protokołu IMAP) i zapisywać wiadomości e-mail otrzymane w aplikacji we właściwym miejscu i / lub automatycznie tworzyć niektóre rekordy (np. Potencjalnych klientów).
 NewEmailCollector=Nowy moduł do zbierania wiadomości e-mail
 EMailHost=Host serwera poczty e-mail IMAP
+EMailHostPort=Port of email IMAP server
+loginPassword=Login/Password
+oauthToken=Oauth2 token
+accessType=Acces type
+oauthService=Oauth service
+TokenMustHaveBeenCreated=Module OAuth2 must be enabled and an oauth2 token must have been created with the correct permissions (for example scope "gmail_full" with OAuth for Gmail).
 MailboxSourceDirectory=Katalog źródłowy skrzynki pocztowej
 MailboxTargetDirectory=Katalog docelowy skrzynki pocztowej
 EmailcollectorOperations=Operacje do wykonania przez kolekcjonera
@@ -2106,7 +2118,7 @@ CreateCandidature=Utwórz podanie o pracę
 FormatZip=Paczka Zip
 MainMenuCode=Kod wejścia menu (menu główne)
 ECMAutoTree=Pokaż automatyczne drzewo ECM
-OperationParamDesc=Define the rules to use to extract or set values.<br>Example for operations that need to extract a name from email subject:<br>name=EXTRACT:SUBJECT:Message from company ([^\n]*)<br>Example for operations that create objects:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value including value of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
+OperationParamDesc=Define the rules to use to extract some data or set values to use for operation.<br><br>Example to extract a company name from email subject into a temporary variable:<br>tmp_var=EXTRACT:SUBJECT:Message from company ([^\n]*)<br><br>Examples to set the properties of an object to create:<br>objproperty1=SET:a hard coded value<br>objproperty2=SET:__tmp_var__<br>objproperty3=SETIFEMPTY:a value (value is set only if property is not already defined)<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
 OpeningHours=Godziny otwarcia
 OpeningHoursDesc=Wpisz tutaj regularne godziny otwarcia swojej firmy.
 ResourceSetup=Konfiguracja modułu zasobów
@@ -2212,6 +2224,7 @@ NoExternalModuleWithUpdate=Nie znaleziono aktualizacji dla modułów zewnętrzny
 SwaggerDescriptionFile=Plik opisu Swagger API (na przykład, do użytku z redoc)
 YouEnableDeprecatedWSAPIsUseRESTAPIsInstead=Włączono przestarzały interfejs API WS. Zamiast tego powinieneś użyć REST API.
 RandomlySelectedIfSeveral=Wybierane losowo, jeśli dostępnych jest kilka zdjęć
+SalesRepresentativeInfo=For Proposals, Orders, Invoices.
 DatabasePasswordObfuscated=Hasło do bazy danych jest zaciemnione w pliku konfiguracyjnym
 DatabasePasswordNotObfuscated=Hasło do bazy danych NIE jest zaciemnione w pliku konfiguracyjnym
 APIsAreNotEnabled=Moduły API nie są włączone
@@ -2277,5 +2290,20 @@ INVOICE_ADD_ZATCA_QR_CODEMore=Some Arabic countries need this QR Code on their i
 INVOICE_ADD_SWISS_QR_CODE=Show the swiss QR-Bill code on invoices
 UrlSocialNetworksDesc=Url link of social network. Use {socialid} for the variable part that contains the social network ID.
 IfThisCategoryIsChildOfAnother=If this category is a child of another one
+DarkThemeMode=Dark theme mode
+AlwaysDisabled=Always disabled
+AccordingToBrowser=According to browser
+AlwaysEnabled=Always Enabled
+DoesNotWorkWithAllThemes=Will not work with all themes
 NoName=No name
+ShowAdvancedOptions= Show advanced options
+HideAdvancedoptions= Hide advanced options
 CIDLookupURL=The module brings an URL that can be used by an external tool to get the name of a thirdparty or contact from its phone number. URL to use is:
+OauthNotAvailableForAllAndHadToBeCreatedBefore=OAUTH2 authentication is not available for all hosts, and a token with the right permissions must have been created upstream with the OAUTH module
+MAIN_MAIL_SMTPS_OAUTH_SERVICE=OAUTH2 authentication service
+DontForgetCreateTokenOauthMod=A token with the right permissions must have been created upstream with the OAUTH module
+MAIN_MAIL_SMTPS_AUTH_TYPE=Authentification method
+UsePassword=Use a password
+UseOauth=Use a OAUTH token
+Images=Images
+MaxNumberOfImagesInGetPost=Max number of images allowed in a HTML field submitted in a form
diff --git a/htdocs/langs/pt_BR/admin.lang b/htdocs/langs/pt_BR/admin.lang
index 4cc65fd8514..d2ab3e033a9 100644
--- a/htdocs/langs/pt_BR/admin.lang
+++ b/htdocs/langs/pt_BR/admin.lang
@@ -365,7 +365,6 @@ InstalledInto=Instalado no diretório %s
 BarcodeInitForThirdparties=Inicialização de código de barras em massa para terceiros
 BarcodeInitForProductsOrServices=Inicialização de código de barras em massa ou redefinir de produtos ou serviços
 CurrentlyNWithoutBarCode=Atualmente, você tem <strong>%s</strong> registro(s) no <strong>%s</strong> %s sem um código de barras definido.
-InitEmptyBarCode=Valor Init para o próximo registros vazios
 EraseAllCurrentBarCode=Apague todos os valores de código de barras atuais
 ConfirmEraseAllCurrentBarCode=Você tem certeza que deseja apagar todos os valores atuais do código de barras?
 AllBarcodeReset=Todos os valores de código de barras foram removidas
diff --git a/htdocs/langs/pt_MZ/admin.lang b/htdocs/langs/pt_MZ/admin.lang
index 33c29283299..e805a0c6120 100644
--- a/htdocs/langs/pt_MZ/admin.lang
+++ b/htdocs/langs/pt_MZ/admin.lang
@@ -366,7 +366,6 @@ InstalledInto=Instalado no diretório %s
 BarcodeInitForThirdparties=Inicialização de código de barras em massa para terceiros
 BarcodeInitForProductsOrServices=Inicialização de código de barras em massa ou redefinir de produtos ou serviços
 CurrentlyNWithoutBarCode=Atualmente, você tem <strong>%s</strong> registro(s) no <strong>%s</strong> %s sem um código de barras definido.
-InitEmptyBarCode=Valor Init para o próximo registros vazios
 EraseAllCurrentBarCode=Apague todos os valores de código de barras atuais
 ConfirmEraseAllCurrentBarCode=Você tem certeza que deseja apagar todos os valores atuais do código de barras?
 AllBarcodeReset=Todos os valores de código de barras foram removidas
@@ -1587,7 +1586,6 @@ CreateCandidature=Criar formulário de emprego
 FormatZip=CEP
 MainMenuCode=Código de entrada do menu (mainmenu)
 ECMAutoTree=Mostrar árvore de ECM automática
-OperationParamDesc=Defina as regras a serem usadas para extrair ou definir valores. <br> Exemplo para operações que precisam extrair um nome do assunto do email: <br> name=EXTRACT:SUBJECT:Message from company ([^\n] *) <br> Exemplo para operações que criam objectos: <br> objproperty1 = SET, o valor de conjunto <br> objproperty2 = SET, um valor incluindo valor de __objproperty1__ <br> objproperty3 = SETIFEMPTY: valor utilizado se objproperty3 se não já definido <br> objproperty4 = EXTRACTO: HEADER :X-Myheaderkey:\\s*([^\\s]*) <br> options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*) <br> object.objproperty5=EXTRACT:BODY:O nome da minha empresa é\\s( [^\\s]*) <br> <br> Use um ; char como separador para extrair ou definir várias propriedades.
 OpeningHours=Horário de abertura
 OpeningHoursDesc=Digite aqui os horários de funcionamento da sua empresa.
 ResourceSetup=Configuração do módulo de recursos
diff --git a/htdocs/langs/pt_PT/admin.lang b/htdocs/langs/pt_PT/admin.lang
index 1807349033a..08e26813173 100644
--- a/htdocs/langs/pt_PT/admin.lang
+++ b/htdocs/langs/pt_PT/admin.lang
@@ -477,7 +477,7 @@ InstalledInto=Installed into directory %s
 BarcodeInitForThirdparties=Mass barcode init for third-parties
 BarcodeInitForProductsOrServices=Inicialização ou reposição de códigos de barras em massa para produtos ou serviços
 CurrentlyNWithoutBarCode=Atualmente, você tem o registo <strong>%s</strong> em <strong>%s</strong> %s sem o código de barras definido.
-InitEmptyBarCode=Inicializar o valor para os próximos %s registos vazios
+InitEmptyBarCode=Init value for the %s empty barcodes
 EraseAllCurrentBarCode=Apagar todos os códigos de barras atuais
 ConfirmEraseAllCurrentBarCode=Tem certeza de que deseja apagar todos os códigos de barras atuais?
 AllBarcodeReset=Todos os códigos de barras foram removidos
@@ -714,6 +714,7 @@ Permission27=Eliminar orçamentos
 Permission28=Exportar orçamentos
 Permission31=Consultar produtos
 Permission32=Criar/Modificar produtos
+Permission33=Read prices products
 Permission34=Eliminar produtos
 Permission36=Ver/Gerir produtos ocultos
 Permission38=Exportar produtos
@@ -739,6 +740,7 @@ Permission79=Criar/Modificar subscrições
 Permission81=Consultar encomendas de clientes
 Permission82=Criar/Modificar encomendas de clientes
 Permission84=Confirmar encomendas de clientes
+Permission85=Generate the documents sales orders
 Permission86=Enviar encomendas de clientes
 Permission87=Fechar encomendas de clientes
 Permission88=Cancelar encomendas de clientes
@@ -874,6 +876,7 @@ Permission525=Aceder á calculadora de empréstimos
 Permission527=Exportar empréstimos
 Permission531=Consultar serviços
 Permission532=Criar/modificar serviços
+Permission533=Read prices services
 Permission534=Eliminar serviços
 Permission536=Ver/gerir serviços ocultos
 Permission538=Exportar serviços
@@ -1235,6 +1238,7 @@ BrowserName=Nome do navegador
 BrowserOS=Sistema operativo do navegador
 ListOfSecurityEvents=Listagem de eventos de segurança do Dolibarr
 SecurityEventsPurged=Os eventos de segurança purgados
+TrackableSecurityEvents=Trackable security events
 LogEventDesc=Ative o registro para eventos de segurança específicos. Administradores o log via menu <b> %s - %s </b>. Atenção, este recurso pode gerar uma grande quantidade de dados no banco de dados.
 AreaForAdminOnly=Os parâmetros de configuração só podem ser definidos pelos <b>utilizadores administradores</b>.
 SystemInfoDesc=Esta informação do sistema é uma informação técnica acessível só para leitura dos administradores.
@@ -1977,6 +1981,7 @@ MailToSendSupplierOrder=Ordens de compra
 MailToSendSupplierInvoice=Faturas do fornecedor
 MailToSendContract=Contratos
 MailToSendReception=Receptions
+MailToExpenseReport=Relatórios de despesas
 MailToThirdparty=Terceiros
 MailToMember=Membros
 MailToUser=Utilizadores
@@ -2030,6 +2035,7 @@ MAIN_PDF_MARGIN_RIGHT=Margem direita do PDF
 MAIN_PDF_MARGIN_TOP=Margem superior do PDF
 MAIN_PDF_MARGIN_BOTTOM=Margem inferior do PDF
 MAIN_DOCUMENTS_LOGO_HEIGHT=Height for logo on PDF
+DOC_SHOW_FIRST_SALES_REP=Show first sales representative
 MAIN_GENERATE_PROPOSALS_WITH_PICTURE=Add column for picture on proposal lines
 MAIN_DOCUMENTS_WITH_PICTURE_WIDTH=Width of the column if a picture is added on lines
 MAIN_PDF_NO_SENDER_FRAME=Hide borders on sender address frame
@@ -2063,6 +2069,12 @@ EmailCollectors=Email collectors
 EmailCollectorDescription=Add a scheduled job and a setup page to scan regularly email boxes (using IMAP protocol) and record emails received into your application, at the right place and/or create some records automatically (like leads).
 NewEmailCollector=Novo coletor de email
 EMailHost=Host do servidor IMAP de e-mail
+EMailHostPort=Port of email IMAP server
+loginPassword=Login/Password
+oauthToken=Oauth2 token
+accessType=Acces type
+oauthService=Oauth service
+TokenMustHaveBeenCreated=Module OAuth2 must be enabled and an oauth2 token must have been created with the correct permissions (for example scope "gmail_full" with OAuth for Gmail).
 MailboxSourceDirectory=Diretório de origem da caixa de correio
 MailboxTargetDirectory=Diretório de destino da caixa de correio
 EmailcollectorOperations=Operações para fazer pelo coletor
@@ -2106,7 +2118,7 @@ CreateCandidature=Create job application
 FormatZip=Código postal
 MainMenuCode=Menu entry code (mainmenu)
 ECMAutoTree=Show automatic ECM tree
-OperationParamDesc=Define the rules to use to extract or set values.<br>Example for operations that need to extract a name from email subject:<br>name=EXTRACT:SUBJECT:Message from company ([^\n]*)<br>Example for operations that create objects:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value including value of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
+OperationParamDesc=Define the rules to use to extract some data or set values to use for operation.<br><br>Example to extract a company name from email subject into a temporary variable:<br>tmp_var=EXTRACT:SUBJECT:Message from company ([^\n]*)<br><br>Examples to set the properties of an object to create:<br>objproperty1=SET:a hard coded value<br>objproperty2=SET:__tmp_var__<br>objproperty3=SETIFEMPTY:a value (value is set only if property is not already defined)<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
 OpeningHours=Opening hours
 OpeningHoursDesc=Enter here the regular opening hours of your company.
 ResourceSetup=Configuration of Resource module
@@ -2212,6 +2224,7 @@ NoExternalModuleWithUpdate=No updates found for external modules
 SwaggerDescriptionFile=Swagger API description file (for use with redoc for example)
 YouEnableDeprecatedWSAPIsUseRESTAPIsInstead=You enabled deprecated WS API. You should use REST API instead.
 RandomlySelectedIfSeveral=Randomly selected if several pictures are available
+SalesRepresentativeInfo=For Proposals, Orders, Invoices.
 DatabasePasswordObfuscated=Database password is obfuscated in conf file
 DatabasePasswordNotObfuscated=Database password is NOT obfuscated in conf file
 APIsAreNotEnabled=APIs modules are not enabled
@@ -2277,5 +2290,20 @@ INVOICE_ADD_ZATCA_QR_CODEMore=Some Arabic countries need this QR Code on their i
 INVOICE_ADD_SWISS_QR_CODE=Show the swiss QR-Bill code on invoices
 UrlSocialNetworksDesc=Url link of social network. Use {socialid} for the variable part that contains the social network ID.
 IfThisCategoryIsChildOfAnother=If this category is a child of another one
+DarkThemeMode=Dark theme mode
+AlwaysDisabled=Always disabled
+AccordingToBrowser=According to browser
+AlwaysEnabled=Always Enabled
+DoesNotWorkWithAllThemes=Will not work with all themes
 NoName=No name
+ShowAdvancedOptions= Show advanced options
+HideAdvancedoptions= Hide advanced options
 CIDLookupURL=The module brings an URL that can be used by an external tool to get the name of a thirdparty or contact from its phone number. URL to use is:
+OauthNotAvailableForAllAndHadToBeCreatedBefore=OAUTH2 authentication is not available for all hosts, and a token with the right permissions must have been created upstream with the OAUTH module
+MAIN_MAIL_SMTPS_OAUTH_SERVICE=OAUTH2 authentication service
+DontForgetCreateTokenOauthMod=A token with the right permissions must have been created upstream with the OAUTH module
+MAIN_MAIL_SMTPS_AUTH_TYPE=Authentification method
+UsePassword=Use a password
+UseOauth=Use a OAUTH token
+Images=Images
+MaxNumberOfImagesInGetPost=Max number of images allowed in a HTML field submitted in a form
diff --git a/htdocs/langs/ro_RO/accountancy.lang b/htdocs/langs/ro_RO/accountancy.lang
index 7a5e759cef6..0b1725efbb8 100644
--- a/htdocs/langs/ro_RO/accountancy.lang
+++ b/htdocs/langs/ro_RO/accountancy.lang
@@ -48,8 +48,9 @@ CountriesNotInEEC=Țări care nu se află în CEE
 CountriesInEECExceptMe=Țările din CEE, cu excepția celor din %s
 CountriesExceptMe=Toate țările, cu excepția %s
 AccountantFiles=Export documente sursă
-ExportAccountingSourceDocHelp=Cu acest instrument, poți exporta evenimentele sursă (listă în CSV și PDF) care sunt utilizate pentru a genera operaţiunile de contabilitate.
+ExportAccountingSourceDocHelp=Cu acest instrument, poți căuta și exporta evenimentele sursă care sunt utilizate pentru generare tranzacții contabilitate.<br> Fișierul ZIP exportat va conține listele de articole solicitate în CSV, precum și fișierele atașate acestora în formatul lor original (PDF, ODT, DOCX...).
 ExportAccountingSourceDocHelp2=Pentru export jurnale, foloseşte meniul %s - %s.
+ExportAccountingProjectHelp=Specifică un proiect dacă ai nevoie de un raport contabil numai pentru un anumit proiect. Rapoartele de cheltuieli și plățile împrumuturilor nu sunt incluse în rapoartele de proiect.
 VueByAccountAccounting=Vizualizare după contul contabil
 VueBySubAccountAccounting=Vizualizați după subcont contabil
 
@@ -183,6 +184,8 @@ ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT=Cont contabil pentru a înregistra abona
 
 ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT= Cont contabil implicit pentru înregistra depunerilor clientului
 UseAuxiliaryAccountOnCustomerDeposit=Stochează contul de client ca și cont contabil individual în registrul subsidiar pentru liniile de avans (dacă este dezactivat, contul individual pentru liniile de avans va rămâne gol)
+ACCOUNTING_ACCOUNT_SUPPLIER_DEPOSIT=Cont contabil implicit pentru a înregistra depozitul furnizorului
+UseAuxiliaryAccountOnSupplierDeposit=Stocare cont furnizor ca și cont individual în registrul subsidiar pentru liniile de avans (dacă este dezactivat, contul individual pentru liniile de avans va rămâne gol) 
 
 ACCOUNTING_PRODUCT_BUY_ACCOUNT=Contul contabil implicit pentru produsele cumpărate (se foloseşte dacă nu este definit în fișa de produs)
 ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT= Contul contabil implicit pentru produsele cumpărate din CEE (utilizat dacă nu este definit în fișa de produs)
@@ -332,7 +335,7 @@ ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS=Dezactivați legarea și transferul
 
 ## Export
 NotifiedExportDate=Marcare linii exportate ca Exportate <span class="warning">(pentru a modifica o linie, va trebui să ștergi întreaga tranzacție și să o retransferi în contabilitate)</span>
-NotifiedValidationDate=Validare şi blocare înregistrări exportate <span class="warning">(același efect ca și caracteristica "Închidere", modificarea și ștergerea liniilor NU  vor MAI fi posibile)</span>
+NotifiedValidationDate=Validare și blocare intrări exportate <span class="warning">(același efect ca și caracteristica "%s", modificarea și ștergerea liniilor NU vor mai fi posibile)</span>
 DateValidationAndLock=Dată de validare şi blocare
 ConfirmExportFile=Confirmare generare fișier de export contabil?
 ExportDraftJournal=Export jurnal schiţă
diff --git a/htdocs/langs/ro_RO/admin.lang b/htdocs/langs/ro_RO/admin.lang
index fb3635f8cdb..960c08741dc 100644
--- a/htdocs/langs/ro_RO/admin.lang
+++ b/htdocs/langs/ro_RO/admin.lang
@@ -477,7 +477,7 @@ InstalledInto=Instalat în director %s
 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=Valoare de inițializare pentru următoarele %s înregistrări goale
+InitEmptyBarCode=Valoarea inițială pentru codurile de bare %s goale
 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
@@ -714,6 +714,7 @@ Permission27=Ştergere oferte comerciale
 Permission28=Export oferte comerciale
 Permission31=Citeşte produse/servicii
 Permission32=Creare/modificare produse/servicii
+Permission33=Citește prețuri produse
 Permission34=Ştergere produse/servicii
 Permission36=Vizualizare/administrare de produse/servicii ascunse
 Permission38=Export de produse/servicii
@@ -739,6 +740,7 @@ Permission79=Creare/modificare abonamente
 Permission81=Citeşte comenzile de vânzare
 Permission82=Creare/modificare comenzi de vânzare
 Permission84=Validare comenzi de vânzare
+Permission85=Generare documente comenzi de vânzare
 Permission86=Trimitere comenzi de vânzare
 Permission87=Închidere comenzi de vânzare
 Permission88=Anulare comenzi de vânzare
@@ -874,6 +876,7 @@ Permission525=Accesare calculator de credite
 Permission527=Export credite împrumuturi
 Permission531=Citeşte servicii
 Permission532=Creare/modificare servicii
+Permission533=Citește prețuri servicii
 Permission534=Şterge servicii
 Permission536=Vede/administrează serviciile ascunse
 Permission538=Export servicii
@@ -1235,6 +1238,7 @@ BrowserName=Nume browser
 BrowserOS=Browser OS
 ListOfSecurityEvents=Listă evenimente de securitate a sistemului
 SecurityEventsPurged=Evenimentele de securitate au fost şterse
+TrackableSecurityEvents=Evenimente de securitate urmăribile
 LogEventDesc=Activați autentificarea pentru anumite evenimente de securitate. Administratorii se autentifica prin meniul <b>%s - %s</b>. Atenție, această caracteristică poate genera o cantitate mare de date în baza de date.
 AreaForAdminOnly=Parametrii de configurare pot fi setați numai de <b>utilizatorii administratori</b>.
 SystemInfoDesc=Informațiile de sistem sunt informații tehnice diverse pe care le poţi accesa numai în modul citire, fiind vizibile numai pentru administratori.
@@ -1977,6 +1981,7 @@ MailToSendSupplierOrder=Comenzi de achiziție
 MailToSendSupplierInvoice=Facturi furnizori
 MailToSendContract=Contracte
 MailToSendReception=Recepţii
+MailToExpenseReport=Rapoarte de cheltuieli
 MailToThirdparty=Terţi
 MailToMember=Membri
 MailToUser=Utilizatori
@@ -2030,6 +2035,7 @@ 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ă
 MAIN_DOCUMENTS_WITH_PICTURE_WIDTH=Lăţimea coloanei dacă o poză este adăugată pe linie
 MAIN_PDF_NO_SENDER_FRAME=Ascunde marginile chenarului de adresă expeditor/furnizor
@@ -2063,6 +2069,12 @@ 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 
+EMailHostPort=Port email server IMAP
+loginPassword=Login/Parolă
+oauthToken=Token Oauth2
+accessType=Tip acces
+oauthService=Serviciu Oauth
+TokenMustHaveBeenCreated=Modulul OAuth2 trebuie să fie activat și un token oauth2 trebuie să fi fost creat cu permisiunile corecte (de exemplu, domeniul "gmail_full" cu OAuth pentru Gmail).
 MailboxSourceDirectory=Directorul sursă al cutiei poștale
 MailboxTargetDirectory=Directorul ţintă al cutiei poștale 
 EmailcollectorOperations=Operațiuni de făcut de către colector
@@ -2106,7 +2118,7 @@ CreateCandidature=Creare aplicare la job
 FormatZip=Zip
 MainMenuCode=Codul de intrare a meniului (meniu principal)
 ECMAutoTree=Afișați arborele ECM automat
-OperationParamDesc=Definire reguli de utilizat pentru a extrage sau a seta valori.<br> Exemplu pentru operațiunile care trebuie să extragă un nume subiectul email-ului: <br>name=EXTRACT:SUBJECT:Message from company ([^\n]*)<br>Exemplu pentru operațiuni de creare obiecte:<br>objproperty1=SET:valoarea de setat<br>objproperty2=SET:o valoare care include valoarea __objproperty1__<br>objproperty3=SETIFEMPTY:valoare utilizată dacă objproperty3 nu este deja definit<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Foloseşte ; ca separator pentru a extrage sau a seta mai multe proprietăți.
+OperationParamDesc=Definește regulile de utilizat pentru a extrage unele date sau setare valori de utilizat pentru operare.<br><br> Exemplu pentru a extrage un nume de companie din subiectul e-mailului î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 codificată<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>Folosește caracterul  ; ca separator pentru a extrage sau a seta mai multe proprietăți.
 OpeningHours=Program de lucru
 OpeningHoursDesc=Introduceți aici programul de lucru normal ale companiei dvs.
 ResourceSetup=Configurarea modulului Resurse 
@@ -2212,6 +2224,7 @@ NoExternalModuleWithUpdate=Nu au fost găsite actualizări pentru modulele exter
 SwaggerDescriptionFile=Fişier descriptor Swagger API (pentru utilizare redoc de exemplu)
 YouEnableDeprecatedWSAPIsUseRESTAPIsInstead=Ai activat WS API care este învechit. Ar trebui să foloseşti REST API. 
 RandomlySelectedIfSeveral=Selectat aleatoriu dacă sunt disponibile mai multe imagini
+SalesRepresentativeInfo=Pentru Oferte, Comenzi, Facturi.
 DatabasePasswordObfuscated=Parola bazei de date este eclipsată în fişierul conf
 DatabasePasswordNotObfuscated=Parola bazei de date NU este eclipsată în fişierul conf
 APIsAreNotEnabled=Modulele API nu sunt activate
@@ -2277,5 +2290,20 @@ INVOICE_ADD_ZATCA_QR_CODEMore=Unele țări arabe au nevoie de acest cod QR pe 
 INVOICE_ADD_SWISS_QR_CODE=Afișare cod QR-Bill swiss pe facturi
 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ă 
+AlwaysDisabled=Întotdeauna dezactivat
+AccordingToBrowser=Conform browser-ului
+AlwaysEnabled=Întotdeauna activat
+DoesNotWorkWithAllThemes=Nu va funcționa cu toate temele
 NoName=Niciun nume
+ShowAdvancedOptions= Afișare opțiuni avansate
+HideAdvancedoptions= Ascundere opțiuni avansate
 CIDLookupURL=Modulul aduce o adresă URL care poate fi utilizată de un instrument extern pentru a obține numele unui terț sau contact din numărul său de telefon. Adresa URL de utilizat este:
+OauthNotAvailableForAllAndHadToBeCreatedBefore=Autentificarea OAUTH2 nu este disponibilă pentru toate host-urile, iar un token cu permisiunile potrivite trebuie să fi fost creat înainte cu modulul OAUTH 
+MAIN_MAIL_SMTPS_OAUTH_SERVICE=Serviciu de autentificare OAUTH2
+DontForgetCreateTokenOauthMod=Un token cu permisiunile potrivite trebuie să fi fost creat înainte cu modulul OAUTH
+MAIN_MAIL_SMTPS_AUTH_TYPE=Metodă de autentificare
+UsePassword=Folosește o parolă
+UseOauth=Folosește un token OAUTH
+Images=Imagini
+MaxNumberOfImagesInGetPost=Numărul maxim de imagini permis într-un câmp HTML trimis într-un formular
diff --git a/htdocs/langs/ro_RO/agenda.lang b/htdocs/langs/ro_RO/agenda.lang
index 8035ed6e5e8..1c8a6fd6bf8 100644
--- a/htdocs/langs/ro_RO/agenda.lang
+++ b/htdocs/langs/ro_RO/agenda.lang
@@ -57,6 +57,7 @@ MemberValidatedInDolibarr=Membrul %s a fost validat
 MemberModifiedInDolibarr=Membrul %s a fost modificat
 MemberResiliatedInDolibarr=Membrul %s a fost reziliat
 MemberDeletedInDolibarr=Membrul %s a fost şters
+MemberExcludedInDolibarr=Membrul %s a fost exclus
 MemberSubscriptionAddedInDolibarr=Cotizaţia %s pentru membrul %s a fost adăugată
 MemberSubscriptionModifiedInDolibarr=Cotizaţia %s pentru membrul %s a fost modificată
 MemberSubscriptionDeletedInDolibarr=Cotizaţia %s pentru membrul %s a fost ştearsă
@@ -159,6 +160,7 @@ DateActionBegin=Dată începere eveniment
 ConfirmCloneEvent=Sigur doriți să clonați evenimentul <b>%s</b>?
 RepeatEvent=Repeta eveniment
 OnceOnly=Doar o dată
+EveryDay=În fiecare zi
 EveryWeek=Fiecare săptămână
 EveryMonth=Fiecare lună
 DayOfMonth=Zi a lunii
@@ -174,3 +176,4 @@ AddReminder=Creați o notificare automată de reminder pentru acest eveniment
 ErrorReminderActionCommCreation=Eroare la crearea notificării de reminder pentru acest eveniment
 BrowserPush=Notificări popup browser
 ActiveByDefault=Activat implicit
+Until=până
diff --git a/htdocs/langs/ro_RO/banks.lang b/htdocs/langs/ro_RO/banks.lang
index b05f3ee77e1..19400a27dd4 100644
--- a/htdocs/langs/ro_RO/banks.lang
+++ b/htdocs/langs/ro_RO/banks.lang
@@ -185,3 +185,4 @@ AlreadyOneBankAccount=Este deja definit un cont bancar
 SEPAXMLPlacePaymentTypeInformationInCreditTransfertransactionInformation=Transfer SEPA: 'Tip de plată' la nivelul 'Transfer de credit'.
 SEPAXMLPlacePaymentTypeInformationInCreditTransfertransactionInformationHelp=Când se generează un fișier XML SEPA pentru transferuri de credit, secțiunea "PaymentTypeInformation" poate fi acum plasată în secțiunea "CreditTransferTransactionInformation" (în loc de secțiunea "Plată"). Vă recomandăm insistent să păstrați această casetă nebifată pentru a plasa PaymentTypeInformation la nivel de plată, deoarece toate băncile nu o vor accepta neapărat la nivel de CreditTransferTransactionInformation. Contactați banca înainte de a plasa PaymentTypeInformation la nivel CreditTransferTransactionInformation.
 ToCreateRelatedRecordIntoBank=De creat înregistrarea bancară aferentă care lipseşte
+BanklineExtraFields=Extracâmpuri linie bancară
diff --git a/htdocs/langs/ro_RO/bills.lang b/htdocs/langs/ro_RO/bills.lang
index 31dbf98ef1a..2ac2c5ccf40 100644
--- a/htdocs/langs/ro_RO/bills.lang
+++ b/htdocs/langs/ro_RO/bills.lang
@@ -446,6 +446,7 @@ ErrorPaymentConditionsNotEligibleToDepositCreation=Condițiile de plată alese n
 PaymentTypeVIR=Transfer bancar
 PaymentTypeShortVIR=Transfer bancar
 PaymentTypePRE=Ordin de plată prin direct debit
+PaymentTypePREdetails=(în cont *-%s)
 PaymentTypeShortPRE=Ordin de plată de debit
 PaymentTypeLIQ=Numerar
 PaymentTypeShortLIQ=Numerar
diff --git a/htdocs/langs/ru_RU/admin.lang b/htdocs/langs/ru_RU/admin.lang
index 533d045dc64..5b007b8e214 100644
--- a/htdocs/langs/ru_RU/admin.lang
+++ b/htdocs/langs/ru_RU/admin.lang
@@ -477,7 +477,7 @@ InstalledInto=Установлен в каталог %s
 BarcodeInitForThirdparties=Массовая инициализация штрих-кода для контрагентов
 BarcodeInitForProductsOrServices=Массовое создание или удаление штрих-кода для Товаров или Услуг
 CurrentlyNWithoutBarCode=В настоящее время у вас есть <strong>%s</strong> запись на <strong>%s</strong> %s без определенного штрих-кода.
-InitEmptyBarCode=Начальное значения для следующих %s пустых записей
+InitEmptyBarCode=Init value for the %s empty barcodes
 EraseAllCurrentBarCode=Стереть все текущие значения штрих-кодов
 ConfirmEraseAllCurrentBarCode=Вы действительно хотите удалить все текущие значения штрих-кода?
 AllBarcodeReset=Все значения штрих-кодов были удалены
@@ -714,6 +714,7 @@ Permission27=Удалить коммерческих предложений
 Permission28=Экспорт коммерческих предложений
 Permission31=Просмотр продуктов/услуг
 Permission32=Создание/изменение продуктов/услуг
+Permission33=Read prices products
 Permission34=Удаленные продукты/услуги
 Permission36=Просмотр/управление скрытыми продуктами/услугами
 Permission38=Экспорт продуктов
@@ -739,6 +740,7 @@ Permission79=Создать/изменить подписки
 Permission81=Читать заказы клиентов
 Permission82=Создать/изменить заказы клиентов
 Permission84=Проверка заказов клиентов
+Permission85=Generate the documents sales orders
 Permission86=Отправка заказов клиентов
 Permission87=Закрытые заказы клиентов
 Permission88=Отмена заказов клиентов
@@ -874,6 +876,7 @@ Permission525=Доступ к калькулятору займа
 Permission527=Экспорт займов
 Permission531=Читать услуги
 Permission532=Создать/изменить услуги
+Permission533=Read prices services
 Permission534=Удаление услуг
 Permission536=Смотреть/Управлять скрытыми услугами
 Permission538=Экспорт услуг
@@ -1235,6 +1238,7 @@ BrowserName=Имя браузера
 BrowserOS=Операционная система браузера
 ListOfSecurityEvents=Список событий безопасности Dolibarr
 SecurityEventsPurged=События безопасности удалены
+TrackableSecurityEvents=Trackable security events
 LogEventDesc=Включите ведение журнала для определенных событий безопасности. Администраторы журнала через меню <b>%s - %s</b>. Предупреждение, эта функция может генерировать большой объем данных в базе данных.
 AreaForAdminOnly=Параметры настройки могут быть установлены только <b>пользователем администратора</b>.
 SystemInfoDesc=Система информации разного техническую информацию Вы получите в режиме только для чтения и видимые только для администраторов.
@@ -1977,6 +1981,7 @@ MailToSendSupplierOrder=Заказы
 MailToSendSupplierInvoice=Счета-фактуры поставщика
 MailToSendContract=Договоры
 MailToSendReception=Приемы
+MailToExpenseReport=Отчёты о затратах
 MailToThirdparty=Контрагенты
 MailToMember=Участники
 MailToUser=Пользователи
@@ -2030,6 +2035,7 @@ MAIN_PDF_MARGIN_RIGHT=Правый отступ PDF
 MAIN_PDF_MARGIN_TOP=Верхний отступ PDF
 MAIN_PDF_MARGIN_BOTTOM=Нижний отступ PDF
 MAIN_DOCUMENTS_LOGO_HEIGHT=Высота для логотипа в PDF
+DOC_SHOW_FIRST_SALES_REP=Show first sales representative
 MAIN_GENERATE_PROPOSALS_WITH_PICTURE=Добавить изображение в строку предложения
 MAIN_DOCUMENTS_WITH_PICTURE_WIDTH=Ширина столбца, если рисунок добавляется по линиям
 MAIN_PDF_NO_SENDER_FRAME=Скрыть границы в рамке адреса отправителя
@@ -2063,6 +2069,12 @@ EmailCollectors=Email collectors
 EmailCollectorDescription=Добавьте запланированное задание и страницу настройки, чтобы регулярно сканировать ящики электронной почты (с использованием протокола IMAP) и записывать электронные письма, полученные в ваше приложение, в нужное место и/или создавать некоторые записи автоматически (например, лидов).
 NewEmailCollector=Новый сборщик электронной почты
 EMailHost=Хост почтового сервера IMAP
+EMailHostPort=Port of email IMAP server
+loginPassword=Login/Password
+oauthToken=Oauth2 token
+accessType=Acces type
+oauthService=Oauth service
+TokenMustHaveBeenCreated=Module OAuth2 must be enabled and an oauth2 token must have been created with the correct permissions (for example scope "gmail_full" with OAuth for Gmail).
 MailboxSourceDirectory=Исходный каталог почтового ящика
 MailboxTargetDirectory=Целевой каталог почтового ящика
 EmailcollectorOperations=Операции, выполняемые сборщиком
@@ -2106,7 +2118,7 @@ CreateCandidature=Создать заявление о приеме на раб
 FormatZip=Индекс
 MainMenuCode=Код входа в меню (главное меню)
 ECMAutoTree=Показать автоматическое дерево ECM
-OperationParamDesc=Define the rules to use to extract or set values.<br>Example for operations that need to extract a name from email subject:<br>name=EXTRACT:SUBJECT:Message from company ([^\n]*)<br>Example for operations that create objects:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value including value of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
+OperationParamDesc=Define the rules to use to extract some data or set values to use for operation.<br><br>Example to extract a company name from email subject into a temporary variable:<br>tmp_var=EXTRACT:SUBJECT:Message from company ([^\n]*)<br><br>Examples to set the properties of an object to create:<br>objproperty1=SET:a hard coded value<br>objproperty2=SET:__tmp_var__<br>objproperty3=SETIFEMPTY:a value (value is set only if property is not already defined)<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
 OpeningHours=Часы работы
 OpeningHoursDesc=Введите здесь обычные часы работы вашей компании.
 ResourceSetup=Конфигурация  модуля Ресурсов
@@ -2212,6 +2224,7 @@ NoExternalModuleWithUpdate=Обновлений для внешних модул
 SwaggerDescriptionFile=Файл описания Swagger API (например, для использования с redoc)
 YouEnableDeprecatedWSAPIsUseRESTAPIsInstead=Вы включили устаревший WS API. Вместо этого вам следует использовать REST API.
 RandomlySelectedIfSeveral=Выбирается случайным образом, если доступно несколько изображений
+SalesRepresentativeInfo=For Proposals, Orders, Invoices.
 DatabasePasswordObfuscated=Пароль базы данных зашифрован в файле conf
 DatabasePasswordNotObfuscated=Пароль базы данных НЕ запутывается в файле conf
 APIsAreNotEnabled=Модули API не включены
@@ -2277,5 +2290,20 @@ INVOICE_ADD_ZATCA_QR_CODEMore=Some Arabic countries need this QR Code on their i
 INVOICE_ADD_SWISS_QR_CODE=Show the swiss QR-Bill code on invoices
 UrlSocialNetworksDesc=Url link of social network. Use {socialid} for the variable part that contains the social network ID.
 IfThisCategoryIsChildOfAnother=If this category is a child of another one
+DarkThemeMode=Dark theme mode
+AlwaysDisabled=Always disabled
+AccordingToBrowser=According to browser
+AlwaysEnabled=Always Enabled
+DoesNotWorkWithAllThemes=Will not work with all themes
 NoName=No name
+ShowAdvancedOptions= Show advanced options
+HideAdvancedoptions= Hide advanced options
 CIDLookupURL=The module brings an URL that can be used by an external tool to get the name of a thirdparty or contact from its phone number. URL to use is:
+OauthNotAvailableForAllAndHadToBeCreatedBefore=OAUTH2 authentication is not available for all hosts, and a token with the right permissions must have been created upstream with the OAUTH module
+MAIN_MAIL_SMTPS_OAUTH_SERVICE=OAUTH2 authentication service
+DontForgetCreateTokenOauthMod=A token with the right permissions must have been created upstream with the OAUTH module
+MAIN_MAIL_SMTPS_AUTH_TYPE=Authentification method
+UsePassword=Use a password
+UseOauth=Use a OAUTH token
+Images=Images
+MaxNumberOfImagesInGetPost=Max number of images allowed in a HTML field submitted in a form
diff --git a/htdocs/langs/sk_SK/admin.lang b/htdocs/langs/sk_SK/admin.lang
index 590cdac0b6a..d1dd653d380 100644
--- a/htdocs/langs/sk_SK/admin.lang
+++ b/htdocs/langs/sk_SK/admin.lang
@@ -477,7 +477,7 @@ InstalledInto=Installed into directory %s
 BarcodeInitForThirdparties=Mass barcode init for third-parties
 BarcodeInitForProductsOrServices=Masové načítanie čiarových kódov alebo reset pre produkty alebo služby
 CurrentlyNWithoutBarCode=Currently, you have <strong>%s</strong> record on <strong>%s</strong> %s without barcode defined.
-InitEmptyBarCode=Načítať hodnotu pre %s prázdne hodnoty
+InitEmptyBarCode=Init value for the %s empty barcodes
 EraseAllCurrentBarCode=Zmazať aktuálne hodnoty čiarových kódov
 ConfirmEraseAllCurrentBarCode=Are you sure you want to erase all current barcode values?
 AllBarcodeReset=Hodnoty čiarových kódov boli zmazané
@@ -714,6 +714,7 @@ Permission27=Odstránenie obchodných návrhov
 Permission28=Export obchodných návrhov
 Permission31=Prečítajte si produkty
 Permission32=Vytvoriť / upraviť produktov
+Permission33=Read prices products
 Permission34=Odstrániť produkty
 Permission36=Pozri / správa skryté produkty
 Permission38=Export produktov
@@ -739,6 +740,7 @@ Permission79=Vytvoriť / upraviť predplatné
 Permission81=Prečítajte objednávky odberateľov
 Permission82=Vytvoriť / upraviť zákazníci objednávky
 Permission84=Potvrdenie objednávky odberateľov
+Permission85=Generate the documents sales orders
 Permission86=Poslať objednávky odberateľov
 Permission87=Zavrieť zákazníkov objednávky
 Permission88=Storno objednávky odberateľov
@@ -874,6 +876,7 @@ Permission525=Pôžičková kalkulačka
 Permission527=Exportovať pôžičku
 Permission531=Prečítajte služby
 Permission532=Vytvoriť / upraviť služby
+Permission533=Read prices services
 Permission534=Odstrániť služby
 Permission536=Pozri / správa skryté služby
 Permission538=Export služieb
@@ -1235,6 +1238,7 @@ BrowserName=Meno prehliadača
 BrowserOS=OS prehliadača
 ListOfSecurityEvents=Zoznam Dolibarr udalostí zabezpečenia
 SecurityEventsPurged=Bezpečnostnej akcie očistil
+TrackableSecurityEvents=Trackable security events
 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=Systémové informácie je rôzne technické informácie získate v režime iba pre čítanie a viditeľné len pre správcov.
@@ -1977,6 +1981,7 @@ MailToSendSupplierOrder=Purchase orders
 MailToSendSupplierInvoice=Vendor invoices
 MailToSendContract=Zmluvy
 MailToSendReception=Receptions
+MailToExpenseReport=Expense reports
 MailToThirdparty=Tretie strany
 MailToMember=Členovia
 MailToUser=Užívatelia
@@ -2030,6 +2035,7 @@ MAIN_PDF_MARGIN_RIGHT=Right margin on PDF
 MAIN_PDF_MARGIN_TOP=Top margin on PDF
 MAIN_PDF_MARGIN_BOTTOM=Bottom margin on PDF
 MAIN_DOCUMENTS_LOGO_HEIGHT=Height for logo on PDF
+DOC_SHOW_FIRST_SALES_REP=Show first sales representative
 MAIN_GENERATE_PROPOSALS_WITH_PICTURE=Add column for picture on proposal lines
 MAIN_DOCUMENTS_WITH_PICTURE_WIDTH=Width of the column if a picture is added on lines
 MAIN_PDF_NO_SENDER_FRAME=Hide borders on sender address frame
@@ -2063,6 +2069,12 @@ EmailCollectors=Email collectors
 EmailCollectorDescription=Add a scheduled job and a setup page to scan regularly email boxes (using IMAP protocol) and record emails received into your application, at the right place and/or create some records automatically (like leads).
 NewEmailCollector=New Email Collector
 EMailHost=Host of email IMAP server
+EMailHostPort=Port of email IMAP server
+loginPassword=Login/Password
+oauthToken=Oauth2 token
+accessType=Acces type
+oauthService=Oauth service
+TokenMustHaveBeenCreated=Module OAuth2 must be enabled and an oauth2 token must have been created with the correct permissions (for example scope "gmail_full" with OAuth for Gmail).
 MailboxSourceDirectory=Mailbox source directory
 MailboxTargetDirectory=Mailbox target directory
 EmailcollectorOperations=Operations to do by collector
@@ -2106,7 +2118,7 @@ CreateCandidature=Create job application
 FormatZip=Zips
 MainMenuCode=Menu entry code (mainmenu)
 ECMAutoTree=Show automatic ECM tree
-OperationParamDesc=Define the rules to use to extract or set values.<br>Example for operations that need to extract a name from email subject:<br>name=EXTRACT:SUBJECT:Message from company ([^\n]*)<br>Example for operations that create objects:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value including value of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
+OperationParamDesc=Define the rules to use to extract some data or set values to use for operation.<br><br>Example to extract a company name from email subject into a temporary variable:<br>tmp_var=EXTRACT:SUBJECT:Message from company ([^\n]*)<br><br>Examples to set the properties of an object to create:<br>objproperty1=SET:a hard coded value<br>objproperty2=SET:__tmp_var__<br>objproperty3=SETIFEMPTY:a value (value is set only if property is not already defined)<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
 OpeningHours=Opening hours
 OpeningHoursDesc=Enter here the regular opening hours of your company.
 ResourceSetup=Configuration of Resource module
@@ -2212,6 +2224,7 @@ NoExternalModuleWithUpdate=No updates found for external modules
 SwaggerDescriptionFile=Swagger API description file (for use with redoc for example)
 YouEnableDeprecatedWSAPIsUseRESTAPIsInstead=You enabled deprecated WS API. You should use REST API instead.
 RandomlySelectedIfSeveral=Randomly selected if several pictures are available
+SalesRepresentativeInfo=For Proposals, Orders, Invoices.
 DatabasePasswordObfuscated=Database password is obfuscated in conf file
 DatabasePasswordNotObfuscated=Database password is NOT obfuscated in conf file
 APIsAreNotEnabled=APIs modules are not enabled
@@ -2277,5 +2290,20 @@ INVOICE_ADD_ZATCA_QR_CODEMore=Some Arabic countries need this QR Code on their i
 INVOICE_ADD_SWISS_QR_CODE=Show the swiss QR-Bill code on invoices
 UrlSocialNetworksDesc=Url link of social network. Use {socialid} for the variable part that contains the social network ID.
 IfThisCategoryIsChildOfAnother=If this category is a child of another one
+DarkThemeMode=Dark theme mode
+AlwaysDisabled=Always disabled
+AccordingToBrowser=According to browser
+AlwaysEnabled=Always Enabled
+DoesNotWorkWithAllThemes=Will not work with all themes
 NoName=No name
+ShowAdvancedOptions= Show advanced options
+HideAdvancedoptions= Hide advanced options
 CIDLookupURL=The module brings an URL that can be used by an external tool to get the name of a thirdparty or contact from its phone number. URL to use is:
+OauthNotAvailableForAllAndHadToBeCreatedBefore=OAUTH2 authentication is not available for all hosts, and a token with the right permissions must have been created upstream with the OAUTH module
+MAIN_MAIL_SMTPS_OAUTH_SERVICE=OAUTH2 authentication service
+DontForgetCreateTokenOauthMod=A token with the right permissions must have been created upstream with the OAUTH module
+MAIN_MAIL_SMTPS_AUTH_TYPE=Authentification method
+UsePassword=Use a password
+UseOauth=Use a OAUTH token
+Images=Images
+MaxNumberOfImagesInGetPost=Max number of images allowed in a HTML field submitted in a form
diff --git a/htdocs/langs/sl_SI/admin.lang b/htdocs/langs/sl_SI/admin.lang
index f49590810fa..8712f5b9641 100644
--- a/htdocs/langs/sl_SI/admin.lang
+++ b/htdocs/langs/sl_SI/admin.lang
@@ -477,7 +477,7 @@ InstalledInto=Installed into directory %s
 BarcodeInitForThirdparties=Mass barcode init for third-parties
 BarcodeInitForProductsOrServices=Vzpostavitev ali resetiranje masovne črtne kode za proizvode in storitve
 CurrentlyNWithoutBarCode=Currently, you have <strong>%s</strong> record on <strong>%s</strong> %s without barcode defined.
-InitEmptyBarCode=Začetna vrednost za naslednjih %s praznih zapisov
+InitEmptyBarCode=Init value for the %s empty barcodes
 EraseAllCurrentBarCode=Zbrišite vse trenutne vrednosti črtnih kod
 ConfirmEraseAllCurrentBarCode=Are you sure you want to erase all current barcode values?
 AllBarcodeReset=Vse vrednosti črtnih kod so bile odstranjene
@@ -714,6 +714,7 @@ Permission27=Brisanje komercialnih ponudb
 Permission28=Izvoz komercialnih ponudb
 Permission31=Branje proizvodov
 Permission32=Kreiranje/spreminjanje proizvodov
+Permission33=Read prices products
 Permission34=Brisanje proizvodov
 Permission36=Pregled/upravljanje skritih proizvodov
 Permission38=Izvoz proizvodov
@@ -739,6 +740,7 @@ Permission79=Kreiranje/spreminjanje naročnin
 Permission81=Branje naročil kupcev
 Permission82=Kreiranje/spreminjanje naročil kupcev
 Permission84=Potrjevanje naročil kupcev
+Permission85=Generate the documents sales orders
 Permission86=Pošiljanje naročil kupcev
 Permission87=Zapiranje naročil kupcev
 Permission88=Preklic naročil kupcev
@@ -874,6 +876,7 @@ Permission525=Dostop do kalkulatorja posojil
 Permission527=Izvoz posojil
 Permission531=Branje storitev
 Permission532=Kreiranje/spreminjanje storitev
+Permission533=Read prices services
 Permission534=Brisanje storitev
 Permission536=Pregled/upravljanje skritih storitev
 Permission538=Izvoz storitev
@@ -1235,6 +1238,7 @@ BrowserName=Ime brskalnika
 BrowserOS=OS brskalnika
 ListOfSecurityEvents=Seznam varnostnih dogodkov Dolibarr
 SecurityEventsPurged=Varnostni dogodki očistimo
+TrackableSecurityEvents=Trackable security events
 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=Sistemske informacije so raznovrstne tehnične informacije, ki so na voljo samo v bralnem načinu in jih vidi samo administrator.
@@ -1977,6 +1981,7 @@ MailToSendSupplierOrder=Nabavni nalogi
 MailToSendSupplierInvoice=Fakture dobaviteljev
 MailToSendContract=Pogodbe
 MailToSendReception=Receptions
+MailToExpenseReport=Stroškovna poročila
 MailToThirdparty=Partnerji
 MailToMember=Člani
 MailToUser=Uporabniki
@@ -2030,6 +2035,7 @@ MAIN_PDF_MARGIN_RIGHT=Right margin on PDF
 MAIN_PDF_MARGIN_TOP=Top margin on PDF
 MAIN_PDF_MARGIN_BOTTOM=Bottom margin on PDF
 MAIN_DOCUMENTS_LOGO_HEIGHT=Height for logo on PDF
+DOC_SHOW_FIRST_SALES_REP=Show first sales representative
 MAIN_GENERATE_PROPOSALS_WITH_PICTURE=Add column for picture on proposal lines
 MAIN_DOCUMENTS_WITH_PICTURE_WIDTH=Width of the column if a picture is added on lines
 MAIN_PDF_NO_SENDER_FRAME=Hide borders on sender address frame
@@ -2063,6 +2069,12 @@ EmailCollectors=Email collectors
 EmailCollectorDescription=Add a scheduled job and a setup page to scan regularly email boxes (using IMAP protocol) and record emails received into your application, at the right place and/or create some records automatically (like leads).
 NewEmailCollector=New Email Collector
 EMailHost=Host of email IMAP server
+EMailHostPort=Port of email IMAP server
+loginPassword=Login/Password
+oauthToken=Oauth2 token
+accessType=Acces type
+oauthService=Oauth service
+TokenMustHaveBeenCreated=Module OAuth2 must be enabled and an oauth2 token must have been created with the correct permissions (for example scope "gmail_full" with OAuth for Gmail).
 MailboxSourceDirectory=Mailbox source directory
 MailboxTargetDirectory=Mailbox target directory
 EmailcollectorOperations=Operations to do by collector
@@ -2106,7 +2118,7 @@ CreateCandidature=Create job application
 FormatZip=Zip
 MainMenuCode=Menu entry code (mainmenu)
 ECMAutoTree=Show automatic ECM tree
-OperationParamDesc=Define the rules to use to extract or set values.<br>Example for operations that need to extract a name from email subject:<br>name=EXTRACT:SUBJECT:Message from company ([^\n]*)<br>Example for operations that create objects:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value including value of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
+OperationParamDesc=Define the rules to use to extract some data or set values to use for operation.<br><br>Example to extract a company name from email subject into a temporary variable:<br>tmp_var=EXTRACT:SUBJECT:Message from company ([^\n]*)<br><br>Examples to set the properties of an object to create:<br>objproperty1=SET:a hard coded value<br>objproperty2=SET:__tmp_var__<br>objproperty3=SETIFEMPTY:a value (value is set only if property is not already defined)<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
 OpeningHours=Opening hours
 OpeningHoursDesc=Enter here the regular opening hours of your company.
 ResourceSetup=Configuration of Resource module
@@ -2212,6 +2224,7 @@ NoExternalModuleWithUpdate=No updates found for external modules
 SwaggerDescriptionFile=Swagger API description file (for use with redoc for example)
 YouEnableDeprecatedWSAPIsUseRESTAPIsInstead=You enabled deprecated WS API. You should use REST API instead.
 RandomlySelectedIfSeveral=Randomly selected if several pictures are available
+SalesRepresentativeInfo=For Proposals, Orders, Invoices.
 DatabasePasswordObfuscated=Database password is obfuscated in conf file
 DatabasePasswordNotObfuscated=Database password is NOT obfuscated in conf file
 APIsAreNotEnabled=APIs modules are not enabled
@@ -2277,5 +2290,20 @@ INVOICE_ADD_ZATCA_QR_CODEMore=Some Arabic countries need this QR Code on their i
 INVOICE_ADD_SWISS_QR_CODE=Show the swiss QR-Bill code on invoices
 UrlSocialNetworksDesc=Url link of social network. Use {socialid} for the variable part that contains the social network ID.
 IfThisCategoryIsChildOfAnother=If this category is a child of another one
+DarkThemeMode=Dark theme mode
+AlwaysDisabled=Always disabled
+AccordingToBrowser=According to browser
+AlwaysEnabled=Always Enabled
+DoesNotWorkWithAllThemes=Will not work with all themes
 NoName=No name
+ShowAdvancedOptions= Show advanced options
+HideAdvancedoptions= Hide advanced options
 CIDLookupURL=The module brings an URL that can be used by an external tool to get the name of a thirdparty or contact from its phone number. URL to use is:
+OauthNotAvailableForAllAndHadToBeCreatedBefore=OAUTH2 authentication is not available for all hosts, and a token with the right permissions must have been created upstream with the OAUTH module
+MAIN_MAIL_SMTPS_OAUTH_SERVICE=OAUTH2 authentication service
+DontForgetCreateTokenOauthMod=A token with the right permissions must have been created upstream with the OAUTH module
+MAIN_MAIL_SMTPS_AUTH_TYPE=Authentification method
+UsePassword=Use a password
+UseOauth=Use a OAUTH token
+Images=Images
+MaxNumberOfImagesInGetPost=Max number of images allowed in a HTML field submitted in a form
diff --git a/htdocs/langs/sr_RS/admin.lang b/htdocs/langs/sr_RS/admin.lang
index 319144e851d..09bf746bf1b 100644
--- a/htdocs/langs/sr_RS/admin.lang
+++ b/htdocs/langs/sr_RS/admin.lang
@@ -477,7 +477,7 @@ InstalledInto=Installed into directory %s
 BarcodeInitForThirdparties=Mass barcode init for third-parties
 BarcodeInitForProductsOrServices=Mass barcode init or reset for products or services
 CurrentlyNWithoutBarCode=Currently, you have <strong>%s</strong> record on <strong>%s</strong> %s without barcode defined.
-InitEmptyBarCode=Init value for next %s empty records
+InitEmptyBarCode=Init value for the %s empty barcodes
 EraseAllCurrentBarCode=Erase all current barcode values
 ConfirmEraseAllCurrentBarCode=Are you sure you want to erase all current barcode values?
 AllBarcodeReset=All barcode values have been removed
@@ -714,6 +714,7 @@ Permission27=Obriši trgovačke ponude
 Permission28=Izvezi trgovačke ponude
 Permission31=Pregled proizvoda
 Permission32=Napravi/promeni proizvode
+Permission33=Read prices products
 Permission34=Obriši proizvode
 Permission36=Pregledaj/uredi skrivene proizvode
 Permission38=Izvoz proizvoda
@@ -739,6 +740,7 @@ Permission79=Create/modify subscriptions
 Permission81=Read customers orders
 Permission82=Create/modify customers orders
 Permission84=Validate customers orders
+Permission85=Generate the documents sales orders
 Permission86=Send customers orders
 Permission87=Close customers orders
 Permission88=Cancel customers orders
@@ -874,6 +876,7 @@ Permission525=Access loan calculator
 Permission527=Export loans
 Permission531=Read services
 Permission532=Create/modify services
+Permission533=Read prices services
 Permission534=Delete services
 Permission536=See/manage hidden services
 Permission538=Export services
@@ -1235,6 +1238,7 @@ BrowserName=Browser name
 BrowserOS=Browser OS
 ListOfSecurityEvents=List of Dolibarr security events
 SecurityEventsPurged=Security events purged
+TrackableSecurityEvents=Trackable security events
 LogEventDesc=Enable logging for specific security events. Administrators the log via menu <b>%s - %s</b>. Warning, this feature can generate a large amount of data in the database.
 AreaForAdminOnly=Setup parameters can be set by <b>administrator users</b> only.
 SystemInfoDesc=System information is miscellaneous technical information you get in read only mode and visible for administrators only.
@@ -1977,6 +1981,7 @@ MailToSendSupplierOrder=Purchase orders
 MailToSendSupplierInvoice=Vendor invoices
 MailToSendContract=Ugovori
 MailToSendReception=Receptions
+MailToExpenseReport=Troškovi
 MailToThirdparty=Subjekti
 MailToMember=Članovi
 MailToUser=Korisnici
@@ -2030,6 +2035,7 @@ MAIN_PDF_MARGIN_RIGHT=Right margin on PDF
 MAIN_PDF_MARGIN_TOP=Top margin on PDF
 MAIN_PDF_MARGIN_BOTTOM=Bottom margin on PDF
 MAIN_DOCUMENTS_LOGO_HEIGHT=Height for logo on PDF
+DOC_SHOW_FIRST_SALES_REP=Show first sales representative
 MAIN_GENERATE_PROPOSALS_WITH_PICTURE=Add column for picture on proposal lines
 MAIN_DOCUMENTS_WITH_PICTURE_WIDTH=Width of the column if a picture is added on lines
 MAIN_PDF_NO_SENDER_FRAME=Hide borders on sender address frame
@@ -2063,6 +2069,12 @@ EmailCollectors=Email collectors
 EmailCollectorDescription=Add a scheduled job and a setup page to scan regularly email boxes (using IMAP protocol) and record emails received into your application, at the right place and/or create some records automatically (like leads).
 NewEmailCollector=New Email Collector
 EMailHost=Host of email IMAP server
+EMailHostPort=Port of email IMAP server
+loginPassword=Login/Password
+oauthToken=Oauth2 token
+accessType=Acces type
+oauthService=Oauth service
+TokenMustHaveBeenCreated=Module OAuth2 must be enabled and an oauth2 token must have been created with the correct permissions (for example scope "gmail_full" with OAuth for Gmail).
 MailboxSourceDirectory=Mailbox source directory
 MailboxTargetDirectory=Mailbox target directory
 EmailcollectorOperations=Operations to do by collector
@@ -2106,7 +2118,7 @@ CreateCandidature=Create job application
 FormatZip=Zip
 MainMenuCode=Menu entry code (mainmenu)
 ECMAutoTree=Show automatic ECM tree
-OperationParamDesc=Define the rules to use to extract or set values.<br>Example for operations that need to extract a name from email subject:<br>name=EXTRACT:SUBJECT:Message from company ([^\n]*)<br>Example for operations that create objects:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value including value of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
+OperationParamDesc=Define the rules to use to extract some data or set values to use for operation.<br><br>Example to extract a company name from email subject into a temporary variable:<br>tmp_var=EXTRACT:SUBJECT:Message from company ([^\n]*)<br><br>Examples to set the properties of an object to create:<br>objproperty1=SET:a hard coded value<br>objproperty2=SET:__tmp_var__<br>objproperty3=SETIFEMPTY:a value (value is set only if property is not already defined)<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
 OpeningHours=Opening hours
 OpeningHoursDesc=Enter here the regular opening hours of your company.
 ResourceSetup=Configuration of Resource module
@@ -2212,6 +2224,7 @@ NoExternalModuleWithUpdate=No updates found for external modules
 SwaggerDescriptionFile=Swagger API description file (for use with redoc for example)
 YouEnableDeprecatedWSAPIsUseRESTAPIsInstead=You enabled deprecated WS API. You should use REST API instead.
 RandomlySelectedIfSeveral=Randomly selected if several pictures are available
+SalesRepresentativeInfo=For Proposals, Orders, Invoices.
 DatabasePasswordObfuscated=Database password is obfuscated in conf file
 DatabasePasswordNotObfuscated=Database password is NOT obfuscated in conf file
 APIsAreNotEnabled=APIs modules are not enabled
@@ -2277,5 +2290,20 @@ INVOICE_ADD_ZATCA_QR_CODEMore=Some Arabic countries need this QR Code on their i
 INVOICE_ADD_SWISS_QR_CODE=Show the swiss QR-Bill code on invoices
 UrlSocialNetworksDesc=Url link of social network. Use {socialid} for the variable part that contains the social network ID.
 IfThisCategoryIsChildOfAnother=If this category is a child of another one
+DarkThemeMode=Dark theme mode
+AlwaysDisabled=Always disabled
+AccordingToBrowser=According to browser
+AlwaysEnabled=Always Enabled
+DoesNotWorkWithAllThemes=Will not work with all themes
 NoName=No name
+ShowAdvancedOptions= Show advanced options
+HideAdvancedoptions= Hide advanced options
 CIDLookupURL=The module brings an URL that can be used by an external tool to get the name of a thirdparty or contact from its phone number. URL to use is:
+OauthNotAvailableForAllAndHadToBeCreatedBefore=OAUTH2 authentication is not available for all hosts, and a token with the right permissions must have been created upstream with the OAUTH module
+MAIN_MAIL_SMTPS_OAUTH_SERVICE=OAUTH2 authentication service
+DontForgetCreateTokenOauthMod=A token with the right permissions must have been created upstream with the OAUTH module
+MAIN_MAIL_SMTPS_AUTH_TYPE=Authentification method
+UsePassword=Use a password
+UseOauth=Use a OAUTH token
+Images=Images
+MaxNumberOfImagesInGetPost=Max number of images allowed in a HTML field submitted in a form
diff --git a/htdocs/langs/sv_SE/admin.lang b/htdocs/langs/sv_SE/admin.lang
index 2d3fe121c52..afd89b4fd7b 100644
--- a/htdocs/langs/sv_SE/admin.lang
+++ b/htdocs/langs/sv_SE/admin.lang
@@ -477,7 +477,7 @@ InstalledInto=Installerad i katalogen %s
 BarcodeInitForThirdparties=Mass streckkod init för tredje part
 BarcodeInitForProductsOrServices=Mass streckkod init eller återställning efter produkter eller tjänster
 CurrentlyNWithoutBarCode=För närvarande har du  <strong>%s</strong> rader på <strong>%s</strong> %s utan steckkod angett.
-InitEmptyBarCode=Init värde för nästa% s tomma poster
+InitEmptyBarCode=Init value for the %s empty barcodes
 EraseAllCurrentBarCode=Radera alla nuvarande streckkoder
 ConfirmEraseAllCurrentBarCode=Är du säker på att du vill radera alla nuvarande streckkodsvärden?
 AllBarcodeReset=Alla värden för streckkod har raderats
@@ -714,6 +714,7 @@ Permission27=Ta bort affärsförslag
 Permission28=Export affärsförslag
 Permission31=Läs produkter
 Permission32=Skapa / modifiera produkter
+Permission33=Read prices products
 Permission34=Ta bort produkter
 Permission36=Se / hantera dold produkter
 Permission38=EXPORTVARA
@@ -739,6 +740,7 @@ Permission79=Skapa / ändra abonnemang
 Permission81=Läs kunderna order
 Permission82=Skapa / modifiera kunder order
 Permission84=Bekräfta kunder order
+Permission85=Generate the documents sales orders
 Permission86=Skicka kunder order
 Permission87=Stäng kunder order
 Permission88=Avbryt kunder order
@@ -874,6 +876,7 @@ Permission525=Tillgång lån kalkylator
 Permission527=Exportlånet
 Permission531=Läs tjänster
 Permission532=Skapa / modifiera tjänster
+Permission533=Read prices services
 Permission534=Ta bort tjänster
 Permission536=Se / Hantera dolda tjänster
 Permission538=Exportera tjänster
@@ -1235,6 +1238,7 @@ BrowserName=Browser namn
 BrowserOS=Browser OS
 ListOfSecurityEvents=Förteckning över Dolibarr säkerhetshändelser
 SecurityEventsPurged=Säkerhetshändelser renas
+TrackableSecurityEvents=Trackable security events
 LogEventDesc=Aktivera loggning för specifika säkerhetshändelser. Administratörer loggen via menyn <b> %s - %s </b>. Varning kan denna funktion generera en stor mängd data i databasen.
 AreaForAdminOnly=Inställningsparametrar kan ställas in av <b> endast administratörs användare </b>.
 SystemInfoDesc=System information diverse teknisk information får du i skrivskyddad läge och synlig för administratörer bara.
@@ -1977,6 +1981,7 @@ MailToSendSupplierOrder=Beställning
 MailToSendSupplierInvoice=Leverantörsfakturor
 MailToSendContract=Kontrakt
 MailToSendReception=Mottagningar
+MailToExpenseReport=Räkningar
 MailToThirdparty=Tredje part
 MailToMember=Medlemmar
 MailToUser=Användare
@@ -2030,6 +2035,7 @@ MAIN_PDF_MARGIN_RIGHT=Höger marginal på PDF
 MAIN_PDF_MARGIN_TOP=Toppmarginal på PDF
 MAIN_PDF_MARGIN_BOTTOM=Bottenmarginal på PDF
 MAIN_DOCUMENTS_LOGO_HEIGHT=Höjd för logotyp på PDF
+DOC_SHOW_FIRST_SALES_REP=Show first sales representative
 MAIN_GENERATE_PROPOSALS_WITH_PICTURE=Add column for picture on proposal lines
 MAIN_DOCUMENTS_WITH_PICTURE_WIDTH=Width of the column if a picture is added on lines
 MAIN_PDF_NO_SENDER_FRAME=Hide borders on sender address frame
@@ -2063,6 +2069,12 @@ EmailCollectors=Email collectors
 EmailCollectorDescription=Lägg till ett schemalagt jobb och en installationssida för att skanna regelbundet e-postrutor (med IMAP-protokoll) och spela in e-postmeddelanden som tas emot i din ansökan, på rätt plats och / eller skapa några poster automatiskt (som ledningar).
 NewEmailCollector=Ny e-postsamlare
 EMailHost=Värd för e-post IMAP-server
+EMailHostPort=Port of email IMAP server
+loginPassword=Login/Password
+oauthToken=Oauth2 token
+accessType=Acces type
+oauthService=Oauth service
+TokenMustHaveBeenCreated=Module OAuth2 must be enabled and an oauth2 token must have been created with the correct permissions (for example scope "gmail_full" with OAuth for Gmail).
 MailboxSourceDirectory=Postkälla källkatalog
 MailboxTargetDirectory=Målkatalogen för brevlådan
 EmailcollectorOperations=Verksamhet att göra av samlare
@@ -2106,7 +2118,7 @@ CreateCandidature=Skapa jobbansökan
 FormatZip=Zip
 MainMenuCode=Menyinmatningskod (huvudmeny)
 ECMAutoTree=Visa automatiskt ECM-träd
-OperationParamDesc=Define the rules to use to extract or set values.<br>Example for operations that need to extract a name from email subject:<br>name=EXTRACT:SUBJECT:Message from company ([^\n]*)<br>Example for operations that create objects:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value including value of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
+OperationParamDesc=Define the rules to use to extract some data or set values to use for operation.<br><br>Example to extract a company name from email subject into a temporary variable:<br>tmp_var=EXTRACT:SUBJECT:Message from company ([^\n]*)<br><br>Examples to set the properties of an object to create:<br>objproperty1=SET:a hard coded value<br>objproperty2=SET:__tmp_var__<br>objproperty3=SETIFEMPTY:a value (value is set only if property is not already defined)<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
 OpeningHours=Öppettider
 OpeningHoursDesc=Ange här företagets vanliga öppettider.
 ResourceSetup=Konfiguration av resursmodulen
@@ -2212,6 +2224,7 @@ NoExternalModuleWithUpdate=Inga uppdateringar hittades för externa moduler
 SwaggerDescriptionFile=Swagger API beskrivningsfil (för exempelvis användning med redoc)
 YouEnableDeprecatedWSAPIsUseRESTAPIsInstead=Du har aktiverat utfasade WS-API. Du borde använda REST API istället.
 RandomlySelectedIfSeveral=Slumpmässigt vald om flera bilder är tillgängliga
+SalesRepresentativeInfo=For Proposals, Orders, Invoices.
 DatabasePasswordObfuscated=Databasens lösenord är dolt i konfigurationsfilen
 DatabasePasswordNotObfuscated=Databasens lösenord är INTE dolt i konfigurationsfilen
 APIsAreNotEnabled=API-moduler är inte aktiverade
@@ -2277,5 +2290,20 @@ INVOICE_ADD_ZATCA_QR_CODEMore=Some Arabic countries need this QR Code on their i
 INVOICE_ADD_SWISS_QR_CODE=Show the swiss QR-Bill code on invoices
 UrlSocialNetworksDesc=Url link of social network. Use {socialid} for the variable part that contains the social network ID.
 IfThisCategoryIsChildOfAnother=If this category is a child of another one
+DarkThemeMode=Dark theme mode
+AlwaysDisabled=Always disabled
+AccordingToBrowser=According to browser
+AlwaysEnabled=Always Enabled
+DoesNotWorkWithAllThemes=Will not work with all themes
 NoName=No name
+ShowAdvancedOptions= Show advanced options
+HideAdvancedoptions= Hide advanced options
 CIDLookupURL=The module brings an URL that can be used by an external tool to get the name of a thirdparty or contact from its phone number. URL to use is:
+OauthNotAvailableForAllAndHadToBeCreatedBefore=OAUTH2 authentication is not available for all hosts, and a token with the right permissions must have been created upstream with the OAUTH module
+MAIN_MAIL_SMTPS_OAUTH_SERVICE=OAUTH2 authentication service
+DontForgetCreateTokenOauthMod=A token with the right permissions must have been created upstream with the OAUTH module
+MAIN_MAIL_SMTPS_AUTH_TYPE=Authentification method
+UsePassword=Use a password
+UseOauth=Use a OAUTH token
+Images=Images
+MaxNumberOfImagesInGetPost=Max number of images allowed in a HTML field submitted in a form
diff --git a/htdocs/langs/th_TH/admin.lang b/htdocs/langs/th_TH/admin.lang
index 700ff31983e..dec2043069b 100644
--- a/htdocs/langs/th_TH/admin.lang
+++ b/htdocs/langs/th_TH/admin.lang
@@ -477,7 +477,7 @@ InstalledInto=Installed into directory %s
 BarcodeInitForThirdparties=Mass barcode init for third-parties
 BarcodeInitForProductsOrServices=init บาร์โค้ดมวลหรือตั้งค่าสำหรับผลิตภัณฑ์หรือบริการ
 CurrentlyNWithoutBarCode=Currently, you have <strong>%s</strong> record on <strong>%s</strong> %s without barcode defined.
-InitEmptyBarCode=ค่า init สำหรับถัด% ระเบียนที่ว่างเปล่า
+InitEmptyBarCode=Init value for the %s empty barcodes
 EraseAllCurrentBarCode=ลบทุกค่าบาร์โค้ดปัจจุบัน
 ConfirmEraseAllCurrentBarCode=Are you sure you want to erase all current barcode values?
 AllBarcodeReset=ทั้งหมดค่าบาร์โค้ดได้ถูกลบออก
@@ -714,6 +714,7 @@ Permission27=ลบข้อเสนอในเชิงพาณิชย์
 Permission28=ข้อเสนอในเชิงพาณิชย์เพื่อการส่งออก
 Permission31=ดูผลิตภัณฑ์
 Permission32=สร้าง / แก้ไขผลิตภัณฑ์
+Permission33=Read prices products
 Permission34=ลบผลิตภัณฑ์
 Permission36=ดู / จัดการผลิตภัณฑ์ที่ซ่อน
 Permission38=สินค้าส่งออก
@@ -739,6 +740,7 @@ Permission79=สร้าง / แก้ไขการสมัครสมา
 Permission81=อ่านคำสั่งซื้อของลูกค้า
 Permission82=สร้าง / แก้ไขคำสั่งซื้อของลูกค้า
 Permission84=ตรวจสอบการสั่งซื้อของลูกค้า
+Permission85=Generate the documents sales orders
 Permission86=ส่งคำสั่งซื้อของลูกค้า
 Permission87=ลูกค้าปิดการสั่งซื้อ
 Permission88=ยกเลิกคำสั่งซื้อของลูกค้า
@@ -874,6 +876,7 @@ Permission525=เครื่องคิดเลขสินเชื่อเ
 Permission527=เงินให้กู้ยืมเพื่อการส่งออก
 Permission531=ดูบริการ
 Permission532=สร้าง / แก้ไขบริการ
+Permission533=Read prices services
 Permission534=ลบบริการ
 Permission536=ดู / จัดการบริการซ่อน
 Permission538=บริการส่งออก
@@ -1235,6 +1238,7 @@ BrowserName=ชื่อเบราว์เซอร์
 BrowserOS=ระบบปฏิบัติการเบราว์เซอร์
 ListOfSecurityEvents=รายการ Dolibarr เหตุการณ์การรักษาความปลอดภัย
 SecurityEventsPurged=เหตุการณ์การรักษาความปลอดภัยกำจัด
+TrackableSecurityEvents=Trackable security events
 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=ข้อมูลระบบข้อมูลทางด้านเทคนิคอื่น ๆ ที่คุณได้รับในโหมดอ่านอย่างเดียวและมองเห็นสำหรับผู้ดูแลระบบเท่านั้น
@@ -1977,6 +1981,7 @@ MailToSendSupplierOrder=Purchase orders
 MailToSendSupplierInvoice=Vendor invoices
 MailToSendContract=สัญญา
 MailToSendReception=Receptions
+MailToExpenseReport=รายงานค่าใช้จ่าย
 MailToThirdparty=บุคคลที่สาม
 MailToMember=สมาชิก
 MailToUser=ผู้ใช้
@@ -2030,6 +2035,7 @@ MAIN_PDF_MARGIN_RIGHT=Right margin on PDF
 MAIN_PDF_MARGIN_TOP=Top margin on PDF
 MAIN_PDF_MARGIN_BOTTOM=Bottom margin on PDF
 MAIN_DOCUMENTS_LOGO_HEIGHT=Height for logo on PDF
+DOC_SHOW_FIRST_SALES_REP=Show first sales representative
 MAIN_GENERATE_PROPOSALS_WITH_PICTURE=Add column for picture on proposal lines
 MAIN_DOCUMENTS_WITH_PICTURE_WIDTH=Width of the column if a picture is added on lines
 MAIN_PDF_NO_SENDER_FRAME=Hide borders on sender address frame
@@ -2063,6 +2069,12 @@ EmailCollectors=Email collectors
 EmailCollectorDescription=Add a scheduled job and a setup page to scan regularly email boxes (using IMAP protocol) and record emails received into your application, at the right place and/or create some records automatically (like leads).
 NewEmailCollector=New Email Collector
 EMailHost=Host of email IMAP server
+EMailHostPort=Port of email IMAP server
+loginPassword=Login/Password
+oauthToken=Oauth2 token
+accessType=Acces type
+oauthService=Oauth service
+TokenMustHaveBeenCreated=Module OAuth2 must be enabled and an oauth2 token must have been created with the correct permissions (for example scope "gmail_full" with OAuth for Gmail).
 MailboxSourceDirectory=Mailbox source directory
 MailboxTargetDirectory=Mailbox target directory
 EmailcollectorOperations=Operations to do by collector
@@ -2106,7 +2118,7 @@ CreateCandidature=Create job application
 FormatZip=รหัสไปรษณีย์
 MainMenuCode=Menu entry code (mainmenu)
 ECMAutoTree=Show automatic ECM tree
-OperationParamDesc=Define the rules to use to extract or set values.<br>Example for operations that need to extract a name from email subject:<br>name=EXTRACT:SUBJECT:Message from company ([^\n]*)<br>Example for operations that create objects:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value including value of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
+OperationParamDesc=Define the rules to use to extract some data or set values to use for operation.<br><br>Example to extract a company name from email subject into a temporary variable:<br>tmp_var=EXTRACT:SUBJECT:Message from company ([^\n]*)<br><br>Examples to set the properties of an object to create:<br>objproperty1=SET:a hard coded value<br>objproperty2=SET:__tmp_var__<br>objproperty3=SETIFEMPTY:a value (value is set only if property is not already defined)<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
 OpeningHours=เวลาเปิดทำการ
 OpeningHoursDesc=Enter here the regular opening hours of your company.
 ResourceSetup=Configuration of Resource module
@@ -2212,6 +2224,7 @@ NoExternalModuleWithUpdate=No updates found for external modules
 SwaggerDescriptionFile=Swagger API description file (for use with redoc for example)
 YouEnableDeprecatedWSAPIsUseRESTAPIsInstead=You enabled deprecated WS API. You should use REST API instead.
 RandomlySelectedIfSeveral=Randomly selected if several pictures are available
+SalesRepresentativeInfo=For Proposals, Orders, Invoices.
 DatabasePasswordObfuscated=Database password is obfuscated in conf file
 DatabasePasswordNotObfuscated=Database password is NOT obfuscated in conf file
 APIsAreNotEnabled=APIs modules are not enabled
@@ -2277,5 +2290,20 @@ INVOICE_ADD_ZATCA_QR_CODEMore=Some Arabic countries need this QR Code on their i
 INVOICE_ADD_SWISS_QR_CODE=Show the swiss QR-Bill code on invoices
 UrlSocialNetworksDesc=Url link of social network. Use {socialid} for the variable part that contains the social network ID.
 IfThisCategoryIsChildOfAnother=If this category is a child of another one
+DarkThemeMode=Dark theme mode
+AlwaysDisabled=Always disabled
+AccordingToBrowser=According to browser
+AlwaysEnabled=Always Enabled
+DoesNotWorkWithAllThemes=Will not work with all themes
 NoName=No name
+ShowAdvancedOptions= Show advanced options
+HideAdvancedoptions= Hide advanced options
 CIDLookupURL=The module brings an URL that can be used by an external tool to get the name of a thirdparty or contact from its phone number. URL to use is:
+OauthNotAvailableForAllAndHadToBeCreatedBefore=OAUTH2 authentication is not available for all hosts, and a token with the right permissions must have been created upstream with the OAUTH module
+MAIN_MAIL_SMTPS_OAUTH_SERVICE=OAUTH2 authentication service
+DontForgetCreateTokenOauthMod=A token with the right permissions must have been created upstream with the OAUTH module
+MAIN_MAIL_SMTPS_AUTH_TYPE=Authentification method
+UsePassword=Use a password
+UseOauth=Use a OAUTH token
+Images=Images
+MaxNumberOfImagesInGetPost=Max number of images allowed in a HTML field submitted in a form
diff --git a/htdocs/langs/tr_TR/admin.lang b/htdocs/langs/tr_TR/admin.lang
index 1dedefb1c10..e15f88bfaec 100644
--- a/htdocs/langs/tr_TR/admin.lang
+++ b/htdocs/langs/tr_TR/admin.lang
@@ -477,7 +477,7 @@ InstalledInto=%s dizinine yüklendi
 BarcodeInitForThirdparties=Cariler için toplu barkod girişi
 BarcodeInitForProductsOrServices=Ürünler ve hizmetler için toplu barkod başlatma ve sıfırlama
 CurrentlyNWithoutBarCode=Şu anda, bazı <strong>%s</strong> kayıtlarınızda <strong>%s</strong> %s tanımlı barkod bulunmamaktadır.
-InitEmptyBarCode=Sonraki %s boş kayıt için ilk değer
+InitEmptyBarCode=Init value for the %s empty barcodes
 EraseAllCurrentBarCode=Geçerli bütün barkod değerlerini sil
 ConfirmEraseAllCurrentBarCode=Geçerli bütün barkod değerlerini silmek istediğinizden emin misiniz?
 AllBarcodeReset=Tüm barkod değerleri silinmiştir
@@ -714,6 +714,7 @@ Permission27=Teklif sil
 Permission28=Teklifleri dışa aktar
 Permission31=Ürün oku
 Permission32=Ürün oluştur/düzenle
+Permission33=Read prices products
 Permission34=Ürün sil
 Permission36=Gizli ürünleri gör/yönet
 Permission38=Ürünleri dışa aktar
@@ -739,6 +740,7 @@ Permission79=Abonelik oluştur/düzenle
 Permission81=Müşteri siparişi oku
 Permission82=Müşteri siparişleri oluştur/düzenle
 Permission84=Müşteri siparişi doğrula
+Permission85=Generate the documents sales orders
 Permission86=Müşteri siparişi gönder
 Permission87=Müşteri siparişi kapat
 Permission88=Müşteri siparişi iptal et
@@ -874,6 +876,7 @@ Permission525=Borç hesaplayıcısına erişim
 Permission527=Borçları dışa aktar
 Permission531=Hizmet oku
 Permission532=Hizmet oluştur/değiştir
+Permission533=Read prices services
 Permission534=Hizmet sil
 Permission536=Gizli hizmetleri gör/yönet
 Permission538=Hizmetleri dışa aktar
@@ -1235,6 +1238,7 @@ BrowserName=Tarayıcı adı
 BrowserOS=Tarayıcı OS
 ListOfSecurityEvents=Dolibarr güvenlik etkinlikleri listesi
 SecurityEventsPurged=Güvenlik etkinlikleri temizlendi
+TrackableSecurityEvents=Trackable security events
 LogEventDesc=Belirli güvenlik etkinlikleri için günlüğe kaydetmeyi etkinleştirin. Yöneticiler <b>%s - %s</b> menüsünden günlüğü görebilir. Uyarı: Bu özellik veri tabanında büyük miktarda veri üretebilir.
 AreaForAdminOnly=Kurulum parametreleri sadece <b>yönetici olan kullanıcılar</b> tarafından ayarlanabilir.
 SystemInfoDesc=Sistem bilgileri sadece okuma modunda ve yöneticiler için görüntülenen çeşitli teknik bilgilerdir.
@@ -1977,6 +1981,7 @@ MailToSendSupplierOrder=Tedarikçi siparişleri
 MailToSendSupplierInvoice=Tedarikçi faturaları
 MailToSendContract=Sözleşmeler
 MailToSendReception=Resepsiyonlar
+MailToExpenseReport=Gider raporları
 MailToThirdparty=Cariler
 MailToMember=Üyeler
 MailToUser=Kullanıcılar
@@ -2030,6 +2035,7 @@ MAIN_PDF_MARGIN_RIGHT=PDF'deki sağ boşluk
 MAIN_PDF_MARGIN_TOP=PDF'deki üst boşluk
 MAIN_PDF_MARGIN_BOTTOM=PDF'deki alt kenar boşluğu
 MAIN_DOCUMENTS_LOGO_HEIGHT=PDF'deki logo için yükseklik
+DOC_SHOW_FIRST_SALES_REP=Show first sales representative
 MAIN_GENERATE_PROPOSALS_WITH_PICTURE=Add column for picture on proposal lines
 MAIN_DOCUMENTS_WITH_PICTURE_WIDTH=Width of the column if a picture is added on lines
 MAIN_PDF_NO_SENDER_FRAME=Hide borders on sender address frame
@@ -2063,6 +2069,12 @@ EmailCollectors=Email collectors
 EmailCollectorDescription=Düzenli olarak e-posta kutularını taramak (IMAP protokolünü kullanarak) ve uygulamanıza alınan e-postaları doğru yerde kaydetmek ve/veya bazı kayıtları otomatik olarak (potansiyel müşteriler gibi) oluşturmak için planlanmış bir iş ve bir kurulum sayfası ekleyin.
 NewEmailCollector=Yeni E-posta Toplayıcı
 EMailHost=E-posta IMAP sunucusu ana bilgisayarı
+EMailHostPort=Port of email IMAP server
+loginPassword=Login/Password
+oauthToken=Oauth2 token
+accessType=Acces type
+oauthService=Oauth service
+TokenMustHaveBeenCreated=Module OAuth2 must be enabled and an oauth2 token must have been created with the correct permissions (for example scope "gmail_full" with OAuth for Gmail).
 MailboxSourceDirectory=Posta kutusu kaynak dizini
 MailboxTargetDirectory=Posta kutusu hedef dizini
 EmailcollectorOperations=Toplayıcı tarafından yapılacak işlemler
@@ -2106,7 +2118,7 @@ CreateCandidature=İş başvurusu oluştur
 FormatZip=Posta Kodu
 MainMenuCode=Menü giriş kodu (ana menü)
 ECMAutoTree=Otomatik ECM ağacını göster
-OperationParamDesc=Define the rules to use to extract or set values.<br>Example for operations that need to extract a name from email subject:<br>name=EXTRACT:SUBJECT:Message from company ([^\n]*)<br>Example for operations that create objects:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value including value of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
+OperationParamDesc=Define the rules to use to extract some data or set values to use for operation.<br><br>Example to extract a company name from email subject into a temporary variable:<br>tmp_var=EXTRACT:SUBJECT:Message from company ([^\n]*)<br><br>Examples to set the properties of an object to create:<br>objproperty1=SET:a hard coded value<br>objproperty2=SET:__tmp_var__<br>objproperty3=SETIFEMPTY:a value (value is set only if property is not already defined)<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
 OpeningHours=Açılış saatleri
 OpeningHoursDesc=Buraya firmanızın normal çalışma saatlerini girin.
 ResourceSetup=Kaynak modülünün yapılandırılması
@@ -2212,6 +2224,7 @@ NoExternalModuleWithUpdate=No updates found for external modules
 SwaggerDescriptionFile=Swagger API description file (for use with redoc for example)
 YouEnableDeprecatedWSAPIsUseRESTAPIsInstead=You enabled deprecated WS API. You should use REST API instead.
 RandomlySelectedIfSeveral=Randomly selected if several pictures are available
+SalesRepresentativeInfo=For Proposals, Orders, Invoices.
 DatabasePasswordObfuscated=Database password is obfuscated in conf file
 DatabasePasswordNotObfuscated=Database password is NOT obfuscated in conf file
 APIsAreNotEnabled=APIs modules are not enabled
@@ -2277,5 +2290,20 @@ INVOICE_ADD_ZATCA_QR_CODEMore=Some Arabic countries need this QR Code on their i
 INVOICE_ADD_SWISS_QR_CODE=Show the swiss QR-Bill code on invoices
 UrlSocialNetworksDesc=Url link of social network. Use {socialid} for the variable part that contains the social network ID.
 IfThisCategoryIsChildOfAnother=If this category is a child of another one
+DarkThemeMode=Dark theme mode
+AlwaysDisabled=Always disabled
+AccordingToBrowser=According to browser
+AlwaysEnabled=Always Enabled
+DoesNotWorkWithAllThemes=Will not work with all themes
 NoName=No name
+ShowAdvancedOptions= Show advanced options
+HideAdvancedoptions= Hide advanced options
 CIDLookupURL=The module brings an URL that can be used by an external tool to get the name of a thirdparty or contact from its phone number. URL to use is:
+OauthNotAvailableForAllAndHadToBeCreatedBefore=OAUTH2 authentication is not available for all hosts, and a token with the right permissions must have been created upstream with the OAUTH module
+MAIN_MAIL_SMTPS_OAUTH_SERVICE=OAUTH2 authentication service
+DontForgetCreateTokenOauthMod=A token with the right permissions must have been created upstream with the OAUTH module
+MAIN_MAIL_SMTPS_AUTH_TYPE=Authentification method
+UsePassword=Use a password
+UseOauth=Use a OAUTH token
+Images=Images
+MaxNumberOfImagesInGetPost=Max number of images allowed in a HTML field submitted in a form
diff --git a/htdocs/langs/vi_VN/admin.lang b/htdocs/langs/vi_VN/admin.lang
index a9e8f0cc8e9..74ff8ee19c0 100644
--- a/htdocs/langs/vi_VN/admin.lang
+++ b/htdocs/langs/vi_VN/admin.lang
@@ -477,7 +477,7 @@ InstalledInto=Đã cài đặt vào thư mục %s
 BarcodeInitForThirdparties=Khởi tạo mã vạch hàng loạt cho bên thứ ba
 BarcodeInitForProductsOrServices=Mass barcode init or reset for products or services
 CurrentlyNWithoutBarCode=Hiện tại, bạn có <strong>%s</strong> bản ghi <strong>%s</strong> %s không xác định được mã vạch
-InitEmptyBarCode=Init value for next %s empty records
+InitEmptyBarCode=Init value for the %s empty barcodes
 EraseAllCurrentBarCode=Xóa tất cả các giá trị hiện tại của mã vạch
 ConfirmEraseAllCurrentBarCode=Bạn có chắc muốn xóa tất cả các giá trị mã vạch hiện tại?
 AllBarcodeReset=Tất cả giá trị mã vạch đã được loại bỏ
@@ -714,6 +714,7 @@ Permission27=Xóa đơn hàng đề xuất
 Permission28=Xuất dữ liệu đơn hàng đề xuất
 Permission31=Xem sản phẩm
 Permission32=Tạo/chỉnh sửa sản phẩm
+Permission33=Read prices products
 Permission34=Xóa sản phẩm
 Permission36=Xem/quản lý sản phẩm ẩn
 Permission38=Xuất dữ liệu sản phẩm
@@ -739,6 +740,7 @@ Permission79=Tạo/sửa đổi thuê bao
 Permission81=Xem đơn hàng khách hàng
 Permission82=Tạo/chỉnh sửa đơn hàng khách hàng
 Permission84=Xác nhận đơn hàng khách hàng
+Permission85=Generate the documents sales orders
 Permission86=Gửi đơn hàng khách hàng
 Permission87=Đóng đơn hàng khách hàng
 Permission88=Hủy bỏ đơn hàng khách hàng
@@ -874,6 +876,7 @@ Permission525=Truy cập tính toán cho vay
 Permission527=Xuất dữ liệu cho vay
 Permission531=Xem dịch vụ
 Permission532=Tạo/chỉnh sửa dịch vụ
+Permission533=Read prices services
 Permission534=Xóa dịch vụ
 Permission536=Xem/quản lý dịch vụ ẩn
 Permission538=Xuất dữ liệu Dịch vụ
@@ -1235,6 +1238,7 @@ BrowserName=Tên trình duyệt
 BrowserOS=Trình duyệt hệ điều hành
 ListOfSecurityEvents=Danh sách các sự kiện bảo mật Dolibarr
 SecurityEventsPurged=Sự kiện bảo mật được thanh lọc
+TrackableSecurityEvents=Trackable security events
 LogEventDesc=Cho phép đăng nhập cho các sự kiện bảo mật cụ thể. Quản trị các nhật ký thông qua menu <b>%s - %s</b> . Cảnh báo, tính năng này có thể tạo ra một lượng lớn dữ liệu trong cơ sở dữ liệu.
 AreaForAdminOnly=Thông số cài đặt chỉ có thể được đặt bởi <b>người dùng quản trị viên</b> .
 SystemInfoDesc=Hệ thống thông tin là thông tin kỹ thuật linh tinh bạn nhận được trong chế độ chỉ đọc và có thể nhìn thấy chỉ cho quản trị viên.
@@ -1977,6 +1981,7 @@ MailToSendSupplierOrder=Đơn đặt hàng mua
 MailToSendSupplierInvoice=Hóa đơn nhà cung cấp
 MailToSendContract=Hợp đồng
 MailToSendReception=Tiếp nhận
+MailToExpenseReport=Báo cáo chi phí
 MailToThirdparty=Bên thứ ba
 MailToMember=Thành viên
 MailToUser=Người dùng
@@ -2030,6 +2035,7 @@ MAIN_PDF_MARGIN_RIGHT=Lề phải trên PDF
 MAIN_PDF_MARGIN_TOP=Lề trên PDF
 MAIN_PDF_MARGIN_BOTTOM=Lề dưới PDF
 MAIN_DOCUMENTS_LOGO_HEIGHT=Height for logo on PDF
+DOC_SHOW_FIRST_SALES_REP=Show first sales representative
 MAIN_GENERATE_PROPOSALS_WITH_PICTURE=Add column for picture on proposal lines
 MAIN_DOCUMENTS_WITH_PICTURE_WIDTH=Width of the column if a picture is added on lines
 MAIN_PDF_NO_SENDER_FRAME=Hide borders on sender address frame
@@ -2063,6 +2069,12 @@ EmailCollectors=Email collectors
 EmailCollectorDescription=Thêm một công việc được lên lịch và một trang thiết lập để quét các hộp thư điện tử thường xuyên (sử dụng giao thức IMAP) và ghi lại các email nhận được vào ứng dụng của bạn, đúng nơi và/hoặc tự động tạo một số bản ghi (như khách hàng tiềm năng).
 NewEmailCollector=Trình thu thập email mới
 EMailHost=Máy chủ email IMAP
+EMailHostPort=Port of email IMAP server
+loginPassword=Login/Password
+oauthToken=Oauth2 token
+accessType=Acces type
+oauthService=Oauth service
+TokenMustHaveBeenCreated=Module OAuth2 must be enabled and an oauth2 token must have been created with the correct permissions (for example scope "gmail_full" with OAuth for Gmail).
 MailboxSourceDirectory=Thư mục nguồn hộp thư
 MailboxTargetDirectory=Thư mục đích hộp thư
 EmailcollectorOperations=Hoạt động để làm bởi trình thu thập
@@ -2106,7 +2118,7 @@ CreateCandidature=Create job application
 FormatZip=Zip
 MainMenuCode=Mã mục nhập menu (mainmenu)
 ECMAutoTree=Hiển thị cây ECM tự động
-OperationParamDesc=Define the rules to use to extract or set values.<br>Example for operations that need to extract a name from email subject:<br>name=EXTRACT:SUBJECT:Message from company ([^\n]*)<br>Example for operations that create objects:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value including value of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
+OperationParamDesc=Define the rules to use to extract some data or set values to use for operation.<br><br>Example to extract a company name from email subject into a temporary variable:<br>tmp_var=EXTRACT:SUBJECT:Message from company ([^\n]*)<br><br>Examples to set the properties of an object to create:<br>objproperty1=SET:a hard coded value<br>objproperty2=SET:__tmp_var__<br>objproperty3=SETIFEMPTY:a value (value is set only if property is not already defined)<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
 OpeningHours=Giờ mở cửa
 OpeningHoursDesc=Nhập vào đây giờ mở cửa thường xuyên của công ty bạn.
 ResourceSetup=Cấu hình của mô-đun tài nguyên
@@ -2212,6 +2224,7 @@ NoExternalModuleWithUpdate=No updates found for external modules
 SwaggerDescriptionFile=Swagger API description file (for use with redoc for example)
 YouEnableDeprecatedWSAPIsUseRESTAPIsInstead=You enabled deprecated WS API. You should use REST API instead.
 RandomlySelectedIfSeveral=Randomly selected if several pictures are available
+SalesRepresentativeInfo=For Proposals, Orders, Invoices.
 DatabasePasswordObfuscated=Database password is obfuscated in conf file
 DatabasePasswordNotObfuscated=Database password is NOT obfuscated in conf file
 APIsAreNotEnabled=APIs modules are not enabled
@@ -2277,5 +2290,20 @@ INVOICE_ADD_ZATCA_QR_CODEMore=Some Arabic countries need this QR Code on their i
 INVOICE_ADD_SWISS_QR_CODE=Show the swiss QR-Bill code on invoices
 UrlSocialNetworksDesc=Url link of social network. Use {socialid} for the variable part that contains the social network ID.
 IfThisCategoryIsChildOfAnother=If this category is a child of another one
+DarkThemeMode=Dark theme mode
+AlwaysDisabled=Always disabled
+AccordingToBrowser=According to browser
+AlwaysEnabled=Always Enabled
+DoesNotWorkWithAllThemes=Will not work with all themes
 NoName=No name
+ShowAdvancedOptions= Show advanced options
+HideAdvancedoptions= Hide advanced options
 CIDLookupURL=The module brings an URL that can be used by an external tool to get the name of a thirdparty or contact from its phone number. URL to use is:
+OauthNotAvailableForAllAndHadToBeCreatedBefore=OAUTH2 authentication is not available for all hosts, and a token with the right permissions must have been created upstream with the OAUTH module
+MAIN_MAIL_SMTPS_OAUTH_SERVICE=OAUTH2 authentication service
+DontForgetCreateTokenOauthMod=A token with the right permissions must have been created upstream with the OAUTH module
+MAIN_MAIL_SMTPS_AUTH_TYPE=Authentification method
+UsePassword=Use a password
+UseOauth=Use a OAUTH token
+Images=Images
+MaxNumberOfImagesInGetPost=Max number of images allowed in a HTML field submitted in a form
diff --git a/htdocs/langs/zh_CN/admin.lang b/htdocs/langs/zh_CN/admin.lang
index 51b00ac6d76..040748ec362 100644
--- a/htdocs/langs/zh_CN/admin.lang
+++ b/htdocs/langs/zh_CN/admin.lang
@@ -1,26 +1,26 @@
 # Dolibarr language file - Source file is en_US - admin
 BoldRefAndPeriodOnPDF=在PDF中打印产品项目的参考编号和期限
 BoldLabelOnPDF=在PDF中使用粗体打印产品的标签
-Foundation=机构
+Foundation=基金会
 Version=版本
-Publisher=出版者
+Publisher=发布者
 VersionProgram=程序版本
 VersionLastInstall=初始安装版本
 VersionLastUpgrade=最新版本升级
-VersionExperimental=试验
+VersionExperimental=试验性
 VersionDevelopment=开发
 VersionUnknown=未知
 VersionRecommanded=推荐
 FileCheck=文件集完整性检查
-FileCheckDesc=使用此工具，您可以将文件与正式文件进行比较，以检查文件的完整性和应用程序的设置。也可以检查某些设置常数的值。您可以使用此工具来确定是否已修改任何文件（例如，被黑客入侵）。
-FileIntegrityIsStrictlyConformedWithReference=文件完整性严格符合参考。
+FileCheckDesc=使用此工具，您可以将文件与正式文件进行比较，以检查文件的完整性和应用程序的设置。也可以检查某些设置常数的值。您可以使用此工具来确定是否有任何文件被修改（例如，被黑客入侵）。
+FileIntegrityIsStrictlyConformedWithReference=文件完整性严格符合参考值。
 FileIntegrityIsOkButFilesWereAdded=文件完整性检查已通过，但添加了一些新文件。
-FileIntegritySomeFilesWereRemovedOrModified=文件完整性检查失败。某些文件已被修改，删除或添加。
+FileIntegritySomeFilesWereRemovedOrModified=文件完整性检查失败。某些文件已被修改、删除或添加。
 GlobalChecksum=全局校验和
 MakeIntegrityAnalysisFrom=对应用程序文件进行完整性分析
 LocalSignature=嵌入式本地签名（不太可靠）
-RemoteSignature=远程遥控签名（更可靠）
-FilesMissing=缺少文件
+RemoteSignature=远端签名（更可靠）
+FilesMissing=缺少的文件
 FilesUpdated=已更新的文件
 FilesModified=已修改的文件
 FilesAdded=增加的文件
@@ -31,29 +31,29 @@ SessionId=会话 ID
 SessionSaveHandler=会话保存处理程序
 SessionSavePath=会话保存位置
 PurgeSessions=清空会话
-ConfirmPurgeSessions=您真的要清除所有会话吗？它将断开每个用户（您自己除外）。
+ConfirmPurgeSessions=您真的要清空所有会话吗？它将断开每个用户（您自己除外）。
 NoSessionListWithThisHandler=您 PHP 中设置的保存会话处理程序不允许列出运行中的会话。
 LockNewSessions=锁定新连接
 ConfirmLockNewSessions=你确定要限制 Dolibarr 的所有新连接，只允许您自己连入？此后将只有用户 <b>%s</b> 可以连入。
-UnlockNewSessions=取消连接锁定
+UnlockNewSessions=移除连接锁定
 YourSession=你的会话
 Sessions=用户会话
 WebUserGroup=Web 服务器用户/组
 PermissionsOnFiles=文件权限
 PermissionsOnFilesInWebRoot=Web根目录中文件的权限
 PermissionsOnFile=文件%s的权限
-NoSessionFound=您的PHP配置似乎不允许列出活动会话。可以保护用于保存会话的目录（<b> %s </b>）（例如，通过OS权限或PHP指令open_basedir）。
-DBStoringCharset=数据库保存数据的字符编码
-DBSortingCharset=数据库排序数据的字符编码
+NoSessionFound=您的 PHP 配置似乎不允许列出活动会话。用于保存会话的目录 (<b> %s </b>) 可能受到保护（例如通过操作系统权限或 PHP 指令 open_basedir）。
+DBStoringCharset=保存数据的数据库字符集
+DBSortingCharset=排序数据的数据库字符集
 HostCharset=主机字符集
-ClientCharset=客户端的字符编码
-ClientSortingCharset=客户核对
+ClientCharset=客户端的字符集
+ClientSortingCharset=客户端整理
 WarningModuleNotActive=<b> %s </b>模块必须启用
 WarningOnlyPermissionOfActivatedModules=仅与已启用模块相关的权限显示在此。您可以在 "主页"->"设置"->"模块"页面中启用其它模块。
-DolibarrSetup=Dolibarr安装及升级 - 向导
-InternalUser=内部员工用户
+DolibarrSetup=Dolibarr安装或升级
+InternalUser=内部用户
 ExternalUser=外部用户
-InternalUsers=内部员工用户
+InternalUsers=内部用户
 ExternalUsers=外部用户
 UserInterface=用户界面
 GUISetup=主题
@@ -61,41 +61,41 @@ SetupArea=设置
 UploadNewTemplate=上传新模板
 FormToTestFileUploadForm=文件上传功能测试
 ModuleMustBeEnabled=必须启用模块/应用程序<b> %s </b>
-ModuleIsEnabled=启用了模块/应用程序<b> %s </b>
+ModuleIsEnabled=模块/应用程序<b> %s </b>已启用
 IfModuleEnabled=注：“是”仅在模块 <b>%s</b> 启用时有效
 RemoveLock=删除/重命名文件<b> %s </b>（如果存在），以允许使用更新/安装工具。
-RestoreLock=恢复文件<b> %s </b>的只读权限，以禁止升级工具的使用。
+RestoreLock=恢复文件<b> %s </b>的只读权限，以禁止更新/安装工具的使用。
 SecuritySetup=安全设置
 PHPSetup=PHP设置
-OSSetup=系统设置
-SecurityFilesDesc=在此定义与上载文件的安全性相关的选项。
+OSSetup=操作系统设置
+SecurityFilesDesc=在此处定义与上传文件的安全性相关的选项。
 ErrorModuleRequirePHPVersion=错误，此模块要求 PHP 版本 %s 或更高
 ErrorModuleRequireDolibarrVersion=错误，此模块要求 Dolibarr 版本 %s 或更高
 ErrorDecimalLargerThanAreForbidden=错误，不支持超过 <b>%s</b> 的精度。
-DictionarySetup=字典的设置
+DictionarySetup=字典设置
 Dictionary=字典库
-ErrorReservedTypeSystemSystemAuto=类型的值'system'和'systemauto'保留。您可以使用“user”作为值来添加自己的记录
+ErrorReservedTypeSystemSystemAuto=类型的值'system'和'systemauto'为保留值。您可以使用“user”作为值来添加自己的记录
 ErrorCodeCantContainZero=编码不能包含 0
 DisableJavascript=禁用 JavaScript 和 Ajax 功能
-DisableJavascriptNote=Note: For test or debug purpose only. For optimization for blind person or text browsers, you may prefer to use the setup on the profile of user
+DisableJavascriptNote=注意：仅用于测试或调试目的。为了针对盲人或文本浏览器进行优化，建议使用用户配置文件上的设置
 UseSearchToSelectCompanyTooltip=此外，如果您有大量第三方（> 100 000），您可以通过在"设置"-> "其他"中将常量COMPANY_DONOTSEARCH_ANYWHERE设置为1来提高速度。然后搜索将限制为以字符串的开头。
 UseSearchToSelectContactTooltip=此外，如果您有大量第三方（> 100 000），您可以通过在"设置"-> "其他"中将常量CONTACT_DONOTSEARCH_ANYWHERE设置为1来提高速度。然后搜索将限制为以字符串开头。
-DelaiedFullListToSelectCompany=Wait until a key is pressed before loading content of Third Parties combo list.<br>This may increase performance if you have a large number of third parties, but it is less convenient.
-DelaiedFullListToSelectContact=Wait until a key is pressed before loading content of Contact combo list.<br>This may increase performance if you have a large number of contacts, but it is less convenient.
-NumberOfKeyToSearch=Number of characters to trigger search: %s
+DelaiedFullListToSelectCompany=在任意键被按下后再加载第三方组合列表的内容。 <br> 如果您有大量第三方，这可能会提高性能，但不太方便。
+DelaiedFullListToSelectContact=在任意键被按下后再加载联系人组合列表列表的内容。 <br> 如果您有大量联系人，这可能会提高性能，但不太方便。
+NumberOfKeyToSearch=可触发搜索的字符数：%s
 NumberOfBytes=字节数
-SearchString=搜寻字串
+SearchString=搜索字符串
 NotAvailableWhenAjaxDisabled=Ajax 禁用时不可用
-AllowToSelectProjectFromOtherCompany=在合作方的文档上，可以选择链接到另一个合作方的项目
-TimesheetPreventAfterFollowingMonths=Prevent recording time spent after the following number of months
-JavascriptDisabled=禁用 JavaScript
-UsePreviewTabs=使用预览标签
+AllowToSelectProjectFromOtherCompany=在第三方的文件上，可以选择与另一个第三方关联的项目
+TimesheetPreventAfterFollowingMonths=在以下几个月后阻止记录花费的时间
+JavascriptDisabled=JavaScript已禁用
+UsePreviewTabs=使用预览标签页
 ShowPreview=显示预览
-ShowHideDetails=显示隐藏详细信息
-PreviewNotAvailable=无预览
+ShowHideDetails=显示-隐藏详细信息
+PreviewNotAvailable=预览不可用
 ThemeCurrentlyActive=当前使用的主题
-MySQLTimeZone=MySql 服务器的时区
-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).
+MySQLTimeZone=MySql(数据库)服务器的时区
+TZHasNoEffect=日期由数据库服务器存储和返回，类似字符串一样提交和保存。时区仅在使用 UNIX_TIMESTAMP 函数时有效（Dolibarr 不应使用该函数，因此数据库时区应该没有影响，即使在输入数据后更改了时区）。
 Space=空间
 Table=表
 Fields=字段
@@ -103,24 +103,24 @@ Index=索引
 Mask=格式掩码
 NextValue=下一个值
 NextValueForInvoices=下一个值（发票）
-NextValueForCreditNotes=下一个值（贷方记录）
-NextValueForDeposit=下一个值（首付）
+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
+MustBeLowerThanPHPLimit=注意：您的 PHP 当前配置将上传的最大文件大小限制为 <b> %s </b> %s，与此参数的值无关
 NoMaxSizeByPHPLimit=注：您的 PHP 配置参数中没有设置限制
 MaxSizeForUploadedFiles=上传文件的最大尺寸（0表示不允许上传）
-UseCaptchaCode=Use graphical code (CAPTCHA) on login page and some public pages
-AntiVirusCommand=防毒命令的完整路径
-AntiVirusCommandExample=Example for ClamAv Daemon (require clamav-daemon): /usr/bin/clamdscan<br>Example for ClamWin (very very slow): c:\\Progra~1\\ClamWin\\bin\\clamscan.exe
+UseCaptchaCode=在登录页面和一些公共页面上使用图形验证码 (CAPTCHA)
+AntiVirusCommand=杀毒软件的完整路径
+AntiVirusCommandExample=ClamAv Daemon示例（需要 clamav-daemon）：/usr/bin/clamdscan <br> ClamWin 示例（非常非常慢）：c:\\Progra~1\\ClamWin\\bin\\clamscan.exe
 AntiVirusParam= 更多命令行参数
-AntiVirusParamExample=Example for ClamAv Daemon: --fdpass<br>Example for ClamWin: --database="C:\\Program Files (x86)\\ClamWin\\lib"
+AntiVirusParamExample=ClamAv Daemon 示例：--fdpass <br> ClamWin 示例：--database="C:\\Program Files (x86)\\ClamWin\\lib"
 ComptaSetup=会计模块设置
 UserSetup=用户管理设置
 MultiCurrencySetup=多币种设置
-MenuLimits=精确度
+MenuLimits=限制和精度
 MenuIdParent=父菜单ID
 DetailMenuIdParent=父菜单ID (空表示顶级菜单)
-ParentID=Parent ID
+ParentID=父ID
 DetailPosition=排序编号，以确定菜单位置
 AllMenus=全部
 NotConfigured=模块或应用未配置
@@ -135,37 +135,37 @@ IdModule=模块ID
 IdPermissions=权限ID
 LanguageBrowserParameter=参数 %s
 LocalisationDolibarrParameters=本地化参数
-ClientHour=(用户)客户端时间
+ClientHour=客户端(用户)时间
 OSTZ=服务器操作系统时区
 PHPTZ=PHP服务器时区
-DaylingSavingTime=夏令时间
+DaylingSavingTime=夏令时
 CurrentHour=PHP 服务器时间
 CurrentSessionTimeOut=当前会话超时
-YouCanEditPHPTZ=To set a different PHP timezone (not required), you can try to add a .htaccess file with a line like this "SetEnv TZ Europe/Paris"
-HoursOnThisPageAreOnServerTZ=Warning, in contrary of other screens, hours on this page are not in your local timezone, but of the timezone of the server.
-Box=插件
-Boxes=插件
-MaxNbOfLinesForBoxes=插件清单数量最大值
-AllWidgetsWereEnabled=全部插件已启用
+YouCanEditPHPTZ=您可以尝试添加一个 .htaccess 文件来设置不同的 PHP 时区（不是必需的），其中包含类似“SetEnv TZ Europe/Paris”的行
+HoursOnThisPageAreOnServerTZ=警告，与其他屏幕相反，此页面上的小时不是您当地的时区，而是服务器的时区。
+Box=小工具
+Boxes=小工具
+MaxNbOfLinesForBoxes=小工具最大行数
+AllWidgetsWereEnabled=全部可用的小工具都已启用
 PositionByDefault=默认顺序
 Position=位置
-MenusDesc=菜单管理器定义两菜单中的内容(横向和纵向菜单栏)。
-MenusEditorDesc=菜单编辑器允许您定义自定义菜单条目。请小心使用，以避免不稳定和永久无法访问的菜单项。<br>某些模块添加菜单项（通常在菜单<b>全部</b>中）。如果您错误地删除了其中一些条目，则可以恢复它们禁用并重新启用该模块。
+MenusDesc=菜单管理器定义两个菜单中的内容(横向和纵向菜单栏)。
+MenusEditorDesc=菜单编辑器允许您定义自定义菜单条目。请小心使用，以避免不稳定和永久无法访问某些菜单项。<br>某些模块会添加菜单项（通常在菜单<b>全部</b>中）。如果您错误地删除了其中一些条目，则可以禁用并重新启用该模块来恢复它们。
 MenuForUsers=用户菜单
 LangFile=.lang 文件
 Language_en_US_es_MX_etc=语言（en_US，es_MX等）
 System=系统
 SystemInfo=系统信息
 SystemToolsArea=系统工具区
-SystemToolsAreaDesc=This area provides administration functions. Use the menu to choose the required feature.
+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.
+PurgeAreaDesc=此页面允许您删除 Dolibarr 生成或存储的所有文件（临时文件或 <b> %s </b> 目录中的所有文件）。通常您不需要使用此功能。它是为那些托管在不提供删除 Web 服务器生成的文件的权限的提供商的Dolibarr用户提供的一种解决方法。
 PurgeDeleteLogFile=删除系统日志模块定义的日志文件<b>%s</b>(无数据丢失风险)
-PurgeDeleteTemporaryFiles=Delete all log and temporary files (no risk of losing data). Parameter can be 'tempfilesold', 'logfiles' or both 'tempfilesold+logfiles'. Note: Deletion of temporary files is done only if the temp directory was created more than 24 hours ago.
-PurgeDeleteTemporaryFilesShort=Delete log and temporary files (no risk of losing data)
-PurgeDeleteAllFilesInDocumentsDir=Delete all files in directory: <b>%s</b>.<br>This will delete all generated documents related to elements (third parties, invoices etc...), files uploaded into the ECM module, database backup dumps and temporary files.
+PurgeDeleteTemporaryFiles=删除所有日志和临时文件（没有丢失数据的风险）。参数可以是“tempfilesold”、“logfiles”或两者都是“tempfilesold+logfiles”。注意：仅当临时目录创建时间超过 24 小时时，才会删除临时文件。
+PurgeDeleteTemporaryFilesShort=删除日志和临时文件（没有丢失数据的风险）
+PurgeDeleteAllFilesInDocumentsDir=删除此目录中的所有文件： <b> %s </b> 。 <br> 这将删除所有生成的与功能相关的文档（第三方、发票等...）、上传到 ECM 模块的文件、数据库备份转储和临时文件。
 PurgeRunNow=立即清空
-PurgeNothingToDelete=未删除目录或文件
+PurgeNothingToDelete=没有要删除的目录或文件。
 PurgeNDirectoriesDeleted=<b>%s</b> 个文件或目录删除。
 PurgeNDirectoriesFailed=删除 <b>%s</b>文件或目录失败
 PurgeAuditEvents=清空所有安全事件
@@ -181,14 +181,14 @@ NoBackupFileAvailable=没有可用的备份文件。
 ExportMethod=导出方法
 ImportMethod=导入方法
 ToBuildBackupFileClickHere=要建立一个备份文件，请单击<a href="%s">此处</a>
-ImportMySqlDesc=To import a MySQL backup file, you may use phpMyAdmin via your hosting or use the mysql command from the Command line.<br>For example:
+ImportMySqlDesc=要导入 MySQL 备份文件，您可以使用服务提供商的 phpMyAdmin 或使用mysql 命令行。 <br> 例如：
 ImportPostgreSqlDesc=导入备份文件，你必须使用 pg_restore 命令行命令：
 ImportMySqlCommand=%s %s < mybackupfile.sql
 ImportPostgreSqlCommand=%s %s mybackupfile.sql
 FileNameToGenerate=备份文件名：
 Compression=压缩
-CommandsToDisableForeignKeysForImport=导入时禁用 Foreign Key 的命令
-CommandsToDisableForeignKeysForImportWarning=如果你希望稍候能恢复您的SQL转储则必须使用。
+CommandsToDisableForeignKeysForImport=导入时禁用外键的命令
+CommandsToDisableForeignKeysForImportWarning=如果您希望以后能够恢复您的 SQL转储，则为必填项
 ExportCompatibility=生成导出文件的兼容性
 ExportUseMySQLQuickParameter=使用--quick参数
 ExportUseMySQLQuickParameterHelp=“ --quick”参数有助于限制大型表的RAM消耗。
@@ -204,234 +204,234 @@ NameColumn=名称列
 ExtendedInsert=扩展 INSERT
 NoLockBeforeInsert=INSERT 命令前后没有锁定命令
 DelayedInsert=延迟插入
-EncodeBinariesInHexa=二进制数据以十六进制编码
+EncodeBinariesInHexa=以十六进制编码二进制数据
 IgnoreDuplicateRecords=忽略重复记录错误(INSERT IGNORE)
 AutoDetectLang=自动检测(浏览器的语言)
 FeatureDisabledInDemo=功能在演示版中已禁用
 FeatureAvailableOnlyOnStable=功能仅适用于官方稳定版本
-BoxesDesc=资讯框是一些页面中显示信息的屏幕区域。你可以选择目标页面并点击“启用”或垃圾桶按钮来显示或禁用这些信息域。
+BoxesDesc=小工具是一些页面中显示信息的屏幕区域。你可以选择目标页面并点击“启用”或垃圾桶按钮来显示或禁用这些小工具。
 OnlyActiveElementsAreShown=仅显示 <a href="%s">已启用模块</a> 的元素。
-ModulesDesc=The modules/applications determine which features are available in the software. Some modules require permissions to be granted to users after activating the module. Click the on/off button <span class="small valignmiddle">%s</span> of each module to enable or disable a module/application.
-ModulesDesc2=Click the wheel button <span class="small valignmiddle">%s</span> to configure the module/application.
-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=You may also develop your own module or find a partner to develop one for you.
-DOLISTOREdescriptionLong=Instead of switching on <a href="https://www.dolistore.com">www.dolistore.com</a> web site to find an external module, you can use this embedded tool that will perform the search on the external market place for you (may be slow, need an internet access)...
+ModulesDesc=模块/应用程序确定软件中可用的功能。某些模块需要在激活模块后授予用户权限。单击每个模块的开/关按钮 <span class="small valignmiddle"> %s </span> 以启用或禁用模块/应用程序。
+ModulesDesc2=单击齿轮按钮 <span class="small valignmiddle"> %s </span> 以配置模块/应用程序。
+ModulesMarketPlaceDesc=您可以在 Internet 上的外部网站上找到更多可下载的模块...
+ModulesDeployDesc=如果您的文件系统上的权限允许，您可以使用此工具部署外部模块。然后，该模块将在选项卡 <strong> %s </strong> 上可见。
+ModulesMarketPlaces=查找外部应用程序/模块
+ModulesDevelopYourModule=开发您自己的应用程序/模块
+ModulesDevelopDesc=您也可以开发自己的模块或寻找合作伙伴为您开发模块。
+DOLISTOREdescriptionLong=无需打开 <a href="https://www.dolistore.com"> www.dolistore.com </a> 网站来查找外部模块，您可以使用此嵌入式工具为您在外部市场上执行搜索（可能很慢，需要互联网访问）...
 NewModule=新模块
 FreeModule=空余
 CompatibleUpTo=与版本%s兼容
 NotCompatible=此模块似乎与您的Dolibarr %s（Min %s  -  Max %s）不兼容。
-CompatibleAfterUpdate=此模块需要更新Dolibarr %s（Min %s  -  Max %s）。
+CompatibleAfterUpdate=此模块需要更新您的Dolibarr %s（最低版本 %s  -  最高版本 %s）。
 SeeInMarkerPlace=在市场上看到
 SeeSetupOfModule=参见模块设置 %s
-SetOptionTo=Set option <b>%s</b> to %s
+SetOptionTo=将选项 <b> %s </b> 设置为 %s
 Updated=已更新
 AchatTelechargement=购买/下载
-GoModuleSetupArea=To deploy/install a new module, go to the Module setup area: <a href="%s">%s</a>.
-DoliStoreDesc=DoliStore，为 Dolibarr 的 ERP/CRM 的外部模块官方市场
-DoliPartnersDesc=List of companies providing custom-developed modules or features.<br>Note: since Dolibarr is an open source application, <i>anyone</i> experienced in PHP programming should be able to develop a module.
-WebSiteDesc=参考网址查找更多模块...
-DevelopYourModuleDesc=一些开发自己模块的解决方案......
-URL=网址
-RelativeURL=相关URL
-BoxesAvailable=插件可用
-BoxesActivated=插件已启用
-ActivateOn=启用
-ActiveOn=启用
-ActivatableOn=可激活
+GoModuleSetupArea=要部署/安装新模块，请转到模块设置区域： <a href="%s"> %s </a> 。
+DoliStoreDesc=DoliStore，为 Dolibarr ERP/CRM 提供外部模块的官方市场
+DoliPartnersDesc=提供定制开发模块或功能的公司列表。 <br> 注意：由于 Dolibarr 是一个开源应用程序，<i> 任何有 PHP 编程经验的人 </i> 都应该能够开发模块。
+WebSiteDesc=可以获取更多附加（非核心）模块的外部网站...
+DevelopYourModuleDesc=一些开发您自己的模块的解决方案......
+URL=URL
+RelativeURL=相对URL
+BoxesAvailable=有可用的小工具
+BoxesActivated=小工具已启用
+ActivateOn=在…启用
+ActiveOn=在…已启用
+ActivatableOn=在…可启用
 SourceFile=来源文件
 AvailableOnlyIfJavascriptAndAjaxNotDisabled=仅当 JavaScript 启用时可用
-Required=必要
+Required=必要的
 UsedOnlyWithTypeOption=仅供某些议程选项使用
 Security=安全
 Passwords=密码
-DoNotStoreClearPassword=Encrypt passwords stored in database (NOT as plain-text). It is strongly recommended to activate this option.
-MainDbPasswordFileConfEncrypted=Encrypt database password stored in conf.php. It is strongly recommended to activate this option.
+DoNotStoreClearPassword=加密存储在数据库中的密码（不保存为纯文本）。强烈建议激活此选项。
+MainDbPasswordFileConfEncrypted=加密存储在 conf.php 中的数据库密码。强烈建议激活此选项。
 InstrucToEncodePass=要将 <b>conf.php</b> 文件中的密码加密，替换行 <br><b>$ dolibarr_main_db_pass="..."</b><br> 为 <br><b>$dolibarr_main_db_pass="crypted:%s"</b>
 InstrucToClearPass=要在<b>conf.php</b>文件中使用将明文密码，替换行<br><b>$ dolibarr_main_db_pass="crypted:..."</b><br>为<br><b>$dolibarr_main_db_pass="%s"</b>
-ProtectAndEncryptPdfFiles=Protect generated PDF files. This is NOT recommended as it breaks bulk PDF generation.
-ProtectAndEncryptPdfFilesDesc=PDF保护允许在PDF浏览器中阅读和打印PDF，但无法编辑和复制内容。请注意，使用此功能将导致生成全局多页合并PDF的功能无效(例如未支付账单)。
+ProtectAndEncryptPdfFiles=保护生成的 PDF 文件。不建议这样做，因为它会阻止批量 PDF 生成。
+ProtectAndEncryptPdfFilesDesc=PDF 文档的保护使其可以使用任何 PDF 浏览器进行阅读和打印。但是，无法再进行编辑和复制。请注意，使用此功能会使构建全局合并 PDF 不起作用。
 Feature=功能
 DolibarrLicense=授权
 Developpers=开发者/贡献者
 OfficialWebSite=Dolibarr官方网站
-OfficialWebSiteLocal=内部网站 (%s)
-OfficialWiki=Dolibarr文档/ Wiki
+OfficialWebSiteLocal=本地网站 (%s)
+OfficialWiki=Dolibarr文档/Wiki
 OfficialDemo=Dolibarr在线演示
-OfficialMarketPlace=官方市场提供外部模块/扩展
-OfficialWebHostingService=引用网络托管服务（云主机）
+OfficialMarketPlace=外部模块/插件的官方市场
+OfficialWebHostingService=可参考的网络托管服务商（云托管）
 ReferencedPreferredPartners=首选合作伙伴
 OtherResources=其他资源
 ExternalResources=外部资源
 SocialNetworks=社交网络
 SocialNetworkId=社交网络ID
-ForDocumentationSeeWiki=For user or developer documentation (Doc, FAQs...),<br>take a look at the Dolibarr Wiki:<br><b><a href="%s" target="_blank" rel="noopener noreferrer">%s</a></b>
-ForAnswersSeeForum=For any other questions/help, you can use the Dolibarr forum:<br><b><a href="%s" target="_blank" rel="noopener noreferrer">%s</a></b>
-HelpCenterDesc1=Here are some resources for getting help and support with Dolibarr.
-HelpCenterDesc2=此资源的一些部分，<b>仅有英文</b> 可用。
+ForDocumentationSeeWiki=要查找用户或开发人员文档（文档、常见问题解答...），请查看 Dolibarr Wiki：<br> <b> <a href="%s" target="_blank" rel="noopener noreferrer"> %s </a> 
+ForAnswersSeeForum=对于其他的任何问题/帮助，您可以使用 Dolibarr 论坛：<br> <b> <a href="%s" target="_blank" rel="noopener noreferrer"> %s </a> </b>
+HelpCenterDesc1=以下是获取 Dolibarr 帮助和支持的一些资源。
+HelpCenterDesc2=此资源的一些部分仅以<b>英文</b> 提供。
 CurrentMenuHandler=当前菜单处理程序
 MeasuringUnit=计量单位
 LeftMargin=左页边距
-TopMargin=顶页边距
+TopMargin=上页边距
 PaperSize=纸张类型
 Orientation=方向
 SpaceX=空间X.
 SpaceY=空间Y.
 FontSize=字体大小
 Content=内容
-ContentForLines=Content to display for each product or service (from variable __LINES__ of Content)
+ContentForLines=为每个产品或服务显示的内容（来自 Content 的变量 __LINES__）
 NoticePeriod=通知期
 NewByMonth=按月新增
 Emails=电子邮件
 EMailsSetup=电子邮件设置
-EMailsDesc=This page allows you to set parameters or options for email sending.
+EMailsDesc=此页面允许您设置电子邮件发送的参数或选项。
 EmailSenderProfiles=电子邮件发件人资料
-EMailsSenderProfileDesc=You can keep this section empty. If you enter some emails here, they will be added to the list of possible senders into the combobox when your write a new email.
+EMailsSenderProfileDesc=您可以将此部分留空。如果您在此处输入一些电子邮件地址，当您撰写新电子邮件时，您可以从可选的发件人列表组合框中选择。
 MAIN_MAIL_SMTP_PORT=SMTP/SMTPS 端口 ( php.ini 文件中的默认值：<b>%s</b>)
 MAIN_MAIL_SMTP_SERVER=SMTP/SMTPS 主机 ( php.ini 文件中的默认值：<b>%s</b>)
-MAIN_MAIL_SMTP_PORT_NotAvailableOnLinuxLike=SMTP/SMTPS 端口 ( Unix 类系统下未在 PHP 中定义)
-MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike=SMTP/SMTPS Host (Not defined into PHP on Unix-like systems)
-MAIN_MAIL_EMAIL_FROM=Sender email for automatic emails (default value in php.ini: <b>%s</b>)
-MAIN_MAIL_ERRORS_TO=Email used for error returns emails (fields 'Errors-To' in emails sent)
+MAIN_MAIL_SMTP_PORT_NotAvailableOnLinuxLike=SMTP/SMTPS 端口（类 Unix 系统上的 PHP 中未定义）
+MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike=SMTP/SMTPS 主机（类 Unix 系统上的 PHP 中未定义）
+MAIN_MAIL_EMAIL_FROM=自动电子邮件的发件人电子邮件地址（php.ini 中的默认值： <b> %s </b> ）
+MAIN_MAIL_ERRORS_TO=用于错误退信的电子邮件地址（已发送的电子邮件中的“错误退信”字段）
 MAIN_MAIL_AUTOCOPY_TO= 将所有已发送的电子邮件复制（密件抄送）到
 MAIN_DISABLE_ALL_MAILS=禁用所有电子邮件发送（出于测试目的或演示目的）
 MAIN_MAIL_FORCE_SENDTO=发送电子邮件至（替换实际的收件人，用于测试目的）
-MAIN_MAIL_ENABLED_USER_DEST_SELECT=Suggest emails of employees (if defined) into the list of predefined recipient when writing a new email
-MAIN_MAIL_SENDMODE=Email sending method
-MAIN_MAIL_SMTPS_ID=SMTP ID (if sending server requires authentication)
-MAIN_MAIL_SMTPS_PW=SMTP Password (if sending server requires authentication)
+MAIN_MAIL_ENABLED_USER_DEST_SELECT=在撰写新电子邮件时将员工的电子邮件（如果已定义）建议到预定义收件人列表中
+MAIN_MAIL_SENDMODE=电子邮件发送方式
+MAIN_MAIL_SMTPS_ID=SMTP 账号（如果发送服务器需要验证）
+MAIN_MAIL_SMTPS_PW=SMTP 密码（如果发送服务器需要验证）
 MAIN_MAIL_EMAIL_TLS=使用 TLS(SSL)加密
 MAIN_MAIL_EMAIL_STARTTLS=使用TLS（STARTTLS）加密
-MAIN_MAIL_EMAIL_SMTP_ALLOW_SELF_SIGNED=Authorise les certificats auto-signés
-MAIN_MAIL_EMAIL_DKIM_ENABLED=Use DKIM to generate email signature
-MAIN_MAIL_EMAIL_DKIM_DOMAIN=Email Domain for use with dkim
-MAIN_MAIL_EMAIL_DKIM_SELECTOR=dkim选择器名称
-MAIN_MAIL_EMAIL_DKIM_PRIVATE_KEY=Private key for dkim signing
-MAIN_DISABLE_ALL_SMS=Disable all SMS sending (for test purposes or demos)
+MAIN_MAIL_EMAIL_SMTP_ALLOW_SELF_SIGNED=允许自签名证书
+MAIN_MAIL_EMAIL_DKIM_ENABLED=使用 DKIM 生成电子邮件签名
+MAIN_MAIL_EMAIL_DKIM_DOMAIN=用于 DKIM 的电子邮件域名
+MAIN_MAIL_EMAIL_DKIM_SELECTOR=DKIM选择器名称
+MAIN_MAIL_EMAIL_DKIM_PRIVATE_KEY=DKIM签名的私钥
+MAIN_DISABLE_ALL_SMS=禁止所有的短信发送（用于测试或演示目的）
 MAIN_SMS_SENDMODE=短信发送方法
-MAIN_MAIL_SMS_FROM=Default sender phone number for SMS sending
-MAIN_MAIL_DEFAULT_FROMTYPE=Default sender email for manual sending (User email or Company email)
+MAIN_MAIL_SMS_FROM=发送短信的默认发件人电话号码
+MAIN_MAIL_DEFAULT_FROMTYPE=手动发送的默认发件人电子邮件地址（用户电子邮件或公司电子邮件）
 UserEmail=用户邮箱
-CompanyEmail=Company Email
-FeatureNotAvailableOnLinux=功能在 Unix 类系统下不可用。请在本地测试您的sendmail程序。
-FixOnTransifex=Fix the translation on the online translation platform of project
-SubmitTranslation=If the translation for this language is not complete or you find errors, you can correct this by editing files in directory <b>langs/%s</b> and submit your change to www.transifex.com/dolibarr-association/dolibarr/
-SubmitTranslationENUS=If translation for this language is not complete or you find errors, you can correct this by editing files into directory <b>langs/%s</b> and submit modified files on dolibarr.org/forum or, if you are a developer, with a PR on github.com/Dolibarr/dolibarr
+CompanyEmail=公司邮箱
+FeatureNotAvailableOnLinux=功能在类Unix系统下不可用。请在本地测试您的sendmail程序。
+FixOnTransifex=于在线翻译平台上修复项目翻译
+SubmitTranslation=如果该语言的翻译不完整或您发现错误，您可以通过编辑目录 <b> langs/%s </b> 中的文件来更正此问题，并将您的更改提交到 www.transifex.com/dolibarr-association/dolibarr/
+SubmitTranslationENUS=如果该语言的翻译不完整或您发现错误，您可以通过将编辑目录 <b> langs/%s </b> 下的文件并在 dolibarr.org/forum 上提交修改后的文件来纠正此问题，或者，如果您是开发人员，请在 github.com/Dolibarr/dolibarr 上提交 PR 
 ModuleSetup=模块设置
-ModulesSetup=模块设置
+ModulesSetup=模块/应用程序设置
 ModuleFamilyBase=系统
-ModuleFamilyCrm=Customer Relationship Management (CRM)
-ModuleFamilySrm=Vendor Relationship Management (VRM)
-ModuleFamilyProducts=Product Management (PM)
+ModuleFamilyCrm=客户关系管理 (CRM)
+ModuleFamilySrm=供应商关系管理 (VRM)
+ModuleFamilyProducts=产品管理（PM）
 ModuleFamilyHr=人力资源管理 (HR)
 ModuleFamilyProjects=项目/协同工作
 ModuleFamilyOther=其他
 ModuleFamilyTechnic=多模块工具
 ModuleFamilyExperimental=试验性模块
-ModuleFamilyFinancial=财务模块(会计/金库)
+ModuleFamilyFinancial=财务模块(会计/财务)
 ModuleFamilyECM=电子文档管理(ECM)
-ModuleFamilyPortal=Websites and other frontal application
-ModuleFamilyInterface=系统外部扩展接口
+ModuleFamilyPortal=网站和其他前台应用
+ModuleFamilyInterface=与外部系统的接口
 MenuHandlers=菜单处理程序
 MenuAdmin=菜单编辑器
-DoNotUseInProduction=请勿用于生产环境
-ThisIsProcessToFollow=Upgrade procedure:
+DoNotUseInProduction=不要在生产中使用
+ThisIsProcessToFollow=升级步骤：
 ThisIsAlternativeProcessToFollow=这是手动处理的替代设置：
 StepNb=第 %s 步
-FindPackageFromWebSite=Find a package that provides the features you need (for example on the official web site %s).
-DownloadPackageFromWebSite=Download package (for example from the official web site %s).
-UnpackPackageInDolibarrRoot=Unpack/unzip the packaged files into your Dolibarr server directory: <b>%s</b>
-UnpackPackageInModulesRoot=To deploy/install an external module, you must unpack/unzip the archive file into the server directory dedicated to external modules:<br><b>%s</b>
-SetupIsReadyForUse=Module deployment is finished. You must however enable and setup the module in your application by going to the page setup modules: <a href="%s">%s</a>.
-NotExistsDirect=未设置可选备用根目录。<br>
+FindPackageFromWebSite=查找提供您需要的功能的软件包（例如在官方网站 %s 上）。
+DownloadPackageFromWebSite=下载软件包（例如从官方网站 %s）。
+UnpackPackageInDolibarrRoot=将打包的软件包文件解压到 Dolibarr 服务器目录：<b> %s </b>
+UnpackPackageInModulesRoot=要部署/安装外部模块，您必须将存档文件解压缩到专用于外部模块的以下服务器目录：<br> <b> %s </b>
+SetupIsReadyForUse=模块部署已完成。但是，您必须在模块/应用设置页面来启用和设置模块： <a href="%s"> %s </a> 。
+NotExistsDirect=替代根目录未定义到现有目录。 <br>
 InfDirAlt=自 v3 版本开始，Dolibarr 可以定义备用根目录地址。这令您可以将插件和自定义模板保存至同一位置。<br>您只需在Dolibarr的根目录下创建一个目录(例如custom)。<br>
 InfDirExample=<br>然后在文件<strong> conf.php</strong>中声明它。<br> $ dolibarr_main_url_root_alt ='/ custom'<br> $ dolibarr_main_document_root_alt ='/ path / of / dolibarr / htdocs / custom'<br>如果这些行用“＃”注释，要启用它们，只需删除“＃”字符即可取消注释。
-YouCanSubmitFile=You can upload the .zip file of module package from here:
+YouCanSubmitFile=您可以从这里上传模块包的 .zip 文件：
 CurrentVersion=Dolibarr 当前版本
-CallUpdatePage=Browse to the page that updates the database structure and data: %s.
+CallUpdatePage=打开更新数据库结构和数据的页面：%s。
 LastStableVersion=最新稳定版
 LastActivationDate=最新激活日期
 LastActivationAuthor=最新激活作者
 LastActivationIP=最新激活IP
-LastActivationVersion=Latest activation version
+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>不允许使用空格<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>例如: 2007-01-31 第三方“TheCompany”的第99笔 %s ：</u> <br>
-GenericMaskCodes4b=<u>例如合作方创建于 2007-03-01:</u><br>
-GenericMaskCodes4c=<u>例如: 于 2007-03-1 建立的产品资料:</u><br>
-GenericMaskCodes5=格式掩码: <b>ABC{yy}{mm}-{000000}</b> 将生成编号 <b>ABC0701-000099</b><br> 格式掩码:<b>{0000+100}-ZZZ/{dd}/XXX</b> 将生成编号 <b>0199-ZZZ/31/XXX</b>
-GenericNumRefModelDesc=根据事先定义的格式掩码，返回一个可定制编号，详见说明。
-ServerAvailableOnIPOrPort=可用服务器地址: <b>%s:</b><b>%s</b>
-ServerNotAvailableOnIPOrPort=服务器地址: <b>%s:</b><b>%s</b> 不可用
+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=掩码中的所有其他字符将保持不变（EAN13 中第 13 位的 * 或 ? 除外）。 <br> 不允许使用空格。 <br> 在 EAN13 中，第 13 位最后一个 } 之后的最后一个字符应该是 * 或 ? 。它将被计算的校验和替换。 <br>
+GenericMaskCodes4a=<u>2007-01-31 第三方“TheCompany”的第99笔 %s 的示例：</u> <br>
+GenericMaskCodes4b= <u> 在 2007 年 3 月 1 日创建的第三方示例：</u> <br>
+GenericMaskCodes4c= <u> 在2007 年 3 月 1 日创建的产品示例：</u> <br>
+GenericMaskCodes5= <b> ABC{yy}{mm}-{000000} </b>  将生成  <b> ABC0701-000099 </b>  <br>  <b> {0000+100@1}-ZZZ/{dd}/XXX </b>  将生成  <b> 0199-ZZZ/31/XXX </b>  <br> <b> IN{yy}{mm}-{0000}-{t} </b> 将生成 <b> IN0701-0099-A </b> 如果公司类型为“Responsable Inscripto”且类型代码为“A_RI”
+GenericNumRefModelDesc=根据定义的掩码返回可自定义的数字。
+ServerAvailableOnIPOrPort=服务器在地址: <b>%s</b>端口<b>%s</b>上可用
+ServerNotAvailableOnIPOrPort=服务器在地址: <b>%s</b>端口<b>%s</b>上不可用
 DoTestServerAvailability=测试服务器连通性
-DoTestSend=测试发送
+DoTestSend=已启动测试
 DoTestSendHTML=测试发送 HTML
 ErrorCantUseRazIfNoYearInMask=错误，如果序列{yy}或{yyyy}不在掩码中，则不能使用选项@来重置计数器。
-ErrorCantUseRazInStartedYearIfNoYearMonthInMask=错误，格式掩码中标记 @ 必须与{yy}{mm}或{yyyy}{mm}同时使用。
+ErrorCantUseRazInStartedYearIfNoYearMonthInMask=错误，如果序列 {yy}{mm} 或 {yyyy}{mm} 不在掩码中，则无法使用选项 @。
 UMask=Unix/Linux/BSD 文件系统下新文件的 umask 参数。
-UMaskExplanation=定义服务器上 Dolibarr 创建文件的默认权限(例如上传的文件)。<br>它必须是八进制值(例如，0666就表示人人可读可写)。 <br>此参数对Windows服务器无效。
-SeeWikiForAllTeam=Take a look at the Wiki page for a list of contributors and their organization
-UseACacheDelay= 缓存导出响应的延迟时间(0或留空表示禁用缓存)
-DisableLinkToHelpCenter=Hide the link "<b>Need help or support</b>" on the login page
-DisableLinkToHelp=Hide the link to the online help "<b>%s</b>"
-AddCRIfTooLong=There is no automatic text wrapping, text that is too long will not display on documents. Please add carriage returns in the text area if needed.
-ConfirmPurge=Are you sure you want to execute this purge?<br>This will permanently delete all your data files with no way to restore them (ECM files, attached files...).
+UMaskExplanation=此参数允许您定义 Dolibarr 在服务器上创建的文件的默认权限（例如上传的文件）。 <br> 必须是八进制值（例如 0666 表示所有人都可以读写）。 <br> 此参数在 Windows 服务器上无效。
+SeeWikiForAllTeam=查看 Wiki 页面以获取贡献者及其组织的列表
+UseACacheDelay= 以秒为单位缓存导出响应的延迟（0 或空无缓存）
+DisableLinkToHelpCenter=在登录页面隐藏链接“<b> 需要帮助或支持 </b>”
+DisableLinkToHelp=隐藏在线帮助链接“<b> %s </b>”
+AddCRIfTooLong=没有自动换行功能，太长的文本会无法显示在文档上。如果需要，请在文本区域添加回车来换行。
+ConfirmPurge=您确定要执行此清除吗？ <br> 这将永久性删除您的所有数据文件且无法恢复它们（ECM 文件、附件...）。
 MinLength=最小长度
 LanguageFilesCachedIntoShmopSharedMemory=文件 .lang 已加载到共享内存
 LanguageFile=语言文件
-ExamplesWithCurrentSetup=Examples with current configuration
-ListOfDirectories=开源办公软件文档模板目录列表
-ListOfDirectoriesForModelGenODT=包含开源办公软件的格式的文档的模板目录列表。<br><br>请在此填写完整的目录路径。<br>每填写一个目录路径结尾按回车换行。<br>添加一个 GED 模块目录, 如下 <b>DOL_DATA_ROOT/ecm/yourdirectoryname</b>。<br><br>该目录中的文件格式必须是 <b>.odt</b> 格式或 <b>.ods</b>格式。
-NumberOfModelFilesFound=Number of ODT/ODS template files found in these directories
-ExampleOfDirectoriesForModelGen=Examples of syntax:<br>c:\\myapp\\mydocumentdir\\mysubdir<br>/home/myapp/mydocumentdir/mysubdir<br>DOL_DATA_ROOT/ecm/ecmdir
-FollowingSubstitutionKeysCanBeUsed=<br>要知道如何建立您的ODT文件范本并储存在指定目录，请至wiki网站：
+ExamplesWithCurrentSetup=当前配置的示例
+ListOfDirectories=OpenDocument模板目录列表
+ListOfDirectoriesForModelGenODT=包含OpenDocument格式的文档的模板目录列表。<br><br>请在此填写完整的目录路径。<br>每填写一个目录路径结尾按回车换行。<br>添加一个 GED 模块目录, 如下 <b>DOL_DATA_ROOT/ecm/yourdirectoryname</b>。<br><br>该目录中的文件格式必须是 <b>.odt</b> 格式或 <b>.ods</b>格式。
+NumberOfModelFilesFound=在这些目录中发现的 ODT/ODS 模板文件数量
+ExampleOfDirectoriesForModelGen=语法示例： <br> c:\\myapp\\mydocumentdir\\mysubdir <br> /home/myapp/mydocumentdir/mysubdir <br> DOL_DATA_ROOT/ecm/ecmdir
+FollowingSubstitutionKeysCanBeUsed=<br>要知道如何建立您的ODT文件范本并储存在指定目录，请访问wiki网站：
 FullListOnOnlineDocumentation=http://wiki.dolibarr.org/index.php/Create_an_ODT_document_template
-FirstnameNamePosition=姓 /名 位置顺序
-DescWeather=The following images will be shown on the dashboard when the number of late actions reach the following values:
+FirstnameNamePosition=名称/姓氏的位置顺序
+DescWeather=当延迟操作的数量达到以下值时，主看板上将显示以下图标：
 KeyForWebServicesAccess=使用 SOAP 服务的密钥 (webservices 中的"dolibarrkey"参数)
-TestSubmitForm=可在以下表单输入资料来测试
-ThisForceAlsoTheme=Using this menu manager will also use its own theme whatever the user choice. Also this menu manager specialized for smartphones does not work on all smartphone. Use another menu manager if you experience problems with yours.
-ThemeDir=主题目录
-ConnectionTimeout=Connection timeout
-ResponseTimeout=响应超时
-SmsTestMessage=测试消息从 __PHONEFROM__ 至 __ PHONETO__
-ModuleMustBeEnabledFirst=必须先行激活启用 <b>%s</b> 模块如果你需要使用这个功能的话。
+TestSubmitForm=输入测试表单
+ThisForceAlsoTheme=无论用户如何设置，使用此菜单管理器将同时使用其主题。同时此菜单管理器专为智能手机而设计但并不适用于所有手机。如果您的手机上使用有问题请选择其它主题。
+ThemeDir=皮肤目录
+ConnectionTimeout=连接已超时
+ResponseTimeout=响应已超时
+SmsTestMessage=从 __PHONEFROM__ 至 __ PHONETO__的测试消息
+ModuleMustBeEnabledFirst=如果你需要使用这个功能必须先行激活启用 <b>%s</b> 模块。
 SecurityToken=保护URL链接的密钥
-NoSmsEngine=No SMS sender manager available. A SMS sender manager is not installed with the default distribution because they depend on an external vendor, but you can find some on %s
-PDF=PDF格式
-PDFDesc=Global options for PDF generation
-PDFOtherDesc=PDF Option specific to some modules
-PDFAddressForging=Rules for address section
-HideAnyVATInformationOnPDF=Hide all information related to Sales Tax / VAT
-PDFRulesForSalesTax=销售税/增值税规则
+NoSmsEngine=没有可用的短信发送管理器。短信发送管理器在默认发布版本没有安装 (因为他们依赖于一个外部供应商) 但你能在 %s找到一些
+PDF=PDF
+PDFDesc=PDF生成的全局选项
+PDFOtherDesc=某些模块的PDF特定选项
+PDFAddressForging=地址部分的规则
+HideAnyVATInformationOnPDF=隐藏与销售税/VAT相关的所有信息
+PDFRulesForSalesTax=销售税/VAT规则
 PDFLocaltax=%s的规则
-HideLocalTaxOnPDF=Hide %s rate in column Sale Tax / VAT
-HideDescOnPDF=Hide products description
-HideRefOnPDF=Hide products ref.
-HideDetailsOnPDF=Hide product lines details
+HideLocalTaxOnPDF=在销售税/VAT列中隐藏 %s 税率
+HideDescOnPDF=隐藏产品描述
+HideRefOnPDF=隐藏产品参考
+HideDetailsOnPDF=隐藏产品行详细信息
 PlaceCustomerAddressToIsoLocation=使用法国标准位置（La Poste）作为客户地址位置
 Library=资料库
-UrlGenerationParameters=URL地址的保护参数
+UrlGenerationParameters=用于保护 URL 的参数
 SecurityTokenIsUnique=为每个URL使用唯一的securekey参数值
-EnterRefToBuildUrl=输入对象 %s 的编号
-GetSecuredUrl=获取算得的URL地址
-ButtonHideUnauthorized=Hide unauthorized action buttons also for internal users (just greyed otherwise)
+EnterRefToBuildUrl=输入对象 %s 的参考
+GetSecuredUrl=获取计算的 URL
+ButtonHideUnauthorized=对内部用户隐藏未经授权的操作按钮（否则为变灰）
 OldVATRates=以前的增值税率(VAT)
-NewVATRates=新建增值税率(VAT)
-PriceBaseTypeToChange=设置了基本参考价值的产品的价格
-MassConvert=Launch bulk conversion
-PriceFormatInCurrentLanguage=Price Format In Current Language
+NewVATRates=新的增值税率(VAT)
+PriceBaseTypeToChange=根据已在…定义的基础参考来修改价格
+MassConvert=启动批量转换
+PriceFormatInCurrentLanguage=当前语言的价格格式
 String=字符串
-String1Line=String (1 line)
+String1Line=字符串（1 行）
 TextLong=长文本
-TextLongNLines=Long text (n lines)
-HtmlText=Html文字
+TextLongNLines=长文本（n 行）
+HtmlText=Html文本
 Int=整型
 Float=浮点型
 DateAndTime=日期与小时
@@ -445,204 +445,204 @@ ExtrafieldSelect = 选择列表
 ExtrafieldSelectList = 从表格中选取
 ExtrafieldSeparator=分隔符（不是字段）
 ExtrafieldPassword=密码
-ExtrafieldRadio=Radio buttons (one choice only)
+ExtrafieldRadio=单选按钮（仅一种选择）
 ExtrafieldCheckBox=复选框
 ExtrafieldCheckBoxFromList=表格中的复选框
-ExtrafieldLink=连接到对象
-ComputedFormula=计算字段
-ComputedFormulaDesc=You can enter here a formula using other properties of object or any PHP coding to get a dynamic computed value. You can use any PHP compatible formulas including the "?" condition operator, and following global object: <strong>$db, $conf, $langs, $mysoc, $user, $object</strong>.<br><strong>WARNING</strong>: Only some properties of $object may be available. If you need a properties not loaded, just fetch yourself the object into your formula like in the second example.<br>Using a computed field means you can't enter yourself any value from interface. Also, if there is a syntax error, the formula may return nothing.<br><br>Example of formula:<br>$object->id < 10 ? round($object->id / 2, 2): ($object->id + 2 * $user->id) * (int) substr($mysoc->zip, 1, 2)<br><br>Example to reload object<br>(($reloadedobj = new Societe($db)) && ($reloadedobj->fetchNoCompute($obj->id ? $obj->id: ($obj->rowid ? $obj->rowid: $object->id)) > 0)) ? $reloadedobj->array_options['options_extrafieldkey'] * $reloadedobj->capital / 5: '-1'<br><br>Other example of formula to force load of object and its parent object:<br>(($reloadedobj = new Task($db)) && ($reloadedobj->fetchNoCompute($object->id) > 0) && ($secondloadedobj = new Project($db)) && ($secondloadedobj->fetchNoCompute($reloadedobj->fk_project) > 0)) ? $secondloadedobj->ref: 'Parent project not found'
-Computedpersistent=Store computed field
-ComputedpersistentDesc=Computed extra fields will be stored in the database, however, the value will only be recalculated when the object of this field is changed. If the computed field depends on other objects or global data this value might be wrong!!
-ExtrafieldParamHelpPassword=Leaving this field blank means this value will be stored without encryption (field must be only hidden with star on screen).<br>Set  'auto' to use the default encryption rule to save password into database (then value read will be the hash only, no way to retrieve original value)
-ExtrafieldParamHelpselect=List of values must be lines with format key,value (where key can't be '0')<br><br> for example: <br>1,value1<br>2,value2<br>code3,value3<br>...<br><br>In order to have the list depending on another complementary attribute list:<br>1,value1|options_<i>parent_list_code</i>:parent_key<br>2,value2|options_<i>parent_list_code</i>:parent_key <br><br>In order to have the list depending on another list:<br>1,value1|<i>parent_list_code</i>:parent_key<br>2,value2|<i>parent_list_code</i>:parent_key
-ExtrafieldParamHelpcheckbox=List of values must be lines with format key,value (where key can't be '0')<br><br> for example: <br>1,value1<br>2,value2<br>3,value3<br>...
-ExtrafieldParamHelpradio=List of values must be lines with format key,value (where key can't be '0')<br><br> for example: <br>1,value1<br>2,value2<br>3,value3<br>...
-ExtrafieldParamHelpsellist=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filtersql<br>Example: c_typent:libelle:id::filtersql<br><br>- id_field is necessarly a primary int key<br>- filtersql is a SQL condition. It can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter which is the current id of current object<br>To use a SELECT into the filter use the keyword $SEL$ to bypass anti-injection protection.<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
-ExtrafieldParamHelpchkbxlst=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filtersql<br>Example: c_typent:libelle:id::filtersql<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
-ExtrafieldParamHelplink=Parameters must be ObjectName:Classpath<br>Syntax: ObjectName:Classpath
-ExtrafieldParamHelpSeparator=Keep empty for a simple separator<br>Set this to 1 for a collapsing separator (open by default for new session, then status is kept for each user session)<br>Set this to 2 for a collapsing separator (collapsed by default for new session, then status is kept fore each user session)
-LibraryToBuildPDF=已使用资料库以支持生成PDF文件
-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=短信
-LinkToTestClickToDial=输入一个电话号码来为用户显示网络电话网址测试功能 <strong>%s</strong>
+ExtrafieldLink=链接到对象
+ComputedFormula=计算出的字段
+ComputedFormulaDesc=您可以在此处使用对象的其他属性或任何 PHP 编码输入公式，以获取动态计算值。您可以使用任何与 PHP 兼容的公式，包括“？”条件运算符和以下全局对象： <strong> $db, $conf, $langs, $mysoc, $user, $object </strong> 。 <br> <strong> 警告 </strong> : 只有 $object 的某些属性可用。如果您需要未加载的属性，只需将对象放入您的公式中，就像在第二个示例中一样。 <br> 使用计算域意味着您不能从界面输入任何值。此外，如果存在语法错误，公式可能不会返回任何内容。 <br> <br> 公式示例：<br> $object->id < 10 ? round($object-> id / 2, 2): ($object->id + 2 * $user->id) * (int) substr($mysoc->zip, 1, 2 ) <br> <br> 重新加载对象的示例 <br> (($reloadedobj = new Societe($db)) && ($reloadedobj->fetchNoCompute($obj->id ? $obj->id: ($obj->rowid ? $obj- >rowid: $object->id)) > 0)) ? $reloadedobj->array_options['options_extrafieldkey'] * $reloadedobj->capital / 5: '-1' <br> <br> 其他强制加载对象及其父对象的公式示例：<br> (($reloadedobj = new Task($db )) && ($reloadedobj->fetchNoCompute($object->id) > 0) && ($secondloadedobj = new Project($db)) && ($secondloadedobj->fetchNoCompute($reloadedobj->fk_project) > 0)) ? $secondloadedobj->ref: '未找到父项目'
+Computedpersistent=存储计算出的域
+ComputedpersistentDesc=计算出的额外字段将存储在数据库中，但是，只有在更改该字段的对象时才会重新计算该值。如果计算域依赖于其他对象或全局数据，这个值可能是错误的！！
+ExtrafieldParamHelpPassword=将此字段留空意味着该值将在不加密的情况下存储（字段必须仅在屏幕上用星号隐藏）。 <br> 设置“auto”以使用默认加密规则将密码保存到数据库中（之后读取的值将只是哈希值，无法检索原始值）
+ExtrafieldParamHelpselect=值列表必须是格式为键/值对的行（其中键不能为'0'）<br> <br>\n例如： <br>  1，value1<br> 2，value2 <br> code3，value3 <br>... <br> <br>\n 为了使列表具有另一个补充属性列表： <br> 1，value1 | options_<i>parent_list_code </i>：parent_key <br> 2，value2 | options_<i>parent_list_code</i> ：parent_key<br><br>\n为了使列表依赖于另一个列表：   <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 <br> ...
+ExtrafieldParamHelpradio=值列表必须是格式为 键/值 的对（其中 键不能为 '0'）1 2 例如：3 1,value1 4 2,value2 5 3,value3 6 ...
+ExtrafieldParamHelpsellist=值列表来自表 <br> 语法：table_name:label_field:id_field::filtersql <br> 示例：c_typent:libelle:id::filtersql <br> <br> - id_field 必须是主 int 键 <br> -sql 过滤器是 SQL 条件。可以是一个简单的测试（例如 active=1），只显示活动值 <br> 您也可以在过滤器中使用 $ID$，它是当前对象 <br> 的当前 ID 要在过滤器中使用 SELECT，请使用关键字 $SEL$ 来绕过防喷油保护。 <br> 如果要过滤额外字段，请使用语法 extra.fieldcode=... （其中字段代码是额外字段的代码） <br> <br> 为了使列表依赖于另一个补充属性列表： <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> <br> 过滤器可以是一个简单的测试（例如 active=1），只显示活动值 <br>也可以在过滤器中使用 $ID$ 女巫是当前对象的当前 id <br> 要在过滤器中进行 SELECT 使用 $SEL$ <br> 如果要过滤额外字段，请使用语法 extra.fieldcode=... （其中字段代码是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=用于 PDF 生成的库
+LocalTaxDesc=一些国家/地区可能对每个发票行征收两到三个税。如果是这种情况，请选择第二和第三税的类型及其税率。可能的类型有： <br> 1：对不含增值税的产品和服务征收地方税（按不含税金额计算地方税） <br> 2：对含增值税的产品和服务征收地方税（按金额+主要税计算地方税） <br> 3：不含增值税产品适用地方税（按不含税金额计算当地税） <br> 4：含增值税产品适用当地税（按金额+主要增值税计算当地税） <br> 5：不含增值税服务适用当地税（按当地税计算不含税的金额）<br> 6：包括增值税在内的服务适用地方税（地方税按金额 + 税款计算）
+SMS=SMS
+LinkToTestClickToDial=输入一个电话号码来为用户显示ClickToDial网址测试功能 <strong>%s</strong>
 RefreshPhoneLink=刷新链接
-LinkToTest=为用户生成的可访问链接<strong>%s</strong> (单击电话号码来测试)
-KeepEmptyToUseDefault=不填表示使用默认值
-KeepThisEmptyInMostCases=In most cases, you can keep this field empy.
+LinkToTest=为用户 <strong> %s </strong> 生成的可点击链接（点击电话号码进行测试）
+KeepEmptyToUseDefault=留空以使用默认值
+KeepThisEmptyInMostCases=在大多数情况下，您可以将此字段保留为空。
 DefaultLink=默认链接
 SetAsDefault=设为默认
-ValueOverwrittenByUserSetup=警告，此设置可能被用户设置所覆盖(用户可以设置各自的网络电话链接)
-ExternalModule=External module
-InstalledInto=Installed into directory %s
-BarcodeInitForThirdparties=Mass barcode init for third-parties
+ValueOverwrittenByUserSetup=警告，此设置可能被用户设置所覆盖(用户可以设置各自的clicktodial链接)
+ExternalModule=外部模块
+InstalledInto=已安装到目录 %s
+BarcodeInitForThirdparties=第三方条码批量初始化
 BarcodeInitForProductsOrServices=产品或服务条码批量初始化或重置
-CurrentlyNWithoutBarCode=目前，您在<strong> %s </ strong> %s上没有定义条形码时有<strong> %s </ strong>记录。
-InitEmptyBarCode=Init value for next %s empty records
-EraseAllCurrentBarCode=抹掉现存所有条码值
+CurrentlyNWithoutBarCode=目前，您在 <strong> %s </strong> %s 上有未定义条形码的 <strong> %s </strong> 记录。
+InitEmptyBarCode=%s 空条码的初始值
+EraseAllCurrentBarCode=删除所有当前条码值
 ConfirmEraseAllCurrentBarCode=您确定要删除所有当前条形码值吗？ 
-AllBarcodeReset=所有现存条码值已经被删除
-NoBarcodeNumberingTemplateDefined=No numbering barcode template enabled in the Barcode module setup.
+AllBarcodeReset=所有当前条码值已经被删除
+NoBarcodeNumberingTemplateDefined=条码模块设置中未启用条码编号模板。
 EnableFileCache=启用文件缓存
-ShowDetailsInPDFPageFoot=Add more details into footer, such as company address or manager names (in addition to professional ids, company capital and VAT number).
+ShowDetailsInPDFPageFoot=在页脚中添加更多详细信息，例如公司地址或经理姓名（除资格ID、公司资本和增值税号外）。
 NoDetails=页脚中没有其他详细信息
 DisplayCompanyInfo=显示公司地址
 DisplayCompanyManagers=显示经理姓名
 DisplayCompanyInfoAndManagers=显示公司地址和经理姓名
-EnableAndSetupModuleCron=If you want to have this recurring invoice generated automatically, module *%s* must be enabled and correctly setup. Otherwise, generation of invoices must be done manually from this template using the *Create* button. Note that even if you enabled automatic generation, you can still safely launch manual generation. Generation of duplicates for the same period is not possible.
-ModuleCompanyCodeCustomerAquarium=%s后跟客户会计代码的客户代码
-ModuleCompanyCodeSupplierAquarium=%s后跟供应商会计代码的合作方供应商代码
+EnableAndSetupModuleCron=如果您希望自动生成此定期发票，则必须启用并正确设置模块 *%s*。否则，必须使用 *创建* 按钮从该模板手动生成发票。请注意，即使您启用了自动生成，您仍然可以安全地启动手动生成，而不会在同一时期生成重复项。
+ModuleCompanyCodeCustomerAquarium=%s后跟客户代码作为记账科目代码
+ModuleCompanyCodeSupplierAquarium=%s后跟供应商代码作为供应商记账科目代码
 ModuleCompanyCodePanicum=返回一个空的科目代码
-ModuleCompanyCodeDigitaria=Returns a compound accounting code according to the name of the third party. The code consists of a prefix that can be defined in the first position followed by the number of characters defined in the third party code.
-ModuleCompanyCodeCustomerDigitaria=%s followed by the truncated customer name by the number of characters: %s for the customer accounting code.
-ModuleCompanyCodeSupplierDigitaria=%s followed by the truncated supplier name by the number of characters: %s for the supplier accounting code.
-Use3StepsApproval=默认情况下，需要由2个不同的用户创建和批准采购订单（一步/用户创建和一步/用户批准。请注意，如果用户同时拥有创建和批准权限，则一步/用户就足够了） 。如果金额高于专用值，您可以要求使用此选项引入第三步/用户批准（因此需要3个步骤：1 =确认，2 =首次批准，3 =如果金额足够则为第二批准）。 <br>如果一个批准（2个步骤）足够，则将其设置为空，如果始终需要第二个批准（3个步骤），则将其设置为非常低的值（0.1）。
-UseDoubleApproval=当金额（不含税金）高于......时，使用3步批准
-WarningPHPMail=WARNING: The setup to send emails from the application is using the default generic setup. It is often better to setup outgoing emails to use the email server of your Email Service Provider instead of the default setup for several reasons:
-WarningPHPMailA=- Using the server of the Email Service Provider increases the trustability of your email, so it increases the deliverablity without being flagged as SPAM
-WarningPHPMailB=- Some Email Service Providers (like Yahoo) do not allow you to send an email from another server than their own server. Your current setup uses the server of the application to send email and not the server of your email provider, so some recipients (the one compatible with the restrictive DMARC protocol), will ask your email provider if they can accept your email and some email providers (like Yahoo) may respond "no" because the server is not theirs, so few of your sent Emails may not be accepted for delivery (be careful also of your email provider's sending quota).
-WarningPHPMailC=- Using the SMTP server of your own Email Service Provider to send emails is also interesting so all emails sent from application will also be saved into your "Sent" directory of your mailbox.
-WarningPHPMailD=Also, it is therefore recommended to change the sending method of e-mails to the value "SMTP". If you really want to keep the default "PHP" method to send emails, just ignore this warning, or remove it by setting the MAIN_HIDE_WARNING_TO_ENCOURAGE_SMTP_SETUP constant to 1 in Home - Setup - Other.
+ModuleCompanyCodeDigitaria=根据第三方名称返回复合科目代码。该代码由一个可以在第一个位置定义的前缀和在第三方代码中定义的字符组成。
+ModuleCompanyCodeCustomerDigitaria=%s 后跟按字符数截断的客户名称：%s 作为客户科目代码。
+ModuleCompanyCodeSupplierDigitaria=%s 后跟按字符数截断的供应商名称：%s 作为供应商科目代码。
+Use3StepsApproval=默认情况下，需要由2个不同的用户创建和审批采购订单（一个步骤/用户创建和一个步骤/用户审批。请注意，如果用户同时拥有创建和审批权限，则一个步骤/用户就足够了） 。如果金额高于特定值，您可以要求使用此选项引入第三个步骤/用户审批（因此需要3个步骤：1 =确认，2 =首次审批，3 =如果金额足够则二次审批）。 <br>如果一次审批（2个步骤）足够，则将其设置为空，如果始终需要二次审批（3个步骤），则将其设置为非常低的值（0.1）。
+UseDoubleApproval=当金额（不含税）高于...时，使用 3 步审批
+WarningPHPMail=警告：从应用程序发送电子邮件的设置正使用默认的通用设置。将外发电子邮件设置为使用电子邮件服务提供商的电子邮件服务器通常比默认设置更好，原因如下：
+WarningPHPMailA=- 使用电子邮件服务提供商的服务器可以提高您电子邮件的可信度，因此它可以提高可传递性而不会被标记为垃圾邮件
+WarningPHPMailB=- 一些电子邮件服务提供商（如雅虎）不允许您从其他服务器而不是他们自己的服务器发送电子邮件。您当前的设置使用应用程序的服务器而不是您的电子邮件提供商的服务器来发送电子邮件，因此某些收件人（与限制性 DMARC 协议兼容的）会询问您的电子邮件提供商他们是否可以接受您的电子邮件，某些电子邮件提供商（如雅虎）可能会回答“不”，因为发送服务器不是他们的，所以您发送的电子邮件中有少数可能不被接受（还要注意您的电子邮件提供商的发送配额）。
+WarningPHPMailC=- 使用您自己的电子邮件服务提供商的 SMTP 服务器发送电子邮件也很有趣，因为从应用程序发送的所有电子邮件也将保存到您邮箱的“已发送”目录中。
+WarningPHPMailD=此外，因此建议将电子邮件的发送方法更改为值“SMTP”。如果您真的想保留默认的“PHP”方法来发送电子邮件，只需忽略此警告，或通过在 主页 - 设置 - 其他 中将 MAIN_HIDE_WARNING_TO_ENCOURAGE_SMTP_SETUP 常量设置为 1 来隐藏它。
 WarningPHPMail2=如果您的电子邮件SMTP提供商需要将电子邮件客户端限制为某些IP地址（非常罕见），则这是您的ERP CRM应用程序的邮件用户代理（MUA）的IP地址：<strong> %s</strong>。
-WarningPHPMailSPF=If the domain name in your sender email address is protected by a SPF record (ask your domain name registar), you must add the following IPs in the SPF record of the DNS of your domain: <strong>%s</strong>.
-ActualMailSPFRecordFound=Actual SPF record found (for email %s) : %s
-ClickToShowDescription=单击以显示描述
+WarningPHPMailSPF=如果您的发件人电子邮件地址域受 SPF 记录保护（询问您的域名注册商），您必须在您域名的 DNS 记录中添加以下 IP的 SPF 记录： <strong> %s </strong> 。
+ActualMailSPFRecordFound=实际找到的 SPF 记录（对于电子邮件 %s）：%s
+ClickToShowDescription=点击以显示描述
 DependsOn=该模块需要模块(集)
 RequiredBy=本模块被以下模块(集)需要
-TheKeyIsTheNameOfHtmlField=This is the name of the HTML field. Technical knowledge is required to read the content of the HTML page to get the key name of a field.
-PageUrlForDefaultValues=You must enter the relative path of the page URL. If you include parameters in URL, the default values will be effective if all parameters are set to same value.
-PageUrlForDefaultValuesCreate=<br>Example:<br>For the form to create a new third party, it is <strong>%s</strong>.<br>For URL of external modules installed into custom directory, do not include the "custom/", so use path like <strong>mymodule/mypage.php</strong> and not custom/mymodule/mypage.php.<br>If you want default value only if url has some parameter, you can use <strong>%s</strong>
-PageUrlForDefaultValuesList=<br>Example:<br>For the page that lists third parties, it is <strong>%s</strong>.<br>For URL of external modules installed into custom directory, do not include the "custom/" so use a path like <strong>mymodule/mypagelist.php</strong> and not custom/mymodule/mypagelist.php.<br>If you want default value only if url has some parameter, you can use <strong>%s</strong>
-AlsoDefaultValuesAreEffectiveForActionCreate=Also note that overwritting default values for form creation works only for pages that were correctly designed (so with parameter action=create or presend...)
+TheKeyIsTheNameOfHtmlField=这是 HTML 字段的名称。需要技术知识才能读取 HTML 页面的内容以获取字段的键名。
+PageUrlForDefaultValues=您必须输入页面 URL 的相对路径。如果您在 URL 中包含参数，则如果所有参数都设置为相同的值，则默认值将生效。
+PageUrlForDefaultValuesCreate= <br> 示例：<br> 用于创建新的第三方的表单，它是 <strong> %s </strong> 。 <br> 对于安装到自定义目录的外部模块的 URL，不要包含“custom/”，因此使用 <strong> mymodule/mypage.php </strong> 之类的路径，而不是 custom/mymodule/mypage.php。 <br> 如果只有在 url 有一些参数时才需要默认值，你可以使用 <strong> %s </strong>
+PageUrlForDefaultValuesList= <br> 示例：<br> 对于列出第三方的页面，它是 <strong> %s </strong> 。 <br> 对于安装到自定义目录的外部模块的 URL，不要包含“custom/”，因此请使用 <strong> mymodule/mypagelist.php </strong> 之类的路径，而不是 custom/mymodule/mypagelist.php。 <br> 如果只有在 url 有一些参数时才需要默认值，你可以使用 <strong> %s </strong>
+AlsoDefaultValuesAreEffectiveForActionCreate=另请注意，覆盖表单创建的默认值仅适用于正确设计的页面（因此请使用参数 action=create 或 presend...）
 EnableDefaultValues=启用自定义默认值
-EnableOverwriteTranslation=启用覆盖翻译
-GoIntoTranslationMenuToChangeThis=A translation has been found for the key with this code. To change this value, you must edit it from Home-Setup-translation.
+EnableOverwriteTranslation=启用翻译覆盖
+GoIntoTranslationMenuToChangeThis=已使用此代码找到此键的翻译。要更改此值，您必须通过 主页-设置-翻译 对其进行编辑。
 WarningSettingSortOrder=警告，如果字段是未知字段，则在列表页面上设置默认排序顺序可能会导致技术错误。如果遇到此类错误，请返回此页面以删除默认排序顺序并恢复默认行为。
 Field=字段
-ProductDocumentTemplates=文档模板以生成产品文档
-FreeLegalTextOnExpenseReports=费用报告中的免费法律文本
-WatermarkOnDraftExpenseReports=草稿费用报告上的水印
-ProjectIsRequiredOnExpenseReports=The project is mandatory for entering an expense report
-PrefillExpenseReportDatesWithCurrentMonth=Pre-fill start and end dates of new expense report with start and end dates of the current month
-ForceExpenseReportsLineAmountsIncludingTaxesOnly=Force the entry of expense report amounts always in amount with taxes
+ProductDocumentTemplates=生成产品文档的文档模板
+FreeLegalTextOnExpenseReports=费用报表中的的自由法律文本
+WatermarkOnDraftExpenseReports=草稿费用报表上的水印
+ProjectIsRequiredOnExpenseReports=该项目是输入费用报表的强制性项目
+PrefillExpenseReportDatesWithCurrentMonth=用当月的开始和结束日期预先填写新费用报表的开始和结束日期
+ForceExpenseReportsLineAmountsIncludingTaxesOnly=强制以含税金额输入费用报表金额
 AttachMainDocByDefault=如果要在默认情况下将主文档附加到电子邮件，请将此项设置为1（如果适用）
 FilesAttachedToEmail=附加文件
 SendEmailsReminders=通过电子邮件发送议程提醒
 davDescription=设置WebDAV服务器
 DAVSetup=模块DAV的设置
-DAV_ALLOW_PRIVATE_DIR=Enable the generic private directory (WebDAV dedicated directory named "private" - login required)
-DAV_ALLOW_PRIVATE_DIRTooltip=The generic private directory is a WebDAV directory anybody can access with its application login/pass.
-DAV_ALLOW_PUBLIC_DIR=Enable the generic public directory (WebDAV dedicated directory named "public" - no login required)
-DAV_ALLOW_PUBLIC_DIRTooltip=The generic public directory is a WebDAV directory anybody can access (in read and write mode), with no authorization required (login/password account).
-DAV_ALLOW_ECM_DIR=Enable the DMS/ECM private directory (root directory of the DMS/ECM module - login required)
-DAV_ALLOW_ECM_DIRTooltip=The root directory where all files are manually uploaded when using the DMS/ECM module. Similarly as access from the web interface, you will need a valid login/password with adecuate permissions to access it.
+DAV_ALLOW_PRIVATE_DIR=启用通用私有目录（名为“private”的 WebDAV 专用目录 - 需要登录）
+DAV_ALLOW_PRIVATE_DIRTooltip=通用私有目录是任何人都可以通过其应用程序登录名/密码访问的 WebDAV 目录。
+DAV_ALLOW_PUBLIC_DIR=启用通用公共目录（名为“public”的 WebDAV 专用目录 - 无需登录）
+DAV_ALLOW_PUBLIC_DIRTooltip=通用公共目录是任何人都可以访问的 WebDAV 目录（可读可写模式），无需授权（用户名/密码登陆）。
+DAV_ALLOW_ECM_DIR=启用 DMS/ECM 私有目录（DMS/ECM 模块的根目录 - 需要登录）
+DAV_ALLOW_ECM_DIRTooltip=使用 DMS/ECM 模块时手动上传所有文件的根目录。与从 Web 界面访问类似，您需要具有适当权限的有效登录名/密码才能访问它。
 # Modules
 Module0Name=用户和组
-Module0Desc=用户/员工和组管理
-Module1Name=合作伙伴
-Module1Desc=Companies and contacts management (customers, prospects...)
+Module0Desc=用户/雇员和组管理
+Module1Name=第三方
+Module1Desc=公司和联系人管理（客户、潜在客户......）
 Module2Name=商业交易
-Module2Desc=交易管理
-Module10Name=Accounting (simplified)
-Module10Desc=Simple accounting reports (journals, turnover) based on database content. Does not use any ledger table.
-Module20Name=报价
-Module20Desc=报价管理模块
-Module22Name=Mass Emailings
-Module22Desc=Manage bulk emailing
+Module2Desc=商业交易管理
+Module10Name=会计（简化）
+Module10Desc=基于数据库内容的简单会计报告（日常报表、营业额）。不使用任何复式账本。
+Module20Name=提案
+Module20Desc=商业提案管理模块
+Module22Name=群发电子邮件
+Module22Desc=群发电子邮件管理
 Module23Name=能耗
-Module23Desc=能耗监测
-Module25Name=Sales Orders
-Module25Desc=Sales order management
+Module23Desc=监测能源消耗
+Module25Name=销售订单
+Module25Desc=销售订单管理
 Module30Name=发票
-Module30Desc=Management of invoices and credit notes for customers. Management of invoices and credit notes for suppliers
+Module30Desc=管理客户发票和贷记单。管理供应商发票和贷记单
 Module40Name=供应商
-Module40Desc=Vendors and purchase management (purchase orders and billing of supplier invoices)
+Module40Desc=供应商和采购管理（采购订单和供应商发票开票）
 Module42Name=调试日志
-Module42Desc=记录设施（文件，系统日志，......）。此类日志用于技术/调试目的。
-Module43Name=Debug Bar
-Module43Desc=A tool for developper adding a debug bar in your browser.
+Module42Desc=日志设施（文件，系统日志，......）。此类日志用于技术/调试目的。
+Module43Name=调试栏
+Module43Desc=为开发人员在浏览器中添加调试栏的工具。
 Module49Name=编辑器
 Module49Desc=编辑器管理
 Module50Name=产品
-Module50Desc=Management of Products
-Module51Name=批量邮寄
-Module51Desc=批量邮寄文件管理
+Module50Desc=产品管理
+Module51Name=群发邮件
+Module51Desc=群发邮件管理
 Module52Name=库存
-Module52Desc=Stock management
+Module52Desc=库存管理
 Module53Name=服务
-Module53Desc=Management of Services
-Module54Name=联系人/订阅
-Module54Desc=Management of contracts (services or recurring subscriptions)
+Module53Desc=服务管理
+Module54Name=合约/订阅
+Module54Desc=合约管理（服务或定期订阅）
 Module55Name=条码
-Module55Desc=Barcode or QR code management
-Module56Name=Payment by credit transfer
-Module56Desc=Management of payment of suppliers by Credit Transfer orders. It includes generation of SEPA file for European countries.
-Module57Name=Payments by Direct Debit
-Module57Desc=Management of Direct Debit orders. It includes generation of SEPA file for European countries.
-Module58Name=网络电话
-Module58Desc=网络电话系统集成(Asterisk ...)
-Module60Name=Stickers
-Module60Desc=Management of stickers
+Module55Desc=条码或二维码管理
+Module56Name=通过贷记转账付款
+Module56Desc=管理使用贷记转账对供应商的付款。它包括为欧洲国家生成 SEPA 文件。
+Module57Name=直接借记付款
+Module57Desc=管理使用直接借记对供应商的付款。它包括为欧洲国家生成 SEPA 文件。
+Module58Name=ClickToDial
+Module58Desc=ClickToDial系统集成(Asterisk ...)
+Module60Name=便签
+Module60Desc=便签管理
 Module70Name=干预
 Module70Desc=干预管理模块
-Module75Name=差旅费用记录
+Module75Name=费用和差旅记录
 Module75Desc=费用和差旅记录的管理
-Module80Name=运输
-Module80Desc=Shipments and delivery note management
-Module85Name=Banks & Cash
+Module80Name=货件
+Module80Desc=货件和送货单管理
+Module85Name=银行和现金
 Module85Desc=银行或现金帐户管理
-Module100Name=External Site
-Module100Desc=Add a link to an external website as a main menu icon. Website is shown in a frame under the top menu.
+Module100Name=外部站点
+Module100Desc=添加指向外部网站的链接为主菜单图标。网站将显示在顶部菜单下的框架中。
 Module105Name=Mailman 及 SPIP
 Module105Desc=会员模块的 Mailman 或 SPIP 接口
 Module200Name=LDAP
-Module200Desc=LDAP directory synchronization
+Module200Desc=LDAP 目录同步
 Module210Name=PostNuke
-Module210Desc=PostNuke 整合
+Module210Desc=PostNuke 集成
 Module240Name=数据导出
-Module240Desc=Tool to export Dolibarr data (with assistance)
+Module240Desc=导出 Dolibarr 数据的工具（有协助）
 Module250Name=数据导入
-Module250Desc=Tool to import data into Dolibarr (with assistance)
+Module250Desc=将数据导入 Dolibarr 的工具（有协助）
 Module310Name=会员
-Module310Desc=机构会员管理模块
+Module310Desc=基金会会员管理模块
 Module320Name=RSS 源
-Module320Desc=Add a RSS feed to Dolibarr pages
-Module330Name=Bookmarks & Shortcuts
-Module330Desc=Create shortcuts, always accessible, to the internal or external pages to which you frequently access
-Module400Name=Projects or Leads
-Module400Desc=Management of projects, leads/opportunities and/or tasks. You can also assign any element (invoice, order, proposal, intervention, ...) to a project and get a transversal view from the project view.
-Module410Name=日历
-Module410Desc=日历整合
-Module500Name=Taxes & Special Expenses
-Module500Desc=Management of other expenses (sales taxes, social or fiscal taxes, dividends, ...)
+Module320Desc=向 Dolibarr 页面添加 RSS 源
+Module330Name=书签和快捷方式
+Module330Desc=为您经常访问的内部或外部页面创建始终可见的快捷方式
+Module400Name=项目或商机
+Module400Desc=管理项目、商机/机会和/或任务。您还可以将任何元素（发票、订单、建议、干预......）分配给项目并从项目视图中获取横向视图。
+Module410Name=Webcalendar
+Module410Desc=Webcalendar集成
+Module500Name=税收和特殊费用
+Module500Desc=管理其他费用（销售税、社会或财政税、股息……）
 Module510Name=工资
-Module510Desc=Record and track employee payments
+Module510Desc=记录和跟踪员工付款
 Module520Name=贷款
 Module520Desc=贷款管理模块
-Module600Name=Notifications on business event
-Module600Desc=Send email notifications triggered by a business event: per user (setup defined on each user), per third-party contacts (setup defined on each third party) or by specific emails
-Module600Long=Note that this module sends emails in real-time when a specific business event occurs. If you are looking for a feature to send email reminders for agenda events, go into the setup of module Agenda.
+Module600Name=商业活动通知
+Module600Desc=发送由商业活动触发的电子邮件通知：按用户（在每个用户上定义的设置）、按第三方联系人（在每个第三方上定义的设置）或通过特定电子邮件
+Module600Long=请注意，此模块会在特定商业活动发生时实时发送电子邮件。如果您正在寻找通过电子邮件发送议程事件提醒的功能，请进入议程模块设置。
 Module610Name=产品变体
-Module610Desc=Creation of product variants (color, size etc.)
+Module610Desc=创建产品变体（颜色、尺寸等）
 Module700Name=捐赠
 Module700Desc=捐赠管理模块
-Module770Name=Expense Reports
-Module770Desc=Manage expense reports claims (transportation, meal, ...)
-Module1120Name=Vendor Commercial Proposals
-Module1120Desc=请求供应商商业提案和价格
+Module770Name=费用报表
+Module770Desc=管理费用报表申报（交通，膳食，...）
+Module1120Name=供应商商业提案
+Module1120Desc=要求供应商商业提案和价格
 Module1200Name=Mantis
-Module1200Desc=Mantis 整合
+Module1200Desc=Mantis 集成
 Module1520Name=文档生成
-Module1520Desc=Mass email document generation
+Module1520Desc=生成群发电子邮件
 Module1780Name=标签/分类
 Module1780Desc=创建标签/分类(商品、客户、供应商、联系人或会员)
 Module2000Name=所见即所得编辑器
-Module2000Desc=Allow text fields to be edited/formatted using CKEditor (html)
+Module2000Desc=允许使用 CKEditor编辑/格式化文本字段 (html) 
 Module2200Name=动态定价
-Module2200Desc=Use maths expressions for auto-generation of prices
+Module2200Desc=使用公式自动生成价格
 Module2300Name=计划任务
-Module2300Desc=预定的工作管理（别名cron或chrono表）
+Module2300Desc=计划任务管理（cron 或 chrono table）
 Module2400Name=事件/日程
-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=跟踪项目。记录自动事件以进行跟踪或记录手动事件或会议。这是良好的客户或供应商关系管理的主要模块。
 Module2500Name=DMS / ECM
 Module2500Desc=文件管理系统/电子内容管理。自动组织生成或存储的文档。在需要时分享。
 Module2600Name=API/Web 服务 (SOAP 服务器)
@@ -650,486 +650,489 @@ Module2600Desc=允许 Dolibarr SOAP 服务器提供 API 服务
 Module2610Name=API/Web 服务 (REST 服务器)
 Module2610Desc=允许 Dolibarr REST 服务器提供 API 服务
 Module2660Name=调用WebServices（SOAP客户端）
-Module2660Desc=Enable the Dolibarr web services client (Can be used to push data/requests to external servers. Only Purchase orders are currently supported.)
+Module2660Desc=启用 Dolibarr Web服务客户端（可用于将数据/请求推送到外部服务器。目前仅支持采购订单。）
 Module2700Name=Gravatar
-Module2700Desc=Use online Gravatar service (www.gravatar.com) to show photo of users/members (found with their emails). Needs Internet access
+Module2700Desc=使用在线 Gravatar 服务 (www.gravatar.com) 显示用户/成员的头像（通过他们的电子邮件找到）。需要互联网连接
 Module2800Desc=FTP 客户端
-Module2900Name=Maxmind网站的GeoIP全球IP地址数据库
-Module2900Desc=Maxmind的geoip数据库的转换能力
-Module3200Name=不可改变的档案
-Module3200Desc=Enable an unalterable log of business events. Events are archived in real-time. The log is a read-only table of chained events that can be exported. This module may be mandatory for some countries.
+Module2900Name=Maxmind的GeoIP全球IP地址数据库
+Module2900Desc=Maxmind的GeoIP数据库的转换能力
+Module3200Name=不可更改的档案
+Module3200Desc=启用不可更改的商业活动日志。事件被实时存档。日志是只读的可以导出的链式事件表。对于某些国家/地区，此模块可能是强制性的。
 Module3400Name=社交网络
-Module3400Desc=Enable Social Networks fields into third parties and addresses (skype, twitter, facebook, ...).
-Module4000Name=人事管理
-Module4000Desc=人力资源管理（部门管理，员工合同和感受）
+Module3400Desc=启用第三方和地址的社交网络字段（skype、twitter、facebook、...）。
+Module4000Name=人力资源管理
+Module4000Desc=人力资源管理（部门管理，员工合约和感受）
 Module5000Name=多公司
 Module5000Desc=允许你管理多个公司
-Module6000Name=Inter-modules Workflow
-Module6000Desc=Workflow management between different modules (automatic creation of object and/or automatic status change)
+Module6000Name=模块间工作流
+Module6000Desc=不同模块之间的工作流管理（自动创建对象和/或自动更改状态）
 Module10000Name=网站
-Module10000Desc=Create websites (public) with a WYSIWYG editor. This is a webmaster or developer oriented CMS (it is better to know HTML and CSS language). Just setup your web server (Apache, Nginx, ...) to point to the dedicated Dolibarr directory to have it online on the internet with your own domain name.
-Module20000Name=Leave Request Management
-Module20000Desc=Define and track employee leave requests
-Module39000Name=Product Lots
-Module39000Desc=Lots, serial numbers, eat-by/sell-by date management for products
-Module40000Name=Multicurrency
-Module40000Desc=Use alternative currencies in prices and documents
-Module50000Name=钱箱
-Module50000Desc=Offer customers a PayBox online payment page (credit/debit cards). This can be used to allow your customers to make ad-hoc payments or payments related to a specific Dolibarr object (invoice, order etc...)
+Module10000Desc=使用所见即所得编辑器创建网站（公共的）。这是一个面向网站管理员或开发人员的 CMS（最好先了解 HTML 和 CSS 语言）。只需将您的 Web 服务器（Apache、Nginx 等）指向专用的 Dolibarr 目录，即可使用您自己的域名在 Internet 上线。
+Module20000Name=休假请求管理
+Module20000Desc=定义和跟踪员工休假请求
+Module39000Name=产品批号
+Module39000Desc=产品的批号、序列号、食用/销售日期管理
+Module40000Name=多币种
+Module40000Desc=在价格和文件中使用替代货币
+Module50000Name=PayBox
+Module50000Desc=为客户提供 PayBox 在线支付页面（信用卡/借记卡）。这可用于允许您的客户进行临时付款或与特定 Dolibarr 对象（发票、订单等）相关的付款
 Module50100Name=POS SimplePOS
-Module50100Desc=Point of Sale module SimplePOS (simple POS).
+Module50100Desc=销售点模块 SimplePOS（Simple POS）。
 Module50150Name=POS TakePOS
-Module50150Desc=Point of Sale module TakePOS (touchscreen POS, for shops, bars or restaurants).
+Module50150Desc=销售点模块 TakePOS（触摸屏 POS，用于商店、酒吧或餐馆）。
 Module50200Name=Paypal
-Module50200Desc=Offer customers a PayPal online payment page (PayPal account or credit/debit cards). This can be used to allow your customers to make ad-hoc payments or payments related to a specific Dolibarr object (invoice, order etc...)
+Module50200Desc=为客户提供 PayPal 在线支付页面（PayPal 账户或信用卡/借记卡）。这可用于允许您的客户进行临时付款或与特定 Dolibarr 对象（发票、订单等）相关的付款
 Module50300Name=Stripe
-Module50300Desc=Offer customers a Stripe online payment page (credit/debit cards). This can be used to allow your customers to make ad-hoc payments or payments related to a specific Dolibarr object (invoice, order etc...)
-Module50400Name=Accounting (double entry)
-Module50400Desc=Accounting management (double entries, support General and Subsidiary Ledgers). Export the ledger in several other accounting software formats.
+Module50300Desc=为客户提供 Stripe 在线支付页面（信用卡/借记卡）。这可用于允许您的客户进行临时付款或与特定 Dolibarr 对象（发票、订单等）相关的付款
+Module50400Name=会计（复式）
+Module50400Desc=会计管理（复式分录，支持总账和分录账）。支持以其他几种会计软件格式导出账目。
 Module54000Name=IPP打印
-Module54000Desc=Direct print (without opening the documents) using Cups IPP interface (Printer must be visible from server, and CUPS must be installed on server).
-Module55000Name=问卷, 调查或投票
-Module55000Desc=Create online polls, surveys or votes (like Doodle, Studs, RDVz etc...)
+Module54000Desc=使用 Cups IPP 界面直接打印（无需打开文档）（打印机必须在服务器可见，并且 CUPS 必须安装在服务器上）。
+Module55000Name=问卷，调查或投票
+Module55000Desc=创建在线问卷，调查或投票（类似 Doodle、Studs、RDVz 等...）
 Module59000Name=利润空间
-Module59000Desc=Module to follow margins
+Module59000Desc=利润空间管理模块
 Module60000Name=佣金
 Module60000Desc=佣金管理模块
-Module62000Name=国际贸易术语解释通则
-Module62000Desc=Add features to manage Incoterms
+Module62000Name=国际贸易术语
+Module62000Desc=添加功能来管理国际贸易术语
 Module63000Name=资源
-Module63000Desc=Manage resources (printers, cars, rooms, ...) for allocating to events
-Permission11=读取销售账单
+Module63000Desc=管理用于分配给活动的资源（打印机、汽车、房间等）
+Permission11=查看客户发票
 Permission12=创建/变更发票
-Permission13=Invalidate customer invoices
+Permission13=作废客户发票
 Permission14=确认客户发票
 Permission15=通过电邮发送发票
 Permission16=添加客户发票付款记录
 Permission19=删除客户发票
-Permission21=读取报价单
+Permission21=查看报价单
 Permission22=创建/变更报价单
 Permission24=确认报价单
 Permission25=发送报价单
 Permission26=关闭报价单
 Permission27=删除报价单
 Permission28=导出报价单
-Permission31=读取产品信息
+Permission31=查看产品信息
 Permission32=创建/变更产品信息
+Permission33=Read prices products
 Permission34=删除产品信息
 Permission36=查看/管理隐藏产品
 Permission38=导出产品信息
-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
-Permission44=Delete projects (shared projects and projects of which I am a contact)
+Permission39=忽略最低价格
+Permission41=查看项目和任务（我是其联系人的共享项目和项目）。
+Permission42=创建/修改项目（共享项目和我是其联系人的项目）。还可以将用户分配给项目和任务
+Permission44=删除项目（共享项目和我作为联系人的项目）
 Permission45=导出项目
-Permission61=读取干预
+Permission61=查看干预
 Permission62=创建/变更干预
 Permission64=删除干预
 Permission67=导出干预措施
-Permission68=Send interventions by email
-Permission69=Validate interventions
-Permission70=Invalidate interventions
-Permission71=读取会员
+Permission68=通过电子邮件发送干预
+Permission69=验证干预
+Permission70=作废干预
+Permission71=查看会员
 Permission72=创建/变更会员
 Permission74=删除会员
 Permission75=设置会员类型
 Permission76=导出数据
-Permission78=读取订阅
+Permission78=查看订阅
 Permission79=创建/变更订阅
-Permission81=读取客户订单
+Permission81=查看客户订单
 Permission82=创建/变更客户订单
 Permission84=确认客户订单
+Permission85=生成销售订单文件
 Permission86=发送客户订单
 Permission87=关闭客户订单
 Permission88=取消客户订单
 Permission89=删除客户订单
-Permission91=读取财政税和增值税
+Permission91=查看财政税和增值税
 Permission92=创建/变更财政税和增值税
 Permission93=删除财政税和增值税
 Permission94=导出财政税和增值税
-Permission95=读取报表
-Permission101=读取发货单信息
+Permission95=查看报表
+Permission101=查看发货单信息
 Permission102=创建/变更发货单
 Permission104=确认发送
-Permission105=Send sendings by email
+Permission105=通过电子邮件发送
 Permission106=导出发货单
 Permission109=删除发货单
-Permission111=读取财务帐目
+Permission111=查看财务账户
 Permission112=创建/变更/删除和比较交易
-Permission113=Setup financial accounts (create, manage categories of bank transactions)
-Permission114=Reconcile transactions
+Permission113=设置财务账户（创建、管理银行交易类别）
+Permission114=交易对账
 Permission115=导出交易和帐户报表
 Permission116=账户间转账
-Permission117=Manage checks dispatching
-Permission121=读取合作方信息关联用户
-Permission122=创建/变更与用户相关联的合作方信息
-Permission125=删除与用户相关联的合作方信息
-Permission126=导出合作方信息
-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)
-Permission146=读取供应商
-Permission147=读取统计
-Permission151=阅读长期订单
-Permission152=创建/修改长期订单
-Permission153=阅读长期订单收据
-Permission154=Record Credits/Rejections of direct debit payment orders
-Permission161=读取联系人/订阅
-Permission162=创建/变更联系人/订阅
-Permission163=启用联系人服务/订阅
-Permission164=禁用联系人服务/订阅
-Permission165=删除联系人/订阅
-Permission167=导出联系人
-Permission171=读取行程及开支 (自己和其下属)
-Permission172=创建/变更行程及开支
+Permission117=管理支票调度
+Permission121=查看链接到用户的第三方
+Permission122=创建/修改链接到用户的第三方
+Permission125=删除链接到用户的第三方
+Permission126=导出第三方
+Permission130=创建/修改第三方支付信息
+Permission141=查看所有项目和任务（以及我不是联系人的私人项目）
+Permission142=创建/修改所有项目和任务（以及我不是联系人的私人项目）
+Permission144=删除所有项目和任务（以及我不是联系人的私人项目）
+Permission145=可以为我或我的下属输入分配的任务所消耗的时间（时间表）
+Permission146=查看供应商
+Permission147=查看统计
+Permission151=查看直接借记付款单
+Permission152=创建/修改直接借记付款单
+Permission153=发送/传输直接借记付款单
+Permission154=记录直接借记付款单的贷项/拒绝
+Permission161=查看合约/订阅
+Permission162=创建/修改合同/订阅
+Permission163=激活合同的服务/订阅
+Permission164=禁用合同的服务/订阅
+Permission165=删除合同/订阅
+Permission167=导出合同
+Permission171=查看行程及开支 (自己和下属)
+Permission172=创建/修改行程和费用
 Permission173=删除行程及开支
-Permission174=读取所有行程和开支
+Permission174=查看所有行程和开支
 Permission178=导出行程及开支
-Permission180=读取供应商资料
-Permission181=Read purchase orders
-Permission182=Create/modify purchase orders
-Permission183=Validate purchase orders
-Permission184=Approve purchase orders
-Permission185=Order or cancel purchase orders
-Permission186=Receive purchase orders
-Permission187=Close purchase orders
-Permission188=Cancel purchase orders
+Permission180=查看供应商
+Permission181=查看采购订单
+Permission182=创建/修改采购订单
+Permission183=验证采购订单
+Permission184=审批采购订单
+Permission185=订购或取消采购订单
+Permission186=接收采购订单
+Permission187=关闭采购订单
+Permission188=取消采购订单
 Permission192=添加线路
 Permission193=取消线路
-Permission194=Read the bandwidth lines
+Permission194=查看宽带线路
 Permission202=创建 ADSL 连接
-Permission203=订立连接订单
+Permission203=创建连接订单
 Permission204=订购连接
 Permission205=链接管理
-Permission206=读取链接
-Permission211=读取电话
+Permission206=查看连接
+Permission211=查看电话
 Permission212=订购线路
 Permission213=激活线路
 Permission214=安装电话
 Permission215=安装商
-Permission221=读取邮件
-Permission222=创建/变更邮件(主题，收件人,,,)
-Permission223=确认邮寄(允许发送)
-Permission229=删除邮件
+Permission221=查看电子邮件
+Permission222=创建/变更电子邮件(主题，收件人,,,)
+Permission223=验证电子邮件（允许发送）
+Permission229=删除电子邮件 
 Permission237=查看收件人及信息
-Permission238=手动发送邮件
-Permission239=确认或发送后删除邮件记录
-Permission241=读取分类
-Permission242=创建/变更分类
+Permission238=手动发送电子邮件
+Permission239=确认或发送后删除电子邮件记录
+Permission241=查看分类
+Permission242=创建/修改分类
 Permission243=删除分类
-Permission244=查看隐藏类别的内容
-Permission251=读取其他用户和群组资料
-PermissionAdvanced251=读取其他用户
-Permission252=读取其他用户的使用权限
-Permission253=Create/modify other users, groups and permissions
-PermissionAdvanced253=创建/变更内部/外部用户和权限
-Permission254=只能创建/变更外部用户资料
+Permission244=查看隐藏分类的内容
+Permission251=查看其他用户和组
+PermissionAdvanced251=查看其他用户
+Permission252=查看其他用户的权限
+Permission253=创建/修改其他用户、组和权限
+PermissionAdvanced253=创建/修改内部/外部用户和权限
+Permission254=只能创建/修改外部用户资料
 Permission255=修改其他用户密码
-Permission256=删除或暂时关闭其他用户
-Permission262=Extend access to all third parties AND their objects (not only third parties for which the user is a sale representative).<br>Not effective for external users (always limited to themselves for proposals, orders, invoices, contracts, etc.).<br>Not effective for projects (only rules on project permissions, visibility and assignment matters).
-Permission263=Extend access to all third parties WITHOUT their objects (not only third parties for which the user is a sale representative).<br>Not effective for external users (always limited to themselves for proposals, orders, invoices, contracts, etc.).<br>Not effective for projects (only rules on project permissions, visibility and assignment matters).
-Permission271=读取 CA
-Permission272=读取发票
+Permission256=删除或禁用其他用户
+Permission262=将访问权限扩展到所有第三方及其对象（不仅是用户作为销售代表的第三方）。 <br> 对外部用户无效（对于提案、订单、发票、合同等，始终仅限于他们自己）。 <br> 对项目无效（仅关于项目权限、可见性和分配事项的规则）。
+Permission263=将访问权限扩展到所有没有对象的第三方（不仅是用户作为销售代表的第三方）。 <br> 对外部用户无效（对于提案、订单、发票、合同等，始终仅限于他们自己）。 <br> 对项目无效（仅关于项目权限、可见性和分配事项的规则）。
+Permission271=查看 CA
+Permission272=查看发票
 Permission273=开具发票
-Permission281=读取联络人资料
-Permission282=创建/变更联络人资料
-Permission283=删除联络人资料
-Permission286=导出联络人资料
-Permission291=读取关税
+Permission281=查看联系人
+Permission282=创建/变更联系人
+Permission283=删除联系人
+Permission286=导出联系人
+Permission291=查看关税
 Permission292=设置关税权限
-Permission293=Modify customer's tariffs
-Permission300=Read barcodes
-Permission301=Create/modify barcodes
-Permission302=Delete barcodes
-Permission311=读取服务
-Permission312=为联系人指定服务/订阅
-Permission331=读取书签
+Permission293=修改客户关税
+Permission300=查看条码
+Permission301=创建/修改条码
+Permission302=删除条码
+Permission311=查看服务
+Permission312=将服务/订阅分配给合同
+Permission331=查看书签
 Permission332=创建/变更书签
 Permission333=删除书签
-Permission341=读取个人权限
-Permission342=创建/变更个人资料
+Permission341=查看个人的权限
+Permission342=创建/修改个人资料
 Permission343=修改个人密码
 Permission344=修改个人权限
-Permission351=读取组
-Permission352=读取组的权限
-Permission353=创建/变更群组
+Permission351=查看组
+Permission352=查看组的权限
+Permission353=创建/修改组
 Permission354=删除或禁用组
-Permission358=导出用户资料
-Permission401=读取折扣
-Permission402=创建/变更折扣
-Permission403=确认折扣
+Permission358=导出用户
+Permission401=查看折扣
+Permission402=创建/修改折扣
+Permission403=验证折扣
 Permission404=删除折扣
-Permission430=Use Debug Bar
-Permission511=Read salaries and payments (yours and subordinates)
-Permission512=Create/modify salaries and payments
-Permission514=Delete salaries and payments
-Permission517=Read salaries and payments everybody
+Permission430=使用调试栏
+Permission511=查看工资和付款（您和下属）
+Permission512=创建/修改工资和付款
+Permission514=删除工资和付款
+Permission517=查看每个人的工资和付款
 Permission519=导出工资
-Permission520=读取贷款
-Permission522=创建/变更贷款
+Permission520=查看贷款
+Permission522=创建/修改贷款
 Permission524=删除贷款
 Permission525=访问贷款计算器
 Permission527=导出贷款
-Permission531=读取服务
+Permission531=查看服务
 Permission532=创建/变更服务
+Permission533=Read prices services
 Permission534=删除服务
-Permission536=查看/隐藏服务管理
+Permission536=查看管理隐藏的服务
 Permission538=导出服务
-Permission561=Read payment orders by credit transfer
-Permission562=Create/modify payment order by credit transfer
-Permission563=Send/Transmit payment order by credit transfer
-Permission564=Record Debits/Rejections of credit transfer
-Permission601=Read stickers
-Permission602=Create/modify stickers
-Permission609=Delete stickers
-Permission611=Read attributes of variants
-Permission612=Create/Update attributes of variants
-Permission613=Delete attributes of variants
-Permission650=Read Bills of Materials
-Permission651=Create/Update Bills of Materials
-Permission652=Delete Bills of Materials
-Permission660=Read Manufacturing Order (MO)
-Permission661=Create/Update Manufacturing Order (MO)
-Permission662=Delete Manufacturing Order (MO)
-Permission701=读取捐款资料
-Permission702=创建/变更捐款资料
-Permission703=删除捐款资料
+Permission561=读取贷记转账的付款单
+Permission562=创建/修改贷记转账付款单
+Permission563=发送/传输贷记转账付款单
+Permission564=记录贷记转账的贷项/拒绝
+Permission601=查看便签
+Permission602=创建/修改便签
+Permission609=删除便签
+Permission611=查看变体的属性
+Permission612=创建/更新变体的属性
+Permission613=删除变体的属性
+Permission650=读取物料清单（BOM）
+Permission651=创建/修改物料清单（BOM）
+Permission652=删除物料清单（BOM）
+Permission660=读取制造订单 (MO)
+Permission661=创建/修改制造订单 (MO)
+Permission662=删除制造订单 (MO)
+Permission701=查看捐款
+Permission702=创建/修改捐款
+Permission703=删除捐款
 Permission771=读取费用报表(您以及您下属)
-Permission772=Create/modify expense reports (for you and your subordinates)
+Permission772=创建/修改费用报表（为您和您的下属）
 Permission773=删除费用报表
-Permission775=批准费用报表
+Permission775=审批费用报表
 Permission776=支付费用报表
-Permission777=Read all expense reports (even those of user not subordinates)
-Permission778=Create/modify expense reports of everybody
+Permission777=读取所有费用报表（包括非下属的用户）
+Permission778=创建/修改每个人的费用报表
 Permission779=导出费用报表
-Permission1001=读取库存信息
-Permission1002=创建/变更仓库
+Permission1001=查看库存
+Permission1002=创建/修改仓库
 Permission1003=删除仓库
-Permission1004=读取库存转让
-Permission1005=创建/变更库存移转调拨
-Permission1011=View inventories
-Permission1012=Create new inventory
-Permission1014=Validate inventory
-Permission1015=Allow to change PMP value for a product
-Permission1016=Delete inventory
-Permission1101=Read delivery receipts
-Permission1102=Create/modify delivery receipts
-Permission1104=Validate delivery receipts
-Permission1109=Delete delivery receipts
-Permission1121=Read supplier proposals
-Permission1122=Create/modify supplier proposals
-Permission1123=Validate supplier proposals
-Permission1124=Send supplier proposals
-Permission1125=Delete supplier proposals
-Permission1126=Close supplier price requests
-Permission1181=读取供应商资料
-Permission1182=Read purchase orders
-Permission1183=Create/modify purchase orders
-Permission1184=Validate purchase orders
-Permission1185=Approve purchase orders
-Permission1186=Order purchase orders
-Permission1187=Acknowledge receipt of purchase orders
-Permission1188=Delete purchase orders
-Permission1189=Check/Uncheck a purchase order reception
-Permission1190=Approve (second approval) purchase orders
-Permission1191=Export supplier orders and their attributes
+Permission1004=查看库存调拨
+Permission1005=创建/修改库存调拨
+Permission1011=查看库存
+Permission1012=创建新库存
+Permission1014=验证库存
+Permission1015=允许更改产品的 PMP 值
+Permission1016=删除库存
+Permission1101=查看交货回单
+Permission1102=创建/修改交货回单
+Permission1104=验证交货回单
+Permission1109=删除交货回单
+Permission1121=查看供应商提案
+Permission1122=创建/修改供应商提案
+Permission1123=验证供应商提案
+Permission1124=发送供应商提案
+Permission1125=删除供应商提案
+Permission1126=关闭供应商价格请求
+Permission1181=查看供应商资料
+Permission1182=查看采购订单
+Permission1183=创建/修改采购订单
+Permission1184=验证采购订单
+Permission1185=审批采购订单
+Permission1186=采购订单下单
+Permission1187=采购订单确认收货
+Permission1188=删除采购订单
+Permission1189=选中/取消选中采购订单接收
+Permission1190=审批（二次审批）采购订单
+Permission1191=导出供应商订单及其属性
 Permission1201=获得导出结果
-Permission1202=创建/变更导出信息
-Permission1231=Read vendor invoices
-Permission1232=Create/modify vendor invoices
-Permission1233=Validate vendor invoices
-Permission1234=Delete vendor invoices
-Permission1235=Send vendor invoices by email
-Permission1236=Export vendor invoices, attributes and payments
-Permission1237=Export purchase orders and their details
-Permission1251=导入大量外部数据到数据库(载入资料)
+Permission1202=创建/修改导出信息
+Permission1231=查看供应商发票
+Permission1232=创建/修改供应商发票
+Permission1233=验证供应商发票
+Permission1234=删除供应商发票
+Permission1235=通过电子邮件发送供应商发票
+Permission1236=导出供应商发票、属性和付款资料
+Permission1237=导出采购订单及其详细信息
+Permission1251=将大量外部数据导入数据库（数据加载）
 Permission1321=导出客户发票、属性及其付款资料
-Permission1322=重新开立付费账单
-Permission1421=Export sales orders and attributes
-Permission1521=Read documents
-Permission1522=Delete documents
-Permission2401=Read actions (events or tasks) linked to his user account (if owner of event or just assigned to)
-Permission2402=Create/modify actions (events or tasks) linked to his user account (if owner of event)
-Permission2403=Delete actions (events or tasks) linked to his user account (if owner of event)
-Permission2411=读取他人的动作(事件或任务)
-Permission2412=创建/变更他人的动作(事件或任务)
-Permission2413=删除他人的动作(事件或任务)
-Permission2414=导出其他动作/任务
-Permission2501=读取/下载文档
+Permission1322=重新打开已付账单
+Permission1421=导出销售订单和属性
+Permission1521=查看文件
+Permission1522=删除文件
+Permission2401=查看关联到此的用户帐户的操作（事件或任务）（如果是事件的所有者或分配到该用户）
+Permission2402=创建/修改关联到此的用户帐户的操作（事件或任务）（如果是事件的所有者或分配到该用户）
+Permission2403=删除关联到此的用户帐户的操作（事件或任务）（如果是事件的所有者或分配到该用户）
+Permission2411=查看他人的操作(事件或任务)
+Permission2412=创建/修改他人的操作(事件或任务)
+Permission2413=删除他人的操作(事件或任务)
+Permission2414=导出他人的操作/任务
+Permission2501=查看/下载文档
 Permission2502=下载文档
-Permission2503=提交或删除的文档
+Permission2503=提交或删除文档
 Permission2515=设置文档目录
-Permission2801=允许FTP客户端读取(仅供浏览和下载)
-Permission2802=允许FTP客户端写入(删除和上传文件)
-Permission3200=Read archived events and fingerprints
-Permission3301=Generate new modules
-Permission4001=Read skill/job/position
-Permission4002=Create/modify skill/job/position
-Permission4003=Delete skill/job/position
-Permission4020=Read evaluations
-Permission4021=Create/modify your evaluation
-Permission4022=Validate evaluation
-Permission4023=Delete evaluation
-Permission4030=See comparison menu
-Permission4031=Read personal information
-Permission4032=Write personal information
-Permission10001=Read website content
-Permission10002=Create/modify website content (html and javascript content)
-Permission10003=Create/modify website content (dynamic php code). Dangerous, must be reserved to restricted developers.
-Permission10005=Delete website content
-Permission20001=Read leave requests (your leave and those of your subordinates)
-Permission20002=Create/modify your leave requests (your leave and those of your subordinates)
-Permission20003=删除请假申请
-Permission20004=Read all leave requests (even those of user not subordinates)
-Permission20005=Create/modify leave requests for everybody (even those of user not subordinates)
-Permission20006=Administer leave requests (setup and update balance)
-Permission20007=Approve leave requests
-Permission23001=读取排定任务
-Permission23002=创建/更新排定任务
-Permission23003=删除排定任务
-Permission23004=执行排定任务
-Permission50101=Use Point of Sale (SimplePOS)
-Permission50151=Use Point of Sale (TakePOS)
-Permission50152=Edit sales lines
-Permission50153=Edit ordered sales lines
-Permission50201=读取交易
+Permission2801=在只读模式下使用 FTP 客户端（仅浏览和下载）
+Permission2802=在写入模式下使用 FTP 客户端（删除或上传文件）
+Permission3200=读取已存档的事件和指纹
+Permission3301=生成新模块
+Permission4001=查看技能/工作/职位
+Permission4002=创建/修改 技能/工作/职位
+Permission4003=删除技能/工作/职位
+Permission4020=查看评价
+Permission4021=创建/修改您的评价
+Permission4022=验证评价
+Permission4023=删除评价
+Permission4030=查看比较菜单
+Permission4031=查看个人信息
+Permission4032=写入个人信息
+Permission10001=查看网站内容
+Permission10002=创建/修改网站内容（HTML和 JavaScript 内容）
+Permission10003=创建/修改网站内容（动态 PHP代码）。危险，只能提供给受限制的开发人员。
+Permission10005=删除网站内容
+Permission20001=查看休假请求（您和您下属的休假）
+Permission20002=创建/修改您的休假请求（您和您下属的休假）
+Permission20003=删除休假请求
+Permission20004=查看所有休假请求（即使是用户不是下属）
+Permission20005=为所有人创建/修改休假请求（即使是非下属的用户）
+Permission20006=管理休假请求（设置和更新余额）
+Permission20007=审批休假请求
+Permission23001=查看计划任务
+Permission23002=创建/修改计划任务
+Permission23003=删除计划任务
+Permission23004=执行计划任务
+Permission50101=使用销售点模块 (SimplePOS)
+Permission50151=使用销售点模块 (TakePOS)
+Permission50152=编辑销售订单行
+Permission50153=编辑已订购的销售订单行
+Permission50201=查看交易
 Permission50202=导入交易
-Permission50330=Read objects of Zapier
-Permission50331=Create/Update objects of Zapier
-Permission50332=Delete objects of Zapier
-Permission50401=Bind products and invoices with accounting accounts
-Permission50411=Read operations in ledger
-Permission50412=Write/Edit operations in ledger
-Permission50414=Delete operations in ledger
-Permission50415=Delete all operations by year and journal in ledger
-Permission50418=Export operations of the ledger
-Permission50420=Report and export reports (turnover, balance, journals, ledger)
-Permission50430=Define fiscal periods. Validate transactions and close fiscal periods.
-Permission50440=Manage chart of accounts, setup of accountancy
-Permission51001=Read assets
-Permission51002=Create/Update assets
-Permission51003=Delete assets
-Permission51005=Setup types of asset
+Permission50330=查看 Zapier 的对象
+Permission50331=创建/修改 Zapier 的对象
+Permission50332=删除 Zapier 的对象
+Permission50401=将产品和发票与会计科目绑定
+Permission50411=查看账目
+Permission50412=写入/修改账目
+Permission50414=删除账目
+Permission50415=在账目中按年份和分类帐删除所有项目
+Permission50418=导出账目
+Permission50420=报表和导出报表（营业额、余额、日记帐、分类帐）
+Permission50430=定义会计期间。验证交易并结账。
+Permission50440=管理会计科目表，会计设置
+Permission51001=查看资产
+Permission51002=创建/修改资产
+Permission51003=删除资产
+Permission51005=设置资产类型
 Permission54001=打印
-Permission55001=读取调查
-Permission55002=创建/变更调查
+Permission55001=查看调查
+Permission55002=创建/修改调查
 Permission59001=查看商业利润
-Permission59002=确定商业利润
-Permission59003=读取每位用户利润
-Permission63001=读取资源
-Permission63002=创建/变更资源
+Permission59002=定义商业利润
+Permission59003=查看每位用户利润
+Permission63001=查看资源
+Permission63002=创建/修改资源
 Permission63003=删除资源
 Permission63004=将资源链接到议程事件
-Permission64001=Allow direct printing
-Permission67000=Allow printing of receipts
-Permission68001=Read intracomm report
-Permission68002=Create/modify intracomm report
-Permission68004=Delete intracomm report
-Permission941601=Read receipts
-Permission941602=Create and modify receipts
-Permission941603=Validate receipts
-Permission941604=Send receipts by email
-Permission941605=Export receipts
-Permission941606=Delete receipts
-DictionaryCompanyType=Third-party types
-DictionaryCompanyJuridicalType=Third-party legal entities
-DictionaryProspectLevel=Prospect potential level for companies
-DictionaryProspectContactLevel=Prospect potential level for contacts
-DictionaryCanton=States/Provinces
+Permission64001=允许直接打印
+Permission67000=允许打印收据
+Permission68001=查看内部通讯报告
+Permission68002=创建/修改内部通信报告
+Permission68004=删除内部通讯报告
+Permission941601=查看收据    
+Permission941602=创建和修改收据
+Permission941603=验证收据
+Permission941604=通过电子邮件发送收据
+Permission941605=导出收据
+Permission941606=删除收据
+DictionaryCompanyType=第三方类型
+DictionaryCompanyJuridicalType=第三方法人实体类型
+DictionaryProspectLevel=公司的前景潜力水平
+DictionaryProspectContactLevel=联系人的前景潜力水平
+DictionaryCanton=州/省
 DictionaryRegion=地区
 DictionaryCountry=国家
 DictionaryCurrency=货币
-DictionaryCivility=Honorific titles
+DictionaryCivility=尊称
 DictionaryActions=活动议程类型
-DictionarySocialContributions=Types of social or fiscal taxes
-DictionaryVAT=增值税率和消费税率
-DictionaryRevenueStamp=税票金额
-DictionaryPaymentConditions=Payment Terms
-DictionaryPaymentModes=Payment Modes
+DictionarySocialContributions=社会税或财政税的类型
+DictionaryVAT=VAT或销售税率
+DictionaryRevenueStamp=印花税金额
+DictionaryPaymentConditions=付款条款
+DictionaryPaymentModes=付款方式
 DictionaryTypeContact=联络人/地址类型
-DictionaryTypeOfContainer=Website - Type of website pages/containers
-DictionaryEcotaxe=Ecotax 指令
+DictionaryTypeOfContainer=网站 - 网站页面/容器的类型
+DictionaryEcotaxe=生态税 (WEEE)
 DictionaryPaperFormat=纸张格式
-DictionaryFormatCards=Card formats
+DictionaryFormatCards=卡片格式
 DictionaryFees=费用报表 - 费用报表行的类型
 DictionarySendingMethods=运输方式
-DictionaryStaff=Number of Employees
-DictionaryAvailability=送货延迟
-DictionaryOrderMethods=Order methods
-DictionarySource=报价/订单来源方式
-DictionaryAccountancyCategory=报告的个性化组
-DictionaryAccountancysystem=会计科目表模型
-DictionaryAccountancyJournal=会计日常报表
-DictionaryEMailTemplates=Email Templates
+DictionaryStaff=雇员人数
+DictionaryAvailability=交货用时
+DictionaryOrderMethods=订购方式
+DictionarySource=提案/订单的来源
+DictionaryAccountancyCategory=个性化的报告组
+DictionaryAccountancysystem=会计科目表
+DictionaryAccountancyJournal=会计日记账
+DictionaryEMailTemplates=电子邮件模板
 DictionaryUnits=单位
-DictionaryMeasuringUnits=Measuring Units
+DictionaryMeasuringUnits=测量单位
 DictionarySocialNetworks=社交网络
-DictionaryProspectStatus=Prospect status for companies
-DictionaryProspectContactStatus=Prospect status for contacts
-DictionaryHolidayTypes=Leave - Types of leave
-DictionaryOpportunityStatus=Lead status for project/lead
+DictionaryProspectStatus=公司的前景状况
+DictionaryProspectContactStatus=联系人的前景状况
+DictionaryHolidayTypes=休假 - 休假类型
+DictionaryOpportunityStatus=项目/商机的潜在状态
 DictionaryExpenseTaxCat=费用报告 - 运输类别
-DictionaryExpenseTaxRange=费用报告 - 按运输类别排列
-DictionaryTransportMode=Intracomm report - Transport mode
-DictionaryBatchStatus=Product lot/serial Quality Control status
-DictionaryAssetDisposalType=Type of disposal of assets
-TypeOfUnit=Type of unit
-SetupSaved=设置已经成功保存
-SetupNotSaved=安装程序未保存
-BackToModuleList=Back to Module list
-BackToDictionaryList=Back to Dictionaries list
-TypeOfRevenueStamp=税票类型
-VATManagement=Sales Tax Management
-VATIsUsedDesc=By default when creating prospects, invoices, orders etc. the Sales Tax rate follows the active standard rule:<br>If the seller is not subject to Sales tax, then Sales tax defaults to 0. End of rule.<br>If the (seller's country = buyer's country), then the Sales tax by default equals the Sales tax of the product in the seller's country. End of rule.<br>If the seller and buyer are both in the European Community and goods are transport-related products (haulage, shipping, airline), the default VAT is 0. This rule is dependant on the seller's country - please consult with your accountant. The VAT should be paid by the buyer to the customs office in their country and not to the seller. End of rule.<br>If the seller and buyer are both in the European Community and the buyer is not a company (with a registered intra-Community VAT number) then the VAT defaults to the VAT rate of the seller's country. End of rule.<br>If the seller and buyer are both in the European Community and the buyer is a company (with a registered intra-Community VAT number), then the VAT is 0 by default. End of rule.<br>In any other case the proposed default is Sales tax=0. End of rule.
-VATIsNotUsedDesc=By default the proposed Sales tax is 0 which can be used for cases like associations, individuals or small companies.
-VATIsUsedExampleFR=In France, it means companies or organizations having a real fiscal system (Simplified real or normal real). A system in which VAT is declared.
-VATIsNotUsedExampleFR=In France, it means associations that are non Sales tax declared or companies, organizations or liberal professions that have chosen the micro enterprise fiscal system (Sales tax in franchise) and paid a franchise Sales tax without any Sales tax declaration.  This choice will display the reference "Non applicable Sales tax - art-293B of CGI" on invoices.
+DictionaryExpenseTaxRange=费用报告 - 按运输类别划分的范围
+DictionaryTransportMode=内部通信报告 - 运输方式
+DictionaryBatchStatus=产品批号/序列号的质量控制状态
+DictionaryAssetDisposalType=资产处置类型
+TypeOfUnit=单位类型
+SetupSaved=设置已保存
+SetupNotSaved=设置未保存
+BackToModuleList=返回模块列表
+BackToDictionaryList=返回字典列表
+TypeOfRevenueStamp=印花税票种类
+VATManagement=销售税管理
+VATIsUsedDesc=默认情况下，在创建潜在客户、发票、订单等时，销售税率遵循现行标准规则：<br> 如果卖方不缴纳销售税，则销售税默认为 0。规则结束。 <br> 如果（卖方国家=买方国家），则销售税默认等于卖方国家/地区的产品销售税。规则结束。 <br> 如果卖方和买方都在欧共体且货物是与运输相关的产品（拖运、海运、航空），则默认增值税为 0。此规则取决于卖家所在的国家/地区 - 请咨询您的会计师。增值税应由买方向其所在国家的海关支付，而不是向卖方支付。规则结束。 <br> 如果卖方和买方都在欧共体，并且买方不是公司（具有注册的欧盟内部增值税号），则增值税默认为卖方所在国家/地区的增值税税率。规则结束。 <br> 如果卖方和买方都在欧共体，并且买方是公司（注册了欧盟内增值税号），则默认增值税为 0。规则结束。 <br> 在任何其他情况下，建议的默认值为销售税 = 0。规则结束。
+VATIsNotUsedDesc=默认情况下，建议的销售税为 0，可用于协会、个人或小公司等情况。
+VATIsUsedExampleFR=在法国，这意味着这个公司或机构有一个真正的财政系统（简化实际或正常实际），这个体制会申报增值税。
+VATIsNotUsedExampleFR=在法国，它指的是非增值税申报的协会或选择微型企业财政系统（特许经营增值税）并在没有任何增值税申报的情况下支付特许经营增值税的公司，组织或自由职业。该选项将在发票上显示“Non applicable VAT - art-293B of CGI”的参考。
 ##### Local Taxes #####
-TypeOfSaleTaxes=Type of sales tax
-LTRate=税率
+TypeOfSaleTaxes=销售税类型
+LTRate=利率
 LocalTax1IsNotUsed=不使用第二税率
-LocalTax1IsUsedDesc=Use a second type of tax (other than first one)
-LocalTax1IsNotUsedDesc=Do not use other type of tax (other than first one)
+LocalTax1IsUsedDesc=使用第二种税率类型（第一种除外）
+LocalTax1IsNotUsedDesc=不要使用其他类型的税（除了第一个）
 LocalTax1Management=第二税率类型
 LocalTax1IsUsedExample=
 LocalTax1IsNotUsedExample=
 LocalTax2IsNotUsed=不使用第三税率
-LocalTax2IsUsedDesc=Use a third type of tax (other than first one)
-LocalTax2IsNotUsedDesc=Do not use other type of tax (other than first one)
+LocalTax2IsUsedDesc=使用第三种税率类型（第一种除外）
+LocalTax2IsNotUsedDesc=不要使用其他类型的税率（除了第一个）
 LocalTax2Management=第三税率类型
 LocalTax2IsUsedExample=
 LocalTax2IsNotUsedExample=
-LocalTax1ManagementES=RE 管理(大陆不适用)
-LocalTax1IsUsedDescES=The RE rate by default when creating prospects, invoices, orders etc. follow the active standard rule:<br>If the buyer is not subjected to RE, RE by default=0. End of rule.<br>If the buyer is subjected to RE then the RE by default. End of rule.<br>
-LocalTax1IsNotUsedDescES=默认情况下，建议RE为0。规则结束。
+LocalTax1ManagementES=RE管理
+LocalTax1IsUsedDescES=创建潜在客户，发票，订单等时默认的RE率遵循有效标准规则：<br>如果买方未受RE限制，则RE默认= 0。规则结束。<br>如果买方受RE限制，则默认为RE。规则结束。<br>
+LocalTax1IsNotUsedDescES=默认情况下，建议的RE为0。规则结束。
 LocalTax1IsUsedExampleES=在西班牙，他们是受西班牙IAE某些特定部分影响的专业人士。
 LocalTax1IsNotUsedExampleES=在西班牙，他们是专业人士和社团，并受西班牙IAE的某些部分的约束。
-LocalTax2ManagementES=IRPF 管理(大陆不适用)
-LocalTax2IsUsedDescES=The IRPF rate by default when creating prospects, invoices, orders etc. follow the active standard rule:<br>If the seller is not subjected to IRPF, then IRPF by default=0. End of rule.<br>If the seller is subjected to IRPF then the IRPF by default. End of rule.<br>
+LocalTax2ManagementES=IRPF 管理
+LocalTax2IsUsedDescES=创建潜在客户，发票，订单等时默认的RE率遵循有效的标准规则：<br>如果卖方不受IRPF的约束，则IRPF默认= 0。规则结束。<br>如果卖方受到IRPF的约束，则默认为IRPF。规则结束。<br>
 LocalTax2IsNotUsedDescES=默认情况下，建议IRPF为0。规则结束。
 LocalTax2IsUsedExampleES=在西班牙，提供服务的自由职业者和独立专业人士以及选择模块税制的公司。
-LocalTax2IsNotUsedExampleES=In Spain they are businesses not subject to tax system of modules.
-RevenueStampDesc=The "tax stamp" or "revenue stamp" is a fixed tax you per invoice (It does not depend on amount of invoice). It can also be a percent tax but using the second or third type of tax is better for percent taxes as tax stamps does not provide any reporting. Only few countries uses this type of tax.
-UseRevenueStamp=Use a tax stamp
-UseRevenueStampExample=The value of tax stamp is defined by default into the setup of dictionaries (%s - %s - %s)
-CalcLocaltax=地税报表
+LocalTax2IsNotUsedExampleES=在西班牙，它们是不受模块税收制度约束的企业。
+RevenueStampDesc=“印花税票”是基于您每张发票的固定税款（不取决于发票金额）。它也可以是百分比税，但使用第二类或第三类税更适合百分比税，因为印花税票不提供任何报告。只有少数国家使用这种税收。
+UseRevenueStamp=使用印花税
+UseRevenueStampExample=印花税的默认值在设置的字典中定义 (%s - %s - %s)
+CalcLocaltax=地方税报表
 CalcLocaltax1=销售 - 采购
-CalcLocaltax1Desc=地税报表已经分别计算了在销售和采购时所产生的不同税。
+CalcLocaltax1Desc=地方税报告是根据进项地方税和销项地方税之间的差额计算的
 CalcLocaltax2=采购
-CalcLocaltax2Desc=地税报表是采购总计
+CalcLocaltax2Desc=地方税报表是进项的地方税总额
 CalcLocaltax3=销售
-CalcLocaltax3Desc=地税报表是销售总计
-NoLocalTaxXForThisCountry=According to the setup of taxes (See %s - %s - %s), your country does not need to use such type of tax
+CalcLocaltax3Desc=地方税报告是地方税销项额的总和
+NoLocalTaxXForThisCountry=根据税收设置（参见 %s - %s - %s），您所在国家/地区不需要使用此类税收
 LabelUsedByDefault=如果代码没有翻译则默认使用以下标签
 LabelOnDocuments=文档中的标签
-LabelOrTranslationKey=Label or translation key
-ValueOfConstantKey=Value of a configuration constant
-ConstantIsOn=Option %s is on
-NbOfDays=No. of days
+LabelOrTranslationKey=标签或翻译键
+ValueOfConstantKey=配置的常量值
+ConstantIsOn=选项 %s 已启用
+NbOfDays=天数
 AtEndOfMonth=月末
-CurrentNext=A given day in month
+CurrentNext=一个月中的某一天
 Offset=偏移
 AlwaysActive=始终启用
 Upgrade=升级
@@ -1138,10 +1141,10 @@ AddExtensionThemeModuleOrOther=部署/安装外部模块
 WebServer=网页服务器
 DocumentRootServer=网页服务器的根目录
 DataRootServer=数据文件的目录
-IP=IP 地址
+IP=IP
 Port=端口
 VirtualServerName=虚拟服务器名称
-OS=操作系统
+OS=OS
 PhpWebLink=Web-Php链接
 Server=服务器
 Database=数据库
@@ -1152,289 +1155,290 @@ DatabaseUser=数据库用户
 DatabasePassword=数据库密码
 Tables=表
 TableName=表名称
-NbOfRecord=No. of records
+NbOfRecord=记录数
 Host=服务器
 DriverType=驱动类型
 SummarySystem=系统信息摘要
-SummaryConst=Dolibarr所有设置参数清单
+SummaryConst=所有 Dolibarr 设置参数列表
 MenuCompanySetup=公司/组织
-DefaultMenuManager= 标准菜单管理
-DefaultMenuSmartphoneManager=智能手机菜单管理
+DefaultMenuManager= 标准菜单管理器
+DefaultMenuSmartphoneManager=智能手机菜单管理器
 Skin=外观主题
 DefaultSkin=默认外观主题
 MaxSizeList=最大列表长度
 DefaultMaxSizeList=列表默认最大值
-DefaultMaxSizeShortList=Default max length for short lists (i.e. in customer card)
-MessageOfDay=每日消息
-MessageLogin=登陆页面显示消息
+DefaultMaxSizeShortList=短列表的默认最大长度（如在客户卡中）
+MessageOfDay=今日消息
+MessageLogin=登陆页面显示的消息
 LoginPage=登录页面
 BackgroundImageLogin=背景图
-PermanentLeftSearchForm=常驻左侧菜单搜寻框
-DefaultLanguage=Default language
-EnableMultilangInterface=Enable multilanguage support for customer or vendor relationships
-EnableShowLogo=Show the company logo in the menu
+PermanentLeftSearchForm=搜索表单常驻左侧菜单
+DefaultLanguage=默认语言(语言代码)
+EnableMultilangInterface=为客户或供应商关系启用多语言支持
+EnableShowLogo=在菜单中显示公司LOGO
 CompanyInfo=公司/组织
-CompanyIds=Company/Organization identities
+CompanyIds=公司/组织身份
 CompanyName=名称
 CompanyAddress=地址
 CompanyZip=邮编
-CompanyTown=城镇
+CompanyTown=城市
 CompanyCountry=国家
-CompanyCurrency=通行货币
+CompanyCurrency=主要货币
 CompanyObject=公司愿景
-IDCountry=ID country
-Logo=LOGO标志
-LogoDesc=Main logo of company. Will be used into generated documents (PDF, ...)
-LogoSquarred=Logo (squarred)
-LogoSquarredDesc=Must be a squarred icon (width = height). This logo will be used as the favorite icon or other need like for the top menu bar (if not disabled into display setup).
-DoNotSuggestPaymentMode=不提示
+IDCountry=ID国家
+Logo=LOGO
+LogoDesc=公司的主LOGO。将用于生成的文档（PDF，...）
+LogoSquarred=LOGO（方形）
+LogoSquarredDesc=必须是方形图标（宽度 = 高度）。此徽标将用作收藏夹图标或其他需要例如顶部菜单栏（如在显示设置中未禁用）。
+DoNotSuggestPaymentMode=不建议
 NoActiveBankAccountDefined=没有定义有效的银行帐户
 OwnerOfBankAccount=银行帐户 %s 的户主
 BankModuleNotActive=银行账户模块没有启用
-ShowBugTrackLink=Show the link "<strong>%s</strong>"
-ShowBugTrackLinkDesc=Keep empty to not display this link, use value 'github' for the link to the Dolibarr project or define directly an url 'https://...'
+ShowBugTrackLink=显示链接“<strong> %s </strong>”
+ShowBugTrackLinkDesc=留空不显示此链接，使用值 'github' 为 Dolibarr 项目的链接，或直接定义一个 URL 'https://...'
 Alerts=警告
-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=Project not closed in time
-Delays_MAIN_DELAY_TASKS_TODO=Planned task (project tasks) not completed
-Delays_MAIN_DELAY_ORDERS_TO_PROCESS=Order not processed
-Delays_MAIN_DELAY_SUPPLIER_ORDERS_TO_PROCESS=Purchase order not processed
-Delays_MAIN_DELAY_PROPALS_TO_CLOSE=Proposal not closed
-Delays_MAIN_DELAY_PROPALS_TO_BILL=Proposal not billed
-Delays_MAIN_DELAY_NOT_ACTIVATED_SERVICES=Service to activate
-Delays_MAIN_DELAY_RUNNING_SERVICES=Expired service
-Delays_MAIN_DELAY_SUPPLIER_BILLS_TO_PAY=Unpaid vendor invoice
-Delays_MAIN_DELAY_CUSTOMER_BILLS_UNPAYED=Unpaid customer invoice
-Delays_MAIN_DELAY_TRANSACTIONS_TO_CONCILIATE=Pending bank reconciliation
-Delays_MAIN_DELAY_MEMBERS=Delayed membership fee
-Delays_MAIN_DELAY_CHEQUES_TO_DEPOSIT=Check deposit not done
-Delays_MAIN_DELAY_EXPENSEREPORTS=Expense report to approve
-Delays_MAIN_DELAY_HOLIDAYS=Leave requests to approve
-SetupDescription1=Before starting to use Dolibarr some initial parameters must be defined and modules enabled/configured.
-SetupDescription2=The following two sections are mandatory (the two first entries in the Setup menu):
-SetupDescription3=<a href="%s">%s -> %s</a><br><br>Basic parameters used to customize the default behavior of your application (e.g for country-related features).
-SetupDescription4=<a href="%s">%s -> %s</a><br><br>This software is a suite of many modules/applications. The modules related to your needs must be enabled and configured. Menu entries will appears with the activation of these modules.
-SetupDescription5=Other Setup menu entries manage optional parameters.
+DelaysOfToleranceBeforeWarning=为…显示警告
+DelaysOfToleranceDesc=这里您可以设置主看板区出现逾期提醒 (带有%s图标) 前的逾期时间。
+Delays_MAIN_DELAY_ACTIONS_TODO=计划的活动（议程活动）未完成
+Delays_MAIN_DELAY_PROJECT_TO_CLOSE=项目未及时关闭
+Delays_MAIN_DELAY_TASKS_TODO=计划的任务（项目任务）未完成
+Delays_MAIN_DELAY_ORDERS_TO_PROCESS=订单未处理
+Delays_MAIN_DELAY_SUPPLIER_ORDERS_TO_PROCESS=采购订单未处理
+Delays_MAIN_DELAY_PROPALS_TO_CLOSE=提案未关闭
+Delays_MAIN_DELAY_PROPALS_TO_BILL=提案未出账单
+Delays_MAIN_DELAY_NOT_ACTIVATED_SERVICES=可激活的服务
+Delays_MAIN_DELAY_RUNNING_SERVICES=过期的服务
+Delays_MAIN_DELAY_SUPPLIER_BILLS_TO_PAY=供应商发票未付
+Delays_MAIN_DELAY_CUSTOMER_BILLS_UNPAYED=客户发票未付
+Delays_MAIN_DELAY_TRANSACTIONS_TO_CONCILIATE=待处理的银行对账
+Delays_MAIN_DELAY_MEMBERS=会员费延迟
+Delays_MAIN_DELAY_CHEQUES_TO_DEPOSIT=支票存款未完成
+Delays_MAIN_DELAY_EXPENSEREPORTS=费用报表审批
+Delays_MAIN_DELAY_HOLIDAYS=休假请求审批
+SetupDescription1=在开始使用 Dolibarr 之前，必须先定义一些初始参数并启用/配置模块。
+SetupDescription2=以下两个部分是必须的的（设置菜单中的前两个条目）：
+SetupDescription3= <a href="%s"> %s -> %s </a> <br> <br> 用于自定义应用程序默认行为的基本参数（例如与国家/地区相关的功能）。
+SetupDescription4= <a href="%s"> %s -> %s </a> <br> <br> 该软件是许多模块/应用程序的套件。必须启用和配置与您的需求相关的模块。激活这些模块后将出现菜单条目。
+SetupDescription5=其他设置菜单条目管理可选参数。
 SetupDescriptionLink=<a href="%s">%s - %s</a>
-SetupDescription3b=Basic parameters used to customize the default behavior of your application (e.g for country-related features).
-SetupDescription4b=This software is a suite of many modules/applications. The modules related to your needs must be enabled and configured. Menu entries will appears with the activation of these modules.
-AuditedSecurityEvents=Security events that are audited
-NoSecurityEventsAreAduited=No security events are audited. You can enable them from menu %s
-Audit=Security events
+SetupDescription3b=用于自定义应用程序默认行为的基本参数（例如与国家/地区相关的功能）。
+SetupDescription4b=该软件是许多模块/应用程序的套件。必须启用和配置与您的需求相关的模块。激活这些模块后将出现菜单条目。
+AuditedSecurityEvents=被审计的安全事件
+NoSecurityEventsAreAduited=未审计任何安全事件。您可以从菜单 %s 启用它们
+Audit=安全事件
 InfoDolibarr=关于Dolibarr
 InfoBrowser=关于浏览器
 InfoOS=关于OS
-InfoWebServer=关于WEB服务器
+InfoWebServer=关于Web服务器
 InfoDatabase=关于数据库
 InfoPHP=关于PHP
 InfoPerf=关于性能
-InfoSecurity=About Security
+InfoSecurity=关于安全
 BrowserName=浏览器名称
 BrowserOS=浏览器操作系统
-ListOfSecurityEvents=安全事件清单
-SecurityEventsPurged=安全事件清除
-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=This area is available to administrator users only. Dolibarr user permissions cannot change this restriction.
-CompanyFundationDesc=Edit the information of your company/organization. Click on "%s" button at the bottom of the page when done.
-AccountantDesc=If you have an external accountant/bookkeeper, you can edit here its information.
-AccountantFileNumber=Accountant code
-DisplayDesc=Parameters affecting the look and presentation of the application can be modified here.
-AvailableModules=可用模块
+ListOfSecurityEvents=Dolibarr安全事件列表
+SecurityEventsPurged=安全事件已清除
+TrackableSecurityEvents=Trackable security events
+LogEventDesc=启用特定安全事件的日志记录。管理可通过菜单 <b> %s - %s </b> 记录的日志。警告，此功能会在数据库中生成大量数据。
+AreaForAdminOnly=设置参数只能由 <b> 管理员用户 </b> 设置。
+SystemInfoDesc=系统信息指只对系统管理员可见的以只读方式显示的杂项技术信息。
+SystemAreaForAdminOnly=此区域仅供管理员用户使用。 Dolibarr 用户权限无法更改此限制。
+CompanyFundationDesc=编辑您的公司/组织的信息。完成后单击页面底部的“%s”按钮。
+AccountantDesc=如果您有外部会计师/簿记员，您可以在此处编辑其信息。
+AccountantFileNumber=会计师代码
+DisplayDesc=在此处可以修改影响应用程序外观和呈现的参数。
+AvailableModules=可用的应用程序/模块
 ToActivateModule=要启用模块，请到“设定”区 (“首页”->“设定”->“模块”)。
 SessionTimeOut=会话超时
-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.
+SessionExplanation=如果会话清理器由内部 PHP 会话清理器完成（仅此而已），则此数字保证会话在此延迟之前永远不会过期。内部 PHP 会话清理器不保证会话会在此延迟后会过期。它将在此延迟之后且当会话清理器运行时过期，因此每次 <b> %s/%s </b> 访问，但仅在其他会话进行访问期间（如果值为 0，则意味着清除会话仅由外部过程完成）。 <br> 注意：在某些具有外部会话清理机制的服务器上（debian、ubuntu 下的 cron...），无论此处输入的值是什么，会话都可以在外部设置定义的时间后销毁。
+SessionsPurgedByExternalSystem=此服务器上的会话似乎是由外部机制（debian、ubuntu 下的 cron ......）清理的，可能每 <b> %s </b> 秒（= 参数值 <b> session.gc_maxlifetime </b> ），所以在这里改变值没有效果。您必须要求服务器管理员更改会话延迟。
 TriggersAvailable=可用的触发器
-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=文件中的触发器代码可以通过文件名中的 <b>-NoRun</b> 前缀禁用。
+TriggersDesc=触发器是一旦复制到目录<b> htdocs / core / triggers</b>中就会修改Dolibarr工作流程行为的文件。他们可以感知新的Dolibarr事件（新公司创建，发票验证......）。
+TriggerDisabledByName=此文件中的触发器被其名称中的 <b> -NORUN </b> 后缀禁用。
 TriggerDisabledAsModuleDisabled=此文件中的触发器将在<b>%s</b>模块禁用时禁用。
 TriggerAlwaysActive=无论 Dolibarr 的各模块是否启用，此文件中的触发器一直处于启用状态。
 TriggerActiveAsModuleActive=此文件中的触发器将于 <b>%s</b> 模块启用后启用。
-GeneratedPasswordDesc=Choose the method to be used for auto-generated passwords.
-DictionaryDesc=输入全部参考数据.你能添加你的参数值为默认值。
-ConstDesc=This page allows you to edit (override) parameters not available in other pages. These are mostly reserved parameters for developers/advanced troubleshooting only.
-MiscellaneousDesc=所有其他安全相关的参数定义在这里。
-LimitsSetup=范围及精确度
-LimitsDesc=You can define limits, precisions and optimizations used by Dolibarr here
-MAIN_MAX_DECIMALS_UNIT=Max. decimals for unit prices
-MAIN_MAX_DECIMALS_TOT=Max. decimals for total prices
-MAIN_MAX_DECIMALS_SHOWN=Max. decimals for prices <b>shown on screen</b>. Add an ellipsis <b>...</b> after this parameter (e.g. "2...") if you want to see "<b>...</b>" suffixed to the truncated price.
-MAIN_ROUNDING_RULE_TOT=Step of rounding range (for countries where rounding is done on something other than base 10. For example, put 0.05 if rounding is done by 0.05 steps)
-UnitPriceOfProduct=税前单价
-TotalPriceAfterRounding=Total price (excl/vat/incl tax) after rounding
+GeneratedPasswordDesc=选择用于自动生成密码的方法。
+DictionaryDesc=输入全部参考数据。您能添加你的参数值为默认值。
+ConstDesc=此页面允许您编辑（覆盖）其他页面中不可用的参数。这些主要是为开发人员/高级故障排除保留的参数。
+MiscellaneousDesc=所有其他安全相关的参数在这里定义。
+LimitsSetup=限制及精度设置
+LimitsDesc=您可以在此处定义 Dolibarr 的使用限制、精度和优化
+MAIN_MAX_DECIMALS_UNIT=单价小数位
+MAIN_MAX_DECIMALS_TOT=总价小数位
+MAIN_MAX_DECIMALS_SHOWN=<b>屏幕上显示</b>的价格的小数位。如果您希望遇到小数位截断的情况下显示<b>...</b>（例如 2…），请在此数值后加上<b>...</b>
+MAIN_ROUNDING_RULE_TOT=舍入范围的步长（对于在除了基数10之外的其他位置进行舍入的国家。例如，如果通过0.05步长舍入，则输入0.05）
+UnitPriceOfProduct=产品的净单价
+TotalPriceAfterRounding=四舍五入后的总价 (税前价/增值税/税后价)
 ParameterActiveForNextInputOnly=参数仅在下次输入数值起生效。
-NoEventOrNoAuditSetup=No security event has been logged. This is normal if Audit has not been enabled in the "Setup - Security - Events" page.
-NoEventFoundWithCriteria=No security event has been found for this search criteria.
+NoEventOrNoAuditSetup=未记录任何安全事件。如果在“设置 - 安全 - 事件”页面中没有启用审核，这是正常的。
+NoEventFoundWithCriteria=未发现符合搜索条件的安全事件。
 SeeLocalSendMailSetup=参见您的本机 sendmail 设置
-BackupDesc=A <b>complete</b> backup of a Dolibarr installation requires two steps.
-BackupDesc2=Backup the contents of the "documents" directory (<b>%s</b>) containing all uploaded and generated files. This will also include all the dump files generated in Step 1. This operation may last several minutes.
-BackupDesc3=Backup the structure and contents of your database (<b>%s</b>) into a dump file. For this, you can use the following assistant.
-BackupDescX=The archived directory should be stored in a secure place.
+BackupDesc=Dolibarr 安装的 <b> 完整 </b> 备份需要两个步骤。
+BackupDesc2=备份包含所有上传和生成的文件的“documents”目录 (<b> %s </b>) 的内容。这还将包括在步骤 1 中生成的所有转储文件。此操作可能会持续几分钟。
+BackupDesc3=将数据库 (<b>%s</b>) 的结构和内容备份到转储文件中。您可以使用以下助手。
+BackupDescX=存档的文档目录应存储在一个安全的地方。
 BackupDescY=生成的转储文件应存放在安全的地方。
-BackupPHPWarning=Backup cannot be guaranteed with this method. Previous one recommended.
-RestoreDesc=To restore a Dolibarr backup, two steps are required.
-RestoreDesc2=Restore the backup file (zip file for example) of the "documents" directory to a new Dolibarr installation or into this current documents directory (<b>%s</b>).
-RestoreDesc3=Restore the database structure and data from a backup dump file into the database of the new Dolibarr installation or into the database of this current installation (<b>%s</b>). Warning, once the restore is complete, you must use a login/password, that existed from the backup time/installation to connect again.<br>To restore a backup database into this current installation, you can follow this assistant.
+BackupPHPWarning=此方法无法确保备份成功。推荐使用前者。
+RestoreDesc=要恢复 Dolibarr 备份，需要两个步骤。
+RestoreDesc2=将“documents”目录的备份文件（例如 zip 文件）恢复到新的 Dolibarr 安装或当前的“documents”目录（<b> %s </b>）。
+RestoreDesc3=将备份转储文件中的数据库结构和数据恢复到新 Dolibarr 安装的数据库或当前安装的数据库 (<b> %s </b>)。警告，一旦恢复完成，您必须使用备份时存在的用户名/密码重新登陆。 <br> 要将备份数据库恢复到当前安装，您可以按照此助手操作。
 RestoreMySQL=MySQL 导入
-ForcedToByAModule=此规则被一个启用中的模块强制应用于 <b>%s</b>
-ValueIsForcedBySystem=This value is forced by the system. You can't change it.
-PreviousDumpFiles=Existing backup files
-PreviousArchiveFiles=Existing archive files
-WeekStartOnDay=First day of the week
-RunningUpdateProcessMayBeRequired=Running the upgrade process seems to be required (Program version %s differs from Database version %s)
+ForcedToByAModule=此规则被某个激活的模块强制为 <b> %s </b>
+ValueIsForcedBySystem=这个值是系统强制的。你不能改变它。
+PreviousDumpFiles=现有备份文件
+PreviousArchiveFiles=现有存档文件
+WeekStartOnDay=一周的第一天
+RunningUpdateProcessMayBeRequired=似乎需要运行升级程序（程序版本 %s 与数据库版本 %s 不同）
 YouMustRunCommandFromCommandLineAfterLoginToUser=您必须以 <b>%s</b> 用户在MySQL控制台登陆后通过命令行运行此命令否则您必须在命令行的末尾使用 -W 选项来提供 <b>%s</b> 的密码。
-YourPHPDoesNotHaveSSLSupport=SSL 在您的 PHP 中不可用
+YourPHPDoesNotHaveSSLSupport=SSL 函数在您的 PHP 中不可用
 DownloadMoreSkins=下载更多外观主题
-SimpleNumRefModelDesc=Returns the reference number in the format %syymm-nnnn where yy is the year, mm is the month and nnnn is a sequential auto-incrementing number with no reset
-SimpleNumRefNoDateModelDesc=Returns the reference number in the format %s-nnnn where nnnn is a sequential auto-incrementing number with no reset
-ShowProfIdInAddress=Show professional ID with addresses
-ShowVATIntaInAddress=Hide intra-Community VAT number
-TranslationUncomplete=部分翻译
-MAIN_DISABLE_METEO=Disable weather thumb
+SimpleNumRefModelDesc=返回格式为 %syymm-nnnn 的参考编号，其中 yy 是年份，mm 是月份，nnnn 是顺序自动递增不会重置的数字
+SimpleNumRefNoDateModelDesc=返回格式为 %s-nnnn 的参考号，其中 nnnn 是顺序自动递增不会重置的数字
+ShowProfIdInAddress=显示带有地址的资格ID
+ShowVATIntaInAddress=隐藏欧盟内增值税号
+TranslationUncomplete=未完成翻译
+MAIN_DISABLE_METEO=禁用天气图标
 MeteoStdMod=标准模式
 MeteoStdModEnabled=标准模式已启用
 MeteoPercentageMod=百分比模式
-MeteoPercentageModEnabled=已启用百分比模式
+MeteoPercentageModEnabled=百分比模式已启用
 MeteoUseMod=点击使用%s
 TestLoginToAPI=测试 API 登陆
-ProxyDesc=Some features of Dolibarr require internet access. Define here the internet connection parameters such as access through a proxy server if necessary.
-ExternalAccess=External/Internet Access
-MAIN_PROXY_USE=Use a proxy server (otherwise access is direct to the internet)
-MAIN_PROXY_HOST=Proxy server: Name/Address
-MAIN_PROXY_PORT=Proxy server: Port
-MAIN_PROXY_USER=Proxy server: Login/User
-MAIN_PROXY_PASS=Proxy server: Password
-DefineHereComplementaryAttributes=Define any additional / custom attributes that must be added to: %s
+ProxyDesc=Dolibarr 的某些功能需要互联网访问。如需要，在此处设置 Internet 连接参数，如需要通过代理服务器进行访问。
+ExternalAccess=外部/互联网访问
+MAIN_PROXY_USE=使用代理服务器（否则直接访问互联网）
+MAIN_PROXY_HOST=代理服务器：名称/地址
+MAIN_PROXY_PORT=代理服务器：端口
+MAIN_PROXY_USER=代理服务器：登录名/用户名
+MAIN_PROXY_PASS=代理服务器：密码
+DefineHereComplementaryAttributes=定义必须添加到：%s的任何附加/自定义属性
 ExtraFields=自定义属性
-ExtraFieldsLines=自定义属性 (行列)
-ExtraFieldsLinesRec=补充属性（模板发票行）
-ExtraFieldsSupplierOrdersLines=补充属性（订单行）
-ExtraFieldsSupplierInvoicesLines=自定义属性(发票明细)
-ExtraFieldsThirdParties=Complementary attributes (third party)
-ExtraFieldsContacts=Complementary attributes (contacts/address)
-ExtraFieldsMember=自定义属性 (会员)
-ExtraFieldsMemberType=自定义属性 (会员类型)
-ExtraFieldsCustomerInvoices=自定义属性(发票)
-ExtraFieldsCustomerInvoicesRec=补充属性（模板发票）
-ExtraFieldsSupplierOrders=自定义属性 (订单)
-ExtraFieldsSupplierInvoices=自定义属性 (账单)
-ExtraFieldsProject=自定义属性 (项目)
-ExtraFieldsProjectTask=自定义属性 (任务)
-ExtraFieldsSalaries=Complementary attributes (salaries)
+ExtraFieldsLines=自定义属性（行）
+ExtraFieldsLinesRec=自定义属性（发票模板行）
+ExtraFieldsSupplierOrdersLines=自定义属性（订单行）
+ExtraFieldsSupplierInvoicesLines=自定义属性（发票行）
+ExtraFieldsThirdParties=自定义属性（第三方）
+ExtraFieldsContacts=自定义属性（联系人/地址）
+ExtraFieldsMember=自定义属性（会员）
+ExtraFieldsMemberType=自定义属性（会员类型）
+ExtraFieldsCustomerInvoices=自定义属性（发票）
+ExtraFieldsCustomerInvoicesRec=自定义属性（发票模板）
+ExtraFieldsSupplierOrders=自定义属性（订单）
+ExtraFieldsSupplierInvoices=自定义属性（发票）
+ExtraFieldsProject=自定义属性（项目）
+ExtraFieldsProjectTask=自定义属性（任务）
+ExtraFieldsSalaries=自定义属性（薪酬）
 ExtraFieldHasWrongValue=属性 %s 有一个错误的值。
-AlphaNumOnlyLowerCharsAndNoSpace=仅限英文大小写字母不含空格
+AlphaNumOnlyLowerCharsAndNoSpace=仅限没有空格的字母数字和小写字符
 SendmailOptionNotComplete=警告，在某些Linux系统上，要从您的电子邮件发送电子邮件，sendmail执行设置必须包含选项-ba（参数mail.force_extra_parameters到您的php.ini文件中）。如果某些收件人从未收到电子邮件，请尝试使用mail.force_extra_parameters = -ba编辑此PHP参数。
-PathToDocuments=文件路径
+PathToDocuments=文档路径
 PathDirectory=目录
-SendmailOptionMayHurtBuggedMTA=Feature to send mails using method "PHP mail direct" will generate a mail message that might not be parsed correctly by some receiving mail servers. The result is that some mails can't be read by people hosted by those bugged platforms. This is the case for some Internet providers (Ex: Orange in France). This is not a problem with Dolibarr or PHP but with the receiving mail server. You can however add an option MAIN_FIX_FOR_BUGGED_MTA to 1 in Setup - Other to modify Dolibarr to avoid this. However, you may experience problems with other servers that strictly use the SMTP standard. The other solution (recommended) is to use the method "SMTP socket library" which has no disadvantages.
+SendmailOptionMayHurtBuggedMTA=使用“PHP mail direct”方法发送邮件的功能将生成可能无法被某些接收邮件服务器正确解析的邮件消息。结果是，某些邮件无法被那些有漏洞的平台托管的人阅读。某些 Internet 提供商就是这种情况（例如：法国的 Orange）。这不是 Dolibarr 或 PHP 的问题，而是接收邮件服务器的问题。但是，您可以在 设置- 其他 中将选项 MAIN_FIX_FOR_BUGGED_MTA 设置为 1 以修改 Dolibarr 来避免这种情况。但是，您可能会遇到其他严格使用 SMTP 标准的服务器的问题。另一种解决方案（推荐）是使用没有缺点的方法“SMTP socket library”。
 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=您还可以覆盖填充下表的字符串。从“%s”下拉列表中选择您的语言，将翻译键字符串插入“%s”并将新翻译成“%s”
-TranslationOverwriteDesc2=You can use the other tab to help you know which translation key to use
+TranslationKeySearch=搜索翻译键或字符串
+TranslationOverwriteKey=覆盖一个翻译字符串
+TranslationDesc=如何设置显示语言：<br> * 默认/系统范围：菜单 <strong> 主页 -> 设置 -> 显示 </strong> <br> * 每个用户：单击屏幕顶部的用户名并修改用户选项卡上的 <strong> 用户显示设置卡片。
+TranslationOverwriteDesc=您还可以覆盖下表中的字符串。从“%s”下拉列表中选择您的语言，将翻译键字符串插入“%s”并将新翻译填写到“%s”
+TranslationOverwriteDesc2=您可以使用其他选项卡来帮助您了解要使用的翻译键
 TranslationString=翻译字符串
 CurrentTranslationString=当前翻译字符串
-WarningAtLeastKeyOrTranslationRequired=至少对于密钥或翻译字符串，需要搜索条件
-NewTranslationStringToShow=显示新翻译字符串
+WarningAtLeastKeyOrTranslationRequired=搜索条件至少要有一个键或翻译字串
+NewTranslationStringToShow=要显示的新翻译字符串
 OriginalValueWas=原始翻译被覆盖。原值是：<br> <br> %s
-TransKeyWithoutOriginalValue=You forced a new translation for the translation key '<strong>%s</strong>' that does not exist in any language files
-TitleNumberOfActivatedModules=Activated modules
-TotalNumberOfActivatedModules=Activated modules: <b>%s</b> / <b>%s</b>
+TransKeyWithoutOriginalValue=您可以对不存在于任何语言文件中的翻译键“<strong> %s </strong>”强制进行新翻译
+TitleNumberOfActivatedModules=已启用的模块
+TotalNumberOfActivatedModules=已启用的模块：<b> %s </b> / <b> %s </b>
 YouMustEnableOneModule=您必须至少启用 1 个模块
-YouMustEnableTranslationOverwriteBefore=You must first enable translation overwriting to be allowed to replace a translation
-ClassNotFoundIntoPathWarning=Class %s not found in PHP path
-YesInSummer=是(在夏天)
-OnlyFollowingModulesAreOpenedToExternalUsers=Note, only the following modules are available to external users (irrespective of the permissions of such users) and only if permissions are granted:<br>
+YouMustEnableTranslationOverwriteBefore=您必须首先启用翻译覆盖才能替换翻译
+ClassNotFoundIntoPathWarning=在 PHP 路径中找不到类 %s
+YesInSummer=是的（在夏天）
+OnlyFollowingModulesAreOpenedToExternalUsers=请注意，只有以下模块可供外部用户使用（无论此类用户的权限如何）并且仅在授予权限的情况下：<br>
 SuhosinSessionEncrypt=会话存储空间已用 Suhosin 加密
-ConditionIsCurrently=当前条件为 %s
-YouUseBestDriver=You use driver %s which is the best driver currently available.
-YouDoNotUseBestDriver=You use driver %s but driver %s is recommended.
-NbOfObjectIsLowerThanNoPb=You have only %s %s in the database. This does not require any particular optimization.
-ComboListOptim=Combo list loading optimization
+ConditionIsCurrently=目前情況 %s
+YouUseBestDriver=您使用了驱动程序 %s，这是目前可用的最佳驱动程序。
+YouDoNotUseBestDriver=您使用了驱动程序 %s 但建议使用驱动程序 %s。
+NbOfObjectIsLowerThanNoPb=数据库中只有 %s %s 。这不需要任何特定的优化。
+ComboListOptim=组合列表加载优化
 SearchOptim=搜索优化
-YouHaveXObjectUseComboOptim=You have %s %s in the database. You can go into setup of module to enable loading of combo list on key pressed event.
-YouHaveXObjectUseSearchOptim=You have %s %s in the database. You can add the constant %s to 1 in Home-Setup-Other.
-YouHaveXObjectUseSearchOptimDesc=This limits the search to the beginning of strings which makes it possible for the database to use indexes and you should get an immediate response.
-YouHaveXObjectAndSearchOptimOn=You have %s %s in the database and constant %s is set to %s in Home-Setup-Other.
-BrowserIsOK=You are using the %s web browser. This browser is ok for security and performance.
-BrowserIsKO=You are using the %s web browser. This browser is known to be a bad choice for security, performance and reliability. We recommend using Firefox, Chrome, Opera or Safari.
-PHPModuleLoaded=PHP component %s is loaded
-PreloadOPCode=Preloaded OPCode is used
-AddRefInList=Display Customer/Vendor ref. into combo lists.<br>Third Parties will appear with a name format of "CC12345 - SC45678 - The Big Company corp." instead of "The Big Company corp".
-AddVatInList=Display Customer/Vendor VAT number into combo lists.
-AddAdressInList=Display Customer/Vendor adress into combo lists.<br>Third Parties will appear with a name format of "The Big Company corp. - 21 jump street 123456 Big town - USA" instead of "The Big Company corp".
-AddEmailPhoneTownInContactList=Display Contact email (or phones if not defined) and town info list (select list or combobox)<br>Contacts will appear with a name format of "Dupond Durand - dupond.durand@email.com - Paris" or "Dupond Durand - 06 07 59 65 66 - Paris" instead of "Dupond Durand".
-AskForPreferredShippingMethod=Ask for preferred shipping method for Third Parties.
+YouHaveXObjectUseComboOptim=您在数据库中有 %s %s 。您可以进入模块设置以启用在按键后再加载组合列表。
+YouHaveXObjectUseSearchOptim=您在数据库中有 %s %s 。您可以在 主页-设置-其他 中将常数 %s 设置为 1。
+YouHaveXObjectUseSearchOptimDesc=这将搜索限制在字符串的开头，这使得数据库可以使用索引，您应该能立即得到响应。
+YouHaveXObjectAndSearchOptimOn=您在数据库中有 %s %s 并且已在 主页-设置-其他 中将常量 %s 设置为 %s。
+BrowserIsOK=您正在使用 %s 网络浏览器。该浏览器的安全性和性能都OK。
+BrowserIsKO=您正在使用 %s 网络浏览器。众所周知，这种浏览器在安全性、性能和可靠性方面是一个糟糕的选择。我们建议使用 Firefox、Chrome、Opera 或 Safari。
+PHPModuleLoaded=PHP 组件 %s 已加载
+PreloadOPCode=已使用预加载的 OPCode
+AddRefInList=在组合列表中显示客户/供应商参考。 <br> 第三方将以“CC12345 - SC45678 - The Big Company corp.”的名称格式出现。而不是“The Big Company corp”。
+AddVatInList=在组合列表中显示客户/供应商增值税号。
+AddAdressInList=在组合列表中显示客户/供应商地址。 <br> 第三方将以“The Big Company corp. - 21 jump street 123456 Big town - USA”的名称格式出现，而不是“The Big Company corp”。
+AddEmailPhoneTownInContactList=显示联系人电子邮件（或电话，如果未定义电子邮件）和城镇信息列表（选择列表或组合框） <br> 联系人将显示为“Dupond Durand - dupond.durand@email.com - 巴黎”或“Dupond Durand - 06 07 59 65 66 - 巴黎”而不是“Dupond Durand”。
+AskForPreferredShippingMethod=询问第三方的首选运输方式。
 FieldEdition=%s 字段的编辑
 FillThisOnlyIfRequired=例如：+2 (请只在时区错误问题出现时填写)
 GetBarCode=获取条码
-NumberingModules=Numbering models
-DocumentModules=Document models
+NumberingModules=编码模式
+DocumentModules=文件模式
 ##### Module password generation
-PasswordGenerationStandard=Return a password generated according to internal Dolibarr algorithm: %s characters containing shared numbers and characters in lowercase.
-PasswordGenerationNone=Do not suggest a generated password. Password must be typed in manually.
+PasswordGenerationStandard=返回根据Dolibarr 内部算法生成的密码：%s 个字符，包含数字和小写字符。
+PasswordGenerationNone=不要建议生成密码。密码必须手动输入。
 PasswordGenerationPerso=返回一个字符串用于设置你的个人密码。
 SetupPerso=根据你的配置
 PasswordPatternDesc=密码模式说明
 ##### Users setup #####
-RuleForGeneratedPasswords=Rules to generate and validate passwords
-DisableForgetPasswordLinkOnLogonPage=Do not show the "Password Forgotten" link on the Login page
+RuleForGeneratedPasswords=生成和验证密码的规则
+DisableForgetPasswordLinkOnLogonPage=不要在登录页面上显示“忘记密码”链接
 UsersSetup=用户模块设置
-UserMailRequired=Email required to create a new user
-UserHideInactive=Hide inactive users from all combo lists of users (Not recommended: this may means you won't be able to filter or search on old users on some pages)
-UsersDocModules=Document templates for documents generated from user record
-GroupsDocModules=Document templates for documents generated from a group record
+UserMailRequired=创建新用户时必须输入电子邮件地址
+UserHideInactive=从所有用户组合列表中隐藏非活动用户（不推荐：这可能意味着您将无法在某些页面上过滤或搜索旧用户）
+UsersDocModules=从用户记录生成的文档的文档模板
+GroupsDocModules=从组记录生成的文档的文档模板
 ##### HRM setup #####
 HRMSetup=人力资源管理模块设置
 ##### Company setup #####
 CompanySetup=客户/供应商模块及其相关参数设置
-CompanyCodeChecker=Options for automatic generation of customer/vendor codes
-AccountCodeManager=Options for automatic generation of customer/vendor accounting codes
-NotificationsDesc=Email notifications can be sent automatically for some Dolibarr events.<br>Recipients of notifications can be defined:
-NotificationsDescUser=* per user, one user at a time.
-NotificationsDescContact=* per third-party contacts (customers or vendors), one contact at a time.
-NotificationsDescGlobal=* or by setting global email addresses in the setup page of the module.
-ModelModules=Document Templates
-DocumentModelOdt=Generate documents from OpenDocument templates (.ODT / .ODS files from LibreOffice, OpenOffice, KOffice, TextEdit,...)
+CompanyCodeChecker=自动生成客户/供应商代码的选项
+AccountCodeManager=自动生成客户/供应商会计科目代码的选项
+NotificationsDesc=可以为某些 Dolibarr 事件自动发送电子邮件通知。 <br> 可以定义通知的接收者：
+NotificationsDescUser=* 每个用户，一次一个用户。
+NotificationsDescContact=* 每个第三方联系人（客户或供应商），一次一个联系人。
+NotificationsDescGlobal=* 或通过在模块的设置页面中设置全局电子邮件地址。
+ModelModules=文档模板
+DocumentModelOdt=从 OpenDocument 模板生成文档（来自 LibreOffice、OpenOffice、KOffice、TextEdit 等的 .ODT / .ODS 文件）
 WatermarkOnDraft=为草稿文档加水印
 JSOnPaimentBill=激活启用在线支付功能来自动填充付款的形式
-CompanyIdProfChecker=Rules for Professional IDs
+CompanyIdProfChecker=资格 ID 规则
 MustBeUnique=必须是独特的吗？
-MustBeMandatory=Mandatory to create third parties (if VAT number or type of company defined) ?
+MustBeMandatory=创建第三方必须填写（如果定义了增值税号或公司类型） ?
 MustBeInvoiceMandatory=是否必须验证发票？
 TechnicalServicesProvided=提供技术服务
 #####DAV #####
-WebDAVSetupDesc=This is the link to access the WebDAV directory. It contains a "public" dir open to any user knowing the URL (if public directory access allowed) and a "private" directory that needs an existing login account/password for access.
-WebDavServer=Root URL of %s server: %s
+WebDAVSetupDesc=这是访问 WebDAV 目录的链接。它包含一个对知道 URL 的任何用户开放的“公共”目录（如果允许公共目录访问）和一个需要现有登录帐户/密码才能访问的“私人”目录。
+WebDavServer=%s 服务器的根 URL：%s
 ##### Webcal setup #####
 WebCalUrlForVCalExport=<b>%s</b>格式的导出文件可以通过链接 %s 下载
 ##### Invoices #####
 BillsSetup=发票模块设置
 BillsNumberingModule=发票与信用记录编号模块
 BillsPDFModules=发票文档模板
-BillsPDFModulesAccordindToInvoiceType=Invoice documents models according to invoice type
+BillsPDFModulesAccordindToInvoiceType=根据发票类型的发票文件模型
 PaymentsPDFModules=付款文件模型
 ForceInvoiceDate=强制发票中的日期为确认日期
-SuggestedPaymentModesIfNotDefinedInInvoice=Suggested payments mode on invoice by default if not defined on the invoice
-SuggestPaymentByRIBOnAccount=Suggest payment by withdrawal on account
-SuggestPaymentByChequeToAddress=Suggest payment by check to
+SuggestedPaymentModesIfNotDefinedInInvoice=如果未在发票上定义，则发票上的默认建议付款方式
+SuggestPaymentByRIBOnAccount=根据账户的提款方式来建议付款方式
+SuggestPaymentByChequeToAddress=建议以支票付款至
 FreeLegalTextOnInvoices=发票中的额外说明文本
 WatermarkOnDraftInvoices=发票草稿加水印(无则留空)
 PaymentsNumberingModule=付款编号模式
-SuppliersPayment=Vendor payments
-SupplierPaymentSetup=Vendor payments setup
-InvoiceCheckPosteriorDate=Check facture date before validation
-InvoiceCheckPosteriorDateHelp=Validating an invoice will be forbidden if its date is anterior to the date of last invoice of same type.
+SuppliersPayment=供应商付款
+SupplierPaymentSetup=供应商付款设置
+InvoiceCheckPosteriorDate=在验证前检查发票日期
+InvoiceCheckPosteriorDateHelp=如果发票日期早于最后一张同类型发票的日期，将禁止验证发票。
 ##### Proposals #####
 PropalSetup=报价单模块设置
 ProposalsNumberingModules=报价单编号模块
 ProposalsPDFModules=报价单文档模板
-SuggestedPaymentModesIfNotDefinedInProposal=Suggested payments mode on proposal by default if not defined on the proposal
+SuggestedPaymentModesIfNotDefinedInProposal=如果未在提案中定义，则默认为提案的建议付款方式
 FreeLegalTextOnProposal=报价单中的额外说明文本
 WatermarkOnDraftProposal=为商业计划书草案添加水印(无则留空)
 BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=询问银行账户
@@ -1449,8 +1453,8 @@ WAREHOUSE_ASK_WAREHOUSE_DURING_ORDER=要求仓库来源订购
 ##### Suppliers Orders #####
 BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDER=询问采购订单的银行帐户目的地
 ##### Orders #####
-SuggestedPaymentModesIfNotDefinedInOrder=Suggested payments mode on sales order by default if not defined on the order
-OrdersSetup=Sales Orders management setup
+SuggestedPaymentModesIfNotDefinedInOrder=如果订单上未定义，则默认销售订单上的建议付款方式
+OrdersSetup=销售订单管理设置
 OrdersNumberingModules=订单编号模块
 OrdersModelModule=订单文档模板
 FreeLegalTextOnOrders=订单中的额外说明文本
@@ -1473,12 +1477,12 @@ WatermarkOnDraftContractCards=为合同草案添加水印 (无则留空)
 MembersSetup=会员模块设置
 MemberMainOptions=主要选项
 AdherentLoginRequired= 管理人员登陆
-AdherentMailRequired=Email required to create a new member
+AdherentMailRequired=创建新成员必须输入电子邮件地址
 MemberSendInformationByMailByDefault=设置向会员发送邮件确认(会员确认或添加订阅)复选框默认为启用
-MemberCreateAnExternalUserForSubscriptionValidated=Create an external user login for each new member subscription validated
-VisitorCanChooseItsPaymentMode=Visitor can choose from available payment modes
-MEMBER_REMINDER_EMAIL=Enable automatic reminder <b>by email</b> of expired subscriptions. Note: Module <strong>%s</strong> must be enabled and correctly setup to send reminders.
-MembersDocModules=Document templates for documents generated from member record
+MemberCreateAnExternalUserForSubscriptionValidated=为每个经过验证的新订阅用户创建一个外部登录用户
+VisitorCanChooseItsPaymentMode=访客可以从可用的付款方式中选择
+MEMBER_REMINDER_EMAIL=通过电子邮件 </b> 启用订阅过期的自动提醒 <b>。注意：模块 <strong> %s </strong> 必须启用并正确设置才能发送提醒。
+MembersDocModules=从成员记录生成的文档的文档模板
 ##### LDAP setup #####
 LDAPSetup=LDAP 设置
 LDAPGlobalParameters=全局参数
@@ -1500,10 +1504,10 @@ LDAPSynchronizeMembersTypes=在LDAP中组织基金会的成员类型
 LDAPPrimaryServer=主服务器
 LDAPSecondaryServer=副服务器
 LDAPServerPort=服务器端口
-LDAPServerPortExample=Standard or StartTLS: 389, LDAPs: 636
+LDAPServerPortExample=标准或 StartTLS：389，LDAP：636
 LDAPServerProtocolVersion=协议版本
 LDAPServerUseTLS=使用 TLS
-LDAPServerUseTLSExample=Your LDAP server use StartTLS
+LDAPServerUseTLSExample=您的 LDAP 服务器使用 StartTLS
 LDAPServerDn=服务器的 DN
 LDAPAdminDn=管理员的 DN
 LDAPAdminDnExample=完整DN（例如：cn = admin，dc = example，dc = com或cn = Administrator，cn = Users，dc = example，dc = com表示活动目录）
@@ -1547,70 +1551,70 @@ LDAPTestSynchroMemberType=测试成员类型同步
 LDAPTestSearch= 测试 LDAP 搜索
 LDAPSynchroOK=同步测试成功
 LDAPSynchroKO=同步测试失败
-LDAPSynchroKOMayBePermissions=Failed synchronization test. Check that the connection to the server is correctly configured and allows LDAP updates
+LDAPSynchroKOMayBePermissions=同步测试失败。检查与服务器的连接是否正确配置并允许 LDAP 更新
 LDAPTCPConnectOK=TCP 连接到 LDAP 服务器连接成功 (服务器=%s, 端口=%s)
 LDAPTCPConnectKO=TCP 连接到 LDAP 服务器连接失败 (服务器=%s, 端口=%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)
+LDAPBindOK=连接/验证到 LDAP 服务器成功（服务器=%s，端口=%s，管理员=%s，密码=%s）
+LDAPBindKO=连接/验证 LDAP 服务器失败（服务器=%s，端口=%s，管理员=%s，密码=%s）
 LDAPSetupForVersion3=LDAP服务器版本配置为 v3
 LDAPSetupForVersion2=LDAP服务器版本配置为 v2
 LDAPDolibarrMapping=Dolibarr 映射
 LDAPLdapMapping=LDAP 映射
 LDAPFieldLoginUnix=登陆 (Unix)
-LDAPFieldLoginExample=Example: uid
+LDAPFieldLoginExample=例如：UID
 LDAPFilterConnection=筛选搜索
-LDAPFilterConnectionExample=Example: &(objectClass=inetOrgPerson)
-LDAPGroupFilterExample=Example: &(objectClass=groupOfUsers)
+LDAPFilterConnectionExample=例如：&(objectClass=inetOrgPerson)
+LDAPGroupFilterExample=例如：&(objectClass=groupOfUsers)
 LDAPFieldLoginSamba=登陆 (samba,activedirectory)
-LDAPFieldLoginSambaExample=Example: samaccountname
+LDAPFieldLoginSambaExample=例如：samaccountname
 LDAPFieldFullname=全名
-LDAPFieldFullnameExample=Example: cn
-LDAPFieldPasswordNotCrypted=Password not encrypted
-LDAPFieldPasswordCrypted=Password encrypted
-LDAPFieldPasswordExample=Example: userPassword
-LDAPFieldCommonNameExample=Example: cn
+LDAPFieldFullnameExample=例如：cn
+LDAPFieldPasswordNotCrypted=明文密码
+LDAPFieldPasswordCrypted=加密密码
+LDAPFieldPasswordExample=例如：用户密码
+LDAPFieldCommonNameExample=例如：cn
 LDAPFieldName=名称
-LDAPFieldNameExample=Example: sn
+LDAPFieldNameExample=例如：sn
 LDAPFieldFirstName=名
-LDAPFieldFirstNameExample=Example: givenName
+LDAPFieldFirstNameExample=例如：名
 LDAPFieldMail=电邮地址
-LDAPFieldMailExample=Example: mail
+LDAPFieldMailExample=例如：邮件
 LDAPFieldPhone=办公电话号码
-LDAPFieldPhoneExample=Example: telephonenumber
+LDAPFieldPhoneExample=例如：电话
 LDAPFieldHomePhone=个人电话号码
-LDAPFieldHomePhoneExample=Example: homephone
+LDAPFieldHomePhoneExample=例如：家庭电话
 LDAPFieldMobile=手机
-LDAPFieldMobileExample=Example: mobile
+LDAPFieldMobileExample=例如：手机
 LDAPFieldFax=传真
-LDAPFieldFaxExample=Example: facsimiletelephonenumber
+LDAPFieldFaxExample=例如：传真电话号码
 LDAPFieldAddress=街道
-LDAPFieldAddressExample=Example: street
+LDAPFieldAddressExample=示例：街道地址
 LDAPFieldZip=邮编
-LDAPFieldZipExample=Example: postalcode
+LDAPFieldZipExample=例如：邮政编码
 LDAPFieldTown=城镇
-LDAPFieldTownExample=Example: l
+LDAPFieldTownExample=例如： l
 LDAPFieldCountry=国家
 LDAPFieldDescription=描述
-LDAPFieldDescriptionExample=Example: description
+LDAPFieldDescriptionExample=例如 ：描述
 LDAPFieldNotePublic=公开备注
-LDAPFieldNotePublicExample=Example: publicnote
+LDAPFieldNotePublicExample=例如：公开备注
 LDAPFieldGroupMembers= 群组成员
-LDAPFieldGroupMembersExample= Example: uniqueMember
+LDAPFieldGroupMembersExample= 例如：uniqueMember
 LDAPFieldBirthdate=生日
 LDAPFieldCompany=公司
-LDAPFieldCompanyExample=Example: o
+LDAPFieldCompanyExample=例如：o
 LDAPFieldSid=SID
-LDAPFieldSidExample=Example: objectsid
+LDAPFieldSidExample=例如：objectsid
 LDAPFieldEndLastSubscription=订阅结束日期
 LDAPFieldTitle=岗位
 LDAPFieldTitleExample=例如: 标题
-LDAPFieldGroupid=Group id
-LDAPFieldGroupidExample=Exemple : gidnumber
-LDAPFieldUserid=User id
-LDAPFieldUseridExample=Exemple : uidnumber
-LDAPFieldHomedirectory=Home directory
-LDAPFieldHomedirectoryExample=Exemple : homedirectory
-LDAPFieldHomedirectoryprefix=Home directory prefix
+LDAPFieldGroupid=组ID
+LDAPFieldGroupidExample=例如：gidnumber
+LDAPFieldUserid=用户ID
+LDAPFieldUseridExample=例如：uidnumber
+LDAPFieldHomedirectory=主目录
+LDAPFieldHomedirectoryExample=例如：homedirectory
+LDAPFieldHomedirectoryprefix=主目录前缀
 LDAPSetupNotComplete=LDAP 的安装程序不完整的 (请检查其他选项卡)
 LDAPNoUserOrPasswordProvidedAccessIsReadOnly=未提供管理员名称或密码LDAP 将以只读模式匿名访问。
 LDAPDescContact=此页面中可以定义 Dolibarr 联系人各项数据在 LDAP 树中的 LDAP 属性名称。
@@ -1621,47 +1625,47 @@ LDAPDescMembersTypes=此页面允许您在LDAP树中为Dolibarr成员类型上
 LDAPDescValues=例值以载入如下模式的 <b>OpenLDAP</b>为例:<b>core.schema, cosine.schema, inetorgperson.schema</b>)如果您使用OpenLDAP和这些例值，请修改您的 LDAP 配置文件<b>slapd.conf</b>来载入全部这些模式。
 ForANonAnonymousAccess=存取访问要求验证， (例如读写访问)
 PerfDolibarr=性能设置/优化报告
-YouMayFindPerfAdviceHere=This page provides some checks or advice related to performance.
-NotInstalled=Not installed.
-NotSlowedDownByThis=Not slowed down by this.
-NotRiskOfLeakWithThis=Not risk of leak with this.
+YouMayFindPerfAdviceHere=此页面提供了一些与性能相关的检查或建议。
+NotInstalled=未安装。
+NotSlowedDownByThis=并没有因此而减慢。
+NotRiskOfLeakWithThis=没有泄漏的风险。
 ApplicativeCache=应用型缓存
 MemcachedNotAvailable=找不到应用缓存。您可以通过安装缓存服务器Memcached和能够使用此缓存服务器的模块来增强性能。<br>更多信息，请访问<a href="http://wiki.dolibarr.org/index.php/Module_MemCached_EN"> http： //wiki.dolibarr.org/index.php/Module_MemCached_EN </a>。请注意，很多网络托管服务提供商都没有提供此类缓存服务器。
 MemcachedModuleAvailableButNotSetup=找到应用程序缓存的memcached模块，但模块设置不完整。
 MemcachedAvailableAndSetup=启用专用于使用memcached服务器的模块memcached。
 OPCodeCache=操作码缓存
-NoOPCodeCacheFound=No OPCode cache found. Maybe you are using an OPCode cache other than XCache or eAccelerator (good), or maybe you don't have OPCode cache (very bad).
+NoOPCodeCacheFound=未找到 OPCode 缓存。也许您正在使用 XCache 或 eAccelerator 以外的 OPCode 缓存（好），或者您可能没有 OPCode 缓存（非常糟糕）。
 HTTPCacheStaticResources=HTTP缓存的静态资源（CSS，JavaScript，IMG）
 FilesOfTypeCached=HTTP服务器 %s 类型的文件缓存
 FilesOfTypeNotCached=HTTP服务器不缓存的文件类型%s
 FilesOfTypeCompressed=HTTP服务器 %s 类型的文件被压缩
 FilesOfTypeNotCompressed=HTTP服务器 %s 类型的文件不会被压缩
 CacheByServer=缓存服务器
-CacheByServerDesc=For example using the Apache directive "ExpiresByType image/gif A2592000"
+CacheByServerDesc=例如使用 Apache 指令“ExpiresByType image/gif A2592000”
 CacheByClient=通过浏览器缓存
 CompressionOfResources=压缩的HTTP响应
-CompressionOfResourcesDesc=For example using the Apache directive "AddOutputFilterByType DEFLATE"
+CompressionOfResourcesDesc=例如使用 Apache 指令“AddOutputFilterByType DEFLATE”
 TestNotPossibleWithCurrentBrowsers=这种自动检测在该浏览器中不适用
-DefaultValuesDesc=Here you may define the default value you wish to use when creating a new record, and/or default filters or the sort order when you list records.
-DefaultCreateForm=Default values (to use on forms)
+DefaultValuesDesc=在这里，您可以定义创建新记录时希望使用的默认值，和/或列出记录时的默认过滤器或排序顺序。
+DefaultCreateForm=默认值（用于表单）
 DefaultSearchFilters=默认搜索过滤器
 DefaultSortOrder=默认排序顺序
 DefaultFocus=默认焦点字段
-DefaultMandatory=Mandatory form fields
+DefaultMandatory=必填表单域
 ##### Products #####
 ProductSetup=产品模块设置
 ServiceSetup=服务模块设置
 ProductServiceSetup=产品和服务模块的设置
-NumberOfProductShowInSelect=Maximum number of products to show in combo select lists (0=no limit)
-ViewProductDescInFormAbility=Display product descriptions in lines of items (otherwise show description in a tooltip popup)
-OnProductSelectAddProductDesc=How to use the description of the products when adding a product as a line of a document
-AutoFillFormFieldBeforeSubmit=Auto fill the description input field with the description of product
-DoNotAutofillButAutoConcat=Do not autofill the input field with description of product. Description of the product will be concatenated to the entered description automatically.
-DoNotUseDescriptionOfProdut=Description of the product will never be included into the description of lines of documents
+NumberOfProductShowInSelect=组合选择列表中显示的最大产品数量（0=无限制）
+ViewProductDescInFormAbility=在项目行中显示产品描述（否则在工具提示弹出窗口中显示描述）
+OnProductSelectAddProductDesc=将产品添加为文档行时如何使用产品描述
+AutoFillFormFieldBeforeSubmit=使用产品描述自动填充描述字段
+DoNotAutofillButAutoConcat=不要使用产品描述自动填充输入字段。产品描述将自动连接到输入的描述。
+DoNotUseDescriptionOfProdut=产品描述永远不会包含在文档行的描述中
 MergePropalProductCard=在产品/服务附加文件选项卡中激活如果产品/服务在提案中，则将产品PDF文档合并到提案PDF azur的选项
-ViewProductDescInThirdpartyLanguageAbility=Display products descriptions in forms in the language of the third party (otherwise in the language of the user)
-UseSearchToSelectProductTooltip=Also if you have a large number of products (> 100 000), you can increase speed by setting constant PRODUCT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
-UseSearchToSelectProduct=Wait until you press a key before loading content of product combo list (This may increase performance if you have a large number of products, but it is less convenient)
+ViewProductDescInThirdpartyLanguageAbility=以第三方的语言（否则以用户的语言）在表单中显示产品描述
+UseSearchToSelectProductTooltip=此外，如果您有大量产品 (> 100 000)，您可以通过在 设置->其他中将常量 PRODUCT_DONOTSEARCH_ANYWHERE 设置为 1 来提高速度。然后搜索将被限制在字符串的开头。
+UseSearchToSelectProduct=等到你按下一个键再加载产品组合列表的内容（如果你有很多产品，这可能会提高性能，但不太方便）
 SetDefaultBarcodeTypeProducts=默认的条码类型
 SetDefaultBarcodeTypeThirdParties=合作方默认条码类型
 UseUnits=在订单，建议或发票行版本中定义数量的度量单位
@@ -1676,9 +1680,9 @@ SyslogLevel=级别
 SyslogFilename=文件名称和路径
 YouCanUseDOL_DATA_ROOT=您可以使用 DOL_DATA_ROOT/dolibarr.log 来表示“documents”目录下的日志文件。您可以设置不同的路径来保存此文件。
 ErrorUnknownSyslogConstant=常量 %s 不是已知的 Syslog 常数
-OnlyWindowsLOG_USER=On Windows, only the LOG_USER facility will be supported
+OnlyWindowsLOG_USER=在 Windows 上，仅支持 LOG_USER 工具
 CompressSyslogs=压缩和备份调试日志文件（由模块Log生成以进行调试）
-SyslogFileNumberOfSaves=Number of backup logs to keep
+SyslogFileNumberOfSaves=要保留的备份日志数量
 ConfigureCleaningCronjobToSetFrequencyOfSaves=配置清理预定作业以设置日志备份频率
 ##### Donations #####
 DonationsSetup=捐赠模块设置
@@ -1702,7 +1706,7 @@ GenbarcodeLocation=条形码生成命令行工具（内部引擎用于某些条
 BarcodeInternalEngine=内部引擎
 BarCodeNumberManager=自动定义条形码管理器
 ##### Prelevements #####
-WithdrawalsSetup=Setup of module Direct Debit payments
+WithdrawalsSetup=设置直接借记付款模块
 ##### ExternalRSS #####
 ExternalRSSSetup=外部 RSS 的导入设置
 NewRSS=新增 RSS 源
@@ -1710,22 +1714,22 @@ RSSUrl=RSS 链接
 RSSUrlExample=感兴趣的 RSS 源
 ##### Mailing #####
 MailingSetup=电邮发送模块设置
-MailingEMailFrom=Sender email (From) for emails sent by emailing module
-MailingEMailError=Return Email (Errors-to) for emails with errors
+MailingEMailFrom=用于电子邮件模的发件人电子邮件地址（发件人）
+MailingEMailError=用于有错误的电子邮件的退信地址（Errors-to）
 MailingDelay=在发送下一条信息时等待几秒
 ##### Notification #####
-NotificationSetup=Email Notification module setup
-NotificationEMailFrom=Sender email (From) for emails sent by the Notifications module
+NotificationSetup=电子邮件通知模块设置
+NotificationEMailFrom=通知模块使用的发件人电子邮件（发件人）
 FixedEmailTarget=接收方
-NotificationDisableConfirmMessageContact=Hide the list of recipients (subscribed as contact) of notifications into the confirmation message
-NotificationDisableConfirmMessageUser=Hide the list of recipients (subscribed as user) of notifications into the confirmation message
-NotificationDisableConfirmMessageFix=Hide the list of recipients (subscribed as global email) of notifications into the confirmation message
+NotificationDisableConfirmMessageContact=在确认消息中隐藏通知的收件人列表（订阅为联系人）
+NotificationDisableConfirmMessageUser=在确认消息中隐藏通知的收件人列表（订阅为用户）
+NotificationDisableConfirmMessageFix=在确认消息中隐藏通知的收件人列表（订阅为全局邮件）
 ##### Sendings #####
-SendingsSetup=Shipping module setup
+SendingsSetup=运输模块设置
 SendingsReceiptModel=运输模板
 SendingsNumberingModules=运输编号模块
 SendingsAbility=支持为客户送货时采用发货单
-NoNeedForDeliveryReceipts=In most cases, shipping sheets are used both as sheets for customer deliveries (list of products to send) and sheets that are received and signed by customer. Hence the product deliveries receipt is a duplicated feature and is rarely activated.
+NoNeedForDeliveryReceipts=在大多数情况下，发货单既用作客户交付的表（要发送的产品列表），也用作客户接收和签名的单据。因此，产品交货收据是一个重复的功能，很少被激活。
 FreeLegalTextOnShippings=运单中的额外说明文本
 ##### Deliveries #####
 DeliveryOrderNumberingModules=收货回执编号模块
@@ -1735,28 +1739,28 @@ FreeLegalTextOnDeliveryReceipts=收货回执中的额外说明文本
 ##### FCKeditor #####
 AdvancedEditor=高级编辑
 ActivateFCKeditor=为以下为功能启用高级编辑器功能:
-FCKeditorForNotePublic=WYSIWIG creation/edition of the field "public notes" of elements
-FCKeditorForNotePrivate=WYSIWIG creation/edition of the field "private notes" of elements
-FCKeditorForCompany=WYSIWIG creation/edition of the field description of elements (except products/services)
-FCKeditorForProduct=WYSIWIG creation/edition of the field description of products/services
-FCKeditorForProductDetails=WYSIWIG creation/edition of products details lines for all entities (proposals, orders, invoices, etc...). <span class="warning">Warning: Using this option for this case is seriously not recommended as it can create problems with special characters and page formatting when building PDF files.</span>
+FCKeditorForNotePublic=所见即所得方式创建/编辑元素的“公共笔记”字段
+FCKeditorForNotePrivate=所见即所得方式创建/编辑元素的“内部笔记”字段
+FCKeditorForCompany=所见即所得方式创建/编辑元素的描述字段（产品/服务除外）
+FCKeditorForProduct=所见即所得方式创建/编辑产品/服务的描述字段
+FCKeditorForProductDetails=所见即所得创建/编辑所有实体（提案、订单、发票等）的产品详细信息行。 <span class="warning"> 警告：严重不建议在这种情况下使用此选项，因为它会在构建 PDF 文件时产生特殊字符和页面格式问题。 </span>
 FCKeditorForMailing= 以所见即所得方式创建/编辑群发邮件(工具->电邮寄送)
 FCKeditorForUserSignature=以所见即所得方式创建/编辑用户签名
 FCKeditorForMail=所有邮件的WYSIWIG创建/版本（工具 - > eMailing除外）
-FCKeditorForTicket=WYSIWIG creation/edition for tickets
+FCKeditorForTicket=所见即所得方式创建/编辑工单
 ##### Stock #####
 StockSetup=库存模块设置
-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=如果您使用默认提供的销售点模块 (POS) 或外部模块，您的 POS 模块可能会忽略此设置。大多数 POS 模块默认设计为立即创建发票并减少库存，无论此处的选项如何。因此，如果您在从 POS 销售时需要或不需要减少库存，请检查您的 POS 模块设置。
 ##### Menu #####
 MenuDeleted=菜单(项)已删除
-Menu=Menu
+Menu=菜单
 Menus=菜单
 TreeMenuPersonalized=个性化选单
 NotTopTreeMenuPersonalized=个性化菜单未链接到顶部菜单条目
 NewMenu=新建菜单
 MenuHandler=菜单处理程序
 MenuModule=源模块
-HideUnauthorizedMenu=Hide unauthorized menus also for internal users (just greyed otherwise)
+HideUnauthorizedMenu=对内部用户隐藏未经授权的菜单（否则为变灰）
 DetailId=菜单编号
 DetailMenuHandler=菜单处理程序 (决定何处显示新菜单)
 DetailMenuModule=模块名称 (如果菜单项来自模块)
@@ -1768,7 +1772,7 @@ DetailRight=菜单显示为变灰禁用的条件
 DetailLangs=标签翻译使用的 .lang 文件名
 DetailUser=内部 / 外部 / 全部
 Target=目标
-DetailTarget=Target for links (_blank top opens a new window)
+DetailTarget=链接的目标（使用_blank 打开新窗口/标签）
 DetailLevel=级 (-1：顶部菜单，0：头菜单，> 0菜单和子菜单)
 ModifMenu=菜单变化
 DeleteMenu=删除选单项
@@ -1779,11 +1783,11 @@ TaxSetup=财政税和增值税模块设置
 OptionVatMode=增值税到期
 OptionVATDefault=标准依据
 OptionVATDebitOption=权责发生制
-OptionVatDefaultDesc=VAT is due:<br>- on delivery of goods (based on invoice date)<br>- on payments for services
-OptionVatDebitOptionDesc=VAT is due:<br>- on delivery of goods (based on invoice date)<br>- on invoice (debit) for services
+OptionVatDefaultDesc=应缴纳增值税： <br> - 货物交付（基于发票日期） <br> - 服务付款
+OptionVatDebitOptionDesc=应缴纳增值税： <br> - 货物交付时（基于发票日期） <br> - 服务发票（借机单）
 OptionPaymentForProductAndServices=产品和服务的现金基础
 OptionPaymentForProductAndServicesDesc=增值税到期：<br>  - 货物付款<br>  - 服务付款
-SummaryOfVatExigibilityUsedByDefault=Time of VAT eligibility by default according to chosen option:
+SummaryOfVatExigibilityUsedByDefault=根据所选选项的默认增值税资格时间：
 OnDelivery=交货时
 OnPayment=付款时
 OnInvoice=发出发票时
@@ -1796,56 +1800,56 @@ YourCompanyDoesNotUseVAT=贵公司已被定义为不含增值税 (首页->设定
 AccountancyCode=科目代码
 AccountancyCodeSell=销售账户代码
 AccountancyCodeBuy=采购账户代码
-CREATE_NEW_VAT_WITHOUT_AUTO_PAYMENT=Keep the checkbox “Automatically create the payment” empty by default when creating a new tax
+CREATE_NEW_VAT_WITHOUT_AUTO_PAYMENT=创建新税时，默认将“自动创建付款”复选框保留为空
 ##### Agenda #####
 AgendaSetup=事件及行程模块设置
 PasswordTogetVCalExport=导出链接的授权密钥
-SecurityKey = Security Key
+SecurityKey = 安全密钥
 PastDelayVCalExport=不导出早于这个日期的时间
-AGENDA_USE_EVENT_TYPE=Use events types (managed in menu Setup -> Dictionaries -> Type of agenda events)
-AGENDA_USE_EVENT_TYPE_DEFAULT=Automatically set this default value for type of event in event create form
-AGENDA_DEFAULT_FILTER_TYPE=Automatically set this type of event in search filter of agenda view
-AGENDA_DEFAULT_FILTER_STATUS=Automatically set this status for events in search filter of agenda view
-AGENDA_DEFAULT_VIEW=Which view do you want to open by default when selecting menu Agenda
-AGENDA_REMINDER_BROWSER=Enable event reminder <b>on user's browser</b> (When remind date is reached, a popup is shown by the browser. Each user can disable such notifications from its browser notification setup).
+AGENDA_USE_EVENT_TYPE=使用事件类型（在菜单设置 -> 词典 -> 议程事件类型中管理）
+AGENDA_USE_EVENT_TYPE_DEFAULT=在事件创建表单中自动为事件类型设置此默认值
+AGENDA_DEFAULT_FILTER_TYPE=自动将此事件设置为议程视图的搜索过滤器
+AGENDA_DEFAULT_FILTER_STATUS=自动将此状态设置为议程视图的搜索过滤器
+AGENDA_DEFAULT_VIEW=选择菜单议程时默认打开哪个视图
+AGENDA_REMINDER_BROWSER=在用户的浏览器 </b> 上启用事件提醒 <b>（到达提醒日期时，浏览器会显示一个弹出窗口。每个用户都可以从其浏览器通知设置中禁用此类通知）。
 AGENDA_REMINDER_BROWSER_SOUND=启用声音通知
-AGENDA_REMINDER_EMAIL=Enable event reminder <b>by emails</b> (remind option/delay can be defined on each event).
-AGENDA_REMINDER_EMAIL_NOTE=Note: The frequency of the scheduled job %s must be enough to be sure that the remind are sent at the correct moment.
+AGENDA_REMINDER_EMAIL=启用<b>通过电子邮件</b>发送事件提醒 （可以在每个事件上定义提醒选项/延迟）。
+AGENDA_REMINDER_EMAIL_NOTE=注意：计划作业 %s 的频率必须足以确保在正确的时刻发送提醒。
 AGENDA_SHOW_LINKED_OBJECT=将链接对象显示在议程视图中
 ##### Clicktodial #####
 ClickToDialSetup=点击拨号模块设置
 ClickToDialUrlDesc=当点击手机图片完成时，网址会被呼叫。在网址中，您可以使用标记为<br> <b> __ PHONETO __ </b>，这些标记将替换为要拨打电话号码的人员的电话号码<br><b> __ PHONEFROM __ </b>将替换为通话电话号码person（你的）<br> <b> __ LOGIN __</b>将替换为clicktodial登录（在用户卡上定义）<br> <b> __ PASS __ </b>将替换为clicktodial密码（在用户上定义）卡）。
-ClickToDialDesc=This module change phone numbers, when using a desktop computer, into clickable links. A click will call the number. This can be used to start the phone call when using a soft phone on your desktop or when using a CTI system based on SIP protocol for example. Note: When using a smartphone, phone numbers are always clickable.
+ClickToDialDesc=在使用桌面计算机时此模块会将电话号码更改为可点击的链接，单击将呼叫该号码。例如，当在桌面上使用软电话或使用基于 SIP 协议的 CTI 系统时，这可用于启动电话呼叫。注意：使用智能手机时，电话号码始终是可点击的。
 ClickToDialUseTelLink=在电话号码上链接 "tel:"
-ClickToDialUseTelLinkDesc=Use this method if your users have a softphone or a software interface, installed on the same computer as the browser, and called when you click on a link starting with "tel:" in your browser. If you need a link that start with "sip:" or a full server solution (no need of local software installation), you must set this to "No" and fill the next field.
+ClickToDialUseTelLinkDesc=如果您的用户有软件电话或软件界面，安装在与浏览器相同的计算机上，并在您单击浏览器中以“tel:”开头的链接时可以调用，请使用此方法。如果您需要以“sip:”开头的链接或完整的服务器解决方案（无需安装本地软件），您必须将其设置为“否”并填写下一个字段。
 ##### Point Of Sale (CashDesk) #####
-CashDesk=Point of Sale
-CashDeskSetup=Point of Sales module setup
-CashDeskThirdPartyForSell=Default generic third party to use for sales
+CashDesk=销售点
+CashDeskSetup=销售点模块设置
+CashDeskThirdPartyForSell=用于销售的默认通用第三方
 CashDeskBankAccountForSell=接收现金付款的默认帐户
-CashDeskBankAccountForCheque=Default account to use to receive payments by check
+CashDeskBankAccountForCheque=用于接收支票付款的默认帐户
 CashDeskBankAccountForCB=接收信用卡支付的默认帐户
-CashDeskBankAccountForSumup=Default bank account to use to receive payments by SumUp
-CashDeskDoNotDecreaseStock=Disable stock decrease when a sale is done from Point of Sale (if "no", stock decrease is done for each sale done from POS, irrespective of the option set in module Stock).
+CashDeskBankAccountForSumup=用于接收 SumUp 付款的默认银行帐户
+CashDeskDoNotDecreaseStock=禁用POS模块销售时的库存减少功能（如果选择”否“，则无论库存模块设置如何，每一笔经过POS模块的销售都会减掉该商品的库存）。
 CashDeskIdWareHouse=强制和限制仓库库存减少
-StockDecreaseForPointOfSaleDisabled=Stock decrease from Point of Sale disabled
-StockDecreaseForPointOfSaleDisabledbyBatch=Stock decrease in POS is not compatible with module Serial/Lot management (currently active) so stock decrease is disabled.
-CashDeskYouDidNotDisableStockDecease=You did not disable stock decrease when making a sale from Point of Sale. Hence a warehouse is required.
-CashDeskForceDecreaseStockLabel=Stock decrease for batch products was forced.
-CashDeskForceDecreaseStockDesc=Decrease first by the oldest eatby and sellby dates.
-CashDeskReaderKeyCodeForEnter=Key code for "Enter" defined in barcode reader (Example: 13)
+StockDecreaseForPointOfSaleDisabled=POS模块减少库存功能被禁用
+StockDecreaseForPointOfSaleDisabledbyBatch=POS 中的库存减少与模块序列号/批号管理（当前处于活动状态）不兼容，因此库存减少已被禁用。
+CashDeskYouDidNotDisableStockDecease=你没有禁用POS模块的减少库存功能，所以必须有一个仓库可以使用。
+CashDeskForceDecreaseStockLabel=已强制启用有序列号/批号的产品的库存减少。
+CashDeskForceDecreaseStockDesc=首先按最旧的eatby 和sellby 日期减少。
+CashDeskReaderKeyCodeForEnter=巴枪中定义的“Enter”键码（示例：13）
 ##### Bookmark #####
 BookmarkSetup=书签模块设置
-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.
+BookmarkDesc=该模块允许您管理书签。您还可以在左侧菜单中添加任何 Dolibarr 页面或外部网站的快捷方式。
 NbOfBoomarkToShow=左侧菜单中显示书签的最大数量
 ##### WebServices #####
 WebServicesSetup=SOAP Webservice 模块设置
-WebServicesDesc=启用此模块，Dolibarr成为Web服务器提供其他Web服务。
+WebServicesDesc=通过启用此模块，Dolibarr将成为提供各种杂项Web服务的服务器。
 WSDLCanBeDownloadedHere=提供服务的 WSDL描述文件可以从此处下载
 EndPointIs=SOAP客户端必须将其请求发送到URL上提供的Dolibarr端点
 ##### API ####
 ApiSetup=API模块设置
-ApiDesc=通过启用此模块，Dolibarr成为REST服务器以提供各种Web服务。
+ApiDesc=通过启用此模块，Dolibarr将成为提供各种杂项Web服务的REST服务器。
 ApiProductionMode=启用生产模式（这将激活使用缓存进行服务管理）
 ApiExporerIs=您可以在URL上浏览和测试API
 OnlyActiveElementsAreExposed=仅公开已启用模块中的元素
@@ -1853,25 +1857,25 @@ ApiKey=API的Key
 WarningAPIExplorerDisabled=API资源管理器已被禁用。 API资源管理器不需要提供API服务。它是开发人员查找/测试REST API的工具。如果您需要此工具，请进入模块API REST的设置以激活它。
 ##### Bank #####
 BankSetupModule=银行模块设置
-FreeLegalTextOnChequeReceipts=Free text on check receipts
+FreeLegalTextOnChequeReceipts=支票收据上的自由文本
 BankOrderShow=Display order of bank accounts for countries using "detailed bank number"
 BankOrderGlobal=一般
 BankOrderGlobalDesc=一般的显示顺序
 BankOrderES=西班牙语
 BankOrderESDesc=西班牙语显示顺序
-ChequeReceiptsNumberingModule=Check Receipts Numbering Module
+ChequeReceiptsNumberingModule=支票收据编号模块
 ##### Multicompany #####
 MultiCompanySetup=多公司模块设置
 ##### Suppliers #####
-SuppliersSetup=Vendor module setup
-SuppliersCommandModel=Complete template of Purchase Order
-SuppliersCommandModelMuscadet=Complete template of Purchase Order (old implementation of cornas template)
-SuppliersInvoiceModel=Complete template of Vendor Invoice
-SuppliersInvoiceNumberingModel=Vendor invoices numbering models
-IfSetToYesDontForgetPermission=If set to a non null value, don't forget to provide permissions to groups or users allowed for the second approval
+SuppliersSetup=供应商模块设置
+SuppliersCommandModel=完整的采购订单模板
+SuppliersCommandModelMuscadet=完整的采购订单模板（基于cornas 模板的旧实现）
+SuppliersInvoiceModel=供应商发票的完整模板
+SuppliersInvoiceNumberingModel=供应商发票编号模型
+IfSetToYesDontForgetPermission=如果设置为非空值，请不要忘记向允许进行二次审核的组或用户授予权限
 ##### GeoIPMaxmind #####
 GeoIPMaxmindSetup=Maxmind Geoip 模块设置
-PathToGeoIPMaxmindCountryDataFile=Path to file containing Maxmind ip to country translation.<br>Examples:<br>/usr/local/share/GeoIP/GeoIP.dat<br>/usr/share/GeoIP/GeoIP.dat<br>/usr/share/GeoIP/GeoLite2-Country.mmdb
+PathToGeoIPMaxmindCountryDataFile=包含 Maxmind IP到国家/地区转换文件的路径。 <br> 示例： <br> /usr/local/share/GeoIP/GeoIP.dat <br> /usr/share/GeoIP/GeoIP.dat <br> /usr/share/GeoIP/GeoLite2-Country.mmdb
 NoteOnPathLocation=注意此数据文件所处目录您的PHP必需能读取(检查您 PHP 的 open_basedir 设置和文件系统权限)。
 YouCanDownloadFreeDatFileTo=您可以下载 Maxmind网站的GeoIP全球IP地址数据库 <b>免费演示版</b> 的国家地理位置数据文件，地址是 %s。
 YouCanDownloadAdvancedDatFileTo=您也可以下载<b>更加完整更新更快的</b> Maxmind GeoIP 国家文件版本，地址是 %s。
@@ -1882,7 +1886,7 @@ ProjectsSetup=项目模块设置
 ProjectsModelModule=项目报告文档模板
 TasksNumberingModules=任务编号模块
 TaskModelModule=任务报告文档模板
-UseSearchToSelectProject=Wait until a key is pressed before loading content of Project combo list.<br>This may improve performance if you have a large number of projects, but it is less convenient.
+UseSearchToSelectProject=直到按下某个键再加载项目组合列表的内容。 <br> 如果您有大量项目，这可能会提高性能，但不太方便。
 ##### ECM (GED) #####
 ##### Fiscal Year #####
 AccountingPeriods=会计期间
@@ -1903,72 +1907,72 @@ NoAmbiCaracAutoGeneration=不使用模糊字符 (例如"1","l","i","|","0","O")
 SalariesSetup=薪酬模块设置
 SortOrder=排序顺序
 Format=格式
-TypePaymentDesc=0:Customer payment type, 1:Vendor payment type, 2:Both customers and suppliers payment type
+TypePaymentDesc=0：客户支付类型，1：供应商支付类型，2：客户和供应商支付类型
 IncludePath=包含路径 (定义变量 %s)
 ExpenseReportsSetup=费用报表模块设置
 TemplatePDFExpenseReports=用于生成费用报表文件的文件模板
 ExpenseReportsRulesSetup=模块费用报告的设置 - 规则
 ExpenseReportNumberingModules=费用报告编号模块
 NoModueToManageStockIncrease=没有能够管理自动库存增加的模块已被激活。库存增加仅在手动输入时完成。
-YouMayFindNotificationsFeaturesIntoModuleNotification=You may find options for email notifications by enabling and configuring the module "Notification".
-TemplatesForNotifications=Templates for notifications
-ListOfNotificationsPerUser=List of automatic notifications per user*
-ListOfNotificationsPerUserOrContact=List of possible automatic notifications (on business event) available per user* or per contact**
-ListOfFixedNotifications=List of automatic fixed notifications
-GoOntoUserCardToAddMore=Go to the tab "Notifications" of a user to add or remove notifications for users
-GoOntoContactCardToAddMore=Go to the tab "Notifications" of a third party to add or remove notifications for contacts/addresses
+YouMayFindNotificationsFeaturesIntoModuleNotification=您可以通过启用和配置“通知”模块找到电子邮件通知的选项。
+TemplatesForNotifications=通知模板
+ListOfNotificationsPerUser=每个用户的自动通知列表*
+ListOfNotificationsPerUserOrContact=每个用户*或每个联系人**可用的自动通知列表（关于商业活动）
+ListOfFixedNotifications=自动固定通知列表
+GoOntoUserCardToAddMore=转到用户的“通知”选项卡以添加或删除用户的通知
+GoOntoContactCardToAddMore=转到第三方的“通知”选项卡以添加或删除联系人/地址的通知
 Threshold=阈值
-BackupDumpWizard=Wizard to build the database dump file
-BackupZipWizard=Wizard to build the archive of documents directory
+BackupDumpWizard=建立数据库转储文件的向导
+BackupZipWizard=建立documents目录压缩包的向导
 SomethingMakeInstallFromWebNotPossible=由于以下原因，无法从Web界面安装外部模块：
-SomethingMakeInstallFromWebNotPossible2=For this reason, process to upgrade described here is a manual process only a privileged user may perform.
+SomethingMakeInstallFromWebNotPossible2=因此，此处描述的升级过程是只有特权用户才能执行的手动过程。
 InstallModuleFromWebHasBeenDisabledByFile=管理员已禁用从应用程序安装外部模块。您必须要求他删除文件<strong> %s </strong>以允许此功能。
 ConfFileMustContainCustom=从应用程序安装或构建外部模块需要将模块文件保存到目录<strong> %s</strong>中。要让Dolibarr处理此目录，您必须设置<strong> conf / conf.php </strong>以添加2个指令行：<br> <strong> $ dolibarr_main_url_root_alt ='/ custom'; </strong> <br>的<strong> $ dolibarr_main_document_root_alt = '%s /自定义';</strong>
 HighlightLinesOnMouseHover=当鼠标经过表格明细时高亮显示
-HighlightLinesColor=Highlight color of the line when the mouse passes over (use 'ffffff' for no highlight)
-HighlightLinesChecked=Highlight color of the line when it is checked (use 'ffffff' for no highlight)
-UseBorderOnTable=Show left-right borders on tables
-BtnActionColor=Color of the action button
-TextBtnActionColor=Text color of the action button
+HighlightLinesColor=鼠标经过时突出显示线条的颜色（使用 'ffffff' 不突出显示）
+HighlightLinesChecked=选中时突出显示线条的颜色（使用 'ffffff' 表示不突出显示）
+UseBorderOnTable=在表格上显示左右边框
+BtnActionColor=操作按钮的颜色
+TextBtnActionColor=操作按钮的文本颜色
 TextTitleColor=页面标题的文字颜色
 LinkColor=颜色链接
 PressF5AfterChangingThis=在键盘上按CTRL + F5或更改此值后清除浏览器缓存以使其生效
 NotSupportedByAllThemes=将与核心主题一起使用，可能不受外部主题的支持
 BackgroundColor=背景颜色
 TopMenuBackgroundColor=顶部菜单背景颜色
-TopMenuDisableImages=Icon or Text in Top menu
+TopMenuDisableImages=顶部菜单中的图标或文本
 LeftMenuBackgroundColor=左侧菜单背景颜色
 BackgroundTableTitleColor=清单表格表头背景颜色
 BackgroundTableTitleTextColor=表标题行的文本颜色
-BackgroundTableTitleTextlinkColor=Text color for Table title link line
+BackgroundTableTitleTextlinkColor=表格标题链接线的文本颜色
 BackgroundTableLineOddColor=表格奇数背景颜色
 BackgroundTableLineEvenColor=表格偶数背景颜色
 MinimumNoticePeriod=最小通知间隔
 NbAddedAutomatically=每月添加到用户计数器（自动）的天数
-EnterAnyCode=This field contains a reference to identify the line. Enter any value of your choice, but without special characters.
-Enter0or1=Enter 0 or 1
-UnicodeCurrency=Enter here between braces, list of byte number that represent the currency symbol. For example: for $, enter [36] - for brazil real R$ [82,36] - for €, enter [8364]
+EnterAnyCode=此字段包含用于标识行的引用。输入您选择的任何值，但不要输入特殊字符。
+Enter0or1=输入 0 或 1
+UnicodeCurrency=在大括号之间输入代表货币符号的字节数列表。例如：对于 $，输入 [36] - 对于巴西雷亚尔 R$ [82,36] - 对于 €，输入 [8364]
 ColorFormat=RGB颜色采用HEX格式，例如：FF0000
-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>- fonwtawesome_xxx_fa_color_size for a FontAwesome fa-xxx picto (with prefix, color and size set)
+PictoHelp=图标名称的格式： <br> - image.png 用于将图像文件放入当前主题目录 <br> 如果文件位于模块的目录 /img/ 中，- image.png@module  <br> - fa-xxx 用于 FontAwesome fa-xxx picto <br> - FontAwesome fa-xxx picto 的 fonwtawesome_xxx_fa_color_size（带有前缀、颜色和大小设置）
 PositionIntoComboList=行位置到组合列表中
-SellTaxRate=Sales tax rate
+SellTaxRate=销售税率
 RecuperableOnly=适用于法国某些州的增值税“Not Perceived but Recoverable”是的。在所有其他情况下，将值保持为“否”。
-UrlTrackingDesc=If the provider or transport service offers a page or web site to check the status of your shipments, you may enter it here. You can use the key {TRACKID} in the URL parameters so the system will replace it with the tracking number the user entered into the shipment card.
-OpportunityPercent=When you create a lead, you will define an estimated amount of project/lead. According to status of the lead, this amount may be multiplied by this rate to evaluate a total amount all your leads may generate. Value is a percentage (between 0 and 100).
-TemplateForElement=This mail template is related to what type of object? An email template is available only when using the "Send Email" button from the related object.
+UrlTrackingDesc=如果供应商或运输服务提供页面或网站来检查您的货件状态，您可以在此处输入。您可以在 URL 参数中使用键 {TRACKID}，以便系统将其替换为用户在货件卡中输入的跟踪号。
+OpportunityPercent=创建潜在客户时，您将定义项目/潜在客户的估计金额。根据潜在客户的状态，此金额可能会乘以此比率来评估您的所有潜在客户可能产生的总金额。值是一个百分比（介于 0 和 100 之间）。
+TemplateForElement=此邮件模板与什么类型的对象相关？电子邮件模板仅在使用相关对象中的“发送电子邮件”按钮时可用。
 TypeOfTemplate=模板类型
-TemplateIsVisibleByOwnerOnly=Template is visible to owner only
+TemplateIsVisibleByOwnerOnly=模板仅对所有者可见
 VisibleEverywhere=四处可见
 VisibleNowhere=无处可见
 FixTZ=时区修复
 FillFixTZOnlyIfRequired=例：+2 (只有问题发生时才填写)
 ExpectedChecksum=预计校验
 CurrentChecksum=当前校验
-ExpectedSize=Expected size
-CurrentSize=Current size
+ExpectedSize=预期规模
+CurrentSize=目前的规模
 ForcedConstants=必需的常量值
 MailToSendProposal=客户报价
-MailToSendOrder=Sales orders
+MailToSendOrder=销售订单
 MailToSendInvoice=客户发票
 MailToSendShipment=运输
 MailToSendIntervention=干预
@@ -1977,30 +1981,31 @@ MailToSendSupplierOrder=订单
 MailToSendSupplierInvoice=供应商发票
 MailToSendContract=合同
 MailToSendReception=Receptions
+MailToExpenseReport=费用报表
 MailToThirdparty=合作方
 MailToMember=会员
 MailToUser=用户
 MailToProject=项目
-MailToTicket=票据
+MailToTicket=工单
 ByDefaultInList=默认显示列表视图
 YouUseLastStableVersion=您使用最新的稳定版本
 TitleExampleForMajorRelease=您可以用来宣布此主要版本的消息示例（可以在您的网站上使用它）
 TitleExampleForMaintenanceRelease=您可以用来宣布此维护版本的消息示例（可以在您的网站上使用它）
 ExampleOfNewsMessageForMajorRelease=Dolibarr ERP＆CRM %s可用。版本%s是一个主要版本，为用户和开发人员提供了许多新功能。您可以从https://www.dolibarr.org portal（子目录稳定版本）的下载区下载它。您可以阅读<a href="https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog"> ChangeLog </a>以获取完整的更改列表。
-ExampleOfNewsMessageForMaintenanceRelease=Dolibarr ERP & CRM %s is available. Version %s is a maintenance version, so contains only bug fixes. We recommend all users to upgrade to this version. A maintenance release does not introduce new features or changes to the database. You may download it from the download area of https://www.dolibarr.org portal (subdirectory Stable versions). You can read the <a href="https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog">ChangeLog</a> for complete list of changes.
-MultiPriceRuleDesc=When option "Several levels of prices per product/service" is enabled, you can define different prices (one per price level) for each product. To save you time, here you may enter a rule to autocalculate a price for each level based on the price of the first level, so you will have to only enter a price for the first level for each product. This page is designed to save you time but is useful only if your prices for each level are relative to first level. You can ignore this page in most cases.
+ExampleOfNewsMessageForMaintenanceRelease=Dolibarr ERP & CRM %s 可用。版本 %s 是维护版本，因此仅包含错误修复。我们建议所有用户升级到此版本。维护版本不会向数据库引入新功能或更改。您可以从 https://www.dolibarr.org 门户（子目录稳定版本）的下载区域下载它。您可以阅读 <a href="https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog"> ChangeLog </a> 以获取完整的更改列表。
+MultiPriceRuleDesc=当启用“每种产品/服务的多个价格级别”选项时，您可以为每种产品定义不同的价格（每个价格级别一个）。为了节省您的时间，您可以在此处输入一个规则，以根据第一级的价格自动计算每个级别的价格，因此您只需为每个产品输入第一级的价格。此页面旨在节省您的时间，但仅当您的每个级别的价格都与第一级别相关时才有用。在大多数情况下，您可以忽略此页面。
 ModelModulesProduct=产品文件模板
-WarehouseModelModules=Templates for documents of warehouses
-ToGenerateCodeDefineAutomaticRuleFirst=To be able to generate codes automatically, you must first define a manager to auto-define the barcode number.
+WarehouseModelModules=仓库文件模板
+ToGenerateCodeDefineAutomaticRuleFirst=为了能够自动生成代码，您必须首先定义一个管理器来自动定义条码编号。
 SeeSubstitutionVars=有关可能的替换变量列表，请参阅* note
 SeeChangeLog=请参阅ChangeLog文件（仅英文）
-AllPublishers=所有出版商
-UnknownPublishers=未知的发布商
+AllPublishers=所有发布者
+UnknownPublishers=未知的发布者
 AddRemoveTabs=添加或删除标签
 AddDataTables=添加对象表
 AddDictionaries=添加词典表
 AddData=添加对象或词典数据
-AddBoxes=添加插件
+AddBoxes=添加小工具
 AddSheduledJobs=添加计划任务
 AddHooks=添加钩子
 AddTriggers=添加触发器
@@ -2012,270 +2017,293 @@ AddOtherPagesOrServices=添加其他页面或服务
 AddModels=添加文档或数据模板
 AddSubstitutions=添加密钥替换
 DetectionNotPossible=检测不可能
-UrlToGetKeyToUseAPIs=Url to get token to use API (once token has been received it is saved in database user table and must be provided on each API call)
+UrlToGetKeyToUseAPIs=获取令牌以使用 API 的 URL（一旦收到令牌，它就会保存在数据库用户表中，并且必须在每次 API 调用时提供）
 ListOfAvailableAPIs=可用的API列表
-activateModuleDependNotSatisfied=Module "%s" depends on module "%s", that is missing, so module "%1$s" may not work correctly. Please install module "%2$s" or disable module "%1$s" if you want to be safe from any surprise
-CommandIsNotInsideAllowedCommands=The command you are trying to run is not in the list of allowed commands defined in parameter <strong>$dolibarr_main_restrict_os_commands</strong> in the <strong>conf.php</strong> file.
+activateModuleDependNotSatisfied=模块“%s”依赖于不存在的模块“%s”，因此模块“%1$s”可能无法正常工作。如果您想避免意外，请安装模块“%2$s”或禁用模块“%1$s”
+CommandIsNotInsideAllowedCommands=您尝试运行的命令不在 <strong> conf.php </strong> 文件中的参数 <strong> $dolibarr_main_restrict_os_commands </strong> 中定义的允许命令列表中。
 LandingPage=加载页
-SamePriceAlsoForSharedCompanies=If you use a multicompany module, with the choice "Single price", the price will also be the same for all companies if products are shared between environments
+SamePriceAlsoForSharedCompanies=如果您使用了多公司模块，并选择了“单一价格”，如果产品在环境之间共享，则所有公司的价格也将相同
 ModuleEnabledAdminMustCheckRights=模块已激活。已激活模块的权限仅授予管理员用户。如有必要，您可能需要手动向其他用户或组授予权限。
-UserHasNoPermissions=This user has no permissions defined
+UserHasNoPermissions=此用户没有定义权限
 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=公司的参考货币（进入公司设置改变这个）
-WarningNoteModuleInvoiceForFrenchLaw=This module %s is compliant with French laws (Loi Finance 2016).
-WarningNoteModulePOSForFrenchLaw=This module %s is compliant with French laws (Loi Finance 2016) because module Non Reversible Logs is automatically activated.
-WarningInstallationMayBecomeNotCompliantWithLaw=You are trying to install module %s that is an external module. Activating an external module means you trust the publisher of that module and that you are sure that this module does not adversely impact the behavior of your application, and is compliant with laws of your country (%s). If the module introduces an illegal feature, you become responsible for the use of illegal software.
+WarningNoteModuleInvoiceForFrenchLaw=此模块 %s 符合法国法律 (Loi Finance 2016)。
+WarningNoteModulePOSForFrenchLaw=此模块 %s 符合法国法律 (Loi Finance 2016)，因为模块不可逆日志是自动激活的。
+WarningInstallationMayBecomeNotCompliantWithLaw=您正在尝试安装外部模块 %s。激活外部模块意味着您信任该模块的发布者，并且您确信该模块不会对您的应用程序的行为产生不利影响，同时符合您所在国家/地区的法律 (%s)。如该模块引入了非法功能，您将对使用非法软件负责。
 MAIN_PDF_MARGIN_LEFT=PDF的左边距
 MAIN_PDF_MARGIN_RIGHT=PDF的右边距
 MAIN_PDF_MARGIN_TOP=PDF的上边距
 MAIN_PDF_MARGIN_BOTTOM=PDF的底部边距
-MAIN_DOCUMENTS_LOGO_HEIGHT=Height for logo on PDF
-MAIN_GENERATE_PROPOSALS_WITH_PICTURE=Add column for picture on proposal lines
-MAIN_DOCUMENTS_WITH_PICTURE_WIDTH=Width of the column if a picture is added on lines
-MAIN_PDF_NO_SENDER_FRAME=Hide borders on sender address frame
-MAIN_PDF_NO_RECIPENT_FRAME=Hide borders on recipent address frame
-MAIN_PDF_HIDE_CUSTOMER_CODE=Hide customer code
-MAIN_PDF_HIDE_SENDER_NAME=Hide sender/company name in address block
-PROPOSAL_PDF_HIDE_PAYMENTTERM=Hide payments conditions
-PROPOSAL_PDF_HIDE_PAYMENTMODE=Hide payment mode
-MAIN_PDF_PROPAL_USE_ELECTRONIC_SIGNING=Add electronic sign in PDF
-NothingToSetup=There is no specific setup required for this module.
+MAIN_DOCUMENTS_LOGO_HEIGHT=PDF上LOGO的高度
+DOC_SHOW_FIRST_SALES_REP=Show first sales representative
+MAIN_GENERATE_PROPOSALS_WITH_PICTURE=在提案行上添加图片列
+MAIN_DOCUMENTS_WITH_PICTURE_WIDTH=图片列的宽度（如有）
+MAIN_PDF_NO_SENDER_FRAME=隐藏发件人地址框的边框
+MAIN_PDF_NO_RECIPENT_FRAME=隐藏收件人地址框的边框
+MAIN_PDF_HIDE_CUSTOMER_CODE=隐藏客户代码
+MAIN_PDF_HIDE_SENDER_NAME=在地址块中隐藏发送人/公司名称
+PROPOSAL_PDF_HIDE_PAYMENTTERM=隐藏付款条款
+PROPOSAL_PDF_HIDE_PAYMENTMODE=隐藏支付方式
+MAIN_PDF_PROPAL_USE_ELECTRONIC_SIGNING=在 PDF 中添加电子签名
+NothingToSetup=此模块无需特定设置。
 SetToYesIfGroupIsComputationOfOtherGroups=如果此组是其他组的计算，则将此值设置为yes
-EnterCalculationRuleIfPreviousFieldIsYes=Enter calculation rule if previous field was set to Yes.<br>For example:<br>CODEGRP1+CODEGRP2
+EnterCalculationRuleIfPreviousFieldIsYes=如果上一个字段设置为是，则输入计算规则。 <br> 例如：<br> CODEGRP1+CODEGRP2
 SeveralLangugeVariatFound=找到了几种语言变体
-RemoveSpecialChars=Remove special characters
+RemoveSpecialChars=删除特殊字符
 COMPANY_AQUARIUM_CLEAN_REGEX=正则表达式过滤器清理值（COMPANY_AQUARIUM_CLEAN_REGEX）
-COMPANY_DIGITARIA_CLEAN_REGEX=Regex filter to clean value (COMPANY_DIGITARIA_CLEAN_REGEX)
-COMPANY_DIGITARIA_UNIQUE_CODE=Duplicate not allowed
-GDPRContact=Data Protection Officer (DPO, Data Privacy or GDPR contact)
-GDPRContactDesc=If you store personal data in your Information System, you can name the contact who is responsible for the General Data Protection Regulation here
-HelpOnTooltip=Help text to show on tooltip
-HelpOnTooltipDesc=Put text or a translation key here for the text to show in a tooltip when this field appears in a form
-YouCanDeleteFileOnServerWith=You can delete this file on the server with Command Line:<br>%s
-ChartLoaded=Chart of account loaded
-SocialNetworkSetup=Setup of module Social Networks
-EnableFeatureFor=Enable features for <strong>%s</strong>
-VATIsUsedIsOff=Note: The option to use Sales Tax or VAT has been set to <strong>Off</strong> in the menu %s - %s, so Sales tax or Vat used will always be 0 for sales.
-SwapSenderAndRecipientOnPDF=Swap sender and recipient address position on PDF documents
-FeatureSupportedOnTextFieldsOnly=Warning, feature supported on text fields and combo lists only. Also an URL parameter action=create or action=edit must be set OR page name must end with 'new.php' to trigger this feature.
-EmailCollector=Email collector
-EmailCollectors=Email collectors
-EmailCollectorDescription=Add a scheduled job and a setup page to scan regularly email boxes (using IMAP protocol) and record emails received into your application, at the right place and/or create some records automatically (like leads).
-NewEmailCollector=New Email Collector
-EMailHost=Host of email IMAP server
-MailboxSourceDirectory=Mailbox source directory
-MailboxTargetDirectory=Mailbox target directory
-EmailcollectorOperations=Operations to do by collector
-EmailcollectorOperationsDesc=Operations are executed from top to bottom order
-MaxEmailCollectPerCollect=Max number of emails collected per collect
-CollectNow=Collect now
-ConfirmCloneEmailCollector=Are you sure you want to clone the Email collector %s?
-DateLastCollectResult=Date of latest collect try
-DateLastcollectResultOk=Date of latest collect success
-LastResult=Latest result
-EmailCollectorHideMailHeaders=Do not include the content of email header into the saved content of collected e-mails
-EmailCollectorHideMailHeadersHelp=When enabled, e-mail headers are not added at the end of the email content that is saved as an agenda event.
-EmailCollectorConfirmCollectTitle=Email collect confirmation
-EmailCollectorConfirmCollect=Do you want to run this collector now?
-EmailCollectorExampleToCollectTicketRequestsDesc=Collect emails that match some rules and create automatically a ticket (Module Ticket must be enabled) with the email informations. You can use this collector if you provide some support by email, so your ticket request will be automatically generated. Activate also Collect_Responses to collect answers of your client directly on the ticket view (you must reply from Dolibarr).
-EmailCollectorExampleToCollectTicketRequests=Example collecting the ticket request (first message only)
-EmailCollectorExampleToCollectAnswersFromExternalEmailSoftwareDesc=Scan your mailbox "Sent" directory to find emails that was sent as an answer of another email directly from your email software and not from Dolibarr. If such an email is found, the event of answer is recorded into Dolibarr
-EmailCollectorExampleToCollectAnswersFromExternalEmailSoftware=Example collecting e-mail answers sent from an external e-mail software
-EmailCollectorExampleToCollectDolibarrAnswersDesc=Collect all emails that are an answer of an email sent from your application. An event (Module Agenda must be enabled) with the email response will be recorded at the good place. For example, if you send a commercial proposal, order, invoice or message for a ticket by email from the application, and the recipient answers your email, the system will automatically catch the answer and add it into your ERP.
-EmailCollectorExampleToCollectDolibarrAnswers=Example collecting all ingoing messages being answers to messages sent from Dolibarr'
-EmailCollectorExampleToCollectLeadsDesc=Collect emails that match some rules and create automatically a lead (Module Project must be enabled) with the email informations. 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 thirdparty can't be found in database (new customer), the lead will be attached to the thirdparty with ID 1.
-EmailCollectorExampleToCollectLeads=Example collecting leads
-EmailCollectorExampleToCollectJobCandidaturesDesc=Collect emails applying to job offers (Module Recruitment must be enabled). You can complete this collector if you want to automatically create a candidature for a job request. Note: With this initial example, the title of the candidature is generated including the email.
-EmailCollectorExampleToCollectJobCandidatures=Example collecting job candidatures received by e-mail
-NoNewEmailToProcess=No new email (matching filters) to process
-NothingProcessed=Nothing done
-XEmailsDoneYActionsDone=%s emails pre-qualified, %s emails successfully processed (for %s record/actions done)
-RecordEvent=Record an event in agenda (with type Email sent or received)
-CreateLeadAndThirdParty=Create a lead (and a third party if necessary)
-CreateTicketAndThirdParty=Create a ticket (linked to a third party if the third party was loaded by a previous operation or was guessed from a tracker in email header, without third party otherwise)
-CodeLastResult=Latest result code
-NbOfEmailsInInbox=Number of emails in source directory
-LoadThirdPartyFromName=Load third party searching on %s (load only)
-LoadThirdPartyFromNameOrCreate=Load third party searching on %s (create if not found)
-AttachJoinedDocumentsToObject=Save attached files into object documents if a ref of an object is found into email topic.
-WithDolTrackingID=Message from a conversation initiated by a first email sent from Dolibarr
-WithoutDolTrackingID=Message from a conversation initiated by a first email NOT sent from Dolibarr
-WithDolTrackingIDInMsgId=Message sent from Dolibarr
-WithoutDolTrackingIDInMsgId=Message NOT sent from Dolibarr
-CreateCandidature=Create job application
+COMPANY_DIGITARIA_CLEAN_REGEX=清理值的正则表达式（COMPANY_DIGITARIA_CLEAN_REGEX）
+COMPANY_DIGITARIA_UNIQUE_CODE=不允许重复
+GDPRContact=数据保护官（DPO、数据隐私或 GDPR 联系人）
+GDPRContactDesc=如果您将个人数据存储在您的信息系统中，您可以在此处指定负责一般数据保护条例（GDPR）的联系人
+HelpOnTooltip=显示在工具提示上的帮助文本
+HelpOnTooltipDesc=当该字段出现在表单中时，将文本或翻译键放在此处以在工具提示中显示文本
+YouCanDeleteFileOnServerWith=您可以使用此命令行在服务器上删除此文件：<br> %s
+ChartLoaded=已加载的会计科目表
+SocialNetworkSetup=社交网络模块的设置
+EnableFeatureFor=启用 <strong> %s </strong> 的功能
+VATIsUsedIsOff=注意：在菜单 %s - %s 中，使用销售税或增值税的选项已设置为 <strong> 关闭</strong>，因此销售税或增值税始终为 0。
+SwapSenderAndRecipientOnPDF=交换 PDF 文档上的发件人和收件人地址位置
+FeatureSupportedOnTextFieldsOnly=警告，仅文本字段和组合列表支持的功能。此外，必须设置 URL 参数 action=create 或 action=edit 或页面名称必须以“new.php”结尾才能触发此功能。
+EmailCollector=电子邮件收集器
+EmailCollectors=电子邮件收集器
+EmailCollectorDescription=添加计划作业和设置页面以定期扫描电子邮件箱（使用 IMAP 协议），并在应用程序的正确的位置记录收到的电子邮件和/或自动创建一些记录（如潜在客户）。
+NewEmailCollector=新建电子邮件收集器
+EMailHost=电子邮件 IMAP 服务器
+EMailHostPort=电子邮件 IMAP 服务器的端口
+loginPassword=Login/Password
+oauthToken=Oauth2 token
+accessType=Acces type
+oauthService=Oauth service
+TokenMustHaveBeenCreated=Module OAuth2 must be enabled and an oauth2 token must have been created with the correct permissions (for example scope "gmail_full" with OAuth for Gmail).
+MailboxSourceDirectory=邮箱源目录
+MailboxTargetDirectory=邮箱目标目录
+EmailcollectorOperations=收集器要做的操作
+EmailcollectorOperationsDesc=操作从上到下顺序执行
+MaxEmailCollectPerCollect=每次收集的最大电子邮件数量
+CollectNow=立即收集
+ConfirmCloneEmailCollector=您确定要克隆电子邮件收集器 %s 吗？
+DateLastCollectResult=最近一次收集尝试的日期
+DateLastcollectResultOk=最近一次收集成功的日期
+LastResult=最新结果
+EmailCollectorHideMailHeaders=不要将邮件头的内容保存在已收集的邮件中
+EmailCollectorHideMailHeadersHelp=启用后，电子邮件头不会添加到保存为议程事件的电子邮件内容的末尾。
+EmailCollectorConfirmCollectTitle=电子邮件收集确认
+EmailCollectorConfirmCollect=你想现在运行这个收集器吗？
+EmailCollectorExampleToCollectTicketRequestsDesc=收集符合某些规则的电子邮件，并使用电子邮件信息自动创建工单（必须启用工单票证）。如果您通过电子邮件提供一些支持，您可以使用此收集器，因此您的工单请求将自动生成。同时激活 Collect_Responses 以直接在工单视图上收集客户的答案（您必须从 Dolibarr 回复）。
+EmailCollectorExampleToCollectTicketRequests=收集工单请求的示例（仅限第一条消息）
+EmailCollectorExampleToCollectAnswersFromExternalEmailSoftwareDesc=扫描您的邮箱“已发送”目录以查找直接从您的电子邮件软件作为另一封电子邮件的答复而不是从 Dolibarr发送的电子邮件。如果找到这样的电子邮件，则将应答事件记录到 Dolibarr
+EmailCollectorExampleToCollectAnswersFromExternalEmailSoftware=收集从外部电子邮件软件发送的电子邮件回复的示例
+EmailCollectorExampleToCollectDolibarrAnswersDesc=收集所有回复您的应用程序发送的电子邮件的电子邮件。带有电子邮件响应的事件（必须启用模块议程）将记录在好位置。例如，如果您从应用程序通过电子邮件发送商业提案、订单、发票或工单消息，并且收件人回复了您的电子邮件，系统将自动捕获回复并将其添加到您的 ERP 中。
+EmailCollectorExampleToCollectDolibarrAnswers=收集所有传入消息的示例，这些消息是从 Dolibarr 发送的消息的答复
+EmailCollectorExampleToCollectLeadsDesc=收集符合某些规则的电子邮件并使用电子邮件信息自动创建潜在客户（必须启用模块项目）。如果您想使用模块项目（1 个潜在客户 = 1 个项目）跟踪您的潜在客户，您可以使用此收集器，因此您的潜在客户将自动生成。如果收集器 Collect_Responses 也已启用，当您从潜在客户、提案或任何其他对象发送电子邮件时，您还可以直接在应用程序上看到客户或合作伙伴的答案。 <br> 注意：在这个初始示例中，生成的线索标题包括电子邮件。如果在数据库中找不到第三方（新客户），则线索将附加到 ID 为 1 的第三方。
+EmailCollectorExampleToCollectLeads=收集商业机会的示例
+EmailCollectorExampleToCollectJobCandidaturesDesc=收集申请工作机会的电子邮件（必须启用模块招聘）。如果您想为工作请求自动创建候选人，您可以完成此收集器。注意：在这个初始示例中，会生成候选人的标题，包括电子邮件。
+EmailCollectorExampleToCollectJobCandidatures=收集通过电子邮件收到的求职者的示例
+NoNewEmailToProcess=没有要处理的新电子邮件（匹配过滤器）
+NothingProcessed=什么都没做
+XEmailsDoneYActionsDone=%s 个电子邮件已通过预审，%s 个电子邮件已成功处理（对于 %s 记录/已完成的操作）
+RecordEvent=在议程中记录事件（类型为发送或接收的电子邮件）
+CreateLeadAndThirdParty=创建商业机会（必要时创建第三方）
+CreateTicketAndThirdParty=创建工单（如果第三方由先前的操作加载或可以从电子邮件标头中的跟踪器猜测，则链接到第三方，否则没有第三方）
+CodeLastResult=最新结果代码
+NbOfEmailsInInbox=源目录中的电子邮件数量
+LoadThirdPartyFromName=在 %s 上加载第三方搜索（仅加载）
+LoadThirdPartyFromNameOrCreate=在 %s 上加载第三方搜索（如果未找到则创建）
+AttachJoinedDocumentsToObject=如果在电子邮件主题中找到对象的引用，则将附件保存到对象文档中。
+WithDolTrackingID=来自 Dolibarr 发送的第一封电子邮件发起的对话的消息
+WithoutDolTrackingID=来自不是从 Dolibarr 发送的第一封电子邮件发起的对话的消息
+WithDolTrackingIDInMsgId=来自 Dolibarr 的消息
+WithoutDolTrackingIDInMsgId=不来自 Dolibarr 的信息
+CreateCandidature=创建工作申请
 FormatZip=邮编
-MainMenuCode=Menu entry code (mainmenu)
-ECMAutoTree=Show automatic ECM tree
-OperationParamDesc=Define the rules to use to extract or set values.<br>Example for operations that need to extract a name from email subject:<br>name=EXTRACT:SUBJECT:Message from company ([^\n]*)<br>Example for operations that create objects:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value including value of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
-OpeningHours=Opening hours
-OpeningHoursDesc=Enter here the regular opening hours of your company.
-ResourceSetup=Configuration of Resource module
+MainMenuCode=菜单入口代码（主菜单）
+ECMAutoTree=显示自动 ECM 树
+OperationParamDesc=定义用于提取某些数据或设置用于操作的值的规则。 <br> <br> 从电子邮件主题中提取公司名称到临时变量的示例： <br> tmp_var=EXTRACT:SUBJECT:Message from company ([^\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:My公司名称为\\s([^\\s]*) <br> <br> 使用a； char 作为分隔符来提取或设置几个属性。
+OpeningHours=营业时间
+OpeningHoursDesc=在此处输入贵公司的正常营业时间。
+ResourceSetup=资源模块的配置
 UseSearchToSelectResource=使用搜索表单选择资源（而不是下拉列表）。
 DisabledResourceLinkUser=禁用将资源链接到用户的功能
 DisabledResourceLinkContact=禁用将资源链接到联系人的功能
-EnableResourceUsedInEventCheck=Prohibit the use of the same resource at the same time in the agenda
+EnableResourceUsedInEventCheck=禁止在议程中同时使用相同的资源
 ConfirmUnactivation=确认模块重置
-OnMobileOnly=On small screen (smartphone) only
-DisableProspectCustomerType=Disable the "Prospect + Customer" third party type (so third party must be "Prospect" or "Customer", but can't be both)
-MAIN_OPTIMIZEFORTEXTBROWSER=Simplify interface for blind person
-MAIN_OPTIMIZEFORTEXTBROWSERDesc=Enable this option if you are a blind person, or if you use the application from a text browser like Lynx or Links.
-MAIN_OPTIMIZEFORCOLORBLIND=Change  interface's color for color blind person
-MAIN_OPTIMIZEFORCOLORBLINDDesc=Enable this option if you are a color blind person, in some case interface will change color setup to increase contrast.
-Protanopia=Protanopia
-Deuteranopes=Deuteranopes
+OnMobileOnly=仅在小屏幕（智能手机）上
+DisableProspectCustomerType=禁用“潜在+ 客户”第三方类型（因此第三方必须是“潜在”或“客户”，但不能同时是两者）
+MAIN_OPTIMIZEFORTEXTBROWSER=盲人简化界面
+MAIN_OPTIMIZEFORTEXTBROWSERDesc=如果您是盲人，或者如果您从 Lynx 或 Links 等文本浏览器使用应用程序，请启用此选项。
+MAIN_OPTIMIZEFORCOLORBLIND=为色盲者更改界面颜色
+MAIN_OPTIMIZEFORCOLORBLINDDesc=如果您是色盲者，请启用此选项，在某些情况下界面会更改颜色设置以增加对比度。
+Protanopia=红眼病
+Deuteranopes=氘核
 Tritanopes=Tritanopes
-ThisValueCanOverwrittenOnUserLevel=This value can be overwritten by each user from its user page - tab '%s'
-DefaultCustomerType=Default thirdparty type for "New customer" creation form
-ABankAccountMustBeDefinedOnPaymentModeSetup=Note: The bank account must be defined on the module of each payment mode (Paypal, Stripe, ...) to have this feature working.
-RootCategoryForProductsToSell=Root category of products to sell
-RootCategoryForProductsToSellDesc=If defined, only products inside this category or childs of this category will be available in the Point Of Sale
-DebugBar=Debug Bar
-DebugBarDesc=Toolbar that comes with a plenty of tools to simplify debugging
-DebugBarSetup=DebugBar Setup
-GeneralOptions=General Options
-LogsLinesNumber=Number of lines to show on logs tab
-UseDebugBar=Use the debug bar
-DEBUGBAR_LOGS_LINES_NUMBER=Number of last log lines to keep in console
-WarningValueHigherSlowsDramaticalyOutput=Warning, higher values slows dramaticaly output
-ModuleActivated=Module %s is activated and slows the interface
-ModuleActivatedWithTooHighLogLevel=Module %s is activated with a too high logging level (try to use a lower level for better performances and security)
-ModuleSyslogActivatedButLevelNotTooVerbose=Module %s is activated and log level (%s) is correct (not too verbose)
-IfYouAreOnAProductionSetThis=If you are on a production environment, you should set this property to %s.
-AntivirusEnabledOnUpload=Antivirus enabled on uploaded files
-SomeFilesOrDirInRootAreWritable=Some files or directories are not in a read-only mode
-EXPORTS_SHARE_MODELS=Export models are share with everybody
-ExportSetup=Setup of module Export
-ImportSetup=Setup of module Import
-InstanceUniqueID=Unique ID of the instance
-SmallerThan=Smaller than
-LargerThan=Larger than
-IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID of an object is found into email, or if the email is an answer of an email aready collected and linked to an object, the created event will be automatically linked to the known related object.
-WithGMailYouCanCreateADedicatedPassword=With a GMail account, if you enabled the 2 steps validation, it is recommanded to create a dedicated second password for the application instead of using your own account passsword from https://myaccount.google.com/.
-EmailCollectorTargetDir=It may be a desired behaviour to move the email into another tag/directory when it was processed successfully. Just set name of directory here to use this feature (Do NOT use special characters in name). Note that you must also use a read/write login account.
-EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database. The found (or created) thirdparty will be used for following actions that need it.<br>For example, if you want to create a thirdparty with a name extracted from a string 'Name: name to find' present into the body, use the sender email as email, you can set the parameter field like this:<br>'email=HEADER:^From:(.*);name=EXTRACT:BODY:Name:\\s([^\\s]*);client=SET:2;'<br>
-EndPointFor=End point for %s : %s
-DeleteEmailCollector=Delete email collector
-ConfirmDeleteEmailCollector=Are you sure you want to delete this email collector?
-RecipientEmailsWillBeReplacedWithThisValue=Recipient emails will be always replaced with this value
-AtLeastOneDefaultBankAccountMandatory=At least 1 default bank account must be defined
-RESTRICT_ON_IP=Allow API access to only certain client IPs (wildcard not allowed, use space between values). Empty means every clients can access.
+ThisValueCanOverwrittenOnUserLevel=每个用户都可以从其用户页面覆盖此值 - 选项卡“%s”
+DefaultCustomerType=“新客户”创建表单的默认第三方类型
+ABankAccountMustBeDefinedOnPaymentModeSetup=注意：必须在每种支付方式（Paypal，Stripe，...）的模块上定义银行帐户才能使此功能正常工作。
+RootCategoryForProductsToSell=要销售的产品的根类别
+RootCategoryForProductsToSellDesc=如果已定义，在销售点（POS）中仅可以使用此类别内的产品或子产品
+DebugBar=调试栏
+DebugBarDesc=带有大量工具的工具栏，可简化调试
+DebugBarSetup=调试栏设置
+GeneralOptions=常规选项
+LogsLinesNumber=日志选项卡上显示的行数
+UseDebugBar=使用调试栏
+DEBUGBAR_LOGS_LINES_NUMBER=保留在控制台中的最新日志行数
+WarningValueHigherSlowsDramaticalyOutput=警告，较高的值会显着减慢输出
+ModuleActivated=模块 %s 被激活并减慢了界面
+ModuleActivatedWithTooHighLogLevel=模块 %s 以过高的日志记录级别激活（尝试使用较低级别以获得更好的性能和安全性）
+ModuleSyslogActivatedButLevelNotTooVerbose=模块 %s 已激活且日志级别 (%s) 正确（不太冗长）
+IfYouAreOnAProductionSetThis=如果您在生产环境中，则应将此属性设置为 %s。
+AntivirusEnabledOnUpload=已对上传的文件启用防病毒
+SomeFilesOrDirInRootAreWritable=某些文件或目录未处于只读模式
+EXPORTS_SHARE_MODELS=导出模型将与所有人共享
+ExportSetup=模块 导出 设置
+ImportSetup=模块 导入 设置
+InstanceUniqueID=实例的唯一标识
+SmallerThan=小于
+LargerThan=大于
+IfTrackingIDFoundEventWillBeLinked=请注意，如果在电子邮件中找到对象的跟踪 ID，或者如果电子邮件是收集到的并链接到对象的电子邮件区域的答复，则创建的事件将自动链接到已知的相关对象。
+WithGMailYouCanCreateADedicatedPassword=如果您启用了 GMail 帐户的两步验证，需要为Dolibarr创建一个专用的应用密码，而不是使用您自己的来自 https://myaccount.google.com/ 的帐户密码。
+EmailCollectorTargetDir=成功处理电子邮件后，将其移动到另一个标签/目录可能是一种期望中的行为。只需在此处设置目录名称即可使用此功能（请勿在名称中使用特殊字符）。请注意，您还必须使用可以读/写的登录帐户。
+EmailCollectorLoadThirdPartyHelp=您可以使用此操作来使用电子邮件内容在数据库中查找和加载现有第三方。找到的（或创建的）第三方将用于后续需要它的操作。 <br> 例如，如果您想创建一个第三方名称，该名称从正文中的字符串“名称：要查找的名称”中提取，使用发件人电子邮件作为电子邮件，您可以将参数字段设置为：<br> 'email=标题：^From:(.*);name=EXTRACT:BODY:Name:\\s([^\\s]*);client=SET:2;' <br>
+EndPointFor=%s 的终点：%s
+DeleteEmailCollector=删除电子邮件收集器
+ConfirmDeleteEmailCollector=您确定要删除此电子邮件收集器吗？
+RecipientEmailsWillBeReplacedWithThisValue=收件人电子邮件将始终替换为此值
+AtLeastOneDefaultBankAccountMandatory=必须定义至少 1 个默认银行帐户
+RESTRICT_ON_IP=仅允许某些客户端 IP访问API （不允许通配符，在值之间使用空格）。留空意味着所有客户端都可以访问。
 IPListExample=127.0.0.1 192.168.0.2 [::1]
-BaseOnSabeDavVersion=Based on the library SabreDAV version
-NotAPublicIp=Not a public IP
-MakeAnonymousPing=Make an anonymous Ping '+1' to the Dolibarr foundation server (done 1 time only after installation) to allow the foundation to count the number of Dolibarr installation.
-FeatureNotAvailableWithReceptionModule=Feature not available when module Reception is enabled
-EmailTemplate=Template for email
-EMailsWillHaveMessageID=Emails will have a tag 'References' matching this syntax
-PDF_SHOW_PROJECT=Show project on document
-ShowProjectLabel=Project Label
-PDF_INCLUDE_ALIAS_IN_THIRDPARTY_NAME=Include alias in thirdparty name
-THIRDPARTY_ALIAS=Name thirdparty - Alias thirdparty
-ALIAS_THIRDPARTY=Alias thirdparty - Name thirdparty
-PDF_USE_ALSO_LANGUAGE_CODE=If you want to have some texts in your PDF duplicated in 2 different languages in the same generated PDF, you must set here this second language so generated PDF will contains 2 different languages in same page, the one chosen when generating PDF and this one (only few PDF templates support this). Keep empty for 1 language per PDF.
-PDF_USE_A=Gererate PDF documents with format PDF/A instead of defaut format PDF
-FafaIconSocialNetworksDesc=Enter here the code of a FontAwesome icon. If you don't know what is FontAwesome, you can use the generic value fa-address-book.
-RssNote=Note: Each RSS feed definition provides a widget that you must enable to have it available in dashboard
-JumpToBoxes=Jump to Setup -> Widgets
-MeasuringUnitTypeDesc=Use here a value like "size", "surface", "volume", "weight", "time"
-MeasuringScaleDesc=The scale is the number of places you have to move the decimal part to match the default reference unit. For "time" unit type, it is the number of seconds. Values between 80 and 99 are reserved values.
-TemplateAdded=Template added
-TemplateUpdated=Template updated
-TemplateDeleted=Template deleted
-MailToSendEventPush=Event reminder email
-SwitchThisForABetterSecurity=Switching this value to %s is recommended for more security
-DictionaryProductNature= Nature of product
-CountryIfSpecificToOneCountry=Country (if specific to a given country)
-YouMayFindSecurityAdviceHere=You may find security advisory here
-ModuleActivatedMayExposeInformation=This PHP extension may expose sensitive data. If you don't need it, disable it.
-ModuleActivatedDoNotUseInProduction=A module designed for the development has been enabled. Do not enable it on a production environment.
-CombinationsSeparator=Separator character for product combinations
-SeeLinkToOnlineDocumentation=See link to online documention on top menu for examples
-SHOW_SUBPRODUCT_REF_IN_PDF=If the feature "%s" of module <b>%s</b> is used, show details of subproducts of a kit on PDF.
-AskThisIDToYourBank=Contact your bank to get this ID
-AdvancedModeOnly=Permision available in Advanced permission mode only
-ConfFileIsReadableOrWritableByAnyUsers=The conf file is readable or writable by any users. Give permission to web server user and group only.
-MailToSendEventOrganization=Event Organization
-MailToPartnership=Partnership
-AGENDA_EVENT_DEFAULT_STATUS=Default event status when creating a event from the form
-YouShouldDisablePHPFunctions=You should disable PHP functions
-IfCLINotRequiredYouShouldDisablePHPFunctions=Except if you need to run system commands in custom code, you shoud disable PHP functions
-PHPFunctionsRequiredForCLI=For shell purpose (like scheduled job backup or running an anitivurs program), you must keep PHP functions
-NoWritableFilesFoundIntoRootDir=No writable files or directories of the common programs were found into your root directory (Good)
-RecommendedValueIs=Recommended: %s
+BaseOnSabeDavVersion=基于库 SabreDAV 的版本
+NotAPublicIp=不是公网IP
+MakeAnonymousPing=对 Dolibarr 基金会服务器进行匿名  '+1' Ping（仅在安装后执行 1 次）以允许基金会计算 Dolibarr 安装量。
+FeatureNotAvailableWithReceptionModule=启用模块接收后此特性不可用
+EmailTemplate=电子邮件模板
+EMailsWillHaveMessageID=电子邮件将具有与此语法匹配的标签“参考”
+PDF_SHOW_PROJECT=在文档上显示项目
+ShowProjectLabel=项目标签
+PDF_INCLUDE_ALIAS_IN_THIRDPARTY_NAME=在第三方名称中包含别名
+THIRDPARTY_ALIAS=第三方名 - 第三方别名
+ALIAS_THIRDPARTY=第三方别名 - 第三方名
+PDF_USE_ALSO_LANGUAGE_CODE=如果您想在同一个生成的 PDF 中以 2 种不同的语言复制 PDF 中的某些文本，则必须在此处设置第二种语言，以便生成的 PDF 将在同一页面中包含 2 种不同的语言：生成 PDF 时选择的一种和这个（只有少数 PDF 模板支持这一点）。留空为每个 PDF只有1种语言。
+PDF_USE_A=使用 PDF/A 格式而不是默认格式 PDF 生成 PDF 文档
+FafaIconSocialNetworksDesc=在此处输入 FontAwesome 图标的代码。如果你不知道什么是 FontAwesome，你可以使用通用值 fa-address-book。
+RssNote=注意：每个 RSS 源定义都提供了一个小根据，您必须启用该小工具才能使其在主看板中可用
+JumpToBoxes=跳转到设置 -> 小根据
+MeasuringUnitTypeDesc=在这里使用像“大小”、“表面”、“体积”、“重量”、“时间”这样的值
+MeasuringScaleDesc=比例是您必须移动小数部分以匹配默认参考单位的位数。对于“时间”单位类型，它是秒数。 80 到 99 之间的值是保留值。
+TemplateAdded=模板已添加
+TemplateUpdated=模板已更新
+TemplateDeleted=模板已删除
+MailToSendEventPush=活动提醒邮件
+SwitchThisForABetterSecurity=建议将此值切换为 %s 以提高安全性
+DictionaryProductNature= 产品性质
+CountryIfSpecificToOneCountry=国家（如果特定于给定国家）
+YouMayFindSecurityAdviceHere=您可以在此处找到安全建议
+ModuleActivatedMayExposeInformation=这个 PHP 扩展可能会暴露敏感数据。如果您不需要它，请禁用它。
+ModuleActivatedDoNotUseInProduction=为开发设计的模块已启用。不要在生产环境中启用它。
+CombinationsSeparator=产品组合的分隔符
+SeeLinkToOnlineDocumentation=有关示例，请参见顶部菜单上的在线文档链接
+SHOW_SUBPRODUCT_REF_IN_PDF=如果使用了模块 <b> %s </b> 的特性“%s”，将在 PDF 上显示套件的子产品的详细信息。
+AskThisIDToYourBank=请与您的银行联系以获取此 ID
+AdvancedModeOnly=权限仅在高级权限模式下可用
+ConfFileIsReadableOrWritableByAnyUsers=任何用户都可以读取或写入 conf 文件。请只向 Web 服务器用户和组授予权限。
+MailToSendEventOrganization=活动组织
+MailToPartnership=合伙
+AGENDA_EVENT_DEFAULT_STATUS=从表单创建事件时的默认事件状态
+YouShouldDisablePHPFunctions=您应该禁用 PHP 函数
+IfCLINotRequiredYouShouldDisablePHPFunctions=除非您需要在自定义代码中运行系统命令，否则您应该禁用 PHP 函数
+PHPFunctionsRequiredForCLI=出于 shell 目的（如计划的备份作业或运行杀毒程序），您必须保留 PHP 函数
+NoWritableFilesFoundIntoRootDir=在您的根目录中没有找到常用程序的可写文件或目录（好）
+RecommendedValueIs=建议：%s
 Recommended=推荐
-NotRecommended=Not recommended
-ARestrictedPath=Some restricted path
-CheckForModuleUpdate=Check for external modules updates
-CheckForModuleUpdateHelp=This action will connect to editors of external modules to check if a new version is available.
-ModuleUpdateAvailable=An update is available
-NoExternalModuleWithUpdate=No updates found for external modules
-SwaggerDescriptionFile=Swagger API description file (for use with redoc for example)
-YouEnableDeprecatedWSAPIsUseRESTAPIsInstead=You enabled deprecated WS API. You should use REST API instead.
-RandomlySelectedIfSeveral=Randomly selected if several pictures are available
-DatabasePasswordObfuscated=Database password is obfuscated in conf file
-DatabasePasswordNotObfuscated=Database password is NOT obfuscated in conf file
-APIsAreNotEnabled=APIs modules are not enabled
-YouShouldSetThisToOff=You should set this to 0 or off
-InstallAndUpgradeLockedBy=Install and upgrades are locked by the file <b>%s</b>
-OldImplementation=Old implementation
-PDF_SHOW_LINK_TO_ONLINE_PAYMENT=If some online payment modules are enabled (Paypal, Stripe, ...), add a link on the PDF to make the online payment
-DashboardDisableGlobal=Disable globally all the thumbs of open objects
-BoxstatsDisableGlobal=Disable totally box statistics
-DashboardDisableBlocks=Thumbs of open objects (to process or late) on main dashboard
-DashboardDisableBlockAgenda=Disable the thumb for agenda
-DashboardDisableBlockProject=Disable the thumb for projects
-DashboardDisableBlockCustomer=Disable the thumb for customers
-DashboardDisableBlockSupplier=Disable the thumb for suppliers
-DashboardDisableBlockContract=Disable the thumb for contracts
-DashboardDisableBlockTicket=Disable the thumb for tickets
-DashboardDisableBlockBank=Disable the thumb for banks
-DashboardDisableBlockAdherent=Disable the thumb for memberships
-DashboardDisableBlockExpenseReport=Disable the thumb for expense reports
-DashboardDisableBlockHoliday=Disable the thumb for leaves
-EnabledCondition=Condition to have field enabled (if not enabled, visibility will always be off)
-IfYouUseASecondTaxYouMustSetYouUseTheMainTax=If you want to use a second tax, you must enable also the first sales tax
-IfYouUseAThirdTaxYouMustSetYouUseTheMainTax=If you want to use a third tax, you must enable also the first sales tax
-LanguageAndPresentation=Language and presentation
-SkinAndColors=Skin and colors
-IfYouUseASecondTaxYouMustSetYouUseTheMainTax=If you want to use a second tax, you must enable also the first sales tax
-IfYouUseAThirdTaxYouMustSetYouUseTheMainTax=If you want to use a third tax, you must enable also the first sales tax
-PDF_USE_1A=Generate PDF with PDF/A-1b format
-MissingTranslationForConfKey = Missing translation for %s
-NativeModules=Native modules
-NoDeployedModulesFoundWithThisSearchCriteria=No modules found for these search criteria
-API_DISABLE_COMPRESSION=Disable compression of API responses
-EachTerminalHasItsOwnCounter=Each terminal use its own counter.
-FillAndSaveAccountIdAndSecret=Fill and save account ID and secret first
-PreviousHash=Previous hash
-LateWarningAfter="Late" warning after
-TemplateforBusinessCards=Template for a business card in different size
-InventorySetup= Inventory Setup
-ExportUseLowMemoryMode=Use a low memory mode
-ExportUseLowMemoryModeHelp=Use the low memory mode to execute the exec of the dump (compression is done through a pipe instead of into the PHP memory). This method does not allow to check that file is completed and error message can't be reported if it fails.
+NotRecommended=不建议
+ARestrictedPath=一些受限路径
+CheckForModuleUpdate=检查外部模块更新
+CheckForModuleUpdateHelp=此操作将连接到外部模块的编写者以检查是否有新版本可用。
+ModuleUpdateAvailable=有可用的更新
+NoExternalModuleWithUpdate=未找到外部模块的更新
+SwaggerDescriptionFile=Swagger API 描述文件（例如与 redoc 一起使用）
+YouEnableDeprecatedWSAPIsUseRESTAPIsInstead=您启用了已弃用的 WS API。您应该改用 REST API。
+RandomlySelectedIfSeveral=如果有多张图片则随机选择
+SalesRepresentativeInfo=For Proposals, Orders, Invoices.
+DatabasePasswordObfuscated=在 conf 文件中的数据库密码已被混淆
+DatabasePasswordNotObfuscated=在 conf 文件中的数据库密码未被混淆
+APIsAreNotEnabled=未启用 API 模块
+YouShouldSetThisToOff=您应该将此设置为 0 或关闭
+InstallAndUpgradeLockedBy=安装和升级被文件 <b> %s </b> 锁定
+OldImplementation=旧实现
+PDF_SHOW_LINK_TO_ONLINE_PAYMENT=如果启用了某些在线支付模块（Paypal、Stripe、...），请在 PDF 上添加一个链接以进行在线支付
+DashboardDisableGlobal=全局禁用所有开放对象的缩略图
+BoxstatsDisableGlobal=完全禁用统计信息盒子
+DashboardDisableBlocks=在主看板上开放对象（处理或延迟）的缩略图
+DashboardDisableBlockAgenda=禁用议程的缩略图
+DashboardDisableBlockProject=禁用项目的缩略图
+DashboardDisableBlockCustomer=禁用客户的缩略图
+DashboardDisableBlockSupplier=禁用供应商的缩略图
+DashboardDisableBlockContract=禁用合同的缩略图
+DashboardDisableBlockTicket=禁用工单的缩略图
+DashboardDisableBlockBank=禁用银行的缩略图
+DashboardDisableBlockAdherent=禁用会员的缩略图
+DashboardDisableBlockExpenseReport=禁用费用报表的缩略图
+DashboardDisableBlockHoliday=禁用休假的缩略图
+EnabledCondition=启用字段的条件（如果未启用，可见性将始终关闭）
+IfYouUseASecondTaxYouMustSetYouUseTheMainTax=如果您想使用第二个税，您还必须启用第一个销售税
+IfYouUseAThirdTaxYouMustSetYouUseTheMainTax=如果您想使用第三税，您还必须启用第一销售税
+LanguageAndPresentation=语言和呈现
+SkinAndColors=皮肤和颜色
+IfYouUseASecondTaxYouMustSetYouUseTheMainTax=如果您想使用第二个税，您还必须启用第一个销售税
+IfYouUseAThirdTaxYouMustSetYouUseTheMainTax=如果您想使用第三税，您还必须启用第一销售税
+PDF_USE_1A=生成 PDF/A-1b 格式的 PDF
+MissingTranslationForConfKey = 缺少 %s 的翻译
+NativeModules=原生模块
+NoDeployedModulesFoundWithThisSearchCriteria=未找到符合这些搜索条件的模块
+API_DISABLE_COMPRESSION=禁止压缩 API  响应
+EachTerminalHasItsOwnCounter=每个终端使用自己的计数器。
+FillAndSaveAccountIdAndSecret=先填写并保存账号ID和密码
+PreviousHash=以前的哈希
+LateWarningAfter=“逾期”警告时间
+TemplateforBusinessCards=不同大小的名片模板
+InventorySetup= 库存设置
+ExportUseLowMemoryMode=使用低内存模式
+ExportUseLowMemoryModeHelp=使用低内存模式执行转储的 exec（压缩是通过管道完成的，而不是进入 PHP 内存）。此方法不允许检查文件是否已完成，如果失败则无法报告错误消息。
 
 ModuleWebhookName = Webhook
-ModuleWebhookDesc = Interface to catch dolibarr triggers and send it to an URL
-WebhookSetup = Webhook setup
+ModuleWebhookDesc = 捕获 dolibarr 触发器并将其发送到某个 URL 的接口
+WebhookSetup = Webhook 设置
 Settings = 设置
-WebhookSetupPage = Webhook setup page
-ShowQuickAddLink=Show a button to quickly add an element in top right menu
+WebhookSetupPage = Webhook 设置页面
+ShowQuickAddLink=在右上角的菜单中显示一个快速添加元素的按钮
 
-HashForPing=Hash used for ping
-ReadOnlyMode=Is instance in "Read Only" mode
-DEBUGBAR_USE_LOG_FILE=Use the <b>dolibarr.log</b> file to trap Logs
-UsingLogFileShowAllRecordOfSubrequestButIsSlower=Use the dolibarr.log file to trap Logs instead of live memory catching. It allows to catch all logs instead of only log of current process (so including the one of ajax subrequests pages) but will make your instance very very slow. Not recommended.
-FixedOrPercent=Fixed (use keyword 'fixed') or percent (use keyword 'percent')
-DefaultOpportunityStatus=Default opportunity status (first status when lead is created)
+HashForPing=用于 Ping 的哈希
+ReadOnlyMode=实例是否处于“只读”模式
+DEBUGBAR_USE_LOG_FILE=使用 <b> dolibarr.log </b> 文件捕获日志
+UsingLogFileShowAllRecordOfSubrequestButIsSlower=使用 dolibarr.log 文件捕获日志而不是实时内存捕获。它允许捕获所有日志，而不仅仅是当前进程的日志（因此包括 ajax 子请求页面），但会使您的实例非常非常慢。不建议。
+FixedOrPercent=固定（使用关键字“固定”）或百分比（使用关键字“百分比”）
+DefaultOpportunityStatus=默认机会状态（创建潜在客户时的第一个状态）
 
-IconAndText=Icon and text
-TextOnly=Text only
-IconOnlyAllTextsOnHover=Icon only - All texts appears under icon on mouse hover menu bar
-IconOnlyTextOnHover=Icon only - Text of icon appears under icon on mouse hover the icon
-IconOnly=Icon only - Text on tooltip only
-INVOICE_ADD_ZATCA_QR_CODE=Show the ZATCA QR code on invoices
-INVOICE_ADD_ZATCA_QR_CODEMore=Some Arabic countries need this QR Code on their invoices
-INVOICE_ADD_SWISS_QR_CODE=Show the swiss QR-Bill code on invoices
-UrlSocialNetworksDesc=Url link of social network. Use {socialid} for the variable part that contains the social network ID.
-IfThisCategoryIsChildOfAnother=If this category is a child of another one
-NoName=No name
-CIDLookupURL=The module brings an URL that can be used by an external tool to get the name of a thirdparty or contact from its phone number. URL to use is:
+IconAndText=图标和文字
+TextOnly=纯文本
+IconOnlyAllTextsOnHover=仅图标 - 所有文本都显示在鼠标悬停菜单的图标下显示
+IconOnlyTextOnHover=仅图标 - 图标文本都显示在在鼠标悬停菜单的图标下
+IconOnly=仅图标 - 仅在工具提示上显示文本
+INVOICE_ADD_ZATCA_QR_CODE=在发票上显示 ZATCA 二维码
+INVOICE_ADD_ZATCA_QR_CODEMore=一些阿拉伯国家的发票上需要此二维码
+INVOICE_ADD_SWISS_QR_CODE=在发票上显示瑞士QR-Bill二维码
+UrlSocialNetworksDesc=社交网络的 URL 链接。使用 {socialid} 作为包含社交网络 ID 的变量部分。
+IfThisCategoryIsChildOfAnother=如果此类别是另一个类别的子类别
+DarkThemeMode=深色主题模式
+AlwaysDisabled=始终禁用
+AccordingToBrowser=根据浏览器
+AlwaysEnabled=始终启用
+DoesNotWorkWithAllThemes=不适用于所有主题
+NoName=无名
+ShowAdvancedOptions= 显示高级选项
+HideAdvancedoptions= 隐藏高级选项
+CIDLookupURL=该模块带来了一个 URL，外部工具可以使用该 URL 从其电话号码中获取第三方或联系人的名称。可使用的网址是：
+OauthNotAvailableForAllAndHadToBeCreatedBefore=OAUTH2 身份验证不适用于所有主机，并且必须已使用 OAUTH 模块在上游创建了具有正确权限的令牌
+MAIN_MAIL_SMTPS_OAUTH_SERVICE=OAUTH2 认证服务
+DontForgetCreateTokenOauthMod=必须使用 OAUTH 模块在上游创建具有正确权限的令牌
+MAIN_MAIL_SMTPS_AUTH_TYPE=认证方式
+UsePassword=使用密码
+UseOauth=使用 OAUTH 令牌
+Images=图像
+MaxNumberOfImagesInGetPost=Max number of images allowed in a HTML field submitted in a form
diff --git a/htdocs/langs/zh_CN/banks.lang b/htdocs/langs/zh_CN/banks.lang
index 26feb7ea2d5..965d5846c93 100644
--- a/htdocs/langs/zh_CN/banks.lang
+++ b/htdocs/langs/zh_CN/banks.lang
@@ -39,7 +39,7 @@ StandingOrders=提款收据
 StandingOrder=直接借记订单
 PaymentByDirectDebit=Payment by direct debit
 PaymentByBankTransfers=Payments by credit transfer
-PaymentByBankTransfer=Payment by credit transfer
+PaymentByBankTransfer=通过银行汇款付款
 AccountStatement=户口结单
 AccountStatementShort=声明
 AccountStatements=户口结单
@@ -95,11 +95,11 @@ LineRecord=交易
 AddBankRecord=添加条目
 AddBankRecordLong=手动添加条目
 Conciliated=调解
-ConciliatedBy=调节人
+ReConciliedBy=调节人
 DateConciliating=核对日期
 BankLineConciliated=Entry reconciled with bank receipt
-Reconciled=调解
-NotReconciled=未调解
+BankLineReconciled=调解
+BankLineNotReconciled=未调解
 CustomerInvoicePayment=客户付款
 SupplierInvoicePayment=Vendor payment
 SubscriptionPayment=认购款项
@@ -172,8 +172,8 @@ SEPAMandate=SEPA授权
 YourSEPAMandate=您的SEPA授权
 FindYourSEPAMandate=这是您的SEPA授权，授权我们公司向您的银行直接扣款。返回签名（扫描签名文档）或通过邮件发送给
 AutoReportLastAccountStatement=Automatically fill the field 'number of bank statement' with last statement number when making reconciliation
-CashControl=POS cash desk control
-NewCashFence=New cash desk opening or closing
+CashControl=POS cash control
+NewCashFence=New cash control (opening or closing)
 BankColorizeMovement=Colorize movements
 BankColorizeMovementDesc=If this function is enable, you can choose specific background color for debit or credit movements
 BankColorizeMovementName1=Background color for debit movement
@@ -182,3 +182,7 @@ IfYouDontReconcileDisableProperty=If you don't make the bank reconciliations on
 NoBankAccountDefined=No bank account defined
 NoRecordFoundIBankcAccount=No record found in bank account. Commonly, this occurs when a record has been deleted manually from the list of transaction in the bank account (for example during a reconciliation of the bank account). Another reason is that the payment was recorded when the module "%s" was disabled.
 AlreadyOneBankAccount=Already one bank account defined
+SEPAXMLPlacePaymentTypeInformationInCreditTransfertransactionInformation=SEPA transfer: 'Payment Type' at 'Credit Transfer' level
+SEPAXMLPlacePaymentTypeInformationInCreditTransfertransactionInformationHelp=When generatin 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=To create missing related bank record
+BanklineExtraFields=Bank Line Extrafields
diff --git a/htdocs/langs/zh_CN/bills.lang b/htdocs/langs/zh_CN/bills.lang
index a575254c7dd..592a162c5c0 100644
--- a/htdocs/langs/zh_CN/bills.lang
+++ b/htdocs/langs/zh_CN/bills.lang
@@ -71,7 +71,7 @@ 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
+SupplierPayments=供应商付款
 ReceivedPayments=收到的付款
 ReceivedCustomersPayments=收到客户付款
 PayedSuppliersPayments=Payments paid to vendors
@@ -90,8 +90,8 @@ CodePaymentMode=Payment method (code)
 LabelPaymentMode=Payment method (label)
 PaymentModeShort=Payment method
 PaymentTerm=Payment Term
-PaymentConditions=Payment Terms
-PaymentConditionsShort=Payment Terms
+PaymentConditions=付款条款
+PaymentConditionsShort=付款条款
 PaymentAmount=付款金额
 PaymentHigherThanReminderToPay=付款金额比需要支付的金额高
 HelpPaymentHigherThanReminderToPay=Attention, the payment amount of one or more bills is higher than the outstanding amount to pay. <br> Edit your entry, otherwise confirm and consider creating a credit note for the excess received for each overpaid invoice.
@@ -156,6 +156,7 @@ ErrorInvoiceAvoirMustBeNegative=错误，这种类型的发票必须有一个负
 ErrorInvoiceOfThisTypeMustBePositive=Error, this type of invoice must have an amount excluding tax positive (or null)
 ErrorCantCancelIfReplacementInvoiceNotValidated=错误，无法取消一个已经被处于草稿状态发票替代的发票
 ErrorThisPartOrAnotherIsAlreadyUsedSoDiscountSerieCantBeRemoved=This part or another is already used so discount series cannot be removed.
+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.
 BillFrom=发送方
 BillTo=接收方
 ActionsOnBill=发票的动作
@@ -282,6 +283,8 @@ RecurringInvoices=定期发票
 RecurringInvoice=Recurring invoice
 RepeatableInvoice=模板发票
 RepeatableInvoices=模板发票
+RecurringInvoicesJob=Generation of recurring invoices (sales invoices)
+RecurringSupplierInvoicesJob=Generation of recurring invoices (purchase invoices)
 Repeatable=模板
 Repeatables=模板
 ChangeIntoRepeatableInvoice=转换为模板发票
@@ -426,14 +429,24 @@ PaymentConditionShort14D=14天
 PaymentCondition14D=14天
 PaymentConditionShort14DENDMONTH=月末14天
 PaymentCondition14DENDMONTH=在月底之后的14天内
+PaymentConditionShortDEP30PCTDEL=__DEPOSIT_PERCENT__%% deposit
+PaymentConditionDEP30PCTDEL=__DEPOSIT_PERCENT__%% deposit, remainder on delivery
 FixAmount=Fixed amount - 1 line with label '%s'
 VarAmount=可变金额(%% tot.)
 VarAmountOneLine=可变金额（%% tot。） -  1行标签'%s'
 VarAmountAllLines=Variable amount (%% tot.) - all lines from origin
+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
 # PaymentType
 PaymentTypeVIR=银行转帐
 PaymentTypeShortVIR=银行转帐
 PaymentTypePRE=直接付款订单
+PaymentTypePREdetails=(on account *-%s)
 PaymentTypeShortPRE=借记卡付款单
 PaymentTypeLIQ=现金
 PaymentTypeShortLIQ=现金
@@ -482,6 +495,7 @@ PaymentByChequeOrderedToShort=Check payments (incl. tax) are payable to
 SendTo=发送到
 PaymentByTransferOnThisBankAccount=Payment by transfer to the following bank account
 VATIsNotUsedForInvoice=* 不得包含增值税, 详见CGI-293B
+VATIsNotUsedForInvoiceAsso=* Non applicable VAT art-261-7 of CGI
 LawApplicationPart1=通过对应用的12/05/80法80.335
 LawApplicationPart2=货物仍然是该人士/组织的资产
 LawApplicationPart3=the seller until full payment of
@@ -599,7 +613,6 @@ 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 %%
@@ -607,3 +620,5 @@ 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
+MakePaymentAndClassifyPayed=Record payment
+BulkPaymentNotPossibleForInvoice=Bulk payment is not possible for invoice %s (bad type or status)
diff --git a/htdocs/langs/zh_TW/accountancy.lang b/htdocs/langs/zh_TW/accountancy.lang
index 5ee3ee39593..50bc8d5b3ef 100644
--- a/htdocs/langs/zh_TW/accountancy.lang
+++ b/htdocs/langs/zh_TW/accountancy.lang
@@ -48,8 +48,9 @@ CountriesNotInEEC=非歐盟國家
 CountriesInEECExceptMe=除了%s以外的歐盟國家
 CountriesExceptMe=除了%s以外的所有國家
 AccountantFiles=匯出來源文件
-ExportAccountingSourceDocHelp=使用此工具，您可以匯出用於產生會計的來源事件（CSV 和 PDF 中的清單）。
+ExportAccountingSourceDocHelp=With this tool, you can search and export the source events that are used to generate your accountancy. <br>The exported ZIP file will contain the lists of requested items in CSV, as well as their attached files in their original format (PDF, ODT, DOCX...).
 ExportAccountingSourceDocHelp2=要匯出您的日記帳，請使用選單條目 %s - %s。
+ExportAccountingProjectHelp=Specify a project if you need an accounting report only for a specific project. Expense reports and loan payments are not included in project reports.
 VueByAccountAccounting=依會計科目檢視
 VueBySubAccountAccounting=依會計子分類帳檢視
 
@@ -107,8 +108,8 @@ MenuTaxAccounts=稅捐會計項目
 MenuExpenseReportAccounts=費用報表會計項目
 MenuLoanAccounts=借款會計項目
 MenuProductsAccounts=產品會計項目
-MenuClosureAccounts=關閉帳戶
-MenuAccountancyClosure=關閉
+MenuClosureAccounts=結束帳戶
+MenuAccountancyClosure=結案
 MenuAccountancyValidationMovements=驗證動作
 ProductsBinding=產品會計項目
 TransferInAccounting=會計轉移
@@ -172,7 +173,7 @@ ACCOUNTING_HAS_NEW_JOURNAL=有新的日記帳
 
 ACCOUNTING_RESULT_PROFIT=結果會計科目（利潤）
 ACCOUNTING_RESULT_LOSS=結果會計科目（虧損）
-ACCOUNTING_CLOSURE_DEFAULT_JOURNAL=關閉日記帳
+ACCOUNTING_CLOSURE_DEFAULT_JOURNAL=結束日記帳
 
 ACCOUNTING_ACCOUNT_TRANSFER_CASH=過渡性銀行轉帳的會計帳戶
 TransitionalAccount=過渡銀行轉帳帳戶
@@ -183,6 +184,8 @@ ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT=用於註冊訂閱的會計科目
 
 ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT=會計帳戶預設註冊客戶存款
 UseAuxiliaryAccountOnCustomerDeposit=Store customer account as individual account in subsidiary ledger for lines of down payments (if disabled, individual account for down payment lines will remain empty)
+ACCOUNTING_ACCOUNT_SUPPLIER_DEPOSIT=Accounting account by default to register supplier deposit
+UseAuxiliaryAccountOnSupplierDeposit=Store supplier account as individual account in subsidiary ledger for lines of down payments (if disabled, individual account for down payment lines will remain empty)
 
 ACCOUNTING_PRODUCT_BUY_ACCOUNT=所購買產品的預設會計科目（如果在產品表中未定義則使用）
 ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT=預設情況下，在EEC中所購買產品的會計帳戶（如果未在產品單中定義則使用）
@@ -278,8 +281,8 @@ DescVentilExpenseReport=在此查閱費用報表行數是否關聯到費用會
 DescVentilExpenseReportMore=如果您在費用報表類型上設定會計帳戶，則應用程序將能夠在費用報表和會計科目表的會計帳戶之間進行所有綁定，只需點擊按鈕<strong>“ %s”即可</strong> 。如果未在費用字典中設定帳戶，或者您仍有某些行未綁定到任何帳戶，則必須從選單“ <strong>%s</strong> ”進行手動綁定。
 DescVentilDoneExpenseReport=在此查閱費用報表的清單及其費用會計項目。
 
-Closure=年度關閉
-DescClosure=Consult here the number of movements by month not yet validated & locked
+Closure=年度結帳
+DescClosure=請在此處查詢按月排列的尚未驗證及尚未鎖定的異動數
 OverviewOfMovementsNotValidated=未驗證和未鎖定的移動概覽
 AllMovementsWereRecordedAsValidated=所有動作都被記錄為已驗證並鎖定
 NotAllMovementsCouldBeRecordedAsValidated=並非所有動作都可以記錄為已驗證與已鎖定
@@ -332,7 +335,7 @@ ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS=停用費用報表中的會計綁
 
 ## Export
 NotifiedExportDate=Flag exported lines as Exported <span class="warning">(to modify a line, you will need to delete the whole transaction and re-transfert it into accounting)</span>
-NotifiedValidationDate=Validate and Lock the exported entries <span class="warning">(same effect than the "Closure" feature, modification and deletion of the lines will DEFINITELY not be possible)</span>
+NotifiedValidationDate=Validate and Lock the exported entries <span class="warning">(same effect than the "%s" feature, modification and deletion of the lines will DEFINITELY not be possible)</span>
 DateValidationAndLock=驗證與鎖定的日期
 ConfirmExportFile=確定要產生會計匯出檔案 ?
 ExportDraftJournal=匯出日記帳草稿
@@ -364,7 +367,7 @@ ChartofaccountsId=會計項目表ID
 InitAccountancy=初始會計
 InitAccountancyDesc=此頁可在沒有定義產品及服務的銷售及採購會計項目下使用產品及服務的會計項目。
 DefaultBindingDesc=當沒有設定特定會計項目時，此頁面可設定預設會計項目連結到薪資、捐贈、稅捐及營業稅的交易紀錄。
-DefaultClosureDesc=該頁面可用於設置用於會計結帳的參數。
+DefaultClosureDesc=該頁面可用於設置會計結帳的參數。
 Options=選項
 OptionModeProductSell=銷售模式
 OptionModeProductSellIntra=在EEC中的銷售模式已匯出
diff --git a/htdocs/langs/zh_TW/admin.lang b/htdocs/langs/zh_TW/admin.lang
index 8122088780e..752f6604a16 100644
--- a/htdocs/langs/zh_TW/admin.lang
+++ b/htdocs/langs/zh_TW/admin.lang
@@ -109,7 +109,7 @@ NextValueForReplacements=下一個值(代替)
 MustBeLowerThanPHPLimit=注意： <b>您的</b> PHP設定目前限制了上傳到<b>%s</b>%s的最大檔案大小，無論此參數的值如何
 NoMaxSizeByPHPLimit=註：你的 PHP 偏好設定為無限制
 MaxSizeForUploadedFiles=上傳檔案最大值（0 為禁止上傳）
-UseCaptchaCode=Use graphical code (CAPTCHA) on login page and some public pages
+UseCaptchaCode=在登入頁或某些公開網頁上的使用圖形碼 (CAPTCHA)
 AntiVirusCommand=防毒命令的完整路徑
 AntiVirusCommandExample=ClamAv Daemon 的範例（需要 clamav-daemon）: / usr / bin / clamdscan <br> ClamWin的範例（非常慢）: c:\\Progra~1\\ClamWin\\bin\\clamscan.exe
 AntiVirusParam= 在命令列中更多的參數
@@ -477,7 +477,7 @@ InstalledInto=已安裝到 %s 資料夾
 BarcodeInitForThirdparties=合作方的批次條碼初始化
 BarcodeInitForProductsOrServices=批次條碼初始化或產品或服務重置
 CurrentlyNWithoutBarCode=目前您在沒有條碼<strong>%s</strong>%s中有<strong>%s</strong>的記錄。
-InitEmptyBarCode=下一筆%s記錄初始值
+InitEmptyBarCode=Init value for the %s empty barcodes
 EraseAllCurrentBarCode=刪除目前全部條碼現有值
 ConfirmEraseAllCurrentBarCode=您確定您要刪除目前全部條碼現有值？
 AllBarcodeReset=全部條碼值已刪除
@@ -714,13 +714,14 @@ Permission27=刪除商業提案/建議書
 Permission28=匯出商業提案/建議書
 Permission31=讀取產品資訊
 Permission32=建立/修改產品資訊
+Permission33=Read prices products
 Permission34=刪除產品
 Permission36=查看/管理隱藏的產品
 Permission38=匯出產品資訊
 Permission39=忽略最低價格
-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=Delete projects (shared projects and projects of which I am a contact)
+Permission41=讀取專案及任務（已分享專案及我擔任連絡人的專案）
+Permission42=建立/修改專案（已分享專案及以我擔任連絡人的專案）。也可以指派用戶到專案及任務
+Permission44=刪除專案（已分享專案及以我擔任連絡人的專案）
 Permission45=匯出專案
 Permission61=讀取干預
 Permission62=建立/修改干預
@@ -739,6 +740,7 @@ Permission79=建立/修改訂閲
 Permission81=讀取客戶訂單
 Permission82=建立/修改客戶訂單
 Permission84=驗證客戶訂單
+Permission85=Generate the documents sales orders
 Permission86=傳送客戶訂單
 Permission87=關閉客戶訂單(結案)
 Permission88=取消客戶訂單
@@ -766,9 +768,9 @@ Permission122=建立/修改已連結到用戶的合作方
 Permission125=刪除已連結到用戶的合作方
 Permission126=匯出合作方資料
 Permission130=建立/修改合作方支付資訊
-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)
+Permission141=讀取全部專案及任務(也含我不是聯絡人的私人專案)
+Permission142=建立/修改全部專案及任務（也包含我不是連絡人的私人專案）
+Permission144=刪除全部專案及任務（也包含我不是連絡人的私人專案）
 Permission145=Can enter time consumed, for me or my hierarchy, on assigned tasks (Timesheet)
 Permission146=讀取提供者
 Permission147=讀取統計資料
@@ -874,6 +876,7 @@ Permission525=存取借款計算器
 Permission527=匯出借款
 Permission531=讀取服務
 Permission532=建立/修改服務
+Permission533=Read prices services
 Permission534=刪除服務
 Permission536=查看/管理隱藏服務
 Permission538=匯出服務
@@ -1197,7 +1200,7 @@ Alerts=警告
 DelaysOfToleranceBeforeWarning=顯示警告警報...
 DelaysOfToleranceDesc=設定延遲時間，以在螢幕上顯示延遲元件的警告圖案%s。
 Delays_MAIN_DELAY_ACTIONS_TODO=未完成計劃事件（應辦事項事件）
-Delays_MAIN_DELAY_PROJECT_TO_CLOSE=專案未及時關閉
+Delays_MAIN_DELAY_PROJECT_TO_CLOSE=專案未及時結束
 Delays_MAIN_DELAY_TASKS_TODO=未完成計劃任務（專案任務）
 Delays_MAIN_DELAY_ORDERS_TO_PROCESS=未處理訂單
 Delays_MAIN_DELAY_SUPPLIER_ORDERS_TO_PROCESS=未處理採購訂單
@@ -1235,6 +1238,7 @@ BrowserName=瀏覽器名稱
 BrowserOS=瀏覽器系統
 ListOfSecurityEvents=Dolibarr 安全事件清單
 SecurityEventsPurged=清除安全事件
+TrackableSecurityEvents=Trackable security events
 LogEventDesc=啟用特定安全事件的日誌記錄。通過選單<b>%s-%s來</b>管理日誌。警告，此功能可能會在資料庫中產生大量數據。
 AreaForAdminOnly=設定參數僅可由<b>管理員</b>進行設定。
 SystemInfoDesc=僅供系統管理員以唯讀及可見模式取得系統資訊。
@@ -1977,6 +1981,7 @@ MailToSendSupplierOrder=採購訂單
 MailToSendSupplierInvoice=供應商發票
 MailToSendContract=合約
 MailToSendReception=收貨(s)
+MailToExpenseReport=費用報表
 MailToThirdparty=合作方
 MailToMember= 會員
 MailToUser=用戶
@@ -2030,6 +2035,7 @@ MAIN_PDF_MARGIN_RIGHT=PDF右邊邊距
 MAIN_PDF_MARGIN_TOP=PDF頂部邊距
 MAIN_PDF_MARGIN_BOTTOM=PDF底部邊距
 MAIN_DOCUMENTS_LOGO_HEIGHT=PDF上Logo的高度
+DOC_SHOW_FIRST_SALES_REP=Show first sales representative
 MAIN_GENERATE_PROPOSALS_WITH_PICTURE=在提案/建議書行加入圖片欄位
 MAIN_DOCUMENTS_WITH_PICTURE_WIDTH=欄位寬度-如果在行上加入圖片
 MAIN_PDF_NO_SENDER_FRAME=隱藏寄件人地址框的邊框
@@ -2063,6 +2069,12 @@ EmailCollectors=Email collectors
 EmailCollectorDescription=新增計劃作業和設定頁面以定期掃描信箱（使用IMAP協議），並在正確的位置記錄接收到您應用程式中的電子郵件和/或自動建立一些記錄（例如潛在）。
 NewEmailCollector=新電子郵件收集器
 EMailHost=IMAP伺服器主機
+EMailHostPort=Port of email IMAP server
+loginPassword=Login/Password
+oauthToken=Oauth2 token
+accessType=Acces type
+oauthService=Oauth service
+TokenMustHaveBeenCreated=Module OAuth2 must be enabled and an oauth2 token must have been created with the correct permissions (for example scope "gmail_full" with OAuth for Gmail).
 MailboxSourceDirectory=信箱來源資料夾
 MailboxTargetDirectory=信箱目標資料夾
 EmailcollectorOperations=收集器要做的操作
@@ -2106,7 +2118,7 @@ CreateCandidature=建立工作應用程式
 FormatZip=Zip
 MainMenuCode=選單輸入代碼（主選單）
 ECMAutoTree=顯示自動ECM樹狀圖
-OperationParamDesc=定義用於提取或設定數值的規則。 <br> 需要從電子郵件主題中提取名稱的操作範例：<br> name=EXTRACT:SUBJECT:公司訊息 ([^\n] *）<br>操作建立物件的範例：<br> objproperty1 = SET：要設定的數值<br> objproperty2 = SET：__objproperty1__要包括的數值 <br> objproperty3=SETIFEMPTY:objproperty3尚未定義時要使用的數值<br> objproperty4 = EXTRACT：HEADER :X-Myheaderkey:\\s*([^\\s]*) <br> options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*) <br> object.objproperty5=EXTRACT:BODY:我的公司名稱是\\s( [^\\s]*) <br> <br> 使用 ; char 作為分隔符來提取或設定幾個屬性。
+OperationParamDesc=Define the rules to use to extract some data or set values to use for operation.<br><br>Example to extract a company name from email subject into a temporary variable:<br>tmp_var=EXTRACT:SUBJECT:Message from company ([^\n]*)<br><br>Examples to set the properties of an object to create:<br>objproperty1=SET:a hard coded value<br>objproperty2=SET:__tmp_var__<br>objproperty3=SETIFEMPTY:a value (value is set only if property is not already defined)<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
 OpeningHours=營業時間
 OpeningHoursDesc=在此處輸入貴公司的正常營業時間。
 ResourceSetup=資源模組的設定
@@ -2212,6 +2224,7 @@ NoExternalModuleWithUpdate=未找到外部模組的更新
 SwaggerDescriptionFile=Swagger API 描述檔案（例如用於 redoc）
 YouEnableDeprecatedWSAPIsUseRESTAPIsInstead=您啟用了已棄用的 WS API。您應該改用 REST API。
 RandomlySelectedIfSeveral=有多張圖片時隨機選擇
+SalesRepresentativeInfo=For Proposals, Orders, Invoices.
 DatabasePasswordObfuscated=資料庫密碼在conf檔案中為加密
 DatabasePasswordNotObfuscated=資料庫密碼在conf檔案中不是加密
 APIsAreNotEnabled=未啟用 API 模組
@@ -2277,5 +2290,20 @@ INVOICE_ADD_ZATCA_QR_CODEMore=Some Arabic countries need this QR Code on their i
 INVOICE_ADD_SWISS_QR_CODE=Show the swiss QR-Bill code on invoices
 UrlSocialNetworksDesc=Url link of social network. Use {socialid} for the variable part that contains the social network ID.
 IfThisCategoryIsChildOfAnother=If this category is a child of another one
+DarkThemeMode=Dark theme mode
+AlwaysDisabled=Always disabled
+AccordingToBrowser=According to browser
+AlwaysEnabled=Always Enabled
+DoesNotWorkWithAllThemes=Will not work with all themes
 NoName=No name
+ShowAdvancedOptions= Show advanced options
+HideAdvancedoptions= Hide advanced options
 CIDLookupURL=The module brings an URL that can be used by an external tool to get the name of a thirdparty or contact from its phone number. URL to use is:
+OauthNotAvailableForAllAndHadToBeCreatedBefore=OAUTH2 authentication is not available for all hosts, and a token with the right permissions must have been created upstream with the OAUTH module
+MAIN_MAIL_SMTPS_OAUTH_SERVICE=OAUTH2 authentication service
+DontForgetCreateTokenOauthMod=A token with the right permissions must have been created upstream with the OAUTH module
+MAIN_MAIL_SMTPS_AUTH_TYPE=Authentification method
+UsePassword=Use a password
+UseOauth=Use a OAUTH token
+Images=Images
+MaxNumberOfImagesInGetPost=Max number of images allowed in a HTML field submitted in a form
diff --git a/htdocs/langs/zh_TW/agenda.lang b/htdocs/langs/zh_TW/agenda.lang
index 4663de7c400..11b6b75f504 100644
--- a/htdocs/langs/zh_TW/agenda.lang
+++ b/htdocs/langs/zh_TW/agenda.lang
@@ -17,9 +17,9 @@ Location=位置
 ToUserOfGroup=將事件分配給群組中的任何用戶
 EventOnFullDay=整天事件
 MenuToDoActions=全部未完成事件
-MenuDoneActions=全部已停止事件
+MenuDoneActions=全部已完成事件
 MenuToDoMyActions=我的未完成事件
-MenuDoneMyActions=我的已停止事件
+MenuDoneMyActions=我的已完成事件
 ListOfEvents=事件清單(預設行事曆)
 ActionsAskedBy=誰的事件報表
 ActionsToDoBy=事件指定給
@@ -57,6 +57,7 @@ MemberValidatedInDolibarr=會員 %s 已驗證
 MemberModifiedInDolibarr=會員 %s 已修改
 MemberResiliatedInDolibarr=會員 %s 已終止
 MemberDeletedInDolibarr=會員 %s 已刪除
+MemberExcludedInDolibarr=Member %s excluded
 MemberSubscriptionAddedInDolibarr=會員 %s 已新增 %s 的訂閱
 MemberSubscriptionModifiedInDolibarr=會員 %s 已修改 %s 訂閱
 MemberSubscriptionDeletedInDolibarr=會員 %s 已刪除 %s 訂閱
@@ -159,6 +160,7 @@ DateActionBegin=事件開始日期
 ConfirmCloneEvent=您確定要複製事件 <b>%s</b>?
 RepeatEvent=重覆事件
 OnceOnly=只有一次
+EveryDay=Every day
 EveryWeek=每周
 EveryMonth=每月
 DayOfMonth=一個月中的某天
@@ -174,3 +176,4 @@ AddReminder=為此事件建立自動提醒通知
 ErrorReminderActionCommCreation=為此事件建立提醒通知時出現錯誤
 BrowserPush=查看彈出通知
 ActiveByDefault=預設為啟用
+Until=until
diff --git a/htdocs/langs/zh_TW/banks.lang b/htdocs/langs/zh_TW/banks.lang
index 1e5aee66716..0bf28f1422d 100644
--- a/htdocs/langs/zh_TW/banks.lang
+++ b/htdocs/langs/zh_TW/banks.lang
@@ -88,7 +88,7 @@ AccountToDebit=借款方帳戶
 DisableConciliation=停用此帳戶對帳功能
 ConciliationDisabled=已停用對帳功能
 LinkedToAConciliatedTransaction=已連結到調節條目
-StatusAccountOpened=開放
+StatusAccountOpened=啟用
 StatusAccountClosed=已關閉
 AccountIdShort=號碼
 LineRecord=交易
@@ -156,7 +156,7 @@ RejectCheck=支票已退回
 ConfirmRejectCheck=您確定要將此支票標記為已拒絕嗎？
 RejectCheckDate=退回支票的日期
 CheckRejected=支票已退回
-CheckRejectedAndInvoicesReopened=支票已退回，發票已重新打開
+CheckRejectedAndInvoicesReopened=支票已退回，發票已重新啟用
 BankAccountModelModule=銀行帳戶的文件範本
 DocumentModelSepaMandate=歐洲統一支付區要求的範本。僅適用於歐洲經濟共同體的歐洲國家。
 DocumentModelBan=列印有BAN資訊的範本。
@@ -185,3 +185,4 @@ AlreadyOneBankAccount=已定義一個銀行帳戶
 SEPAXMLPlacePaymentTypeInformationInCreditTransfertransactionInformation=SEPA 轉帳：“信用轉帳”級別的“付款類型”
 SEPAXMLPlacePaymentTypeInformationInCreditTransfertransactionInformationHelp=When generatin 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=建立遺失的相關銀行記錄
+BanklineExtraFields=Bank Line Extrafields
diff --git a/htdocs/partnership/partnershipindex.php b/htdocs/partnership/partnershipindex.php
deleted file mode 100644
index 0b8a6cd33c9..00000000000
--- a/htdocs/partnership/partnershipindex.php
+++ /dev/null
@@ -1,197 +0,0 @@
-<?php
-/* Copyright (C) 2001-2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2004-2015 Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) 2005-2012 Regis Houssin        <regis.houssin@inodbox.com>
- * Copyright (C) 2015      Jean-François Ferry	<jfefe@aternatik.fr>
- *
- * This 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       partnership/partnershipindex.php
- *	\ingroup    partnership
- *	\brief      Home page of partnership top menu
- */
-
-// Load Dolibarr environment
-require '../main.inc.php';
-
-require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
-
-// Load translation files required by the page
-$langs->loadLangs(array("partnership"));
-
-$action = GETPOST('action', 'aZ09');
-
-
-// Security check
-// if (! $user->rights->partnership->myobject->read) {
-// 	accessforbidden();
-// }
-$socid = GETPOST('socid', 'int');
-if (isset($user->socid) && $user->socid > 0) {
-	$action = '';
-	$socid = $user->socid;
-}
-
-$max = 5;
-$now = dol_now();
-
-
-/*
- * Actions
- */
-
-// None
-
-
-/*
- * View
- */
-
-$form = new Form($db);
-$formfile = new FormFile($db);
-
-llxHeader("", $langs->trans("PartnershipArea"));
-
-print load_fiche_titre($langs->trans("PartnershipArea"), '', 'partnership.png@partnership');
-
-print '<div class="fichecenter"><div class="fichethirdleft">';
-
-
-/* BEGIN MODULEBUILDER DRAFT MYOBJECT
-// Draft MyObject
-if (! empty($conf->partnership->enabled) && $user->rights->partnership->read) {
-	$langs->load("orders");
-
-	$sql = "SELECT c.rowid, c.ref, c.ref_client, c.total_ht, c.tva as total_tva, c.total_ttc, s.rowid as socid, s.nom as name, s.client, s.canvas";
-	$sql.= ", s.code_client";
-	$sql.= " FROM ".MAIN_DB_PREFIX."commande as c";
-	$sql.= ", ".MAIN_DB_PREFIX."societe as s";
-	if (! $user->rights->societe->client->voir && ! $socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-	$sql.= " WHERE c.fk_soc = s.rowid";
-	$sql.= " AND c.fk_statut = 0";
-	$sql.= " AND c.entity IN (".getEntity('commande').")";
-	if (! $user->rights->societe->client->voir && ! $socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".((int) $user->id);
-	if ($socid)	$sql.= " AND c.fk_soc = ".((int) $socid);
-
-	$resql = $db->query($sql);
-	if ($resql) {
-		$total = 0;
-		$num = $db->num_rows($resql);
-
-		print '<table class="noborder centpercent">';
-		print '<tr class="liste_titre">';
-		print '<th colspan="3">'.$langs->trans("DraftMyObjects").($num?'<span class="badge marginleftonlyshort">'.$num.'</span>':'').'</th></tr>';
-
-		$var = true;
-		if ($num > 0) {
-			$i = 0;
-			while ($i < $num) {
-				$obj = $db->fetch_object($resql);
-				print '<tr class="oddeven"><td class="nowrap">';
-
-				$myobjectstatic->id=$obj->rowid;
-				$myobjectstatic->ref=$obj->ref;
-				$myobjectstatic->ref_client=$obj->ref_client;
-				$myobjectstatic->total_ht = $obj->total_ht;
-				$myobjectstatic->total_tva = $obj->total_tva;
-				$myobjectstatic->total_ttc = $obj->total_ttc;
-
-				print $myobjectstatic->getNomUrl(1);
-				print '</td>';
-				print '<td class="nowrap">';
-				print '</td>';
-				print '<td class="right" class="nowrap">'.price($obj->total_ttc).'</td></tr>';
-				$i++;
-				$total += $obj->total_ttc;
-			}
-			if ($total>0) {
-				print '<tr class="liste_total"><td>'.$langs->trans("Total").'</td><td colspan="2" class="right">'.price($total)."</td></tr>";
-			}
-		} else {
-			print '<tr class="oddeven"><td colspan="3" class="opacitymedium">'.$langs->trans("NoOrder").'</td></tr>';
-		}
-		print "</table><br>";
-
-		$db->free($resql);
-	} else {
-		dol_print_error($db);
-	}
-}
-END MODULEBUILDER DRAFT MYOBJECT */
-
-
-print '</div><div class="fichetwothirdright">';
-
-
-$NBMAX = $conf->global->MAIN_SIZE_SHORTLIST_LIMIT;
-$max = $conf->global->MAIN_SIZE_SHORTLIST_LIMIT;
-
-/* BEGIN MODULEBUILDER LASTMODIFIED MYOBJECT
-// Last modified myobject
-if (! empty($conf->partnership->enabled) && $user->rights->partnership->read) {
-	$sql = "SELECT s.rowid, s.ref, s.label, s.date_creation, s.tms";
-	$sql.= " FROM ".MAIN_DB_PREFIX."partnership_myobject as s";
-	//if (! $user->rights->societe->client->voir && ! $socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-	$sql.= " WHERE s.entity IN (".getEntity($myobjectstatic->element).")";
-	//if (! $user->rights->societe->client->voir && ! $socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".((int) $user->id);
-	//if ($socid)	$sql.= " AND s.rowid = $socid";
-	$sql .= " ORDER BY s.tms DESC";
-	$sql .= $db->plimit($max, 0);
-
-	$resql = $db->query($sql);
-	if ($resql) {
-		$num = $db->num_rows($resql);
-		$i = 0;
-
-		print '<table class="noborder centpercent">';
-		print '<tr class="liste_titre">';
-		print '<th colspan="2">';
-		print $langs->trans("BoxTitleLatestModifiedMyObjects", $max);
-		print '</th>';
-		print '<th class="right">'.$langs->trans("DateModificationShort").'</th>';
-		print '</tr>';
-		if ($num) {
-			while ($i < $num) {
-				$objp = $db->fetch_object($resql);
-
-				$myobjectstatic->id=$objp->rowid;
-				$myobjectstatic->ref=$objp->ref;
-				$myobjectstatic->label=$objp->label;
-				$myobjectstatic->status = $objp->status;
-
-				print '<tr class="oddeven">';
-				print '<td class="nowrap">'.$myobjectstatic->getNomUrl(1).'</td>';
-				print '<td class="right nowrap">';
-				print "</td>";
-				print '<td class="right nowrap">'.dol_print_date($db->jdate($objp->tms), 'day')."</td>";
-				print '</tr>';
-				$i++;
-			}
-
-			$db->free($resql);
-		} else {
-			print '<tr class="oddeven"><td colspan="3" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
-		}
-		print "</table><br>";
-	}
-}
-*/
-
-print '</div></div>';
-
-// End of page
-llxFooter();
-$db->close();

From e6d0e4ebca8e61d880bdd73f68a44e43bfe97c75 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 8 Sep 2022 14:15:48 +0200
Subject: [PATCH 781/974] Fix #yogosha12268

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

diff --git a/htdocs/recruitment/index.php b/htdocs/recruitment/index.php
index c2b35a7e2a0..a6c0a41be60 100644
--- a/htdocs/recruitment/index.php
+++ b/htdocs/recruitment/index.php
@@ -49,7 +49,7 @@ if (isset($user->socid) && $user->socid > 0) {
 // if (! $user->hasRights('mymodule', 'myobject', 'read')) {
 // 	accessforbidden();
 // }
-restrictedArea($user, 'recruitment', 0, 'recruitment_recruitmentcandidature', 'recruitmentjobposition', '', 'rowid');
+restrictedArea($user, 'recruitment', 0, 'recruitment_recruitmentjobposition', 'recruitmentjobposition', '', 'rowid');
 
 
 /*

From ad673b3207506de03ee8e745399e3a19505900d2 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 8 Sep 2022 14:16:21 +0200
Subject: [PATCH 782/974] Fix perm

---
 htdocs/recruitment/recruitmentindex.php | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/htdocs/recruitment/recruitmentindex.php b/htdocs/recruitment/recruitmentindex.php
index f028f2f8243..83101d6f31e 100644
--- a/htdocs/recruitment/recruitmentindex.php
+++ b/htdocs/recruitment/recruitmentindex.php
@@ -46,6 +46,14 @@ if (isset($user->socid) && $user->socid > 0) {
 $max = 5;
 $now = dol_now();
 
+// Security check (enable the most restrictive one)
+//if ($user->socid > 0) accessforbidden();
+//if ($user->socid > 0) $socid = $user->socid;
+// if (! $user->hasRights('mymodule', 'myobject', 'read')) {
+// 	accessforbidden();
+// }
+restrictedArea($user, 'recruitment', 0, 'recruitment_recruitmentjobposition', 'recruitmentjobposition', '', 'rowid');
+
 
 /*
  * Actions

From c3f673c3ad61fa2b20c72e92854732e0e5924b5d Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 8 Sep 2022 14:58:00 +0200
Subject: [PATCH 783/974] Clean permissions for barcode menu

---
 htdocs/barcode/codeinit.php                   | 18 +++++----
 htdocs/barcode/printsheet.php                 | 15 ++++++--
 htdocs/core/modules/modBarcode.class.php      | 38 ++++++++++++-------
 .../install/mysql/migration/16.0.0-17.0.0.sql |  3 ++
 htdocs/langs/en_US/admin.lang                 |  6 +--
 htdocs/langs/en_US/modulebuilder.lang         |  2 +-
 .../core/modules/modMyModule.class.php        | 16 ++++----
 .../modulebuilder/template/mymoduleindex.php  |  8 +++-
 htdocs/recruitment/index.php                  |  2 +-
 9 files changed, 69 insertions(+), 39 deletions(-)

diff --git a/htdocs/barcode/codeinit.php b/htdocs/barcode/codeinit.php
index fe8ff50cf96..08456fc45af 100644
--- a/htdocs/barcode/codeinit.php
+++ b/htdocs/barcode/codeinit.php
@@ -49,6 +49,17 @@ $modBarCodeThirdparty = '';
 
 $maxperinit = 1000;
 
+// Security check (enable the most restrictive one)
+//if ($user->socid > 0) accessforbidden();
+//if ($user->socid > 0) $socid = $user->socid;
+if (!isModEnabled('barcode')) {
+	accessforbidden('Module not enabled');
+}
+//restrictedArea($user, 'barcode');
+if (empty($user->admin)) {
+	accessforbidden('Must be admin');
+}
+
 
 /*
  * Actions
@@ -262,13 +273,6 @@ if ($action == 'initbarcodeproducts') {
  * View
  */
 
-if (!$user->admin) {
-	accessforbidden();
-}
-if (empty($conf->barcode->enabled)) {
-	accessforbidden();
-}
-
 $form = new Form($db);
 
 llxHeader('', $langs->trans("MassBarcodeInit"));
diff --git a/htdocs/barcode/printsheet.php b/htdocs/barcode/printsheet.php
index c55db4ef2a1..66297ab173c 100644
--- a/htdocs/barcode/printsheet.php
+++ b/htdocs/barcode/printsheet.php
@@ -56,6 +56,17 @@ $action = GETPOST('action', 'aZ09');
 $producttmp = new Product($db);
 $thirdpartytmp = new Societe($db);
 
+// Security check (enable the most restrictive one)
+//if ($user->socid > 0) accessforbidden();
+//if ($user->socid > 0) $socid = $user->socid;
+if (!isModEnabled('barcode')) {
+	accessforbidden('Module not enabled');
+}
+if (!$user->hasRight('barcode', 'read')) {
+	accessforbidden();
+}
+restrictedArea($user, 'barcode');
+
 
 /*
  * Actions
@@ -263,10 +274,6 @@ if ($action == 'builddoc') {
  * View
  */
 
-if (empty($conf->barcode->enabled)) {
-	accessforbidden();
-}
-
 $form = new Form($db);
 
 llxHeader('', $langs->trans("BarCodePrintsheet"));
diff --git a/htdocs/core/modules/modBarcode.class.php b/htdocs/core/modules/modBarcode.class.php
index ced58f9b6c4..ef0f1b7166a 100644
--- a/htdocs/core/modules/modBarcode.class.php
+++ b/htdocs/core/modules/modBarcode.class.php
@@ -77,18 +77,28 @@ class modBarcode extends DolibarrModules
 		// Permissions
 		$this->rights = array();
 		$this->rights_class = 'barcode';
+		$r = 0;
 
-		$this->rights[1][0] = 301; // id de la permission
-		$this->rights[1][1] = 'Read barcodes'; // libelle de la permission
-		$this->rights[1][2] = 'r'; // type de la permission (deprecie a ce jour)
-		$this->rights[1][3] = 1; // La permission est-elle une permission par defaut
-		$this->rights[1][4] = 'lire_advance';
+		$this->rights[$r][0] = 301; // id de la permission
+		$this->rights[$r][1] = 'Generate PDF sheets of barcodes'; // libelle de la permission
+		$this->rights[$r][2] = 'r'; // type de la permission (deprecie a ce jour)
+		$this->rights[$r][3] = 1; // La permission est-elle une permission par defaut
+		$this->rights[$r][4] = 'read';
+		$r++;
 
-		$this->rights[2][0] = 302; // id de la permission
-		$this->rights[2][1] = 'Create/modify barcodes'; // libelle de la permission
-		$this->rights[2][2] = 'w'; // type de la permission (deprecie a ce jour)
-		$this->rights[2][3] = 0; // La permission est-elle une permission par defaut
-		$this->rights[2][4] = 'creer_advance';
+		$this->rights[$r][0] = 304; // id de la permission
+		$this->rights[$r][1] = 'Read barcodes'; // libelle de la permission
+		$this->rights[$r][2] = 'r'; // type de la permission (deprecie a ce jour)
+		$this->rights[$r][3] = 1; // La permission est-elle une permission par defaut
+		$this->rights[$r][4] = 'lire_advance';
+		$r++;
+
+		$this->rights[$r][0] = 305; // id de la permission
+		$this->rights[$r][1] = 'Create/modify barcodes'; // libelle de la permission
+		$this->rights[$r][2] = 'w'; // type de la permission (deprecie a ce jour)
+		$this->rights[$r][3] = 0; // La permission est-elle une permission par defaut
+		$this->rights[$r][4] = 'creer_advance';
+		$r++;
 
 		// Main menu entries
 		$r = 0;
@@ -104,8 +114,8 @@ class modBarcode extends DolibarrModules
 			'url'=>'/barcode/printsheet.php?mainmenu=tools&leftmenu=barcodeprint',
 			'langs'=>'products', // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
 			'position'=>200,
-			'enabled'=>'$conf->barcode->enabled', // Define condition to show or hide menu entry. Use '$conf->mymodule->enabled' if entry must be visible if module is enabled. Use '$leftmenu==\'system\'' to show if leftmenu system is selected.
-			'perms'=>'($conf->global->MAIN_USE_ADVANCED_PERMS && $user->rights->barcode->lire_advance) || (! $conf->global->MAIN_USE_ADVANCED_PERMS)', // Use 'perms'=>'$user->rights->mymodule->level1->level2' if you want your menu with a permission rules
+			'enabled'=>'isModEnabled("barcode")', // 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("barcode", "read")',
 			'target'=>'',
 			'user'=>0, // 0=Menu for internal users, 1=external users, 2=both
 		);
@@ -119,8 +129,8 @@ class modBarcode extends DolibarrModules
 			'url'=>'/barcode/codeinit.php?mainmenu=home&leftmenu=admintools',
 			'langs'=>'products', // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
 			'position'=>300,
-			'enabled'=>'$conf->barcode->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'=>'($conf->global->MAIN_USE_ADVANCED_PERMS && $user->rights->barcode->creer_advance) || (! $conf->global->MAIN_USE_ADVANCED_PERMS)', // Use 'perms'=>'$user->rights->mymodule->level1->level2' if you want your menu with a permission rules
+			'enabled'=>'isModEnabled("barcode") && 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',
 			'target'=>'',
 			'user'=>0, // 0=Menu for internal users, 1=external users, 2=both
 		);
diff --git a/htdocs/install/mysql/migration/16.0.0-17.0.0.sql b/htdocs/install/mysql/migration/16.0.0-17.0.0.sql
index 9b52b09ba2a..8121b94494d 100644
--- a/htdocs/install/mysql/migration/16.0.0-17.0.0.sql
+++ b/htdocs/install/mysql/migration/16.0.0-17.0.0.sql
@@ -146,3 +146,6 @@ ALTER TABLE llx_bank_extrafields ADD INDEX idx_bank_extrafields (fk_object);
 ALTER TABLE llx_user CHANGE COLUMN note note_private text;
 
 UPDATE llx_c_effectif SET code='EF101-500', libelle='101 - 500' WHERE code='EF100-500';
+
+ALTER TABLE llx_rights_def ADD COLUMN tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP;
+
diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index d82631cc8fa..a24dd69cc71 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -843,9 +843,9 @@ Permission286=Export contacts
 Permission291=Read tariffs
 Permission292=Set permissions on the tariffs
 Permission293=Modify customer's tariffs
-Permission300=Read barcodes
-Permission301=Create/modify barcodes
-Permission302=Delete barcodes
+Permission301=Generate PDF sheets of barcodes
+Permission304=Create/modify barcodes
+Permission305=Delete barcodes
 Permission311=Read services
 Permission312=Assign service/subscription to contract
 Permission331=Read bookmarks
diff --git a/htdocs/langs/en_US/modulebuilder.lang b/htdocs/langs/en_US/modulebuilder.lang
index a16dfc52ed2..d68b0b337f9 100644
--- a/htdocs/langs/en_US/modulebuilder.lang
+++ b/htdocs/langs/en_US/modulebuilder.lang
@@ -90,7 +90,7 @@ ListOfDictionariesEntries=List of dictionaries entries
 ListOfPermissionsDefined=List of defined permissions
 SeeExamples=See examples here
 EnabledDesc=Condition to have this field active.<br><br>Examples:<br>1<br>isModEnabled('MAIN_MODULE_MYMODULE')<br>getDolGlobalString('MYMODULE_OPTION')==2
-VisibleDesc=Is the field visible ? (Examples: 0=Never visible, 1=Visible on list and create/update/view forms, 2=Visible on list only, 3=Visible on create/update/view form only (not list), 4=Visible on list and update/view form only (not create), 5=Visible on list end view form only (not create, not update).<br><br>Using a negative value means field is not shown by default on list but can be selected for viewing).<br><br>It can be an expression, for example:<br>preg_match('/public/', $_SERVER['PHP_SELF'])?0:1<br>$user->hasRights('holiday', 'define_holiday')?1:5
+VisibleDesc=Is the field visible ? (Examples: 0=Never visible, 1=Visible on list and create/update/view forms, 2=Visible on list only, 3=Visible on create/update/view form only (not list), 4=Visible on list and update/view form only (not create), 5=Visible on list end view form only (not create, not update).<br><br>Using a negative value means field is not shown by default on list but can be selected for viewing).<br><br>It can be an expression, for example:<br>preg_match('/public/', $_SERVER['PHP_SELF'])?0:1<br>$user->hasRight('holiday', 'define_holiday')?1:5
 DisplayOnPdfDesc=Display this field on compatible PDF documents, you can manage position with "Position" field.<br>Currently, known compatibles PDF models are : eratosthene (order), espadon (ship), sponge (invoices), cyan (propal/quotation), cornas (supplier order)<br><br><strong>For document :</strong><br>0 = not displayed <br>1 = display<br>2 = display only if not empty<br><br><strong>For document lines :</strong><br>0 = not displayed <br>1 = displayed in a column<br>3 = display in line description column after the description<br>4 = display in description column after the description only if not empty
 DisplayOnPdf=Display on PDF
 IsAMeasureDesc=Can the value of field be cumulated to get a total into list? (Examples: 1 or 0)
diff --git a/htdocs/modulebuilder/template/core/modules/modMyModule.class.php b/htdocs/modulebuilder/template/core/modules/modMyModule.class.php
index edf0c7647de..973eb6ba915 100644
--- a/htdocs/modulebuilder/template/core/modules/modMyModule.class.php
+++ b/htdocs/modulebuilder/template/core/modules/modMyModule.class.php
@@ -298,8 +298,8 @@ class modMyModule extends DolibarrModules
 			'url'=>'/mymodule/mymoduleindex.php',
 			'langs'=>'mymodule@mymodule', // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
 			'position'=>1000 + $r,
-			'enabled'=>'$conf->mymodule->enabled', // 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->myobject->read' if you want your menu with a permission rules
+			'enabled'=>'isModEnabled("mymodule")', // Define condition to show or hide menu entry. Use 'isModEnabled("mymodule")' if entry must be visible if module is enabled.
+			'perms'=>'1', // Use 'perms'=>'$user->hasRight("mymodule", "myobject", "read")' if you want your menu with a permission rules
 			'target'=>'',
 			'user'=>2, // 0=Menu for internal users, 1=external users, 2=both
 		);
@@ -315,8 +315,8 @@ class modMyModule extends DolibarrModules
 			'url'=>'/mymodule/mymoduleindex.php',
 			'langs'=>'mymodule@mymodule',	        // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
 			'position'=>1000+$r,
-			'enabled'=>'$conf->mymodule->enabled',  // Define condition to show or hide menu entry. Use '$conf->mymodule->enabled' if entry must be visible if module is enabled.
-			'perms'=>'$user->rights->mymodule->myobject->read',			                // Use 'perms'=>'$user->rights->mymodule->level1->level2' if you want your menu with a permission rules
+			'enabled'=>'isModEnabled("mymodule")', // Define condition to show or hide menu entry. Use 'isModEnabled("mymodule")' if entry must be visible if module is enabled.
+			'perms'=>'$user->hasRight("mymodule", "myobject", "read")',
 			'target'=>'',
 			'user'=>2,				                // 0=Menu for internal users, 1=external users, 2=both
 		);
@@ -329,8 +329,8 @@ class modMyModule extends DolibarrModules
 			'url'=>'/mymodule/myobject_list.php',
 			'langs'=>'mymodule@mymodule',	        // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
 			'position'=>1000+$r,
-			'enabled'=>'$conf->mymodule->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->mymodule->myobject->read',			                // Use 'perms'=>'$user->rights->mymodule->level1->level2' if you want your menu with a permission rules
+			'enabled'=>'isModEnabled("mymodule")', // Define condition to show or hide menu entry. Use 'isModEnabled("mymodule")' if entry must be visible if module is enabled.
+			'perms'=>'$user->hasRight("mymodule", "myobject", "read")'
 			'target'=>'',
 			'user'=>2,				                // 0=Menu for internal users, 1=external users, 2=both
 		);
@@ -343,8 +343,8 @@ class modMyModule extends DolibarrModules
 			'url'=>'/mymodule/myobject_card.php?action=create',
 			'langs'=>'mymodule@mymodule',	        // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
 			'position'=>1000+$r,
-			'enabled'=>'$conf->mymodule->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->mymodule->myobject->write',			                // Use 'perms'=>'$user->rights->mymodule->level1->level2' if you want your menu with a permission rules
+			'enabled'=>'isModEnabled("mymodule")', // Define condition to show or hide menu entry. Use 'isModEnabled("mymodule")' if entry must be visible if module is enabled. Use '$leftmenu==\'system\'' to show if leftmenu system is selected.
+			'perms'=>'$user->hasRight("mymodule", "myobject", "write")'
 			'target'=>'',
 			'user'=>2,				                // 0=Menu for internal users, 1=external users, 2=both
 		);
diff --git a/htdocs/modulebuilder/template/mymoduleindex.php b/htdocs/modulebuilder/template/mymoduleindex.php
index d49e4e5e659..2581b407f3b 100644
--- a/htdocs/modulebuilder/template/mymoduleindex.php
+++ b/htdocs/modulebuilder/template/mymoduleindex.php
@@ -75,10 +75,16 @@ if (isset($user->socid) && $user->socid > 0) {
 // Security check (enable the most restrictive one)
 //if ($user->socid > 0) accessforbidden();
 //if ($user->socid > 0) $socid = $user->socid;
-//if (! $user->hasRights('mymodule', 'myobject', 'read')) {
+//if (!isModEnabled('barcode')) {
+//	accessforbidden('Module not enabled');
+//}
+//if (! $user->hasRight('mymodule', 'myobject', 'read')) {
 //	accessforbidden();
 //}
 //restrictedArea($user, 'mymodule', 0, 'mymodule_myobject', 'myobject', '', 'rowid');
+//if (empty($user->admin)) {
+//	accessforbidden('Must be admin');
+//}
 
 
 /*
diff --git a/htdocs/recruitment/index.php b/htdocs/recruitment/index.php
index a6c0a41be60..020204505a7 100644
--- a/htdocs/recruitment/index.php
+++ b/htdocs/recruitment/index.php
@@ -46,7 +46,7 @@ if (isset($user->socid) && $user->socid > 0) {
 // Security check (enable the most restrictive one)
 //if ($user->socid > 0) accessforbidden();
 //if ($user->socid > 0) $socid = $user->socid;
-// if (! $user->hasRights('mymodule', 'myobject', 'read')) {
+// if (! $user->hasRight('mymodule', 'myobject', 'read')) {
 // 	accessforbidden();
 // }
 restrictedArea($user, 'recruitment', 0, 'recruitment_recruitmentjobposition', 'recruitmentjobposition', '', 'rowid');

From aa9036a0f5dce89eec3a5cc01ae58519a48be357 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 8 Sep 2022 15:05:51 +0200
Subject: [PATCH 784/974] Clean code

---
 htdocs/comm/propal/card.php                   |   2 +-
 htdocs/comm/propal/list.php                   |   2 +-
 htdocs/commande/card.php                      | 157 +++++++++---------
 htdocs/commande/list.php                      |   2 +-
 htdocs/compta/facture/card.php                |   6 +-
 .../compta/facture/invoicetemplate_list.php   |   2 +-
 htdocs/compta/facture/list.php                |   2 +-
 htdocs/core/class/html.form.class.php         |   2 +-
 htdocs/fourn/commande/card.php                |   2 +-
 htdocs/fourn/facture/card.php                 |   2 +-
 htdocs/fourn/facture/list-rec.php             |   2 +-
 htdocs/fourn/facture/list.php                 |   2 +-
 htdocs/supplier_proposal/card.php             |   2 +-
 13 files changed, 94 insertions(+), 91 deletions(-)

diff --git a/htdocs/comm/propal/card.php b/htdocs/comm/propal/card.php
index eb5dc2979d9..d3e7070a25d 100644
--- a/htdocs/comm/propal/card.php
+++ b/htdocs/comm/propal/card.php
@@ -1791,7 +1791,7 @@ if ($action == 'create') {
 	// Terms of payment
 	print '<tr class="field_cond_reglement_id"><td class="nowrap">'.$langs->trans('PaymentConditionsShort').'</td><td>';
 	print img_picto('', 'paiment');
-	$form->select_conditions_paiements((GETPOSTISSET('cond_reglement_id') && GETPOST('cond_reglement_id') != 0) ? GETPOST('cond_reglement_id', 'int') : $soc->cond_reglement_id, 'cond_reglement_id', 1, 1, 0, '', (GETPOSTISSET('cond_reglement_id_deposit_percent') ? GETPOST('cond_reglement_id_deposit_percent', 'alpha') : $soc->deposit_percent));
+	print $form->getSelectConditionsPaiements((GETPOSTISSET('cond_reglement_id') && GETPOST('cond_reglement_id') != 0) ? GETPOST('cond_reglement_id', 'int') : $soc->cond_reglement_id, 'cond_reglement_id', 1, 1, 0, '', (GETPOSTISSET('cond_reglement_id_deposit_percent') ? GETPOST('cond_reglement_id_deposit_percent', 'alpha') : $soc->deposit_percent));
 	print '</td></tr>';
 
 	// Mode of payment
diff --git a/htdocs/comm/propal/list.php b/htdocs/comm/propal/list.php
index cf6237cd012..9998a8b714f 100644
--- a/htdocs/comm/propal/list.php
+++ b/htdocs/comm/propal/list.php
@@ -1232,7 +1232,7 @@ if ($resql) {
 	// Payment term
 	if (!empty($arrayfields['p.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/commande/card.php b/htdocs/commande/card.php
index d6a4aead2ec..3b4b05f6ec3 100644
--- a/htdocs/commande/card.php
+++ b/htdocs/commande/card.php
@@ -1813,7 +1813,7 @@ if ($action == 'create' && $usercancreate) {
 	// Terms of payment
 	print '<tr><td class="nowrap">'.$langs->trans('PaymentConditionsShort').'</td><td>';
 	print img_picto('', 'payment', 'class="pictofixedwidth"');
-	$form->select_conditions_paiements($cond_reglement_id, 'cond_reglement_id', 1, 1, 0, 'maxwidth200 widthcentpercentminusx', $deposit_percent);
+	print $form->getSelectConditionsPaiements($cond_reglement_id, 'cond_reglement_id', 1, 1, 0, 'maxwidth200 widthcentpercentminusx', $deposit_percent);
 	print '</td></tr>';
 
 	// Payment mode
@@ -2105,109 +2105,112 @@ if ($action == 'create' && $usercancreate) {
 			}
 			if ($nbMandated > 0 ) $text .= '<div><span class="clearboth nowraponall warning">'.$langs->trans("mandatoryPeriodNeedTobeSetMsgValidate").'</span></div>';
 
+			if (getDolGlobalInt('SALE_ORDER_SUGGEST_DOWN_PAYMENT_INVOICE_CREATION')) {
+				// This is a hidden option:
+				// Suggestion to create invoice during order validation is not enabled by default.
+				// Such choice should be managed by the workflow module and trigger. This option generates conflicts with some setup.
+				// 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 = getDictionaryValue('c_payment_term', 'deposit_percent', $object->cond_reglement_id);
 
-			$deposit_percent_from_payment_terms = getDictionaryValue('c_payment_term', 'deposit_percent', $object->cond_reglement_id);
+				if (!empty($deposit_percent_from_payment_terms) && !empty($conf->facture->enabled) && !empty($user->rights->facture->creer)) {
+					require_once DOL_DOCUMENT_ROOT . '/compta/facture/class/facture.class.php';
 
-			if (!empty($deposit_percent_from_payment_terms) && !empty($conf->facture->enabled) && !empty($user->rights->facture->creer)) {
-				require_once DOL_DOCUMENT_ROOT . '/compta/facture/class/facture.class.php';
+					$object->fetchObjectLinked();
 
-				$object->fetchObjectLinked();
+					$eligibleForDepositGeneration = true;
 
-				$eligibleForDepositGeneration = true;
-
-				if (array_key_exists('facture', $object->linkedObjects)) {
-					foreach ($object->linkedObjects['facture'] as $invoice) {
-						if ($invoice->type == Facture::TYPE_DEPOSIT) {
-							$eligibleForDepositGeneration = false;
-							break;
+					if (array_key_exists('facture', $object->linkedObjects)) {
+						foreach ($object->linkedObjects['facture'] as $invoice) {
+							if ($invoice->type == Facture::TYPE_DEPOSIT) {
+								$eligibleForDepositGeneration = false;
+								break;
+							}
 						}
 					}
-				}
 
-				if ($eligibleForDepositGeneration && array_key_exists('propal', $object->linkedObjects)) {
-					foreach ($object->linkedObjects['propal'] as $proposal) {
-						$proposal->fetchObjectLinked();
+					if ($eligibleForDepositGeneration && array_key_exists('propal', $object->linkedObjects)) {
+						foreach ($object->linkedObjects['propal'] as $proposal) {
+							$proposal->fetchObjectLinked();
 
-						if (array_key_exists('facture', $proposal->linkedObjects)) {
-							foreach ($proposal->linkedObjects['facture'] as $invoice) {
-								if ($invoice->type == Facture::TYPE_DEPOSIT) {
-									$eligibleForDepositGeneration = false;
-									break 2;
+							if (array_key_exists('facture', $proposal->linkedObjects)) {
+								foreach ($proposal->linkedObjects['facture'] as $invoice) {
+									if ($invoice->type == Facture::TYPE_DEPOSIT) {
+										$eligibleForDepositGeneration = false;
+										break 2;
+									}
 								}
 							}
 						}
 					}
-				}
 
+					if ($eligibleForDepositGeneration) {
+						$formquestion[] = array(
+							'type' => 'checkbox',
+							'tdclass' => '',
+							'name' => 'generate_deposit',
+							'label' => $form->textwithpicto($langs->trans('GenerateDeposit', $object->deposit_percent), $langs->trans('DepositGenerationPermittedByThePaymentTermsSelected'))
+						);
 
-				if ($eligibleForDepositGeneration) {
-					$formquestion[] = array(
-						'type' => 'checkbox',
-						'tdclass' => '',
-						'name' => 'generate_deposit',
-						'label' => $form->textwithpicto($langs->trans('GenerateDeposit', $object->deposit_percent), $langs->trans('DepositGenerationPermittedByThePaymentTermsSelected'))
-					);
-
-					$formquestion[] = array(
-						'type' => 'date',
-						'tdclass' => 'fieldrequired showonlyifgeneratedeposit',
-						'name' => 'datef',
-						'label' => $langs->trans('DateInvoice'),
-						'value' => dol_now(),
-						'datenow' => true
-					);
-
-					if (!empty($conf->global->INVOICE_POINTOFTAX_DATE)) {
 						$formquestion[] = array(
 							'type' => 'date',
 							'tdclass' => 'fieldrequired showonlyifgeneratedeposit',
-							'name' => 'date_pointoftax',
-							'label' => $langs->trans('DatePointOfTax'),
+							'name' => 'datef',
+							'label' => $langs->trans('DateInvoice'),
 							'value' => dol_now(),
 							'datenow' => true
 						);
-					}
 
-					ob_start();
-					$form->select_conditions_paiements(0, 'cond_reglement_id', -1, 0, 0, 'minwidth200');
-					$paymentTermsSelect = ob_get_clean();
+						if (!empty($conf->global->INVOICE_POINTOFTAX_DATE)) {
+							$formquestion[] = array(
+								'type' => 'date',
+								'tdclass' => 'fieldrequired showonlyifgeneratedeposit',
+								'name' => 'date_pointoftax',
+								'label' => $langs->trans('DatePointOfTax'),
+								'value' => dol_now(),
+								'datenow' => true
+							);
+						}
 
-					$formquestion[] = array(
-						'type' => 'other',
-						'tdclass' => 'fieldrequired showonlyifgeneratedeposit',
-						'name' => 'cond_reglement_id',
-						'label' => $langs->trans('PaymentTerm'),
-						'value' => $paymentTermsSelect
-					);
 
-					$formquestion[] = array(
-						'type' => 'checkbox',
-						'tdclass' => 'showonlyifgeneratedeposit',
-						'name' => 'validate_generated_deposit',
-						'label' => $langs->trans('ValidateGeneratedDeposit')
-					);
+						$paymentTermsSelect = $form->getSelectConditionsPaiements(0, 'cond_reglement_id', -1, 0, 0, 'minwidth200');
 
-					$formquestion[] = array(
-						'type' => 'onecolumn',
-						'value' => '
-							<script>
-								$(document).ready(function() {
-									$("[name=generate_deposit]").change(function () {
-										let $self = $(this);
-										let $target = $(".showonlyifgeneratedeposit").parent(".tagtr");
+						$formquestion[] = array(
+							'type' => 'other',
+							'tdclass' => 'fieldrequired showonlyifgeneratedeposit',
+							'name' => 'cond_reglement_id',
+							'label' => $langs->trans('PaymentTerm'),
+							'value' => $paymentTermsSelect
+						);
 
-										if (! $self.parents(".tagtr").is(":hidden") && $self.is(":checked")) {
-											$target.show();
-										} else {
-											$target.hide();
-										}
+						$formquestion[] = array(
+							'type' => 'checkbox',
+							'tdclass' => 'showonlyifgeneratedeposit',
+							'name' => 'validate_generated_deposit',
+							'label' => $langs->trans('ValidateGeneratedDeposit')
+						);
 
-										return true;
+						$formquestion[] = array(
+							'type' => 'onecolumn',
+							'value' => '
+								<script>
+									$(document).ready(function() {
+										$("[name=generate_deposit]").change(function () {
+											let $self = $(this);
+											let $target = $(".showonlyifgeneratedeposit").parent(".tagtr");
+
+											if (! $self.parents(".tagtr").is(":hidden") && $self.is(":checked")) {
+												$target.show();
+											} else {
+												$target.hide();
+											}
+
+											return true;
+										});
 									});
-								});
-							</script>
-						'
-					);
+								</script>
+							'
+						);
+					}
 				}
 			}
 
diff --git a/htdocs/commande/list.php b/htdocs/commande/list.php
index 6984255b91c..ef485f62b5f 100644
--- a/htdocs/commande/list.php
+++ b/htdocs/commande/list.php
@@ -1507,7 +1507,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/card.php b/htdocs/compta/facture/card.php
index aadaf3895e9..3edefe8f159 100644
--- a/htdocs/compta/facture/card.php
+++ b/htdocs/compta/facture/card.php
@@ -3670,7 +3670,7 @@ if ($action == 'create') {
 
 	// Payment term
 	print '<tr><td class="nowrap fieldrequired">'.$langs->trans('PaymentConditionsShort').'</td><td colspan="2">';
-	$form->select_conditions_paiements(GETPOSTISSET('cond_reglement_id') ? GETPOST('cond_reglement_id', 'int') : $cond_reglement_id, 'cond_reglement_id');
+	print $form->getSelectConditionsPaiements(GETPOSTISSET('cond_reglement_id') ? GETPOST('cond_reglement_id', 'int') : $cond_reglement_id, 'cond_reglement_id');
 	print '</td></tr>';
 
 
@@ -3702,7 +3702,7 @@ if ($action == 'create') {
 				$retained_warranty_fk_cond_reglement = $conf->global->INVOICE_SITUATION_DEFAULT_RETAINED_WARRANTY_COND_ID;
 			}
 		}
-		$form->select_conditions_paiements($retained_warranty_fk_cond_reglement, 'retained_warranty_fk_cond_reglement', -1, 1);
+		print $form->getSelectConditionsPaiements($retained_warranty_fk_cond_reglement, 'retained_warranty_fk_cond_reglement', -1, 1);
 		print '</td></tr>';
 
 		print '<script type="text/javascript">
@@ -4728,7 +4728,7 @@ if ($action == 'create') {
 				$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;
-				$form->select_conditions_paiements($retained_warranty_fk_cond_reglement, 'retained_warranty_fk_cond_reglement', -1, 1);
+				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>';
 			} else {
diff --git a/htdocs/compta/facture/invoicetemplate_list.php b/htdocs/compta/facture/invoicetemplate_list.php
index 71573505a7f..e905360853a 100644
--- a/htdocs/compta/facture/invoicetemplate_list.php
+++ b/htdocs/compta/facture/invoicetemplate_list.php
@@ -530,7 +530,7 @@ if ($resql) {
 	if (!empty($arrayfields['f.fk_cond_reglement']['checked'])) {
 		// Payment term
 		print '<td class="liste_titre right">';
-		$form->select_conditions_paiements($search_payment_term, 'search_payment_term', -1, 1, 1, 'maxwidth100');
+		print $form->getSelectConditionsPaiements($search_payment_term, 'search_payment_term', -1, 1, 1, 'maxwidth100');
 		print "</td>";
 	}
 	if (!empty($arrayfields['f.fk_mode_reglement']['checked'])) {
diff --git a/htdocs/compta/facture/list.php b/htdocs/compta/facture/list.php
index 309ec6fdae6..abec5b19cf6 100644
--- a/htdocs/compta/facture/list.php
+++ b/htdocs/compta/facture/list.php
@@ -1371,7 +1371,7 @@ if ($resql) {
 	// Payment terms
 	if (!empty($arrayfields['f.fk_cond_reglement']['checked'])) {
 		print '<td class="liste_titre">';
-		$form->select_conditions_paiements($search_paymentterms, 'search_paymentterms', -1, 1, 1);
+		print $form->getSelectConditionsPaiements($search_paymentterms, 'search_paymentterms', -1, 1, 1);
 		print '</td>';
 	}
 	// Module source
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 41279c8ae36..42fa3a1a6b6 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -5372,7 +5372,7 @@ class Form
 			if ($type) {
 				print '<input type="hidden" name="type" value="'.dol_escape_htmltag($type).'">';
 			}
-			$this->select_conditions_paiements($selected, $htmlname, $filtertype, $addempty, 0, '', $deposit_percent);
+			print $this->getSelectConditionsPaiements($selected, $htmlname, $filtertype, $addempty, 0, '', $deposit_percent);
 			print '<input type="submit" class="button valignmiddle smallpaddingimp" value="'.$langs->trans("Modify").'">';
 			print '</form>';
 		} else {
diff --git a/htdocs/fourn/commande/card.php b/htdocs/fourn/commande/card.php
index 86113b13592..43265d1c101 100644
--- a/htdocs/fourn/commande/card.php
+++ b/htdocs/fourn/commande/card.php
@@ -1729,7 +1729,7 @@ if ($action == 'create') {
 
 	// Payment term
 	print '<tr><td class="nowrap">'.$langs->trans('PaymentConditionsShort').'</td><td>';
-	$form->select_conditions_paiements(GETPOSTISSET('cond_reglement_id') ? GETPOST('cond_reglement_id') : $cond_reglement_id, 'cond_reglement_id');
+	print $form->getSelectConditionsPaiements(GETPOSTISSET('cond_reglement_id') ? GETPOST('cond_reglement_id') : $cond_reglement_id, 'cond_reglement_id');
 	print '</td></tr>';
 
 	// Payment mode
diff --git a/htdocs/fourn/facture/card.php b/htdocs/fourn/facture/card.php
index 2ee737fdf0e..f8c806cb8b6 100644
--- a/htdocs/fourn/facture/card.php
+++ b/htdocs/fourn/facture/card.php
@@ -2400,7 +2400,7 @@ if ($action == 'create') {
 
 	// Payment term
 	print '<tr><td class="nowrap">'.$langs->trans('PaymentConditionsShort').'</td><td>';
-	$form->select_conditions_paiements(GETPOSTISSET('cond_reglement_id') ?GETPOST('cond_reglement_id', 'int') : $cond_reglement_id, 'cond_reglement_id');
+	print $form->getSelectConditionsPaiements(GETPOSTISSET('cond_reglement_id') ?GETPOST('cond_reglement_id', 'int') : $cond_reglement_id, 'cond_reglement_id');
 	print '</td></tr>';
 
 	// Payment mode
diff --git a/htdocs/fourn/facture/list-rec.php b/htdocs/fourn/facture/list-rec.php
index 93519ff9524..7445e36f8a1 100644
--- a/htdocs/fourn/facture/list-rec.php
+++ b/htdocs/fourn/facture/list-rec.php
@@ -521,7 +521,7 @@ if ($resql) {
 	if (!empty($arrayfields['f.fk_cond_reglement']['checked'])) {
 		// Payment term
 		print '<td class="liste_titre right">';
-		$form->select_conditions_paiements($search_payment_term, 'search_payment_term', -1, 1, 1, 'maxwidth100');
+		print $form->getSelectConditionsPaiements($search_payment_term, 'search_payment_term', -1, 1, 1, 'maxwidth100');
 		print "</td>";
 	}
 	if (!empty($arrayfields['f.fk_mode_reglement']['checked'])) {
diff --git a/htdocs/fourn/facture/list.php b/htdocs/fourn/facture/list.php
index 4c5b84ea4ee..ec201537695 100644
--- a/htdocs/fourn/facture/list.php
+++ b/htdocs/fourn/facture/list.php
@@ -1045,7 +1045,7 @@ if ($resql) {
 	// Condition of payment
 	if (!empty($arrayfields['f.fk_cond_reglement']['checked'])) {
 		print '<td class="liste_titre left">';
-		$form->select_conditions_paiements($search_paymentcond, 'search_paymentcond', -1, 1, 1, 'maxwidth100');
+		print $form->getSelectConditionsPaiements($search_paymentcond, 'search_paymentcond', -1, 1, 1, 'maxwidth100');
 		print '</td>';
 	}
 	// Payment mode
diff --git a/htdocs/supplier_proposal/card.php b/htdocs/supplier_proposal/card.php
index 26679d58908..232bd82761e 100644
--- a/htdocs/supplier_proposal/card.php
+++ b/htdocs/supplier_proposal/card.php
@@ -1276,7 +1276,7 @@ if ($action == 'create') {
 
 	// Terms of payment
 	print '<tr><td class="nowrap">'.$langs->trans('PaymentConditionsShort').'</td><td colspan="2">';
-	$form->select_conditions_paiements(GETPOST('cond_reglement_id') > 0 ? GETPOST('cond_reglement_id') : $cond_reglement_id, 'cond_reglement_id', -1, 1);
+	print $form->getSelectConditionsPaiements(GETPOST('cond_reglement_id') > 0 ? GETPOST('cond_reglement_id') : $cond_reglement_id, 'cond_reglement_id', -1, 1);
 	print '</td></tr>';
 
 	// Mode of payment

From ee05abaa272deff7bfab011def7b254f2456be27 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 8 Sep 2022 15:13:16 +0200
Subject: [PATCH 785/974] Clean code

---
 htdocs/adherents/subscription.php              | 2 +-
 htdocs/comm/propal/card.php                    | 2 +-
 htdocs/comm/propal/list.php                    | 2 +-
 htdocs/commande/card.php                       | 2 +-
 htdocs/commande/list.php                       | 2 +-
 htdocs/compta/bank/bankentries_list.php        | 2 +-
 htdocs/compta/bank/various_payment/list.php    | 2 +-
 htdocs/compta/facture/invoicetemplate_list.php | 2 +-
 htdocs/compta/facture/list.php                 | 2 +-
 htdocs/compta/localtax/card.php                | 2 +-
 htdocs/compta/paiement/list.php                | 2 +-
 htdocs/compta/paiement_vat.php                 | 2 +-
 htdocs/compta/sociales/list.php                | 2 +-
 htdocs/compta/tva/card.php                     | 2 +-
 htdocs/compta/tva/list.php                     | 2 +-
 htdocs/fourn/facture/list-rec.php              | 2 +-
 htdocs/fourn/facture/list.php                  | 2 +-
 htdocs/salaries/list.php                       | 2 +-
 htdocs/salaries/payments.php                   | 2 +-
 19 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/htdocs/adherents/subscription.php b/htdocs/adherents/subscription.php
index 5779fe036d9..67c2ffef1d0 100644
--- a/htdocs/adherents/subscription.php
+++ b/htdocs/adherents/subscription.php
@@ -1072,7 +1072,7 @@ if ($rowid > 0) {
 
 				// Payment mode
 				print '<tr class="bankswitchclass"><td class="fieldrequired">'.$langs->trans("PaymentMode").'</td><td>';
-				$form->select_types_paiements(GETPOST('operation'), 'operation', '', 2, 1, 0, 0, 1, 'minwidth200');
+				print $form->select_types_paiements(GETPOST('operation'), 'operation', '', 2, 1, 0, 0, 1, 'minwidth200', 1);
 				print "</td></tr>\n";
 
 				// Date of payment
diff --git a/htdocs/comm/propal/card.php b/htdocs/comm/propal/card.php
index d3e7070a25d..f7da4d720c0 100644
--- a/htdocs/comm/propal/card.php
+++ b/htdocs/comm/propal/card.php
@@ -1797,7 +1797,7 @@ if ($action == 'create') {
 	// Mode of payment
 	print '<tr class="field_mode_reglement_id"><td class="titlefieldcreate">'.$langs->trans('PaymentMode').'</td><td class="valuefieldcreate">';
 	print img_picto('', 'bank', 'class="pictofixedwidth"');
-	$form->select_types_paiements((GETPOSTISSET('mode_reglement_id') && GETPOST('mode_reglement_id') != 0) ? GETPOST('mode_reglement_id', 'int') : $soc->mode_reglement_id, 'mode_reglement_id', 'CRDT', 0, 1, 0, 0, 1, 'maxwidth200 widthcentpercentminusx');
+	print $form->select_types_paiements((GETPOSTISSET('mode_reglement_id') && GETPOST('mode_reglement_id') != 0) ? GETPOST('mode_reglement_id', 'int') : $soc->mode_reglement_id, 'mode_reglement_id', 'CRDT', 0, 1, 0, 0, 1, 'maxwidth200 widthcentpercentminusx', 1);
 	print '</td></tr>';
 
 	// Bank Account
diff --git a/htdocs/comm/propal/list.php b/htdocs/comm/propal/list.php
index 9998a8b714f..1b7083f4277 100644
--- a/htdocs/comm/propal/list.php
+++ b/htdocs/comm/propal/list.php
@@ -1238,7 +1238,7 @@ if ($resql) {
 	// Payment mode
 	if (!empty($arrayfields['p.fk_mode_reglement']['checked'])) {
 		print '<td class="liste_titre">';
-		$form->select_types_paiements($search_fk_mode_reglement, 'search_fk_mode_reglement', '', 0, 1, 1, 0, -1);
+		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'])) {
diff --git a/htdocs/commande/card.php b/htdocs/commande/card.php
index 3b4b05f6ec3..c81b4266dbf 100644
--- a/htdocs/commande/card.php
+++ b/htdocs/commande/card.php
@@ -1819,7 +1819,7 @@ if ($action == 'create' && $usercancreate) {
 	// Payment mode
 	print '<tr><td>'.$langs->trans('PaymentMode').'</td><td>';
 	print img_picto('', 'bank', 'class="pictofixedwidth"');
-	$form->select_types_paiements($mode_reglement_id, 'mode_reglement_id', 'CRDT', 0, 1, 0, 0, 1, 'maxwidth200 widthcentpercentminusx');
+	print $form->select_types_paiements($mode_reglement_id, 'mode_reglement_id', 'CRDT', 0, 1, 0, 0, 1, 'maxwidth200 widthcentpercentminusx', 1);
 	print '</td></tr>';
 
 	// Bank Account
diff --git a/htdocs/commande/list.php b/htdocs/commande/list.php
index ef485f62b5f..7578f75cc1f 100644
--- a/htdocs/commande/list.php
+++ b/htdocs/commande/list.php
@@ -1513,7 +1513,7 @@ if ($resql) {
 	// Payment mode
 	if (!empty($arrayfields['c.fk_mode_reglement']['checked'])) {
 		print '<td class="liste_titre">';
-		$form->select_types_paiements($search_fk_mode_reglement, 'search_fk_mode_reglement', '', 0, 1, 1, 0, -1);
+		print $form->select_types_paiements($search_fk_mode_reglement, 'search_fk_mode_reglement', '', 0, 1, 1, 0, -1, '', 1);
 		print '</td>';
 	}
 	// Channel
diff --git a/htdocs/compta/bank/bankentries_list.php b/htdocs/compta/bank/bankentries_list.php
index d9689202297..93505490146 100644
--- a/htdocs/compta/bank/bankentries_list.php
+++ b/htdocs/compta/bank/bankentries_list.php
@@ -1084,7 +1084,7 @@ if ($resql) {
 	}
 	if (!empty($arrayfields['type']['checked'])) {
 		print '<td class="liste_titre" align="center">';
-		$form->select_types_paiements(empty($search_type) ? '' : $search_type, 'search_type', '', 2, 1, 1, 0, 1, 'maxwidth100');
+		print $form->select_types_paiements(empty($search_type) ? '' : $search_type, 'search_type', '', 2, 1, 1, 0, 1, 'maxwidth100', 1);
 		print '</td>';
 	}
 	// Numero
diff --git a/htdocs/compta/bank/various_payment/list.php b/htdocs/compta/bank/various_payment/list.php
index fe9bb032fa8..3499c02f8e0 100644
--- a/htdocs/compta/bank/various_payment/list.php
+++ b/htdocs/compta/bank/various_payment/list.php
@@ -418,7 +418,7 @@ if ($resql) {
 	// Payment type
 	if ($arrayfields['type']['checked']) {
 		print '<td class="liste_titre center">';
-		$form->select_types_paiements($search_type_id, 'search_type_id', '', 0, 1, 1, 16, 1, 'maxwidth100');
+		print $form->select_types_paiements($search_type_id, 'search_type_id', '', 0, 1, 1, 16, 1, 'maxwidth100', 1);
 		print '</td>';
 	}
 
diff --git a/htdocs/compta/facture/invoicetemplate_list.php b/htdocs/compta/facture/invoicetemplate_list.php
index e905360853a..836f9e47f4b 100644
--- a/htdocs/compta/facture/invoicetemplate_list.php
+++ b/htdocs/compta/facture/invoicetemplate_list.php
@@ -536,7 +536,7 @@ if ($resql) {
 	if (!empty($arrayfields['f.fk_mode_reglement']['checked'])) {
 		// Payment mode
 		print '<td class="liste_titre right">';
-		$form->select_types_paiements($search_payment_mode, 'search_payment_mode', '', 0, 1, 1, 0, 1, 'maxwidth100');
+		print $form->select_types_paiements($search_payment_mode, 'search_payment_mode', '', 0, 1, 1, 0, 1, 'maxwidth100', 1);
 		print '</td>';
 	}
 	if (!empty($arrayfields['recurring']['checked'])) {
diff --git a/htdocs/compta/facture/list.php b/htdocs/compta/facture/list.php
index abec5b19cf6..ce00bfecbd1 100644
--- a/htdocs/compta/facture/list.php
+++ b/htdocs/compta/facture/list.php
@@ -1365,7 +1365,7 @@ if ($resql) {
 	// Payment mode
 	if (!empty($arrayfields['f.fk_mode_reglement']['checked'])) {
 		print '<td class="liste_titre">';
-		$form->select_types_paiements($search_paymentmode, 'search_paymentmode', '', 0, 1, 1, 10);
+		print $form->select_types_paiements($search_paymentmode, 'search_paymentmode', '', 0, 1, 1, 10, 1, '', 1);
 		print '</td>';
 	}
 	// Payment terms
diff --git a/htdocs/compta/localtax/card.php b/htdocs/compta/localtax/card.php
index 84f40f5cd19..c076fa1de1b 100644
--- a/htdocs/compta/localtax/card.php
+++ b/htdocs/compta/localtax/card.php
@@ -177,7 +177,7 @@ if ($action == 'create') {
 	if (isModEnabled("banque")) {
 		// Type payment
 		print '<tr><td class="fieldrequired">'.$langs->trans("PaymentMode").'</td><td>';
-		$form->select_types_paiements(GETPOST("paiementtype"), "paiementtype", '', 0, 1, 0, 0, 1, 'maxwidth500 widthcentpercentminusx');
+		print $form->select_types_paiements(GETPOST("paiementtype"), "paiementtype", '', 0, 1, 0, 0, 1, 'maxwidth500 widthcentpercentminusx', 1);
 		print "</td>\n";
 		print "</tr>";
 
diff --git a/htdocs/compta/paiement/list.php b/htdocs/compta/paiement/list.php
index e6b57137df8..3ace8f1cc6b 100644
--- a/htdocs/compta/paiement/list.php
+++ b/htdocs/compta/paiement/list.php
@@ -400,7 +400,7 @@ if (!empty($arrayfields['s.nom']['checked'])) {
 // Filter: Payment type
 if (!empty($arrayfields['c.libelle']['checked'])) {
 	print '<td class="liste_titre">';
-	$form->select_types_paiements($search_paymenttype, 'search_paymenttype', '', 2, 1, 1);
+	print $form->select_types_paiements($search_paymenttype, 'search_paymenttype', '', 2, 1, 1, 1, 1, '', 1);
 	print '</td>';
 }
 
diff --git a/htdocs/compta/paiement_vat.php b/htdocs/compta/paiement_vat.php
index f1f243bc06d..db573086a2f 100644
--- a/htdocs/compta/paiement_vat.php
+++ b/htdocs/compta/paiement_vat.php
@@ -207,7 +207,7 @@ if ($action == 'create') {
 	print '</tr>';
 
 	print '<tr><td class="fieldrequired">'.$langs->trans("PaymentMode").'</td><td>';
-	$form->select_types_paiements(GETPOSTISSET("paiementtype") ? GETPOST("paiementtype", "int") : $tva->paiementtype, "paiementtype", '', 0, 1, 0, 0, 1, 'maxwidth500 widthcentpercentminusx');
+	print $form->select_types_paiements(GETPOSTISSET("paiementtype") ? GETPOST("paiementtype", "int") : $tva->paiementtype, "paiementtype", '', 0, 1, 0, 0, 1, 'maxwidth500 widthcentpercentminusx', 1);
 	print "</td>\n";
 	print '</tr>';
 
diff --git a/htdocs/compta/sociales/list.php b/htdocs/compta/sociales/list.php
index f36694bb3b2..ce27ebb3200 100644
--- a/htdocs/compta/sociales/list.php
+++ b/htdocs/compta/sociales/list.php
@@ -457,7 +457,7 @@ if (!empty($arrayfields['cs.fk_user']['checked'])) {
 // Filter: Type
 if (!empty($arrayfields['cs.fk_mode_reglement']['checked'])) {
 	print '<td class="liste_titre">';
-	$form->select_types_paiements($search_type, 'search_type', '', 0, 1, 1, 0, 1, 'maxwidth150');
+	print $form->select_types_paiements($search_type, 'search_type', '', 0, 1, 1, 0, 1, 'maxwidth150', 1);
 	print '</td>';
 }
 
diff --git a/htdocs/compta/tva/card.php b/htdocs/compta/tva/card.php
index 5f089a4e205..c10c4fb9fae 100644
--- a/htdocs/compta/tva/card.php
+++ b/htdocs/compta/tva/card.php
@@ -490,7 +490,7 @@ if ($action == 'create') {
 
 	// Type payment
 	print '<tr><td class="fieldrequired" id="label_type_payment">'.$langs->trans("PaymentMode").'</td><td>';
-	$form->select_types_paiements(GETPOST("type_payment", 'int'), "type_payment", '', 0, 1, 0, 0, 1, 'maxwidth500 widthcentpercentminusx');
+	print $form->select_types_paiements(GETPOST("type_payment", 'int'), "type_payment", '', 0, 1, 0, 0, 1, 'maxwidth500 widthcentpercentminusx', 1);
 	print "</td>\n";
 	print "</tr>";
 
diff --git a/htdocs/compta/tva/list.php b/htdocs/compta/tva/list.php
index 524f8b0105b..39ead71f25d 100644
--- a/htdocs/compta/tva/list.php
+++ b/htdocs/compta/tva/list.php
@@ -354,7 +354,7 @@ if (!empty($arrayfields['t.datev']['checked'])) {
 // Filter: Type
 if (!empty($arrayfields['t.fk_typepayment']['checked'])) {
 	print '<td class="liste_titre left">';
-	$form->select_types_paiements($search_type, 'search_type', '', 0, 1, 1, 16);
+	print $form->select_types_paiements($search_type, 'search_type', '', 0, 1, 1, 16, 1, '', 1);
 	print '</td>';
 }
 
diff --git a/htdocs/fourn/facture/list-rec.php b/htdocs/fourn/facture/list-rec.php
index 7445e36f8a1..8316e689ead 100644
--- a/htdocs/fourn/facture/list-rec.php
+++ b/htdocs/fourn/facture/list-rec.php
@@ -527,7 +527,7 @@ if ($resql) {
 	if (!empty($arrayfields['f.fk_mode_reglement']['checked'])) {
 		// Payment mode
 		print '<td class="liste_titre right">';
-		$form->select_types_paiements($search_payment_mode, 'search_payment_mode', '', 0, 1, 1, 0, 1, 'maxwidth100');
+		print $form->select_types_paiements($search_payment_mode, 'search_payment_mode', '', 0, 1, 1, 0, 1, 'maxwidth100', 1);
 		print '</td>';
 	}
 	if (!empty($arrayfields['recurring']['checked'])) {
diff --git a/htdocs/fourn/facture/list.php b/htdocs/fourn/facture/list.php
index ec201537695..0ca7336944d 100644
--- a/htdocs/fourn/facture/list.php
+++ b/htdocs/fourn/facture/list.php
@@ -1051,7 +1051,7 @@ if ($resql) {
 	// Payment mode
 	if (!empty($arrayfields['f.fk_mode_reglement']['checked'])) {
 		print '<td class="liste_titre left">';
-		$form->select_types_paiements($search_paymentmode, 'search_paymentmode', '', 0, 1, 1, 20, 1, 'maxwidth100');
+		print $form->select_types_paiements($search_paymentmode, 'search_paymentmode', '', 0, 1, 1, 20, 1, 'maxwidth100', 1);
 		print '</td>';
 	}
 	if (!empty($arrayfields['f.total_ht']['checked'])) {
diff --git a/htdocs/salaries/list.php b/htdocs/salaries/list.php
index dd44155ea5a..dec6bcd273f 100644
--- a/htdocs/salaries/list.php
+++ b/htdocs/salaries/list.php
@@ -434,7 +434,7 @@ print '</td>';
 
 // Type
 print '<td class="liste_titre left">';
-$form->select_types_paiements($search_type_id, 'search_type_id', '', 0, 1, 1, 16);
+print $form->select_types_paiements($search_type_id, 'search_type_id', '', 0, 1, 1, 16, 1, '', 1);
 print '</td>';
 
 // Bank account
diff --git a/htdocs/salaries/payments.php b/htdocs/salaries/payments.php
index 6893d701d96..5b858633d14 100644
--- a/htdocs/salaries/payments.php
+++ b/htdocs/salaries/payments.php
@@ -443,7 +443,7 @@ print '<input class="flat" type="text" size="6" name="search_user" value="'.$db-
 print '</td>';
 // Type
 print '<td class="liste_titre left">';
-$form->select_types_paiements($search_type_id, 'search_type_id', '', 0, 1, 1, 16);
+print $form->select_types_paiements($search_type_id, 'search_type_id', '', 0, 1, 1, 16, 1, '', 1);
 print '</td>';
 // Chq number
 print '<td class="liste_titre right"><input name="search_chq_number" class="flat" type="text" size="8" value="'.$db->escape($search_chq_number).'"></td>';

From 5b213b2b1a2aae6d444b47f1b4c5db91df84bb03 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Thu, 8 Sep 2022 15:18:52 +0200
Subject: [PATCH 786/974] doc

---
 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 ec8e4a93b80..2c89a456961 100644
--- a/htdocs/compta/facture/class/facture.class.php
+++ b/htdocs/compta/facture/class/facture.class.php
@@ -4903,7 +4903,7 @@ class Facture extends CommonInvoice
 
 	/**
 	 * @param	int			$rounding		Minimum number of decimal to show. If 0, no change, if -1, we use min($conf->global->MAIN_MAX_DECIMALS_UNIT,$conf->global->MAIN_MAX_DECIMALS_TOT)
-	 * @return number or -1 if not available
+	 * @return float or -1 if not available
 	 */
 	public function getRetainedWarrantyAmount($rounding = -1)
 	{

From 90d58bde27dec1a72b5d216d14f365763e721dfb Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 8 Sep 2022 16:19:11 +0200
Subject: [PATCH 787/974] Clean module datapolicy

---
 .tx/config                                    |  6 ++
 htdocs/core/modules/modDataPolicy.class.php   | 20 ++--
 htdocs/datapolicy/{ => admin}/mailing.php     | 39 +++++++-
 htdocs/datapolicy/admin/setup.php             | 13 ++-
 htdocs/datapolicy/admin/setupmail.php         | 74 ++++++++------
 .../class/actions_datapolicy.class.php        | 20 ++--
 htdocs/datapolicy/class/datapolicy.class.php  | 43 ++++----
 .../datapolicy/class/datapolicycron.class.php | 22 ++---
 htdocs/datapolicy/langs/fr_FR/datapolicy.lang | 97 -------------------
 htdocs/datapolicy/langs/it_IT/datapolicy.lang | 78 ---------------
 htdocs/datapolicy/lib/datapolicy.lib.php      |  8 +-
 .../langs/en_US/datapolicy.lang               |  0
 .../modulebuilder/template/mymoduleindex.php  |  2 +-
 .../template/myobject_agenda.php              |  4 +-
 .../modulebuilder/template/myobject_card.php  |  8 +-
 .../template/myobject_contact.php             |  4 +-
 .../template/myobject_document.php            |  4 +-
 .../modulebuilder/template/myobject_list.php  |  4 +-
 .../modulebuilder/template/myobject_note.php  |  4 +-
 .../public => public/datapolicy}/index.php    | 76 ++++++++-------
 20 files changed, 216 insertions(+), 310 deletions(-)
 rename htdocs/datapolicy/{ => admin}/mailing.php (63%)
 delete mode 100644 htdocs/datapolicy/langs/fr_FR/datapolicy.lang
 delete mode 100644 htdocs/datapolicy/langs/it_IT/datapolicy.lang
 rename htdocs/{datapolicy => }/langs/en_US/datapolicy.lang (100%)
 rename htdocs/{datapolicy/public => public/datapolicy}/index.php (75%)

diff --git a/.tx/config b/.tx/config
index ca169bfcc50..494ba41613d 100644
--- a/.tx/config
+++ b/.tx/config
@@ -98,6 +98,12 @@ source_file = htdocs/langs/en_US/cron.lang
 source_lang = en_US
 type = MOZILLAPROPERTIES
 
+[dolibarr.datapolicy]
+file_filter = htdocs/langs/<lang>/datapolicy.lang
+source_file = htdocs/langs/en_US/datapolicy.lang
+source_lang = en_US
+type = MOZILLAPROPERTIES
+
 [dolibarr.deliveries]
 file_filter = htdocs/langs/<lang>/deliveries.lang
 source_file = htdocs/langs/en_US/deliveries.lang
diff --git a/htdocs/core/modules/modDataPolicy.class.php b/htdocs/core/modules/modDataPolicy.class.php
index 1b82334a95b..db1abf2a075 100644
--- a/htdocs/core/modules/modDataPolicy.class.php
+++ b/htdocs/core/modules/modDataPolicy.class.php
@@ -106,7 +106,7 @@ class modDataPolicy extends DolibarrModules {
 		$this->depends = array('always'=>'modCron'); // 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
-		$this->langfiles = array("datapolicy@datapolicy");
+		$this->langfiles = array("datapolicy");
 		$this->phpmin = array(5, 3); // Minimum version of PHP required by module
 		$this->need_dolibarr_version = array(4, 0); // Minimum version of Dolibarr required by module
 		$this->warnings_activation = array(); // Warning to show when we activate module. array('always'='text') or array('FR'='textfr','ES'='textes'...)
@@ -217,23 +217,23 @@ class modDataPolicy extends DolibarrModules {
 
 		/*
 		// Extrafield contact
-		$result1 = $extrafields->addExtraField('datapolicy_consentement', $langs->trans("DATAPOLICY_consentement"), 'boolean', 101, 3, 'thirdparty', 0, 0, '', '', 1, '', '3', 0, '', '', 'datapolicy@datapolicy', '$conf->datapolicy->enabled');
-		$result1 = $extrafields->addExtraField('datapolicy_opposition_traitement', $langs->trans("DATAPOLICY_opposition_traitement"), 'boolean', 102, 3, 'thirdparty', 0, 0, '', '', 1, '', '3', 0, '', '', 'datapolicy@datapolicy', '$conf->datapolicy->enabled');
-		$result1 = $extrafields->addExtraField('datapolicy_opposition_prospection', $langs->trans("DATAPOLICY_opposition_prospection"), 'boolean', 103, 3, 'thirdparty', 0, 0, '', '', 1, '', '3', 0, '', '', 'datapolicy@datapolicy', '$conf->datapolicy->enabled');
+		$result1 = $extrafields->addExtraField('datapolicy_consentement', $langs->trans("DATAPOLICY_consentement"), 'boolean', 101, 3, 'thirdparty', 0, 0, '', '', 1, '', '3', 0, '', '', 'datapolicy', '$conf->datapolicy->enabled');
+		$result1 = $extrafields->addExtraField('datapolicy_opposition_traitement', $langs->trans("DATAPOLICY_opposition_traitement"), 'boolean', 102, 3, 'thirdparty', 0, 0, '', '', 1, '', '3', 0, '', '', 'datapolicy', '$conf->datapolicy->enabled');
+		$result1 = $extrafields->addExtraField('datapolicy_opposition_prospection', $langs->trans("DATAPOLICY_opposition_prospection"), 'boolean', 103, 3, 'thirdparty', 0, 0, '', '', 1, '', '3', 0, '', '', 'datapolicy', '$conf->datapolicy->enabled');
 		$result1 = $extrafields->addExtraField('datapolicy_date', $langs->trans("DATAPOLICY_date"), 'date', 104, 3, 'thirdparty', 0, 0, '', '', 1, '', '3', 0);
 		$result1 = $extrafields->addExtraField('datapolicy_send', $langs->trans("DATAPOLICY_send"), 'date', 105, 3, 'thirdparty', 0, 0, '', '', 0, '', '0', 0);
 
 		// Extrafield Tiers
-		$result1 = $extrafields->addExtraField('datapolicy_consentement', $langs->trans("DATAPOLICY_consentement"), 'boolean', 101, 3, 'contact', 0, 0, '', '', 1, '', '3', 0, '', '', 'datapolicy@datapolicy', '$conf->datapolicy->enabled');
-		$result1 = $extrafields->addExtraField('datapolicy_opposition_traitement', $langs->trans("DATAPOLICY_opposition_traitement"), 'boolean', 102, 3, 'contact', 0, 0, '', '', 1, '', '3', 0, '', '', 'datapolicy@datapolicy', '$conf->datapolicy->enabled');
-		$result1 = $extrafields->addExtraField('datapolicy_opposition_prospection', $langs->trans("DATAPOLICY_opposition_prospection"), 'boolean', 103, 3, 'contact', 0, 0, '', '', 1, '', '3', 0, '', '', 'datapolicy@datapolicy', '$conf->datapolicy->enabled');
+		$result1 = $extrafields->addExtraField('datapolicy_consentement', $langs->trans("DATAPOLICY_consentement"), 'boolean', 101, 3, 'contact', 0, 0, '', '', 1, '', '3', 0, '', '', 'datapolicy', '$conf->datapolicy->enabled');
+		$result1 = $extrafields->addExtraField('datapolicy_opposition_traitement', $langs->trans("DATAPOLICY_opposition_traitement"), 'boolean', 102, 3, 'contact', 0, 0, '', '', 1, '', '3', 0, '', '', 'datapolicy', '$conf->datapolicy->enabled');
+		$result1 = $extrafields->addExtraField('datapolicy_opposition_prospection', $langs->trans("DATAPOLICY_opposition_prospection"), 'boolean', 103, 3, 'contact', 0, 0, '', '', 1, '', '3', 0, '', '', 'datapolicy', '$conf->datapolicy->enabled');
 		$result1 = $extrafields->addExtraField('datapolicy_date', $langs->trans("DATAPOLICY_date"), 'date', 104, 3, 'contact', 0, 0, '', '', 1, '', '3', 0);
 		$result1 = $extrafields->addExtraField('datapolicy_send', $langs->trans("DATAPOLICY_send"), 'date', 105, 3, 'contact', 0, 0, '', '', 0, '', '0', 0);
 
 		// Extrafield Adherent
-		$result1 = $extrafields->addExtraField('datapolicy_consentement', $langs->trans("DATAPOLICY_consentement"), 'boolean', 101, 3, 'adherent', 0, 0, '', '', 1, '', '3', 0, '', '', 'datapolicy@datapolicy', '$conf->datapolicy->enabled');
-		$result1 = $extrafields->addExtraField('datapolicy_opposition_traitement', $langs->trans("DATAPOLICY_opposition_traitement"), 'boolean', 102, 3, 'adherent', 0, 0, '', '', 1, '', '3', 0, '', '', 'datapolicy@datapolicy', '$conf->datapolicy->enabled');
-		$result1 = $extrafields->addExtraField('datapolicy_opposition_prospection', $langs->trans("DATAPOLICY_opposition_prospection"), 'boolean', 103, 3, 'adherent', 0, 0, '', '', 1, '', '3', 0, '', '', 'datapolicy@datapolicy', '$conf->datapolicy->enabled');
+		$result1 = $extrafields->addExtraField('datapolicy_consentement', $langs->trans("DATAPOLICY_consentement"), 'boolean', 101, 3, 'adherent', 0, 0, '', '', 1, '', '3', 0, '', '', 'datapolicy', '$conf->datapolicy->enabled');
+		$result1 = $extrafields->addExtraField('datapolicy_opposition_traitement', $langs->trans("DATAPOLICY_opposition_traitement"), 'boolean', 102, 3, 'adherent', 0, 0, '', '', 1, '', '3', 0, '', '', 'datapolicy', '$conf->datapolicy->enabled');
+		$result1 = $extrafields->addExtraField('datapolicy_opposition_prospection', $langs->trans("DATAPOLICY_opposition_prospection"), 'boolean', 103, 3, 'adherent', 0, 0, '', '', 1, '', '3', 0, '', '', 'datapolicy', '$conf->datapolicy->enabled');
 		$result1 = $extrafields->addExtraField('datapolicy_date', $langs->trans("DATAPOLICY_date"), 'date', 104, 3, 'adherent', 0, 0, '', '', 1, '', '3', 0);
 		$result1 = $extrafields->addExtraField('datapolicy_send', $langs->trans("DATAPOLICY_send"), 'date', 105, 3, 'adherent', 0, 0, '', '', 0, '', '0', 0);
 		*/
diff --git a/htdocs/datapolicy/mailing.php b/htdocs/datapolicy/admin/mailing.php
similarity index 63%
rename from htdocs/datapolicy/mailing.php
rename to htdocs/datapolicy/admin/mailing.php
index 7e2dccaf7d4..d381f5995de 100644
--- a/htdocs/datapolicy/mailing.php
+++ b/htdocs/datapolicy/admin/mailing.php
@@ -17,25 +17,56 @@
  */
 
 /**
- * \file    htdocs/datapolicy/mailing.php
+ * \file    htdocs/datapolicy/admin/mailing.php
  * \ingroup datapolicy
- * \brief   datapolicy mailing page.
+ * \brief   Page called by the setupmail.php page to send agreements by email.
  */
 
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
 require_once DOL_DOCUMENT_ROOT.'/datapolicy/class/datapolicy.class.php';
 
-$idcontact = GETPOST('idc');
+$idcontact = GETPOST('idc', 'int');
+$idcompany = GETPOST('ids', 'int');
+$idmember = GETPOST('ida', 'int');
+
+// Security
+if (!isModEnabled("datapolicy")) {
+	accessforbidden();
+}
+if (!$user->admin) {
+	accessforbidden();
+}
+
+
+/*
+ * Actions
+ */
 
 if (!empty($idcontact)) {
 	$contact = new Contact($db);
 	$contact->fetch($idcontact);
 	DataPolicy::sendMailDataPolicyContact($contact);
+} elseif (!empty($idcompany)) {
+	$company = new Societe($db);
+	$company->fetch($idcompany);
+	DataPolicy::sendMailDataPolicyCompany($company);
+} elseif (!empty($idmember)) {
+	$member = new Adherent($db);
+	$member->fetch($idmember);
+	DataPolicy::sendMailDataPolicyAdherent($member);
 } else {
 	$contacts = new DataPolicy($db);
+
+	// Send email to all contacts where email was not already sent
 	$contacts->getAllContactNotInformed();
 	$contacts->getAllCompaniesNotInformed();
 	$contacts->getAllAdherentsNotInformed();
-	echo $langs->trans('AllAgreementSend');
 }
+
+
+/*
+ * View
+ */
+
+echo $langs->trans('AllAgreementSend');
diff --git a/htdocs/datapolicy/admin/setup.php b/htdocs/datapolicy/admin/setup.php
index 26b71ce60e1..ade4e502872 100644
--- a/htdocs/datapolicy/admin/setup.php
+++ b/htdocs/datapolicy/admin/setup.php
@@ -19,15 +19,15 @@
 /**
  * \file    htdocs/datapolicy/admin/setup.php
  * \ingroup datapolicy
- * \brief   datapolicy setup page.
+ * \brief   Datapolicy setup page to define duration of data keeping.
  */
 
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php";
-require_once '../lib/datapolicy.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/datapolicy/lib/datapolicy.lib.php';
 
 // Translations
-$langs->loadLangs(array('admin', 'companies', 'members', 'datapolicy@datapolicy'));
+$langs->loadLangs(array('admin', 'companies', 'members', 'datapolicy'));
 
 // Parameters
 $action = GETPOST('action', 'aZ09');
@@ -69,7 +69,10 @@ $valTab = array(
 	'240' => $langs->trans('NB_YEARS', 20),
 );
 
-// Access control
+// Security
+if (!isModEnabled("datapolicy")) {
+	accessforbidden();
+}
 if (!$user->admin) {
 	accessforbidden();
 }
@@ -137,7 +140,7 @@ if ($action == 'edit') {
 		foreach ($tab as $key => $val) {
 			print '<tr class="oddeven"><td>';
 			print $val['picto'];
-			print $form->textwithpicto($langs->trans($key), $langs->trans($key.'Tooltip'));
+			print $form->textwithpicto($langs->trans($key), $langs->trans('DATAPOLICY_Tooltip_SETUP'));
 			print '</td><td>';
 			print '<select name="'.$key.'"  class="flat '.(empty($val['css']) ? 'minwidth200' : $val['css']).'">';
 			foreach ($valTab as $key1 => $val1) {
diff --git a/htdocs/datapolicy/admin/setupmail.php b/htdocs/datapolicy/admin/setupmail.php
index 825bd13b142..3aab757365c 100644
--- a/htdocs/datapolicy/admin/setupmail.php
+++ b/htdocs/datapolicy/admin/setupmail.php
@@ -1,6 +1,6 @@
 <?php
 
-/* Copyright (C) 2004-2017  Laurent Destailleur     <eldy@users.sourceforge.net>
+/* Copyright (C) 2004-2022  Laurent Destailleur     <eldy@users.sourceforge.net>
  * Copyright (C) 2018       Nicolas ZABOURI         <info@inovea-conseil.com>
  * Copyright (C) 2018       Frédéric France         <frederic.france@netlogic.fr>
  *
@@ -18,11 +18,17 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
+/**
+ * \file    htdocs/datapolicy/admin/setupmail.php
+ * \ingroup datapolicy
+ * \brief   Datapolicy setup page to define email content end send email for end user agreement.
+ */
+
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php";
 require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formadmin.class.php';
-require_once '../lib/datapolicy.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/datapolicy/lib/datapolicy.lib.php';
 
 // Translations
 $langs->loadLangs(array('admin', 'companies', 'members', 'datapolicy'));
@@ -31,18 +37,22 @@ $langs->loadLangs(array('admin', 'companies', 'members', 'datapolicy'));
 // Parameters
 $action = GETPOST('action', 'aZ09');
 $backtopage = GETPOST('backtopage', 'alpha');
-$formadmin = new FormAdmin($db);
 
 if (GETPOST('l')) {
 	$l = GETPOST('l');
 } else {
 	$l = $langs->defaultlang;
 }
-// Access control
+
+// Security
+if (!isModEnabled("datapolicy")) {
+	accessforbidden();
+}
 if (!$user->admin) {
 	accessforbidden();
 }
 
+
 /*
  * Actions
  */
@@ -51,17 +61,17 @@ include DOL_DOCUMENT_ROOT.'/core/actions_setmoduleoptions.inc.php';
 
 if ($action == 'setvalue' && $user->admin) {
 	$db->begin();
-	$sub = "DATAPOLICIESSUBJECT_".$l;
+	$sub = "DATAPOLICYSUBJECT_".$l;
 	$result = dolibarr_set_const($db, $sub, GETPOST($sub), 'chaine', 0, '', $conf->entity);
-	$cont = "DATAPOLICIESCONTENT_".$l;
+	$cont = "DATAPOLICYCONTENT_".$l;
 	$result = dolibarr_set_const($db, $cont, GETPOST($cont), 'chaine', 0, '', $conf->entity);
-	$cont = "TXTLINKDATAPOLICIESACCEPT_".$l;
+	$cont = "TXTLINKDATAPOLICYACCEPT_".$l;
 	$result = dolibarr_set_const($db, $cont, GETPOST($cont), 'chaine', 0, '', $conf->entity);
-	$cont = "TXTLINKDATAPOLICIESREFUSE_".$l;
+	$cont = "TXTLINKDATAPOLICYREFUSE_".$l;
 	$result = dolibarr_set_const($db, $cont, GETPOST($cont), 'chaine', 0, '', $conf->entity);
-	$sub = "DATAPOLICIESACCEPT_".$l;
+	$sub = "DATAPOLICYACCEPT_".$l;
 	$result = dolibarr_set_const($db, $sub, GETPOST($sub), 'chaine', 0, '', $conf->entity);
-	$sub = "DATAPOLICIESREFUSE_".$l;
+	$sub = "DATAPOLICYREFUSE_".$l;
 	$result = dolibarr_set_const($db, $sub, GETPOST($sub), 'chaine', 0, '', $conf->entity);
 	if (!($result > 0)) {
 		$error++;
@@ -80,17 +90,19 @@ if ($action == 'setvalue' && $user->admin) {
  * View
  */
 
+$formadmin = new FormAdmin($db);
+
 $page_name = "datapolicySetup";
 llxHeader('', $langs->trans($page_name));
 
 // 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($page_name), $linkback, 'object_datapolicy@datapolicy');
+print load_fiche_titre($langs->trans($page_name), $linkback, 'generic');
 
 // Configuration header
 $head = datapolicyAdminPrepareHead();
-print dol_get_fiche_head($head, 'settings', '', -1, "datapolicy@datapolicy");
+print dol_get_fiche_head($head, 'emailing', '', -1, '');
 
 
 print "<script type='text/javascript'>
@@ -108,42 +120,46 @@ print '<input type="hidden" name="action" value="setvalue">';
 print '<table>';
 if (!empty($conf->global->MAIN_MULTILANGS)) {
 	print '<tr><td>'.$form->editfieldkey('DefaultLang', 'default_lang', '', null, 0).'</td><td colspan="3" class="maxwidthonsmartphone">'."\n";
+	print img_picto('', 'language', 'class="pictofixedwidth"');
 	print $formadmin->select_language((GETPOST('l') ? GETPOST('l') : $langs->defaultlang), 'default_lang', 0, 0, 1, 0, 0, 'maxwidth200onsmartphone');
 	print '</tr>';
 }
-$subject = 'DATAPOLICIESSUBJECT_'.$l;
-$linka = 'TXTLINKDATAPOLICIESACCEPT_'.$l;
-$linkr = 'TXTLINKDATAPOLICIESREFUSE_'.$l;
-$content = 'DATAPOLICIESCONTENT_'.$l;
-$acc = 'DATAPOLICIESACCEPT_'.$l;
-$ref = 'DATAPOLICIESREFUSE_'.$l;
+$subject = 'DATAPOLICYSUBJECT_'.$l;
+$linka = 'TXTLINKDATAPOLICYACCEPT_'.$l;
+$linkr = 'TXTLINKDATAPOLICYREFUSE_'.$l;
+$content = 'DATAPOLICYCONTENT_'.$l;
+$acc = 'DATAPOLICYACCEPT_'.$l;
+$ref = 'DATAPOLICYREFUSE_'.$l;
 print '<tr class"oddeven"><td class="fieldrequired">';
-print $langs->trans('DATAPOLICIESSUBJECTMAIL').'</td><td>';
-print '<input type="text" size="100" name="'.$subject.'" value="'.$conf->global->$subject.'" />';
+print $langs->trans('DATAPOLICYSUBJECTMAIL').'</td><td>';
+print '<input type="text" name="'.$subject.'" value="'.$conf->global->$subject.'" />';
 print '</td><tr>';
 print '<tr class"oddeven"><td class="fieldrequired">';
-print $langs->trans('DATAPOLICIESCONTENTMAIL').'</td><td>';
-print $langs->trans('DATAPOLICIESSUBSITUTION'); echo'__LINKACCEPT__,__LINKREFUSED__,__FIRSTNAME__,__NAME__,__CIVILITY__';
+print $langs->trans('DATAPOLICYCONTENTMAIL').'</td><td>';
+print '<span class="opacitymedium">';
+print $langs->trans('DATAPOLICYSUBSITUTION');
+print '__LINKACCEPT__,__LINKREFUSED__,__FIRSTNAME__,__NAME__,__CIVILITY__';
+print '</span>';
 $doleditor = new DolEditor($content, $conf->global->$content, '', 250, 'Full', '', false, true, 1, 200, 70);
 $doleditor->Create();
 print '</td><tr>';
 print '<tr class"oddeven"><td class="fieldrequired">';
-print $langs->trans('TXTLINKDATAPOLICIESACCEPT').'</td><td>';
-print '<input type="text" size="200" name="'.$linka.'" value="'.$conf->global->$linka.'" />';
+print $langs->trans('TXTLINKDATAPOLICYACCEPT').'</td><td>';
+print '<input type="text" name="'.$linka.'" value="'.$conf->global->$linka.'" />';
 print '</td><tr>';
 print '<tr class"oddeven"><td class="fieldrequired">';
-print $langs->trans('TXTLINKDATAPOLICIESREFUSE').'</td><td>';
-print '<input type="text" size="200" name="'.$linkr.'" value="'.$conf->global->$linkr.'" />';
+print $langs->trans('TXTLINKDATAPOLICYREFUSE').'</td><td>';
+print '<input type="text" name="'.$linkr.'" value="'.$conf->global->$linkr.'" />';
 print '</td><tr>';
 print '<tr class"oddeven"><td class="fieldrequired">';
 
-print $langs->trans('DATAPOLICIESACCEPT').'</td><td>';
+print $langs->trans('DATAPOLICYACCEPT').'</td><td>';
 
 $doleditor = new DolEditor($acc, $conf->global->$acc, '', 250, 'Full', '', false, true, 1, 200, 70);
 $doleditor->Create();
 print '</td><tr>';
 print '<tr class"oddeven"><td class="fieldrequired">';
-print $langs->trans('DATAPOLICIESREFUSE').'</td><td>';
+print $langs->trans('DATAPOLICYREFUSE').'</td><td>';
 
 print $langs->trans('');
 $doleditor = new DolEditor($ref, $conf->global->$ref, '', 250, 'Full', '', false, true, 1, 200, 70);
@@ -160,7 +176,7 @@ print dol_get_fiche_end();
 print '<br><br>';
 
 print $langs->trans('SendAgreementText');
-print '<a class="button" href="'.DOL_URL_ROOT.'/datapolicy/mailing.php">'.$langs->trans('SendAgreement').'</a>';
+print '<a class="button" href="'.DOL_URL_ROOT.'/datapolicy/admin/mailing.php">'.$langs->trans('SendAgreementRequestByEmail').'</a>';
 
 llxFooter();
 $db->close();
diff --git a/htdocs/datapolicy/class/actions_datapolicy.class.php b/htdocs/datapolicy/class/actions_datapolicy.class.php
index ffd43bbf8ac..ac360674c85 100644
--- a/htdocs/datapolicy/class/actions_datapolicy.class.php
+++ b/htdocs/datapolicy/class/actions_datapolicy.class.php
@@ -331,9 +331,9 @@ class ActionsDatapolicy
 		global $conf, $user, $langs;
 		$langs->load('datapolicy@datapolicy');
 
-		if (!empty($conf->global->DATAPOLICIES_ENABLE_EMAILS)) {
-			$dialog = '<div id="dialogdatapolicy" style="display:none;" title="'.$langs->trans('DATAPOLICIES_PORTABILITE_TITLE').'">';
-			$dialog .= '<div class="confirmmessage">'.img_help('', '').' '.$langs->trans('DATAPOLICIES_PORTABILITE_CONFIRMATION').'</div>';
+		if (!empty($conf->global->DATAPOLICY_ENABLE_EMAILS)) {
+			$dialog = '<div id="dialogdatapolicy" style="display:none;" title="'.$langs->trans('DATAPOLICY_PORTABILITE_TITLE').'">';
+			$dialog .= '<div class="confirmmessage">'.img_help('', '').' '.$langs->trans('DATAPOLICY_PORTABILITE_CONFIRMATION').'</div>';
 			$dialog .= "</div>";
 			$dialog .= '<script>
                       $( function() {
@@ -359,18 +359,18 @@ class ActionsDatapolicy
                       </script>';
 			echo $dialog;
 			if ($parameters['currentcontext'] == 'thirdpartycard' && in_array($object->forme_juridique_code, array(11, 12, 13, 15, 17, 18, 19, 35, 60, 200, 311, 312, 316, 401, 600, 700, 1005)) || $object->typent_id == 8) {
-				echo '<div class="inline-block divButAction"><a target="_blank" rel="noopener noreferrer" id="rpgpdbtn" class="butAction" href="'.$_SERVER["PHP_SELF"]."?socid=".$object->id.'&action=datapolicy_portabilite" title="'.$langs->trans('DATAPOLICIES_PORTABILITE_TITLE').'">'.$langs->trans("DATAPOLICIES_PORTABILITE").'</a></div>';
+				echo '<div class="inline-block divButAction"><a target="_blank" rel="noopener noreferrer" id="rpgpdbtn" class="butAction" href="'.$_SERVER["PHP_SELF"]."?socid=".$object->id.'&action=datapolicy_portabilite" title="'.$langs->trans('DATAPOLICY_PORTABILITE_TITLE').'">'.$langs->trans("DATAPOLICY_PORTABILITE").'</a></div>';
 			} elseif ($parameters['currentcontext'] == 'membercard') {
-				echo '<div class="inline-block divButAction"><a target="_blank" rel="noopener noreferrer" id="rpgpdbtn" class="butAction" href="'.$_SERVER["PHP_SELF"]."?rowid=".$object->id.'&action=datapolicy_portabilite" title="'.$langs->trans('DATAPOLICIES_PORTABILITE_TITLE').'">'.$langs->trans("DATAPOLICIES_PORTABILITE").'</a></div>';
+				echo '<div class="inline-block divButAction"><a target="_blank" rel="noopener noreferrer" id="rpgpdbtn" class="butAction" href="'.$_SERVER["PHP_SELF"]."?rowid=".$object->id.'&action=datapolicy_portabilite" title="'.$langs->trans('DATAPOLICY_PORTABILITE_TITLE').'">'.$langs->trans("DATAPOLICY_PORTABILITE").'</a></div>';
 			} elseif ($parameters['currentcontext'] == 'contactcard') {
-				echo '<div class="inline-block divButAction"><a target="_blank" rel="noopener noreferrer" id="rpgpdbtn" class="butAction" href="'.$_SERVER["PHP_SELF"]."?id=".$object->id.'&action=datapolicy_portabilite" title="'.$langs->trans('DATAPOLICIES_PORTABILITE_TITLE').'">'.$langs->trans("DATAPOLICIES_PORTABILITE").'</a></div>';
+				echo '<div class="inline-block divButAction"><a target="_blank" rel="noopener noreferrer" id="rpgpdbtn" class="butAction" href="'.$_SERVER["PHP_SELF"]."?id=".$object->id.'&action=datapolicy_portabilite" title="'.$langs->trans('DATAPOLICY_PORTABILITE_TITLE').'">'.$langs->trans("DATAPOLICY_PORTABILITE").'</a></div>';
 			}
 			if (!empty($object->mail) && empty($object->array_options['options_datapolicy_send']) && $parameters['currentcontext'] == 'thirdpartycard' && in_array($object->forme_juridique_code, array(11, 12, 13, 15, 17, 18, 19, 35, 60, 200, 311, 312, 316, 401, 600, 700, 1005)) || $object->typent_id == 8) {
-				echo '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"]."?socid=".$object->id.'&action=send_datapolicy" title="'.$langs->trans('DATAPOLICIES_SEND').'">'.$langs->trans("DATAPOLICIES_SEND").'</a></div>';
+				echo '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"]."?socid=".$object->id.'&action=send_datapolicy" title="'.$langs->trans('DATAPOLICY_SEND').'">'.$langs->trans("DATAPOLICY_SEND").'</a></div>';
 			} elseif (!empty($object->mail) && empty($object->array_options['options_datapolicy_send']) && $parameters['currentcontext'] == 'membercard') {
-				echo '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"]."?rowid=".$object->id.'&action=send_datapolicy" title="'.$langs->trans('DATAPOLICIES_SEND').'">'.$langs->trans("DATAPOLICIES_SEND").'</a></div>';
+				echo '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"]."?rowid=".$object->id.'&action=send_datapolicy" title="'.$langs->trans('DATAPOLICY_SEND').'">'.$langs->trans("DATAPOLICY_SEND").'</a></div>';
 			} elseif (!empty($object->mail) && empty($object->array_options['options_datapolicy_send']) && $parameters['currentcontext'] == 'contactcard') {
-				echo '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"]."?id=".$object->id.'&action=send_datapolicy" title="'.$langs->trans('DATAPOLICIES_SEND').'">'.$langs->trans("DATAPOLICIES_SEND").'</a></div>';
+				echo '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"]."?id=".$object->id.'&action=send_datapolicy" title="'.$langs->trans('DATAPOLICY_SEND').'">'.$langs->trans("DATAPOLICY_SEND").'</a></div>';
 			}
 		}
 	}
@@ -412,7 +412,7 @@ class ActionsDatapolicy
 				if ((in_array($object->forme_juridique_code, array(11, 12, 13, 15, 17, 18, 19, 35, 60, 200, 311, 312, 316, 401, 600, 700, 1005)) || $societe->typent_id == 8) && $societe->isObjectUsed(GETPOST('socid'))) {
 					require_once DOL_DOCUMENT_ROOT.'/core/class/html.form.class.php';
 					$form = new Form($this->db);
-					echo $form->formconfirm($_SERVER["PHP_SELF"]."?socid=".GETPOST('socid'), substr($langs->trans("DATAPOLICIES_POPUP_ANONYME_TITLE"), 0, strlen($langs->trans("DATAPOLICIES_POPUP_ANONYME_TITLE")) - 2), $langs->trans("DATAPOLICIES_POPUP_ANONYME_TEXTE"), 'anonymiser', '', '', 1);
+					echo $form->formconfirm($_SERVER["PHP_SELF"]."?socid=".GETPOST('socid'), substr($langs->trans("DATAPOLICY_POPUP_ANONYME_TITLE"), 0, strlen($langs->trans("DATAPOLICY_POPUP_ANONYME_TITLE")) - 2), $langs->trans("DATAPOLICY_POPUP_ANONYME_TEXTE"), 'anonymiser', '', '', 1);
 				}
 			}
 
diff --git a/htdocs/datapolicy/class/datapolicy.class.php b/htdocs/datapolicy/class/datapolicy.class.php
index d0cf2e48434..7bbe8d7c1a6 100644
--- a/htdocs/datapolicy/class/datapolicy.class.php
+++ b/htdocs/datapolicy/class/datapolicy.class.php
@@ -23,6 +23,7 @@
 include_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
 include_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
 include_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
+include_once DOL_DOCUMENT_ROOT.'/core/lib/security.lib.php';
 
 
 /**
@@ -161,17 +162,17 @@ class DataPolicy
 		$from = $user->getFullName($langs).' <'.$user->email.'>';
 
 		$sendto = $contact->email;
-		$code = md5($contact->email);
+		$code = dol_hash($contact->email, 'md5');
 		if (!empty($contact->default_lang)) {
 			$l = $contact->default_lang;
 		} else {
 			$l = $langs->defaultlang;
 		}
 		// TODO Use a dolibarr email template
-		$s = "DATAPOLICIESSUBJECT_".$l;
-		$ma = "DATAPOLICIESCONTENT_".$l;
-		$la = 'TXTLINKDATAPOLICIESACCEPT_'.$l;
-		$lr = 'TXTLINKDATAPOLICIESREFUSE_'.$l;
+		$s = "DATAPOLICYSUBJECT_".$l;
+		$ma = "DATAPOLICYCONTENT_".$l;
+		$la = 'TXTLINKDATAPOLICYACCEPT_'.$l;
+		$lr = 'TXTLINKDATAPOLICYREFUSE_'.$l;
 
 		$subject = $conf->global->$s;
 		$message = $conf->global->$ma;
@@ -182,8 +183,8 @@ class DataPolicy
 		$deliveryreceipt = 0;
 
 		$substitutionarray = array(
-			'__LINKACCEPT__' => '<a href="'.dol_buildpath('/datapolicy/public/index.php?action=1&c='.$contact->id.'&l='.$l.'&key='.$code, 3).'" target="_blank" rel="noopener noreferrer">'.$linka.'</a>',
-			'__LINKREFUSED__' => '<a href="'.dol_buildpath('/datapolicy/public/index.php?action=2&c='.$contact->id.'&l='.$l.'&key='.$code, 3).'" target="_blank" rel="noopener noreferrer">'.$linkr.'</a>',
+			'__LINKACCEPT__' => '<a href="'.dol_buildpath('/public/datapolicy/index.php?action=1&c='.$contact->id.'&l='.$l.'&key='.$code, 3).'" target="_blank" rel="noopener noreferrer">'.$linka.'</a>',
+			'__LINKREFUSED__' => '<a href="'.dol_buildpath('/public/datapolicy/index.php?action=2&c='.$contact->id.'&l='.$l.'&key='.$code, 3).'" target="_blank" rel="noopener noreferrer">'.$linkr.'</a>',
 			'__FIRSTNAME__' => $contact->firstname,
 			'__NAME__' => $contact->lastname,
 			'__CIVILITY__' => $contact->civility,
@@ -238,17 +239,17 @@ class DataPolicy
 
 		$sendto = $societe->email;
 
-		$code = md5($societe->email);
+		$code = dol_hash($societe->email, 'md5');
 		if (!empty($societe->default_lang)) {
 			$l = $societe->default_lang;
 		} else {
 			$l = $langs->defaultlang;
 		}
 		// TODO Use a dolibarr email template
-		$s = "DATAPOLICIESSUBJECT_".$l;
-		$ma = "DATAPOLICIESCONTENT_".$l;
-		$la = 'TXTLINKDATAPOLICIESACCEPT_'.$l;
-		$lr = 'TXTLINKDATAPOLICIESREFUSE_'.$l;
+		$s = "DATAPOLICYSUBJECT_".$l;
+		$ma = "DATAPOLICYCONTENT_".$l;
+		$la = 'TXTLINKDATAPOLICYACCEPT_'.$l;
+		$lr = 'TXTLINKDATAPOLICYREFUSE_'.$l;
 
 		$subject = $conf->global->$s;
 		$message = $conf->global->$ma;
@@ -259,8 +260,8 @@ class DataPolicy
 		$deliveryreceipt = 0;
 
 		$substitutionarray = array(
-			'__LINKACCEPT__' => '<a href="'.dol_buildpath('/datapolicy/public/index.php?action=1&s='.$societe->id.'&l='.$l.'&key='.$code, 3).'" target="_blank" rel="noopener noreferrer">'.$linka.'</a>',
-			'__LINKREFUSED__' => '<a href="'.dol_buildpath('/datapolicy/public/index.php?action=2&s='.$societe->id.'&l='.$l.'&key='.$code, 3).'" target="_blank" rel="noopener noreferrer">'.$linkr.'</a>',
+			'__LINKACCEPT__' => '<a href="'.dol_buildpath('/public/datapolicy/index.php?action=1&s='.$societe->id.'&l='.$l.'&key='.$code, 3).'" target="_blank" rel="noopener noreferrer">'.$linka.'</a>',
+			'__LINKREFUSED__' => '<a href="'.dol_buildpath('/public/datapolicy/index.php?action=2&s='.$societe->id.'&l='.$l.'&key='.$code, 3).'" target="_blank" rel="noopener noreferrer">'.$linkr.'</a>',
 		);
 		$subject = make_substitutions($subject, $substitutionarray);
 		$message = make_substitutions($message, $substitutionarray);
@@ -311,17 +312,17 @@ class DataPolicy
 
 		$sendto = $adherent->email;
 
-		$code = md5($adherent->email);
+		$code = dol_hash($adherent->email, 'md5');
 		if (!empty($adherent->default_lang)) {
 			$l = $adherent->default_lang;
 		} else {
 			$l = $langs->defaultlang;
 		}
 		// TODO Use a dolibarr email template
-		$s = 'TXTLINKDATAPOLICIESSUBJECT_'.$l;
-		$ma = 'TXTLINKDATAPOLICIESMESSAGE_'.$l;
-		$la = 'TXTLINKDATAPOLICIESACCEPT_'.$l;
-		$lr = 'TXTLINKDATAPOLICIESREFUSE_'.$l;
+		$s = 'TXTLINKDATAPOLICYSUBJECT_'.$l;
+		$ma = 'TXTLINKDATAPOLICYMESSAGE_'.$l;
+		$la = 'TXTLINKDATAPOLICYACCEPT_'.$l;
+		$lr = 'TXTLINKDATAPOLICYREFUSE_'.$l;
 
 		$subject = $conf->global->$s;
 		$message = $conf->global->$ma;
@@ -332,8 +333,8 @@ class DataPolicy
 		$deliveryreceipt = 0;
 
 		$substitutionarray = array(
-			'__LINKACCEPT__' => '<a href="'.dol_buildpath('/datapolicy/public/index.php?action=1&a='.$adherent->id.'&l='.$l.'&key='.$code, 3).'" target="_blank" rel="noopener noreferrer">'.$linka.'</a>',
-			'__LINKREFUSED__' => '<a href="'.dol_buildpath('/datapolicy/public/index.php?action=2&a='.$adherent->id.'&l='.$l.'&key='.$code, 3).'" target="_blank" rel="noopener noreferrer">'.$linkr.'</a>',
+			'__LINKACCEPT__' => '<a href="'.dol_buildpath('/public/datapolicy/index.php?action=1&a='.$adherent->id.'&l='.$l.'&key='.$code, 3).'" target="_blank" rel="noopener noreferrer">'.$linka.'</a>',
+			'__LINKREFUSED__' => '<a href="'.dol_buildpath('/public/datapolicy/index.php?action=2&a='.$adherent->id.'&l='.$l.'&key='.$code, 3).'" target="_blank" rel="noopener noreferrer">'.$linkr.'</a>',
 		);
 		$subject = make_substitutions($subject, $substitutionarray);
 		$message = make_substitutions($message, $substitutionarray);
diff --git a/htdocs/datapolicy/class/datapolicycron.class.php b/htdocs/datapolicy/class/datapolicycron.class.php
index 965d93754f7..44152f0c68b 100644
--- a/htdocs/datapolicy/class/datapolicycron.class.php
+++ b/htdocs/datapolicy/class/datapolicycron.class.php
@@ -56,7 +56,7 @@ class DataPolicyCron
 
 		// FIXME Exclude data from the selection if there is at least 1 invoice.
 		$arrayofparameters = array(
-			'DATAPOLICIES_TIERS_CLIENT' => array(
+			'DATAPOLICY_TIERS_CLIENT' => array(
 				'sql' => "
                     SELECT s.rowid FROM ".MAIN_DB_PREFIX."societe as s
                     WHERE s.entity = %d
@@ -90,7 +90,7 @@ class DataPolicyCron
 					'country_id' => '',
 				)
 			),
-			'DATAPOLICIES_TIERS_PROSPECT' => array(
+			'DATAPOLICY_TIERS_PROSPECT' => array(
 				'sql' => "
                     SELECT s.rowid FROM ".MAIN_DB_PREFIX."societe as s
                     WHERE s.entity = %d
@@ -124,7 +124,7 @@ class DataPolicyCron
 					'country_id' => '',
 				)
 			),
-			'DATAPOLICIES_TIERS_PROSPECT_CLIENT' => array(
+			'DATAPOLICY_TIERS_PROSPECT_CLIENT' => array(
 				'sql' => "
                     SELECT s.rowid FROM ".MAIN_DB_PREFIX."societe as s
                     WHERE s.entity = %d
@@ -158,7 +158,7 @@ class DataPolicyCron
 					'country_id' => '',
 				)
 			),
-			'DATAPOLICIES_TIERS_NIPROSPECT_NICLIENT' => array(
+			'DATAPOLICY_TIERS_NIPROSPECT_NICLIENT' => array(
 				'sql' => "
                     SELECT s.rowid FROM ".MAIN_DB_PREFIX."societe as s
                     WHERE s.entity = %d
@@ -192,7 +192,7 @@ class DataPolicyCron
 					'country_id' => '',
 				)
 			),
-			'DATAPOLICIES_TIERS_FOURNISSEUR' => array(
+			'DATAPOLICY_TIERS_FOURNISSEUR' => array(
 				'sql' => "
                     SELECT s.rowid FROM ".MAIN_DB_PREFIX."societe as s
                     WHERE s.entity = %d
@@ -225,7 +225,7 @@ class DataPolicyCron
 					'country_id' => '',
 				)
 			),
-			'DATAPOLICIES_CONTACT_CLIENT' => array(
+			'DATAPOLICY_CONTACT_CLIENT' => array(
 				'sql' => "
                     SELECT c.rowid FROM ".MAIN_DB_PREFIX."socpeople as c
                     INNER JOIN ".MAIN_DB_PREFIX."societe as s ON s.rowid = c.fk_soc
@@ -263,7 +263,7 @@ class DataPolicyCron
 					'country_id' => '',
 				)
 			),
-			'DATAPOLICIES_CONTACT_PROSPECT' => array(
+			'DATAPOLICY_CONTACT_PROSPECT' => array(
 				'sql' => "
                     SELECT c.rowid FROM ".MAIN_DB_PREFIX."socpeople as c
                     INNER JOIN ".MAIN_DB_PREFIX."societe as s ON s.rowid = c.fk_soc
@@ -301,7 +301,7 @@ class DataPolicyCron
 					'country_id' => '',
 				)
 			),
-			'DATAPOLICIES_CONTACT_PROSPECT_CLIENT' => array(
+			'DATAPOLICY_CONTACT_PROSPECT_CLIENT' => array(
 				'sql' => "
                     SELECT c.rowid FROM ".MAIN_DB_PREFIX."socpeople as c
                     INNER JOIN ".MAIN_DB_PREFIX."societe as s ON s.rowid = c.fk_soc
@@ -339,7 +339,7 @@ class DataPolicyCron
 					'country_id' => '',
 				)
 			),
-			'DATAPOLICIES_CONTACT_NIPROSPECT_NICLIENT' => array(
+			'DATAPOLICY_CONTACT_NIPROSPECT_NICLIENT' => array(
 				'sql' => "
                     SELECT c.rowid FROM ".MAIN_DB_PREFIX."socpeople as c
                     INNER JOIN ".MAIN_DB_PREFIX."societe as s ON s.rowid = c.fk_soc
@@ -377,7 +377,7 @@ class DataPolicyCron
 					'country_id' => '',
 				)
 			),
-			'DATAPOLICIES_CONTACT_FOURNISSEUR' => array(
+			'DATAPOLICY_CONTACT_FOURNISSEUR' => array(
 				'sql' => "
                     SELECT c.rowid FROM ".MAIN_DB_PREFIX."socpeople as c
                     INNER JOIN ".MAIN_DB_PREFIX."societe as s ON s.rowid = c.fk_soc
@@ -414,7 +414,7 @@ class DataPolicyCron
 					'country_id' => '',
 				)
 			),
-			'DATAPOLICIES_ADHERENT' => array(
+			'DATAPOLICY_ADHERENT' => array(
 				'sql' => "
                     SELECT a.rowid FROM ".MAIN_DB_PREFIX."adherent as a
                     WHERE a.entity = %d
diff --git a/htdocs/datapolicy/langs/fr_FR/datapolicy.lang b/htdocs/datapolicy/langs/fr_FR/datapolicy.lang
deleted file mode 100644
index 6bf0c6a904d..00000000000
--- a/htdocs/datapolicy/langs/fr_FR/datapolicy.lang
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright (C) 2018  INOVEA CONSEil info@inovea-conseil.com
-#
-# This 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/>.
-
-#
-# Générique
-#
-
-# Module label 'ModuledatapolicyName'
-Module4100Name = Protection des Données
-# Module description 'ModuledatapolicyDesc'
-Module4100Desc = Module de gestion de la protection des données (RGPD)
-
-#
-# Page d'administration
-#
-datapolicySetup = Configuration du module Protection des données
-Settings_DATAPOLICY = Paramétrage du module Protection des données
-datapolicySetupPage = Selon la loi de votre pays (Exemple <a href="http://www.privacy-regulation.eu/fr/5.htm" target="_blank" rel="noopener noreferrer">l’article 5</a> du RGPD), les données à caractère personnel doivent être conservées pendant une durée n’excédant pas celle nécessaire au regard des finalités pour lesquelles elles ont été traitées, à l’exception de fins archivistiques. 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
-DATAPOLICY_TIERS_CLIENT = Client
-DATAPOLICY_TIERS_PROSPECT = Prospect
-DATAPOLICY_TIERS_PROSPECT_CLIENT = Prospect/Client
-DATAPOLICY_TIERS_NIPROSPECT_NICLIENT = Ni prospect / Ni client
-DATAPOLICY_TIERS_FOURNISSEUR = Fournisseur
-DATAPOLICY_CONTACT_CLIENT = Client
-DATAPOLICY_CONTACT_PROSPECT = Prospect
-DATAPOLICY_CONTACT_PROSPECT_CLIENT = Prospect/Client
-DATAPOLICY_CONTACT_NIPROSPECT_NICLIENT = Ni prospect / Ni client
-DATAPOLICY_CONTACT_FOURNISSEUR = Fournisseur
-DATAPOLICY_ADHERENT = Adhérent
-DATAPOLICY_Tooltip_SETUP = Type du contact - Indiquez vos choix pour chaque type.
-DATAPOLICYMail=Paramétrage des emails
-DATAPOLICYSUBJECTMAIL=Objet du mail
-DATAPOLICYCONTENTMAIL=Contenu du mail
-DATAPOLICYSUBSITUTION=Vous pouvez utiliser les variables suivantes dans votre email (LINKACCEPT permet de créer un lien enregistrant l'acceptation de la personne, LINKREFUSED permet d'enregistrer le refus de la personne) :
-DATAPOLICYACCEPT=Message suite acceptation
-DATAPOLICYREFUSE=Message suite opposition
-SendAgreementText=Vous pouvez envoyer un email DATAPOLICY à tous vos contacts concernés (qui n'ont pas encore reçus de mail et pour lesquels vous n'avez rien enregistré concernant leur accord/désaccord DATAPOLICY). Pour cela, utilisez le bouton suivant.
-SendAgreement=Envoyer les emails
-AllAgreementSend = Tous les e-mails de consentement ont été envoyés
-TXTLINKDATAPOLICYACCEPT= Texte du lien d'acceptation
-TXTLINKDATAPOLICYREFUSE= Texte du lien d'opposition
-
-
-
-#
-# Extrafield
-#
-DATAPOLICY_BLOCKCHECKBOX = DATAPOLICY : Traitement des données à caractère personnel
-DATAPOLICY_consentement = Consentement recueilli pour le traitement des données à caractère personnel le concernant
-DATAPOLICY_opposition_traitement = S’oppose au traitement de ses données à caractère personnel
-DATAPOLICY_opposition_prospection = S’oppose au traitement de ses données à caractère personnel à des fins de prospection
-
-#
-# Popup
-#
-DATAPOLICY_POPUP_ANONYME_TITLE = Anonymiser un tiers
-DATAPOLICY_POPUP_ANONYME_TEXTE = Vous ne pouvez pas supprimer ce contact de Dolibarr car des éléments y sont liés. Conformément au DATAPOLICY, vous allez rendre toutes ces données anonymes afin de respecter vos obligations. Souhaitez-vous continuer ?
-
-#
-# Bouton portabilité
-# 
-DATAPOLICY_PORTABILITE = Portabilité DATAPOLICY
-DATAPOLICY_PORTABILITE_TITLE = Export des données à caractère personnel
-DATAPOLICY_PORTABILITE_CONFIRMATION = Vous souhaitez exporter les données à caractère personnel de ce contact. Etes-vous sûr ?
-
-#
-# Note ajoutés lors d'une anonymisation
-#
-ANONYMISER_AT = Anonymisé le %s
-
-#V2
-DATAPOLICYReturn=Validation DATAPOLICY
-DATAPOLICY_date=Date d'accord/opposition au traitement
-DATAPOLICY_send=Date envoi consentement
-DATAPOLICYReturn=Retour DATAPOLICY
-DATAPOLICY_SEND=Envoyer l'email de consentement
-MailSent=L'email a bien été envoyé
-
-#ERROR
-ErrorSubjectIsRequired=Erreur : vous n'avez pas indiqué l'objet de l'email dans la configuration
-=Suite à un problème technique, nous n'avons pas pu enregistrer votre choix. Nous nous en excusons. Contactez-nous pour nous transmettre votre choix.
-NUMBER_MONTH_BEFORE_DELETION = Nombre de mois avant suppression des données
diff --git a/htdocs/datapolicy/langs/it_IT/datapolicy.lang b/htdocs/datapolicy/langs/it_IT/datapolicy.lang
deleted file mode 100644
index 68284e17844..00000000000
--- a/htdocs/datapolicy/langs/it_IT/datapolicy.lang
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright (C) 2018 INOVEA CONSEIl info@inovea-conseil.com - Thanks to Claudio Aschieri
-#
-# # Module label 'ModuledatapolicyName'
-Module4100Name = Data Policy
-# Module description 'ModuledatapolicyDesc'
-Module4100Desc = Conformità con GDPR
-
-#
-# Page d'administration
-#
-datapolicySetup = Module Setup
-Settings_DATAPOLICY = Configurazione modulo GDPR 
-datapolicySetupPage = In accordo con <a href="http://www.privacy-regulation.eu/it/5.htm" target="_blank" rel="noopener noreferrer">l'art 5 del GDPR </a> i dati personali devono essere conservati per un periodo di tempo che .... ed eliminati se non sono più utili agli scopi per cui sono stati processati.
-NB_MONTHS = %s mesi
-ONE_YEAR = 1 anno
-NB_YEARS = %s anni
-DATAPOLICY_TIERS_CLIENT = Cliente
-DATAPOLICY_TIERS_PROSPECT = Fornitore
-DATAPOLICY_TIERS_PROSPECT_CLIENT = Potenziale Cliente / Cliente
-DATAPOLICY_TIERS_NIPROSPECT_NICLIENT = Nè potenziale cliente / Nè cliente
-DATAPOLICY_TIERS_FOURNISSEUR = Fornitore
-DATAPOLICY_CONTACT_CLIENT = Cliente
-DATAPOLICY_CONTACT_PROSPECT = Potenziale cliente
-DATAPOLICY_CONTACT_PROSPECT_CLIENT = Potenziale Cliente / Cliente
-DATAPOLICY_CONTACT_NIPROSPECT_NICLIENT = Nè potenziale cliente / Nè cliente
-DATAPOLICY_CONTACT_FOURNISSEUR = Fornitore
-DATAPOLICY_ADHERENT = Membri
-DATAPOLICY_Tooltip_SETUP = Tipo di contatto - Indica la scelta per ogni tipologia
-DATAPOLICYMail=Configurazione Email
-DATAPOLICYSUBJECTMAIL=Subject dell'e-mail
-DATAPOLICYCONTENTMAIL=Contenuto dell'e-mail
-DATAPOLICYSUBSITUTION=Puoi utilizzare le seguenti variabili nella tua email (LINKACCEPT consente di creare un link per registrare l'accettazione della persona, LINKREFUSED consente di registrare il rifiuto della persona):
-DATAPOLICYACCEPT= Messaggio dopo il consenso
-DATAPOLICYREFUSE=Messaggio dopo il rifiuto
-SendAgreementText=Puoi inviare un'email GDPR a tutti i tuoi contatti rilevanti (che non hanno ancora ricevuto un'e-mail e per i quali non hai registrato nulla sul loro accordo GDPR). Per fare ciò, utilizzare il seguente pulsante.
-SendAgreement=Invia emails
-AllAgreementSend = Tutte le email sono state inviate
-TXTLINKDATAPOLICYACCEPT= Testo per il link "Consenso" 
-TXTLINKDATAPOLICYREFUSE= Testo per il link "Consenso negato" 
-
-#
-# Extrafield
-#
-DATAPOLICY_BLOCKCHECKBOX = GDPR : Trattamento dei dati personali
-DATAPOLICY_consentement = Consenso ottenuto al Trattamento dei dati personali
-DATAPOLICY_opposition_traitement = Consenso negato al trattamento dei dati personali
-DATAPOLICY_opposition_prospection = Consenso negato al trattamento dei dati personali a fini commerciali
-
-#
-# Popup
-#
-DATAPOLICY_POPUP_ANONYME_TITLE = Anonimizza un soggetto terzo
-DATAPOLICY_POPUP_ANONYME_TEXTE = Impossibile eliminare questo contatto da Dolibarr perchè vi sono elementi collegati. In conformità con il GDPR, renderai tutti questi dati anonimi per rispettare i tuoi obblighi. Vuoi continuare?
-
-
-#
-# Bouton portabilité
-# 
-DATAPOLICY_PORTABILITE = Portabilità GDPR
-DATAPOLICY_PORTABILITE_TITLE = Esporta i dati personali
-DATAPOLICY_PORTABILITE_CONFIRMATION = Vuoi davvero esportare i dati personali di questo contatto?
-
-#
-# Note ajoutée lors d'une anonymisation
-#
-ANONYMISER_AT = Anonimizzato il %s
-
-#V2
-DATAPOLICYReturn=GDPR Validazione
-DATAPOLICY_date = Data di accordo / disaccordo GDPR
-DATAPOLICY_send = Data di invio del consenso (e-mail)
-DATAPOLICYReturn = GDPR ritorno
-DATAPOLICY_SEND = Inviare GDPR e-mail
-MailSent=L'email è stata inviata
-
-#ERROR
-ErrorSubjectIsRequired= Errore: L'oggetto della mail è obbligatorio. Inserisci l'oggetto nella configurazione del modulo.
-=A causa di un problema tecnico, non siamo stati in grado di registrare la tua scelta. Ci scusiamo per questo. Contattaci per inviarci la tua scelta.
diff --git a/htdocs/datapolicy/lib/datapolicy.lib.php b/htdocs/datapolicy/lib/datapolicy.lib.php
index 02ac575047e..eb70736d27c 100644
--- a/htdocs/datapolicy/lib/datapolicy.lib.php
+++ b/htdocs/datapolicy/lib/datapolicy.lib.php
@@ -31,7 +31,7 @@ function datapolicyAdminPrepareHead()
 {
 	global $langs, $conf;
 
-	$langs->load("datapolicy@datapolicy");
+	$langs->load("datapolicy");
 
 	$h = 0;
 	$head = array();
@@ -41,10 +41,10 @@ function datapolicyAdminPrepareHead()
 	$head[$h][2] = 'settings';
 	$h++;
 
-	if (!empty($conf->global->DATAPOLICIES_ENABLE_EMAILS)) {
+	if (!empty($conf->global->DATAPOLICY_ENABLE_EMAILS) || getDolGlobalInt('MAIN_FEATURES_LEVEL') >= 1) {
 		$head[$h][0] = DOL_URL_ROOT."/datapolicy/admin/setupmail.php";
-		$head[$h][1] = $langs->trans("DATAPOLICIESMail");
-		$head[$h][2] = 'settings';
+		$head[$h][1] = $langs->trans("DATAPOLICYMail");
+		$head[$h][2] = 'emailing';
 		$h++;
 	}
 
diff --git a/htdocs/datapolicy/langs/en_US/datapolicy.lang b/htdocs/langs/en_US/datapolicy.lang
similarity index 100%
rename from htdocs/datapolicy/langs/en_US/datapolicy.lang
rename to htdocs/langs/en_US/datapolicy.lang
diff --git a/htdocs/modulebuilder/template/mymoduleindex.php b/htdocs/modulebuilder/template/mymoduleindex.php
index 2581b407f3b..3b7b1b13009 100644
--- a/htdocs/modulebuilder/template/mymoduleindex.php
+++ b/htdocs/modulebuilder/template/mymoduleindex.php
@@ -75,7 +75,7 @@ if (isset($user->socid) && $user->socid > 0) {
 // Security check (enable the most restrictive one)
 //if ($user->socid > 0) accessforbidden();
 //if ($user->socid > 0) $socid = $user->socid;
-//if (!isModEnabled('barcode')) {
+//if (!isModEnabled('mymodule')) {
 //	accessforbidden('Module not enabled');
 //}
 //if (! $user->hasRight('mymodule', 'myobject', 'read')) {
diff --git a/htdocs/modulebuilder/template/myobject_agenda.php b/htdocs/modulebuilder/template/myobject_agenda.php
index 3e6213eaa26..6cc99f4f34d 100644
--- a/htdocs/modulebuilder/template/myobject_agenda.php
+++ b/htdocs/modulebuilder/template/myobject_agenda.php
@@ -148,7 +148,9 @@ if ($enablepermissioncheck) {
 //if ($user->socid > 0) $socid = $user->socid;
 //$isdraft = (($object->status == $object::STATUS_DRAFT) ? 1 : 0);
 //restrictedArea($user, $object->element, $object->id, $object->table_element, '', 'fk_soc', 'rowid', $isdraft);
-if (empty($conf->mymodule->enabled)) accessforbidden();
+if (!isModEnabled("mymodule")) {
+	accessforbidden();
+}
 if (!$permissiontoread) accessforbidden();
 
 
diff --git a/htdocs/modulebuilder/template/myobject_card.php b/htdocs/modulebuilder/template/myobject_card.php
index 18328de1f9d..7ecce8c745f 100644
--- a/htdocs/modulebuilder/template/myobject_card.php
+++ b/htdocs/modulebuilder/template/myobject_card.php
@@ -148,8 +148,12 @@ $upload_dir = $conf->mymodule->multidir_output[isset($object->entity) ? $object-
 //if ($user->socid > 0) $socid = $user->socid;
 //$isdraft = (isset($object->status) && ($object->status == $object::STATUS_DRAFT) ? 1 : 0);
 //restrictedArea($user, $object->element, $object->id, $object->table_element, '', 'fk_soc', 'rowid', $isdraft);
-if (empty($conf->mymodule->enabled)) accessforbidden();
-if (!$permissiontoread) accessforbidden();
+if (!isModEnabled("mymodule")) {
+	accessforbidden();
+}
+if (!$permissiontoread) {
+	accessforbidden();
+}
 
 
 /*
diff --git a/htdocs/modulebuilder/template/myobject_contact.php b/htdocs/modulebuilder/template/myobject_contact.php
index 9a365dd88f2..b0f7b5cfb30 100644
--- a/htdocs/modulebuilder/template/myobject_contact.php
+++ b/htdocs/modulebuilder/template/myobject_contact.php
@@ -94,7 +94,9 @@ if ($enablepermissioncheck) {
 //if ($user->socid > 0) $socid = $user->socid;
 //$isdraft = (($object->status == $object::STATUS_DRAFT) ? 1 : 0);
 //restrictedArea($user, $object->element, $object->id, $object->table_element, '', 'fk_soc', 'rowid', $isdraft);
-if (empty($conf->mymodule->enabled)) accessforbidden();
+if (!isModEnabled("mymodule")) {
+	accessforbidden();
+}
 if (!$permissiontoread) accessforbidden();
 
 
diff --git a/htdocs/modulebuilder/template/myobject_document.php b/htdocs/modulebuilder/template/myobject_document.php
index 173bea760a0..d06eb61ba0e 100644
--- a/htdocs/modulebuilder/template/myobject_document.php
+++ b/htdocs/modulebuilder/template/myobject_document.php
@@ -140,7 +140,9 @@ if ($enablepermissioncheck) {
 //if ($user->socid > 0) $socid = $user->socid;
 //$isdraft = (($object->status == $object::STATUS_DRAFT) ? 1 : 0);
 //restrictedArea($user, $object->element, $object->id, $object->table_element, '', 'fk_soc', 'rowid', $isdraft);
-if (empty($conf->mymodule->enabled)) accessforbidden();
+if (!isModEnabled("mymodule")) {
+	accessforbidden();
+}
 if (!$permissiontoread) accessforbidden();
 
 
diff --git a/htdocs/modulebuilder/template/myobject_list.php b/htdocs/modulebuilder/template/myobject_list.php
index ce7aa447c66..987b58f2369 100644
--- a/htdocs/modulebuilder/template/myobject_list.php
+++ b/htdocs/modulebuilder/template/myobject_list.php
@@ -199,7 +199,9 @@ if ($user->socid > 0) accessforbidden();
 //$socid = 0; if ($user->socid > 0) $socid = $user->socid;
 //$isdraft = (($object->status == $object::STATUS_DRAFT) ? 1 : 0);
 //restrictedArea($user, $object->element, 0, $object->table_element, '', 'fk_soc', 'rowid', $isdraft);
-if (empty($conf->mymodule->enabled)) accessforbidden('Module not enabled');
+if (!isModEnabled("mymodule")) {
+	accessforbidden();
+}
 if (!$permissiontoread) accessforbidden();
 
 
diff --git a/htdocs/modulebuilder/template/myobject_note.php b/htdocs/modulebuilder/template/myobject_note.php
index f38e703fa69..6b03ddbf8c6 100644
--- a/htdocs/modulebuilder/template/myobject_note.php
+++ b/htdocs/modulebuilder/template/myobject_note.php
@@ -120,7 +120,9 @@ if ($enablepermissioncheck) {
 //if ($user->socid > 0) $socid = $user->socid;
 //$isdraft = (($object->status == $object::STATUS_DRAFT) ? 1 : 0);
 //restrictedArea($user, $object->element, $object->id, $object->table_element, '', 'fk_soc', 'rowid', $isdraft);
-if (empty($conf->mymodule->enabled)) accessforbidden();
+if (!isModEnabled("mymodule")) {
+	accessforbidden();
+}
 if (!$permissiontoread) accessforbidden();
 
 
diff --git a/htdocs/datapolicy/public/index.php b/htdocs/public/datapolicy/index.php
similarity index 75%
rename from htdocs/datapolicy/public/index.php
rename to htdocs/public/datapolicy/index.php
index 104b393bf7e..79172f30efd 100644
--- a/htdocs/datapolicy/public/index.php
+++ b/htdocs/public/datapolicy/index.php
@@ -1,5 +1,4 @@
 <?php
-
 /* Copyright (C) 2018      Nicolas ZABOURI      <info@inovea-conseil.com>
  *
  * This program is free software: you can redistribute it and/or modify
@@ -19,15 +18,12 @@
 /**
  * \file    htdocs/datapolicy/admin/setup.php
  * \ingroup datapolicy
- * \brief   datapolicy setup page.
+ * \brief   Page to show the result of updating it Data policiy preferences after an email campaign using sendMailDataPolicyContact()
  */
 
 if (!defined('NOLOGIN')) {
 	define("NOLOGIN", 1); // This means this output page does not require to be logged.
 }
-if (!defined('NOCSRFCHECK')) {
-	define('NOCSRFCHECK', '1'); // Do not check anti CSRF attack test
-}
 if (!defined('NOREQUIREMENU')) {
 	define('NOREQUIREMENU', '1');
 }
@@ -38,89 +34,103 @@ 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.'/user/class/user.class.php';
 require_once DOL_DOCUMENT_ROOT.'/datapolicy/class/datapolicy.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/security.lib.php';
 
 $idc = GETPOST('c', 'int');
 $ids = GETPOST('s', 'int');
 $ida = GETPOST('a', 'int');
-$action = GETPOST('action', 'aZ09');
-$lang = GETPOST('l', 'alpha');
-$code = GETPOST('key', 'alpha');
+$action = GETPOST('action', 'aZ09');	// 1 or 2
+$l = GETPOST('l', 'alpha');
+$securitykey = GETPOST('key', 'alpha');
 
-$acc = "DATAPOLICIESACCEPT_".$lang;
-$ref = "DATAPOLICIESREFUSE_".$lang;
-$langs->load('datapolicy@datapolicy', 0, 0, $lang);
+$acc = "DATAPOLICIESACCEPT_".$l;
+$ref = "DATAPOLICIESREFUSE_".$l;
+$langs->load('datapolicy', 0, 0, $l);
+
+
+/*
+ * Actions
+ */
 
 if (empty($action) || (empty($idc) && empty($ids) && empty($ida))) {
+	print 'Missing paramater s, c or a';
 	return 0;
 } elseif (!empty($idc)) {
 	$contact = new Contact($db);
 	$contact->fetch($idc);
-	$check = md5($contact->email);
-	if ($check != $code) {
-		$return = $langs->trans('ErrorEmailDATAPOLICIES');
+	$check = dol_hash($contact->email, 'md5');
+	if ($check != $securitykey) {
+		$return = $langs->trans('Bad value for key.');
 	} elseif ($action == 1) {
 		$contact->array_options['options_datapolicy_consentement'] = 1;
 		$contact->array_options['options_datapolicy_opposition_traitement'] = 0;
 		$contact->array_options['options_datapolicy_opposition_prospection'] = 0;
-		$contact->array_options['options_datapolicy_date'] = date('Y-m-d', time());
+		$contact->array_options['options_datapolicy_date'] = dol_now();
 
-		$return = $conf->global->$acc;
+		$return = getDolGlobalString($acc);
 	} elseif ($action == 2) {
 		$contact->no_email = 1;
 		$contact->array_options['options_datapolicy_consentement'] = 0;
 		$contact->array_options['options_datapolicy_opposition_traitement'] = 1;
 		$contact->array_options['options_datapolicy_opposition_prospection'] = 1;
-		$contact->array_options['options_datapolicy_date'] = date('Y-m-d', time());
+		$contact->array_options['options_datapolicy_date'] = dol_now();
 
-		$return = $conf->global->$ref;
+		$return = getDolGlobalString($ref);
 	}
 	$contact->update($idc);
 } elseif (!empty($ids)) {
 	$societe = new Societe($db);
 	$societe->fetch($ids);
-	$check = md5($societe->email);
-	if ($check != $code) {
-		$return = $langs->trans('ErrorEmailDATAPOLICIES');
+	$check = dol_hash($societe->email, 'md5');
+	if ($check != $securitykey) {
+		$return = $langs->trans('Bad value for key.');
 	} elseif ($action == 1) {
 		$societe->array_options['options_datapolicy_consentement'] = 1;
 		$societe->array_options['options_datapolicy_opposition_traitement'] = 0;
 		$societe->array_options['options_datapolicy_opposition_prospection'] = 0;
-		$societe->array_options['options_datapolicy_date'] = date('Y-m-d', time());
-		$return = $conf->global->$acc;
+		$societe->array_options['options_datapolicy_date'] = dol_now();
+
+		$return = getDolGlobalString($acc);
 	} elseif ($action == 2) {
 		$societe->array_options['options_datapolicy_consentement'] = 0;
 		$societe->array_options['options_datapolicy_opposition_traitement'] = 1;
 		$societe->array_options['options_datapolicy_opposition_prospection'] = 1;
-		$societe->array_options['options_datapolicy_date'] = date('Y-m-d', time());
+		$societe->array_options['options_datapolicy_date'] = dol_now();
 
-		$return = $conf->global->$ref;
+		$return = getDolGlobalString($ref);
 	}
 	$societe->update($ids);
 } elseif (!empty($ida)) {
 	$adherent = new Adherent($db);
 	$adherent->fetch($ida);
-	$check = md5($adherent->email);
-	if ($check != $code) {
-		$return = $langs->trans('ErrorEmailDATAPOLICIES');
+	$check = dol_hash($adherent->email, 'md5');
+	if ($check != $securitykey) {
+		$return = $langs->trans('Bad value for key.');
 	} elseif ($action == 1) {
 		$adherent->array_options['options_datapolicy_consentement'] = 1;
 		$adherent->array_options['options_datapolicy_opposition_traitement'] = 0;
 		$adherent->array_options['options_datapolicy_opposition_prospection'] = 0;
-		//$adherent->array_options['options_datapolicy_date'] = date('Y-m-d', time());
-		$return = $conf->global->$acc;
+		//$adherent->array_options['options_datapolicy_date'] = dol_now();
+
+		$return = getDolGlobalString($acc);
 	} elseif ($action == 2) {
 		$adherent->array_options['options_datapolicy_consentement'] = 0;
 		$adherent->array_options['options_datapolicy_opposition_traitement'] = 1;
 		$adherent->array_options['options_datapolicy_opposition_prospection'] = 1;
-		//$adherent->array_options['options_datapolicy_date'] = date('Y-m-d', time());
+		//$adherent->array_options['options_datapolicy_date'] = dol_now();
 
-		$return = $conf->global->$ref;
+		$return = getDolGlobalString($ref);
 	}
 	$newuser = new User($db);
 	$adherent->update($newuser);
 }
 
-header("Content-type: text/html; charset=".$conf->file->character_set_client);
+
+/*
+ * View
+ */
+
+top_httphead();
 
 print '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">';
 print "\n";

From e19e65d362ea339c309e2fe1b9e3ae9cb95d403a Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 8 Sep 2022 16:38:39 +0200
Subject: [PATCH 788/974] Fix phpunit

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

diff --git a/htdocs/user/class/user.class.php b/htdocs/user/class/user.class.php
index f521d10c936..12b2a52742d 100644
--- a/htdocs/user/class/user.class.php
+++ b/htdocs/user/class/user.class.php
@@ -750,7 +750,9 @@ class User extends CommonObject
 
 		// In $conf->modules, we have 'accounting', 'product', 'facture', ...
 		// In $user->rights, we have 'accounting', 'produit', 'facture', ...
-		//if ($a) { var_dump($module); var_dump($this->rights->$rightsPath); var_dump($conf->modules); }
+		//var_dump($module);
+		//var_dump($this->rights->$rightsPath);
+		//var_dump($conf->modules);
 		if (!in_array($module, $conf->modules)) {
 			return 0;
 		}

From f26e2652e61c0c5a735f3f3c749a35665eb8ba6f Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 8 Sep 2022 16:39:47 +0200
Subject: [PATCH 789/974] Debug

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

diff --git a/htdocs/datapolicy/lib/datapolicy.lib.php b/htdocs/datapolicy/lib/datapolicy.lib.php
index eb70736d27c..2f195bfc3ab 100644
--- a/htdocs/datapolicy/lib/datapolicy.lib.php
+++ b/htdocs/datapolicy/lib/datapolicy.lib.php
@@ -41,7 +41,7 @@ function datapolicyAdminPrepareHead()
 	$head[$h][2] = 'settings';
 	$h++;
 
-	if (!empty($conf->global->DATAPOLICY_ENABLE_EMAILS) || getDolGlobalInt('MAIN_FEATURES_LEVEL') >= 1) {
+	if (!empty($conf->global->DATAPOLICY_ENABLE_EMAILS) || getDolGlobalInt('MAIN_FEATURES_LEVEL') >= 2) {
 		$head[$h][0] = DOL_URL_ROOT."/datapolicy/admin/setupmail.php";
 		$head[$h][1] = $langs->trans("DATAPOLICYMail");
 		$head[$h][2] = 'emailing';

From 4d14c0850f1eb0b8ecdbbc99b4f6e608b22766d7 Mon Sep 17 00:00:00 2001
From: UT from dolibit <45215329+dolibit-ut@users.noreply.github.com>
Date: Thu, 8 Sep 2022 18:56:48 +0200
Subject: [PATCH 790/974] Update ChangeLog

- NEW: Add param *border* table for md theme  -  border instead of boder?

- start moving  CONFIG_OPTIONS  from  *For users:*  section to  *For developers or integrators:*
---
 ChangeLog | 48 ++++++++++++++++++++++++------------------------
 1 file changed, 24 insertions(+), 24 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 9a5513031e9..7a87f3fbc2d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -59,66 +59,60 @@ NEW: Add margin info in proposal and order list
 NEW: Add massaction "Edit Extrafield" for Product
 NEW: Add more fields to detect duplicate during import of thirdparties
 NEW: Add option to foce delivery on email for purchase order receipt to yes
-NEW: Add param boder table for md theme
+NEW: Add param border table for md theme
 NEW: Add param color button action
 NEW: Add possibility to create contract from invoice
 NEW: Add possibility with constant MAIN_LOGIN_BADCHARUNAUTHORIZED to define bad character unauthorized into login name
 NEW: Add private and public notes on tax files.
-NEW: Add status "Obsolete" to KM articles
 NEW: Add substitutions "user numbers"
 NEW: allow a ticket to be automatically marked as read when created from backend.
 NEW: allow cut&paste as real numeric value to excel
 NEW: A public form to send a message and create a lead is available
 NEW: automatically set totally received status in reception
 NEW: Auto set invoice paid when adding credit not and remain to pay is 0
-NEW: Availibility dictionnary has a new column unit and number
 NEW: Can change value of AWP during the inventory
 NEW: Can enter price with tax for predefined products on purchase objects
 NEW: Can filter on a thirdparty on product statistics
 NEW: Can removed doc templates from setup page of thirdparty
-NEW: Can set the parent company during the creation of thirdparty (action=add of societe/card.php)
 NEW: Can use ! to make a search that exclude a string
 NEW: Change in theme colors does not need to use the refresh button
 NEW: clean values and amount in FEC import
 NEW: const MAIL_MASS_ACTION_ADD_LAST_IF_MAIN_DOC_NOT_FOUND for mailing mass action
 NEW: Contact filter project list
 NEW: Create contract from invoice
-NEW: create third-party with contact if not found on public ticket
+NEW: Database: Can store the session into database (instead of beeing managed by PHP)
+NEW: Database: Some core tables are created only at module activation
 NEW: Default value for MAIN_SECURITY_CSRF_WITH_TOKEN is now 2 (GET are also protected agains CSRF attacks)
 NEW: deposit payment terms: add field into dictionary admin page to define default percentage of deposit. 
 NEW: Dictionaries - add possibility to manage countries in EEC
+NEW: Dictionaries - Availibility dictionnary has a new column unit and number
 NEW: Display errors in a message box after generating documents
-NEW: Display physical and virtual stock of the products when creating OF from a BOM
-NEW: Display product ref in "Object link" product tab for BOM
 NEW: Enhance the import. Can use 'auto' for the ref (import of orders)
 NEW: Events on Proposal to Return to Draft
 NEW: Page to list expense report payments
 NEW: JS inventory autocalc input
 NEW: language support for more emailing target selectors
 NEW: leave requests: add field into type dictionary to block request if balance is negative
-NEW: MAIN_MAIL_AUTOCOPY_TO can accept several email and special keys
-NEW: MAIN_SEARCH_CAT_OR_BY_DEFAULT const for search by category
 NEW: Mass action "Close shipments"
 NEW: Module BOM - Add tabs for nets Bom
 NEW: Module BOM - Add the possibility to add sub-BOMs to BOM
-NEW: Module Recruitment - Add a public page with all list of open job positions.
+NEW: Module Recruitment - Add a public page with list of all open job positions.
 NEW: Module Recruitment - Add a tab with list of application on the jobposition file.
-NEW: Module Website - supports now the multicompany module
 NEW: More mode for THEME_TOPMENU_DISABLE_IMAGE (2, 3, ...)
 NEW: Add option to move checkbox column as first column on Thirdparty list (only few screens)
-NEW: on redirect of page in website module, GET parameters are kept.
-NEW: optional display warning icons on ticket list
 NEW: payment conditions enabling semi-automatic deposit creation (Issue #18439)
 NEW: possibility to consume multiple batch
 NEW: Reverse movement product consumption
 NEW: Send email to the supplier order contact
 NEW: add permission to report time on timesheet
-NEW: SEPA XML - option to place payment Type Info at Credit transfer Transaction level
-NEW: Some core tables are created only at module activation
+NEW: Knowledge Management - Add status "Obsolete" to KM articles
 NEW: MRP - split consumption line on MO
+NEW: MRP - Display physical and virtual stock of the products when creating OF from a BOM
+NEW: MRP - Display product ref in "Object link" product tab for BOM
 NEW: Proposals - option update prices on proposal cloning
-NEW: stock filter in reassort lists
-NEW: stock limit in stock export CSV
+NEW: SEPA XML - option to place payment Type Info at Credit transfer Transaction level
+NEW: Stocks - stock filter in reassort lists
+NEW: Stocks - stock limit in stock export CSV
 NEW: Supplier order - Show ref supplier of reception in linked object block
 NEW: support user_modif in order
 NEW: Surveys - Show number of votes into the label of tab "Results" of a survey
@@ -128,20 +122,24 @@ NEW: TakePOS - show product reference
 NEW: TakePOS - add constant to hide categories
 NEW: TakePOS - add constant to show category description
 NEW: TakePOS - add constant to show only the products in stock
+NEW: Third-Parties - Add rules "customer accountancy code" is mandatory to validate invoice
+NEW: Third-Parties - Can set the parent company during the creation of thirdparty (action=add of societe/card.php)
+NEW: Tickets - create Third-party with contact if not found on public ticket
 NEW: Tickets - option to default check "notify tier at creation"
 NEW: Tickets - Trigger: allow to automatically send messages on new tickets
+NEW: Tickets - optional display warning icons on ticket list
+NEW: Websites Module - supports now the multicompany module
+NEW: Websites Module - on redirect of page in website module, GET parameters are kept.
 NEW: The backup tools has an "lowmemory" option for mysqldump on large database
 NEW: The 'reposition' class works on ajax constantonoff that make redirects
-NEW: Thirdparty - Add rules "customer accountancy code" is mandatory to validate invoice
 NEW: thumbnail field in product list
 NEW: total mark rate in list
 NEW: uncheck "send message" by default on a ticket when private messages has been checked
 NEW: VAT Report by month - Show detail by rate and also by code
-NEW: Can store the session into database (instead of beeing managed by PHP)
 NEW: Added MMK currency (Myanmar Kyat)
 NEW: On a form to send an email, we show all emails of contacts of object
 
- Modules
+ Modules state
 NEW: Module Partnership Management
 NEW: Module Event Organization Management
 
@@ -164,7 +162,7 @@ NEW: Creation of the function select_bom() used to display bom select list
 NEW: Add trigger and event on completely received status change
 NEW: Add utility function send backup by mail
 NEW: add WordPress OAuth to save a token (not SSO)
-NEW: A module can embed a sql script run at each Dolibarr upgrade
+NEW: A module can embed a SQL script run at each Dolibarr upgrade
 NEW: Add param to keep the robot=index meta tag on public pages
 NEW: Add method hintindex() in database handlers.
 NEW: add modifications for new function "$db->prefix()"
@@ -209,9 +207,11 @@ NEW: TakePOS - add hook doaction in TakePOS invoice
 
 Config Options:
 NEW: Add hidden option on contract PDF line to hide qty and price
-NEW: Option INVOICEREC_SET_AUTOFILL_DATE_START/END
-NEW: Option MAIL_MASS_ACTION_ADD_LAST_IF_MAIN_DOC_NOT_FOUND to send last document in mass mailing action
-
+NEW: Option  MAIL_MASS_ACTION_ADD_LAST_IF_MAIN_DOC_NOT_FOUND  to send last document in mass mailing action
+NEW: Option  MAIN_API_DEBUG  to save API logs into a file
+NEW: Option  MAIN_MAIL_AUTOCOPY_TO  can accept several email and special keys
+NEW: Option  MAIN_SEARCH_CAT_OR_BY_DEFAULT  const for search by category
+NEW: Option  INVOICEREC_SET_AUTOFILL_DATE_START/END
 
 WARNING:
 

From 043a48892705136e57ddaf45c63c259af3e8d4d4 Mon Sep 17 00:00:00 2001
From: UT from dolibit <45215329+dolibit-ut@users.noreply.github.com>
Date: Thu, 8 Sep 2022 19:17:11 +0200
Subject: [PATCH 791/974] Update agenda.php

add  $langs->loadLangs  'agenda'
---
 htdocs/societe/agenda.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/societe/agenda.php b/htdocs/societe/agenda.php
index c0525767527..3a4ca2df6f5 100644
--- a/htdocs/societe/agenda.php
+++ b/htdocs/societe/agenda.php
@@ -34,7 +34,7 @@ require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 
 // Load translation files required by the page
-$langs->loadLangs(array('bills', 'companies', 'orders', 'propal'));
+$langs->loadLangs(array('agenda', 'bills', 'companies', 'orders', 'propal'));
 
 
 if (GETPOST('actioncode', 'array')) {

From 34522910e8d69cbf10028cf7f12e9bb9255575d1 Mon Sep 17 00:00:00 2001
From: UT from dolibit <45215329+dolibit-ut@users.noreply.github.com>
Date: Thu, 8 Sep 2022 19:37:40 +0200
Subject: [PATCH 792/974] Update card.php

---
 htdocs/product/card.php | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/htdocs/product/card.php b/htdocs/product/card.php
index 17387e3948d..dd0a2cd75e0 100644
--- a/htdocs/product/card.php
+++ b/htdocs/product/card.php
@@ -44,19 +44,19 @@
 
 // Load Dolibarr environment
 require '../main.inc.php';
-require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/canvas.class.php';
-require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
-require_once DOL_DOCUMENT_ROOT.'/product/class/html.formproduct.class.php';
-require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/genericobject.class.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/product.lib.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/lib/company.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/product.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/modules/product/modules_product.class.php';
+require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
+require_once DOL_DOCUMENT_ROOT.'/product/class/html.formproduct.class.php';
+require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
 
-if (isModEnabled("propal")) {
+if (isModEnabled('propal')) {
 	require_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php';
 }
 if (isModEnabled('facture')) {
@@ -91,7 +91,7 @@ $mesg = ''; $error = 0; $errors = array();
 $refalreadyexists = 0;
 
 // Get parameters
-$id = GETPOST('id', 'int');
+$id  = GETPOST('id', 'int');
 $ref = (GETPOSTISSET('ref') ? GETPOST('ref', 'alpha') : null);
 $type = (GETPOSTISSET('type') ? GETPOST('type', 'int') : Product::TYPE_PRODUCT);
 $action = (GETPOST('action', 'alpha') ? GETPOST('action', 'alpha') : 'view');
@@ -184,7 +184,8 @@ if ($object->id > 0) {
 // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $hookmanager->initHooks(array('productcard', 'globalcard'));
 
-$usercanread = (($object->type == Product::TYPE_PRODUCT && $user->rights->produit->lire) || ($object->type == Product::TYPE_SERVICE && $user->rights->service->lire));
+// Permissions
+$usercanread   = (($object->type == Product::TYPE_PRODUCT && $user->rights->produit->lire) || ($object->type == Product::TYPE_SERVICE && $user->rights->service->lire));
 $usercancreate = (($object->type == Product::TYPE_PRODUCT && $user->rights->produit->creer) || ($object->type == Product::TYPE_SERVICE && $user->rights->service->creer));
 $usercandelete = (($object->type == Product::TYPE_PRODUCT && $user->rights->produit->supprimer) || ($object->type == Product::TYPE_SERVICE && $user->rights->service->supprimer));
 

From e6b5ef99a91bdbea4ead726b85591b046d53adc8 Mon Sep 17 00:00:00 2001
From: UT from dolibit <45215329+dolibit-ut@users.noreply.github.com>
Date: Thu, 8 Sep 2022 19:47:17 +0200
Subject: [PATCH 793/974] Update card.php

---
 htdocs/comm/action/card.php | 34 ++++++++++++++++++++--------------
 1 file changed, 20 insertions(+), 14 deletions(-)

diff --git a/htdocs/comm/action/card.php b/htdocs/comm/action/card.php
index 14654914dd5..30339f51310 100644
--- a/htdocs/comm/action/card.php
+++ b/htdocs/comm/action/card.php
@@ -25,31 +25,36 @@
  */
 
 /**
- *       \file       htdocs/comm/action/card.php
- *       \ingroup    agenda
- *       \brief      Page for event card
+ *    \file       htdocs/comm/action/card.php
+ *    \ingroup    agenda
+ *    \brief      Page for event card
  */
 
+
+// Load Dolibarr environment
 require '../../main.inc.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/agenda.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
-require_once DOL_DOCUMENT_ROOT.'/user/class/user.class.php';
-require_once DOL_DOCUMENT_ROOT.'/comm/action/class/cactioncomm.class.php';
-require_once DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php';
-require_once DOL_DOCUMENT_ROOT.'/comm/action/class/actioncommreminder.class.php';
+
+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/class/html.formactions.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
-require_once DOL_DOCUMENT_ROOT.'/core/class/html.form.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/agenda.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
+require_once DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php';
+require_once DOL_DOCUMENT_ROOT.'/comm/action/class/actioncommreminder.class.php';
+require_once DOL_DOCUMENT_ROOT.'/comm/action/class/cactioncomm.class.php';
+require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.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.formprojet.class.php';
-require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
-require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
+require_once DOL_DOCUMENT_ROOT.'/user/class/user.class.php';
+
 
 // Load translation files required by the page
 $langs->loadLangs(array("companies", "other", "commercial", "bills", "orders", "agenda", "mails"));
 
+// Get Parameters
 $action = GETPOST('action', 'aZ09');
 $cancel = GETPOST('cancel', 'alpha');
 $backtopage = GETPOST('backtopage', 'alpha');
@@ -96,6 +101,7 @@ if ($user->socid) {
 $error = GETPOST("error");
 $donotclearsession = GETPOST('donotclearsession') ?GETPOST('donotclearsession') : 0;
 
+// Initialize Objects
 $object = new ActionComm($db);
 $cactioncomm = new CActionComm($db);
 $contact = new Contact($db);

From b1ff726e9c5590b8df91eaaefa4de2f20a7df324 Mon Sep 17 00:00:00 2001
From: UT from dolibit <45215329+dolibit-ut@users.noreply.github.com>
Date: Thu, 8 Sep 2022 19:55:11 +0200
Subject: [PATCH 794/974] Update mo_card.php

---
 htdocs/mrp/mo_card.php | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/htdocs/mrp/mo_card.php b/htdocs/mrp/mo_card.php
index 5d06f8c0f52..cda6088a982 100644
--- a/htdocs/mrp/mo_card.php
+++ b/htdocs/mrp/mo_card.php
@@ -16,11 +16,12 @@
  */
 
 /**
- *   	\file       mo_card.php
- *		\ingroup    mrp
- *		\brief      Page to create/edit/view mo
+ *    \file       htdocs/mrp/mo_card.php
+ *    \ingroup    mrp
+ *    \brief      Page to create/edit/view MO Manufacturing Order
  */
 
+
 // Load Dolibarr environment
 require '../main.inc.php';
 
@@ -35,7 +36,8 @@ require_once DOL_DOCUMENT_ROOT.'/bom/lib/bom.lib.php';
 
 
 // Load translation files required by the page
-$langs->loadLangs(array("mrp", "other"));
+$langs->loadLangs(array('mrp', 'other'));
+
 
 // Get parameters
 $id = GETPOST('id', 'int');
@@ -97,6 +99,7 @@ if (GETPOST('fk_bom', 'int') > 0) {
 $isdraft = (($object->status == $object::STATUS_DRAFT) ? 1 : 0);
 $result = restrictedArea($user, 'mrp', $object->id, 'mrp_mo', '', 'fk_soc', 'rowid', $isdraft);
 
+// Permissions
 $permissionnote = $user->rights->mrp->write; // Used by the include of actions_setnotes.inc.php
 $permissiondellink = $user->rights->mrp->write; // Used by the include of actions_dellink.inc.php
 $permissiontoadd = $user->rights->mrp->write; // Used by the include of actions_addupdatedelete.inc.php and actions_lineupdown.inc.php

From 376825b3dd433c15643ceba11b7600ff22929e36 Mon Sep 17 00:00:00 2001
From: UT from dolibit <45215329+dolibit-ut@users.noreply.github.com>
Date: Thu, 8 Sep 2022 20:12:52 +0200
Subject: [PATCH 795/974] Update pay.php

---
 htdocs/takepos/pay.php | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/htdocs/takepos/pay.php b/htdocs/takepos/pay.php
index 7b5d4aea6b5..81d6d5d13d9 100644
--- a/htdocs/takepos/pay.php
+++ b/htdocs/takepos/pay.php
@@ -22,10 +22,11 @@
  *	\brief      Page with the content of the popup to enter payments
  */
 
-//if (! defined('NOREQUIREUSER'))	define('NOREQUIREUSER', '1');	// Not disabled cause need to load personalized language
-//if (! defined('NOREQUIREDB'))		define('NOREQUIREDB', '1');		// Not disabled cause need to load personalized language
-//if (! defined('NOREQUIRESOC'))		define('NOREQUIRESOC', '1');
-//if (! defined('NOREQUIRETRAN'))		define('NOREQUIRETRAN', '1');
+// if (! defined('NOREQUIREUSER'))		define('NOREQUIREUSER', '1');		// Not disabled cause need to load personalized language
+// if (! defined('NOREQUIREDB'))		define('NOREQUIREDB', '1');			// Not disabled cause need to load personalized language
+// if (! defined('NOREQUIRESOC'))		define('NOREQUIRESOC', '1');
+// if (! defined('NOREQUIRETRAN'))		define('NOREQUIRETRAN', '1');
+
 if (!defined('NOCSRFCHECK')) {
 	define('NOCSRFCHECK', '1');
 }
@@ -39,11 +40,15 @@ if (!defined('NOREQUIREHTML')) {
 	define('NOREQUIREHTML', '1');
 }
 
-require '../main.inc.php'; // Load $user and permissions
+// Load Dolibarr environment
+require '../main.inc.php';		// Load $user and permissions
+
+require_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
 require_once DOL_DOCUMENT_ROOT.'/stripe/class/stripe.class.php';
-require_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
 
+
+// Load translation files required by the page
 $langs->loadLangs(array("main", "bills", "cashdesk", "banks"));
 
 $place = (GETPOST('place', 'aZ09') ? GETPOST('place', 'aZ09') : '0'); // $place is id of table for Bar or Restaurant

From ec6d490c99c87fad31642a637add72eab34e62b3 Mon Sep 17 00:00:00 2001
From: UT from dolibit <45215329+dolibit-ut@users.noreply.github.com>
Date: Thu, 8 Sep 2022 20:16:22 +0200
Subject: [PATCH 796/974] Update invoice.php

---
 htdocs/takepos/invoice.php | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/htdocs/takepos/invoice.php b/htdocs/takepos/invoice.php
index 8659cc6ea52..f383b630275 100644
--- a/htdocs/takepos/invoice.php
+++ b/htdocs/takepos/invoice.php
@@ -18,15 +18,16 @@
  */
 
 /**
- *	\file       htdocs/takepos/invoice.php
- *	\ingroup    takepos
- *	\brief      Page to generate section with list of lines
+ *    \file       htdocs/takepos/invoice.php
+ *    \ingroup    takepos
+ *    \brief      Page to generate section with list of lines
  */
 
-// if (! defined('NOREQUIREUSER'))    define('NOREQUIREUSER', '1');    // Not disabled cause need to load personalized language
-// if (! defined('NOREQUIREDB'))        define('NOREQUIREDB', '1');        // Not disabled cause need to load personalized language
-// if (! defined('NOREQUIRESOC'))        define('NOREQUIRESOC', '1');
-// if (! defined('NOREQUIRETRAN'))        define('NOREQUIRETRAN', '1');
+// if (! defined('NOREQUIREUSER')) 		define('NOREQUIREUSER', '1'); 		// Not disabled cause need to load personalized language
+// if (! defined('NOREQUIREDB')) 		define('NOREQUIREDB', '1'); 		// Not disabled cause need to load personalized language
+// if (! defined('NOREQUIRESOC')) 		define('NOREQUIRESOC', '1');
+// if (! defined('NOREQUIRETRAN')) 		define('NOREQUIRETRAN', '1');
+
 if (!defined('NOCSRFCHECK')) {
 	define('NOCSRFCHECK', '1');
 }
@@ -43,13 +44,16 @@ if (!defined('NOREQUIREAJAX')) {
 	define('NOREQUIREAJAX', '1');
 }
 
+// Load Dolibarr environment
 if (!defined('INCLUDE_PHONEPAGE_FROM_PUBLIC_PAGE')) {
 	require '../main.inc.php';
 }
-require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
-require_once DOL_DOCUMENT_ROOT.'/compta/paiement/class/paiement.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.form.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
+require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
+require_once DOL_DOCUMENT_ROOT.'/compta/paiement/class/paiement.class.php';
+
+
 $hookmanager->initHooks(array('takeposinvoice'));
 
 global $mysoc;

From 3bd74e41884169e2369f996190cf72224b6eaa9a Mon Sep 17 00:00:00 2001
From: UT from dolibit <45215329+dolibit-ut@users.noreply.github.com>
Date: Thu, 8 Sep 2022 20:20:57 +0200
Subject: [PATCH 797/974] Update index.php

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

diff --git a/htdocs/takepos/index.php b/htdocs/takepos/index.php
index 410de2c330c..dd7eb27178f 100644
--- a/htdocs/takepos/index.php
+++ b/htdocs/takepos/index.php
@@ -18,15 +18,16 @@
  */
 
 /**
- *	\file       htdocs/takepos/index.php
- *	\ingroup    takepos
- *	\brief      Main TakePOS screen
+ *    \file       htdocs/takepos/index.php
+ *    \ingroup    takepos
+ *    \brief      Main TakePOS screen
  */
 
-//if (! defined('NOREQUIREUSER'))	define('NOREQUIREUSER','1');	// Not disabled cause need to load personalized language
-//if (! defined('NOREQUIREDB'))		define('NOREQUIREDB','1');		// Not disabled cause need to load personalized language
-//if (! defined('NOREQUIRESOC'))	define('NOREQUIRESOC','1');
-//if (! defined('NOREQUIRETRAN'))	define('NOREQUIRETRAN','1');
+// if (! defined('NOREQUIREUSER')) 		define('NOREQUIREUSER','1'); 		// Not disabled cause need to load personalized language
+// if (! defined('NOREQUIREDB')) 		define('NOREQUIREDB','1'); 			// Not disabled cause need to load personalized language
+// if (! defined('NOREQUIRESOC')) 		define('NOREQUIRESOC','1');
+// if (! defined('NOREQUIRETRAN')) 		define('NOREQUIRETRAN','1');
+
 if (!defined('NOCSRFCHECK')) {
 	define('NOCSRFCHECK', '1');
 }
@@ -43,14 +44,16 @@ if (!defined('NOREQUIREAJAX')) {
 	define('NOREQUIREAJAX', '1');
 }
 
+// Load Dolibarr environment
 require '../main.inc.php'; // Load $user and permissions
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.form.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
-require_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
-require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
-require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
+require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
+require_once DOL_DOCUMENT_ROOT.'/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');

From 854cf63a6aa10ef4a1c7fde79c2cafd2be7130b7 Mon Sep 17 00:00:00 2001
From: UT from dolibit <45215329+dolibit-ut@users.noreply.github.com>
Date: Thu, 8 Sep 2022 20:26:31 +0200
Subject: [PATCH 798/974] Update multicurrency_rate.php

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

diff --git a/htdocs/multicurrency/multicurrency_rate.php b/htdocs/multicurrency/multicurrency_rate.php
index 3f20476f72a..2cc729bb35d 100644
--- a/htdocs/multicurrency/multicurrency_rate.php
+++ b/htdocs/multicurrency/multicurrency_rate.php
@@ -23,15 +23,16 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 /**
- *  \file       htdocs/multicurrency/multicurrency_rate.php
- *  \ingroup    multicurrency
- *  \brief      Page to list multicurrency rate
+ *    \file       htdocs/multicurrency/multicurrency_rate.php
+ *    \ingroup    multicurrency
+ *    \brief      Page to list multicurrency rate
  */
 
+// Dolibarr Environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/multicurrency.lib.php';
@@ -39,6 +40,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/multicurrency.lib.php';
 // Load translation files required by the page
 $langs->loadLangs(array('multicurrency'));
 
+// Get Parameters
 $action				= GETPOST('action', 'alpha');
 $massaction			= GETPOST('massaction', 'alpha');
 $show_files			= GETPOST('show_files', 'int');

From 309dfe788f597ae70b544b00ddc377d7a0ec326c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20France?= <frederic.france@free.fr>
Date: Thu, 8 Sep 2022 20:32:18 +0200
Subject: [PATCH 799/974] clean code

---
 .../recruitmentcandidature_agenda.php         |  8 ++--
 .../recruitmentcandidature_card.php           |  8 ++--
 .../recruitmentcandidature_document.php       |  5 +--
 .../recruitmentcandidature_list.php           | 15 +++----
 .../recruitmentcandidature_note.php           |  9 ++--
 .../recruitmentjobposition_agenda.php         |  8 ++--
 .../recruitmentjobposition_applications.php   | 41 +++----------------
 .../recruitmentjobposition_card.php           |  6 +--
 .../recruitmentjobposition_list.php           |  3 --
 .../recruitmentjobposition_note.php           |  9 ++--
 htdocs/zapier/lib/zapier.lib.php              |  2 +-
 11 files changed, 38 insertions(+), 76 deletions(-)

diff --git a/htdocs/recruitment/recruitmentcandidature_agenda.php b/htdocs/recruitment/recruitmentcandidature_agenda.php
index 50a79a35872..2aeb51628a6 100644
--- a/htdocs/recruitment/recruitmentcandidature_agenda.php
+++ b/htdocs/recruitment/recruitmentcandidature_agenda.php
@@ -27,8 +27,8 @@ require_once '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
-dol_include_once('/recruitment/class/recruitmentcandidature.class.php');
-dol_include_once('/recruitment/lib/recruitment_recruitmentcandidature.lib.php');
+require_once DOL_DOCUMENT_ROOT.'/recruitment/class/recruitmentcandidature.class.php';
+require_once DOL_DOCUMENT_ROOT.'/recruitment/lib/recruitment_recruitmentcandidature.lib.php';
 
 
 // Load translation files required by the page
@@ -36,9 +36,9 @@ $langs->loadLangs(array("recruitment", "other"));
 
 // Get parameters
 $id = GETPOST('id', 'int');
-$ref        = GETPOST('ref', 'alpha');
+$ref = GETPOST('ref', 'alpha');
 $action = GETPOST('action', 'aZ09');
-$cancel     = GETPOST('cancel', 'aZ09');
+$cancel = GETPOST('cancel', 'aZ09');
 $backtopage = GETPOST('backtopage', 'alpha');
 
 if (GETPOST('actioncode', 'array')) {
diff --git a/htdocs/recruitment/recruitmentcandidature_card.php b/htdocs/recruitment/recruitmentcandidature_card.php
index f3d41f9de97..ca7e3c20e2c 100644
--- a/htdocs/recruitment/recruitmentcandidature_card.php
+++ b/htdocs/recruitment/recruitmentcandidature_card.php
@@ -36,14 +36,14 @@ $langs->loadLangs(array("recruitment", "other", "users"));
 
 // Get parameters
 $id = GETPOST('id', 'int');
-$ref        = GETPOST('ref', 'alpha');
+$ref = GETPOST('ref', 'alpha');
 $action = GETPOST('action', 'aZ09');
-$confirm    = GETPOST('confirm', 'alpha');
-$cancel     = GETPOST('cancel', 'aZ09');
+$confirm = GETPOST('confirm', 'alpha');
+$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 = GETPOST('lineid', 'int');
 
 // Initialize technical objects
 $object = new RecruitmentCandidature($db);
diff --git a/htdocs/recruitment/recruitmentcandidature_document.php b/htdocs/recruitment/recruitmentcandidature_document.php
index f72271a3105..3f08c770111 100644
--- a/htdocs/recruitment/recruitmentcandidature_document.php
+++ b/htdocs/recruitment/recruitmentcandidature_document.php
@@ -28,8 +28,8 @@ 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('/recruitment/class/recruitmentcandidature.class.php');
-dol_include_once('/recruitment/lib/recruitment_recruitmentcandidature.lib.php');
+require_once DOL_DOCUMENT_ROOT.'/recruitment/class/recruitmentcandidature.class.php';
+require_once DOL_DOCUMENT_ROOT.'/recruitment/lib/recruitment_recruitmentcandidature.lib.php';
 
 // Load translation files required by the page
 $langs->loadLangs(array("recruitment", "companies", "other", "mails"));
@@ -118,7 +118,6 @@ if ($object->id) {
 	}
 
 	// Object card
-	// ------------------------------------------------------------
 	$linkback = '<a href="'.dol_buildpath('/recruitment/recruitmentcandidature_list.php', 1).'?restore_lastsearch_values=1'.(!empty($socid) ? '&socid='.$socid : '').'">'.$langs->trans("BackToList").'</a>';
 
 	$morehtmlref = '<div class="refidno">';
diff --git a/htdocs/recruitment/recruitmentcandidature_list.php b/htdocs/recruitment/recruitmentcandidature_list.php
index 2b1126e838f..34b852574f6 100644
--- a/htdocs/recruitment/recruitmentcandidature_list.php
+++ b/htdocs/recruitment/recruitmentcandidature_list.php
@@ -31,25 +31,22 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/recruitment/class/recruitmentcandidature.class.php';
 require_once DOL_DOCUMENT_ROOT.'/recruitment/class/recruitmentjobposition.class.php';
 
-// for other modules
-//dol_include_once('/othermodule/class/otherobject.class.php');
-
 // Load translation files required by the page
 $langs->loadLangs(array("recruitment", "other"));
 
 $id = GETPOST('id', 'int');
 $ref = GETPOST('ref', 'alpha');
 
-$action     = GETPOST('action', 'aZ09') ?GETPOST('action', 'aZ09') : 'view'; // The action 'add', 'create', 'edit', 'update', 'view', ...
+$action = GETPOST('action', 'aZ09') ?GETPOST('action', 'aZ09') : 'view'; // The action 'add', 'create', 'edit', 'update', 'view', ...
 $massaction = GETPOST('massaction', 'alpha'); // The bulk action (combo box choice into lists)
 $show_files = GETPOST('show_files', 'int'); // Show files area generated by bulk actions ?
-$confirm    = GETPOST('confirm', 'alpha'); // Result of a confirmation
-$cancel     = GETPOST('cancel', 'alpha'); // We click on a Cancel button
-$toselect   = GETPOST('toselect', 'array'); // Array of ids of elements selected into a list
+$confirm = GETPOST('confirm', 'alpha'); // Result of a confirmation
+$cancel = GETPOST('cancel', 'alpha'); // We click on a Cancel button
+$toselect = GETPOST('toselect', 'array'); // Array of ids of elements selected into a list
 $contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : ((empty($id) && empty($ref)) ? 'recruitmentcandidaturelist' : 'recruitmentjobposition_candidature'); // To manage different context of search
 $backtopage = GETPOST('backtopage', 'alpha'); // Go back to a dedicated page
-$optioncss  = GETPOST('optioncss', 'aZ'); // Option for the css output (always '' except when 'print')
-$mode       = GETPOST('mode', 'aZ');
+$optioncss = GETPOST('optioncss', 'aZ'); // Option for the css output (always '' except when 'print')
+$mode = GETPOST('mode', 'aZ');
 
 // Load variable for pagination
 $limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
diff --git a/htdocs/recruitment/recruitmentcandidature_note.php b/htdocs/recruitment/recruitmentcandidature_note.php
index ccb6b2a60cc..543d7a66c10 100644
--- a/htdocs/recruitment/recruitmentcandidature_note.php
+++ b/htdocs/recruitment/recruitmentcandidature_note.php
@@ -24,17 +24,17 @@
 
 // Load Dolibarr environment
 require_once '../main.inc.php';
-dol_include_once('/recruitment/class/recruitmentcandidature.class.php');
-dol_include_once('/recruitment/lib/recruitment_recruitmentcandidature.lib.php');
+require_once DOL_DOCUMENT_ROOT.'/recruitment/class/recruitmentcandidature.class.php';
+require_once DOL_DOCUMENT_ROOT.'/recruitment/lib/recruitment_recruitmentcandidature.lib.php';
 
 // Load translation files required by the page
 $langs->loadLangs(array("recruitment", "companies"));
 
 // Get parameters
 $id = GETPOST('id', 'int');
-$ref        = GETPOST('ref', 'alpha');
+$ref = GETPOST('ref', 'alpha');
 $action = GETPOST('action', 'aZ09');
-$cancel     = GETPOST('cancel', 'aZ09');
+$cancel = GETPOST('cancel', 'aZ09');
 $backtopage = GETPOST('backtopage', 'alpha');
 
 // Initialize technical objects
@@ -139,7 +139,6 @@ if ($id > 0 || !empty($ref)) {
 
 	dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
 
-
 	print '<div class="fichecenter">';
 	print '<div class="underbanner clearboth"></div>';
 
diff --git a/htdocs/recruitment/recruitmentjobposition_agenda.php b/htdocs/recruitment/recruitmentjobposition_agenda.php
index 11e54486bfe..38adf67acc1 100644
--- a/htdocs/recruitment/recruitmentjobposition_agenda.php
+++ b/htdocs/recruitment/recruitmentjobposition_agenda.php
@@ -27,8 +27,8 @@ require_once '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
-dol_include_once('/recruitment/class/recruitmentjobposition.class.php');
-dol_include_once('/recruitment/lib/recruitment_recruitmentjobposition.lib.php');
+require_once DOL_DOCUMENT_ROOT.'/recruitment/class/recruitmentjobposition.class.php';
+require_once DOL_DOCUMENT_ROOT.'/recruitment/lib/recruitment_recruitmentjobposition.lib.php';
 
 
 // Load translation files required by the page
@@ -36,9 +36,9 @@ $langs->loadLangs(array("recruitment", "other"));
 
 // Get parameters
 $id = GETPOST('id', 'int');
-$ref        = GETPOST('ref', 'alpha');
+$ref = GETPOST('ref', 'alpha');
 $action = GETPOST('action', 'aZ09');
-$cancel     = GETPOST('cancel', 'aZ09');
+$cancel = GETPOST('cancel', 'aZ09');
 $backtopage = GETPOST('backtopage', 'alpha');
 
 if (GETPOST('actioncode', 'array')) {
diff --git a/htdocs/recruitment/recruitmentjobposition_applications.php b/htdocs/recruitment/recruitmentjobposition_applications.php
index 6a7d471046e..3cdca44c93e 100644
--- a/htdocs/recruitment/recruitmentjobposition_applications.php
+++ b/htdocs/recruitment/recruitmentjobposition_applications.php
@@ -22,52 +22,23 @@
  */
 
 // 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_once '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php';
 require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
-dol_include_once('/recruitment/class/recruitmentjobposition.class.php');
-dol_include_once('/recruitment/lib/recruitment_recruitmentjobposition.lib.php');
+require_once DOL_DOCUMENT_ROOT.'/recruitment/class/recruitmentjobposition.class.php';
+require_once DOL_DOCUMENT_ROOT.'/recruitment/lib/recruitment_recruitmentjobposition.lib.php';
 
 // Load translation files required by the page
 $langs->loadLangs(array("recruitment", "other"));
 
 // Get parameters
 $id = GETPOST('id', 'int');
-$ref        = GETPOST('ref', 'alpha');
+$ref = GETPOST('ref', 'alpha');
 $action = GETPOST('action', 'aZ09');
-$confirm    = GETPOST('confirm', 'alpha');
-$cancel     = GETPOST('cancel', 'aZ09');
+$confirm = GETPOST('confirm', 'alpha');
+$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');
diff --git a/htdocs/recruitment/recruitmentjobposition_card.php b/htdocs/recruitment/recruitmentjobposition_card.php
index cf41a06f954..bdae11bdc60 100644
--- a/htdocs/recruitment/recruitmentjobposition_card.php
+++ b/htdocs/recruitment/recruitmentjobposition_card.php
@@ -37,12 +37,12 @@ $langs->loadLangs(array("recruitment", "other"));
 $id = GETPOST('id', 'int');
 $ref = GETPOST('ref', 'alpha');
 $action = GETPOST('action', 'aZ09');
-$confirm    = GETPOST('confirm', 'alpha');
-$cancel     = GETPOST('cancel', 'aZ09');
+$confirm = GETPOST('confirm', 'alpha');
+$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 = GETPOST('lineid', 'int');
 
 // Initialize technical objects
 $object = new RecruitmentJobPosition($db);
diff --git a/htdocs/recruitment/recruitmentjobposition_list.php b/htdocs/recruitment/recruitmentjobposition_list.php
index 5435a5a2ac2..5b1bee43e56 100644
--- a/htdocs/recruitment/recruitmentjobposition_list.php
+++ b/htdocs/recruitment/recruitmentjobposition_list.php
@@ -29,9 +29,6 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/recruitment/class/recruitmentjobposition.class.php';
 
-// for other modules
-//dol_include_once('/othermodule/class/otherobject.class.php');
-
 // Load translation files required by the page
 $langs->loadLangs(array("recruitment", "other"));
 
diff --git a/htdocs/recruitment/recruitmentjobposition_note.php b/htdocs/recruitment/recruitmentjobposition_note.php
index bbcced5326a..dcda5b53109 100644
--- a/htdocs/recruitment/recruitmentjobposition_note.php
+++ b/htdocs/recruitment/recruitmentjobposition_note.php
@@ -24,17 +24,17 @@
 
 // Load Dolibarr environment
 require_once '../main.inc.php';
-dol_include_once('/recruitment/class/recruitmentjobposition.class.php');
-dol_include_once('/recruitment/lib/recruitment_recruitmentjobposition.lib.php');
+require_once DOL_DOCUMENT_ROOT.'/recruitment/class/recruitmentjobposition.class.php';
+require_once DOL_DOCUMENT_ROOT.'/recruitment/lib/recruitment_recruitmentjobposition.lib.php';
 
 // Load translation files required by the page
 $langs->loadLangs(array("recruitment", "companies"));
 
 // Get parameters
 $id = GETPOST('id', 'int');
-$ref        = GETPOST('ref', 'alpha');
+$ref = GETPOST('ref', 'alpha');
 $action = GETPOST('action', 'aZ09');
-$cancel     = GETPOST('cancel', 'aZ09');
+$cancel = GETPOST('cancel', 'aZ09');
 $backtopage = GETPOST('backtopage', 'alpha');
 
 // Initialize technical objects
@@ -97,7 +97,6 @@ if ($id > 0 || !empty($ref)) {
 	print dol_get_fiche_head($head, 'note', $langs->trans("RecruitmentJobPosition"), -1, $object->picto);
 
 	// Object card
-	// ------------------------------------------------------------
 	$linkback = '<a href="'.dol_buildpath('/recruitment/recruitmentjobposition_list.php', 1).'?restore_lastsearch_values=1'.(!empty($socid) ? '&socid='.$socid : '').'">'.$langs->trans("BackToList").'</a>';
 
 	$morehtmlref = '<div class="refidno">';
diff --git a/htdocs/zapier/lib/zapier.lib.php b/htdocs/zapier/lib/zapier.lib.php
index e483ebd9229..dedec01ac71 100644
--- a/htdocs/zapier/lib/zapier.lib.php
+++ b/htdocs/zapier/lib/zapier.lib.php
@@ -52,7 +52,7 @@ function zapierAdminPrepareHead()
 	//$this->tabs = array(
 	//	'entity:-tabname:Title:@zapier:/zapier/mypage.php?id=__ID__'
 	//); // to remove a tab
-	complete_head_from_modules($conf, $langs, $object, $head, $h, 'zapier');
+	complete_head_from_modules($conf, $langs, null, $head, $h, 'zapier');
 
 	return $head;
 }

From 32f5642156c53c5ae9c4cb501abbd24e4f4d1b20 Mon Sep 17 00:00:00 2001
From: UT from dolibit <45215329+dolibit-ut@users.noreply.github.com>
Date: Thu, 8 Sep 2022 20:43:26 +0200
Subject: [PATCH 800/974] Update transfer.php

---
 htdocs/compta/bank/transfer.php | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/htdocs/compta/bank/transfer.php b/htdocs/compta/bank/transfer.php
index ff38abb32d4..cb3f04d5126 100644
--- a/htdocs/compta/bank/transfer.php
+++ b/htdocs/compta/bank/transfer.php
@@ -22,17 +22,21 @@
  */
 
 /**
- *		\file       htdocs/compta/bank/transfer.php
- *		\ingroup    banque
- *		\brief      Page de saisie d'un virement
+ *    \file       htdocs/compta/bank/transfer.php
+ *    \ingroup    bank
+ *    \brief      Page for entering a bank transfer
  */
 
+
+// Load Dolibarr environment
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/bank.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
 
 // Load translation files required by the page
-$langs->loadLangs(array("banks", "categories", "multicurrency"));
+$langs->loadLangs(array('banks', 'categories', 'multicurrency'));
+
+
 $socid = 0;
 if ($user->socid > 0) {
 	$socid = $user->socid;

From af6308799cf252f61805fc28ea57265c77f5e9c3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Thu, 8 Sep 2022 20:48:05 +0200
Subject: [PATCH 801/974] Update ticket.class.php

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

diff --git a/htdocs/ticket/class/ticket.class.php b/htdocs/ticket/class/ticket.class.php
index 18cdf5e1067..9d19e5d95c6 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-2020 Frédéric France     <frederic.france@netlogic.fr>
+ * Copyright (C) 2019-2022 Frédéric France     <frederic.france@netlogic.fr>
  * Copyright (C) 2020      Laurent Destailleur <eldy@users.sourceforge.net>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -108,7 +108,8 @@ class Ticket extends CommonObject
 
 	/**
 	 * @var int  Ticket statut
-	 * @deprecated
+	 * @deprecated use status
+	 * @see $status
 	 */
 	public $fk_statut;
 
@@ -217,7 +218,9 @@ class Ticket extends CommonObject
 	 */
 	public $oldcopy;
 
-
+	/**
+	 * @var array array of TicketsLine
+	 */
 	public $lines;
 
 
@@ -3013,7 +3016,7 @@ class TicketsLine
 {
 	/**
 	 * @var int ID
-	 * @deprecated
+	 * @deprecated use id
 	 */
 	public $rowid;
 

From 31c8dce167b9d985c0f6fb43aa7d311018bdef0f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Thu, 8 Sep 2022 20:51:12 +0200
Subject: [PATCH 802/974] Update agenda.php

---
 htdocs/ticket/agenda.php | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/htdocs/ticket/agenda.php b/htdocs/ticket/agenda.php
index a79d30bb377..5f7263f5214 100644
--- a/htdocs/ticket/agenda.php
+++ b/htdocs/ticket/agenda.php
@@ -41,12 +41,12 @@ $track_id = GETPOST('track_id', 'alpha', 3);
 $socid    = GETPOST('socid', 'int');
 $action   = GETPOST('action', 'aZ09');
 
-$limit     = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page  = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
-$page  = is_numeric($page) ? $page : 0;
-$page  = $page == -1 ? 0 : $page;
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+$page = is_numeric($page) ? $page : 0;
+$page = $page == -1 ? 0 : $page;
 if (!$sortfield) {
 	$sortfield = "a.datep,a.id";
 }
@@ -90,7 +90,7 @@ if ($user->socid > 0 && ($object->fk_soc != $user->socid)) {
 	accessforbidden();
 }
 // or for unauthorized internals users
-if (!$user->socid && ($conf->global->TICKET_LIMIT_VIEW_ASSIGNED_ONLY && $object->fk_user_assign != $user->id) && !$user->rights->ticket->manage) {
+if (!$user->socid && (!empty($conf->global->TICKET_LIMIT_VIEW_ASSIGNED_ONLY) && $object->fk_user_assign != $user->id) && !$user->rights->ticket->manage) {
 	accessforbidden();
 }
 
@@ -146,7 +146,7 @@ if ($socid > 0) {
 	print dol_get_fiche_end();
 }
 
-if (!$user->socid && $conf->global->TICKET_LIMIT_VIEW_ASSIGNED_ONLY) {
+if (!$user->socid && !empty($conf->global->TICKET_LIMIT_VIEW_ASSIGNED_ONLY)) {
 	$object->next_prev_filter = "te.fk_user_assign = '".$user->id."'";
 } elseif ($user->socid > 0) {
 	$object->next_prev_filter = "te.fk_soc = '".$user->socid."'";
@@ -244,12 +244,12 @@ if (!empty($object->id)) {
 	$morehtmlright .= dolGetButtonTitle($langs->trans('MessageListViewType'), '', 'fa fa-bars imgforviewmode', $messagingUrl, '', 1, array('morecss'=>'btnTitleSelected'));
 
 	// Show link to add a message (if read and not closed)
-	$btnstatus = $object->fk_statut < Ticket::STATUS_CLOSED && $action != "presend" && $action != "presend_addmessage";
+	$btnstatus = $object->status < Ticket::STATUS_CLOSED && $action != "presend" && $action != "presend_addmessage";
 	$url = 'card.php?track_id='.$object->track_id.'&action=presend_addmessage&mode=init';
 	$morehtmlright .= dolGetButtonTitle($langs->trans('TicketAddMessage'), '', 'fa fa-comment-dots', $url, 'add-new-ticket-title-button', $btnstatus);
 
 	// Show link to add event (if read and not closed)
-	$btnstatus = $object->fk_statut < Ticket::STATUS_CLOSED && $action != "presend" && $action != "presend_addmessage";
+	$btnstatus = $object->status < Ticket::STATUS_CLOSED && $action != "presend" && $action != "presend_addmessage";
 	$url = DOL_URL_ROOT.'/comm/action/card.php?action=create&datep='.date('YmdHi').'&origin=ticket&originid='.$object->id.'&projectid='.$object->fk_project.'&backtopage='.urlencode($_SERVER["PHP_SELF"].'?id='.$object->id);
 	$morehtmlright .= dolGetButtonTitle($langs->trans('AddAction'), '', 'fa fa-plus-circle', $url, 'add-new-ticket-even-button', $btnstatus);
 

From 1a3ff13808622cf97d72a6f1631fafdfef2a2aa9 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 8 Sep 2022 20:52:33 +0200
Subject: [PATCH 803/974] FIX Restore the option MAIN_OPTIMIZEFORTEXTBROWSER

---
 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 accbd84ba8c..367a4eb087e 100644
--- a/htdocs/core/lib/usergroups.lib.php
+++ b/htdocs/core/lib/usergroups.lib.php
@@ -906,7 +906,7 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
 	}
 
 	// Use MAIN_OPTIMIZEFORTEXTBROWSER
-	if ($foruserprofile && !empty($fuser->conf->MAIN_OPTIMIZEFORTEXTBROWSER)) {
+	if ($foruserprofile) {
 		//$default=yn($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER);
 		$default = $langs->trans('No');
 		print '<tr class="oddeven">';

From 64beee3396d9978ef4483163bb150224e42de903 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 8 Sep 2022 22:04:29 +0200
Subject: [PATCH 804/974] FIX the shipment PDF was using the full size logo
 instead of small

---
 .../modules/expedition/doc/pdf_espadon.modules.php     | 10 +++++++++-
 .../core/modules/expedition/doc/pdf_merou.modules.php  | 10 +++++++++-
 .../core/modules/expedition/doc/pdf_rouget.modules.php | 10 +++++++++-
 3 files changed, 27 insertions(+), 3 deletions(-)

diff --git a/htdocs/core/modules/expedition/doc/pdf_espadon.modules.php b/htdocs/core/modules/expedition/doc/pdf_espadon.modules.php
index 39df041bb51..5280c2b7a1e 100644
--- a/htdocs/core/modules/expedition/doc/pdf_espadon.modules.php
+++ b/htdocs/core/modules/expedition/doc/pdf_espadon.modules.php
@@ -969,8 +969,16 @@ class pdf_espadon extends ModelePdfExpedition
 		$pdf->SetXY($this->marge_gauche, $posy);
 
 		// Logo
-		$logo = $conf->mycompany->dir_output.'/logos/'.$this->emetteur->logo;
 		if ($this->emetteur->logo) {
+			$logodir = $conf->mycompany->dir_output;
+			if (!empty($conf->mycompany->multidir_output[$object->entity])) {
+				$logodir = $conf->mycompany->multidir_output[$object->entity];
+			}
+			if (empty($conf->global->MAIN_PDF_USE_LARGE_LOGO)) {
+				$logo = $logodir.'/logos/thumbs/'.$this->emetteur->logo_small;
+			} else {
+				$logo = $logodir.'/logos/'.$this->emetteur->logo;
+			}
 			if (is_readable($logo)) {
 				$height = pdf_getHeightForLogo($logo);
 				$pdf->Image($logo, $this->marge_gauche, $posy, 0, $height); // width=0 (auto)
diff --git a/htdocs/core/modules/expedition/doc/pdf_merou.modules.php b/htdocs/core/modules/expedition/doc/pdf_merou.modules.php
index 9a905422ff1..3646ef515de 100644
--- a/htdocs/core/modules/expedition/doc/pdf_merou.modules.php
+++ b/htdocs/core/modules/expedition/doc/pdf_merou.modules.php
@@ -548,8 +548,16 @@ class pdf_merou extends ModelePdfExpedition
 
 		//*********************LOGO****************************
 		$pdf->SetXY(11, 7);
-		$logo = $conf->mycompany->dir_output.'/logos/'.$this->emetteur->logo;
 		if ($this->emetteur->logo) {
+			$logodir = $conf->mycompany->dir_output;
+			if (!empty($conf->mycompany->multidir_output[$object->entity])) {
+				$logodir = $conf->mycompany->multidir_output[$object->entity];
+			}
+			if (empty($conf->global->MAIN_PDF_USE_LARGE_LOGO)) {
+				$logo = $logodir.'/logos/thumbs/'.$this->emetteur->logo_small;
+			} else {
+				$logo = $logodir.'/logos/'.$this->emetteur->logo;
+			}
 			if (is_readable($logo)) {
 				$height = pdf_getHeightForLogo($logo);
 				$pdf->Image($logo, 10, 5, 0, $height); // width=0 (auto)
diff --git a/htdocs/core/modules/expedition/doc/pdf_rouget.modules.php b/htdocs/core/modules/expedition/doc/pdf_rouget.modules.php
index eededb90d67..b2bacffa901 100644
--- a/htdocs/core/modules/expedition/doc/pdf_rouget.modules.php
+++ b/htdocs/core/modules/expedition/doc/pdf_rouget.modules.php
@@ -914,8 +914,16 @@ class pdf_rouget extends ModelePdfExpedition
 		$pdf->SetXY($this->marge_gauche, $posy);
 
 		// Logo
-		$logo = $conf->mycompany->dir_output.'/logos/'.$this->emetteur->logo;
 		if ($this->emetteur->logo) {
+			$logodir = $conf->mycompany->dir_output;
+			if (!empty($conf->mycompany->multidir_output[$object->entity])) {
+				$logodir = $conf->mycompany->multidir_output[$object->entity];
+			}
+			if (empty($conf->global->MAIN_PDF_USE_LARGE_LOGO)) {
+				$logo = $logodir.'/logos/thumbs/'.$this->emetteur->logo_small;
+			} else {
+				$logo = $logodir.'/logos/'.$this->emetteur->logo;
+			}
 			if (is_readable($logo)) {
 				$height = pdf_getHeightForLogo($logo);
 				$pdf->Image($logo, $this->marge_gauche, $posy, 0, $height); // width=0 (auto)

From 36b798e9a81986b16b432f05ee1366925274b459 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 8 Sep 2022 22:16:31 +0200
Subject: [PATCH 805/974] Fix responsive

---
 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 2d81c5e0545..9b55ff46c14 100644
--- a/htdocs/expedition/list.php
+++ b/htdocs/expedition/list.php
@@ -658,7 +658,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);
+	print $form->selectarray("search_shipping_method_id", $shipment->meths, $search_shipping_method_id, 1, 0, 0, "", 1, 0, 0, '', 'maxwidth150');
 	print "</td>\n";
 }
 // Tracking number
@@ -904,7 +904,7 @@ while ($i < min($num, $limit)) {
 	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');
-		print '<td class="center">';
+		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));
 		print '</td>';
 	}

From 25199fd9c627855da164b5d276ac143cae176614 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 8 Sep 2022 23:49:25 +0200
Subject: [PATCH 806/974] Code comment

---
 htdocs/admin/mails_templates.php | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/htdocs/admin/mails_templates.php b/htdocs/admin/mails_templates.php
index 0c12ba1a3a0..dc46561b1f8 100644
--- a/htdocs/admin/mails_templates.php
+++ b/htdocs/admin/mails_templates.php
@@ -1060,21 +1060,29 @@ if ($num) {
 							print '<strong>'.$form->textwithpicto($langs->trans("FilesAttachedToEmail"), $tabhelp[$id][$tmpfieldlist], 1, 'help', '', 0, 2, $tmpfieldlist).'</strong> ';
 							print '<input type="text" class="flat maxwidth50" name="'.$tmpfieldlist.'-'.$rowid.'" value="'.(!empty($obj->{$tmpfieldlist}) ? $obj->{$tmpfieldlist} : '').'">';
 						}
+
+						// If $acceptlocallinktomedia is true, we can add link  media files int email templates (we already can do this into HTML editor of an email).
+						// Note that local link to a file into medias are replaced with a real link by email in CMailFile.class.php with value $urlwithroot defined like this:
+						// $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
+						$acceptlocallinktomedia = true;	// TODO Set it to true only if $urlwithroot is a HTTPS link ?
+
 						if ($tmpfieldlist == 'content') {
 							print $form->textwithpicto($langs->trans("Content"), $tabhelp[$id][$tmpfieldlist], 1, 'help', '', 0, 2, $tmpfieldlist).'<br>';
 							$okforextended = true;
 							if (empty($conf->global->FCKEDITOR_ENABLE_MAIL)) {
 								$okforextended = false;
 							}
-							$doleditor = new DolEditor($tmpfieldlist.'-'.$rowid, (!empty($obj->{$tmpfieldlist}) ? $obj->{$tmpfieldlist} : ''), '', 500, 'dolibarr_mailings', 'In', 0, true, $okforextended, ROWS_6, '90%');
+							$doleditor = new DolEditor($tmpfieldlist.'-'.$rowid, (!empty($obj->{$tmpfieldlist}) ? $obj->{$tmpfieldlist} : ''), '', 500, 'dolibarr_mailings', 'In', 0, $acceptlocallinktomedia, $okforextended, ROWS_6, '90%');
 							print $doleditor->Create(1);
 						}
 						if ($tmpfieldlist == 'content_lines') {
 							print $form->textwithpicto($langs->trans("ContentForLines"), $tabhelp[$id][$tmpfieldlist], 1, 'help', '', 0, 2, $tmpfieldlist).'<br>';
 							$okforextended = true;
-							if (empty($conf->global->FCKEDITOR_ENABLE_MAIL))
+							if (empty($conf->global->FCKEDITOR_ENABLE_MAIL)) {
 								$okforextended = false;
-							$doleditor = new DolEditor($tmpfieldlist.'-'.$rowid, (! empty($obj->{$tmpfieldlist}) ? $obj->{$tmpfieldlist} : ''), '', 140, 'dolibarr_mailings', 'In', 0, false, $okforextended, ROWS_6, '90%');
+							}
+							$doleditor = new DolEditor($tmpfieldlist.'-'.$rowid, (! empty($obj->{$tmpfieldlist}) ? $obj->{$tmpfieldlist} : ''), '', 140, 'dolibarr_mailings', 'In', 0, $acceptlocallinktomedia, $okforextended, ROWS_6, '90%');
 							print $doleditor->Create(1);
 						}
 						print '</td>';

From a87fbd3f06c3edf0c138ffd924bcbdd656bad10e Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 8 Sep 2022 23:58:38 +0200
Subject: [PATCH 807/974] Bad type

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

diff --git a/htdocs/core/class/doleditor.class.php b/htdocs/core/class/doleditor.class.php
index 2be0c36c56c..4402ff51732 100644
--- a/htdocs/core/class/doleditor.class.php
+++ b/htdocs/core/class/doleditor.class.php
@@ -68,7 +68,7 @@ class DolEditor
 	 *  @param	int		$readonly						0=Read/Edit, 1=Read only
 	 *  @param	array	$poscursor						Array for initial cursor position array('x'=>x, 'y'=>y)
 	 */
-	public function __construct($htmlname, $content, $width = '', $height = 200, $toolbarname = 'Basic', $toolbarlocation = 'In', $toolbarstartexpanded = false, $uselocalbrowser = true, $okforextendededitor = true, $rows = 0, $cols = 0, $readonly = 0, $poscursor = array())
+	public function __construct($htmlname, $content, $width = '', $height = 200, $toolbarname = 'Basic', $toolbarlocation = 'In', $toolbarstartexpanded = false, $uselocalbrowser = 1, $okforextendededitor = true, $rows = 0, $cols = 0, $readonly = 0, $poscursor = array())
 	{
 		global $conf, $langs;
 

From e03d2311c39d37e893f54b38c46e73d87fd9b788 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 9 Sep 2022 00:08:20 +0200
Subject: [PATCH 808/974] Accept media links if public url is not private

---
 htdocs/admin/mails_templates.php | 30 +++++++++++++++++++++++++++++-
 1 file changed, 29 insertions(+), 1 deletion(-)

diff --git a/htdocs/admin/mails_templates.php b/htdocs/admin/mails_templates.php
index dc46561b1f8..58a694726bc 100644
--- a/htdocs/admin/mails_templates.php
+++ b/htdocs/admin/mails_templates.php
@@ -1065,7 +1065,35 @@ if ($num) {
 						// Note that local link to a file into medias are replaced with a real link by email in CMailFile.class.php with value $urlwithroot defined like this:
 						// $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
-						$acceptlocallinktomedia = true;	// TODO Set it to true only if $urlwithroot is a HTTPS link ?
+						$acceptlocallinktomedia = getDolGlobalInt('MAIN_DISALLOW_MEDIAS_IN_EMAIL_TEMPLATES') ? 0 : 1;
+						if ($acceptlocallinktomedia) {
+							global $dolibarr_main_url_root;
+							$urlwithouturlroot = preg_replace('/'.preg_quote(DOL_URL_ROOT, '/').'$/i', '', trim($dolibarr_main_url_root));
+
+							// Parse $newUrl
+							$newUrlArray = parse_url($urlwithouturlroot);
+							$hosttocheck = $newUrlArray['host'];
+							$hosttocheck = str_replace(array('[', ']'), '', $hosttocheck); // Remove brackets of IPv6
+
+							if (function_exists('gethostbyname')) {
+								$iptocheck = gethostbyname($hosttocheck);
+							} else {
+								$iptocheck = $hosttocheck;
+							}
+
+							//var_dump($iptocheck.' '.$acceptlocallinktomedia);
+							if (!filter_var($iptocheck, FILTER_VALIDATE_IP, FILTER_FLAG_NO_PRIV_RANGE | FILTER_FLAG_NO_RES_RANGE)) {
+								// If ip of public url is an private network IP, we do not allow this.
+								$acceptlocallinktomedia = 0;
+								// TODO Show a warning
+							}
+
+							if (preg_match('/http:/i', $urlwithouturlroot)) {
+								// If public url is not a https, we do not allow to add medias link. It will generate security alerts when email will be sent.
+								$acceptlocallinktomedia = 0;
+								// TODO Show a warning
+							}
+						}
 
 						if ($tmpfieldlist == 'content') {
 							print $form->textwithpicto($langs->trans("Content"), $tabhelp[$id][$tmpfieldlist], 1, 'help', '', 0, 2, $tmpfieldlist).'<br>';

From fa64be5e82ef7093985f5c88aafeb3580c4a5404 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 9 Sep 2022 00:29:45 +0200
Subject: [PATCH 809/974] Fix wrong number of td

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

diff --git a/htdocs/compta/resultat/clientfourn.php b/htdocs/compta/resultat/clientfourn.php
index 936adb482d2..915fa4de771 100644
--- a/htdocs/compta/resultat/clientfourn.php
+++ b/htdocs/compta/resultat/clientfourn.php
@@ -1520,15 +1520,17 @@ $hookmanager->initHooks(array('externalbalance'));
 $reshook = $hookmanager->executeHooks('addBalanceLine', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
 print $hookmanager->resPrint;
 
+
+
 // Total
 print '<tr>';
-print '<td colspan="4">&nbsp;</td>';
+print '<td colspan="'.($modecompta == 'BOOKKEEPING' ? 3 : 4).'">&nbsp;</td>';
 print '</tr>';
 
 print '<tr class="liste_total"><td class="left" colspan="2">'.$langs->trans("Income").'</td>';
 if ($modecompta == 'CREANCES-DETTES') {
 	print '<td class="liste_total right">'.price(price2num($total_ht_income, 'MT')).'</td>';
-} else {
+} elseif ($modecompta == 'RECETTES-DEPENSES') {
 	print '<td></td>';
 }
 print '<td class="liste_total right">'.price(price2num($total_ttc_income, 'MT')).'</td>';
@@ -1536,7 +1538,7 @@ print '</tr>';
 print '<tr class="liste_total"><td class="left" colspan="2">'.$langs->trans("Outcome").'</td>';
 if ($modecompta == 'CREANCES-DETTES') {
 	print '<td class="liste_total right">'.price(price2num(-$total_ht_outcome, 'MT')).'</td>';
-} else {
+} elseif ($modecompta == 'RECETTES-DEPENSES') {
 	print '<td></td>';
 }
 print '<td class="liste_total right">'.price(price2num(-$total_ttc_outcome, 'MT')).'</td>';
@@ -1544,7 +1546,7 @@ print '</tr>';
 print '<tr class="liste_total"><td class="left" colspan="2">'.$langs->trans("Profit").'</td>';
 if ($modecompta == 'CREANCES-DETTES') {
 	print '<td class="liste_total right">'.price(price2num($total_ht, 'MT')).'</td>';
-} else {
+} elseif ($modecompta == 'RECETTES-DEPENSES') {
 	print '<td></td>';
 }
 print '<td class="liste_total right">'.price(price2num($total_ttc, 'MT')).'</td>';

From c5d5a963cb377f55bc95b5e2a4125f205965dfce Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 9 Sep 2022 00:38:16 +0200
Subject: [PATCH 810/974] Fix preselected country

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

diff --git a/htdocs/accountancy/admin/categories_list.php b/htdocs/accountancy/admin/categories_list.php
index ea613ea38cd..aca2854df7f 100644
--- a/htdocs/accountancy/admin/categories_list.php
+++ b/htdocs/accountancy/admin/categories_list.php
@@ -885,9 +885,11 @@ function fieldListAccountingCategories($fieldlist, $obj = '', $tabname = '', $co
 			$fieldname = 'country';
 			if ($context == 'add') {
 				$fieldname = 'country_id';
-				print $form->select_country(GETPOST('country_id', 'int'), $fieldname, '', 28, 'maxwidth200 maxwidthonsmartphone');
+				$preselectcountrycode = GETPOSTISSET('country_id') ? GETPOST('country_id', 'int') : $mysoc->country_code;
+				print $form->select_country($preselectcountrycode, $fieldname, '', 28, 'maxwidth200 maxwidthonsmartphone');
 			} else {
-				print $form->select_country((!empty($obj->country_code) ? $obj->country_code : (!empty($obj->country) ? $obj->country : $mysoc->country_code)), $fieldname, '', 28, 'maxwidth200 maxwidthonsmartphone');
+				$preselectcountrycode = (empty($obj->country_code) ? (empty($obj->country) ? $mysoc->country_code : $obj->country) : $obj->country_code);
+				print $form->select_country($preselectcountrycode, $fieldname, '', 28, 'maxwidth200 maxwidthonsmartphone');
 			}
 			print '</td>';
 		} elseif ($fieldlist[$field] == 'country_id') {

From 5341c7a4a18cb7f12d376e4666c1ecfb1e9ffb53 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 9 Sep 2022 01:36:58 +0200
Subject: [PATCH 811/974] Fix sql error

---
 htdocs/compta/resultat/clientfourn.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/htdocs/compta/resultat/clientfourn.php b/htdocs/compta/resultat/clientfourn.php
index 915fa4de771..2c9d467ddc2 100644
--- a/htdocs/compta/resultat/clientfourn.php
+++ b/htdocs/compta/resultat/clientfourn.php
@@ -1062,7 +1062,11 @@ if ($modecompta == 'BOOKKEEPING') {
 				$sql .= " AND $column >= '".$db->idate($date_start)."' AND $column <= '".$db->idate($date_end)."'";
 			}
 
-			$sql .= " GROUP BY u.rowid, p.rowid, p.ref, u.firstname, u.lastname, dm";
+			if ($modecompta == 'CREANCES-DETTES') {
+				//No need of GROUP BY
+			} else {
+				$sql .= " GROUP BY u.rowid, p.rowid, p.ref, u.firstname, u.lastname, dm";
+			}
 			$newsortfield = $sortfield;
 			if ($newsortfield == 's.nom, s.rowid') {
 				$newsortfield = 'p.ref';

From c505b6618aad8c7551357c8addf051753cbadcd0 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 9 Sep 2022 01:42:43 +0200
Subject: [PATCH 812/974] Fix type

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

diff --git a/htdocs/core/class/doleditor.class.php b/htdocs/core/class/doleditor.class.php
index b529d23ebda..e5b7512895c 100644
--- a/htdocs/core/class/doleditor.class.php
+++ b/htdocs/core/class/doleditor.class.php
@@ -68,7 +68,7 @@ class DolEditor
 	 *  @param	int		$readonly						0=Read/Edit, 1=Read only
 	 *  @param	array	$poscursor						Array for initial cursor position array('x'=>x, 'y'=>y)
 	 */
-	public function __construct($htmlname, $content, $width = '', $height = 200, $toolbarname = 'Basic', $toolbarlocation = 'In', $toolbarstartexpanded = false, $uselocalbrowser = true, $okforextendededitor = true, $rows = 0, $cols = 0, $readonly = 0, $poscursor = array())
+	public function __construct($htmlname, $content, $width = '', $height = 200, $toolbarname = 'Basic', $toolbarlocation = 'In', $toolbarstartexpanded = false, $uselocalbrowser = 1, $okforextendededitor = true, $rows = 0, $cols = 0, $readonly = 0, $poscursor = array())
 	{
 		global $conf, $langs;
 

From 9a09e0f304b21af390ba8e7a632b2a94844369ed Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 9 Sep 2022 02:26:45 +0200
Subject: [PATCH 813/974] Merge SEPA payment using Stripe manually.

---
 htdocs/compta/facture/prelevement.php |  24 ++-
 htdocs/langs/en_US/withdrawals.lang   |   1 +
 htdocs/stripe/class/stripe.class.php  | 251 +++++++++++++-------------
 3 files changed, 149 insertions(+), 127 deletions(-)

diff --git a/htdocs/compta/facture/prelevement.php b/htdocs/compta/facture/prelevement.php
index 5a10c2055c0..8bd2a02ce57 100644
--- a/htdocs/compta/facture/prelevement.php
+++ b/htdocs/compta/facture/prelevement.php
@@ -111,8 +111,14 @@ if (empty($reshook)) {
 				$sourcetype = 'supplier_invoice';
 				$newtype = 'bank-transfer';
 			}
+			$paymentservice = GETPOST('paymentservice');
+
+			if (preg_match('/stripesepa/', $paymentservice)) {
+				$result = $object->demande_prelevement_stripe($user, price2num(GETPOST('withdraw_request_amount', 'alpha')), $newtype, $sourcetype);
+			} else {
+				$result = $object->demande_prelevement($user, price2num(GETPOST('withdraw_request_amount', 'alpha')), $newtype, $sourcetype);
+			}
 
-			$result = $object->demande_prelevement($user, price2num(GETPOST('withdraw_request_amount', 'alpha')), $newtype, $sourcetype);
 			if ($result > 0) {
 				$db->commit();
 
@@ -736,6 +742,22 @@ if ($object->id > 0) {
 				print '<input type="text" id="withdraw_request_amount" name="withdraw_request_amount" value="'.$remaintopaylesspendingdebit.'" size="9" />';
 				print '<input type="submit" class="butAction" value="'.$buttonlabel.'" />';
 				print '</form>';
+
+				if (!empty($conf->global->STRIPE_SEPA_DIRECT_DEBIT)) {
+					print "<br>";
+					//add stripe sepa button
+					$buttonlabel = $langs->trans("MakeWithdrawRequestStripe");
+					print '<form method="POST" action="">';
+					print '<input type="hidden" name="token" value="'.newToken().'" />';
+					print '<input type="hidden" name="id" value="'.$object->id.'" />';
+					print '<input type="hidden" name="type" value="'.$type.'" />';
+					print '<input type="hidden" name="action" value="new" />';
+					print '<input type="hidden" name="paymenservice" value="stripesepa" />';
+					print '<label for="withdraw_request_amount">'.$langs->trans('BankTransferAmount').' </label>';
+					print '<input type="text" id="withdraw_request_amount" name="withdraw_request_amount" value="'.$remaintopaylesspendingdebit.'" size="9" />';
+					print '<input type="submit" class="butAction" value="'.$buttonlabel.'" />';
+					print '</form>';
+				}
 			} else {
 				print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NotEnoughPermissions")).'">'.$buttonlabel.'</a>';
 			}
diff --git a/htdocs/langs/en_US/withdrawals.lang b/htdocs/langs/en_US/withdrawals.lang
index c7820a965aa..c2d9a042ece 100644
--- a/htdocs/langs/en_US/withdrawals.lang
+++ b/htdocs/langs/en_US/withdrawals.lang
@@ -42,6 +42,7 @@ CreditTransferStatistics=Credit transfer statistics
 Rejects=Rejects
 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
diff --git a/htdocs/stripe/class/stripe.class.php b/htdocs/stripe/class/stripe.class.php
index 6410050c642..ea453b28412 100644
--- a/htdocs/stripe/class/stripe.class.php
+++ b/htdocs/stripe/class/stripe.class.php
@@ -434,8 +434,10 @@ class Stripe extends CommonObject
 
 			// list of payment method types
 			$paymentmethodtypes = array("card");
+			$descriptor = dol_trunc($tag, 10, 'right', 'UTF-8', 1);
 			if (!empty($conf->global->STRIPE_SEPA_DIRECT_DEBIT)) {
 				$paymentmethodtypes[] = "sepa_debit"; //&& ($object->thirdparty->isInEEC())
+				//$descriptor = preg_replace('/ref=[^:=]+/', '', $descriptor);	// Clean ref
 			}
 			if (!empty($conf->global->STRIPE_KLARNA)) {
 				$paymentmethodtypes[] = "klarna";
@@ -463,7 +465,8 @@ class Stripe extends CommonObject
 				"currency" => $currency_code,
 				"payment_method_types" => $paymentmethodtypes,
 				"description" => $description,
-				"statement_descriptor_suffix" => dol_trunc($tag, 10, 'right', 'UTF-8', 1), // 22 chars that appears on bank receipt (company + description)
+				"statement_descriptor_suffix" => $descriptor, // For card payment, 22 chars that appears on bank receipt (prefix into stripe setup + this suffix)
+				"statement_descriptor" => $descriptor, // For SEPA, it will take only statement_descriptor, not statement_descriptor_suffix
 				//"save_payment_method" => true,
 				"setup_future_usage" => "on_session",
 				"metadata" => $metadata
@@ -589,131 +592,6 @@ class Stripe extends CommonObject
 		}
 	}
 
-	/**
-		 * Get the Stripe SEPA of a company payment mode
-		 *
-		 * @param	\Stripe\StripeCustomer	$cu								Object stripe customer.
-		 * @param	CompanyPaymentMode		$object							Object companypaymentmode to check, or create on stripe (create on stripe also update the societe_rib table for current entity)
-		 * @param	string					$stripeacc						''=Use common API. If not '', it is the Stripe connect account 'acc_....' to use Stripe connect
-		 * @param	int						$status							Status (0=test, 1=live)
-		 * @param	int						$createifnotlinkedtostripe		1=Create the stripe sepa and the link if the sepa is not yet linked to a stripe sepa. Deprecated with new Stripe API and SCA.
-		 * @return 	\Stripe\PaymentMethod|null 			Stripe SEPA or null if not found
-		 */
-	public function sepaStripe($cu, CompanyPaymentMode $object, $stripeacc = '', $status = 0, $createifnotlinkedtostripe = 0)
-	{
-		global $conf, $user, $langs;
-		$sepa = null;
-
-		$sql = "SELECT sa.stripe_card_ref, sa.proprio, sa.iban_prefix"; // stripe_card_ref is src_ for sepa
-		$sql .= " FROM ".MAIN_DB_PREFIX."societe_rib as sa";
-		$sql .= " WHERE sa.rowid = '".$this->db->escape($object->id)."'"; // We get record from ID, no need for filter on entity
-		$sql .= " AND sa.type = 'ban'"; //type ban to get normal bank account of customer (prelevement)
-
-		$soc = new Societe($this->db);
-		$soc->fetch($object->fk_soc);
-
-		dol_syslog(get_class($this)."::fetch search stripe sepa(card) id for paymentmode id=".$object->id.", stripeacc=".$stripeacc.", status=".$status.", createifnotlinkedtostripe=".$createifnotlinkedtostripe, LOG_DEBUG);
-		$resql = $this->db->query($sql);
-		if ($resql) {
-			$num = $this->db->num_rows($resql);
-			if ($num) {
-				$obj = $this->db->fetch_object($resql);
-				$cardref = $obj->stripe_card_ref;
-				dol_syslog(get_class($this)."::cardStripe cardref=".$cardref);
-				if ($cardref) {
-					try {
-						if (empty($stripeacc)) {				// If the Stripe connect account not set, we use common API usage
-							if (!preg_match('/^pm_/', $cardref) && !empty($cu->sources)) {
-								$sepa = $cu->sources->retrieve($cardref);
-							} else {
-								$sepa = \Stripe\PaymentMethod::retrieve($cardref);
-							}
-						} else {
-							if (!preg_match('/^pm_/', $cardref) && !empty($cu->sources)) {
-								//$sepa = $cu->sources->retrieve($cardref, array("stripe_account" => $stripeacc));		// this API fails when array stripe_account is provided
-								$sepa = $cu->sources->retrieve($cardref);
-							} else {
-								//$sepa = \Stripe\PaymentMethod::retrieve($cardref, array("stripe_account" => $stripeacc));		// Don't know if this works
-								$sepa = \Stripe\PaymentMethod::retrieve($cardref);
-							}
-						}
-					} catch (Exception $e) {
-						$this->error = $e->getMessage();
-						dol_syslog($this->error, LOG_WARNING);
-					}
-				} elseif ($createifnotlinkedtostripe) {
-					$iban = $obj->iban_prefix; //prefix ?
-					$ipaddress = getUserRemoteIP();
-
-					$dataforcard = array(
-						'type'=>'sepa_debit',
-						"sepa_debit" => array('iban' => $iban),
-						'currency' => 'eur',
-						'usage' => 'reusable',
-						'owner' => array(
-							'name' => $soc->name,
-						),
-						"metadata" => array('dol_id'=>$object->id, 'dol_version'=>DOL_VERSION, 'dol_entity'=>$conf->entity, 'ipaddress'=>$ipaddress)
-					);
-
-					//$a = \Stripe\Stripe::getApiKey();
-					//var_dump($a);var_dump($stripeacc);exit;
-					try {
-						dol_syslog("Try to create sepa_debit 0");
-
-						$service = 'StripeTest';
-						$servicestatus = 0;
-						if (!empty($conf->global->STRIPE_LIVE) && !GETPOST('forcesandbox', 'alpha')) {
-							$service = 'StripeLive';
-							$servicestatus = 1;
-						}
-						// Force to use the correct API key
-						global $stripearrayofkeysbyenv;
-						$stripeacc = $stripearrayofkeysbyenv[$servicestatus]['secret_key'];
-
-						dol_syslog("Try to create sepa_debit with data = ".json_encode($dataforcard));
-						$s = new \Stripe\StripeClient($stripeacc);
-						$sepa = $s->sources->create($dataforcard);
-						if (!$sepa) {
-							$this->error = 'Creation of sepa_debit on Stripe has failed';
-						} else {
-							//association du client avec cette source de paimeent
-							$cs = $cu->createSource(
-								$cu->id,
-								[
-								'source' => $sepa->id,
-								]
-							);
-							if (!$cs) {
-								$this->error = 'Link SEPA <-> Customer failed';
-							} else {
-								dol_syslog("Try to create sepa_debit 3");
-								// print json_encode($sepa);
-
-								$sql = "UPDATE ".MAIN_DB_PREFIX."societe_rib";
-								$sql .= " SET stripe_card_ref = '".$this->db->escape($sepa->id)."', card_type = 'sepa_debit',";
-								$sql .= " stripe_account= '" . $this->db->escape($cu->id . "@" . $stripeacc) . "'";
-								$sql .= " WHERE rowid = '".$this->db->escape($object->id)."'";
-								$sql .= " AND type = 'ban'";
-								$resql = $this->db->query($sql);
-								if (!$resql) {
-									$this->error = $this->db->lasterror();
-								}
-							}
-						}
-					} catch (Exception $e) {
-						$this->error = $e->getMessage();
-						dol_syslog($this->error, LOG_WARNING);
-					}
-				}
-			}
-		} else {
-			dol_print_error($this->db);
-		}
-
-		return $sepa;
-	}
-
 	/**
 	 * Get the Stripe payment intent. Create it with confirmnow=false
 	 * Warning. If a payment was tried and failed, a payment intent was created.
@@ -1012,6 +890,127 @@ class Stripe extends CommonObject
 		return $card;
 	}
 
+
+	/**
+	 * Get the Stripe SEPA of a company payment mode
+	 *
+	 * @param	\Stripe\StripeCustomer	$cu								Object stripe customer.
+	 * @param	CompanyPaymentMode		$object							Object companypaymentmode to check, or create on stripe (create on stripe also update the societe_rib table for current entity)
+	 * @param	string					$stripeacc						''=Use common API. If not '', it is the Stripe connect account 'acc_....' to use Stripe connect
+	 * @param	int						$status							Status (0=test, 1=live)
+	 * @param	int						$createifnotlinkedtostripe		1=Create the stripe sepa and the link if the sepa is not yet linked to a stripe sepa. Deprecated with new Stripe API and SCA.
+	 * @return 	\Stripe\PaymentMethod|null 			Stripe SEPA or null if not found
+	 */
+	public function sepaStripe($cu, CompanyPaymentMode $object, $stripeacc = '', $status = 0, $createifnotlinkedtostripe = 0)
+	{
+		global $conf, $user, $langs;
+		$sepa = null;
+
+		$sql = "SELECT sa.stripe_card_ref, sa.proprio, sa.iban_prefix"; // stripe_card_ref is src_ for sepa
+		$sql .= " FROM ".MAIN_DB_PREFIX."societe_rib as sa";
+		$sql .= " WHERE sa.rowid = '".$this->db->escape($object->id)."'"; // We get record from ID, no need for filter on entity
+		$sql .= " AND sa.type = 'ban'"; //type ban to get normal bank account of customer (prelevement)
+
+		$soc = new Societe($this->db);
+		$soc->fetch($object->fk_soc);
+
+		dol_syslog(get_class($this)."::fetch search stripe sepa(card) id for paymentmode id=".$object->id.", stripeacc=".$stripeacc.", status=".$status.", createifnotlinkedtostripe=".$createifnotlinkedtostripe, LOG_DEBUG);
+		$resql = $this->db->query($sql);
+		if ($resql) {
+			$num = $this->db->num_rows($resql);
+			if ($num) {
+				$obj = $this->db->fetch_object($resql);
+				$cardref = $obj->stripe_card_ref;
+				dol_syslog(get_class($this)."::cardStripe cardref=".$cardref);
+				if ($cardref) {
+					try {
+						if (empty($stripeacc)) {				// If the Stripe connect account not set, we use common API usage
+							if (!preg_match('/^pm_/', $cardref) && !empty($cu->sources)) {
+								$sepa = $cu->sources->retrieve($cardref);
+							} else {
+								$sepa = \Stripe\PaymentMethod::retrieve($cardref);
+							}
+						} else {
+							if (!preg_match('/^pm_/', $cardref) && !empty($cu->sources)) {
+								//$sepa = $cu->sources->retrieve($cardref, array("stripe_account" => $stripeacc));		// this API fails when array stripe_account is provided
+								$sepa = $cu->sources->retrieve($cardref);
+							} else {
+								//$sepa = \Stripe\PaymentMethod::retrieve($cardref, array("stripe_account" => $stripeacc));		// Don't know if this works
+								$sepa = \Stripe\PaymentMethod::retrieve($cardref);
+							}
+						}
+					} catch (Exception $e) {
+						$this->error = $e->getMessage();
+						dol_syslog($this->error, LOG_WARNING);
+					}
+				} elseif ($createifnotlinkedtostripe) {
+					$iban = $obj->iban_prefix; //prefix ?
+					$ipaddress = getUserRemoteIP();
+
+					$dataforcard = array(
+						'type'=>'sepa_debit',
+						"sepa_debit" => array('iban' => $iban),
+						'currency' => 'eur',
+						'usage' => 'reusable',
+						'owner' => array(
+							'name' => $soc->name,
+						),
+						"metadata" => array('dol_id'=>$object->id, 'dol_version'=>DOL_VERSION, 'dol_entity'=>$conf->entity, 'ipaddress'=>$ipaddress)
+					);
+
+					//$a = \Stripe\Stripe::getApiKey();
+					//var_dump($a);var_dump($stripeacc);exit;
+					try {
+						dol_syslog("Try to create sepa_debit 0");
+
+						$service = 'StripeTest';
+						$servicestatus = 0;
+						if (!empty($conf->global->STRIPE_LIVE) && !GETPOST('forcesandbox', 'alpha')) {
+							$service = 'StripeLive';
+							$servicestatus = 1;
+						}
+						// Force to use the correct API key
+						global $stripearrayofkeysbyenv;
+						$stripeacc = $stripearrayofkeysbyenv[$servicestatus]['secret_key'];
+
+						dol_syslog("Try to create sepa_debit with data = ".json_encode($dataforcard));
+						$s = new \Stripe\StripeClient($stripeacc);
+						$sepa = $s->sources->create($dataforcard);
+						if (!$sepa) {
+							$this->error = 'Creation of sepa_debit on Stripe has failed';
+						} else {
+							// association du client avec cette source de paimeent
+							$cs = $cu->createSource($cu->id, array('source' => $sepa->id));
+							if (!$cs) {
+								$this->error = 'Link SEPA <-> Customer failed';
+							} else {
+								dol_syslog("Try to create sepa_debit 3");
+								// print json_encode($sepa);
+
+								$sql = "UPDATE ".MAIN_DB_PREFIX."societe_rib";
+								$sql .= " SET stripe_card_ref = '".$this->db->escape($sepa->id)."', card_type = 'sepa_debit',";
+								$sql .= " stripe_account= '" . $this->db->escape($cu->id . "@" . $stripeacc) . "'";
+								$sql .= " WHERE rowid = '".$this->db->escape($object->id)."'";
+								$sql .= " AND type = 'ban'";
+								$resql = $this->db->query($sql);
+								if (!$resql) {
+									$this->error = $this->db->lasterror();
+								}
+							}
+						}
+					} catch (Exception $e) {
+						$this->error = $e->getMessage();
+						dol_syslog($this->error, LOG_WARNING);
+					}
+				}
+			}
+		} else {
+			dol_print_error($this->db);
+		}
+
+		return $sepa;
+	}
+
 	/**
 	 * Create charge.
 	 * This is called by page htdocs/stripe/payment.php and may be deprecated.

From 584f9e6a73117e3d652ff52c01271788ee158f87 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 9 Sep 2022 04:10:48 +0200
Subject: [PATCH 814/974] Clean code to manage SEPA payment using external
 service

---
 htdocs/core/class/commoninvoice.class.php     | 809 ++++++++++++++++++
 htdocs/langs/en_US/errors.lang                |   3 +-
 .../class/companybankaccount.class.php        |  10 +-
 htdocs/societe/paymentmodes.php               | 442 +++++++---
 htdocs/stripe/class/stripe.class.php          |   8 +-
 5 files changed, 1148 insertions(+), 124 deletions(-)

diff --git a/htdocs/core/class/commoninvoice.class.php b/htdocs/core/class/commoninvoice.class.php
index bed28c63035..190e3a3fc62 100644
--- a/htdocs/core/class/commoninvoice.class.php
+++ b/htdocs/core/class/commoninvoice.class.php
@@ -823,6 +823,815 @@ abstract class CommonInvoice extends CommonObject
 		}
 	}
 
+
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *	Create a withdrawal request for a direct debit order or a credit transfer order.
+	 *  Use the remain to pay excluding all existing open direct debit requests.
+	 *
+	 *	@param      User	$fuser      	User asking the direct debit transfer
+	 *  @param		float	$amount			Amount we request direct debit for
+	 *  @param		string	$type			'direct-debit' or 'bank-transfer'
+	 *  @param		string	$sourcetype		Source ('facture' or 'supplier_invoice')
+	 *	@return     int         			<0 if KO, >0 if OK
+	 */
+	public function demande_prelevement_stripe($fuser, $amount = 0, $type = 'direct-debit', $sourcetype = 'facture')
+	{
+		// phpcs:enable
+		global $conf, $mysoc, $user, $langs;
+
+		if (empty($conf->global->STRIPE_SEPA_DIRECT_DEBIT)) {
+			//exit
+			return 0;
+		}
+
+		$error = 0;
+
+		dol_syslog(get_class($this)."::demande_prelevement_stripe 0", LOG_DEBUG);
+
+		if ($this->statut > self::STATUS_DRAFT && $this->paye == 0) {
+			require_once DOL_DOCUMENT_ROOT.'/societe/class/companybankaccount.class.php';
+			$bac = new CompanyBankAccount($this->db);
+			$bac->fetch(0, $this->socid);
+
+			$sql = 'SELECT count(*)';
+			$sql .= ' FROM '.MAIN_DB_PREFIX.'prelevement_facture_demande';
+			$sql .= ' WHERE fk_facture = '.$this->id;
+			$sql .= ' AND ext_payment_id IS NULL'; // To exclude record done for some online payments
+			$sql .= ' AND traite = 0';
+
+			dol_syslog(get_class($this)."::demande_prelevement_stripe 1", LOG_DEBUG);
+			$resql = $this->db->query($sql);
+			if ($resql) {
+				$row = $this->db->fetch_row($resql);
+
+				if ($row[0] == 0) {
+					$now = dol_now();
+
+					$totalpaye = $this->getSommePaiement();
+					$totalcreditnotes = $this->getSumCreditNotesUsed();
+					$totaldeposits = $this->getSumDepositsUsed();
+					//print "totalpaye=".$totalpaye." totalcreditnotes=".$totalcreditnotes." totaldeposts=".$totaldeposits;
+
+					// 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($this->total_ttc,$totalpaye,$conf->global->MAIN_MAX_DECIMALS_TOT);
+					//$resteapayer=bcadd($resteapayer,$totalavoir,$conf->global->MAIN_MAX_DECIMALS_TOT);
+					if (empty($amount)) {
+						$amount = price2num($this->total_ttc - $totalpaye - $totalcreditnotes - $totaldeposits, 'MT');
+					}
+
+					if (is_numeric($amount) && $amount != 0) {
+						require_once DOL_DOCUMENT_ROOT.'/societe/class/companypaymentmode.class.php';
+						$companypaymentmode = new CompanyPaymentMode($this->db);
+						$companypaymentmode->fetch($bac->id);
+
+						dol_syslog(get_class($this)."::demande_prelevement_stripe amount=$amount, companypaymentmode = " . $companypaymentmode->id, LOG_DEBUG);
+
+						//Start code from sellyoursaas
+						$service = 'StripeTest';
+						$servicestatus = 0;
+						if (!empty($conf->global->STRIPE_LIVE) && !GETPOST('forcesandbox', 'alpha')) {
+							$service = 'StripeLive';
+							$servicestatus = 1;
+						}
+
+						$langs->load("agenda");
+						dol_syslog("doTakePaymentStripeForThirdparty service=" . $service . " servicestatus=" . $servicestatus . " thirdparty_id=" . $this->socid . " companypaymentmode=" . $companypaymentmode->id . " noemailtocustomeriferror=" . $noemailtocustomeriferror . " nocancelifpaymenterror=" . $nocancelifpaymenterror . " calledinmyaccountcontext=" . $calledinmyaccountcontext);
+
+						$this->stripechargedone = 0;
+						$this->stripechargeerror = 0;
+						$now = dol_now();
+
+						$currency = $conf->currency;
+
+						global $stripearrayofkeysbyenv;
+						global $savstripearrayofkeysbyenv;
+
+						$errorforinvoice = 0;     // We reset the $errorforinvoice at each invoice loop
+
+						$this->fetch_thirdparty();
+
+						dol_syslog("--- Process invoice thirdparty_id=" . $this->id . ", thirdparty_name=" . $this->thirdparty->name . " id=" . $this->id . ", ref=" . $this->ref . ", datef=" . dol_print_date($this->date, 'dayhourlog'), LOG_DEBUG);
+
+						$alreadypayed = $this->getSommePaiement();
+						$amount_credit_notes_included = $this->getSumCreditNotesUsed();
+						$amounttopay = $this->total_ttc - $alreadypayed - $amount_credit_notes_included;
+
+						// Correct the amount according to unit of currency
+						// See https://support.stripe.com/questions/which-zero-decimal-currencies-does-stripe-support
+						$arrayzerounitcurrency = ['BIF', 'CLP', 'DJF', 'GNF', 'JPY', 'KMF', 'KRW', 'MGA', 'PYG', 'RWF', 'VND', 'VUV', 'XAF', 'XOF', 'XPF'];
+						$amountstripe = $amounttopay;
+						if (!in_array($currency, $arrayzerounitcurrency)) {
+							$amountstripe = $amountstripe * 100;
+						}
+
+						if ($amountstripe > 0) {
+							try {
+								//var_dump($companypaymentmode);
+								dol_syslog("We will try to pay with companypaymentmodeid=" . $companypaymentmode->id . " stripe_card_ref=" . $companypaymentmode->stripe_card_ref . " mode=" . $companypaymentmode->status, LOG_DEBUG);
+
+								$thirdparty = new Societe($this->db);
+								$resultthirdparty = $thirdparty->fetch($this->socid);
+
+								include_once DOL_DOCUMENT_ROOT . '/stripe/class/stripe.class.php';        // This include the include of htdocs/stripe/config.php
+								// So it inits or erases the $stripearrayofkeysbyenv
+								$stripe = new Stripe($this->db);
+
+								if (empty($savstripearrayofkeysbyenv)) {
+									$savstripearrayofkeysbyenv = $stripearrayofkeysbyenv;
+								}
+								dol_syslog("Current Stripe environment is " . $stripearrayofkeysbyenv[$servicestatus]['publishable_key']);
+								dol_syslog("Current Saved Stripe environment is " . $savstripearrayofkeysbyenv[$servicestatus]['publishable_key']);
+
+								$foundalternativestripeaccount = '';
+
+								// Force stripe to another value (by default this value is empty)
+								if (!empty($thirdparty->array_options['options_stripeaccount'])) {
+									dol_syslog("The thirdparty id=" . $thirdparty->id . " has a dedicated Stripe Account, so we switch to it.");
+
+									$tmparray = explode('@', $thirdparty->array_options['options_stripeaccount']);
+									if (!empty($tmparray[1])) {
+										$tmparray2 = explode(':', $tmparray[1]);
+										if (!empty($tmparray2[3])) {
+											$stripearrayofkeysbyenv = [
+												0 => [
+													"publishable_key" => $tmparray2[0],
+													"secret_key" => $tmparray2[1]
+												],
+												1 => [
+													"publishable_key" => $tmparray2[2],
+													"secret_key" => $tmparray2[3]
+												]
+											];
+
+											$stripearrayofkeys = $stripearrayofkeysbyenv[$servicestatus];
+											\Stripe\Stripe::setApiKey($stripearrayofkeys['secret_key']);
+
+											$foundalternativestripeaccount = $tmparray[0];    // Store the customer id
+
+											dol_syslog("We use now customer=" . $foundalternativestripeaccount . " publishable_key=" . $stripearrayofkeys['publishable_key'], LOG_DEBUG);
+										}
+									}
+
+									if (!$foundalternativestripeaccount) {
+										$stripearrayofkeysbyenv = $savstripearrayofkeysbyenv;
+
+										$stripearrayofkeys = $savstripearrayofkeysbyenv[$servicestatus];
+										\Stripe\Stripe::setApiKey($stripearrayofkeys['secret_key']);
+										dol_syslog("We found a bad value for Stripe Account for thirdparty id=" . $thirdparty->id . ", so we ignore it and keep using the global one, so " . $stripearrayofkeys['publishable_key'], LOG_WARNING);
+									}
+								} else {
+									$stripearrayofkeysbyenv = $savstripearrayofkeysbyenv;
+
+									$stripearrayofkeys = $savstripearrayofkeysbyenv[$servicestatus];
+									\Stripe\Stripe::setApiKey($stripearrayofkeys['secret_key']);
+									dol_syslog("The thirdparty id=" . $thirdparty->id . " has no dedicated Stripe Account, so we use global one, so " . json_encode($stripearrayofkeys), LOG_DEBUG);
+								}
+
+
+								dol_syslog("get stripe account", LOG_DEBUG);
+								$stripeacc = $stripe->getStripeAccount($service, $this->socid);								// Get Stripe OAuth connect account if it exists (no network access here)
+								dol_syslog("get stripe account return " . json_encode($stripeacc), LOG_DEBUG);
+
+								if ($foundalternativestripeaccount) {
+									if (empty($stripeacc)) {				// If the Stripe connect account not set, we use common API usage
+										$customer = \Stripe\Customer::retrieve(['id' => "$foundalternativestripeaccount", 'expand[]' => 'sources']);
+									} else {
+										$customer = \Stripe\Customer::retrieve(['id' => "$foundalternativestripeaccount", 'expand[]' => 'sources'], ["stripe_account" => $stripeacc]);
+									}
+								} else {
+									$customer = $stripe->customerStripe($thirdparty, $stripeacc, $servicestatus, 0);
+									if (empty($customer) && !empty($stripe->error)) {
+										$this->errors[] = $stripe->error;
+									}
+									/*if (!empty($customer) && empty($customer->sources)) {
+									 $customer = null;
+									 $this->errors[] = '\Stripe\Customer::retrieve did not returned the sources';
+									 }*/
+								}
+
+								// $nbhoursbetweentries = (empty($conf->global->SELLYOURSAAS_NBHOURSBETWEENTRIES) ? 49 : $conf->global->SELLYOURSAAS_NBHOURSBETWEENTRIES);				// Must have more that 48 hours + 1 between each try (so 1 try every 3 daily batch)
+								// $nbdaysbeforeendoftries = (empty($conf->global->SELLYOURSAAS_NBDAYSBEFOREENDOFTRIES) ? 35 : $conf->global->SELLYOURSAAS_NBDAYSBEFOREENDOFTRIES);
+								$labeltouse = '';
+								$postactionmessages = [];
+
+								if ($resultthirdparty > 0 && !empty($customer)) {
+									if (!$error && !empty($this->array_options['options_delayautopayment']) && $this->array_options['options_delayautopayment'] > $now && empty($calledinmyaccountcontext)) {
+										$errmsg = 'Payment try was canceled (invoice qualified by the automatic payment was delayed after the ' . dol_print_date($this->array_options['options_delayautopayment'], 'day') . ')';
+										dol_syslog($errmsg, LOG_DEBUG);
+
+										$error++;
+										$errorforinvoice++;
+										$this->errors[] = $errmsg;
+									}
+									// if (!$error && ($this->date < ($now - ($nbdaysbeforeendoftries * 24 * 3600)))                                 // We try until we reach $nbdaysbeforeendoftries
+									// 	&& ($this->date < ($now - (62 * 24 * 3600)) || $this->date > ($now - (60 * 24 * 3600)))     // or when we have 60 days
+									// 	&& ($this->date < ($now - (92 * 24 * 3600)) || $this->date > ($now - (90 * 24 * 3600)))     // or when we have 90 days
+									// 	&& empty($nocancelifpaymenterror)) {
+									// 	$errmsg = 'Payment try was canceled (invoice date is older than ' . $nbdaysbeforeendoftries . ' days and not 60 days old and not 90 days old) - You can still take payment from backoffice.';
+										// 	dol_syslog($errmsg, LOG_DEBUG);
+
+										// 	$error++;
+										// 	$errorforinvoice++;
+										// 	$this->errors[] = $errmsg;
+										// }
+										// if (!$error && empty($nocancelifpaymenterror)) {	// If we are not in a mode that ask to avoid cancelation, we cancel payment.
+										// 	// Test if last AC_PAYMENT_STRIPE_KO event is an old error lower than $nbhoursbetweentries hours.
+										// 	$recentfailedpayment = false;
+										// 	$sqlonevents = 'SELECT COUNT(*) as nb FROM ' . MAIN_DB_PREFIX . 'actioncomm WHERE fk_soc = ' . $thirdparty->id . " AND code ='AC_PAYMENT_STRIPE_KO' AND datep > '" . $this->db->idate($now - ($nbhoursbetweentries * 3600)) . "'";
+										// 	$resqlonevents = $this->db->query($sqlonevents);
+										// 	if ($resqlonevents) {
+										// 		$obj = $this->db->fetch_object($resqlonevents);
+										// 		if ($obj && $obj->nb > 0) {
+										// 			$recentfailedpayment = true;
+										// 		}
+										// 	}
+
+										// 	if ($recentfailedpayment) {
+										// 		$errmsg = 'Payment try was canceled (recent payment, in last ' . $nbhoursbetweentries . ' hours, with error AC_PAYMENT_STRIPE_KO for this customer)';
+										// 		dol_syslog($errmsg, LOG_DEBUG);
+
+										// 		$error++;
+										// 		$errorforinvoice++;
+										// 		$this->errors[] = $errmsg;
+										// 	}
+										// }
+
+									if (!$error) {	// Payment was not canceled
+										//erics card or sepa ?
+										$sepaMode = false;
+										if ($companypaymentmode->type == 'ban') {
+											$sepaMode = true;
+											$stripecard = $stripe->sepaStripe($customer, $companypaymentmode, $stripeacc, $servicestatus, 0);
+										} else {
+											$stripecard = $stripe->cardStripe($customer, $companypaymentmode, $stripeacc, $servicestatus, 0);
+										}
+
+										if ($stripecard) {  // Can be card_... (old mode) or pm_... (new mode)
+											$FULLTAG = 'INV=' . $this->id . '-CUS=' . $thirdparty->id;
+											$description = 'Stripe payment from doTakePaymentStripeForThirdparty: ' . $FULLTAG . ' ref=' . $this->ref;
+
+											$stripefailurecode = '';
+											$stripefailuremessage = '';
+											$stripefailuredeclinecode = '';
+
+											if (preg_match('/^card_/', $stripecard->id)) { // Using old method
+												dol_syslog("* Create charge on card " . $stripecard->id . ", amountstripe=" . $amountstripe . ", FULLTAG=" . $FULLTAG, LOG_DEBUG);
+
+												$ipaddress = getUserRemoteIP();
+
+												$charge = null;		// Force reset of $charge, so, if already set from a previous fetch, it will be empty even if there is an exception at next step
+												try {
+													$charge = \Stripe\Charge::create([
+														'amount' => price2num($amountstripe, 'MU'),
+														'currency' => $currency,
+														'capture' => true,							// Charge immediatly
+														'description' => $description,
+														'metadata' => ["FULLTAG" => $FULLTAG, 'Recipient' => $mysoc->name, 'dol_version' => DOL_VERSION, 'dol_entity' => $conf->entity, 'ipaddress' => $ipaddress],
+														'customer' => $customer->id,
+														//'customer' => 'bidon_to_force_error',		// To use to force a stripe error
+														'source' => $stripecard,
+														'statement_descriptor' => dol_trunc('INV=' . $this->id, 10, 'right', 'UTF-8', 1),     // 22 chars that appears on bank receipt (company + description)
+													]);
+												} catch (\Stripe\Error\Card $e) {
+													// Since it's a decline, Stripe_CardError will be caught
+													$body = $e->getJsonBody();
+													$err = $body['error'];
+
+													$stripefailurecode = $err['code'];
+													$stripefailuremessage = $err['message'];
+													$stripefailuredeclinecode = $err['decline_code'];
+												} catch (Exception $e) {
+													$stripefailurecode = 'UnknownChargeError';
+													$stripefailuremessage = $e->getMessage();
+												}
+											} else { // Using new SCA method
+												if ($sepaMode)
+													dol_syslog("* Create payment on SEPA " . $stripecard->id . ", amounttopay=" . $amounttopay . ", amountstripe=" . $amountstripe . ", FULLTAG=" . $FULLTAG, LOG_DEBUG);
+												else dol_syslog("* Create payment on card " . $stripecard->id . ", amounttopay=" . $amounttopay . ", amountstripe=" . $amountstripe . ", FULLTAG=" . $FULLTAG, LOG_DEBUG);
+
+														// Create payment intent and charge payment (confirmnow = true)
+														$paymentintent = $stripe->getPaymentIntent($amounttopay, $currency, $FULLTAG, $description, $invoice, $customer->id, $stripeacc, $servicestatus, 0, 'automatic', true, $stripecard->id, 1);
+
+														$charge = new stdClass();
+														//erics add processing sepa is like success ?
+												if ($paymentintent->status === 'succeeded' || $paymentintent->status === 'processing') {
+													$charge->status = 'ok';
+													$charge->id = $paymentintent->id;
+													$charge->customer = $customer->id;
+												} elseif ($paymentintent->status === 'requires_action') {
+													//paymentintent->status may be => 'requires_action' (no error in such a case)
+													dol_syslog(var_export($paymentintent, true), LOG_DEBUG);
+
+													$charge->status = 'failed';
+													$charge->customer = $customer->id;
+													$charge->failure_code = $stripe->code;
+													$charge->failure_message = $stripe->error;
+													$charge->failure_declinecode = $stripe->declinecode;
+													$stripefailurecode = $stripe->code;
+													$stripefailuremessage = 'Action required. Contact the support at ';// . $conf->global->SELLYOURSAAS_MAIN_EMAIL;
+													$stripefailuredeclinecode = $stripe->declinecode;
+												} else {
+													dol_syslog(var_export($paymentintent, true), LOG_DEBUG);
+
+													$charge->status = 'failed';
+													$charge->customer = $customer->id;
+													$charge->failure_code = $stripe->code;
+													$charge->failure_message = $stripe->error;
+													$charge->failure_declinecode = $stripe->declinecode;
+													$stripefailurecode = $stripe->code;
+													$stripefailuremessage = $stripe->error;
+													$stripefailuredeclinecode = $stripe->declinecode;
+												}
+
+														//var_dump("stripefailurecode=".$stripefailurecode." stripefailuremessage=".$stripefailuremessage." stripefailuredeclinecode=".$stripefailuredeclinecode);
+														//exit;
+											}
+
+											// Return $charge = array('id'=>'ch_XXXX', 'status'=>'succeeded|pending|failed', 'failure_code'=>, 'failure_message'=>...)
+											if (empty($charge) || $charge->status == 'failed') {
+												dol_syslog('Failed to charge card or payment mode ' . $stripecard->id . ' stripefailurecode=' . $stripefailurecode . ' stripefailuremessage=' . $stripefailuremessage . ' stripefailuredeclinecode=' . $stripefailuredeclinecode, LOG_WARNING);
+
+												// Save a stripe payment was in error
+												$this->stripechargeerror++;
+
+												$error++;
+												$errorforinvoice++;
+												$errmsg = $langs->trans("FailedToChargeCard");
+												if (!empty($charge)) {
+													if ($stripefailuredeclinecode == 'authentication_required') {
+														$errauthenticationmessage = $langs->trans("ErrSCAAuthentication");
+														$errmsg = $errauthenticationmessage;
+													} elseif (in_array($stripefailuredeclinecode, ['insufficient_funds', 'generic_decline'])) {
+														$errmsg .= ': ' . $charge->failure_code;
+														$errmsg .= ($charge->failure_message ? ' - ' : '') . ' ' . $charge->failure_message;
+														if (empty($stripefailurecode)) {
+															$stripefailurecode = $charge->failure_code;
+														}
+														if (empty($stripefailuremessage)) {
+															$stripefailuremessage = $charge->failure_message;
+														}
+													} else {
+														$errmsg .= ': failure_code=' . $charge->failure_code;
+														$errmsg .= ($charge->failure_message ? ' - ' : '') . ' failure_message=' . $charge->failure_message;
+														if (empty($stripefailurecode)) {
+															$stripefailurecode = $charge->failure_code;
+														}
+														if (empty($stripefailuremessage)) {
+															$stripefailuremessage = $charge->failure_message;
+														}
+													}
+												} else {
+													$errmsg .= ': ' . $stripefailurecode . ' - ' . $stripefailuremessage;
+													$errmsg .= ($stripefailuredeclinecode ? ' - ' . $stripefailuredeclinecode : '');
+												}
+
+												$description = 'Stripe payment ERROR from doTakePaymentStripeForThirdparty: ' . $FULLTAG;
+												$postactionmessages[] = $errmsg . ' (' . $stripearrayofkeys['publishable_key'] . ')';
+												$this->errors[] = $errmsg;
+											} else {
+												dol_syslog('Successfuly charge card ' . $stripecard->id);
+
+												$postactionmessages[] = 'Success to charge card (' . $charge->id . ' with ' . $stripearrayofkeys['publishable_key'] . ')';
+
+												// Save a stripe payment was done in realy life so later we will be able to force a commit on recorded payments
+												// even if in batch mode (method doTakePaymentStripe), we will always make all action in one transaction with a forced commit.
+												$this->stripechargedone++;
+
+												// Default description used for label of event. Will be overwrite by another value later.
+												$description = 'Stripe payment OK (' . $charge->id . ') from doTakePaymentStripeForThirdparty: ' . $FULLTAG;
+
+												$db = $this->db;
+
+												$ipaddress = getUserRemoteIP();
+
+												$TRANSACTIONID = $charge->id;
+												$currency = $conf->currency;
+												$paymentmethod = 'stripe';
+												$emetteur_name = $charge->customer;
+
+												// Same code than into paymentok.php...
+
+												$paymentTypeId = 0;
+												if ($paymentmethod == 'paybox') {
+													$paymentTypeId = $conf->global->PAYBOX_PAYMENT_MODE_FOR_PAYMENTS;
+												}
+												if ($paymentmethod == 'paypal') {
+													$paymentTypeId = $conf->global->PAYPAL_PAYMENT_MODE_FOR_PAYMENTS;
+												}
+												if ($paymentmethod == 'stripe') {
+													$paymentTypeId = $conf->global->STRIPE_PAYMENT_MODE_FOR_PAYMENTS;
+												}
+												if (empty($paymentTypeId)) {
+													//erics
+													if ($sepaMode) {
+														$paymentType = 'PRE';
+													} else {
+														$paymentType = $_SESSION["paymentType"];
+														if (empty($paymentType)) {
+															$paymentType = 'CB';
+														}
+													}
+													$paymentTypeId = dol_getIdFromCode($this->db, $paymentType, 'c_paiement', 'code', 'id', 1);
+												}
+
+												$currencyCodeType = $currency;
+
+												$ispostactionok = 1;
+
+												// Creation of payment line
+												include_once DOL_DOCUMENT_ROOT . '/compta/paiement/class/paiement.class.php';
+												$paiement = new Paiement($this->db);
+												$paiement->datepaye = $now;
+												$paiement->date = $now;
+												if ($currencyCodeType == $conf->currency) {
+													$paiement->amounts = [$this->id => $amounttopay];   // Array with all payments dispatching with invoice id
+												} else {
+													$paiement->multicurrency_amounts = [$this->id => $amounttopay];   // Array with all payments dispatching
+
+													$postactionmessages[] = 'Payment was done in a different currency than currency expected of company';
+													$ispostactionok = -1;
+													// Not yet supported, so error
+													$error++;
+													$errorforinvoice++;
+												}
+												$paiement->paiementid = $paymentTypeId;
+												$paiement->num_paiement = '';
+												$paiement->num_payment = '';
+												// Add a comment with keyword 'SellYourSaas' in text. Used by trigger.
+												$paiement->note_public = 'StripeSepa payment ' . dol_print_date($now, 'standard') . ' using ' . $paymentmethod . ($ipaddress ? ' from ip ' . $ipaddress : '') . ' - Transaction ID = ' . $TRANSACTIONID;
+												$paiement->note_private = 'StripeSepa payment ' . dol_print_date($now, 'standard') . ' using ' . $paymentmethod . ($ipaddress ? ' from ip ' . $ipaddress : '') . ' - Transaction ID = ' . $TRANSACTIONID;
+												$paiement->ext_payment_id = $charge->id . ':' . $customer->id . '@' . $stripearrayofkeys['publishable_key'];
+												$paiement->ext_payment_site = 'stripe';
+
+												if (!$errorforinvoice) {
+													dol_syslog('* Record payment for invoice id ' . $this->id . '. It includes closing of invoice and regenerating document');
+
+													// This include closing invoices to 'paid' (and trigger including unsuspending) and regenerating document
+													$paiement_id = $paiement->create($user, 1);
+													if ($paiement_id < 0) {
+														$postactionmessages[] = $paiement->error . ($paiement->error ? ' ' : '') . join("<br>\n", $paiement->errors);
+														$ispostactionok = -1;
+														$error++;
+														$errorforinvoice++;
+													} else {
+														$postactionmessages[] = 'Payment created';
+													}
+
+													dol_syslog("The payment has been created for invoice id " . $this->id);
+												}
+
+												if (!$errorforinvoice && !empty($conf->banque->enabled)) {
+													dol_syslog('* Add payment to bank');
+
+													$bankaccountid = 0;
+													if ($paymentmethod == 'paybox') {
+														$bankaccountid = $conf->global->PAYBOX_BANK_ACCOUNT_FOR_PAYMENTS;
+													}
+													if ($paymentmethod == 'paypal') {
+														$bankaccountid = $conf->global->PAYPAL_BANK_ACCOUNT_FOR_PAYMENTS;
+													}
+													if ($paymentmethod == 'stripe') {
+														$bankaccountid = $conf->global->STRIPE_BANK_ACCOUNT_FOR_PAYMENTS;
+													}
+
+													if ($bankaccountid > 0) {
+														$label = '(CustomerInvoicePayment)';
+														if ($this->type == Facture::TYPE_CREDIT_NOTE) {
+															$label = '(CustomerInvoicePaymentBack)';
+														}  // Refund of a credit note
+														$result = $paiement->addPaymentToBank($user, 'payment', $label, $bankaccountid, $emetteur_name, '');
+														if ($result < 0) {
+															$postactionmessages[] = $paiement->error . ($paiement->error ? ' ' : '') . join("<br>\n", $paiement->errors);
+															$ispostactionok = -1;
+															$error++;
+															$errorforinvoice++;
+														} else {
+															$postactionmessages[] = 'Bank transaction of payment created (by doTakePaymentStripeForThirdparty)';
+														}
+													} else {
+														$postactionmessages[] = 'Setup of bank account to use in module ' . $paymentmethod . ' was not set. No way to record the payment.';
+														$ispostactionok = -1;
+														$error++;
+														$errorforinvoice++;
+													}
+												}
+
+												if ($ispostactionok < 1) {
+													$description = 'Stripe payment OK (' . $charge->id . ' - ' . $amounttopay . ' ' . $conf->currency . ') but post action KO from doTakePaymentStripeForThirdparty: ' . $FULLTAG;
+												} else {
+													$description = 'Stripe payment+post action OK (' . $charge->id . ' - ' . $amounttopay . ' ' . $conf->currency . ') from doTakePaymentStripeForThirdparty: ' . $FULLTAG;
+												}
+											}
+
+											$object = $invoice;
+
+											// Send emails
+											$labeltouse = 'InvoicePaymentSuccess';
+											$sendemailtocustomer = 1;
+
+											if (empty($charge) || $charge->status == 'failed') {
+												$labeltouse = 'InvoicePaymentFailure';
+												if ($noemailtocustomeriferror) {
+													$sendemailtocustomer = 0;
+												}		// $noemailtocustomeriferror is set when error already reported on myaccount screen
+											}
+
+											// Track an event
+											if (empty($charge) || $charge->status == 'failed') {
+												$actioncode = 'PAYMENT_STRIPE_KO';
+												$extraparams = $stripefailurecode;
+												$extraparams .= (($extraparams && $stripefailuremessage) ? ' - ' : '') . $stripefailuremessage;
+												$extraparams .= (($extraparams && $stripefailuredeclinecode) ? ' - ' : '') . $stripefailuredeclinecode;
+											} else {
+												$actioncode = 'PAYMENT_STRIPE_OK';
+												$extraparams = '';
+											}
+										} else {
+											$error++;
+											$errorforinvoice++;
+											dol_syslog("No card or payment method found for this stripe customer " . $customer->id, LOG_WARNING);
+											$this->errors[] = 'Failed to get card | payment method for stripe customer = ' . $customer->id;
+
+											$labeltouse = 'InvoicePaymentFailure';
+											$sendemailtocustomer = 1;
+											if ($noemailtocustomeriferror) {
+												$sendemailtocustomer = 0;
+											}		// $noemailtocustomeriferror is set when error already reported on myaccount screen
+
+											$description = 'Failed to find or use the payment mode - no credit card defined for the customer account';
+											$stripefailurecode = 'BADPAYMENTMODE';
+											$stripefailuremessage = 'Failed to find or use the payment mode - no credit card defined for the customer account';
+											$postactionmessages[] = $description . ' (' . $stripearrayofkeys['publishable_key'] . ')';
+
+											$object = $invoice;
+
+											$actioncode = 'PAYMENT_STRIPE_KO';
+											$extraparams = '';
+										}
+									} else {
+										// If error because payment was canceled for a logical reason, we do nothing (no email and no event added)
+										$labeltouse = '';
+										$sendemailtocustomer = 0;
+
+										$description = '';
+										$stripefailurecode = '';
+										$stripefailuremessage = '';
+
+										$object = $invoice;
+
+										$actioncode = '';
+										$extraparams = '';
+									}
+								} else {	// Else of the   if ($resultthirdparty > 0 && ! empty($customer)) {
+									if ($resultthirdparty <= 0) {
+										dol_syslog('SellYourSaasUtils Failed to load customer for thirdparty_id = ' . $thirdparty->id, LOG_WARNING);
+										$this->errors[] = 'Failed to load customer for thirdparty_id = ' . $thirdparty->id;
+									} else { // $customer stripe not found
+										dol_syslog('SellYourSaasUtils Failed to get Stripe customer id for thirdparty_id = ' . $thirdparty->id . " in mode " . $servicestatus . " in Stripe env " . $stripearrayofkeysbyenv[$servicestatus]['publishable_key'], LOG_WARNING);
+										$this->errors[] = 'Failed to get Stripe customer id for thirdparty_id = ' . $thirdparty->id . " in mode " . $servicestatus . " in Stripe env " . $stripearrayofkeysbyenv[$servicestatus]['publishable_key'];
+									}
+									$error++;
+									$errorforinvoice++;
+
+									$labeltouse = 'InvoicePaymentFailure';
+									$sendemailtocustomer = 1;
+									if ($noemailtocustomeriferror) {
+										$sendemailtocustomer = 0;
+									}		// $noemailtocustomeriferror is set when error already reported on myaccount screen
+
+									$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 = [];
+
+									$object = $invoice;
+
+									$actioncode = 'PAYMENT_STRIPE_KO';
+									$extraparams = '';
+								}
+
+									// Send email + create action after
+								if ($sendemailtocustomer && $labeltouse) {
+									dol_syslog("* Send email with result of payment - " . $labeltouse);
+
+									// Set output language
+									$outputlangs = new Translate('', $conf);
+									$outputlangs->setDefaultLang(empty($object->thirdparty->default_lang) ? $mysoc->default_lang : $object->thirdparty->default_lang);
+									$outputlangs->loadLangs(["main", "members", "bills"]);
+
+									// Get email content from templae
+									$arraydefaultmessage = null;
+
+									include_once DOL_DOCUMENT_ROOT . '/core/class/html.formmail.class.php';
+									$formmail = new FormMail($this->db);
+
+									if (!empty($labeltouse)) {
+										$arraydefaultmessage = $formmail->getEMailTemplate($this->db, 'facture_send', $user, $outputlangs, 0, 1, $labeltouse);
+									}
+
+									if (!empty($labeltouse) && is_object($arraydefaultmessage) && $arraydefaultmessage->id > 0) {
+										$subject = $arraydefaultmessage->topic;
+										$msg = $arraydefaultmessage->content;
+									}
+
+									$substitutionarray = getCommonSubstitutionArray($outputlangs, 0, null, $object);
+
+									//$substitutionarray['__SELLYOURSAAS_PAYMENT_ERROR_DESC__'] = $stripefailurecode . ' ' . $stripefailuremessage;
+
+									complete_substitutions_array($substitutionarray, $outputlangs, $object);
+
+									// Set the property ->ref_customer with ref_customer of contract so __REF_CLIENT__ will be replaced in email content
+									// Search contract linked to invoice
+									$foundcontract = null;
+									$this->fetchObjectLinked();
+									if (is_array($this->linkedObjects['contrat']) && count($this->linkedObjects['contrat']) > 0) {
+										//dol_sort_array($object->linkedObjects['facture'], 'date');
+										foreach ($this->linkedObjects['contrat'] as $idcontract => $contract) {
+											$substitutionarray['__CONTRACT_REF__'] = $contract->ref_customer;
+											$substitutionarray['__REFCLIENT__'] = $contract->ref_customer;	// For backward compatibility
+											$substitutionarray['__REF_CLIENT__'] = $contract->ref_customer;
+											$foundcontract = $contract;
+											break;
+										}
+									}
+
+									dol_syslog('__DIRECTDOWNLOAD_URL_INVOICE__=' . $substitutionarray['__DIRECTDOWNLOAD_URL_INVOICE__']);
+
+									//erics - erreur de réécriture de l'url de téléchargement direct de la facture ... le lien de base est le bon
+									//on cherche donc d'ou vien le pb ...
+									//$urlforsellyoursaasaccount = getRootUrlForAccount($foundcontract);
+									// if ($urlforsellyoursaasaccount) {
+									// 	$tmpforurl = preg_replace('/.*document.php/', '', $substitutionarray['__DIRECTDOWNLOAD_URL_INVOICE__']);
+									// 	if ($tmpforurl) {
+									// 		dol_syslog('__DIRECTDOWNLOAD_URL_INVOICE__ cas 1, urlforsellyoursaasaccount=' . $urlforsellyoursaasaccount);
+									// 		// $substitutionarray['__DIRECTDOWNLOAD_URL_INVOICE__'] = $urlforsellyoursaasaccount . '/source/document.php' . $tmpforurl;
+									// 	} else {
+									// 		dol_syslog('__DIRECTDOWNLOAD_URL_INVOICE__ cas 2, urlforsellyoursaasaccount=' . $urlforsellyoursaasaccount);
+									// 		// $substitutionarray['__DIRECTDOWNLOAD_URL_INVOICE__'] = $urlforsellyoursaasaccount;
+									// 	}
+									// }
+
+									$subjecttosend = make_substitutions($subject, $substitutionarray, $outputlangs);
+									$texttosend = make_substitutions($msg, $substitutionarray, $outputlangs);
+
+									// Attach a file ?
+									$file = '';
+									$listofpaths = [];
+									$listofnames = [];
+									$listofmimes = [];
+									if (is_object($invoice)) {
+										$invoicediroutput = $conf->facture->dir_output;
+										//erics - choix du PDF a joindre aux mails
+										$fileparams = dol_most_recent_file($invoicediroutput . '/' . $this->ref, preg_quote($this->ref, '/') . '[^\-]+*.pdf');
+										$file = $fileparams['fullname'];
+										//$file = $invoicediroutput . '/' . $this->ref . '/' . $this->ref . '.pdf';
+										// $file = '';		// Disable attachment of invoice in emails
+
+										if ($file) {
+											$listofpaths = [$file];
+											$listofnames = [basename($file)];
+											$listofmimes = [dol_mimetype($file)];
+										}
+									}
+									$from = "";//$conf->global->SELLYOURSAAS_NOREPLY_EMAIL;
+
+									$trackid = 'inv' . $this->id;
+									$moreinheader = 'X-Dolibarr-Info: doTakeStripePaymentForThirdParty' . "\r\n";
+
+									// Send email (substitutionarray must be done just before this)
+									include_once DOL_DOCUMENT_ROOT . '/core/class/CMailFile.class.php';
+									$mailfile = new CMailFile($subjecttosend, $this->thirdparty->email, $from, $texttosend, $listofpaths, $listofmimes, $listofnames, '', '', 0, -1, '', '', $trackid, $moreinheader);
+									if ($mailfile->sendfile()) {
+										$result = 1;
+									} else {
+										$this->error = $langs->trans("ErrorFailedToSendMail", $from, $this->thirdparty->email) . '. ' . $mailfile->error;
+										$result = -1;
+									}
+
+									if ($result < 0) {
+										$errmsg = $this->error;
+										$postactionmessages[] = $errmsg;
+										$ispostactionok = -1;
+									} else {
+										if ($file) {
+											$postactionmessages[] = 'Email sent to thirdparty (to ' . $this->thirdparty->email . ' with invoice document attached: ' . $file . ', language = ' . $outputlangs->defaultlang . ')';
+										} else {
+											$postactionmessages[] = 'Email sent to thirdparty (to ' . $this->thirdparty->email . ' without any attached document, language = ' . $outputlangs->defaultlang . ')';
+										}
+									}
+								}
+
+								if ($description) {
+									dol_syslog("* Record event for payment result - " . $description);
+									require_once DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php';
+
+									// Insert record of payment (success or error)
+									$actioncomm = new ActionComm($this->db);
+
+									$actioncomm->type_code = 'AC_OTH_AUTO';		// Type of event ('AC_OTH', 'AC_OTH_AUTO', 'AC_XXX'...)
+									$actioncomm->code = 'AC_' . $actioncode;
+									$actioncomm->label = $description;
+									$actioncomm->note_private = join(",\n", $postactionmessages);
+									$actioncomm->fk_project = $this->fk_project;
+									$actioncomm->datep = $now;
+									$actioncomm->datef = $now;
+									$actioncomm->percentage = -1;   // Not applicable
+									$actioncomm->socid = $thirdparty->id;
+									$actioncomm->contactid = 0;
+									$actioncomm->authorid = $user->id;   // User saving action
+									$actioncomm->userownerid = $user->id;	// Owner of action
+									// Fields when action is a real email (content is already into note)
+									/*$actioncomm->email_msgid = $object->email_msgid;
+									 $actioncomm->email_from  = $object->email_from;
+									 $actioncomm->email_sender= $object->email_sender;
+									 $actioncomm->email_to    = $object->email_to;
+									 $actioncomm->email_tocc  = $object->email_tocc;
+									 $actioncomm->email_tobcc = $object->email_tobcc;
+									 $actioncomm->email_subject = $object->email_subject;
+									 $actioncomm->errors_to   = $object->errors_to;*/
+									$actioncomm->fk_element = $this->id;
+									$actioncomm->elementtype = $this->element;
+									$actioncomm->extraparams = dol_trunc($extraparams, 250);
+
+									$actioncomm->create($user);
+								}
+
+									$this->description = $description;
+									$this->postactionmessages = $postactionmessages;
+							} catch (Exception $e) {
+								$error++;
+								$errorforinvoice++;
+								dol_syslog('Error ' . $e->getMessage(), LOG_ERR);
+								$this->errors[] = 'Error ' . $e->getMessage();
+							}
+						} else {	// If remain to pay is null
+							$error++;
+							$errorforinvoice++;
+							dol_syslog("Remain to pay is null for the invoice " . $this->id . " " . $this->ref . ". Why is the invoice not classified 'Paid' ?", LOG_WARNING);
+							$this->errors[] = "Remain to pay is null for the invoice " . $this->id . " " . $this->ref . ". Why is the invoice not classified 'Paid' ?";
+						}
+
+							//end copy
+							// print json_encode($stripecard);
+							// exit;
+
+							$sql = 'INSERT INTO '.MAIN_DB_PREFIX.'prelevement_facture_demande(';
+							$sql .= 'fk_facture, ';
+							$sql .= ' amount, date_demande, fk_user_demande, ext_payment_id, ext_payment_site, sourcetype, entity)';
+							$sql .= ' VALUES ('.$this->id;
+							$sql .= ",'".price2num($amount)."'";
+							$sql .= ",'".$this->db->idate($now)."'";
+							$sql .= ",".$fuser->id;
+							$sql .= ",'".$this->db->escape($stripe_id)."'";
+							$sql .= ",'".$this->db->escape($stripe_uri)."'";
+							$sql .= ",'".$this->db->escape($sourcetype)."'";
+							$sql .= ",".$conf->entity;
+							$sql .= ")";
+
+							dol_syslog(get_class($this)."::demande_prelevement_stripe", LOG_DEBUG);
+							$resql = $this->db->query($sql);
+						if (!$resql) {
+							$this->error = $this->db->lasterror();
+							dol_syslog(get_class($this).'::demande_prelevement_stripe Erreur');
+							$error++;
+						}
+					} else {
+						$this->error = 'WithdrawRequestErrorNilAmount';
+						dol_syslog(get_class($this).'::demande_prelevement_stripe WithdrawRequestErrorNilAmount');
+						$error++;
+					}
+
+					if (!$error) {
+						// Force payment mode of invoice to withdraw
+						$payment_mode_id = dol_getIdFromCode($this->db, ($type == 'bank-transfer' ? 'VIR' : 'PRE'), 'c_paiement', 'code', 'id', 1);
+						if ($payment_mode_id > 0) {
+							$result = $this->setPaymentMethods($payment_mode_id);
+						}
+					}
+
+					if ($error) {
+						return -1;
+					}
+						return 1;
+				} else {
+					$this->error = "A request already exists";
+					dol_syslog(get_class($this).'::demande_prelevement_stripe Impossible de creer une demande, demande deja en cours');
+					return 0;
+				}
+			} else {
+				$this->error = $this->db->error();
+				dol_syslog(get_class($this).'::demande_prelevement_stripe Erreur -2');
+				return -2;
+			}
+		} else {
+			$this->error = "Status of invoice does not allow this";
+			dol_syslog(get_class($this)."::demande_prelevement_stripe ".$this->error." $this->statut, $this->paye, $this->mode_reglement_id");
+			return -3;
+		}
+	}
+
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Remove a direct debit request or a credit transfer request
diff --git a/htdocs/langs/en_US/errors.lang b/htdocs/langs/en_US/errors.lang
index b47199e8fe2..fba4f286b62 100644
--- a/htdocs/langs/en_US/errors.lang
+++ b/htdocs/langs/en_US/errors.lang
@@ -292,7 +292,8 @@ ErrorThirpdartyOrMemberidIsMandatory=Third party or Member of partnership is man
 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
- 
+ErrorThisPaymentModeIsNotSepa=This payment mode is not a bank account 
+
 # 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.
diff --git a/htdocs/societe/class/companybankaccount.class.php b/htdocs/societe/class/companybankaccount.class.php
index 4ddbd1c613f..c3ecbe31ccd 100644
--- a/htdocs/societe/class/companybankaccount.class.php
+++ b/htdocs/societe/class/companybankaccount.class.php
@@ -47,6 +47,9 @@ class CompanyBankAccount extends Account
 	public $rum;
 	public $date_rum;
 
+	public $stripe_card_ref;	// ID of BAN into an external payment system
+	public $stripe_account;		// Account of the external payment system
+
 	/**
 	 * Date creation record (datec)
 	 *
@@ -187,6 +190,8 @@ class CompanyBankAccount extends Account
 		} else {
 			$sql .= ",label = NULL";
 		}
+		$sql .= ",stripe_card_ref = '".$this->db->escape($this->stripe_card_ref)."'";
+		$sql .= ",stripe_account = '".$this->db->escape($this->stripe_account)."'";
 		$sql .= " WHERE rowid = ".((int) $this->id);
 
 		$result = $this->db->query($sql);
@@ -232,7 +237,8 @@ class CompanyBankAccount extends Account
 		}
 
 		$sql = "SELECT rowid, type, fk_soc, 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 .= " owner_address, default_rib, label, datec, tms as datem, rum, frstrecur, date_rum,";
+		$sql .= " stripe_card_ref, stripe_account";
 		$sql .= " FROM ".MAIN_DB_PREFIX."societe_rib";
 		if ($id) {
 			$sql .= " WHERE rowid = ".((int) $id);
@@ -274,6 +280,8 @@ class CompanyBankAccount extends Account
 				$this->rum             = $obj->rum;
 				$this->frstrecur       = $obj->frstrecur;
 				$this->date_rum        = $this->db->jdate($obj->date_rum);
+				$this->stripe_card_ref = $obj->stripe_card_ref;
+				$this->stripe_account  = $obj->stripe_account;
 			}
 			$this->db->free($resql);
 
diff --git a/htdocs/societe/paymentmodes.php b/htdocs/societe/paymentmodes.php
index e7899db813e..7e3c916ec27 100644
--- a/htdocs/societe/paymentmodes.php
+++ b/htdocs/societe/paymentmodes.php
@@ -175,6 +175,12 @@ if (empty($reshook)) {
 				$companybankaccount->rum = $prelevement->buildRumNumber($object->code_client, $companybankaccount->datec, $companybankaccount->id);
 			}
 
+			if (GETPOST('stripe_card_ref', 'alpha') && GETPOST('stripe_card_ref', 'alpha') != $companypaymentmode->stripe_card_ref) {
+				// If we set a stripe value that is different than previous one, we also set the stripe account
+				$companypaymentmode->stripe_account = $stripecu.'@'.$site_account;
+			}
+			$companybankaccount->stripe_card_ref = GETPOST('stripe_card_ref', 'alpha');
+
 			$result = $companybankaccount->update($user);
 			if (!$result) {
 				setEventMessages($companybankaccount->error, $companybankaccount->errors, 'errors');
@@ -416,6 +422,7 @@ if (empty($reshook)) {
 	if ($action == 'confirm_deletecard' && GETPOST('confirm', 'alpha') == 'yes') {
 		$companypaymentmode = new CompanyPaymentMode($db);
 		if ($companypaymentmode->fetch($ribid ? $ribid : $id)) {
+			// TODO This is currently done at bottom of page instead of asking confirm
 			/*if ($companypaymentmode->stripe_card_ref && preg_match('/pm_/', $companypaymentmode->stripe_card_ref))
 			{
 				$payment_method = \Stripe\PaymentMethod::retrieve($companypaymentmode->stripe_card_ref);
@@ -440,6 +447,16 @@ if (empty($reshook)) {
 	if ($action == 'confirm_delete' && GETPOST('confirm', 'alpha') == 'yes') {
 		$companybankaccount = new CompanyBankAccount($db);
 		if ($companybankaccount->fetch($ribid ? $ribid : $id)) {
+			// TODO This is currently done at bottom of page instead of asking confirm
+			/*if ($companypaymentmode->stripe_card_ref && preg_match('/pm_/', $companypaymentmode->stripe_card_ref))
+			{
+				$payment_method = \Stripe\PaymentMethod::retrieve($companypaymentmode->stripe_card_ref);
+				if ($payment_method)
+				{
+					$payment_method->detach();
+				}
+			}*/
+
 			$result = $companybankaccount->delete($user);
 			if ($result > 0) {
 				$url = $_SERVER['PHP_SELF']."?socid=".$object->id;
@@ -505,7 +522,7 @@ if (empty($reshook)) {
 				}
 
 				if (!$error) {
-					// Creation of Stripe card + update of societe_account
+					// Creation of Stripe card + update of llx_societe_rib
 					// Note that with the new Stripe API, option to create a card is no more available, instead an error message will be returned to
 					// ask to create the crdit card from Stripe backoffice.
 					$card = $stripe->cardStripe($cu, $companypaymentmode, $stripeacc, $servicestatus, 1);
@@ -517,18 +534,13 @@ if (empty($reshook)) {
 			}
 		}
 		if ($action == 'syncsepatostripe') {
-			$companybankaccount->fetch(GETPOST('bankid', 'int'));
-			// print "stripe account = " . json_encode($stripe->getStripeAccount($service));
-			// print json_encode($companybankaccount);
-			// print "fetch id = " . json_encode($socid);
-
-			$companypaymentmode = new CompanyPaymentMode($db);
-			$companypaymentmode->fetch(null, null, $socid);
-			// print json_encode($companypaymentmode);
+			$companypaymentmode = new CompanyPaymentMode($db);	// Get record in llx_societe_rib
+			$companypaymentmode->fetch($id);
 
 			if ($companypaymentmode->type != 'ban') {
 				$error++;
-				setEventMessages('ThisPaymentModeIsNotSepa', null, 'errors');
+				$langs->load("errors");
+				setEventMessages('ThisPaymentModeIsNotABan', null, 'errors');
 			} else {
 				// Get the Stripe customer
 				$cu = $stripe->customerStripe($object, $stripeacc, $servicestatus);
@@ -539,13 +551,13 @@ if (empty($reshook)) {
 				}
 
 				if (!$error) {
-					// Creation of Stripe SEPA + update of societe_account
+					// Creation of Stripe SEPA + update of llx_societe_rib
 					$card = $stripe->sepaStripe($cu, $companypaymentmode, $stripeacc, $servicestatus, 1);
 					if (!$card) {
 						$error++;
 						setEventMessages($stripe->error, $stripe->errors, 'errors');
 					} else {
-						setEventMessages("", array("SEPA on Stripe", "SEPA IBAN is now linked to the Stripe customer account !"));
+						setEventMessages("", array("Bank Account on Stripe", "BAN is now linked to the Stripe customer account !"));
 					}
 				}
 			}
@@ -711,6 +723,37 @@ if (empty($reshook)) {
 				$error++;
 				setEventMessages($e->getMessage(), null, 'errors');
 			}
+		} elseif ($action == 'delete' && $source) {
+			try {
+				if (preg_match('/pm_/', $source)) {
+					$payment_method = \Stripe\PaymentMethod::retrieve($source, array("stripe_account" => $stripeacc));
+					if ($payment_method) {
+						$payment_method->detach();
+					}
+				} else {
+					$cu = $stripe->customerStripe($object, $stripeacc, $servicestatus);
+					$card = $cu->sources->retrieve("$source");
+					if ($card) {
+						// $card->detach();  Does not work with card_, only with src_
+						if (method_exists($card, 'detach')) {
+							$card->detach();
+							$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();
+						}
+					}
+				}
+
+				$url = DOL_URL_ROOT.'/societe/paymentmodes.php?socid='.$object->id;
+				header('Location: '.$url);
+				exit;
+			} catch (Exception $e) {
+				$error++;
+				setEventMessages($e->getMessage(), null, 'errors');
+			}
 		}
 	}
 }
@@ -938,70 +981,75 @@ if ($socid && $action != 'edit' && $action != 'create' && $action != 'editcard'
 
 	print '<br>';
 
-	// List of Stripe payment modes
-	if (!(empty($conf->stripe->enabled)) && $object->client) {
+	$showcardpaymentmode = 0;
+	if (isModEnabled('stripe')) {
+		$showcardpaymentmode++;
+	}
+
+	// Get list of remote payment modes
+	$listofsources = array();
+
+	if (is_object($stripe)) {
+		try {
+			$customerstripe = $stripe->customerStripe($object, $stripeacc, $servicestatus);
+			if (!empty($customerstripe->id)) {
+				// When using the Charge API architecture
+				if (empty($conf->global->STRIPE_USE_INTENT_WITH_AUTOMATIC_CONFIRMATION)) {
+					$listofsources = $customerstripe->sources->data;
+				} else {
+					$service = 'StripeTest';
+					$servicestatus = 0;
+					if (!empty($conf->global->STRIPE_LIVE) && !GETPOST('forcesandbox', 'alpha')) {
+						$service = 'StripeLive';
+						$servicestatus = 1;
+					}
+
+					// Force to use the correct API key
+					global $stripearrayofkeysbyenv;
+					\Stripe\Stripe::setApiKey($stripearrayofkeysbyenv[$servicestatus]['secret_key']);
+
+					try {
+						if (empty($stripeacc)) {				// If the Stripe connect account not set, we use common API usage
+							$paymentmethodobjsA = \Stripe\PaymentMethod::all(array("customer" => $customerstripe->id, "type" => "card"));
+							$paymentmethodobjsB = \Stripe\PaymentMethod::all(array("customer" => $customerstripe->id, "type" => "sepa_debit"));
+						} else {
+							$paymentmethodobjsA = \Stripe\PaymentMethod::all(array("customer" => $customerstripe->id, "type" => "card"), array("stripe_account" => $stripeacc));
+							$paymentmethodobjsB = \Stripe\PaymentMethod::all(array("customer" => $customerstripe->id, "type" => "sepa_debit"), array("stripe_account" => $stripeacc));
+						}
+
+						if ($paymentmethodobjsA->data != null && $paymentmethodobjsB->data != null) {
+							$listofsources = array_merge((array) $paymentmethodobjsA->data, (array) $paymentmethodobjsB->data);
+						} elseif ($paymentmethodobjsB->data != null) {
+							$listofsources = $paymentmethodobjsB->data;
+						} else {
+							$listofsources = $paymentmethodobjsA->data;
+						}
+					} catch (Exception $e) {
+						$error++;
+						setEventMessages($e->getMessage(), null, 'errors');
+					}
+				}
+			}
+		} catch (Exception $e) {
+			dol_syslog("Error when searching/loading Stripe customer for thirdparty id =".$object->id);
+		}
+	}
+
+
+	// List of Card payment modes
+	if ($showcardpaymentmode && $object->client) {
 		$morehtmlright = '';
 		if (!empty($conf->global->STRIPE_ALLOW_LOCAL_CARD)) {
 			$morehtmlright .= dolGetButtonTitle($langs->trans('Add'), '', 'fa fa-plus-circle', $_SERVER["PHP_SELF"].'?socid='.$object->id.'&amp;action=createcard');
 		}
-		print load_fiche_titre($langs->trans('StripePaymentModes').($stripeacc ? ' (Stripe connection with StripeConnect account '.$stripeacc.')' : ' (Stripe connection with keys from Stripe module setup)'), $morehtmlright, 'stripe-s');
+		print load_fiche_titre($langs->trans('CreditCard').($stripeacc ? ' (Stripe connection with StripeConnect account '.$stripeacc.')' : ' (Stripe connection with keys from Stripe module setup)'), $morehtmlright, 'fa-credit-card');
 
-		$listofsources = array();
-		if (is_object($stripe)) {
-			try {
-				$customerstripe = $stripe->customerStripe($object, $stripeacc, $servicestatus);
-				if (!empty($customerstripe->id)) {
-					// When using the Charge API architecture
-					if (empty($conf->global->STRIPE_USE_INTENT_WITH_AUTOMATIC_CONFIRMATION)) {
-						$listofsources = $customerstripe->sources->data;
-					} else {
-						$service = 'StripeTest';
-						$servicestatus = 0;
-						if (!empty($conf->global->STRIPE_LIVE) && !GETPOST('forcesandbox', 'alpha')) {
-							$service = 'StripeLive';
-							$servicestatus = 1;
-						}
-
-						// Force to use the correct API key
-						global $stripearrayofkeysbyenv;
-						\Stripe\Stripe::setApiKey($stripearrayofkeysbyenv[$servicestatus]['secret_key']);
-
-						try {
-							if (empty($stripeacc)) {				// If the Stripe connect account not set, we use common API usage
-								$paymentmethodobjsA = \Stripe\PaymentMethod::all(array("customer" => $customerstripe->id, "type" => "card"));
-								$paymentmethodobjsB = \Stripe\PaymentMethod::all(array("customer" => $customerstripe->id, "type" => "sepa_debit"));
-							} else {
-								$paymentmethodobjsA = \Stripe\PaymentMethod::all(array("customer" => $customerstripe->id, "type" => "card"), array("stripe_account" => $stripeacc));
-								$paymentmethodobjsB = \Stripe\PaymentMethod::all(array("customer" => $customerstripe->id, "type" => "sepa_debit"), array("stripe_account" => $stripeacc));
-							}
-
-							if ($paymentmethodobjsA->data != null && $paymentmethodobjsB->data != null) {
-								$listofsources = array_merge((array) $paymentmethodobjsA->data, (array) $paymentmethodobjsB->data);
-							} elseif ($paymentmethodobjsB->data != null) {
-								$listofsources = $paymentmethodobjsB->data;
-							} else {
-								$listofsources = $paymentmethodobjsA->data;
-							}
-						} catch (Exception $e) {
-							$error++;
-							setEventMessages($e->getMessage(), null, 'errors');
-						}
-					}
-				}
-			} catch (Exception $e) {
-				dol_syslog("Error when searching/loading Stripe customer for thirdparty id =".$object->id);
-			}
-		}
-
-		print '<!-- List of stripe payments -->'."\n";
+		print '<!-- List of card payments -->'."\n";
 		print '<div class="div-table-responsive-no-min">'; // You can use div-table-responsive-no-min if you dont need reserved height for your table
 		print '<table class="liste centpercent">'."\n";
 		print '<tr class="liste_titre">';
-		if (!empty($conf->global->STRIPE_ALLOW_LOCAL_CARD)) {
-			print '<td>'.$langs->trans('LocalID').'</td>';
-		}
 		print '<td>'.$langs->trans('Label').'</td>';
-		print '<td>'.$langs->trans('StripeID').'</td>';
+		print '<td>'.$langs->trans('StripeID').'</td>';	// external system ID
 		print '<td>'.$langs->trans('Type').'</td>';
 		print '<td>'.$langs->trans('Informations').'</td>';
 		print '<td></td>';
@@ -1018,7 +1066,7 @@ if ($socid && $action != 'edit' && $action != 'create' && $action != 'editcard'
 
 		$nbremote = 0;
 		$nblocal = 0;
-		$arrayofstripecard = array();
+		$arrayofremotecard = array();
 
 		// Show local sources
 		if (!empty($conf->global->STRIPE_ALLOW_LOCAL_CARD)) {
@@ -1042,18 +1090,16 @@ if ($socid && $action != 'edit' && $action != 'create' && $action != 'editcard'
 						if ($obj) {
 							$companypaymentmodetemp->fetch($obj->rowid);
 
-							$arrayofstripecard[$companypaymentmodetemp->stripe_card_ref] = $companypaymentmodetemp->stripe_card_ref;
+							$arrayofremotecard[$companypaymentmodetemp->stripe_card_ref] = $companypaymentmodetemp->stripe_card_ref;
 
-							print '<tr class="oddeven">';
-							print '<td>';
-							print $companypaymentmodetemp->id;
-							print '</td>';
+							print '<tr class="oddeven" data-rowid="'.((int) $companypaymentmodetemp->id).'">';
+							// Label
 							print '<td class="tdoverflowmax150" title="'.dol_escape_htmltag($companypaymentmodetemp->label).'">';
 							print dol_escape_htmltag($companypaymentmodetemp->label);
 							print '</td>';
-							print '<td>';
-							print $companypaymentmodetemp->stripe_card_ref;
-							if ($companypaymentmodetemp->stripe_card_ref) {
+							// External card ID
+							print '<td class="tdoverflowmax150">';
+							if (!empty($companypaymentmodetemp->stripe_card_ref)) {
 								$connect = '';
 								if (!empty($stripeacc)) {
 									$connect = $stripeacc.'/';
@@ -1062,12 +1108,15 @@ if ($socid && $action != 'edit' && $action != 'create' && $action != 'editcard'
 								if ($servicestatus) {
 									$url = 'https://dashboard.stripe.com/'.$connect.'search?query='.$companypaymentmodetemp->stripe_card_ref;
 								}
-								print ' <a href="'.$url.'" target="_stripe">'.img_picto($langs->trans('ShowInStripe').' - Customer and Publishable key = '.$companypaymentmodetemp->stripe_account, 'globe').'</a>';
+								print '<a href="'.$url.'" target="_stripe">'.img_picto($langs->trans('ShowInStripe').' - Customer and Publishable key = '.$companypaymentmodetemp->stripe_account, 'globe').'</a> ';
 							}
+							print $companypaymentmodetemp->stripe_card_ref;
 							print '</td>';
+							// Type
 							print '<td>';
 							print img_credit_card($companypaymentmodetemp->type);
 							print '</td>';
+							// Information (Owner, ...)
 							print '<td>';
 							if ($companypaymentmodetemp->proprio) {
 								print '<span class="opacitymedium">'.$companypaymentmodetemp->proprio.'</span><br>';
@@ -1121,7 +1170,6 @@ if ($socid && $action != 'edit' && $action != 'create' && $action != 'editcard'
 								print '<a class="editfielda marginleftonly marginrightonly" href="'.DOL_URL_ROOT.'/societe/paymentmodes.php?socid='.$object->id.'&id='.$companypaymentmodetemp->id.'&action=editcard&token='.newToken().'">';
 								print img_picto($langs->trans("Modify"), 'edit');
 								print '</a>';
-								print '&nbsp;';
 								print '<a class="marginleftonly marginrightonly" href="'.DOL_URL_ROOT.'/societe/paymentmodes.php?socid='.$object->id.'&id='.$companypaymentmodetemp->id.'&action=deletecard&token='.newToken().'">'; // source='.$companypaymentmodetemp->stripe_card_ref.'&
 								print img_picto($langs->trans("Delete"), 'delete');
 								print '</a>';
@@ -1140,24 +1188,31 @@ if ($socid && $action != 'edit' && $action != 'create' && $action != 'editcard'
 		// Show remote sources (not already shown as local source)
 		if (is_array($listofsources) && count($listofsources)) {
 			foreach ($listofsources as $src) {
-				if (!empty($arrayofstripecard[$src->id])) {
+				if (!empty($arrayofremotecard[$src->id])) {
 					continue; // Already in previous list
 				}
 
 				$nbremote++;
 
-				print '<tr class="oddeven">';
-				// Local ID
-				if (!empty($conf->global->STRIPE_ALLOW_LOCAL_CARD)) {
-					print '<td>';
-					print '</td>';
+				$imgline = '';
+				if ($src->object == 'card') {
+					$imgline = img_credit_card($src->brand);
+				} elseif ($src->object == 'source' && $src->type == 'card') {
+					$imgline = img_credit_card($src->card->brand);
+				} elseif ($src->object == 'payment_method' && $src->type == 'card') {
+					$imgline = img_credit_card($src->card->brand);
+				} elseif ($src->object == 'source' && $src->type == 'sepa_debit') {
+					continue;
+				} elseif ($src->object == 'payment_method' && $src->type == 'sepa_debit') {
+					continue;
 				}
+
+				print '<tr class="oddeven">';
 				print '<td>';
 				print '</td>';
 				// Src ID
-				print '<td>';
+				print '<td class="tdoverflowmax150">';
 				$connect = '';
-				print $src->id;
 				if (!empty($stripeacc)) {
 					$connect = $stripeacc.'/';
 				}
@@ -1167,21 +1222,12 @@ if ($socid && $action != 'edit' && $action != 'create' && $action != 'editcard'
 					//$url='https://dashboard.stripe.com/'.$connect.'sources/'.$src->id;
 					$url = 'https://dashboard.stripe.com/'.$connect.'search?query='.$src->id;
 				}
-				print " <a href='".$url."' target='_stripe'>".img_picto($langs->trans('ShowInStripe'), 'globe')."</a>";
+				print "<a href='".$url."' target='_stripe'>".img_picto($langs->trans('ShowInStripe'), 'globe')."</a> ";
+				print $src->id;
 				print '</td>';
-				// Img of credit card
+				// Img
 				print '<td>';
-				if ($src->object == 'card') {
-					print img_credit_card($src->brand);
-				} elseif ($src->object == 'source' && $src->type == 'card') {
-					print img_credit_card($src->card->brand);
-				} elseif ($src->object == 'source' && $src->type == 'sepa_debit') {
-					print '<span class="fa fa-university fa-2x fa-fw"></span>';
-				} elseif ($src->object == 'payment_method' && $src->type == 'card') {
-					print img_credit_card($src->card->brand);
-				} elseif ($src->object == 'payment_method' && $src->type == 'sepa_debit') {
-					print '<span class="fa fa-university fa-2x fa-fw"></span>';
-				}
+				print $imgline;
 				print'</td>';
 				// Information
 				print '<td valign="middle">';
@@ -1256,18 +1302,20 @@ if ($socid && $action != 'edit' && $action != 'create' && $action != 'editcard'
 				print $langs->trans("Remote");
 				//if ($src->cvc_check == 'fail') print ' - CVC check fail';
 				print '</td>';
+
 				print '<td>';
 				//var_dump($src);
-				print '';
 				print '</td>';
+
 				// Fields from hook
 				$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;
+
 				// Action column
 				print '<td class="right nowraponall">';
 				if ($permissiontoaddupdatepaymentinformation) {
-					print '<a href="'.DOL_URL_ROOT.'/societe/paymentmodes.php?socid='.$object->id.'&source='.$src->id.'&action=deletecard&token='.newToken().'">';
+					print '<a class="marginleftonly marginrightonly" href="'.DOL_URL_ROOT.'/societe/paymentmodes.php?socid='.$object->id.'&source='.$src->id.'&action=deletecard&token='.newToken().'">';
 					print img_picto($langs->trans("Delete"), 'delete');
 					print '</a>';
 				}
@@ -1286,7 +1334,7 @@ if ($socid && $action != 'edit' && $action != 'create' && $action != 'editcard'
 		print '<br>';
 	}
 
-	// List of Stripe payment modes
+	// List of Stripe connect accounts
 	if (!empty($conf->stripe->enabled) && !empty($conf->stripeconnect->enabled) && !empty($stripesupplieracc)) {
 		print load_fiche_titre($langs->trans('StripeBalance').($stripesupplieracc ? ' (Stripe connection with StripeConnect account '.$stripesupplieracc.')' : ' (Stripe connection with keys from Stripe module setup)'), $morehtmlright, 'stripe-s');
 		$balance = \Stripe\Balance::retrieve(array("stripe_account" => $stripesupplieracc));
@@ -1337,16 +1385,20 @@ if ($socid && $action != 'edit' && $action != 'create' && $action != 'editcard'
 		$morehtmlright = dolGetButtonTitle($langs->trans('Add'), '', 'fa fa-plus-circle', $_SERVER["PHP_SELF"] . '?socid=' . $object->id . '&amp;action=create');
 	}
 
-
 	print load_fiche_titre($langs->trans("BankAccounts"), $morehtmlright, 'bank');
 
+	$nblocal = 0; $nbremote = 0;
+	$arrayofremoteban = array();
+
 	$rib_list = $object->get_all_rib();
+
 	if (is_array($rib_list)) {
 		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="liste centpercent">';
 
 		print '<tr class="liste_titre">';
-		print_liste_field_titre("LabelRIB");
+		print_liste_field_titre("Label");
+		print_liste_field_titre("StripeID");		// external system ID
 		print_liste_field_titre("Bank");
 		print_liste_field_titre("RIB");
 		print_liste_field_titre("IBAN");
@@ -1356,17 +1408,43 @@ if ($socid && $action != 'edit' && $action != 'create' && $action != 'editcard'
 			print_liste_field_titre("DateRUM");
 			print_liste_field_titre("WithdrawMode");
 		}
-		print_liste_field_titre("DefaultRIB", '', '', '', '', '', '', '', 'center ');
+		print_liste_field_titre("Default", '', '', '', '', '', '', '', 'center ');
 		print_liste_field_titre('', '', '', '', '', '', '', '', 'center ');
+		// Fields from hook
+		$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 ');
 		print "</tr>\n";
 
+		// List of local BAN
 		foreach ($rib_list as $rib) {
+			$arrayofremoteban[$rib->stripe_card_ref] = $rib->stripe_card_ref;
+
+			$nblocal++;
+
 			print '<tr class="oddeven">';
 			// Label
-			print '<td>'.$rib->label.'</td>';
+			print '<td>'.dol_escape_htmltag($rib->label).'</td>';
+			// Stripe ID
+			print '<td class="tdoverflowmax150">';
+			if ($rib->stripe_card_ref) {
+				$connect = '';
+				if (!empty($stripeacc)) {
+					$connect = $stripeacc.'/';
+				}
+				//$url='https://dashboard.stripe.com/'.$connect.'test/sources/'.$src->id;
+				$url = 'https://dashboard.stripe.com/'.$connect.'test/search?query='.$rib->stripe_card_ref;
+				if ($servicestatus) {
+					//$url='https://dashboard.stripe.com/'.$connect.'sources/'.$src->id;
+					$url = 'https://dashboard.stripe.com/'.$connect.'search?query='.$rib->stripe_card_ref;
+				}
+				print "<a href='".$url."' target='_stripe'>".img_picto($langs->trans('ShowInStripe'), 'globe')."</a> ";
+			}
+			print $rib->stripe_card_ref;
+			print '</td>';
 			// Bank name
-			print '<td>'.$rib->bank.'</td>';
+			print '<td class="tdoverflowmax100" title="'.dol_escape_htmltag($rib->bank).'">'.dol_escape_htmltag($rib->bank).'</td>';
 			// Account number
 			print '<td>';
 			$string = '';
@@ -1398,7 +1476,7 @@ if ($socid && $action != 'edit' && $action != 'create' && $action != 'editcard'
 			print $string;
 			print '</td>';
 			// IBAN
-			print '<td>'.$rib->iban;
+			print '<td class="tdoverflowmax100" title="'.dol_escape_htmltag($rib->iban).'">'.dol_escape_htmltag($rib->iban);
 			if (!empty($rib->iban)) {
 				if (!checkIbanForAccount($rib)) {
 					print ' '.img_picto($langs->trans("IbanNotValid"), 'warning');
@@ -1417,7 +1495,7 @@ if ($socid && $action != 'edit' && $action != 'create' && $action != 'editcard'
 			if (!empty($conf->prelevement->enabled)) {
 				// RUM
 				//print '<td>'.$prelevement->buildRumNumber($object->code_client, $rib->datec, $rib->id).'</td>';
-				print '<td>'.$rib->rum.'</td>';
+				print '<td class="tdoverflowmax100" title="'.dol_escape_htmltag($rib->rum).'">'.dol_escape_htmltag($rib->rum).'</td>';
 
 				print '<td>'.dol_print_date($rib->date_rum, 'day').'</td>';
 
@@ -1500,12 +1578,19 @@ if ($socid && $action != 'edit' && $action != 'create' && $action != 'editcard'
 			print $out;
 			print '</td>';
 
+			// Fields from hook
+			$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;
+
 			// Edit/Delete
 			print '<td class="right nowraponall">';
 			if ($permissiontoaddupdatepaymentinformation) {
-				print '<a class="editfielda marginrightonly marginleftonly" href="'.$_SERVER["PHP_SELF"].'?socid='.$object->id.'&id='.$rib->id.'&action=syncsepatostripe">';
-				print img_picto($langs->trans("CreateBAN"), 'stripe');
-				print '</a>';
+				if (empty($rib->stripe_card_ref)) {
+					print '<a class="editfielda marginrightonly marginleftonly" href="'.$_SERVER["PHP_SELF"].'?socid='.$object->id.'&id='.$rib->id.'&action=syncsepatostripe">';
+					print img_picto($langs->trans("CreateBAN"), 'stripe');
+					print '</a>';
+				}
 
 				print '<a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?socid='.$object->id.'&id='.$rib->id.'&action=edit">';
 				print img_picto($langs->trans("Modify"), 'edit');
@@ -1520,10 +1605,114 @@ if ($socid && $action != 'edit' && $action != 'create' && $action != 'editcard'
 			print '</tr>';
 		}
 
-		if (count($rib_list) == 0) {
-			$colspan = 9;
+
+		// List of remote BAN (if not already added as local)
+		foreach ($listofsources as $src) {
+			if (!empty($arrayofremoteban[$src->id])) {
+				continue; // Already in previous list
+			}
+
+			$nbremote++;
+
+			$imgline = '';
+			if ($src->object == 'source' && $src->type == 'sepa_debit') {
+				$imgline = '<span class="fa fa-university fa-2x fa-fw"></span>';
+			} elseif ($src->object == 'payment_method' && $src->type == 'sepa_debit') {
+				$imgline = '<span class="fa fa-university fa-2x fa-fw"></span>';
+			} else {
+				continue;
+			}
+
+			print '<tr class="oddeven">';
+			print '<td>';
+			print '</td>';
+			// Src ID
+			print '<td class="tdoverflowmax150">';
+			$connect = '';
+			if (!empty($stripeacc)) {
+				$connect = $stripeacc.'/';
+			}
+			//$url='https://dashboard.stripe.com/'.$connect.'test/sources/'.$src->id;
+			$url = 'https://dashboard.stripe.com/'.$connect.'test/search?query='.$src->id;
+			if ($servicestatus) {
+				//$url='https://dashboard.stripe.com/'.$connect.'sources/'.$src->id;
+				$url = 'https://dashboard.stripe.com/'.$connect.'search?query='.$src->id;
+			}
+			print "<a href='".$url."' target='_stripe'>".img_picto($langs->trans('ShowInStripe'), 'globe')."</a> ";
+			print $src->id;
+			print '</td>';
+			// Bank
+			print '<td>';
+			print'</td>';
+			// Account number
+			print '<td valign="middle">';
+			print '</td>';
+			// IBAN
+			print '<td valign="middle">';
+			//var_dump($src);
+			print '</td>';
+			// BIC
+			print '<td valign="middle">';
+			//var_dump($src);
+			print '</td>';
+
 			if (!empty($conf->prelevement->enabled)) {
-				$colspan += 2;
+				// RUM
+				print '<td valign="middle">';
+				//var_dump($src);
+				print '</td>';
+				// Date
+				print '<td valign="middle">';
+				//var_dump($src);
+				print '</td>';
+				// Mode mandate
+				print '<td valign="middle">';
+				//var_dump($src);
+				print '</td>';
+			}
+
+			// Default
+			print '<td class="center" width="50">';
+			if ((empty($customerstripe->invoice_settings) && $customerstripe->default_source != $src->id) ||
+				(!empty($customerstripe->invoice_settings) && $customerstripe->invoice_settings->default_payment_method != $src->id)) {
+					print '<a href="'.DOL_URL_ROOT.'/societe/paymentmodes.php?socid='.$object->id.'&source='.$src->id.'&action=setassourcedefault&token='.newToken().'">';
+					print img_picto($langs->trans("Default"), 'off');
+					print '</a>';
+			} else {
+				print img_picto($langs->trans("Default"), 'on');
+			}
+			print '</td>';
+			/*
+			print '<td>';
+			print $langs->trans("Remote");
+			//if ($src->cvc_check == 'fail') print ' - CVC check fail';
+			print '</td>';
+			*/
+
+			print '<td>';
+			print '</td>';
+
+			// Fields from hook
+			$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;
+
+			// Action column
+			print '<td class="right nowraponall">';
+			if ($permissiontoaddupdatepaymentinformation) {
+				print '<a class="marginleftonly marginrightonly" href="'.DOL_URL_ROOT.'/societe/paymentmodes.php?socid='.$object->id.'&source='.$src->id.'&action=delete&token='.newToken().'">';
+				print img_picto($langs->trans("Delete"), 'delete');
+				print '</a>';
+			}
+			print '</td>';
+
+			print '</tr>';
+		}
+
+		if ($nbremote == 0 && $nblocal == 0) {
+			$colspan = 10;
+			if (!empty($conf->prelevement->enabled)) {
+				$colspan += 3;
 			}
 			print '<tr><td colspan="'.$colspan.'"><span class="opacitymedium">'.$langs->trans("NoBANRecord").'</span></td></tr>';
 		}
@@ -1603,10 +1792,12 @@ if ($socid && $action == 'edit' && $permissiontoaddupdatepaymentinformation) {
 
 	print '<div class="underbanner clearboth"></div>';
 
+	print '<br>';
+
 	print '<div class="div-table-responsive-no-min">';
 	print '<table class="border centpercent">';
 
-	print '<tr><td class="titlefield fieldrequired">'.$langs->trans("LabelRIB").'</td>';
+	print '<tr><td class="titlefield fieldrequired">'.$langs->trans("Label").'</td>';
 	print '<td><input class="minwidth300" type="text" name="label" value="'.$companybankaccount->label.'"></td></tr>';
 
 	print '<tr><td class="fieldrequired">'.$langs->trans("BankName").'</td>';
@@ -1702,6 +1893,9 @@ if ($socid && $action == 'edit' && $permissiontoaddupdatepaymentinformation) {
 		print $form->selectarray("frstrecur", $tblArraychoice, dol_escape_htmltag(GETPOST('frstrecur', 'alpha') ?GETPOST('frstrecur', 'alpha') : $companybankaccount->frstrecur), 0);
 		print '</td></tr>';
 
+		print '<tr><td>'.$langs->trans("StripeID")." ('src_....')</td>";
+		print '<td><input class="minwidth300" type="text" name="stripe_card_ref" value="'.$companypaymentmode->stripe_card_ref.'"></td></tr>';
+
 		print '</table>';
 		print '</div>';
 	}
@@ -1720,9 +1914,12 @@ if ($socid && $action == 'editcard' && $permissiontoaddupdatepaymentinformation)
 
 	dol_banner_tab($object, 'socid', $linkback, ($user->socid ? 0 : 1), 'rowid', 'nom');
 
-	print '<div class="fichecenter">';
+	print '<div class="nofichecenter">';
 
 	print '<div class="underbanner clearboth"></div>';
+
+	print '<br>';
+
 	print '<table class="border centpercent">';
 
 	print '<tr><td class="titlefieldcreate fieldrequired">'.$langs->trans("Label").'</td>';
@@ -1766,9 +1963,12 @@ if ($socid && $action == 'create' && $permissiontoaddupdatepaymentinformation) {
 	print '<div class="nofichecenter">';
 
 	print '<div class="underbanner clearboth"></div>';
+
+	print '<br>';
+
 	print '<table class="border centpercent">';
 
-	print '<tr><td class="titlefieldcreate fieldrequired">'.$langs->trans("LabelRIB").'</td>';
+	print '<tr><td class="titlefieldcreate fieldrequired">'.$langs->trans("Label").'</td>';
 	print '<td><input class="minwidth200" type="text" id="label" name="label" value="'.(GETPOSTISSET('label') ? GETPOST('label') : $object->name).'"></td></tr>';
 
 	print '<tr><td class="fieldrequired">'.$langs->trans("Bank").'</td>';
@@ -1858,6 +2058,9 @@ if ($socid && $action == 'create' && $permissiontoaddupdatepaymentinformation) {
 		print $form->selectarray("frstrecur", $tblArraychoice, (GETPOSTISSET('frstrecur') ? GETPOST('frstrecur') : 'FRST'), 0);
 		print '</td></tr>';
 
+		print '<tr><td>'.$langs->trans("StripeID")." ('src_....')</td>";
+		print '<td><input class="minwidth300" type="text" name="stripe_card_ref" value="'.GETPOST('stripe_card_ref', 'alpha').'"></td></tr>';
+
 		print '</table>';
 	}
 
@@ -1881,6 +2084,9 @@ if ($socid && $action == 'createcard' && $permissiontoaddupdatepaymentinformatio
 	print '<div class="nofichecenter">';
 
 	print '<div class="underbanner clearboth"></div>';
+
+	print '<br>';
+
 	print '<table class="border centpercent">';
 
 	print '<tr><td class="titlefieldcreate fieldrequired">'.$langs->trans("Label").'</td>';
diff --git a/htdocs/stripe/class/stripe.class.php b/htdocs/stripe/class/stripe.class.php
index ea453b28412..cc8178d2a01 100644
--- a/htdocs/stripe/class/stripe.class.php
+++ b/htdocs/stripe/class/stripe.class.php
@@ -774,7 +774,7 @@ class Stripe extends CommonObject
 		$sql .= " WHERE sa.rowid = ".((int) $object->id); // We get record from ID, no need for filter on entity
 		$sql .= " AND sa.type = 'card'";
 
-		dol_syslog(get_class($this)."::fetch search stripe card id for paymentmode id=".$object->id.", stripeacc=".$stripeacc.", status=".$status.", createifnotlinkedtostripe=".$createifnotlinkedtostripe, LOG_DEBUG);
+		dol_syslog(get_class($this)."::cardStripe search stripe card id for paymentmode id=".$object->id.", stripeacc=".$stripeacc.", status=".$status.", createifnotlinkedtostripe=".$createifnotlinkedtostripe, LOG_DEBUG);
 		$resql = $this->db->query($sql);
 		if ($resql) {
 			$num = $this->db->num_rows($resql);
@@ -914,14 +914,14 @@ class Stripe extends CommonObject
 		$soc = new Societe($this->db);
 		$soc->fetch($object->fk_soc);
 
-		dol_syslog(get_class($this)."::fetch search stripe sepa(card) id for paymentmode id=".$object->id.", stripeacc=".$stripeacc.", status=".$status.", createifnotlinkedtostripe=".$createifnotlinkedtostripe, LOG_DEBUG);
+		dol_syslog(get_class($this)."::sepaStripe search stripe ban id for paymentmode id=".$object->id.", stripeacc=".$stripeacc.", status=".$status.", createifnotlinkedtostripe=".$createifnotlinkedtostripe, LOG_DEBUG);
 		$resql = $this->db->query($sql);
 		if ($resql) {
 			$num = $this->db->num_rows($resql);
 			if ($num) {
 				$obj = $this->db->fetch_object($resql);
 				$cardref = $obj->stripe_card_ref;
-				dol_syslog(get_class($this)."::cardStripe cardref=".$cardref);
+				dol_syslog(get_class($this)."::sepaStripe cardref=".$cardref);
 				if ($cardref) {
 					try {
 						if (empty($stripeacc)) {				// If the Stripe connect account not set, we use common API usage
@@ -990,7 +990,7 @@ class Stripe extends CommonObject
 								$sql = "UPDATE ".MAIN_DB_PREFIX."societe_rib";
 								$sql .= " SET stripe_card_ref = '".$this->db->escape($sepa->id)."', card_type = 'sepa_debit',";
 								$sql .= " stripe_account= '" . $this->db->escape($cu->id . "@" . $stripeacc) . "'";
-								$sql .= " WHERE rowid = '".$this->db->escape($object->id)."'";
+								$sql .= " WHERE rowid = ".((int) $object->id);
 								$sql .= " AND type = 'ban'";
 								$resql = $this->db->query($sql);
 								if (!$resql) {

From 9ffc4ef44db341bda78b59c103e2a8cc0e163fa7 Mon Sep 17 00:00:00 2001
From: UT from dolibit <45215329+dolibit-ut@users.noreply.github.com>
Date: Fri, 9 Sep 2022 08:53:38 +0200
Subject: [PATCH 815/974] Update exportcsv.php

---
 htdocs/opensurvey/exportcsv.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/htdocs/opensurvey/exportcsv.php b/htdocs/opensurvey/exportcsv.php
index 624fd620816..a7e8b709793 100644
--- a/htdocs/opensurvey/exportcsv.php
+++ b/htdocs/opensurvey/exportcsv.php
@@ -1,5 +1,4 @@
 <?php
-
 /* Copyright (C) 2013      Laurent Destailleur        <eldy@users.sourceforge.net>
  * Copyright (C) 2014      Marcos García              <marcosgdf@gmail.com>
  *

From 348682c3862d16db8835eaa2c7a79221597d8f2c Mon Sep 17 00:00:00 2001
From: UT from dolibit <45215329+dolibit-ut@users.noreply.github.com>
Date: Fri, 9 Sep 2022 09:43:50 +0200
Subject: [PATCH 816/974] Update pertype.php

---
 htdocs/comm/action/pertype.php | 71 +++++++++++++++++++++-------------
 1 file changed, 45 insertions(+), 26 deletions(-)

diff --git a/htdocs/comm/action/pertype.php b/htdocs/comm/action/pertype.php
index d21b20bbfaf..abfcc5951cf 100644
--- a/htdocs/comm/action/pertype.php
+++ b/htdocs/comm/action/pertype.php
@@ -23,20 +23,22 @@
 
 
 /**
- *  \file       htdocs/comm/action/pertype.php
- *  \ingroup    agenda
- *  \brief      Tab of calendar events per type
+ *    \file       htdocs/comm/action/pertype.php
+ *    \ingroup    agenda
+ *    \brief      Tab of calendar events per type
  */
 
+
+// Load Dolibarr environment
 require '../../main.inc.php';
-require_once DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php';
-require_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
-require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
-require_once DOL_DOCUMENT_ROOT.'/user/class/usergroup.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/agenda.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php';
+require_once DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php';
+require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
 require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
+require_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
+require_once DOL_DOCUMENT_ROOT.'/user/class/usergroup.class.php';
 
 
 if (!isset($conf->global->AGENDA_MAX_EVENTS_DAY_VIEW)) {
@@ -51,28 +53,35 @@ $filter = GETPOST("search_filter", 'alpha', 3) ? GETPOST("search_filter", 'alpha
 $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);
 //if (! ($usergroup > 0) && ! ($filtert > 0)) $filtert = $user->id;
-//$showbirthday = empty($conf->use_javascript_ajax)?GETPOST("showbirthday","int"):1;
-$showbirthday = 0;
+
+// $showbirthday = empty($conf->use_javascript_ajax)?GETPOST("showbirthday","int"):1;
+$showbirthday = 0;    // will be hidden here
 
 // If not choice done on calendar owner, we filter on user.
 if (empty($filtert) && empty($conf->global->AGENDA_ALL_CALENDARS)) {
 	$filtert = $user->id;
 }
 
+// Sorting
 $sortfield = GETPOST('sortfield', 'aZ09comma');
+if (!$sortfield) {
+	$sortfield = "a.datec";
+}
+
 $sortorder = GETPOST('sortorder', 'aZ09comma');
+if (!$sortorder) {
+	$sortorder = "ASC";
+}
+
+// Page
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 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;
 $offset = $limit * $page;
-if (!$sortorder) {
-	$sortorder = "ASC";
-}
-if (!$sortfield) {
-	$sortfield = "a.datec";
-}
+
+
 
 // Security check
 $socid = GETPOST("search_socid", "int") ?GETPOST("search_socid", "int") : GETPOST("socid", "int");
@@ -83,6 +92,7 @@ if ($socid < 0) {
 	$socid = '';
 }
 
+// Permissions
 $canedit = 1;
 if (empty($user->rights->agenda->myactions->read)) {
 	accessforbidden();
@@ -105,6 +115,7 @@ $status = GETPOSTISSET("search_status") ? GETPOST("search_status", 'alpha') : GE
 $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);
 $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)
 if (GETPOST('search_actioncode', 'array')) {
 	$actioncode = GETPOST('search_actioncode', 'array', 3);
@@ -117,11 +128,12 @@ if (GETPOST('search_actioncode', 'array')) {
 
 $dateselect = dol_mktime(0, 0, 0, GETPOST('dateselectmonth', 'int'), GETPOST('dateselectday', 'int'), GETPOST('dateselectyear', 'int'));
 if ($dateselect > 0) {
-	$day = GETPOST('dateselectday', 'int');
+	$day   = GETPOST('dateselectday', 'int');
 	$month = GETPOST('dateselectmonth', 'int');
-	$year = GETPOST('dateselectyear', 'int');
+	$year  = GETPOST('dateselectyear', 'int');
 }
 
+// working hours
 $tmp = empty($conf->global->MAIN_DEFAULT_WORKING_HOURS) ? '9-18' : $conf->global->MAIN_DEFAULT_WORKING_HOURS;
 $tmp = str_replace(' ', '', $tmp); // FIX 7533
 $tmparray = explode('-', $tmp);
@@ -137,6 +149,7 @@ if ($end_h <= $begin_h) {
 	$end_h = $begin_h + 1;
 }
 
+// working days
 $tmp = empty($conf->global->MAIN_DEFAULT_WORKING_DAYS) ? '1-5' : $conf->global->MAIN_DEFAULT_WORKING_DAYS;
 $tmp = str_replace(' ', '', $tmp); // FIX 7533
 $tmparray = explode('-', $tmp);
@@ -150,19 +163,24 @@ if (empty($mode) && !GETPOSTISSET('mode')) {
 	$mode = (empty($conf->global->AGENDA_DEFAULT_VIEW) ? 'show_month' : $conf->global->AGENDA_DEFAULT_VIEW);
 }
 
+// View by month
 if (GETPOST('viewcal', 'alpha') && $mode != 'show_day' && $mode != 'show_week' && $mode != 'show_peruser') {
 	$mode = 'show_month'; $day = '';
-}                                                   // View by month
+}
+// View by week
 if (GETPOST('viewweek', 'alpha') || $mode == 'show_week') {
 	$mode = 'show_week'; $week = ($week ? $week : date("W")); $day = ($day ? $day : date("d"));
-}  // View by week
+}
+// View by day
 if (GETPOST('viewday', 'alpha') || $mode == 'show_day') {
 	$mode = 'show_day'; $day = ($day ? $day : date("d"));
-}                                  // View by day
+}
+// View by year
 if (GETPOST('viewyear', 'alpha') || $mode == 'show_year') {
 	$mode = 'show_year';
-}                                  // View by year
+}
 
+// Initialize object
 $object = new ActionComm($db);
 
 // Load translation files required by the page
@@ -218,6 +236,7 @@ $parameters = array(
 	'resourceid' => $resourceid,
 	'usergroup' => $usergroup,
 );
+
 $reshook = $hookmanager->executeHooks('beforeAgendaPerType', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
 if ($reshook < 0) {
 	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
@@ -226,14 +245,14 @@ if ($reshook < 0) {
 $form = new Form($db);
 $companystatic = new Societe($db);
 
-$help_url = 'EN:Module_Agenda_En|FR:Module_Agenda|ES:M&oacute;dulo_Agenda';
+$help_url = 'EN:Module_Agenda_En|FR:Module_Agenda|ES:M&oacute;dulo_Agenda|DE:Modul_Terminplanung';
 llxHeader('', $langs->trans("Agenda"), $help_url);
 
 $now = dol_now();
 $nowarray = dol_getdate($now);
-$nowyear = $nowarray['year'];
+$nowyear  = $nowarray['year'];
 $nowmonth = $nowarray['mon'];
-$nowday = $nowarray['mday'];
+$nowday   = $nowarray['mday'];
 
 
 // Define list of all external calendars (global setup)
@@ -246,7 +265,7 @@ $first_year  = $year;
 
 $week = $prev['week'];
 
-$day = (int) $day;
+$day  = (int) $day;
 $next = dol_get_next_day($day, $month, $year);
 $next_year  = $year + 1;
 $next_month = $month;

From 68b72ac17d542473a34b9c031259f8abe779d3d6 Mon Sep 17 00:00:00 2001
From: lmarcouiller <lucas.marcouiller@gmail.com>
Date: Fri, 9 Sep 2022 10:06:16 +0200
Subject: [PATCH 817/974] Fix : php 8.1 warnings

---
 htdocs/compta/bank/annuel.php             |  3 +++
 htdocs/compta/bank/bankentries_list.php   |  2 +-
 htdocs/compta/bank/treso.php              |  2 +-
 htdocs/compta/paiement/cheque/list.php    |  2 ++
 htdocs/compta/prelevement/create.php      |  3 ++-
 htdocs/compta/prelevement/orders_list.php |  2 ++
 htdocs/hrm/skill_card.php                 | 13 +++++++------
 htdocs/stripe/payout.php                  |  8 ++++++--
 htdocs/stripe/transaction.php             | 13 ++++++++-----
 htdocs/user/bank.php                      |  6 +++---
 10 files changed, 35 insertions(+), 19 deletions(-)

diff --git a/htdocs/compta/bank/annuel.php b/htdocs/compta/bank/annuel.php
index 41d58cb35c2..dda1e4f0758 100644
--- a/htdocs/compta/bank/annuel.php
+++ b/htdocs/compta/bank/annuel.php
@@ -192,6 +192,9 @@ for ($mois = 1; $mois < 13; $mois++) {
 	print '<tr class="oddeven">';
 	print "<td>".dol_print_date(dol_mktime(1, 1, 1, $mois, 1, 2000), "%B")."</td>";
 	for ($annee = $year_start; $annee <= $year_end; $annee++) {
+		$totsorties[$annee] = 0;
+		$totentrees[$annee] = 0;
+
 		$case = sprintf("%04s-%02s", $annee, $mois);
 
 		print '<td class="right" width="10%">&nbsp;';
diff --git a/htdocs/compta/bank/bankentries_list.php b/htdocs/compta/bank/bankentries_list.php
index d9689202297..d89484174b7 100644
--- a/htdocs/compta/bank/bankentries_list.php
+++ b/htdocs/compta/bank/bankentries_list.php
@@ -1277,7 +1277,7 @@ if ($resql) {
 				}
 				// Extra fields
 				$element = 'banktransaction';
-				if (is_array($extrafields->attributes[$element]['label']) && count($extrafields->attributes[$element]['label'])) {
+				if (!empty($extrafields->attributes[$element]['label']) && is_array($extrafields->attributes[$element]['label']) && count($extrafields->attributes[$element]['label'])) {
 					foreach ($extrafields->attributes[$element]['label'] as $key => $val) {
 						if (!empty($arrayfields["ef.".$key]['checked'])) {
 							if (!empty($arrayfields[$key]['checked'])) {
diff --git a/htdocs/compta/bank/treso.php b/htdocs/compta/bank/treso.php
index 0d76b40a3e2..abbc4a62a46 100644
--- a/htdocs/compta/bank/treso.php
+++ b/htdocs/compta/bank/treso.php
@@ -293,7 +293,7 @@ if (GETPOST("account") || GETPOST("ref")) {
 				}
 				print "</td>";
 				print "<td>".$ref."</td>";
-				if ($conf->global->MULTICOMPANY_INVOICE_SHARING_ENABLED) {
+				if (getDolGlobalString("MULTICOMPANY_INVOICE_SHARING_ENABLED")) {
 					if ($tmpobj->family == 'invoice') {
 						$mc->getInfo($tmpobj->entity);
 						print "<td>".$mc->label."</td>";
diff --git a/htdocs/compta/paiement/cheque/list.php b/htdocs/compta/paiement/cheque/list.php
index 1c3abfe87bd..c8b828ebdd5 100644
--- a/htdocs/compta/paiement/cheque/list.php
+++ b/htdocs/compta/paiement/cheque/list.php
@@ -63,6 +63,8 @@ if (!$sortfield) {
 
 $year = GETPOST("year");
 $month = GETPOST("month");
+$optioncss = GETPOST('optioncss', 'alpha');
+$view = GETPOST("view", 'alpha');
 
 $form = new Form($db);
 $formother = new FormOther($db);
diff --git a/htdocs/compta/prelevement/create.php b/htdocs/compta/prelevement/create.php
index 832429fe012..21b65d57517 100644
--- a/htdocs/compta/prelevement/create.php
+++ b/htdocs/compta/prelevement/create.php
@@ -61,6 +61,7 @@ $offset = $limit * $page;
 $hookmanager->initHooks(array('directdebitcreatecard', 'globalcard'));
 
 // Security check
+$socid = GETPOST('socid', 'int');
 if ($user->socid) {
 	$socid = $user->socid;
 }
@@ -71,7 +72,7 @@ if ($type == 'bank-transfer') {
 }
 
 $error = 0;
-
+$option = "";
 
 /*
  * Actions
diff --git a/htdocs/compta/prelevement/orders_list.php b/htdocs/compta/prelevement/orders_list.php
index ee370b9532e..cc1e823c792 100644
--- a/htdocs/compta/prelevement/orders_list.php
+++ b/htdocs/compta/prelevement/orders_list.php
@@ -52,6 +52,8 @@ if (!$sortfield) {
 	$sortfield = "p.datec";
 }
 
+$optioncss = GETPOST('optioncss', 'alpha');
+
 // Get supervariables
 $statut = GETPOST('statut', 'int');
 $search_ref = GETPOST('search_ref', 'alpha');
diff --git a/htdocs/hrm/skill_card.php b/htdocs/hrm/skill_card.php
index 9093766d3ed..4fd3a0bc28b 100644
--- a/htdocs/hrm/skill_card.php
+++ b/htdocs/hrm/skill_card.php
@@ -47,7 +47,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   = GETPOST('lineid', 'int');
 
 // Initialize technical objects
 $object = new Skill($db);
@@ -577,7 +577,7 @@ if ($action != "create" && $action != "edit") {
 	$title = $langs->transnoentitiesnoconv("Skilldets");
 	$morejs = array();
 	$morecss = array();
-
+	$nbtotalofrecords = 0;
 
 	// Build and execute select
 	// --------------------------------------------------------------------
@@ -626,8 +626,10 @@ if ($action != "create" && $action != "edit") {
 		print '<input type="hidden" name="id" value="' . $id . '">';
 	}
 
-	$param_fk = "&fk_skill=" . $id . "&fk_user_creat=" . $user->rowid;
+	$param_fk = "&fk_skill=" . $id . "&fk_user_creat=" . (!empty($user->rowid) ? $user->rowid :0);
 	$backtopage = dol_buildpath('/hrm/skill_card.php', 1) . '?id=' . $id;
+	$param = "";
+	$massactionbutton = "";
 	//$newcardbutton = dolGetButtonTitle($langs->trans('New'), '', 'fa fa-plus-circle', dol_buildpath('/hrm/skilldet_card.php', 1) . '?action=create&backtopage=' . urlencode($_SERVER['PHP_SELF']) . $param_fk . '&backtopage=' . $backtopage, '', $permissiontoadd);
 
 	print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'object_' . $object->picto, 0, "", '', '', 0, 0, 1);
@@ -688,7 +690,7 @@ if ($action != "create" && $action != "edit") {
 		//          $cssforfield .= ($cssforfield ? ' ' : '') . 'right';
 		//      }
 		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, (!empty($cssforfield) ? 'class="' . $cssforfield . '"' : ''), $sortfield, $sortorder, (!empty($cssforfield) ? $cssforfield . ' ' : '')) . "\n";
 		}
 	}
 	print '<td></td>';
@@ -814,8 +816,7 @@ if ($action != "create" && $action != "edit") {
 		print '<tr><td colspan="' . $colspan . '" class="opacitymedium">' . $langs->trans("NoRecordFound") . '</td></tr>';
 	}
 
-
-	$db->free($resql);
+	if (!empty($resql)) $db->free($resql);
 
 	$parameters = array('arrayfields' => $arrayfields, 'sql' => $sql);
 	$reshook = $hookmanager->executeHooks('printFieldListFooter', $parameters, $objectline); // Note that $action and $objectline may have been modified by hook
diff --git a/htdocs/stripe/payout.php b/htdocs/stripe/payout.php
index a33c183a1e7..f78734b107f 100644
--- a/htdocs/stripe/payout.php
+++ b/htdocs/stripe/payout.php
@@ -51,6 +51,10 @@ if (empty($page) || $page == -1) {
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
+$optioncss = GETPOST('optioncss', 'alpha');
+$param = "";
+$num = 0;
+$totalnboflines = 0;
 
 $result = restrictedArea($user, 'banque');
 
@@ -95,12 +99,12 @@ if (!$rowid) {
 	print '<input type="hidden" name="page" value="'.$page.'">';
 
 	$title = $langs->trans("StripePayoutList");
-	$title .= ($stripeaccount ? ' (Stripe connection with Stripe OAuth Connect account '.$stripeacc.')' : ' (Stripe connection with keys from Stripe module setup)');
+	$title .= ($stripeacc ? ' (Stripe connection with Stripe OAuth Connect account '.$stripeacc.')' : ' (Stripe connection with keys from Stripe module setup)');
 
 	print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $totalnboflines, 'title_accountancy.png', 0, '', '', $limit);
 
 	print '<div class="div-table-responsive">';
-	print '<table class="tagtable liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n";
+	print '<table class="tagtable liste'.(!empty($moreforfilter) ? " listwithfilterbefore" : "").'">'."\n";
 
 	print '<tr class="liste_titre">';
 	print_liste_field_titre("Ref", $_SERVER["PHP_SELF"], "", "", "", "", $sortfield, $sortorder);
diff --git a/htdocs/stripe/transaction.php b/htdocs/stripe/transaction.php
index f04833ff107..509edc07509 100644
--- a/htdocs/stripe/transaction.php
+++ b/htdocs/stripe/transaction.php
@@ -52,7 +52,9 @@ $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
 $optioncss = GETPOST('optioncss', 'alpha');
-
+$param = "";
+$num = 0;
+$totalnboflines = 0;
 $result = restrictedArea($user, 'banque');
 
 
@@ -95,12 +97,12 @@ if (!$rowid) {
 	print '<input type="hidden" name="page" value="'.$page.'">';
 
 	$title = $langs->trans("StripeTransactionList");
-	$title .= ($stripeaccount ? ' (Stripe connection with Stripe OAuth Connect account '.$stripeacc.')' : ' (Stripe connection with keys from Stripe module setup)');
+	$title .= (!empty($stripeacc) ? ' (Stripe connection with Stripe OAuth Connect account '.$stripeacc.')' : ' (Stripe connection with keys from Stripe module setup)');
 
 	print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $totalnboflines, 'title_accountancy.png', 0, '', '', $limit);
 
 	print '<div class="div-table-responsive">';
-	print '<table class="tagtable liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n";
+	print '<table class="tagtable liste'.(!empty($moreforfilter) ? " listwithfilterbefore" : "").'">'."\n";
 
 	print '<tr class="liste_titre">';
 	print_liste_field_titre("Ref", $_SERVER["PHP_SELF"], "", "", "", "", $sortfield, $sortorder);
@@ -113,6 +115,7 @@ if (!$rowid) {
 	print_liste_field_titre("Fee", $_SERVER["PHP_SELF"], "", "", "", '', $sortfield, $sortorder, 'right ');
 	print_liste_field_titre("Status", $_SERVER["PHP_SELF"], "", "", "", '', '', '', 'right ');
 	print "</tr>\n";
+	$connect = "";
 
 	try {
 		if ($stripeacc) {
@@ -146,7 +149,7 @@ if (!$rowid) {
 			else
 			{
 				$memberstatic->id = 0;
-			}*/
+			}
 
 			$societestatic->fetch($charge->metadata->idcustomer);
 			$societestatic->id = $charge->metadata->idcustomer;
@@ -155,7 +158,7 @@ if (!$rowid) {
 			$societestatic->admin = $obj->admin;
 			$societestatic->login = $obj->login;
 			$societestatic->email = $obj->email;
-			$societestatic->societe_id = $obj->fk_soc;
+			$societestatic->societe_id = $obj->fk_soc;*/
 
 			print '<tr class="oddeven">';
 
diff --git a/htdocs/user/bank.php b/htdocs/user/bank.php
index 4f3ee5c32c8..69f83259f31 100644
--- a/htdocs/user/bank.php
+++ b/htdocs/user/bank.php
@@ -646,9 +646,9 @@ if ($action != 'edit' && $action != 'create') {		// If not bank account yet, $ac
 				$salary->paye = $objp->paye;
 				$salary->amount = $objp->amount;
 
-				$payment_salary->id = $objp->rowid;
-				$payment_salary->ref = $objp->ref;
-				$payment_salary->datep = $db->jdate($objp->datep);
+				$payment_salary->id = !empty($objp->rowid) ? $objp->rowid : 0;
+				$payment_salary->ref = !empty($objp->ref) ? $objp->ref : "";
+				$payment_salary->datep = $db->jdate(!empty($objp->datep) ? $objp->datep : "");
 
 				print '<tr class="oddeven">';
 				print '<td class="nowraponall">';

From e53457732051ad84e751208d5afa2be1b605185a Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Fri, 9 Sep 2022 10:12:30 +0200
Subject: [PATCH 818/974] fix : Typo

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

diff --git a/htdocs/core/actions_linkedfiles.inc.php b/htdocs/core/actions_linkedfiles.inc.php
index 86d4e923131..f11058312d1 100644
--- a/htdocs/core/actions_linkedfiles.inc.php
+++ b/htdocs/core/actions_linkedfiles.inc.php
@@ -41,8 +41,8 @@ if ((GETPOST('sendit', 'alpha')
 	|| ($action == 'confirm_deletefile' && $confirm == 'yes')
 	|| ($action == 'confirm_updateline' && GETPOST('save', 'alpha') && GETPOST('link', 'alpha'))
 	|| ($action == 'renamefile' && GETPOST('renamefilesave', 'alpha'))) && empty($permissiontoadd)) {
-	dol_syslog('The file actions_linkedfiles.inc.php was included but paramater $permissiontoadd as not set before.');
-	print 'The file actions_linkedfiles.inc.php was included but paramater $permissiontoadd as not set before.';
+	dol_syslog('The file actions_linkedfiles.inc.php was included but parameter $permissiontoadd was not set before.');
+	print 'The file actions_linkedfiles.inc.php was included but parameter $permissiontoadd was not set before.';
 	die;
 }
 

From ab9652db5f960d177089c51e38a0633c5c179d75 Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Fri, 9 Sep 2022 10:23:07 +0200
Subject: [PATCH 819/974] update code toward php8 compliance

---
 htdocs/adherents/card.php | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/htdocs/adherents/card.php b/htdocs/adherents/card.php
index 6816023f8de..b9e04015d7d 100644
--- a/htdocs/adherents/card.php
+++ b/htdocs/adherents/card.php
@@ -110,10 +110,10 @@ if ($id > 0 || !empty($ref)) {
 }
 
 // Define variables to determine what the current user can do on the members
-$canaddmember = $user->rights->adherent->creer;
+$canaddmember = $user->hasRight('adherent', 'creer');
 // Define variables to determine what the current user can do on the properties of a member
 if ($id) {
-	$caneditfieldmember = $user->rights->adherent->creer;
+	$caneditfieldmember = $user->hasRight('adherent', 'creer');
 }
 
 // Security check
@@ -246,7 +246,7 @@ if (empty($reshook)) {
 		}
 	}
 
-	if ($action == 'update' && !$cancel && $user->rights->adherent->creer) {
+	if ($action == 'update' && !$cancel && $user->hasRight('adherent', 'creer')) {
 		require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 
 		$birthdate = '';
@@ -421,7 +421,7 @@ if (empty($reshook)) {
 		}
 	}
 
-	if ($action == 'add' && $user->rights->adherent->creer) {
+	if ($action == 'add' && $user->hasRight('adherent', 'creer')) {
 		if ($canvas) {
 			$object->canvas = $canvas;
 		}
@@ -629,7 +629,7 @@ if (empty($reshook)) {
 		}
 	}
 
-	if ($user->rights->adherent->creer && $action == 'confirm_valid' && $confirm == 'yes') {
+	if ($user->hasRight('adherent', 'creer') && $action == 'confirm_valid' && $confirm == 'yes') {
 		$error = 0;
 
 		$db->begin();
@@ -854,7 +854,7 @@ if (empty($reshook)) {
 		}
 	}
 
-	if ($user->rights->adherent->creer && $action == 'confirm_add_spip' && $confirm == 'yes') {
+	if ($user->hasRight('adherent', 'creer') && $action == 'confirm_add_spip' && $confirm == 'yes') {
 		if (!count($object->errors)) {
 			if (!$mailmanspip->add_to_spip($object)) {
 				setEventMessages($langs->trans('AddIntoSpipError').': '.$mailmanspip->error, null, 'errors');
@@ -867,7 +867,7 @@ if (empty($reshook)) {
 
 	// Actions to build doc
 	$upload_dir = $conf->adherent->dir_output;
-	$permissiontoadd = $user->rights->adherent->creer;
+	$permissiontoadd = $user->hasRight('adherent', 'creer');
 	include DOL_DOCUMENT_ROOT.'/core/actions_builddoc.inc.php';
 
 	// Actions to send emails
@@ -1222,7 +1222,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 
 		// Type
 		print '<tr><td class="fieldrequired">'.$langs->trans("Type").'</td><td>';
-		if ($user->rights->adherent->creer) {
+		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);
 		} else {
 			print $adht->getNomUrl(1);
@@ -1820,7 +1820,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 		// Third party Dolibarr
 		if (isModEnabled('societe')) {
 			print '<tr><td>';
-			$editenable = $user->rights->adherent->creer;
+			$editenable = $user->hasRight('adherent', 'creer');
 			print $form->editfieldkey('LinkedToDolibarrThirdParty', 'thirdparty', '', $object, $editenable);
 			print '</td><td colspan="2" class="valeur">';
 			if ($action == 'editthirdparty') {
@@ -1857,7 +1857,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 
 		// Login Dolibarr - Link to user
 		print '<tr><td>';
-		$editenable = $user->rights->adherent->creer && $user->rights->user->user->creer;
+		$editenable = $user->hasRight('adherent', 'creer') && $user->rights->user->user->creer;
 		print $form->editfieldkey('LinkedToDolibarrUser', 'login', '', $object, $editenable);
 		print '</td><td colspan="2" class="valeur">';
 		if ($action == 'editlogin') {
@@ -1901,7 +1901,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 				// Send card by email
 				// TODO Remove this to replace with a template
 				/*
-				if ($user->rights->adherent->creer) {
+				if ($user->hasRight('adherent', 'creer')) {
 					if (Adherent::STATUS_VALIDATED == $object->statut) {
 						if ($object->email) print '<a class="butAction" href="card.php?rowid='.$object->id.'&action=sendinfo">'.$langs->trans("SendCardByMail")."</a>\n";
 						else print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NoEMail")).'">'.$langs->trans("SendCardByMail")."</a>\n";
@@ -1913,7 +1913,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 				}*/
 
 				// Modify
-				if (!empty($user->rights->adherent->creer)) {
+				if ($user->hasRight('adherent', 'creer')) {
 					print '<a class="butAction" href="card.php?rowid='.$id.'&action=edit&token='.newToken().'">'.$langs->trans("Modify").'</a>'."\n";
 				} else {
 					print '<span class="butActionRefused classfortooltip" title="'.dol_escape_htmltag($langs->trans("NotEnoughPermissions")).'">'.$langs->trans("Modify").'</span>'."\n";
@@ -1921,7 +1921,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 
 				// Validate
 				if (Adherent::STATUS_DRAFT == $object->statut) {
-					if ($user->rights->adherent->creer) {
+					if ($user->hasRight('adherent', 'creer')) {
 						print '<a class="butAction" href="card.php?rowid='.$id.'&action=valid">'.$langs->trans("Validate").'</a>'."\n";
 					} else {
 						print '<span class="butActionRefused classfortooltip" title="'.dol_escape_htmltag($langs->trans("NotEnoughPermissions")).'">'.$langs->trans("Validate").'</span>'."\n";
@@ -1930,7 +1930,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 
 				// Reactivate
 				if (Adherent::STATUS_RESILIATED == $object->statut || Adherent::STATUS_EXCLUDED == $object->statut) {
-					if ($user->rights->adherent->creer) {
+					if ($user->hasRight('adherent', 'creer')) {
 						print '<a class="butAction" href="card.php?rowid='.$id.'&action=valid">'.$langs->trans("Reenable")."</a>\n";
 					} else {
 						print '<span class="butActionRefused classfortooltip" title="'.dol_escape_htmltag($langs->trans("NotEnoughPermissions")).'">'.$langs->trans("Reenable").'</span>'."\n";
@@ -2022,7 +2022,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 			$filedir = $conf->adherent->dir_output.'/'.get_exdir(0, 0, 0, 1, $object, 'member');
 			$urlsource = $_SERVER['PHP_SELF'].'?id='.$object->id;
 			$genallowed = $user->rights->adherent->lire;
-			$delallowed = $user->rights->adherent->creer;
+			$delallowed = $user->hasRight('adherent', 'creer');
 
 			print $formfile->showdocuments('member', $filename, $filedir, $urlsource, $genallowed, $delallowed, $object->model_pdf, 1, 0, 0, 28, 0, '', '', '', (empty($object->default_lang) ? '' : $object->default_lang), '', $object);
 			$somethingshown = $formfile->numoffiles;

From 1bacb20a872cb1a16bf3b5f991dcea734cb9e824 Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Fri, 9 Sep 2022 10:24:38 +0200
Subject: [PATCH 820/974] update code toward php8 compliance

---
 htdocs/adherents/document.php |  8 ++++----
 htdocs/adherents/ldap.php     |  4 ++--
 htdocs/adherents/list.php     | 12 ++++++------
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/htdocs/adherents/document.php b/htdocs/adherents/document.php
index c8282179fe5..2170fe0ab62 100644
--- a/htdocs/adherents/document.php
+++ b/htdocs/adherents/document.php
@@ -87,10 +87,10 @@ if ($id > 0 || !empty($ref)) {
 }
 
 // Define variables to determine what the current user can do on the members
-$canaddmember = $user->rights->adherent->creer;
+$canaddmember = $user->hasRight('adherent', 'creer');
 // Define variables to determine what the current user can do on the properties of a member
 if ($id) {
-	$caneditfieldmember = $user->rights->adherent->creer;
+	$caneditfieldmember = $user->hasRight('adherent', 'creer');
 }
 
 $permissiontoadd = $canaddmember;
@@ -186,8 +186,8 @@ if ($id > 0) {
 		print dol_get_fiche_end();
 
 		$modulepart = 'member';
-		$permissiontoadd = $user->rights->adherent->creer;
-		$permtoedit = $user->rights->adherent->creer;
+		$permissiontoadd = $user->hasRight('adherent', 'creer');
+		$permtoedit = $user->hasRight('adherent', 'creer');
 		$param = '&id='.$object->id;
 		include DOL_DOCUMENT_ROOT.'/core/tpl/document_actions_post_headers.tpl.php';
 		print "<br><br>";
diff --git a/htdocs/adherents/ldap.php b/htdocs/adherents/ldap.php
index db87e514cb5..6a25b57b532 100644
--- a/htdocs/adherents/ldap.php
+++ b/htdocs/adherents/ldap.php
@@ -62,10 +62,10 @@ if ($id > 0 || !empty($ref)) {
 }
 
 // Define variables to determine what the current user can do on the members
-$canaddmember = $user->rights->adherent->creer;
+$canaddmember = $user->hasRight('adherent', 'creer');
 // Define variables to determine what the current user can do on the properties of a member
 if ($id) {
-	$caneditfieldmember = $user->rights->adherent->creer;
+	$caneditfieldmember = $user->hasRight('adherent', 'creer');
 }
 
 // Security check
diff --git a/htdocs/adherents/list.php b/htdocs/adherents/list.php
index 98d75c9fefb..b0e63098322 100644
--- a/htdocs/adherents/list.php
+++ b/htdocs/adherents/list.php
@@ -232,7 +232,7 @@ if (empty($reshook)) {
 	}
 
 	// Close
-	if ($massaction == 'close' && $user->rights->adherent->creer) {
+	if ($massaction == 'close' && $user->hasRight('adherent', 'creer')) {
 		$tmpmember = new Adherent($db);
 		$error = 0;
 		$nbclose = 0;
@@ -262,7 +262,7 @@ if (empty($reshook)) {
 	}
 
 	// Create external user
-	if ($massaction == 'createexternaluser' && $user->rights->adherent->creer && $user->rights->user->user->creer) {
+	if ($massaction == 'createexternaluser' && $user->hasRight('adherent', 'creer') && $user->rights->user->user->creer) {
 		$tmpmember = new Adherent($db);
 		$error = 0;
 		$nbcreated = 0;
@@ -302,7 +302,7 @@ if (empty($reshook)) {
 	$objectlabel = 'Members';
 	$permissiontoread = $user->rights->adherent->lire;
 	$permissiontodelete = $user->rights->adherent->supprimer;
-	$permissiontoadd = $user->rights->adherent->creer;
+	$permissiontoadd = $user->hasRight('adherent', 'creer');
 	$uploaddir = $conf->adherent->dir_output;
 	include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php';
 }
@@ -617,7 +617,7 @@ $arrayofmassactions = array(
 	//'presend'=>img_picto('', 'email', 'class="pictofixedwidth"').$langs->trans("SendByMail"),
 	//'builddoc'=>img_picto('', 'pdf', 'class="pictofixedwidth"').$langs->trans("PDFMerge"),
 );
-if ($user->rights->adherent->creer) {
+if ($user->hasRight('adherent', 'creer')) {
 	$arrayofmassactions['close'] = img_picto('', 'close_title', 'class="pictofixedwidth"').$langs->trans("Resiliate");
 }
 if ($user->rights->adherent->supprimer) {
@@ -626,7 +626,7 @@ if ($user->rights->adherent->supprimer) {
 if ($user->rights->societe->creer) {
 	$arrayofmassactions['preaffecttag'] = img_picto('', 'category', 'class="pictofixedwidth"').$langs->trans("AffectTag");
 }
-if ($user->rights->adherent->creer && $user->rights->user->user->creer) {
+if ($user->hasRight('adherent', 'creer') && $user->rights->user->user->creer) {
 	$arrayofmassactions['createexternaluser'] = img_picto('', 'user', 'class="pictofixedwidth"').$langs->trans("CreateExternalUser");
 }
 if (GETPOST('nomassaction', 'int') || in_array($massaction, array('presend', 'predelete', 'preaffecttag'))) {
@@ -635,7 +635,7 @@ if (GETPOST('nomassaction', 'int') || in_array($massaction, array('presend', 'pr
 $massactionbutton = $form->selectMassAction('', $arrayofmassactions);
 
 $newcardbutton = '';
-if ($user->rights->adherent->creer) {
+if ($user->hasRight('adherent', 'creer')) {
 	$newcardbutton .= dolGetButtonTitle($langs->trans('NewMember'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/adherents/card.php?action=create');
 }
 

From b411ec8b596c0a9bd6ee7deaa006904f23f4963f Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Fri, 9 Sep 2022 10:26:01 +0200
Subject: [PATCH 821/974] update code toward php8 compliance

---
 htdocs/adherents/note.php         | 8 ++++----
 htdocs/adherents/subscription.php | 8 ++++----
 htdocs/adherents/type.php         | 2 +-
 htdocs/adherents/vcard.php        | 4 ++--
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/htdocs/adherents/note.php b/htdocs/adherents/note.php
index 7e445e41a37..ea5e22fe153 100644
--- a/htdocs/adherents/note.php
+++ b/htdocs/adherents/note.php
@@ -51,7 +51,7 @@ if ($result > 0) {
 }
 
 
-$permissionnote = $user->rights->adherent->creer; // Used by the include of actions_setnotes.inc.php
+$permissionnote = $user->hasRight('adherent', 'creer'); // Used by the include of actions_setnotes.inc.php
 
 // Fetch object
 if ($id > 0 || !empty($ref)) {
@@ -71,10 +71,10 @@ if ($id > 0 || !empty($ref)) {
 }
 
 // Define variables to determine what the current user can do on the members
-$canaddmember = $user->rights->adherent->creer;
+$canaddmember = $user->hasRight('adherent', 'creer');
 // Define variables to determine what the current user can do on the properties of a member
 if ($id) {
-	$caneditfieldmember = $user->rights->adherent->creer;
+	$caneditfieldmember = $user->hasRight('adherent', 'creer');
 }
 
 $hookmanager->initHooks(array('membernote'));
@@ -155,7 +155,7 @@ if ($id) {
 
 
 	$cssclass = 'titlefield';
-	$permission = $user->rights->adherent->creer; // Used by the include of notes.tpl.php
+	$permission = $user->hasRight('adherent', 'creer'); // Used by the include of notes.tpl.php
 	include DOL_DOCUMENT_ROOT.'/core/tpl/notes.tpl.php';
 
 
diff --git a/htdocs/adherents/subscription.php b/htdocs/adherents/subscription.php
index 67c2ffef1d0..8700c3669ea 100644
--- a/htdocs/adherents/subscription.php
+++ b/htdocs/adherents/subscription.php
@@ -112,10 +112,10 @@ if ($id > 0 || !empty($ref)) {
 }
 
 // Define variables to determine what the current user can do on the members
-$canaddmember = $user->rights->adherent->creer;
+$canaddmember = $user->hasRight('adherent', 'creer');
 // Define variables to determine what the current user can do on the properties of a member
 if ($id) {
-	$caneditfieldmember = $user->rights->adherent->creer;
+	$caneditfieldmember = $user->hasRight('adherent', 'creer');
 }
 
 // Security check
@@ -594,7 +594,7 @@ if ($rowid > 0) {
 		print '<table class="nobordernopadding" width="100%"><tr><td>';
 		print $langs->trans("LinkedToDolibarrThirdParty");
 		print '</td>';
-		if ($action != 'editthirdparty' && $user->rights->adherent->creer) {
+		if ($action != 'editthirdparty' && $user->hasRight('adherent', 'creer')) {
 			print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editthirdparty&token='.newToken().'&rowid='.$object->id.'">'.img_edit($langs->trans('SetLinkToThirdParty'), 1).'</a></td>';
 		}
 		print '</tr></table>';
@@ -636,7 +636,7 @@ if ($rowid > 0) {
 	print '<table class="nobordernopadding" width="100%"><tr><td>';
 	print $langs->trans("LinkedToDolibarrUser");
 	print '</td>';
-	if ($action != 'editlogin' && $user->rights->adherent->creer) {
+	if ($action != 'editlogin' && $user->hasRight('adherent', 'creer')) {
 		print '<td class="right">';
 		if ($user->rights->user->user->creer) {
 			print '<a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editlogin&token='.newToken().'&rowid='.$object->id.'">'.img_edit($langs->trans('SetLinkToUser'), 1).'</a>';
diff --git a/htdocs/adherents/type.php b/htdocs/adherents/type.php
index b6463e006a9..df74a1e33b7 100644
--- a/htdocs/adherents/type.php
+++ b/htdocs/adherents/type.php
@@ -753,7 +753,7 @@ if ($rowid > 0) {
 
 				// Actions
 				print '<td class="center">';
-				if ($user->rights->adherent->creer) {
+				if ($user->hasRight('adherent', 'creer')) {
 					print '<a class="editfielda marginleftonly" href="card.php?rowid='.$objp->rowid.'&action=edit&token='.newToken().'&backtopage='.urlencode($_SERVER["PHP_SELF"].'?rowid='.$object->id).'">'.img_edit().'</a>';
 				}
 				if ($user->rights->adherent->supprimer) {
diff --git a/htdocs/adherents/vcard.php b/htdocs/adherents/vcard.php
index 902206c7874..235488b1290 100644
--- a/htdocs/adherents/vcard.php
+++ b/htdocs/adherents/vcard.php
@@ -53,10 +53,10 @@ if ($id > 0 || !empty($ref)) {
 }
 
 // Define variables to determine what the current user can do on the members
-$canaddmember = $user->rights->adherent->creer;
+$canaddmember = $user->hasRight('adherent', 'creer');
 // Define variables to determine what the current user can do on the properties of a member
 if ($id) {
-	$caneditfieldmember = $user->rights->adherent->creer;
+	$caneditfieldmember = $user->hasRight('adherent', 'creer');
 }
 
 // Security check

From 9027e2b96b9b7ae6054330cd9ce6d3878b9f7d14 Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Fri, 9 Sep 2022 10:28:00 +0200
Subject: [PATCH 822/974] update code toward php8 compliance

---
 .../adherents/canvas/default/tpl/adherentcard_view.tpl.php  | 4 ++--
 htdocs/adherents/class/api_members.class.php                | 6 +++---
 htdocs/adherents/class/api_subscriptions.class.php          | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/htdocs/adherents/canvas/default/tpl/adherentcard_view.tpl.php b/htdocs/adherents/canvas/default/tpl/adherentcard_view.tpl.php
index 696520f79d4..4b0eed154c0 100644
--- a/htdocs/adherents/canvas/default/tpl/adherentcard_view.tpl.php
+++ b/htdocs/adherents/canvas/default/tpl/adherentcard_view.tpl.php
@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2010-2012 Regis Houssin  <regis.houssin@inodbox.com>
- * Copyright (C) 2012      Philippe Grand <philippe.grand@atoo-net.com>
+ * Copyright (C) 2012-2022 Philippe Grand <philippe.grand@atoo-net.com>
  *
  * This 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,7 +124,7 @@ if (!empty($this->control->tpl['action_delete'])) {
 if (empty($user->socid)) {
 	echo '<div class="tabsAction">';
 
-	if ($user->rights->adherent->creer) {
+	if ($user->hasRight('adherent', 'creer')) {
 		echo '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$this->control->tpl['id'].'&action=edit&token='.newToken().'&canvas='.$canvas.'">'.$langs->trans('Modify').'</a>';
 	}
 
diff --git a/htdocs/adherents/class/api_members.class.php b/htdocs/adherents/class/api_members.class.php
index d30e851b9a2..35ab65e9d82 100644
--- a/htdocs/adherents/class/api_members.class.php
+++ b/htdocs/adherents/class/api_members.class.php
@@ -2,7 +2,7 @@
 /* Copyright (C) 2016	Xebax Christy	<xebax@wanadoo.fr>
  * 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) 2020	Frédéric France	<frederic.france@netlogic.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -286,7 +286,7 @@ class Members extends DolibarrApi
 	 */
 	public function post($request_data = null)
 	{
-		if (!DolibarrApiAccess::$user->rights->adherent->creer) {
+		if (!DolibarrApiAccess::$user->hasRight('adherent', 'creer')) {
 			throw new RestException(401);
 		}
 		// Check mandatory fields
@@ -311,7 +311,7 @@ class Members extends DolibarrApi
 	 */
 	public function put($id, $request_data = null)
 	{
-		if (!DolibarrApiAccess::$user->rights->adherent->creer) {
+		if (!DolibarrApiAccess::$user->hasRight('adherent', 'creer')) {
 			throw new RestException(401);
 		}
 
diff --git a/htdocs/adherents/class/api_subscriptions.class.php b/htdocs/adherents/class/api_subscriptions.class.php
index f969017146b..0512ea46b20 100644
--- a/htdocs/adherents/class/api_subscriptions.class.php
+++ b/htdocs/adherents/class/api_subscriptions.class.php
@@ -173,7 +173,7 @@ class Subscriptions extends DolibarrApi
 	 */
 	public function put($id, $request_data = null)
 	{
-		if (!DolibarrApiAccess::$user->rights->adherent->creer) {
+		if (!DolibarrApiAccess::$user->hasRight('adherent', 'creer')) {
 			throw new RestException(401);
 		}
 

From b3d0be6b6b7c8bf97bbd403484b202625afc96c6 Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Fri, 9 Sep 2022 10:29:27 +0200
Subject: [PATCH 823/974] update code toward php8 compliance

---
 htdocs/categories/class/api_categories.class.php | 8 ++++----
 htdocs/categories/viewcat.php                    | 6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/htdocs/categories/class/api_categories.class.php b/htdocs/categories/class/api_categories.class.php
index d5345106093..76381c0d53d 100644
--- a/htdocs/categories/class/api_categories.class.php
+++ b/htdocs/categories/class/api_categories.class.php
@@ -386,7 +386,7 @@ class Categories extends DolibarrApi
 			}
 			$object = new Contact($this->db);
 		} elseif ($type === Categorie::TYPE_MEMBER) {
-			if (!DolibarrApiAccess::$user->rights->adherent->creer) {
+			if (!DolibarrApiAccess::$user->hasRight('adherent', 'creer')) {
 				throw new RestException(401);
 			}
 			$object = new Adherent($this->db);
@@ -466,7 +466,7 @@ class Categories extends DolibarrApi
 			}
 			$object = new Contact($this->db);
 		} elseif ($type === Categorie::TYPE_MEMBER) {
-			if (!DolibarrApiAccess::$user->rights->adherent->creer) {
+			if (!DolibarrApiAccess::$user->hasRight('adherent', 'creer')) {
 				throw new RestException(401);
 			}
 			$object = new Adherent($this->db);
@@ -546,7 +546,7 @@ class Categories extends DolibarrApi
 			}
 			$object = new Contact($this->db);
 		} elseif ($type === Categorie::TYPE_MEMBER) {
-			if (!DolibarrApiAccess::$user->rights->adherent->creer) {
+			if (!DolibarrApiAccess::$user->hasRight('adherent', 'creer')) {
 				throw new RestException(401);
 			}
 			$object = new Adherent($this->db);
@@ -624,7 +624,7 @@ class Categories extends DolibarrApi
 			}
 			$object = new Contact($this->db);
 		} elseif ($type === Categorie::TYPE_MEMBER) {
-			if (!DolibarrApiAccess::$user->rights->adherent->creer) {
+			if (!DolibarrApiAccess::$user->hasRight('adherent', 'creer')) {
 				throw new RestException(401);
 			}
 			$object = new Adherent($this->db);
diff --git a/htdocs/categories/viewcat.php b/htdocs/categories/viewcat.php
index 0e5da0735ce..6ed4622ac00 100644
--- a/htdocs/categories/viewcat.php
+++ b/htdocs/categories/viewcat.php
@@ -117,7 +117,7 @@ if ($id > 0 && $removeelem > 0 && $action == 'unlink') {
 		$tmpobject = new Societe($db);
 		$result = $tmpobject->fetch($removeelem);
 		$elementtype = 'customer';
-	} elseif ($type == Categorie::TYPE_MEMBER && $user->rights->adherent->creer) {
+	} elseif ($type == Categorie::TYPE_MEMBER && $user->hasRight('adherent', 'creer')) {
 		require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
 		$tmpobject = new Adherent($db);
 		$result = $tmpobject->fetch($removeelem);
@@ -733,7 +733,7 @@ if ($type == Categorie::TYPE_MEMBER) {
 	if ($user->hasRight("adherent", "read")) {
 		require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
 
-		$permission = $user->rights->adherent->creer;
+		$permission = $user->hasRight('adherent', 'creer');
 
 		$prods = $object->getObjectsInCateg($type, 0, $limit, $offset);
 		if ($prods < 0) {
@@ -768,7 +768,7 @@ if ($type == Categorie::TYPE_MEMBER) {
 
 			print '<br>';
 			$param = '&limit='.$limit.'&id='.$id.'&type='.$type; $num = count($prods); $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->rights->adherent->creer);
+			$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'));
 			print_barre_liste($langs->trans("Member"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'members', 0, $newcardbutton, '', $limit);
 
 			print "<table class='noborder' width='100%'>\n";

From f1a68d9272448f60d4f0417dd342a3b3d3c722d7 Mon Sep 17 00:00:00 2001
From: UT from dolibit <45215329+dolibit-ut@users.noreply.github.com>
Date: Fri, 9 Sep 2022 10:36:08 +0200
Subject: [PATCH 824/974] Update modZapier.class.php

IMHO in this case is  *require_once*  instead of  *include_one*  more correct
---
 htdocs/core/modules/modZapier.class.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/htdocs/core/modules/modZapier.class.php b/htdocs/core/modules/modZapier.class.php
index c92de9d5909..b0a1daf642e 100644
--- a/htdocs/core/modules/modZapier.class.php
+++ b/htdocs/core/modules/modZapier.class.php
@@ -13,8 +13,9 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
+
 /**
  *  \defgroup   zapier     Module Zapier
  *  \brief      Zapier module descriptor.
@@ -23,7 +24,8 @@
  *  \ingroup    zapier
  *  \brief      Description and activation file for the module Zapier
  */
-include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';
+
+require_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';
 
 /**
  *  Description and activation class for module Zapier

From 86d777009e4aa54466996a8cd45ff985bc80c032 Mon Sep 17 00:00:00 2001
From: lmarcouiller <lucas.marcouiller@gmail.com>
Date: Fri, 9 Sep 2022 11:09:53 +0200
Subject: [PATCH 825/974] fix : scrutinaizer report

---
 htdocs/core/class/html.formticket.class.php |  1 +
 htdocs/projet/class/projectstats.class.php  | 18 +++++++++++++++++-
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/htdocs/core/class/html.formticket.class.php b/htdocs/core/class/html.formticket.class.php
index 1a48da2f752..7c5007ddca2 100644
--- a/htdocs/core/class/html.formticket.class.php
+++ b/htdocs/core/class/html.formticket.class.php
@@ -77,6 +77,7 @@ class FormTicket
 
 	public $withtitletopic;
 	public $withtopicreadonly;
+	public $withreadid;
 	public $withcompany; // affiche liste déroulante company
 	public $withfromsocid;
 	public $withfromcontactid;
diff --git a/htdocs/projet/class/projectstats.class.php b/htdocs/projet/class/projectstats.class.php
index f1295c10424..322277187f7 100644
--- a/htdocs/projet/class/projectstats.class.php
+++ b/htdocs/projet/class/projectstats.class.php
@@ -32,6 +32,11 @@ class ProjectStats extends Stats
 	public $status;
 	public $opp_status;
 
+	//SQL stat
+	public $field;
+	public $from;
+	public $where;
+
 
 	/**
 	 * Constructor
@@ -46,6 +51,18 @@ class ProjectStats extends Stats
 
 		require_once 'project.class.php';
 		$this->project = new Project($this->db);
+
+		$this->from = MAIN_DB_PREFIX.$this->project->table_element;
+		$this->field = 'opp_amount';
+		$this->where = " entity = ".$conf->entity;
+		if ($this->socid > 0) {
+			$this->where .= " AND fk_soc = ".((int) $this->socid);
+		}
+		if (is_array($this->userid) && count($this->userid) > 0) {
+			$this->where .= ' AND fk_user IN ('.$this->db->sanitize(join(',', $this->userid)).')';
+		} elseif ($this->userid > 0) {
+			$this->where .= " AND fk_user = ".((int) $this->userid);
+		}
 	}
 
 
@@ -538,7 +555,6 @@ class ProjectStats extends Stats
 	{
 		$sql = "SELECT date_format(datef,'%m') as dm, AVG(f.".$this->field.")";
 		$sql .= " FROM ".$this->from;
-		$sql .= $this->join;
 		$sql .= " WHERE f.datef 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";

From f22744210e6f2c7d12b0a413f9da01bd48dd794d Mon Sep 17 00:00:00 2001
From: lmarcouiller <lucas.marcouiller@gmail.com>
Date: Fri, 9 Sep 2022 11:31:06 +0200
Subject: [PATCH 826/974] Fix : missing column in etablishement sql

---
 htdocs/install/mysql/migration/16.0.0-17.0.0.sql  | 1 +
 htdocs/install/mysql/tables/llx_establishment.sql | 1 +
 2 files changed, 2 insertions(+)

diff --git a/htdocs/install/mysql/migration/16.0.0-17.0.0.sql b/htdocs/install/mysql/migration/16.0.0-17.0.0.sql
index 8121b94494d..5536e09ca42 100644
--- a/htdocs/install/mysql/migration/16.0.0-17.0.0.sql
+++ b/htdocs/install/mysql/migration/16.0.0-17.0.0.sql
@@ -149,3 +149,4 @@ UPDATE llx_c_effectif SET code='EF101-500', libelle='101 - 500' WHERE code='EF10
 
 ALTER TABLE llx_rights_def ADD COLUMN tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP;
 
+ALTER TABLE llx_establishment ADD COLUMN label varchar(255) NOT NULL AFTER entity;
\ No newline at end of file
diff --git a/htdocs/install/mysql/tables/llx_establishment.sql b/htdocs/install/mysql/tables/llx_establishment.sql
index 7159a53059c..1b0d2668cb0 100644
--- a/htdocs/install/mysql/tables/llx_establishment.sql
+++ b/htdocs/install/mysql/tables/llx_establishment.sql
@@ -22,6 +22,7 @@
 CREATE TABLE llx_establishment (
   rowid 			integer NOT NULL auto_increment PRIMARY KEY,
   entity 			integer NOT NULL DEFAULT 1,
+  label       varchar(255) NOT NULL,
   ref				varchar(30),
   name				varchar(128),
   address           varchar(255),

From 999e5861e3343f27391de9116b5228b00631147e Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 9 Sep 2022 11:55:45 +0200
Subject: [PATCH 827/974] NEW Add method httponly_accessforbidden()

---
 htdocs/core/ajax/onlineSign.php  |  4 +---
 htdocs/core/lib/security.lib.php | 29 +++++++++++++++++++++++++++--
 2 files changed, 28 insertions(+), 5 deletions(-)

diff --git a/htdocs/core/ajax/onlineSign.php b/htdocs/core/ajax/onlineSign.php
index c342f7aeab1..f3a82783a2b 100644
--- a/htdocs/core/ajax/onlineSign.php
+++ b/htdocs/core/ajax/onlineSign.php
@@ -74,9 +74,7 @@ if ($type == 'proposal') {
 }
 
 if (empty($SECUREKEY) || !dol_verifyHash($securekeyseed.$type.$ref.(!isModEnabled('multicompany') ? '' : $entity), $SECUREKEY, '0')) {
-	http_response_code(403);
-	print 'Bad value for securitykey. Value provided '.dol_escape_htmltag($SECUREKEY).' does not match expected value for ref='.dol_escape_htmltag($ref);
-	exit(-1);
+	httponly_accessforbidden('Bad value for securitykey. Value provided '.dol_escape_htmltag($SECUREKEY).' does not match expected value for ref='.dol_escape_htmltag($ref), 403);
 }
 
 
diff --git a/htdocs/core/lib/security.lib.php b/htdocs/core/lib/security.lib.php
index d0067d7575b..1efcbaacf78 100644
--- a/htdocs/core/lib/security.lib.php
+++ b/htdocs/core/lib/security.lib.php
@@ -1016,8 +1016,30 @@ function checkUserAccessToObject($user, array $featuresarray, $object = 0, $tabl
 	return true;
 }
 
+
 /**
- *	Show a message to say access is forbidden and stop program
+ *	Show a message to say access is forbidden and stop program.
+ *  This includes only HTTP header.
+ *	Calling this function terminate execution of PHP.
+ *
+ *	@param	string		$message			Force error message
+ *	@param	int			$http_response_code	HTTP response code
+ *  @return	void
+ *  @see accessforbidden()
+ */
+function httponly_accessforbidden($message = 1, $http_response_code = 403)
+{
+	top_httphead('text/html');
+	http_response_code($http_response_code);
+
+	print htmlentities($message);
+
+	exit(1);
+}
+
+/**
+ *	Show a message to say access is forbidden and stop program.
+ *  This includes HTTP and HTML header and footer.
  *	Calling this function terminate execution of PHP.
  *
  *	@param	string		$message			Force error message
@@ -1026,10 +1048,12 @@ function checkUserAccessToObject($user, array $featuresarray, $object = 0, $tabl
  *  @param  int			$showonlymessage    Show only message parameter. Otherwise add more information.
  *  @param  array|null  $params         	More parameters provided to hook
  *  @return	void
+ *  @see httponly_accessforbidden()
  */
 function accessforbidden($message = '', $printheader = 1, $printfooter = 1, $showonlymessage = 0, $params = null)
 {
 	global $conf, $db, $user, $langs, $hookmanager;
+
 	if (!is_object($langs)) {
 		include_once DOL_DOCUMENT_ROOT.'/core/class/translate.class.php';
 		$langs = new Translate('', $conf);
@@ -1049,7 +1073,7 @@ function accessforbidden($message = '', $printheader = 1, $printfooter = 1, $sho
 	if (!$message) {
 		print $langs->trans("ErrorForbidden");
 	} else {
-		print $message;
+		print $langs->trans($message);
 	}
 	print '</div>';
 	print '<br>';
@@ -1077,6 +1101,7 @@ function accessforbidden($message = '', $printheader = 1, $printfooter = 1, $sho
 	if ($printfooter && function_exists("llxFooter")) {
 		llxFooter();
 	}
+
 	exit(0);
 }
 

From f4973068555cb6b0df45eb0d2230b946ac72d97a Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Fri, 9 Sep 2022 11:57:59 +0200
Subject: [PATCH 828/974] NEW : Supplier order list - Add column private and
 public note

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

diff --git a/htdocs/fourn/commande/list.php b/htdocs/fourn/commande/list.php
index c6401b0a70a..f1f65ed3fa8 100644
--- a/htdocs/fourn/commande/list.php
+++ b/htdocs/fourn/commande/list.php
@@ -188,7 +188,9 @@ $arrayfields = array(
 	'state.nom'=>array('label'=>"StateShort", 'enabled'=>1, 'position'=>48),
 	'country.code_iso'=>array('label'=>"Country", 'enabled'=>1, 'position'=>49),
 	'typent.code'=>array('label'=>"ThirdPartyType", 'enabled'=>$checkedtypetiers, 'position'=>50),
-	'u.login'=>array('label'=>"AuthorRequest", 'enabled'=>1, 'position'=>51)
+	'u.login'=>array('label'=>"AuthorRequest", 'enabled'=>1, 'position'=>51),
+	'cf.note_public'=>array('label'=>'NotePublic', 'checked'=>0, 'enabled'=>(empty($conf->global->MAIN_LIST_ALLOW_PUBLIC_NOTES)), 'position'=>100),
+	'cf.note_private'=>array('label'=>'NotePrivate', 'checked'=>0, 'enabled'=>(empty($conf->global->MAIN_LIST_ALLOW_PRIVATE_NOTES)), 'position'=>110),
 );
 foreach ($object->fields as $key => $val) {
 	// If $val['visible']==0, then we never show the field
@@ -1440,6 +1442,16 @@ if ($resql) {
 		print '</div>';
 		print '</td>';
 	}
+	// Note public
+	if (!empty($arrayfields['cf.note_public']['checked'])) {
+		print '<td class="liste_titre">';
+		print '</td>';
+	}
+	// Note private
+	if (!empty($arrayfields['cf.note_private']['checked'])) {
+		print '<td class="liste_titre">';
+		print '</td>';
+	}
 	// Action column
 	print '<td class="liste_titre middle">';
 	$searchpicto = $form->showFilterButtons();
@@ -1540,6 +1552,12 @@ if ($resql) {
 	if (!empty($arrayfields['cf.date_approve']['checked'])) {
 		print_liste_field_titre($arrayfields['cf.date_approve']['label'], $_SERVER["PHP_SELF"], 'cf.date_approve', '', $param, '', $sortfield, $sortorder, 'center ');
 	}
+	if (!empty($arrayfields['cf.note_public']['checked'])) {
+		print_liste_field_titre($arrayfields['cf.note_public']['label'], $_SERVER["PHP_SELF"], "cf.note_public", "", $param, '', $sortfield, $sortorder, 'right ');
+	}
+	if (!empty($arrayfields['cf.note_private']['checked'])) {
+		print_liste_field_titre($arrayfields['cf.note_private']['label'], $_SERVER["PHP_SELF"], "cf.note_private", "", $param, '', $sortfield, $sortorder, 'right ');
+	}
 	print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ');
 	print "</tr>\n";
 
@@ -1867,6 +1885,25 @@ if ($resql) {
 				$totalarray['nbfield']++;
 			}
 		}
+		// Note public
+		if (!empty($arrayfields['cf.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['cf.note_private']['checked'])) {
+			print '<td class="center">';
+			print dol_string_nohtmltag($obj->note_private);
+			print '</td>';
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+		}
 
 		// Action column
 		print '<td class="nowrap center">';

From 9890965cfe7c8635da82dc3778f3266f9f756564 Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Fri, 9 Sep 2022 12:03:42 +0200
Subject: [PATCH 829/974] rather center column title

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

diff --git a/htdocs/fourn/commande/list.php b/htdocs/fourn/commande/list.php
index f1f65ed3fa8..f71126f60ed 100644
--- a/htdocs/fourn/commande/list.php
+++ b/htdocs/fourn/commande/list.php
@@ -1553,10 +1553,10 @@ if ($resql) {
 		print_liste_field_titre($arrayfields['cf.date_approve']['label'], $_SERVER["PHP_SELF"], 'cf.date_approve', '', $param, '', $sortfield, $sortorder, 'center ');
 	}
 	if (!empty($arrayfields['cf.note_public']['checked'])) {
-		print_liste_field_titre($arrayfields['cf.note_public']['label'], $_SERVER["PHP_SELF"], "cf.note_public", "", $param, '', $sortfield, $sortorder, 'right ');
+		print_liste_field_titre($arrayfields['cf.note_public']['label'], $_SERVER["PHP_SELF"], "cf.note_public", "", $param, '', $sortfield, $sortorder, 'center ');
 	}
 	if (!empty($arrayfields['cf.note_private']['checked'])) {
-		print_liste_field_titre($arrayfields['cf.note_private']['label'], $_SERVER["PHP_SELF"], "cf.note_private", "", $param, '', $sortfield, $sortorder, 'right ');
+		print_liste_field_titre($arrayfields['cf.note_private']['label'], $_SERVER["PHP_SELF"], "cf.note_private", "", $param, '', $sortfield, $sortorder, 'center ');
 	}
 	print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ');
 	print "</tr>\n";

From ca8c650feb12668abcd6a67fbc8147e577e68299 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?No=C3=A9=20Courtier?= <noe.courtier@scopen.fr>
Date: Fri, 9 Sep 2022 12:20:47 +0200
Subject: [PATCH 830/974] Fix: status of product suplier price was not
 recovered

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

diff --git a/htdocs/fourn/class/fournisseur.product.class.php b/htdocs/fourn/class/fournisseur.product.class.php
index 0ae975a1cbf..ea5dc639a5e 100644
--- a/htdocs/fourn/class/fournisseur.product.class.php
+++ b/htdocs/fourn/class/fournisseur.product.class.php
@@ -578,7 +578,7 @@ class ProductFournisseur extends Product
 		$sql .= " pfp.supplier_reputation, pfp.fk_user, pfp.datec,";
 		$sql .= " pfp.multicurrency_price, pfp.multicurrency_unitprice, pfp.multicurrency_tx, pfp.fk_multicurrency, pfp.multicurrency_code,";
 		$sql .= " pfp.barcode, pfp.fk_barcode_type, pfp.packaging,";
-		$sql .= " p.ref as product_ref";
+		$sql .= " p.ref as product_ref, p.tosell as status, p.tobuy as status_buy";
 		$sql .= " FROM ".MAIN_DB_PREFIX."product_fournisseur_price as pfp, ".MAIN_DB_PREFIX."product as p";
 		$sql .= " WHERE pfp.rowid = ".(int) $rowid;
 		$sql .= " AND pfp.fk_product = p.rowid";
@@ -594,7 +594,8 @@ class ProductFournisseur extends Product
 				$this->fk_product				= $obj->fk_product;
 				$this->product_id				= $obj->fk_product;
 				$this->product_ref				= $obj->product_ref;
-
+				$this->status					= $obj->status;
+				$this->status_buy				= $obj->status_buy;
 				$this->fourn_id					= $obj->fk_soc;
 				$this->fourn_ref				= $obj->ref_fourn; // deprecated
 				$this->ref_supplier             = $obj->ref_fourn;
@@ -670,7 +671,7 @@ class ProductFournisseur extends Product
 		// phpcs:enable
 		global $conf;
 
-		$sql = "SELECT s.nom as supplier_name, s.rowid as fourn_id, p.ref as product_ref,";
+		$sql = "SELECT s.nom as supplier_name, s.rowid as fourn_id, p.ref as product_ref, p.tosell as status, p.tobuy as status_buy, ";
 		$sql .= " pfp.rowid as product_fourn_pri_id, pfp.entity, pfp.ref_fourn, pfp.desc_fourn, pfp.fk_product as product_fourn_id, pfp.fk_supplier_price_expression,";
 		$sql .= " pfp.price, pfp.quantity, pfp.unitprice, pfp.remise_percent, pfp.remise, pfp.tva_tx, pfp.fk_availability, pfp.charges, pfp.info_bits, pfp.delivery_time_days, pfp.supplier_reputation,";
 		$sql .= " pfp.multicurrency_price, pfp.multicurrency_unitprice, pfp.multicurrency_tx, pfp.fk_multicurrency, pfp.multicurrency_code, pfp.datec, pfp.tms,";
@@ -699,6 +700,8 @@ class ProductFournisseur extends Product
 
 				$prodfourn->product_ref = $record["product_ref"];
 				$prodfourn->product_fourn_price_id = $record["product_fourn_pri_id"];
+				$prodfourn->status					= $record["status"];
+				$prodfourn->status_buy				= $record["status_buy"];
 				$prodfourn->product_fourn_id = $record["product_fourn_id"];
 				$prodfourn->product_fourn_entity = $record["entity"];
 				$prodfourn->ref_supplier			= $record["ref_fourn"];

From 14a3bc736072d2583ed6647684bc68f50dfc3b9e Mon Sep 17 00:00:00 2001
From: lmarcouiller <lucas.marcouiller@gmail.com>
Date: Fri, 9 Sep 2022 12:26:17 +0200
Subject: [PATCH 831/974] Fix : php 8.1 warnings

---
 htdocs/admin/fichinter.php                    |   8 +-
 htdocs/admin/hrm.php                          |   2 +-
 htdocs/admin/reception_setup.php              |   6 +-
 htdocs/admin/supplier_invoice.php             |   2 +-
 htdocs/admin/supplier_order.php               | 354 +++++++++---------
 htdocs/admin/supplier_payment.php             |  12 +-
 htdocs/admin/ticket.php                       |   5 +-
 htdocs/admin/ticket_public.php                |  16 +-
 htdocs/core/db/mysqli.class.php               |   2 +-
 .../modules/commande/mod_commande_saphir.php  |   4 +-
 .../modules/contract/mod_contract_magre.php   |   4 +-
 htdocs/core/modules/fichinter/mod_arctic.php  |   4 +-
 .../doc/doc_generic_proposal_odt.modules.php  |   4 +-
 .../reception/mod_reception_moonstone.php     |   4 +-
 .../mod_facture_fournisseur_tulip.php         |  22 +-
 .../mod_commande_fournisseur_orchidee.php     |   4 +-
 .../mod_supplier_payment_brodator.php         |   8 +-
 .../modules/ticket/mod_ticket_universal.php   |   4 +-
 htdocs/hrm/admin/admin_establishment.php      |   2 +-
 htdocs/hrm/establishment/card.php             |   2 +-
 20 files changed, 235 insertions(+), 234 deletions(-)

diff --git a/htdocs/admin/fichinter.php b/htdocs/admin/fichinter.php
index 79896d0ed74..daa0d7e8570 100644
--- a/htdocs/admin/fichinter.php
+++ b/htdocs/admin/fichinter.php
@@ -537,7 +537,7 @@ print '<input type="hidden" name="action" value="set_FICHINTER_PRINT_PRODUCTS">'
 print '<tr class="oddeven"><td>';
 print $langs->trans("PrintProductsOnFichinter").' ('.$langs->trans("PrintProductsOnFichinterDetails").')</td>';
 print '<td align="center"><input type="checkbox" name="FICHINTER_PRINT_PRODUCTS" ';
-if ($conf->global->FICHINTER_PRINT_PRODUCTS) {
+if (getDolGlobalString("FICHINTER_PRINT_PRODUCTS")) {
 	print 'checked ';
 }
 print '/>';
@@ -554,7 +554,7 @@ print '<td>';
 print $langs->trans("UseServicesDurationOnFichinter");
 print '</td>';
 print '<td class="center">';
-print '<input type="checkbox" name="FICHINTER_USE_SERVICE_DURATION"'.($conf->global->FICHINTER_USE_SERVICE_DURATION ? ' checked' : '').'>';
+print '<input type="checkbox" name="FICHINTER_USE_SERVICE_DURATION"'.(getDolGlobalString("FICHINTER_USE_SERVICE_DURATION") ? ' checked' : '').'>';
 print '</td>';
 print '<td class="right">';
 print '<input type="submit" class="button button-edit" value="'.$langs->trans("Modify").'">';
@@ -570,7 +570,7 @@ print '<td>';
 print $langs->trans("UseDurationOnFichinter");
 print '</td>';
 print '<td class="center">';
-print '<input type="checkbox" name="FICHINTER_WITHOUT_DURATION"'.($conf->global->FICHINTER_WITHOUT_DURATION ? ' checked' : '').'>';
+print '<input type="checkbox" name="FICHINTER_WITHOUT_DURATION"'.(getDolGlobalString("FICHINTER_WITHOUT_DURATION") ? ' checked' : '').'>';
 print '</td>';
 print '<td class="right">';
 print '<input type="submit" class="button button-edit" value="'.$langs->trans("Modify").'">';
@@ -586,7 +586,7 @@ print '<td>';
 print $langs->trans("UseDateWithoutHourOnFichinter");
 print '</td>';
 print '<td class="center">';
-print '<input type="checkbox" name="FICHINTER_DATE_WITHOUT_HOUR"'.($conf->global->FICHINTER_DATE_WITHOUT_HOUR ? ' checked' : '').'>';
+print '<input type="checkbox" name="FICHINTER_DATE_WITHOUT_HOUR"'.(getDolGlobalString("FICHINTER_DATE_WITHOUT_HOUR") ? ' checked' : '').'>';
 print '</td>';
 print '<td class="right">';
 print '<input type="submit" class="button button-edit" value="'.$langs->trans("Modify").'">';
diff --git a/htdocs/admin/hrm.php b/htdocs/admin/hrm.php
index c568e6de39c..838e9bf9a0b 100644
--- a/htdocs/admin/hrm.php
+++ b/htdocs/admin/hrm.php
@@ -624,7 +624,7 @@ if ($action == 'edit') {
 						setEventMessages(null, $object->errors, "errors");
 					}
 				} else {
-					print $conf->global->{$constname};
+					print getDolGlobalString($constname);
 				}
 				print '</td></tr>';
 			}
diff --git a/htdocs/admin/reception_setup.php b/htdocs/admin/reception_setup.php
index a06760b9da4..a43b8c8003f 100644
--- a/htdocs/admin/reception_setup.php
+++ b/htdocs/admin/reception_setup.php
@@ -237,7 +237,7 @@ foreach ($dirmodels as $reldir) {
 						if ($conf->global->RECEPTION_ADDON_NUMBER == "$file") {
 							print img_picto($langs->trans("Activated"), 'switch_on');
 						} else {
-							print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=setmodel&token='.newToken().'&value='.urlencode($file).'&scan_dir='.$module->scandir.'&label='.urlencode($module->name).'">';
+							print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=setmodel&token='.newToken().'&value='.urlencode($file).(!empty($module->scandir) ? '&scan_dir='.$module->scandir : '').(!empty($module->name) ? '&label='.urlencode($module->name) : '').'">';
 							print img_picto($langs->trans("Disabled"), 'switch_off');
 							print '</a>';
 						}
@@ -344,10 +344,10 @@ foreach ($dirmodels as $reldir) {
 							$module = new $classname($db);
 
 							$modulequalified = 1;
-							if ($module->version == 'development' && $conf->global->MAIN_FEATURES_LEVEL < 2) {
+							if (isset($module->version) && $module->version == 'development' && $conf->global->MAIN_FEATURES_LEVEL < 2) {
 								$modulequalified = 0;
 							}
-							if ($module->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) {
+							if (isset($module->version) && $module->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) {
 								$modulequalified = 0;
 							}
 
diff --git a/htdocs/admin/supplier_invoice.php b/htdocs/admin/supplier_invoice.php
index aa337ff1f29..646b5e1e13d 100644
--- a/htdocs/admin/supplier_invoice.php
+++ b/htdocs/admin/supplier_invoice.php
@@ -392,7 +392,7 @@ foreach ($dirmodels as $reldir) {
 
 					// Default
 					print '<td class="center">';
-					if ($conf->global->INVOICE_SUPPLIER_ADDON_PDF == "$name") {
+					if (getDolGlobalString("INVOICE_SUPPLIER_ADDON_PDF") == "$name") {
 						//print img_picto($langs->trans("Default"),'on');
 						// Even if choice is the default value, we allow to disable it: For supplier invoice, we accept to have no doc generation at all
 						print '<a href="'.$_SERVER["PHP_SELF"].'?action=unsetdoc&token='.newToken().'&value='.$name.'&scan_dir='.$module->scandir.'&label='.urlencode($module->name).'&type=invoice_supplier"" alt="'.$langs->trans("Disable").'">'.img_picto($langs->trans("Enabled"), 'on').'</a>';
diff --git a/htdocs/admin/supplier_order.php b/htdocs/admin/supplier_order.php
index 0204f184de7..905721128ad 100644
--- a/htdocs/admin/supplier_order.php
+++ b/htdocs/admin/supplier_order.php
@@ -1,63 +1,63 @@
 <?php
-/* Copyright (C) 2003-2007 Rodolphe Quiedeville    <rodolphe@quiedeville.org>
- * 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>
- * 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>
- *
- * This 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/>.
- */
+																																/* Copyright (C) 2003-2007 Rodolphe Quiedeville    <rodolphe@quiedeville.org>
+																																* 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>
+																																* 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>
+																																*
+																																* This 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/admin/supplier_order.php
- *  \ingroup    fournisseur
- *  \brief      Page d'administration-configuration du module Fournisseur
- */
+																																/**
+																																 *  \file       htdocs/admin/supplier_order.php
+																																 *  \ingroup    fournisseur
+																																 *  \brief      Page d'administration-configuration du module Fournisseur
+																																 */
 
-require '../main.inc.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/fourn.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.class.php';
-require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.commande.class.php';
+																																require '../main.inc.php';
+																																require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
+																																require_once DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php';
+																																require_once DOL_DOCUMENT_ROOT.'/core/lib/fourn.lib.php';
+																																require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.class.php';
+																																require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.commande.class.php';
 
-// Load translation files required by the page
-$langs->loadLangs(array("admin", "other", "orders", "stocks"));
+																																// Load translation files required by the page
+																																$langs->loadLangs(array("admin", "other", "orders", "stocks"));
 
 if (!$user->admin) {
 	accessforbidden();
 }
 
-$type = GETPOST('type', 'alpha');
-$value = GETPOST('value', 'alpha');
-$modulepart = GETPOST('modulepart', 'aZ09');	// Used by actions_setmoduleoptions.inc.php
+																																$type = GETPOST('type', 'alpha');
+																																$value = GETPOST('value', 'alpha');
+																																$modulepart = GETPOST('modulepart', 'aZ09');	// Used by actions_setmoduleoptions.inc.php
 
-$label = GETPOST('label', 'alpha');
-$action = GETPOST('action', 'aZ09');
-$scandir = GETPOST('scan_dir', 'alpha');
+																																$label = GETPOST('label', 'alpha');
+																																$action = GETPOST('action', 'aZ09');
+																																$scandir = GETPOST('scan_dir', 'alpha');
 
-$specimenthirdparty = new Societe($db);
-$specimenthirdparty->initAsSpecimen();
+																																$specimenthirdparty = new Societe($db);
+																																$specimenthirdparty->initAsSpecimen();
 
 
-/*
- * Actions
- */
+																																/*
+																																* Actions
+																																*/
 
-include DOL_DOCUMENT_ROOT.'/core/actions_setmoduleoptions.inc.php';
+																																include DOL_DOCUMENT_ROOT.'/core/actions_setmoduleoptions.inc.php';
 
 if ($action == 'updateMask') {
 	$maskconstorder = GETPOST('maskconstorder', 'alpha');
@@ -193,40 +193,40 @@ if ($action == 'updateMask') {
 }
 
 
-/*
- * View
- */
+																																/*
+																																* View
+																																*/
 
-$form = new Form($db);
+																																$form = new Form($db);
 
-$dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
+																																$dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
 
-llxHeader("", "");
+																																llxHeader("", "");
 
-$linkback = '<a href="'.DOL_URL_ROOT.'/admin/modules.php?restore_lastsearch_values=1">'.$langs->trans("BackToModuleList").'</a>';
-print load_fiche_titre($langs->trans("SuppliersSetup"), $linkback, 'title_setup');
+																																$linkback = '<a href="'.DOL_URL_ROOT.'/admin/modules.php?restore_lastsearch_values=1">'.$langs->trans("BackToModuleList").'</a>';
+																																print load_fiche_titre($langs->trans("SuppliersSetup"), $linkback, 'title_setup');
 
-print "<br>";
+																																print "<br>";
 
-$head = supplierorder_admin_prepare_head();
+																																$head = supplierorder_admin_prepare_head();
 
-print dol_get_fiche_head($head, 'order', $langs->trans("Suppliers"), -1, 'company');
+																																print dol_get_fiche_head($head, 'order', $langs->trans("Suppliers"), -1, 'company');
 
 
-// Supplier order numbering module
+																																// Supplier order numbering module
 
-print load_fiche_titre($langs->trans("OrdersNumberingModules"), '', '');
+																																print load_fiche_titre($langs->trans("OrdersNumberingModules"), '', '');
 
-print '<table class="noborder centpercent">';
-print '<tr class="liste_titre">';
-print '<td width="100">'.$langs->trans("Name").'</td>';
-print '<td>'.$langs->trans("Description").'</td>';
-print '<td>'.$langs->trans("Example").'</td>';
-print '<td align="center" width="60">'.$langs->trans("Status").'</td>';
-print '<td align="center" width="16">'.$langs->trans("ShortInfo").'</td>';
-print "</tr>\n";
+																																print '<table class="noborder centpercent">';
+																																print '<tr class="liste_titre">';
+																																print '<td width="100">'.$langs->trans("Name").'</td>';
+																																print '<td>'.$langs->trans("Description").'</td>';
+																																print '<td>'.$langs->trans("Example").'</td>';
+																																print '<td align="center" width="60">'.$langs->trans("Status").'</td>';
+																																print '<td align="center" width="16">'.$langs->trans("ShortInfo").'</td>';
+																																print "</tr>\n";
 
-clearstatcache();
+																																clearstatcache();
 
 foreach ($dirmodels as $reldir) {
 	$dir = dol_buildpath($reldir."core/modules/supplier_order/");
@@ -309,24 +309,24 @@ foreach ($dirmodels as $reldir) {
 	}
 }
 
-print '</table><br>';
+																																print '</table><br>';
 
 
-/*
- *  Documents models for supplier orders
- */
+																																/*
+																																*  Documents models for supplier orders
+																																*/
 
-print load_fiche_titre($langs->trans("OrdersModelModule"), '', '');
+																																print load_fiche_titre($langs->trans("OrdersModelModule"), '', '');
 
-// Defini tableau def de modele
-$def = array();
+																																// Defini tableau def de modele
+																																$def = array();
 
-$sql = "SELECT nom";
-$sql .= " FROM ".MAIN_DB_PREFIX."document_model";
-$sql .= " WHERE type = 'order_supplier'";
-$sql .= " AND entity = ".$conf->entity;
+																																$sql = "SELECT nom";
+																																$sql .= " FROM ".MAIN_DB_PREFIX."document_model";
+																																$sql .= " WHERE type = 'order_supplier'";
+																																$sql .= " AND entity = ".$conf->entity;
 
-$resql = $db->query($sql);
+																																$resql = $db->query($sql);
 if ($resql) {
 	$i = 0;
 	$num_rows = $db->num_rows($resql);
@@ -339,17 +339,17 @@ if ($resql) {
 	dol_print_error($db);
 }
 
-print '<table class="noborder centpercent">'."\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 align="center" width="60">'.$langs->trans("Status").'</td>'."\n";
-print '<td align="center" width="60">'.$langs->trans("Default").'</td>'."\n";
-print '<td align="center" width="40">'.$langs->trans("ShortInfo").'</td>';
-print '<td align="center" width="40">'.$langs->trans("Preview").'</td>';
-print '</tr>'."\n";
+																																print '<table class="noborder centpercent">'."\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 align="center" width="60">'.$langs->trans("Status").'</td>'."\n";
+																																print '<td align="center" width="60">'.$langs->trans("Default").'</td>'."\n";
+																																print '<td align="center" width="40">'.$langs->trans("ShortInfo").'</td>';
+																																print '<td align="center" width="40">'.$langs->trans("Preview").'</td>';
+																																print '</tr>'."\n";
 
-clearstatcache();
+																																clearstatcache();
 
 foreach ($dirmodels as $reldir) {
 	$realpath = $reldir."core/modules/supplier_order/doc";
@@ -434,76 +434,76 @@ foreach ($dirmodels as $reldir) {
 	}
 }
 
-print '</table><br>';
+																																print '</table><br>';
 
-/*
- * Other options
- */
+																																/*
+																																* Other options
+																																*/
 
-print '<form action="'.$_SERVER["PHP_SELF"].'" method="post">';
-print '<input type="hidden" name="token" value="'.newToken().'">';
-print '<input type="hidden" name="action" value="set_SUPPLIER_ORDER_OTHER">';
+																																print '<form action="'.$_SERVER["PHP_SELF"].'" method="post">';
+																																print '<input type="hidden" name="token" value="'.newToken().'">';
+																																print '<input type="hidden" name="action" value="set_SUPPLIER_ORDER_OTHER">';
 
-print load_fiche_titre($langs->trans("OtherOptions"), '', '');
-print '<table class="noborder centpercent">';
-print '<tr class="liste_titre">';
-print '<td>'.$langs->trans("Parameter").'</td>';
-print '<td align="center" width="60">'.$langs->trans("Value").'</td>';
-print '<td width="80">&nbsp;</td>';
-print "</tr>\n";
+																																print load_fiche_titre($langs->trans("OtherOptions"), '', '');
+																																print '<table class="noborder centpercent">';
+																																print '<tr class="liste_titre">';
+																																print '<td>'.$langs->trans("Parameter").'</td>';
+																																print '<td align="center" width="60">'.$langs->trans("Value").'</td>';
+																																print '<td width="80">&nbsp;</td>';
+																																print "</tr>\n";
 
-print '<tr class="oddeven"><td>';
-print $form->textwithpicto($langs->trans("UseDoubleApproval"), $langs->trans("Use3StepsApproval"), 1, 'help').'<br>';
-print $langs->trans("IfSetToYesDontForgetPermission");
-print '</td><td>';
-print '<input type="text" size="6" name="SUPPLIER_ORDER_3_STEPS_TO_BE_APPROVED" value="'.$conf->global->SUPPLIER_ORDER_3_STEPS_TO_BE_APPROVED.'">';
-print '</td><td class="right">';
-print '<input type="submit" class="button button-edit" value="'.$langs->trans("Modify").'">';
-print "</td></tr>\n";
+																																print '<tr class="oddeven"><td>';
+																																print $form->textwithpicto($langs->trans("UseDoubleApproval"), $langs->trans("Use3StepsApproval"), 1, 'help').'<br>';
+																																print $langs->trans("IfSetToYesDontForgetPermission");
+																																print '</td><td>';
+																																print '<input type="text" size="6" name="SUPPLIER_ORDER_3_STEPS_TO_BE_APPROVED" value="'.getDolGlobalString("SUPPLIER_ORDER_3_STEPS_TO_BE_APPROVED").'">';
+																																print '</td><td class="right">';
+																																print '<input type="submit" class="button button-edit" value="'.$langs->trans("Modify").'">';
+																																print "</td></tr>\n";
 
 
-// Ask for payment bank during supplier order
-/* Kept as hidden for the moment
-if (isModEnabled('banque')) {
+																																// Ask for payment bank during supplier order
+																																/* Kept as hidden for the moment
+																																if (isModEnabled('banque')) {
 
-	print '<tr class="oddeven"><td>';
-	print $langs->trans("BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDER").'</td><td>&nbsp;</td><td align="center">';
-	if (!empty($conf->use_javascript_ajax))
-	{
-		print ajax_constantonoff('BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDER');
-	}
-	else
-	{
-		if (empty($conf->global->BANK_ASK_PAYMENT_BANK_DURING_ORDER))
-		{
-			print '<a href="'.$_SERVER['PHP_SELF'].'?action=set_BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDER&token='.newToken().'&value=1">'.img_picto($langs->trans("Disabled"),'switch_off').'</a>';
-		}
-		else
-		{
-			print '<a href="'.$_SERVER['PHP_SELF'].'?action=set_BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDER&token='.newToken().'&value=0">'.img_picto($langs->trans("Enabled"),'switch_on').'</a>';
-		}
-	}
-	print '</td></tr>';
-}
-else
-{
+																																print '<tr class="oddeven"><td>';
+																																print $langs->trans("BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDER").'</td><td>&nbsp;</td><td align="center">';
+																																if (!empty($conf->use_javascript_ajax))
+																																{
+																																print ajax_constantonoff('BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDER');
+																																}
+																																else
+																																{
+																																if (empty($conf->global->BANK_ASK_PAYMENT_BANK_DURING_ORDER))
+																																{
+																																print '<a href="'.$_SERVER['PHP_SELF'].'?action=set_BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDER&token='.newToken().'&value=1">'.img_picto($langs->trans("Disabled"),'switch_off').'</a>';
+																																}
+																																else
+																																{
+																																print '<a href="'.$_SERVER['PHP_SELF'].'?action=set_BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDER&token='.newToken().'&value=0">'.img_picto($langs->trans("Enabled"),'switch_on').'</a>';
+																																}
+																																}
+																																print '</td></tr>';
+																																}
+																																else
+																																{
 
-	print '<tr class="oddeven"><td>';
-	print $langs->trans("BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDER").'</td><td>&nbsp;</td><td align="center">'.$langs->trans('NotAvailable').'</td></tr>';
-}
-*/
+																																print '<tr class="oddeven"><td>';
+																																print $langs->trans("BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDER").'</td><td>&nbsp;</td><td align="center">'.$langs->trans('NotAvailable').'</td></tr>';
+																																}
+																																*/
 
-$substitutionarray = pdf_getSubstitutionArray($langs, null, null, 2);
-$substitutionarray['__(AnyTranslationKey)__'] = $langs->trans("Translation");
-$htmltext = '<i>'.$langs->trans("AvailableVariables").':<br>';
+																																$substitutionarray = pdf_getSubstitutionArray($langs, null, null, 2);
+																																$substitutionarray['__(AnyTranslationKey)__'] = $langs->trans("Translation");
+																																$htmltext = '<i>'.$langs->trans("AvailableVariables").':<br>';
 foreach ($substitutionarray as $key => $val) {
 	$htmltext .= $key.'<br>';
 }
-$htmltext .= '</i>';
+																																$htmltext .= '</i>';
 
-print '<tr class="oddeven"><td colspan="2">';
-print $form->textwithpicto($langs->trans("FreeLegalTextOnOrders"), $langs->trans("AddCRIfTooLong").'<br><br>'.$htmltext, 1, 'help', '', 0, 2, 'freetexttooltip').'<br>';
-$variablename = 'SUPPLIER_ORDER_FREE_TEXT';
+																																print '<tr class="oddeven"><td colspan="2">';
+																																print $form->textwithpicto($langs->trans("FreeLegalTextOnOrders"), $langs->trans("AddCRIfTooLong").'<br><br>'.$htmltext, 1, 'help', '', 0, 2, 'freetexttooltip').'<br>';
+																																$variablename = 'SUPPLIER_ORDER_FREE_TEXT';
 if (empty($conf->global->PDF_ALLOW_HTML_FOR_FREE_TEXT)) {
 	print '<textarea name="'.$variablename.'" class="flat" cols="120">'.getDolGlobalString($variablename).'</textarea>';
 } else {
@@ -511,15 +511,15 @@ if (empty($conf->global->PDF_ALLOW_HTML_FOR_FREE_TEXT)) {
 	$doleditor = new DolEditor($variablename, getDolGlobalString($variablename), '', 80, 'dolibarr_notes');
 	print $doleditor->Create();
 }
-print '</td><td class="right">';
-print '<input type="submit" class="button button-edit" value="'.$langs->trans("Modify").'">';
-print "</td></tr>\n";
+																																print '</td><td class="right">';
+																																print '<input type="submit" class="button button-edit" value="'.$langs->trans("Modify").'">';
+																																print "</td></tr>\n";
 
-// Option to add a quality/validation step, on products, after reception.
-print '<tr class="oddeven">';
-print '<td>'.$langs->trans("UseDispatchStatus").'</td>';
-print '<td></td>';
-print '<td class="center">';
+																																// Option to add a quality/validation step, on products, after reception.
+																																print '<tr class="oddeven">';
+																																print '<td>'.$langs->trans("UseDispatchStatus").'</td>';
+																																print '<td></td>';
+																																print '<td class="center">';
 if (isModEnabled('reception')) {
 	print '<span class="opacitymedium">'.$langs->trans("FeatureNotAvailableWithReceptionModule").'</span>';
 } else {
@@ -530,33 +530,33 @@ if (isModEnabled('reception')) {
 		print $form->selectarray("SUPPLIER_ORDER_USE_DISPATCH_STATUS", $arrval, $conf->global->SUPPLIER_ORDER_USE_DISPATCH_STATUS);
 	}
 }
-print "</td>\n";
-print "</tr>\n";
+																																print "</td>\n";
+																																print "</tr>\n";
 
-print '</table><br>';
+																																print '</table><br>';
 
-print '</form>';
+																																print '</form>';
 
 
-/*
- * Notifications
- */
+																																/*
+																																* Notifications
+																																*/
 
-print load_fiche_titre($langs->trans("Notifications"), '', '');
-print '<table class="noborder centpercent">';
-print '<tr class="liste_titre">';
-print '<td>'.$langs->trans("Parameter").'</td>';
-print '<td align="center" width="60"></td>';
-print '<td width="80">&nbsp;</td>';
-print "</tr>\n";
+																																print load_fiche_titre($langs->trans("Notifications"), '', '');
+																																print '<table class="noborder centpercent">';
+																																print '<tr class="liste_titre">';
+																																print '<td>'.$langs->trans("Parameter").'</td>';
+																																print '<td align="center" width="60"></td>';
+																																print '<td width="80">&nbsp;</td>';
+																																print "</tr>\n";
 
-print '<tr class="oddeven"><td colspan="2">';
-print $langs->trans("YouMayFindNotificationsFeaturesIntoModuleNotification").'<br>';
-print '</td><td class="right">';
-print "</td></tr>\n";
+																																print '<tr class="oddeven"><td colspan="2">';
+																																print $langs->trans("YouMayFindNotificationsFeaturesIntoModuleNotification").'<br>';
+																																print '</td><td class="right">';
+																																print "</td></tr>\n";
 
-print '</table>';
+																																print '</table>';
 
-// End of page
-llxFooter();
-$db->close();
+																																// End of page
+																																llxFooter();
+																																$db->close();
diff --git a/htdocs/admin/supplier_payment.php b/htdocs/admin/supplier_payment.php
index a41f9fdf80c..187123ebbe7 100644
--- a/htdocs/admin/supplier_payment.php
+++ b/htdocs/admin/supplier_payment.php
@@ -74,7 +74,7 @@ if ($action == 'updateMask') {
 } elseif ($action == 'del') {
 	$ret = delDocumentModel($value, $type);
 	if ($ret > 0) {
-		if ($conf->global->FACTURE_ADDON_PDF == "$value") {
+		if (getDolGlobalString("FACTURE_ADDON_PDF") == "$value") {
 			dolibarr_del_const($db, 'SUPPLIER_PAYMENT_ADDON_PDF', $conf->entity);
 		}
 	}
@@ -262,7 +262,7 @@ foreach ($dirmodels as $reldir) {
 							if ($conf->global->SUPPLIER_PAYMENT_ADDON == $file || $conf->global->SUPPLIER_PAYMENT_ADDON.'.php' == $file) {
 								print img_picto($langs->trans("Activated"), 'switch_on');
 							} else {
-								print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=setmod&token='.newToken().'&value='.preg_replace('/\.php$/', '', $file).'&scandir='.$module->scandir.'&label='.urlencode($module->name).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
+								print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=setmod&token='.newToken().'&value='.preg_replace('/\.php$/', '', $file).(!empty($module->scandir) ? '&scandir='.$module->scandir : '').'&label='.urlencode($module->name).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
 							}
 							print '</td>';
 
@@ -288,7 +288,7 @@ foreach ($dirmodels as $reldir) {
 							print '<td class="center">';
 							print $form->textwithpicto('', $htmltooltip, 1, 0);
 
-							if ($conf->global->PAYMENT_ADDON.'.php' == $file) {  // If module is the one used, we show existing errors
+							if (getDolGlobalString("PAYMENT_ADDON").'.php' == $file) {  // If module is the one used, we show existing errors
 								if (!empty($module->error)) {
 									dol_htmloutput_mesg($module->error, '', 'error', 1);
 								}
@@ -350,7 +350,7 @@ foreach ($dirmodels as $reldir) {
 					print "</td>\n";
 					print "<td>\n";
 					require_once $dir.'/'.$file;
-					$module = new $classname($db, $specimenthirdparty);
+					$module = new $classname($db, new Societe($db));
 					if (method_exists($module, 'info')) {
 						print $module->info($langs);
 					} else {
@@ -382,7 +382,7 @@ foreach ($dirmodels as $reldir) {
 
 					// Default
 					print '<td class="center">';
-					if ($conf->global->SUPPLIER_PAYMENT_ADDON_PDF == "$name") {
+					if (getDolGlobalString("SUPPLIER_PAYMENT_ADDON_PDF") == "$name") {
 						//print img_picto($langs->trans("Default"),'on');
 						// Even if choice is the default value, we allow to disable it: For supplier invoice, we accept to have no doc generation at all
 						print '<a href="'.$_SERVER["PHP_SELF"].'?action=unsetdoc&token='.newToken().'&value='.urlencode($name).'&scandir='.urlencode($module->scandir).'&label='.urlencode($module->name).'&type=SUPPLIER_PAYMENT"" alt="'.$langs->trans("Disable").'">'.img_picto($langs->trans("Enabled"), 'on').'</a>';
@@ -441,7 +441,7 @@ print "</tr>\n";
 print '<tr class="oddeven"><td>';
 print $langs->trans("GroupPaymentsByModOnReports");
 print '</td><td width="60" align="center">';
-print $form->selectyesno("PAYMENTS_FOURN_REPORT_GROUP_BY_MOD", $conf->global->PAYMENTS_FOURN_REPORT_GROUP_BY_MOD, 1);
+print $form->selectyesno("PAYMENTS_FOURN_REPORT_GROUP_BY_MOD", getDolGlobalString("PAYMENTS_FOURN_REPORT_GROUP_BY_MOD"), 1);
 print '</td><td class="right">';
 print "</td></tr>\n";
 
diff --git a/htdocs/admin/ticket.php b/htdocs/admin/ticket.php
index f1fbba03840..66b7f24a719 100644
--- a/htdocs/admin/ticket.php
+++ b/htdocs/admin/ticket.php
@@ -428,7 +428,7 @@ foreach ($dirmodels as $reldir) {
 
 								// Default
 								print '<td class="center">';
-								if ($conf->global->TICKET_ADDON_PDF == $name) {
+								if (getDolGlobalString("TICKET_ADDON_PDF") == $name) {
 									print img_picto($langs->trans("Default"), 'on');
 								} else {
 									print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=setdoc&amp;token='.newToken().'&amp;value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
@@ -540,9 +540,10 @@ print '</td>';
 print '</tr>';
 
 if (isModEnabled('product')) {
+	$htmlname = "product_category_id";
 	print '<tr class="oddeven"><td>'.$langs->trans("TicketChooseProductCategory").'</td>';
 	print '<td class="left">';
-	$formcategory->selectProductCategory($conf->global->TICKET_PRODUCT_CATEGORY, 'product_category_id');
+	$formcategory->selectProductCategory($conf->global->TICKET_PRODUCT_CATEGORY, $htmlname);
 	if ($conf->use_javascript_ajax) {
 		print ajax_combobox('select_'.$htmlname);
 	}
diff --git a/htdocs/admin/ticket_public.php b/htdocs/admin/ticket_public.php
index 3e4c088620d..3d2a64e4d96 100644
--- a/htdocs/admin/ticket_public.php
+++ b/htdocs/admin/ticket_public.php
@@ -381,10 +381,10 @@ if (!empty($conf->global->TICKET_ENABLE_PUBLIC_INTERFACE)) {
 	}
 
 	// Interface topic
-	$url_interface = $conf->global->TICKET_PUBLIC_INTERFACE_TOPIC;
+	$url_interface = getDolGlobalString("TICKET_PUBLIC_INTERFACE_TOPIC");
 	print '<tr><td>'.$langs->trans("TicketPublicInterfaceTopicLabelAdmin").'</label>';
 	print '</td><td>';
-	print '<input type="text"   name="TICKET_PUBLIC_INTERFACE_TOPIC" value="'.$conf->global->TICKET_PUBLIC_INTERFACE_TOPIC.'" size="40" ></td>';
+	print '<input type="text"   name="TICKET_PUBLIC_INTERFACE_TOPIC" value="'.$url_interface.'" size="40" ></td>';
 	print '</td>';
 	print '<td class="center width75">';
 	print $form->textwithpicto('', $langs->trans("TicketPublicInterfaceTopicHelp"), 1, 'help');
@@ -403,7 +403,7 @@ if (!empty($conf->global->TICKET_ENABLE_PUBLIC_INTERFACE)) {
 	print '</td></tr>';
 
 	// Text to help to enter a ticket
-	$public_text_help_message = $conf->global->TICKET_PUBLIC_TEXT_HELP_MESSAGE ? $conf->global->TICKET_PUBLIC_TEXT_HELP_MESSAGE : $langs->trans('TicketPublicPleaseBeAccuratelyDescribe');
+	$public_text_help_message = getDolGlobalString("TICKET_PUBLIC_TEXT_HELP_MESSAGE", $langs->trans('TicketPublicPleaseBeAccuratelyDescribe'));
 	print '<tr><td>'.$langs->trans("TicketPublicInterfaceTextHelpMessageLabelAdmin").'</label>';
 	print '</td><td>';
 	require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
@@ -415,10 +415,10 @@ if (!empty($conf->global->TICKET_ENABLE_PUBLIC_INTERFACE)) {
 	print '</td></tr>';
 
 	// Url public interface
-	$url_interface = $conf->global->TICKET_URL_PUBLIC_INTERFACE;
+	$url_interface = getDolGlobalString("TICKET_URL_PUBLIC_INTERFACE");
 	print '<tr><td>'.$langs->trans("TicketUrlPublicInterfaceLabelAdmin").'</label>';
 	print '</td><td>';
-	print '<input type="text" class="minwidth500" name="TICKET_URL_PUBLIC_INTERFACE" value="'.$conf->global->TICKET_URL_PUBLIC_INTERFACE.'"></td>';
+	print '<input type="text" class="minwidth500" name="TICKET_URL_PUBLIC_INTERFACE" value="'.$url_interface.'"></td>';
 	print '</td>';
 	print '<td class="center">';
 	print $form->textwithpicto('', $langs->trans("TicketUrlPublicInterfaceHelpAdmin"), 1, 'help');
@@ -448,7 +448,7 @@ if (!empty($conf->global->TICKET_ENABLE_PUBLIC_INTERFACE)) {
 	print '</tr>';
 
 	// Text of email after creatio of a ticket
-	$mail_mesg_new = $conf->global->TICKET_MESSAGE_MAIL_NEW ? $conf->global->TICKET_MESSAGE_MAIL_NEW : $langs->trans('TicketNewEmailBody');
+	$mail_mesg_new = getDolGlobalString("TICKET_MESSAGE_MAIL_NEW", $langs->trans('TicketNewEmailBody'));
 	print '<tr><td>';
 	print $form->textwithpicto($langs->trans("TicketNewEmailBodyLabel"), $langs->trans("TicketNewEmailBodyHelp"), 1, 'help');
 	print '</label>';
@@ -468,7 +468,7 @@ if (!empty($conf->global->TICKET_ENABLE_PUBLIC_INTERFACE)) {
 		print ajax_constantonoff('TICKET_PUBLIC_NOTIFICATION_NEW_MESSAGE_ENABLED');
 	} else {
 		$arrval = array('0' => $langs->trans("No"), '1' => $langs->trans("Yes"));
-		print $form->selectarray("TICKET_PUBLIC_NOTIFICATION_NEW_MESSAGE_ENABLED", $arrval, $conf->global->TICKET_PUBLIC_NOTIFICATION_NEW_MESSAGE_ENABLED);
+		print $form->selectarray("TICKET_PUBLIC_NOTIFICATION_NEW_MESSAGE_ENABLED", $arrval, getDolGlobalString("TICKET_PUBLIC_NOTIFICATION_NEW_MESSAGE_ENABLED"));
 	}
 	print '</td>';
 	print '</tr>';
@@ -477,7 +477,7 @@ if (!empty($conf->global->TICKET_ENABLE_PUBLIC_INTERFACE)) {
 	print '<tr><td>';
 	print $form->textwithpicto($langs->trans("TicketPublicNotificationNewMessageDefaultEmail"), $langs->trans("TicketPublicNotificationNewMessageDefaultEmailHelp"), 1, 'help');
 	print '</td><td>';
-	print '<input type="text" name="TICKET_PUBLIC_NOTIFICATION_NEW_MESSAGE_DEFAULT_EMAIL" value="'.$conf->global->TICKET_PUBLIC_NOTIFICATION_NEW_MESSAGE_DEFAULT_EMAIL.'" size="40" ></td>';
+	print '<input type="text" name="TICKET_PUBLIC_NOTIFICATION_NEW_MESSAGE_DEFAULT_EMAIL" value="'.getDolGlobalString("TICKET_PUBLIC_NOTIFICATION_NEW_MESSAGE_DEFAULT_EMAIL").'" size="40" ></td>';
 	print '</td>';
 	print '</tr>';
 
diff --git a/htdocs/core/db/mysqli.class.php b/htdocs/core/db/mysqli.class.php
index 9b1d78f1694..1fe4ce77414 100644
--- a/htdocs/core/db/mysqli.class.php
+++ b/htdocs/core/db/mysqli.class.php
@@ -421,7 +421,7 @@ class DoliDBMysqli extends DoliDB
 		if (!is_object($resultset)) {
 			$resultset = $this->_results;
 		}
-		return $resultset->num_rows;
+		return isset($resultset->num_rows) ? $resultset->num_rows : 0;
 	}
 
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
diff --git a/htdocs/core/modules/commande/mod_commande_saphir.php b/htdocs/core/modules/commande/mod_commande_saphir.php
index 36efdcc1d88..ad2b109f2d1 100644
--- a/htdocs/core/modules/commande/mod_commande_saphir.php
+++ b/htdocs/core/modules/commande/mod_commande_saphir.php
@@ -79,7 +79,7 @@ class mod_commande_saphir extends ModeleNumRefCommandes
 
 		// Parametrage du prefix
 		$texte .= '<tr><td>'.$langs->trans("Mask").':</td>';
-		$texte .= '<td class="right">'.$form->textwithpicto('<input type="text" class="flat minwidth175" name="maskorder" value="'.$conf->global->COMMANDE_SAPHIR_MASK.'">', $tooltip, 1, 1).'</td>';
+		$texte .= '<td class="right">'.$form->textwithpicto('<input type="text" class="flat minwidth175" name="maskorder" value="'.getDolGlobalString("COMMANDE_SAPHIR_MASK").'">', $tooltip, 1, 1).'</td>';
 
 		$texte .= '<td class="left" rowspan="2">&nbsp; <input type="submit" class="button button-edit" name="Button"value="'.$langs->trans("Modify").'"></td>';
 
@@ -128,7 +128,7 @@ class mod_commande_saphir extends ModeleNumRefCommandes
 		require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 
 		// We get cursor rule
-		$mask = $conf->global->COMMANDE_SAPHIR_MASK;
+		$mask = getDolGlobalString("COMMANDE_SAPHIR_MASK");
 
 		if (!$mask) {
 			$this->error = 'NotConfigured';
diff --git a/htdocs/core/modules/contract/mod_contract_magre.php b/htdocs/core/modules/contract/mod_contract_magre.php
index e0c54c1d022..e88d2c46b32 100644
--- a/htdocs/core/modules/contract/mod_contract_magre.php
+++ b/htdocs/core/modules/contract/mod_contract_magre.php
@@ -85,7 +85,7 @@ class mod_contract_magre extends ModelNumRefContracts
 		$tooltip .= $langs->trans("GenericMaskCodes5");
 
 		$texte .= '<tr><td>'.$langs->trans("Mask").':</td>';
-		$texte .= '<td class="right">'.$form->textwithpicto('<input type="text" class="flat minwidth175" name="maskcontract" value="'.$conf->global->CONTRACT_MAGRE_MASK.'">', $tooltip, 1, 1).'</td>';
+		$texte .= '<td class="right">'.$form->textwithpicto('<input type="text" class="flat minwidth175" name="maskcontract" value="'.getDolGlobalString("CONTRACT_MAGRE_MASK").'">', $tooltip, 1, 1).'</td>';
 		$texte .= '<td class="left" rowspan="2">&nbsp; <input type="submit" class="button button-edit" name="Button"value="'.$langs->trans("Modify").'"></td>';
 		$texte .= '</tr>';
 		$texte .= '</table>';
@@ -127,7 +127,7 @@ class mod_contract_magre extends ModelNumRefContracts
 
 		require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 
-		$mask = $conf->global->CONTRACT_MAGRE_MASK;
+		$mask = getDolGlobalString("CONTRACT_MAGRE_MASK");
 
 		if (!$mask) {
 			$this->error = 'NotConfigured';
diff --git a/htdocs/core/modules/fichinter/mod_arctic.php b/htdocs/core/modules/fichinter/mod_arctic.php
index cb5acddd6e9..8efd936601b 100644
--- a/htdocs/core/modules/fichinter/mod_arctic.php
+++ b/htdocs/core/modules/fichinter/mod_arctic.php
@@ -84,7 +84,7 @@ class mod_arctic extends ModeleNumRefFicheinter
 
 		// Setting the prefix
 		$texte .= '<tr><td>'.$langs->trans("Mask").':</td>';
-		$texte .= '<td class="right">'.$form->textwithpicto('<input type="text" class="flat minwidth175" name="maskvalue" value="'.$conf->global->FICHINTER_ARTIC_MASK.'">', $tooltip, 1, 1).'</td>';
+		$texte .= '<td class="right">'.$form->textwithpicto('<input type="text" class="flat minwidth175" name="maskvalue" value="'.getDolGlobalString("FICHINTER_ARTIC_MASK").'">', $tooltip, 1, 1).'</td>';
 
 		$texte .= '<td class="left" rowspan="2">&nbsp; <input type="submit" class="button button-edit" name="Button" value="'.$langs->trans("Modify").'"></td>';
 
@@ -130,7 +130,7 @@ class mod_arctic extends ModeleNumRefFicheinter
 		require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 
 		// We define the search criteria of the counter
-		$mask = $conf->global->FICHINTER_ARTIC_MASK;
+		$mask = getDolGlobalString("FICHINTER_ARTIC_MASK");
 
 		if (!$mask) {
 			$this->error = 'NotConfigured';
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 8314d62dada..dfcc9273505 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
@@ -123,7 +123,7 @@ class doc_generic_proposal_odt extends ModelePDFPropales
 		$texte .= '<input type="hidden" name="page_y" value="">';
 		$texte .= '<input type="hidden" name="action" value="setModuleOptions">';
 		$texte .= '<input type="hidden" name="param1" value="PROPALE_ADDON_PDF_ODT_PATH">';
-		if ($conf->global->MAIN_PROPAL_CHOOSE_ODT_DOCUMENT > 0) {
+		if (getDolGlobalInt("MAIN_PROPAL_CHOOSE_ODT_DOCUMENT") > 0) {
 			$texte .= '<input type="hidden" name="param2" value="PROPALE_ADDON_PDF_ODT_DEFAULT">';
 			$texte .= '<input type="hidden" name="param3" value="PROPALE_ADDON_PDF_ODT_TOBILL">';
 			$texte .= '<input type="hidden" name="param4" value="PROPALE_ADDON_PDF_ODT_CLOSED">';
@@ -187,7 +187,7 @@ class doc_generic_proposal_odt extends ModelePDFPropales
 			$texte .= '</div>';
 
 			// Set default template for different status of proposal
-			if ($conf->global->MAIN_PROPAL_CHOOSE_ODT_DOCUMENT > 0) {
+			if (getDolGlobalInt("MAIN_PROPAL_CHOOSE_ODT_DOCUMENT") > 0) {
 				// Model for creation
 				$list = ModelePDFPropales::liste_modeles($this->db);
 				$texte .= '<table width="50%;">';
diff --git a/htdocs/core/modules/reception/mod_reception_moonstone.php b/htdocs/core/modules/reception/mod_reception_moonstone.php
index e1a5669dc09..40aaa63a7a8 100644
--- a/htdocs/core/modules/reception/mod_reception_moonstone.php
+++ b/htdocs/core/modules/reception/mod_reception_moonstone.php
@@ -61,7 +61,7 @@ class mod_reception_moonstone extends ModelNumRefReception
 		$tooltip .= $langs->trans("GenericMaskCodes5");
 
 		$texte .= '<tr><td>'.$langs->trans("Mask").':</td>';
-		$texte .= '<td class="right">'.$form->textwithpicto('<input type="text" class="flat minwidth175" name="maskreception" value="'.$conf->global->RECEPTION_MOONSTONE_MASK.'">', $tooltip, 1, 1).'</td>';
+		$texte .= '<td class="right">'.$form->textwithpicto('<input type="text" class="flat minwidth175" name="maskreception" value="'.getDolGlobalString("RECEPTION_MOONSTONE_MASK").'">', $tooltip, 1, 1).'</td>';
 		$texte .= '<td class="left" rowspan="2">&nbsp; <input type="submit" class="button button-edit" name="Button" value="'.$langs->trans("Modify").'"></td>';
 		$texte .= '</tr>';
 		$texte .= '</table>';
@@ -106,7 +106,7 @@ class mod_reception_moonstone extends ModelNumRefReception
 
 		require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 
-		$mask = $conf->global->RECEPTION_MOONSTONE_MASK;
+		$mask = getDolGlobalString("RECEPTION_MOONSTONE_MASK");
 
 		if (!$mask) {
 			$this->error = 'NotConfigured';
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 e6838b9c4c4..0aacecc69da 100644
--- a/htdocs/core/modules/supplier_invoice/mod_facture_fournisseur_tulip.php
+++ b/htdocs/core/modules/supplier_invoice/mod_facture_fournisseur_tulip.php
@@ -67,12 +67,12 @@ class mod_facture_fournisseur_tulip extends ModeleNumRefSuppliersInvoices
 	 */
 	public function info()
 	{
-		global $conf, $langs;
+		global $conf, $langs, $db;
 
 		// Load translation files required by the page
 		$langs->loadLangs(array("bills", "admin"));
 
-		$form = new Form($this->db);
+		$form = new Form($db);
 
 		$texte = $langs->trans('GenericNumRefModelDesc')."<br>\n";
 		$texte .= '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
@@ -93,7 +93,7 @@ class mod_facture_fournisseur_tulip extends ModeleNumRefSuppliersInvoices
 		// Setting the prefix
 		$texte .= '<tr><td>'.$langs->trans("Mask").' ('.$langs->trans("InvoiceStandard").')';
 		$texte .= ':</td>';
-		$texte .= '<td class="right">'.$form->textwithpicto('<input type="text" class="flat minwidth175" name="maskinvoice" value="'.$conf->global->SUPPLIER_INVOICE_TULIP_MASK.'">', $tooltip, 1, 1).'</td>';
+		$texte .= '<td class="right">'.$form->textwithpicto('<input type="text" class="flat minwidth175" name="maskinvoice" value="'.getDolGlobalString("SUPPLIER_INVOICE_TULIP_MASK").'">', $tooltip, 1, 1).'</td>';
 
 		$texte .= '<td class="left" rowspan="2">&nbsp; <input type="submit" class="button button-edit" name="Button"value="'.$langs->trans("Modify").'"></td>';
 
@@ -101,19 +101,19 @@ class mod_facture_fournisseur_tulip extends ModeleNumRefSuppliersInvoices
 
 		// Prefix setting of credit note
 		$texte .= '<tr><td>'.$langs->trans("Mask").' ('.$langs->trans("InvoiceAvoir").'):</td>';
-		$texte .= '<td class="right">'.$form->textwithpicto('<input type="text" class="flat minwidth175" name="maskcredit" value="'.$conf->global->SUPPLIER_CREDIT_TULIP_MASK.'">', $tooltip, 1, 1).'</td>';
+		$texte .= '<td class="right">'.$form->textwithpicto('<input type="text" class="flat minwidth175" name="maskcredit" value="'.getDolGlobalString("SUPPLIER_CREDIT_TULIP_MASK").'">', $tooltip, 1, 1).'</td>';
 		$texte .= '</tr>';
 
 		if (getDolGlobalInt('MAIN_FEATURES_LEVEL') >= 2) {
 			// Parametrage du prefix des replacement
 			$texte .= '<tr><td>'.$langs->trans("Mask").' ('.$langs->trans("InvoiceReplacement").'):</td>';
-			$texte .= '<td class="right">'.$form->textwithpicto('<input type="text" class="flat minwidth175" name="maskreplacement" value="'.$conf->global->SUPPLIER_REPLACEMENT_TULIP_MASK.'">', $tooltip, 1, 1).'</td>';
+			$texte .= '<td class="right">'.$form->textwithpicto('<input type="text" class="flat minwidth175" name="maskreplacement" value="'.getDolGlobalString("SUPPLIER_REPLACEMENT_TULIP_MASK").'">', $tooltip, 1, 1).'</td>';
 			$texte .= '</tr>';
 		}
 
 		// Prefix setting of deposit
 		$texte .= '<tr><td>'.$langs->trans("Mask").' ('.$langs->trans("InvoiceDeposit").'):</td>';
-		$texte .= '<td class="right">'.$form->textwithpicto('<input type="text" class="flat minwidth175" name="maskdeposit" value="'.$conf->global->SUPPLIER_DEPOSIT_TULIP_MASK.'">', $tooltip, 1, 1).'</td>';
+		$texte .= '<td class="right">'.$form->textwithpicto('<input type="text" class="flat minwidth175" name="maskdeposit" value="'.getDolGlobalString("SUPPLIER_DEPOSIT_TULIP_MASK").'">', $tooltip, 1, 1).'</td>';
 		$texte .= '</tr>';
 
 		$texte .= '</table>';
@@ -159,16 +159,16 @@ class mod_facture_fournisseur_tulip extends ModeleNumRefSuppliersInvoices
 		// Get Mask value
 		$mask = '';
 		if (is_object($object) && $object->type == 1) {
-			$mask = $conf->global->SUPPLIER_REPLACEMENT_TULIP_MASK;
+			$mask = getDolGlobalString("SUPPLIER_REPLACEMENT_TULIP_MASK");
 			if (!$mask) {
-				$mask = $conf->global->SUPPLIER_INVOICE_TULIP_MASK;
+				$mask = getDolGlobalString("SUPPLIER_INVOICE_TULIP_MASK");
 			}
 		} elseif (is_object($object) && $object->type == 2) {
-			$mask = $conf->global->SUPPLIER_CREDIT_TULIP_MASK;
+			$mask = getDolGlobalString("SUPPLIER_CREDIT_TULIP_MASK");
 		} elseif (is_object($object) && $object->type == 3) {
-			$mask = $conf->global->SUPPLIER_DEPOSIT_TULIP_MASK;
+			$mask = getDolGlobalString("SUPPLIER_DEPOSIT_TULIP_MASK");
 		} else {
-			$mask = $conf->global->SUPPLIER_INVOICE_TULIP_MASK;
+			$mask = getDolGlobalString("SUPPLIER_INVOICE_TULIP_MASK");
 		}
 		if (!$mask) {
 			$this->error = 'NotConfigured';
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 473664cb44c..8f67f28b42d 100644
--- a/htdocs/core/modules/supplier_order/mod_commande_fournisseur_orchidee.php
+++ b/htdocs/core/modules/supplier_order/mod_commande_fournisseur_orchidee.php
@@ -85,7 +85,7 @@ class mod_commande_fournisseur_orchidee extends ModeleNumRefSuppliersOrders
 
 		// Parametrage du prefix
 		$texte .= '<tr><td>'.$langs->trans("Mask").':</td>';
-		$texte .= '<td class="right">'.$form->textwithpicto('<input type="text" class="flat minwidth175" name="maskorder" value="'.$conf->global->COMMANDE_FOURNISSEUR_ORCHIDEE_MASK.'">', $tooltip, 1, 1).'</td>';
+		$texte .= '<td class="right">'.$form->textwithpicto('<input type="text" class="flat minwidth175" name="maskorder" value="'.getDolGlobalString("COMMANDE_FOURNISSEUR_ORCHIDEE_MASK").'">', $tooltip, 1, 1).'</td>';
 
 		$texte .= '<td class="left" rowspan="2">&nbsp; <input type="submit" class="button button-edit" name="Button"value="'.$langs->trans("Modify").'"></td>';
 
@@ -131,7 +131,7 @@ class mod_commande_fournisseur_orchidee extends ModeleNumRefSuppliersOrders
 		require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 
 		// On defini critere recherche compteur
-		$mask = $conf->global->COMMANDE_FOURNISSEUR_ORCHIDEE_MASK;
+		$mask = getDolGlobalString("COMMANDE_FOURNISSEUR_ORCHIDEE_MASK");
 
 		if (!$mask) {
 			$this->error = 'NotConfigured';
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 0bc0543e6cd..292662a14ad 100644
--- a/htdocs/core/modules/supplier_payment/mod_supplier_payment_brodator.php
+++ b/htdocs/core/modules/supplier_payment/mod_supplier_payment_brodator.php
@@ -61,11 +61,11 @@ class mod_supplier_payment_brodator extends ModeleNumRefSupplierPayments
 	 */
 	public function info()
 	{
-		global $conf, $langs;
+		global $conf, $langs, $db;
 
 		$langs->load("bills");
 
-		$form = new Form($this->db);
+		$form = new Form($db);
 
 		$texte = $langs->trans('GenericNumRefModelDesc')."<br>\n";
 		$texte .= '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
@@ -82,7 +82,7 @@ class mod_supplier_payment_brodator extends ModeleNumRefSupplierPayments
 
 		// Parametrage du prefix
 		$texte .= '<tr><td>'.$langs->trans("Mask").':</td>';
-		$texte .= '<td class="right">'.$form->textwithpicto('<input type="text" class="flat minwidth175" name="masksupplierpayment" value="'.$conf->global->SUPPLIER_PAYMENT_BRODATOR_MASK.'">', $tooltip, 1, 1).'</td>';
+		$texte .= '<td class="right">'.$form->textwithpicto('<input type="text" class="flat minwidth175" name="masksupplierpayment" value="'.getDolGlobalString("SUPPLIER_PAYMENT_BRODATOR_MASK").'">', $tooltip, 1, 1).'</td>';
 
 		$texte .= '<td class="left" rowspan="2">&nbsp; <input type="submit" class="button button-edit" name="Button"value="'.$langs->trans("Modify").'"></td>';
 
@@ -128,7 +128,7 @@ class mod_supplier_payment_brodator extends ModeleNumRefSupplierPayments
 		require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 
 		// We get cursor rule
-		$mask = $conf->global->SUPPLIER_PAYMENT_BRODATOR_MASK;
+		$mask = getDolGlobalString("SUPPLIER_PAYMENT_BRODATOR_MASK");
 
 		if (!$mask) {
 			$this->error = 'NotConfigured';
diff --git a/htdocs/core/modules/ticket/mod_ticket_universal.php b/htdocs/core/modules/ticket/mod_ticket_universal.php
index 2c46376eea1..8efc2f6a4e5 100644
--- a/htdocs/core/modules/ticket/mod_ticket_universal.php
+++ b/htdocs/core/modules/ticket/mod_ticket_universal.php
@@ -81,7 +81,7 @@ class mod_ticket_universal extends ModeleNumRefTicket
 
 		// Parametrage du prefix
 		$texte .= '<tr><td>'.$langs->trans("Mask").':</td>';
-		$texte .= '<td class="right">'.$form->textwithpicto('<input type="text" class="flat minwidth175" name="maskticket" value="'.$conf->global->TICKET_UNIVERSAL_MASK.'">', $tooltip, 1, 1).'</td>';
+		$texte .= '<td class="right">'.$form->textwithpicto('<input type="text" class="flat minwidth175" name="maskticket" value="'.getDolGlobalString("TICKET_UNIVERSAL_MASK").'">', $tooltip, 1, 1).'</td>';
 
 		$texte .= '<td class="left" rowspan="2">&nbsp; <input type="submit" class="button button-edit" name="Button"value="'.$langs->trans("Modify").'"></td>';
 
@@ -127,7 +127,7 @@ class mod_ticket_universal extends ModeleNumRefTicket
 		include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 
 		// On defini critere recherche compteur
-		$mask = $conf->global->TICKET_UNIVERSAL_MASK;
+		$mask = getDolGlobalString("TICKET_UNIVERSAL_MASK");
 
 		if (!$mask) {
 			$this->error = 'NotConfigured';
diff --git a/htdocs/hrm/admin/admin_establishment.php b/htdocs/hrm/admin/admin_establishment.php
index 223f8a720d5..f28c0285e1f 100644
--- a/htdocs/hrm/admin/admin_establishment.php
+++ b/htdocs/hrm/admin/admin_establishment.php
@@ -53,10 +53,10 @@ if (empty($page) || $page == -1) {
 	$page = 0;
 }
 
+$limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
-$limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
 
 
 /*
diff --git a/htdocs/hrm/establishment/card.php b/htdocs/hrm/establishment/card.php
index 1b30eed663a..fa2ed2f55fd 100644
--- a/htdocs/hrm/establishment/card.php
+++ b/htdocs/hrm/establishment/card.php
@@ -254,7 +254,7 @@ if ($action == 'create') {
 }
 
 // Part to edit record
-if (($id || $ref) && $action == 'edit') {
+if ((!empty($id) || !empty($ref)) && $action == 'edit') {
 	$result = $object->fetch($id);
 	if ($result > 0) {
 		$head = establishment_prepare_head($object);

From b23ab2cb712a7f89ba989843a48bd12d26b9aa12 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 9 Sep 2022 13:58:54 +0200
Subject: [PATCH 832/974] FIX #yogosha12266

---
 htdocs/accountancy/journal/variousjournal.php |   2 +-
 htdocs/admin/clicktodial.php                  |   4 +-
 htdocs/api/index.php                          |   2 +
 htdocs/categories/viewcat.php                 |  20 +-
 htdocs/comm/action/list.php                   |   4 -
 htdocs/core/ajax/objectonoff.php              |   9 +-
 htdocs/core/ajax/selectsearchbox.php          |   1 +
 htdocs/core/lib/functions.lib.php             |   3 +-
 htdocs/core/lib/security.lib.php              |  23 ++-
 htdocs/core/tpl/login.tpl.php                 |   4 +-
 htdocs/core/tpl/passwordforgotten.tpl.php     |   4 +-
 htdocs/core/website.inc.php                   |  26 ++-
 htdocs/document.php                           |   8 +-
 .../conferenceorboothattendee_note.php        |   1 -
 htdocs/hrm/position.php                       |   1 -
 htdocs/hrm/skill_tab.php                      |   4 +-
 htdocs/main.inc.php                           |  13 +-
 htdocs/modulebuilder/index.php                |   4 +-
 .../mailinglist_mymodule_myobject.modules.php |   6 +-
 .../template/myobject_agenda.php              |   1 -
 .../modulebuilder/template/myobject_card.php  |   4 +-
 .../template/myobject_document.php            | 181 +++++++++---------
 .../modulebuilder/template/myobject_list.php  |   1 -
 .../modulebuilder/template/myobject_note.php  |   1 -
 .../template/scripts/mymodule.php             |   1 -
 htdocs/public/agenda/agendaexport.php         |   2 +-
 htdocs/public/cron/cron_run_jobs_by_url.php   |   2 +-
 htdocs/public/demo/index.php                  |   2 +-
 htdocs/public/donations/donateurs_code.php    |   2 +-
 .../public/eventorganization/attendee_new.php |   2 +-
 .../eventorganization/subscriptionok.php      |   2 +-
 htdocs/public/members/new.php                 |   5 +-
 htdocs/public/members/public_card.php         |   2 +-
 htdocs/public/members/public_list.php         |   2 +-
 htdocs/public/onlinesign/newonlinesign.php    |  34 ++--
 htdocs/public/opensurvey/studs.php            |  10 +-
 htdocs/public/partnership/new.php             |   5 +-
 htdocs/public/payment/paymentko.php           |   2 +-
 htdocs/public/payment/paymentok.php           |   2 +-
 htdocs/public/project/index.php               |   2 +-
 htdocs/public/project/new.php                 |   2 +-
 htdocs/public/project/suggestbooth.php        |   2 +-
 htdocs/public/project/suggestconference.php   |   2 +-
 htdocs/public/project/viewandvote.php         |   2 +-
 htdocs/public/recruitment/index.php           |   2 +-
 htdocs/public/recruitment/view.php            |   2 +-
 htdocs/public/stripe/ipn.php                  |  31 ++-
 htdocs/public/ticket/create_ticket.php        |   2 +-
 htdocs/public/ticket/index.php                |   2 +-
 htdocs/public/ticket/list.php                 |   2 +-
 htdocs/public/ticket/view.php                 |   2 +-
 htdocs/societe/document.php                   | 158 ++++++++-------
 htdocs/user/class/user.class.php              |   2 +-
 htdocs/viewimage.php                          |  16 +-
 htdocs/webhook/target_card.php                |   2 +-
 55 files changed, 316 insertions(+), 317 deletions(-)

diff --git a/htdocs/accountancy/journal/variousjournal.php b/htdocs/accountancy/journal/variousjournal.php
index d737925f2c3..9c944aa7470 100644
--- a/htdocs/accountancy/journal/variousjournal.php
+++ b/htdocs/accountancy/journal/variousjournal.php
@@ -51,7 +51,7 @@ if ($result > 0) {
 } elseif ($result < 0) {
 	dol_print_error('', $object->error, $object->errors);
 } elseif ($result == 0) {
-	accessforbidden($langs->trans('ErrorRecordNotFound'));
+	accessforbidden('ErrorRecordNotFound');
 }
 
 $hookmanager->initHooks(array('globaljournal', $object->nature.'journal'));
diff --git a/htdocs/admin/clicktodial.php b/htdocs/admin/clicktodial.php
index 8b8f2c6c921..72b7be134bb 100644
--- a/htdocs/admin/clicktodial.php
+++ b/htdocs/admin/clicktodial.php
@@ -35,8 +35,8 @@ if (!$user->admin) {
 
 $action = GETPOST('action', 'aZ09');
 
-if (!in_array('clicktodial', $conf->modules)) {
-	accessforbidden($langs->trans("WarningModuleNotActive", $langs->transnoentitiesnoconv("Module58Name")));
+if (!isModEnabled('clicktodial')) {
+	accessforbidden($langs->transnoentitiesnoconv("WarningModuleNotActive", $langs->transnoentitiesnoconv("Module58Name")));
 }
 
 
diff --git a/htdocs/api/index.php b/htdocs/api/index.php
index 8543e284533..4c0d36fdcfe 100644
--- a/htdocs/api/index.php
+++ b/htdocs/api/index.php
@@ -76,6 +76,8 @@ if (preg_match('/\/api\/index\.php/', $_SERVER["PHP_SELF"])) {
 	header('Access-Control-Allow-Methods: GET, POST, PUT, DELETE');
 	header('Access-Control-Allow-Headers: Content-Type, Authorization, api_key, DOLAPIKEY');
 }
+header('X-Frame-Options: SAMEORIGIN');
+
 
 $res = 0;
 if (!$res && file_exists("../main.inc.php")) {
diff --git a/htdocs/categories/viewcat.php b/htdocs/categories/viewcat.php
index 0e5da0735ce..97c6d118842 100644
--- a/htdocs/categories/viewcat.php
+++ b/htdocs/categories/viewcat.php
@@ -563,7 +563,7 @@ if ($type == Categorie::TYPE_PRODUCT) {
 		}
 	} else {
 		print_barre_liste($langs->trans("ProductsAndServices"), null, $_SERVER["PHP_SELF"], '', '', '', '', '', '', 'products');
-		accessforbidden($langs->trans("NotEnoughPermissions"), 0, 0);
+		accessforbidden("NotEnoughPermissions", 0, 0);
 	}
 }
 
@@ -643,7 +643,7 @@ if ($type == Categorie::TYPE_CUSTOMER) {
 		}
 	} else {
 		print_barre_liste($langs->trans("Customers"), null, $_SERVER["PHP_SELF"], '', '', '', '', '', '', 'companies');
-		accessforbidden($langs->trans("NotEnoughPermissions"), 0, 0);
+		accessforbidden("NotEnoughPermissions", 0, 0);
 	}
 }
 
@@ -724,7 +724,7 @@ if ($type == Categorie::TYPE_SUPPLIER) {
 		}
 	} else {
 		print_barre_liste($langs->trans("Suppliers"), null, $_SERVER["PHP_SELF"], '', '', '', '', '', '', 'companies');
-		accessforbidden($langs->trans("NotEnoughPermissions"), 0, 0);
+		accessforbidden("NotEnoughPermissions", 0, 0);
 	}
 }
 
@@ -808,7 +808,7 @@ if ($type == Categorie::TYPE_MEMBER) {
 		}
 	} else {
 		print_barre_liste($langs->trans("Member"), null, $_SERVER["PHP_SELF"], '', '', '', '', '', '', 'members');
-		accessforbidden($langs->trans("NotEnoughPermissions"), 0, 0);
+		accessforbidden("NotEnoughPermissions", 0, 0);
 	}
 }
 
@@ -895,7 +895,7 @@ if ($type == Categorie::TYPE_CONTACT) {
 		}
 	} else {
 		print_barre_liste($langs->trans("Contact"), null, $_SERVER["PHP_SELF"], '', '', '', '', '', '', 'contact');
-		accessforbidden($langs->trans("NotEnoughPermissions"), 0, 0);
+		accessforbidden("NotEnoughPermissions", 0, 0);
 	}
 }
 
@@ -977,7 +977,7 @@ if ($type == Categorie::TYPE_ACCOUNT) {
 		}
 	} else {
 		print_barre_liste($langs->trans("Banque"), null, $_SERVER["PHP_SELF"], '', '', '', '', '', '', 'bank');
-		accessforbidden($langs->trans("NotEnoughPermissions"), 0, 0);
+		accessforbidden("NotEnoughPermissions", 0, 0);
 	}
 }
 
@@ -1060,7 +1060,7 @@ if ($type == Categorie::TYPE_PROJECT) {
 		}
 	} else {
 		print_barre_liste($langs->trans("Project"), null, $_SERVER["PHP_SELF"], '', '', '', '', '', '', 'project');
-		accessforbidden($langs->trans("NotEnoughPermissions"), 0, 0);
+		accessforbidden("NotEnoughPermissions", 0, 0);
 	}
 }
 
@@ -1137,7 +1137,7 @@ if ($type == Categorie::TYPE_USER) {
 		}
 	} else {
 		print_barre_liste($langs->trans("Users"), null, $_SERVER["PHP_SELF"], '', '', '', '', '', '', 'user');
-		accessforbidden($langs->trans("NotEnoughPermissions"), 0, 0);
+		accessforbidden("NotEnoughPermissions", 0, 0);
 	}
 }
 
@@ -1201,7 +1201,7 @@ if ($type == Categorie::TYPE_WAREHOUSE) {
 		}
 	} else {
 		print_barre_liste($langs->trans("Warehouse"), null, $_SERVER["PHP_SELF"], '', '', '', '', '', '', 'stock');
-		accessforbidden($langs->trans("NotEnoughPermissions"), 0, 0);
+		accessforbidden("NotEnoughPermissions", 0, 0);
 	}
 }
 
@@ -1280,7 +1280,7 @@ if ($type == Categorie::TYPE_TICKET) {
 		}
 	} else {
 		print_barre_liste($langs->trans("Ticket"), null, $_SERVER["PHP_SELF"], '', '', '', '', '', '', 'ticket');
-		accessforbidden($langs->trans("NotEnoughPermissions"), 0, 0);
+		accessforbidden("NotEnoughPermissions", 0, 0);
 	}
 }
 
diff --git a/htdocs/comm/action/list.php b/htdocs/comm/action/list.php
index b42bf003333..767c91b8abd 100644
--- a/htdocs/comm/action/list.php
+++ b/htdocs/comm/action/list.php
@@ -27,10 +27,6 @@
  *		\brief      Page to list actions
  */
 
-if (!defined("NOREDIRECTBYMAINTOLOGIN")) {
-	define('NOREDIRECTBYMAINTOLOGIN', 1);
-}
-
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
 require_once DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php';
diff --git a/htdocs/core/ajax/objectonoff.php b/htdocs/core/ajax/objectonoff.php
index ffd05c4747e..5042dadb9b3 100644
--- a/htdocs/core/ajax/objectonoff.php
+++ b/htdocs/core/ajax/objectonoff.php
@@ -1,5 +1,6 @@
 <?php
-/*
+/* Copyright (C) 2015-2022 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
@@ -65,13 +66,15 @@ if (!empty($user->socid)) {
 	$socid = $user->socid;
 }
 
+//$user->rights->societe->lire = 0;$user->rights->fournisseur->lire = 0;
+//restrictedArea($user, 'societe', $id);
+
 if (in_array($field, array('status'))) {
 	restrictedArea($user, $element, $id);
 } elseif ($element == 'product' && in_array($field, array('tosell', 'tobuy', 'tobatch'))) {	// Special case for products
 	restrictedArea($user, 'produit|service', $id, 'product&product', '', '', 'rowid');
 } else {
-	accessforbidden("Bad value for combination of parameters element/field.", 0, 0, 1);
-	exit;
+	httponly_accessforbidden("Bad value for combination of parameters element/field.");
 }
 
 
diff --git a/htdocs/core/ajax/selectsearchbox.php b/htdocs/core/ajax/selectsearchbox.php
index b643351dc73..19f7523fd21 100644
--- a/htdocs/core/ajax/selectsearchbox.php
+++ b/htdocs/core/ajax/selectsearchbox.php
@@ -40,6 +40,7 @@ if (!isset($usedbyinclude) || empty($usedbyinclude)) {
 		define('NOREQUIREAJAX', '1');
 	}
 	if (!defined('NOREDIRECTBYMAINTOLOGIN')) {
+		// Disable redirect to main login because the selectsearch must not ask a login
 		define('NOREDIRECTBYMAINTOLOGIN', '1');
 	}
 
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 7391785312f..a18e3a761a9 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -4955,8 +4955,9 @@ function dol_print_error($db = '', $error = '', $errors = null)
 		$out .= "<br>\n";
 	}
 
-	// Return a http error code if possible
+	// Return a http header with error code if possible
 	if (!headers_sent()) {
+		top_httphead();
 		http_response_code(500);
 	}
 
diff --git a/htdocs/core/lib/security.lib.php b/htdocs/core/lib/security.lib.php
index 1efcbaacf78..ce6f9b38320 100644
--- a/htdocs/core/lib/security.lib.php
+++ b/htdocs/core/lib/security.lib.php
@@ -329,11 +329,11 @@ function dolGetLdapPasswordHash($password, $type = 'md5')
  *  @param  string		$dbt_keyfield   Field name for socid foreign key if not fk_soc. Not used if objectid is null (optional)
  *  @param  string		$dbt_select     Field name for select if not rowid. Not used if objectid is null (optional)
  *  @param	int			$isdraft		1=The object with id=$objectid is a draft
- *  @param	int			$mode			Mode (0=default, 1=return with not die)
+ *  @param	int			$mode			Mode (0=default, 1=return without dieing)
  * 	@return	int							If mode = 0 (default): Always 1, die process if not allowed. If mode = 1: Return 0 if access not allowed.
  *  @see dol_check_secure_access_document(), checkUserAccessToObject()
  */
-function restrictedArea($user, $features, $objectid = 0, $tableandshare = '', $feature2 = '', $dbt_keyfield = 'fk_soc', $dbt_select = 'rowid', $isdraft = 0, $mode = 0)
+function restrictedArea(User $user, $features, $objectid = 0, $tableandshare = '', $feature2 = '', $dbt_keyfield = 'fk_soc', $dbt_select = 'rowid', $isdraft = 0, $mode = 0)
 {
 	global $db, $conf;
 	global $hookmanager;
@@ -1022,24 +1022,29 @@ function checkUserAccessToObject($user, array $featuresarray, $object = 0, $tabl
  *  This includes only HTTP header.
  *	Calling this function terminate execution of PHP.
  *
- *	@param	string		$message			Force error message
- *	@param	int			$http_response_code	HTTP response code
+ *	@param	string		$message					Force error message
+ *	@param	int			$http_response_code			HTTP response code
+ *  @param	int			$stringalreadysanitized		1 if string is already sanitized with HTML entities
  *  @return	void
  *  @see accessforbidden()
  */
-function httponly_accessforbidden($message = 1, $http_response_code = 403)
+function httponly_accessforbidden($message = 1, $http_response_code = 403, $stringalreadysanitized = 0)
 {
-	top_httphead('text/html');
+	top_httphead();
 	http_response_code($http_response_code);
 
-	print htmlentities($message);
+	if ($stringalreadysanitized) {
+		print $message;
+	} else {
+		print htmlentities($message);
+	}
 
 	exit(1);
 }
 
 /**
  *	Show a message to say access is forbidden and stop program.
- *  This includes HTTP and HTML header and footer.
+ *  This includes HTTP and HTML header and footer (except if $printheader and $printfooter is  0, use this case inside an already started page).
  *	Calling this function terminate execution of PHP.
  *
  *	@param	string		$message			Force error message
@@ -1070,7 +1075,7 @@ function accessforbidden($message = '', $printheader = 1, $printfooter = 1, $sho
 		}
 	}
 	print '<div class="error">';
-	if (!$message) {
+	if (empty($message)) {
 		print $langs->trans("ErrorForbidden");
 	} else {
 		print $langs->trans($message);
diff --git a/htdocs/core/tpl/login.tpl.php b/htdocs/core/tpl/login.tpl.php
index b07bb66b46c..f179ea9ed36 100644
--- a/htdocs/core/tpl/login.tpl.php
+++ b/htdocs/core/tpl/login.tpl.php
@@ -33,10 +33,8 @@ if (empty($conf) || !is_object($conf)) {
 // DDOS protection
 $size = (empty($_SERVER['CONTENT_LENGTH']) ? 0 : (int) $_SERVER['CONTENT_LENGTH']);
 if ($size > 10000) {
-	http_response_code(413);
 	$langs->loadLangs(array("errors", "install"));
-	accessforbidden('<center>'.$langs->trans("ErrorRequestTooLarge").'.<br><a href="'.DOL_URL_ROOT.'">'.$langs->trans("ClickHereToGoToApp").'</a></center>', 0, 0, 1);
-	exit;
+	httponly_accessforbidden('<center>'.$langs->trans("ErrorRequestTooLarge").'.<br><a href="'.DOL_URL_ROOT.'">'.$langs->trans("ClickHereToGoToApp").'</a></center>', 413, 1);
 }
 
 require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
diff --git a/htdocs/core/tpl/passwordforgotten.tpl.php b/htdocs/core/tpl/passwordforgotten.tpl.php
index 6d52cfff267..9aaba5745bb 100644
--- a/htdocs/core/tpl/passwordforgotten.tpl.php
+++ b/htdocs/core/tpl/passwordforgotten.tpl.php
@@ -30,10 +30,8 @@ if (empty($conf) || !is_object($conf)) {
 // DDOS protection
 $size = (int) $_SERVER['CONTENT_LENGTH'];
 if ($size > 10000) {
-	http_response_code(413);
 	$langs->loadLangs(array("errors", "install"));
-	accessforbidden('<center>'.$langs->trans("ErrorRequestTooLarge").'<br><a href="'.DOL_URL_ROOT.'">'.$langs->trans("ClickHereToGoToApp").'</a></center>', 0, 0, 1);
-	exit;
+	httponly_accessforbidden('<center>'.$langs->trans("ErrorRequestTooLarge").'<br><a href="'.DOL_URL_ROOT.'">'.$langs->trans("ClickHereToGoToApp").'</a></center>', 413, 1);
 }
 
 require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
diff --git a/htdocs/core/website.inc.php b/htdocs/core/website.inc.php
index 3bbfe225bee..2bdc9080b78 100644
--- a/htdocs/core/website.inc.php
+++ b/htdocs/core/website.inc.php
@@ -75,6 +75,18 @@ if ($pageid > 0) {
 
 	if (!defined('USEDOLIBARREDITOR') && (in_array($websitepage->type_container, array('menu', 'other')) || empty($websitepage->status) && !defined('USEDOLIBARRSERVER'))) {
 		$weblangs->load("website");
+
+		// Security options
+
+		// X-Content-Type-Options
+		header("X-Content-Type-Options: nosniff");
+
+		// X-Frame-Options
+		if (empty($websitepage->allowed_in_frames) && empty($conf->global->WEBSITE_ALLOW_FRAMES_ON_ALL_PAGES)) {
+			header("X-Frame-Options: SAMEORIGIN");
+		}
+
+		//httponly_accessforbidden('<center><br><br>'.$weblangs->trans("YouTryToAccessToAFileThatIsNotAWebsitePage", $websitepage->pageurl, $websitepage->type_container, $websitepage->status).'</center>', 404, 1);
 		http_response_code(404);
 		print '<center><br><br>'.$weblangs->trans("YouTryToAccessToAFileThatIsNotAWebsitePage", $websitepage->pageurl, $websitepage->type_container, $websitepage->status).'</center>';
 		exit;
@@ -198,9 +210,21 @@ if ($_SERVER['PHP_SELF'] != DOL_URL_ROOT.'/website/index.php') {	// If we browsi
 	}
 }
 
-// Show off line message
+// Show off line message when all website is off
 if (!defined('USEDOLIBARREDITOR') && empty($website->status)) {
+	// Security options
+
+	// X-Content-Type-Options
+	header("X-Content-Type-Options: nosniff");
+
+	// X-Frame-Options
+	if (empty($websitepage->allowed_in_frames) && empty($conf->global->WEBSITE_ALLOW_FRAMES_ON_ALL_PAGES)) {
+		header("X-Frame-Options: SAMEORIGIN");
+	}
+
 	$weblangs->load("website");
+
+	//httponly_accessforbidden('<center><br><br>'.$weblangs->trans("SorryWebsiteIsCurrentlyOffLine").'</center>', 503, 1);
 	http_response_code(503);
 	print '<center><br><br>'.$weblangs->trans("SorryWebsiteIsCurrentlyOffLine").'</center>';
 	exit;
diff --git a/htdocs/document.php b/htdocs/document.php
index 65e5cce7e5f..4f6652fafda 100644
--- a/htdocs/document.php
+++ b/htdocs/document.php
@@ -104,10 +104,10 @@ $entity = GETPOST('entity', 'int') ?GETPOST('entity', 'int') : $conf->entity;
 
 // Security check
 if (empty($modulepart) && empty($hashp)) {
-	accessforbidden('Bad link. Bad value for parameter modulepart', 0, 0, 1);
+	httponly_accessforbidden('Bad link. Bad value for parameter modulepart', 400);
 }
 if (empty($original_file) && empty($hashp)) {
-	accessforbidden('Bad link. Missing identification to find file (original_file or hashp)', 0, 0, 1);
+	httponly_accessforbidden('Bad link. Missing identification to find file (original_file or hashp)', 400);
 }
 if ($modulepart == 'fckeditor') {
 	$modulepart = 'medias'; // For backward compatibility
@@ -158,7 +158,7 @@ if (!empty($hashp)) {
 				$original_file = (($tmp[1] ? $tmp[1].'/' : '').$ecmfile->filename); // this is relative to module dir
 				//var_dump($original_file); exit;
 			} else {
-				accessforbidden('Bad link. File is from another module part.', 0, 0, 1);
+				httponly_accessforbidden('Bad link. File is from another module part.', 403);
 			}
 		} else {
 			$modulepart = $moduleparttocheck;
@@ -171,7 +171,7 @@ if (!empty($hashp)) {
 		}
 	} else {
 		$langs->load("errors");
-		accessforbidden($langs->trans("ErrorFileNotFoundWithSharedLink"), 0, 0, 1);
+		httponly_accessforbidden($langs->trans("ErrorFileNotFoundWithSharedLink"), 403, 1);
 	}
 }
 
diff --git a/htdocs/eventorganization/conferenceorboothattendee_note.php b/htdocs/eventorganization/conferenceorboothattendee_note.php
index b6e343e4496..adc4a1683b8 100644
--- a/htdocs/eventorganization/conferenceorboothattendee_note.php
+++ b/htdocs/eventorganization/conferenceorboothattendee_note.php
@@ -38,7 +38,6 @@
 //if (! defined('NOIPCHECK'))                define('NOIPCHECK', '1');					// Do not check IP defined into conf $dolibarr_main_restrict_ip
 //if (! defined("MAIN_LANG_DEFAULT"))        define('MAIN_LANG_DEFAULT', 'auto');					// Force lang to a particular value
 //if (! defined("MAIN_AUTHENTICATION_MODE")) define('MAIN_AUTHENTICATION_MODE', 'aloginmodule');	// Force authentication handler
-//if (! defined("NOREDIRECTBYMAINTOLOGIN"))  define('NOREDIRECTBYMAINTOLOGIN', 1);		// The main.inc.php does not make a redirect if not logged, instead show simple error message
 //if (! defined('CSRFCHECK_WITH_TOKEN'))     define('CSRFCHECK_WITH_TOKEN', '1');		// Force use of CSRF protection with tokens even for GET
 //if (! defined('NOBROWSERNOTIF'))     		 define('NOBROWSERNOTIF', '1');				// Disable browser notification
 
diff --git a/htdocs/hrm/position.php b/htdocs/hrm/position.php
index 2659321e5fc..24ce9ec3b51 100644
--- a/htdocs/hrm/position.php
+++ b/htdocs/hrm/position.php
@@ -41,7 +41,6 @@
 //if (! defined('NOIPCHECK'))                define('NOIPCHECK', '1');					// Do not check IP defined into conf $dolibarr_main_restrict_ip
 //if (! defined("MAIN_LANG_DEFAULT"))        define('MAIN_LANG_DEFAULT', 'auto');					// Force lang to a particular value
 //if (! defined("MAIN_AUTHENTICATION_MODE")) define('MAIN_AUTHENTICATION_MODE', 'aloginmodule');	// Force authentication handler
-//if (! defined("NOREDIRECTBYMAINTOLOGIN"))  define('NOREDIRECTBYMAINTOLOGIN', 1);		// The main.inc.php does not make a redirect if not logged, instead show simple error message
 //if (! defined('CSRFCHECK_WITH_TOKEN'))     define('CSRFCHECK_WITH_TOKEN', '1');		// Force use of CSRF protection with tokens even for GET
 //if (! defined('NOBROWSERNOTIF'))     		 define('NOBROWSERNOTIF', '1');				// Disable browser notification
 
diff --git a/htdocs/hrm/skill_tab.php b/htdocs/hrm/skill_tab.php
index c48a7c405c6..393e20ba3c4 100644
--- a/htdocs/hrm/skill_tab.php
+++ b/htdocs/hrm/skill_tab.php
@@ -64,7 +64,9 @@ if (in_array($objecttype, $TAuthorizedObjects)) {
 	} elseif ($objecttype == "user") {
 		$object = new User($db);
 	}
-} else accessforbidden($langs->trans('ErrorBadObjectType'));
+} else {
+	accessforbidden('ErrorBadObjectType');
+}
 
 $hookmanager->initHooks(array('skilltab', 'globalcard')); // Note that conf->hooks_modules contains array
 
diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index 06ff00e474f..6d89923f20e 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -547,12 +547,12 @@ 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')) {
 				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").' ';
 				print $langs->trans("ErrorGoBackAndCorrectParameters");
-				die;
 			} else {
 				http_response_code(403);
 				if (defined('CSRFCHECK_WITH_TOKEN')) {
@@ -567,8 +567,8 @@ if ((!defined('NOCSRFCHECK') && empty($dolibarr_nocsrfcheck) && getDolGlobalInt(
 					}
 					print " into setup).\n";
 				}
-				die;
 			}
+			die;
 		}
 	}
 
@@ -851,12 +851,16 @@ if (!defined('NOLOGIN')) {
 			// No data to test login, so we show the login page.
 			dol_syslog("--- Access to ".(empty($_SERVER["REQUEST_METHOD"]) ? '' : $_SERVER["REQUEST_METHOD"].' ').$_SERVER["PHP_SELF"]." - action=".GETPOST('action', 'aZ09')." - actionlogin=".GETPOST('actionlogin', 'aZ09')." - showing the login form and exit", LOG_INFO);
 			if (defined('NOREDIRECTBYMAINTOLOGIN')) {
+				// When used with NOREDIRECTBYMAINTOLOGIN set, the http header must already be set when including the main.
+				// See example with selectsearchbox.php. This case is reserverd for the selectesearchbox.php so we can
+				// report a message to ask to login when search ajax component is used after a timeout.
+				//top_httphead();
 				return 'ERROR_NOT_LOGGED';
 			} else {
 				if ($_SERVER["HTTP_USER_AGENT"] == 'securitytest') {
 					http_response_code(401); // It makes easier to understand if session was broken during security tests
 				}
-				dol_loginfunction($langs, $conf, (!empty($mysoc) ? $mysoc : ''));
+				dol_loginfunction($langs, $conf, (!empty($mysoc) ? $mysoc : ''));	// This include http headers
 			}
 			exit;
 		}
@@ -1242,8 +1246,7 @@ if (!defined('NOLOGIN')) {
 		// If not active, we refuse the user
 		$langs->loadLangs(array("errors", "other"));
 		dol_syslog("Authentication KO as login is disabled", LOG_NOTICE);
-		accessforbidden($langs->trans("ErrorLoginDisabled"));
-		exit;
+		accessforbidden("ErrorLoginDisabled");
 	}
 
 	// Load permissions
diff --git a/htdocs/modulebuilder/index.php b/htdocs/modulebuilder/index.php
index 7e086887a37..688f8235174 100644
--- a/htdocs/modulebuilder/index.php
+++ b/htdocs/modulebuilder/index.php
@@ -81,10 +81,10 @@ $idmodule= GETPOST('idmodule', 'alpha');
 
 // Security check
 if (!isModEnabled('modulebuilder')) {
-	accessforbidden();
+	accessforbidden('Module ModuleBuilder not enabled');
 }
 if (!$user->admin && empty($conf->global->MODULEBUILDER_FOREVERYONE)) {
-	accessforbidden($langs->trans('ModuleBuilderNotAllowed'));
+	accessforbidden('ModuleBuilderNotAllowed');
 }
 
 
diff --git a/htdocs/modulebuilder/template/core/modules/mailings/mailinglist_mymodule_myobject.modules.php b/htdocs/modulebuilder/template/core/modules/mailings/mailinglist_mymodule_myobject.modules.php
index 290048785fd..280f62dc2c1 100644
--- a/htdocs/modulebuilder/template/core/modules/mailings/mailinglist_mymodule_myobject.modules.php
+++ b/htdocs/modulebuilder/template/core/modules/mailings/mailinglist_mymodule_myobject.modules.php
@@ -46,12 +46,8 @@ class mailing_mailinglist_mymodule_myobject extends MailingTargets
 	 */
 	public function __construct($db)
 	{
-		global $conf;
-
 		$this->db = $db;
-		if (is_array($conf->modules)) {
-			$this->enabled = in_array('mymodule', $conf->modules) ? 1 : 0;
-		}
+		$this->enabled = isModEnabled('mymodule');
 	}
 
 
diff --git a/htdocs/modulebuilder/template/myobject_agenda.php b/htdocs/modulebuilder/template/myobject_agenda.php
index 6cc99f4f34d..0a397dceaa6 100644
--- a/htdocs/modulebuilder/template/myobject_agenda.php
+++ b/htdocs/modulebuilder/template/myobject_agenda.php
@@ -38,7 +38,6 @@
 //if (! defined('NOIPCHECK'))                define('NOIPCHECK', '1');					// Do not check IP defined into conf $dolibarr_main_restrict_ip
 //if (! defined("MAIN_LANG_DEFAULT"))        define('MAIN_LANG_DEFAULT', 'auto');					// Force lang to a particular value
 //if (! defined("MAIN_AUTHENTICATION_MODE")) define('MAIN_AUTHENTICATION_MODE', 'aloginmodule');	// Force authentication handler
-//if (! defined("NOREDIRECTBYMAINTOLOGIN"))  define('NOREDIRECTBYMAINTOLOGIN', 1);		// The main.inc.php does not make a redirect if not logged, instead show simple error message
 //if (! defined("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
diff --git a/htdocs/modulebuilder/template/myobject_card.php b/htdocs/modulebuilder/template/myobject_card.php
index 7ecce8c745f..aa2680ea568 100644
--- a/htdocs/modulebuilder/template/myobject_card.php
+++ b/htdocs/modulebuilder/template/myobject_card.php
@@ -38,7 +38,6 @@
 //if (! defined('NOIPCHECK'))                define('NOIPCHECK', '1');					// Do not check IP defined into conf $dolibarr_main_restrict_ip
 //if (! defined("MAIN_LANG_DEFAULT"))        define('MAIN_LANG_DEFAULT', 'auto');					// Force lang to a particular value
 //if (! defined("MAIN_AUTHENTICATION_MODE")) define('MAIN_AUTHENTICATION_MODE', 'aloginmodule');	// Force authentication handler
-//if (! defined("NOREDIRECTBYMAINTOLOGIN"))  define('NOREDIRECTBYMAINTOLOGIN', 1);		// The main.inc.php does not make a redirect if not logged, instead show simple error message
 //if (! defined("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
@@ -248,8 +247,7 @@ llxHeader('', $title, $help_url);
 // Part to create
 if ($action == 'create') {
 	if (empty($permissiontoadd)) {
-		accessforbidden($langs->trans('NotEnoughPermissions'), 0, 1);
-		exit;
+		accessforbidden('NotEnoughPermissions', 0, 1);
 	}
 
 	print load_fiche_titre($langs->trans("NewObject", $langs->transnoentitiesnoconv("MyObject")), '', 'object_'.$object->picto);
diff --git a/htdocs/modulebuilder/template/myobject_document.php b/htdocs/modulebuilder/template/myobject_document.php
index d06eb61ba0e..4a4b68391bc 100644
--- a/htdocs/modulebuilder/template/myobject_document.php
+++ b/htdocs/modulebuilder/template/myobject_document.php
@@ -38,7 +38,6 @@
 //if (! defined('NOIPCHECK'))                define('NOIPCHECK', '1');					// Do not check IP defined into conf $dolibarr_main_restrict_ip
 //if (! defined("MAIN_LANG_DEFAULT"))        define('MAIN_LANG_DEFAULT', 'auto');					// Force lang to a particular value
 //if (! defined("MAIN_AUTHENTICATION_MODE")) define('MAIN_AUTHENTICATION_MODE', 'aloginmodule');	// Force authentication handler
-//if (! defined("NOREDIRECTBYMAINTOLOGIN"))  define('NOREDIRECTBYMAINTOLOGIN', 1);		// The main.inc.php does not make a redirect if not logged, instead show simple error message
 //if (! defined("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
@@ -143,7 +142,13 @@ if ($enablepermissioncheck) {
 if (!isModEnabled("mymodule")) {
 	accessforbidden();
 }
-if (!$permissiontoread) accessforbidden();
+if (!$permissiontoread) {
+	accessforbidden();
+}
+if (empty($object->id)) {
+	accessforbidden();
+}
+
 
 
 /*
@@ -164,100 +169,94 @@ $help_url = '';
 //$help_url='EN:Module_Third_Parties|FR:Module_Tiers|ES:Empresas';
 llxHeader('', $title, $help_url);
 
-if ($object->id) {
-	/*
-	 * Show tabs
-	 */
-	$head = myobjectPrepareHead($object);
+// Show tabs
+$head = myobjectPrepareHead($object);
 
-	print dol_get_fiche_head($head, 'document', $langs->trans("MyObject"), -1, $object->picto);
+print dol_get_fiche_head($head, 'document', $langs->trans("MyObject"), -1, $object->picto);
 
 
-	// Build file list
-	$filearray = dol_dir_list($upload_dir, "files", 0, '', '(\.meta|_preview.*\.png)$', $sortfield, (strtolower($sortorder) == 'desc' ?SORT_DESC:SORT_ASC), 1);
-	$totalsize = 0;
-	foreach ($filearray as $key => $file) {
-		$totalsize += $file['size'];
-	}
-
-	// Object card
-	// ------------------------------------------------------------
-	$linkback = '<a href="'.dol_buildpath('/mymodule/myobject_list.php', 1).'?restore_lastsearch_values=1'.(!empty($socid) ? '&socid='.$socid : '').'">'.$langs->trans("BackToList").'</a>';
-
-	$morehtmlref = '<div class="refidno">';
-	/*
-	 // Ref customer
-	 $morehtmlref.=$form->editfieldkey("RefCustomer", 'ref_client', $object->ref_client, $object, 0, 'string', '', 0, 1);
-	 $morehtmlref.=$form->editfieldval("RefCustomer", 'ref_client', $object->ref_client, $object, 0, 'string', '', null, null, '', 1);
-	 // Thirdparty
-	 $morehtmlref.='<br>'.$langs->trans('ThirdParty') . ' : ' . (is_object($object->thirdparty) ? $object->thirdparty->getNomUrl(1) : '');
-	 // Project
-	 if (!empty($conf->project->enabled))
-	 {
-	 $langs->load("projects");
-	 $morehtmlref.='<br>'.$langs->trans('Project') . ' ';
-	 if ($permissiontoadd)
-	 {
-	 if ($action != 'classify')
-	 //$morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&token='.newToken().'&id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
-	 $morehtmlref.=' : ';
-	 if ($action == 'classify') {
-	 //$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
-	 $morehtmlref.='<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
-	 $morehtmlref.='<input type="hidden" name="action" value="classin">';
-	 $morehtmlref.='<input type="hidden" name="token" value="'.newToken().'">';
-	 $morehtmlref.=$formproject->select_projects($object->socid, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
-	 $morehtmlref.='<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
-	 $morehtmlref.='</form>';
-	 } else {
-	 $morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
-	 }
-	 } else {
-	 if (!empty($object->fk_project)) {
-	 $proj = new Project($db);
-	 $proj->fetch($object->fk_project);
-	 $morehtmlref .= ': '.$proj->getNomUrl();
-	 } else {
-	 $morehtmlref .= '';
-	 }
-	 }
-	 }*/
-	$morehtmlref .= '</div>';
-
-	dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
-
-	print '<div class="fichecenter">';
-
-	print '<div class="underbanner clearboth"></div>';
-	print '<table class="border centpercent tableforfield">';
-
-	// Number of files
-	print '<tr><td class="titlefield">'.$langs->trans("NbOfAttachedFiles").'</td><td colspan="3">'.count($filearray).'</td></tr>';
-
-	// Total size
-	print '<tr><td>'.$langs->trans("TotalSizeOfAttachedFiles").'</td><td colspan="3">'.$totalsize.' '.$langs->trans("bytes").'</td></tr>';
-
-	print '</table>';
-
-	print '</div>';
-
-	print dol_get_fiche_end();
-
-	$modulepart = 'mymodule';
-	//$permissiontoadd = $user->rights->mymodule->myobject->write;
-	$permissiontoadd = 1;
-	//$permtoedit = $user->rights->mymodule->myobject->write;
-	$permtoedit = 1;
-	$param = '&id='.$object->id;
-
-	//$relativepathwithnofile='myobject/' . dol_sanitizeFileName($object->id).'/';
-	$relativepathwithnofile = 'myobject/'.dol_sanitizeFileName($object->ref).'/';
-
-	include DOL_DOCUMENT_ROOT.'/core/tpl/document_actions_post_headers.tpl.php';
-} else {
-	accessforbidden('', 0, 1);
+// Build file list
+$filearray = dol_dir_list($upload_dir, "files", 0, '', '(\.meta|_preview.*\.png)$', $sortfield, (strtolower($sortorder) == 'desc' ?SORT_DESC:SORT_ASC), 1);
+$totalsize = 0;
+foreach ($filearray as $key => $file) {
+	$totalsize += $file['size'];
 }
 
+// Object card
+// ------------------------------------------------------------
+$linkback = '<a href="'.dol_buildpath('/mymodule/myobject_list.php', 1).'?restore_lastsearch_values=1'.(!empty($socid) ? '&socid='.$socid : '').'">'.$langs->trans("BackToList").'</a>';
+
+$morehtmlref = '<div class="refidno">';
+/*
+ // Ref customer
+ $morehtmlref.=$form->editfieldkey("RefCustomer", 'ref_client', $object->ref_client, $object, 0, 'string', '', 0, 1);
+ $morehtmlref.=$form->editfieldval("RefCustomer", 'ref_client', $object->ref_client, $object, 0, 'string', '', null, null, '', 1);
+ // Thirdparty
+ $morehtmlref.='<br>'.$langs->trans('ThirdParty') . ' : ' . (is_object($object->thirdparty) ? $object->thirdparty->getNomUrl(1) : '');
+ // Project
+ if (!empty($conf->project->enabled))
+ {
+ $langs->load("projects");
+ $morehtmlref.='<br>'.$langs->trans('Project') . ' ';
+ if ($permissiontoadd)
+ {
+ if ($action != 'classify')
+ //$morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&token='.newToken().'&id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
+ $morehtmlref.=' : ';
+ if ($action == 'classify') {
+ //$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
+ $morehtmlref.='<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
+ $morehtmlref.='<input type="hidden" name="action" value="classin">';
+ $morehtmlref.='<input type="hidden" name="token" value="'.newToken().'">';
+ $morehtmlref.=$formproject->select_projects($object->socid, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
+ $morehtmlref.='<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
+ $morehtmlref.='</form>';
+ } else {
+ $morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
+ }
+ } else {
+ if (!empty($object->fk_project)) {
+ $proj = new Project($db);
+ $proj->fetch($object->fk_project);
+ $morehtmlref .= ': '.$proj->getNomUrl();
+ } else {
+ $morehtmlref .= '';
+ }
+ }
+ }*/
+$morehtmlref .= '</div>';
+
+dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
+
+print '<div class="fichecenter">';
+
+print '<div class="underbanner clearboth"></div>';
+print '<table class="border centpercent tableforfield">';
+
+// Number of files
+print '<tr><td class="titlefield">'.$langs->trans("NbOfAttachedFiles").'</td><td colspan="3">'.count($filearray).'</td></tr>';
+
+// Total size
+print '<tr><td>'.$langs->trans("TotalSizeOfAttachedFiles").'</td><td colspan="3">'.$totalsize.' '.$langs->trans("bytes").'</td></tr>';
+
+print '</table>';
+
+print '</div>';
+
+print dol_get_fiche_end();
+
+$modulepart = 'mymodule';
+//$permissiontoadd = $user->rights->mymodule->myobject->write;
+$permissiontoadd = 1;
+//$permtoedit = $user->rights->mymodule->myobject->write;
+$permtoedit = 1;
+$param = '&id='.$object->id;
+
+//$relativepathwithnofile='myobject/' . dol_sanitizeFileName($object->id).'/';
+$relativepathwithnofile = 'myobject/'.dol_sanitizeFileName($object->ref).'/';
+
+include DOL_DOCUMENT_ROOT.'/core/tpl/document_actions_post_headers.tpl.php';
+
 // End of page
 llxFooter();
 $db->close();
diff --git a/htdocs/modulebuilder/template/myobject_list.php b/htdocs/modulebuilder/template/myobject_list.php
index 987b58f2369..789a5d2312d 100644
--- a/htdocs/modulebuilder/template/myobject_list.php
+++ b/htdocs/modulebuilder/template/myobject_list.php
@@ -38,7 +38,6 @@
 //if (! defined('NOIPCHECK'))                define('NOIPCHECK', '1');					// Do not check IP defined into conf $dolibarr_main_restrict_ip
 //if (! defined("MAIN_LANG_DEFAULT"))        define('MAIN_LANG_DEFAULT', 'auto');					// Force lang to a particular value
 //if (! defined("MAIN_AUTHENTICATION_MODE")) define('MAIN_AUTHENTICATION_MODE', 'aloginmodule');	// Force authentication handler
-//if (! defined("NOREDIRECTBYMAINTOLOGIN"))  define('NOREDIRECTBYMAINTOLOGIN', 1);		// The main.inc.php does not make a redirect if not logged, instead show simple error message
 //if (! defined("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
diff --git a/htdocs/modulebuilder/template/myobject_note.php b/htdocs/modulebuilder/template/myobject_note.php
index 6b03ddbf8c6..e97d131551a 100644
--- a/htdocs/modulebuilder/template/myobject_note.php
+++ b/htdocs/modulebuilder/template/myobject_note.php
@@ -38,7 +38,6 @@
 //if (! defined('NOIPCHECK'))                define('NOIPCHECK', '1');					// Do not check IP defined into conf $dolibarr_main_restrict_ip
 //if (! defined("MAIN_LANG_DEFAULT"))        define('MAIN_LANG_DEFAULT', 'auto');					// Force lang to a particular value
 //if (! defined("MAIN_AUTHENTICATION_MODE")) define('MAIN_AUTHENTICATION_MODE', 'aloginmodule');	// Force authentication handler
-//if (! defined("NOREDIRECTBYMAINTOLOGIN"))  define('NOREDIRECTBYMAINTOLOGIN', 1);		// The main.inc.php does not make a redirect if not logged, instead show simple error message
 //if (! defined("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
diff --git a/htdocs/modulebuilder/template/scripts/mymodule.php b/htdocs/modulebuilder/template/scripts/mymodule.php
index 860c3a54bec..2d9b3aac79c 100644
--- a/htdocs/modulebuilder/template/scripts/mymodule.php
+++ b/htdocs/modulebuilder/template/scripts/mymodule.php
@@ -39,7 +39,6 @@
 //if (! defined('NOIPCHECK'))                define('NOIPCHECK', '1');					// Do not check IP defined into conf $dolibarr_main_restrict_ip
 //if (! defined("MAIN_LANG_DEFAULT"))        define('MAIN_LANG_DEFAULT', 'auto');					// Force lang to a particular value
 //if (! defined("MAIN_AUTHENTICATION_MODE")) define('MAIN_AUTHENTICATION_MODE', 'aloginmodule');	// Force authentication handler
-//if (! defined("NOREDIRECTBYMAINTOLOGIN"))  define('NOREDIRECTBYMAINTOLOGIN', 1);		// The main.inc.php does not make a redirect if not logged, instead show simple error message
 //if (! defined('CSRFCHECK_WITH_TOKEN'))     define('CSRFCHECK_WITH_TOKEN', '1');		// Force use of CSRF protection with tokens even for GET
 //if (! defined('NOBROWSERNOTIF'))     		 define('NOBROWSERNOTIF', '1');				// Disable browser notification
 if (!defined('NOSESSION')) define('NOSESSION', '1');	// On CLI mode, no need to use web sessions
diff --git a/htdocs/public/agenda/agendaexport.php b/htdocs/public/agenda/agendaexport.php
index a0e7ea817a7..fa134da668c 100644
--- a/htdocs/public/agenda/agendaexport.php
+++ b/htdocs/public/agenda/agendaexport.php
@@ -84,7 +84,7 @@ require_once DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php';
 
 // Security check
 if (empty($conf->agenda->enabled)) {
-	accessforbidden('', 0, 0, 1);
+	httponly_accessforbidden('Module Agenda not enabled');
 }
 
 // Not older than
diff --git a/htdocs/public/cron/cron_run_jobs_by_url.php b/htdocs/public/cron/cron_run_jobs_by_url.php
index fa81b8d8bd7..497c68954db 100644
--- a/htdocs/public/cron/cron_run_jobs_by_url.php
+++ b/htdocs/public/cron/cron_run_jobs_by_url.php
@@ -75,7 +75,7 @@ $langs->loadLangs(array("admin", "cron", "dict"));
 
 // Security check
 if (empty($conf->cron->enabled)) {
-	accessforbidden('', 0, 0, 1);
+	httponly_accessforbidden('Module Cron not enabled');
 }
 
 
diff --git a/htdocs/public/demo/index.php b/htdocs/public/demo/index.php
index 49bde1a2b9b..892eb45870d 100644
--- a/htdocs/public/demo/index.php
+++ b/htdocs/public/demo/index.php
@@ -51,7 +51,7 @@ $conf->dol_use_jmobile = GETPOST('dol_use_jmobile', 'int');
 // Security check
 global $dolibarr_main_demo;
 if (empty($dolibarr_main_demo)) {
-	accessforbidden('Parameter dolibarr_main_demo must be defined in conf file with value "default login,default pass" to enable the demo entry page', 0, 0, 1);
+	httponly_accessforbidden('Parameter dolibarr_main_demo must be defined in conf file with value "default login,default pass" to enable the demo entry page');
 }
 
 // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
diff --git a/htdocs/public/donations/donateurs_code.php b/htdocs/public/donations/donateurs_code.php
index 87db3ee4133..51f7ef7234b 100644
--- a/htdocs/public/donations/donateurs_code.php
+++ b/htdocs/public/donations/donateurs_code.php
@@ -60,7 +60,7 @@ require_once DOL_DOCUMENT_ROOT.'/don/class/don.class.php';
 
 // Security check
 if (empty($conf->don->enabled)) {
-	accessforbidden('', 0, 0, 1);
+	httponly_accessforbidden('Module Donation not enabled');
 }
 
 
diff --git a/htdocs/public/eventorganization/attendee_new.php b/htdocs/public/eventorganization/attendee_new.php
index 8bb85022b2e..b3eb731ab19 100644
--- a/htdocs/public/eventorganization/attendee_new.php
+++ b/htdocs/public/eventorganization/attendee_new.php
@@ -138,7 +138,7 @@ $user->loadDefaultValues();
 
 // Security check
 if (empty($conf->eventorganization->enabled)) {
-	accessforbidden('', 0, 0, 1);
+	httponly_accessforbidden('Module Event organization not enabled');
 }
 
 
diff --git a/htdocs/public/eventorganization/subscriptionok.php b/htdocs/public/eventorganization/subscriptionok.php
index 8acf3daba78..248c281a284 100644
--- a/htdocs/public/eventorganization/subscriptionok.php
+++ b/htdocs/public/eventorganization/subscriptionok.php
@@ -77,7 +77,7 @@ if ($securekeyreceived != $securekeytocompare) {
 
 // Security check
 if (empty($conf->eventorganization->enabled)) {
-	accessforbidden('', 0, 0, 1);
+	httponly_accessforbidden('Module Event organization not enabled');
 }
 
 
diff --git a/htdocs/public/members/new.php b/htdocs/public/members/new.php
index 2a69b4b0ef0..0a1ebc0600e 100644
--- a/htdocs/public/members/new.php
+++ b/htdocs/public/members/new.php
@@ -86,12 +86,11 @@ $langs->loadLangs(array("main", "members", "companies", "install", "other"));
 
 // Security check
 if (empty($conf->adherent->enabled)) {
-	accessforbidden('', 0, 0, 1);
+	httponly_accessforbidden('Module Membership not enabled');
 }
 
 if (empty($conf->global->MEMBER_ENABLE_PUBLIC)) {
-	print $langs->trans("Auto subscription form for public visitors has not been enabled");
-	exit;
+	httponly_accessforbidden("Auto subscription form for public visitors has not been enabled");
 }
 
 // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
diff --git a/htdocs/public/members/public_card.php b/htdocs/public/members/public_card.php
index d58b6448edb..067e6ed94ea 100644
--- a/htdocs/public/members/public_card.php
+++ b/htdocs/public/members/public_card.php
@@ -53,7 +53,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
 
 // Security check
 if (empty($conf->adherent->enabled)) {
-	accessforbidden('', 0, 0, 1);
+	httponly_accessforbidden('Module Memebership no enabled');
 }
 
 
diff --git a/htdocs/public/members/public_list.php b/htdocs/public/members/public_list.php
index 178af5fce11..24cdcf5c001 100644
--- a/htdocs/public/members/public_list.php
+++ b/htdocs/public/members/public_list.php
@@ -49,7 +49,7 @@ require '../../main.inc.php';
 
 // Security check
 if (empty($conf->adherent->enabled)) {
-	accessforbidden('', 0, 0, 1);
+	httponly_accessforbidden('Module Membership not enabled');
 }
 
 
diff --git a/htdocs/public/onlinesign/newonlinesign.php b/htdocs/public/onlinesign/newonlinesign.php
index 65c2faf7918..411a37d6284 100644
--- a/htdocs/public/onlinesign/newonlinesign.php
+++ b/htdocs/public/onlinesign/newonlinesign.php
@@ -81,13 +81,6 @@ $ref = $REF = GETPOST("ref", 'alpha');
 if (empty($source)) {
 	$source = 'proposal';
 }
-
-if (!$action) {
-	if ($source && !$ref) {
-		print $langs->trans('ErrorBadParameters')." - ref missing";
-		exit;
-	}
-}
 if (!empty($refusepropal)) {
 	$action = "refusepropal";
 }
@@ -123,15 +116,12 @@ $urlko = preg_replace('/&$/', '', $urlko); // Remove last &
 $creditor = $mysoc->name;
 
 $type = $source;
-if ($source == 'proposal') {
-	require_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php';
-	$object = new Propal($db);
-	$result= $object->fetch(0, $ref, '', $entity);
-} else {
-	accessforbidden('Bad value for source');
-	exit;
-}
 
+if (!$action) {
+	if ($source && !$ref) {
+		httponly_accessforbidden($langs->trans('ErrorBadParameters')." - ref missing", 400, 1);
+	}
+}
 
 // Check securitykey
 $securekeyseed = '';
@@ -139,10 +129,16 @@ if ($source == 'proposal') {
 	$securekeyseed = getDolGlobalString('PROPOSAL_ONLINE_SIGNATURE_SECURITY_TOKEN');
 }
 
-if (!dol_verifyHash($securekeyseed.$type.$ref.(!isModEnabled('multicompany') ? '' : $entity), $SECUREKEY, '0')) {
-	http_response_code(403);
-	print 'Bad value for securitykey. Value provided '.dol_escape_htmltag($SECUREKEY).' does not match expected value for ref='.dol_escape_htmltag($ref);
-	exit(-1);
+if (!dol_verifyHash($securekeyseed.$type.$ref.(isModEnabled('multicompany') ? $entity : ''), $SECUREKEY, '0')) {
+	httponly_accessforbidden('Bad value for securitykey. Value provided '.dol_escape_htmltag($SECUREKEY).' does not match expected value for ref='.dol_escape_htmltag($ref), 403, 1);
+}
+
+if ($source == 'proposal') {
+	require_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php';
+	$object = new Propal($db);
+	$result= $object->fetch(0, $ref, '', $entity);
+} else {
+	httponly_accessforbidden($langs->trans('ErrorBadParameters')." - Bad value for source", 400, 1);
 }
 
 
diff --git a/htdocs/public/opensurvey/studs.php b/htdocs/public/opensurvey/studs.php
index 4853eec496e..3450393b7b7 100644
--- a/htdocs/public/opensurvey/studs.php
+++ b/htdocs/public/opensurvey/studs.php
@@ -59,7 +59,7 @@ $canbemodified = ((empty($object->date_fin) || $object->date_fin > dol_now()) &&
 
 // Security check
 if (empty($conf->opensurvey->enabled)) {
-	accessforbidden('', 0, 0, 1);
+	httponly_accessforbidden('Module Survey not enabled');
 }
 
 
@@ -74,7 +74,7 @@ $listofvoters = explode(',', $_SESSION["savevoter"]);
 // Add comment
 if (GETPOST('ajoutcomment', 'alpha')) {
 	if (!$canbemodified) {
-		accessforbidden('', 0, 0, 1);
+		httponly_accessforbidden('ErrorForbidden');
 	}
 
 	$error = 0;
@@ -108,7 +108,7 @@ if (GETPOST('ajoutcomment', 'alpha')) {
 // Add vote
 if (GETPOST("boutonp") || GETPOST("boutonp.x") || GETPOST("boutonp_x")) {		// boutonp for chrome, boutonp_x for firefox
 	if (!$canbemodified) {
-		accessforbidden('', 0, 0, 1);
+		httponly_accessforbidden('ErrorForbidden');
 	}
 
 	//Si le nom est bien entré
@@ -214,7 +214,7 @@ if ($testmodifier) {
 	}
 
 	if (!$canbemodified) {
-		accessforbidden('', 0, 0, 1);
+		httponly_accessforbidden('ErrorForbidden');
 	}
 
 	$idtomodify = GETPOST("idtomodify".$modifier);
@@ -232,7 +232,7 @@ if ($testmodifier) {
 $idcomment = GETPOST('deletecomment', 'int');
 if ($idcomment) {
 	if (!$canbemodified) {
-		accessforbidden('', 0, 0, 1);
+		httponly_accessforbidden('ErrorForbidden');
 	}
 
 	$resql = $object->deleteComment($idcomment);
diff --git a/htdocs/public/partnership/new.php b/htdocs/public/partnership/new.php
index a50892c9e08..f2706bf0bc9 100644
--- a/htdocs/public/partnership/new.php
+++ b/htdocs/public/partnership/new.php
@@ -71,12 +71,11 @@ $langs->loadLangs(array("main", "members", "partnership", "companies", "install"
 
 // Security check
 if (empty($conf->partnership->enabled)) {
-	accessforbidden('', 0, 0, 1);
+	httponly_accessforbidden('Module Partnership not enabled');
 }
 
 if (empty($conf->global->PARTNERSHIP_ENABLE_PUBLIC)) {
-	print $langs->trans("Auto subscription form for public visitors has not been enabled");
-	exit;
+	httponly_accessforbidden("Auto subscription form for public visitors has not been enabled");
 }
 
 // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
diff --git a/htdocs/public/payment/paymentko.php b/htdocs/public/payment/paymentko.php
index 606bed0c490..67ad99d46f3 100644
--- a/htdocs/public/payment/paymentko.php
+++ b/htdocs/public/payment/paymentko.php
@@ -108,7 +108,7 @@ if (!empty($conf->stripe->enabled)) {
 
 // Security check
 if (empty($validpaymentmethod)) {
-	accessforbidden('', 0, 0, 1);
+	httponly_accessforbidden('No valid payment mode');
 }
 
 
diff --git a/htdocs/public/payment/paymentok.php b/htdocs/public/payment/paymentok.php
index 209e931a75b..fee0e801964 100644
--- a/htdocs/public/payment/paymentok.php
+++ b/htdocs/public/payment/paymentok.php
@@ -138,7 +138,7 @@ if (!empty($conf->stripe->enabled)) {
 
 // Security check
 if (empty($validpaymentmethod)) {
-	accessforbidden('', 0, 0, 1);
+	httponly_accessforbidden('No valid payment mode');
 }
 
 
diff --git a/htdocs/public/project/index.php b/htdocs/public/project/index.php
index e5dfeb59a8e..6c8746152c4 100644
--- a/htdocs/public/project/index.php
+++ b/htdocs/public/project/index.php
@@ -84,7 +84,7 @@ if ($resultproject < 0) {
 
 // Security check
 if (empty($conf->project->enabled)) {
-	accessforbidden('', 0, 0, 1);
+	httponly_accessforbidden('Module Project not enabled');
 }
 
 
diff --git a/htdocs/public/project/new.php b/htdocs/public/project/new.php
index d984b3346d8..3241b6004ca 100644
--- a/htdocs/public/project/new.php
+++ b/htdocs/public/project/new.php
@@ -82,7 +82,7 @@ $user->loadDefaultValues();
 
 // Security check
 if (empty($conf->project->enabled)) {
-	accessforbidden('', 0, 0, 1);
+	httponly_accessforbidden('Module Project not enabled');
 }
 
 
diff --git a/htdocs/public/project/suggestbooth.php b/htdocs/public/project/suggestbooth.php
index 52193e4fcd4..0c11c82e13b 100644
--- a/htdocs/public/project/suggestbooth.php
+++ b/htdocs/public/project/suggestbooth.php
@@ -105,7 +105,7 @@ $arrayofconfboothtype = $cactioncomm->liste_array('', 'id', '', 0, "module='boot
 
 // Security check
 if (empty($conf->eventorganization->enabled)) {
-	accessforbidden('', 0, 0, 1);
+	httponly_accessforbidden('Module Event organization not enabled');
 }
 
 
diff --git a/htdocs/public/project/suggestconference.php b/htdocs/public/project/suggestconference.php
index 05cc8e61a82..cfe5bb67fec 100644
--- a/htdocs/public/project/suggestconference.php
+++ b/htdocs/public/project/suggestconference.php
@@ -106,7 +106,7 @@ $arrayofconfboothtype = $cactioncomm->liste_array('', 'id', '', 0, "module='conf
 
 // Security check
 if (empty($conf->eventorganization->enabled)) {
-	accessforbidden('', 0, 0, 1);
+	httponly_accessforbidden('Module Event organization not enabled');
 }
 
 
diff --git a/htdocs/public/project/viewandvote.php b/htdocs/public/project/viewandvote.php
index 805eb8cfdd1..1c8d1208d1f 100644
--- a/htdocs/public/project/viewandvote.php
+++ b/htdocs/public/project/viewandvote.php
@@ -91,7 +91,7 @@ if ($resultproject < 0) {
 
 // Security check
 if (empty($conf->eventorganization->enabled)) {
-	accessforbidden('', 0, 0, 1);
+	httponly_accessforbidden('Module Event organization not enabled');
 }
 
 
diff --git a/htdocs/public/recruitment/index.php b/htdocs/public/recruitment/index.php
index 32585c94bb4..5ad954af906 100644
--- a/htdocs/public/recruitment/index.php
+++ b/htdocs/public/recruitment/index.php
@@ -80,7 +80,7 @@ $urlwithroot = DOL_MAIN_URL_ROOT; // This is to use same domain name than curren
 
 // Security check
 if (empty($conf->recruitment->enabled)) {
-	accessforbidden('', 0, 0, 1);
+	httponly_accessforbidden('Module Recruitment not enabled');
 }
 
 
diff --git a/htdocs/public/recruitment/view.php b/htdocs/public/recruitment/view.php
index 2eaa51ac2fe..0875f33ebdd 100644
--- a/htdocs/public/recruitment/view.php
+++ b/htdocs/public/recruitment/view.php
@@ -77,7 +77,7 @@ $urlwithroot = DOL_MAIN_URL_ROOT; // This is to use same domain name than curren
 
 // Security check
 if (empty($conf->recruitment->enabled)) {
-	accessforbidden('', 0, 0, 1);
+	httponly_accessforbidden('Module Recruitment not enabled');
 }
 
 
diff --git a/htdocs/public/stripe/ipn.php b/htdocs/public/stripe/ipn.php
index 29e22c72de7..f1571557d83 100644
--- a/htdocs/public/stripe/ipn.php
+++ b/htdocs/public/stripe/ipn.php
@@ -49,11 +49,6 @@ require_once DOL_DOCUMENT_ROOT.'/includes/stripe/stripe-php/init.php';
 require_once DOL_DOCUMENT_ROOT.'/stripe/class/stripe.class.php';
 
 
-if (empty($conf->stripe->enabled)) {
-	accessforbidden('', 0, 0, 1);
-}
-
-
 // You can find your endpoint's secret in your webhook settings
 if (isset($_GET['connect'])) {
 	if (isset($_GET['test'])) {
@@ -77,10 +72,12 @@ if (isset($_GET['connect'])) {
 	}
 }
 
+if (empty($conf->stripe->enabled)) {
+	httponly_accessforbidden('Module Stripe not enabled');
+}
+
 if (empty($endpoint_secret)) {
-	print 'Error: Setup of module Stripe not complete for mode '.$service.'. The WEBHOOK_KEY is not defined.';
-	http_response_code(400); // PHP 5.4 or greater
-	exit();
+	httponly_accessforbidden('Error: Setup of module Stripe not complete for mode '.dol_escape_htmltag($service).'. The WEBHOOK_KEY is not defined.', 400, 1);
 }
 
 if (!empty($conf->global->STRIPE_USER_ACCOUNT_FOR_ACTIONS)) {
@@ -89,9 +86,7 @@ if (!empty($conf->global->STRIPE_USER_ACCOUNT_FOR_ACTIONS)) {
 	$user->fetch($conf->global->STRIPE_USER_ACCOUNT_FOR_ACTIONS);
 	$user->getrights();
 } else {
-	print 'Error: Setup of module Stripe not complete for mode '.$service.'. The STRIPE_USER_ACCOUNT_FOR_ACTIONS is not defined.';
-	http_response_code(400); // PHP 5.4 or greater
-	exit();
+	httponly_accessforbidden('Error: Setup of module Stripe not complete for mode '.dol_escape_htmltag($service).'. The STRIPE_USER_ACCOUNT_FOR_ACTIONS is not defined.', 400, 1);
 }
 
 
@@ -113,12 +108,9 @@ try {
 	$event = \Stripe\Webhook::constructEvent($payload, $sig_header, $endpoint_secret);
 } catch (\UnexpectedValueException $e) {
 	// Invalid payload
-	http_response_code(400); // PHP 5.4 or greater
-	exit();
+	httponly_accessforbidden('Invalid payload', 400);
 } catch (\Stripe\Error\SignatureVerification $e) {
-	// Invalid signature
-	http_response_code(400); // PHP 5.4 or greater
-	exit();
+	httponly_accessforbidden('Invalid signature', 400);
 }
 
 // Do something with $event
@@ -155,6 +147,7 @@ if (!empty($conf->global->MAIN_APPLICATION_TITLE)) {
 	$societeName = $conf->global->MAIN_APPLICATION_TITLE;
 }
 
+top_httphead();
 
 dol_syslog("***** Stripe IPN was called with event->type = ".$event->type);
 
@@ -195,11 +188,10 @@ if ($event->type == 'payout.created') {
 
 		$ret = $mailfile->sendfile();
 
-		http_response_code(200); // PHP 5.4 or greater
 		return 1;
 	} else {
 		$error++;
-		http_response_code(500); // PHP 5.4 or greater
+		http_response_code(500);
 		return -1;
 	}
 } elseif ($event->type == 'payout.paid') {
@@ -287,7 +279,6 @@ if ($event->type == 'payout.created') {
 
 		$ret = $mailfile->sendfile();
 
-		http_response_code(200);
 		return 1;
 	} else {
 		$error++;
@@ -396,4 +387,4 @@ if ($event->type == 'payout.created') {
 	// This event is deprecated.
 }
 
-http_response_code(200);
+// End of page. Default return HTTP code will be 200
diff --git a/htdocs/public/ticket/create_ticket.php b/htdocs/public/ticket/create_ticket.php
index 7ebbdb05af3..59f12a64482 100644
--- a/htdocs/public/ticket/create_ticket.php
+++ b/htdocs/public/ticket/create_ticket.php
@@ -91,7 +91,7 @@ if (!empty($conf->global->TICKET_CREATE_THIRD_PARTY_WITH_CONTACT_IF_NOT_EXIST))
 $extrafields->fetch_name_optionals_label($object->table_element);
 
 if (empty($conf->ticket->enabled)) {
-	accessforbidden('', 0, 0, 1);
+	httponly_accessforbidden('Module Ticket not enabled');
 }
 
 
diff --git a/htdocs/public/ticket/index.php b/htdocs/public/ticket/index.php
index 6332f063541..ae9b281900e 100644
--- a/htdocs/public/ticket/index.php
+++ b/htdocs/public/ticket/index.php
@@ -59,7 +59,7 @@ $action = GETPOST('action', 'aZ09');
 $suffix = "";
 
 if (empty($conf->ticket->enabled)) {
-	accessforbidden('', 0, 0, 1);
+	httponly_accessforbidden('Module Ticket not enabled');
 }
 
 
diff --git a/htdocs/public/ticket/list.php b/htdocs/public/ticket/list.php
index 7af60f50e83..5730ac424df 100644
--- a/htdocs/public/ticket/list.php
+++ b/htdocs/public/ticket/list.php
@@ -79,7 +79,7 @@ $object = new Ticket($db);
 $hookmanager->initHooks(array('ticketpubliclist', 'globalcard'));
 
 if (empty($conf->ticket->enabled)) {
-	accessforbidden('', 0, 0, 1);
+	httponly_accessforbidden('Module Ticket not enabled');
 }
 
 
diff --git a/htdocs/public/ticket/view.php b/htdocs/public/ticket/view.php
index de76e2f9904..d46944ebd82 100644
--- a/htdocs/public/ticket/view.php
+++ b/htdocs/public/ticket/view.php
@@ -73,7 +73,7 @@ if (isset($_SESSION['email_customer'])) {
 $object = new ActionsTicket($db);
 
 if (empty($conf->ticket->enabled)) {
-	accessforbidden('', 0, 0, 1);
+	httponly_accessforbidden('Module Ticket not enabled');
 }
 
 
diff --git a/htdocs/societe/document.php b/htdocs/societe/document.php
index 92c7efb63d9..fccb1ae3044 100644
--- a/htdocs/societe/document.php
+++ b/htdocs/societe/document.php
@@ -92,7 +92,9 @@ if ($user->socid > 0) {
 }
 $result = restrictedArea($user, 'societe', $object->id, '&societe');
 
-$permissiontoadd = $user->rights->societe->creer; // Used by the include of actions_addupdatedelete.inc.php and actions_linkedfiles
+if (empty($object->id)) {
+	accessforbidden();
+}
 
 
 /*
@@ -115,88 +117,80 @@ if (!empty($conf->global->MAIN_HTML_TITLE) && preg_match('/thirdpartynameonly/',
 $help_url = 'EN:Module_Third_Parties|FR:Module_Tiers|ES:Empresas';
 llxHeader('', $title, $help_url);
 
-if ($object->id) {
-	/*
-	 * Show tabs
-	 */
-	if (!empty($conf->notification->enabled)) {
-		$langs->load("mails");
-	}
-	$head = societe_prepare_head($object);
-
-	$form = new Form($db);
-
-	print dol_get_fiche_head($head, 'document', $langs->trans("ThirdParty"), -1, 'company');
-
-
-	// Build file list
-	$filearray = dol_dir_list($upload_dir, "files", 0, '', '(\.meta|_preview.*\.png)$', $sortfield, (strtolower($sortorder) == 'desc' ?SORT_DESC:SORT_ASC), 1);
-	$totalsize = 0;
-	foreach ($filearray as $key => $file) {
-		$totalsize += $file['size'];
-	}
-
-	$linkback = '<a href="'.DOL_URL_ROOT.'/societe/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
-
-	dol_banner_tab($object, 'socid', $linkback, ($user->socid ? 0 : 1), 'rowid', 'nom');
-
-	print '<div class="fichecenter">';
-
-	print '<div class="underbanner clearboth"></div>';
-	print '<table class="border tableforfield centpercent">';
-
-	// Type Prospect/Customer/Supplier
-	print '<tr><td class="titlefield">'.$langs->trans('NatureOfThirdParty').'</td><td>';
-	print $object->getTypeUrl(1);
-	print '</td></tr>';
-
-	// Prefix
-	if (!empty($conf->global->SOCIETE_USEPREFIX)) {  // Old not used prefix field
-		print '<tr><td class="titlefield">'.$langs->trans('Prefix').'</td><td colspan="3">'.$object->prefix_comm.'</td></tr>';
-	}
-
-	if ($object->client) {
-		print '<tr><td class="titlefield">';
-		print $langs->trans('CustomerCode').'</td><td colspan="3">';
-		print showValueWithClipboardCPButton(dol_escape_htmltag($object->code_client));
-		$tmpcheck = $object->check_codeclient();
-		if ($tmpcheck != 0 && $tmpcheck != -5) {
-			print ' <span class="error">('.$langs->trans("WrongCustomerCode").')</span>';
-		}
-		print '</td></tr>';
-	}
-
-	if ($object->fournisseur) {
-		print '<tr><td class="titlefield">';
-		print $langs->trans('SupplierCode').'</td><td colspan="3">';
-		print showValueWithClipboardCPButton(dol_escape_htmltag($object->code_fournisseur));
-		$tmpcheck = $object->check_codefournisseur();
-		if ($tmpcheck != 0 && $tmpcheck != -5) {
-			print ' <span class="error">('.$langs->trans("WrongSupplierCode").')</span>';
-		}
-		print '</td></tr>';
-	}
-
-	// Number of files
-	print '<tr><td class="titlefield">'.$langs->trans("NbOfAttachedFiles").'</td><td colspan="3">'.count($filearray).'</td></tr>';
-
-	// Total size
-	print '<tr><td>'.$langs->trans("TotalSizeOfAttachedFiles").'</td><td colspan="3">'.dol_print_size($totalsize, 1, 1).'</td></tr>';
-
-	print '</table>';
-
-	print '</div>';
-
-	print dol_get_fiche_end();
-
-	$modulepart = 'societe';
-	$permissiontoadd = $user->rights->societe->creer;
-	$permtoedit = $user->rights->societe->creer;
-	$param = '&id='.$object->id;
-	include DOL_DOCUMENT_ROOT.'/core/tpl/document_actions_post_headers.tpl.php';
-} else {
-	accessforbidden('', 0, 0);
+// Show tabs
+if (!empty($conf->notification->enabled)) {
+	$langs->load("mails");
 }
+$head = societe_prepare_head($object);
+
+print dol_get_fiche_head($head, 'document', $langs->trans("ThirdParty"), -1, 'company');
+
+
+// Build file list
+$filearray = dol_dir_list($upload_dir, "files", 0, '', '(\.meta|_preview.*\.png)$', $sortfield, (strtolower($sortorder) == 'desc' ?SORT_DESC:SORT_ASC), 1);
+$totalsize = 0;
+foreach ($filearray as $key => $file) {
+	$totalsize += $file['size'];
+}
+
+$linkback = '<a href="'.DOL_URL_ROOT.'/societe/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
+
+dol_banner_tab($object, 'socid', $linkback, ($user->socid ? 0 : 1), 'rowid', 'nom');
+
+print '<div class="fichecenter">';
+
+print '<div class="underbanner clearboth"></div>';
+print '<table class="border tableforfield centpercent">';
+
+// Type Prospect/Customer/Supplier
+print '<tr><td class="titlefield">'.$langs->trans('NatureOfThirdParty').'</td><td>';
+print $object->getTypeUrl(1);
+print '</td></tr>';
+
+// Prefix
+if (!empty($conf->global->SOCIETE_USEPREFIX)) {  // Old not used prefix field
+	print '<tr><td class="titlefield">'.$langs->trans('Prefix').'</td><td colspan="3">'.$object->prefix_comm.'</td></tr>';
+}
+
+if ($object->client) {
+	print '<tr><td class="titlefield">';
+	print $langs->trans('CustomerCode').'</td><td colspan="3">';
+	print showValueWithClipboardCPButton(dol_escape_htmltag($object->code_client));
+	$tmpcheck = $object->check_codeclient();
+	if ($tmpcheck != 0 && $tmpcheck != -5) {
+		print ' <span class="error">('.$langs->trans("WrongCustomerCode").')</span>';
+	}
+	print '</td></tr>';
+}
+
+if ($object->fournisseur) {
+	print '<tr><td class="titlefield">';
+	print $langs->trans('SupplierCode').'</td><td colspan="3">';
+	print showValueWithClipboardCPButton(dol_escape_htmltag($object->code_fournisseur));
+	$tmpcheck = $object->check_codefournisseur();
+	if ($tmpcheck != 0 && $tmpcheck != -5) {
+		print ' <span class="error">('.$langs->trans("WrongSupplierCode").')</span>';
+	}
+	print '</td></tr>';
+}
+
+// Number of files
+print '<tr><td class="titlefield">'.$langs->trans("NbOfAttachedFiles").'</td><td colspan="3">'.count($filearray).'</td></tr>';
+
+// Total size
+print '<tr><td>'.$langs->trans("TotalSizeOfAttachedFiles").'</td><td colspan="3">'.dol_print_size($totalsize, 1, 1).'</td></tr>';
+
+print '</table>';
+
+print '</div>';
+
+print dol_get_fiche_end();
+
+$modulepart = 'societe';
+$permissiontoadd = $user->rights->societe->creer;
+$permtoedit = $user->rights->societe->creer;
+$param = '&id='.$object->id;
+include DOL_DOCUMENT_ROOT.'/core/tpl/document_actions_post_headers.tpl.php';
 
 // End of page
 llxFooter();
diff --git a/htdocs/user/class/user.class.php b/htdocs/user/class/user.class.php
index 12b2a52742d..cb61ab6c1b1 100644
--- a/htdocs/user/class/user.class.php
+++ b/htdocs/user/class/user.class.php
@@ -753,7 +753,7 @@ class User extends CommonObject
 		//var_dump($module);
 		//var_dump($this->rights->$rightsPath);
 		//var_dump($conf->modules);
-		if (!in_array($module, $conf->modules)) {
+		if (!isModEnabled($module)) {
 			return 0;
 		}
 
diff --git a/htdocs/viewimage.php b/htdocs/viewimage.php
index f297fed62b4..3b1d60e0e90 100644
--- a/htdocs/viewimage.php
+++ b/htdocs/viewimage.php
@@ -138,10 +138,10 @@ $entity = GETPOST('entity', 'int') ?GETPOST('entity', 'int') : $conf->entity;
 
 // Security check
 if (empty($modulepart) && empty($hashp)) {
-	accessforbidden('Bad link. Bad value for parameter modulepart', 0, 0, 1);
+	httponly_accessforbidden('Bad link. Bad value for parameter modulepart', 400);
 }
 if (empty($original_file) && empty($hashp) && $modulepart != 'barcode') {
-	accessforbidden('Bad link. Missing identification to find file (param file or hashp)', 0, 0, 1);
+	httponly_accessforbidden('Bad link. Missing identification to find file (param file or hashp)', 400);
 }
 if ($modulepart == 'fckeditor') {
 	$modulepart = 'medias'; // For backward compatibility
@@ -192,7 +192,7 @@ if (!empty($hashp)) {
 				$original_file = (($tmp[1] ? $tmp[1].'/' : '').$ecmfile->filename); // this is relative to module dir
 				//var_dump($original_file); exit;
 			} else {
-				accessforbidden('Bad link. File is from another module part.', 0, 0, 1);
+				httponly_accessforbidden('Bad link. File is from another module part.', 403);
 			}
 		} else {
 			$modulepart = $moduleparttocheck;
@@ -200,7 +200,7 @@ if (!empty($hashp)) {
 		}
 	} else {
 		$langs->load("errors");
-		accessforbidden($langs->trans("ErrorFileNotFoundWithSharedLink"), 0, 0, 1);
+		httponly_accessforbidden($langs->trans("ErrorFileNotFoundWithSharedLink"), 403, 1);
 	}
 }
 
@@ -214,11 +214,11 @@ if (GETPOST('type', 'alpha')) {
 
 // Security: This wrapper is for images. We do not allow type/html
 if (preg_match('/html/i', $type)) {
-	accessforbidden('Error: Using the image wrapper to output a file with a mime type HTML is not possible.', 0, 0, 1);
+	httponly_accessforbidden('Error: Using the image wrapper to output a file with a mime type HTML is not possible.');
 }
 // Security: This wrapper is for images. We do not allow files ending with .noexe
 if (preg_match('/\.noexe$/i', $original_file)) {
-	accessforbidden('Error: Using the image wrapper to output a file ending with .noexe is not allowed.', 0, 0, 1);
+	httponly_accessforbidden('Error: Using the image wrapper to output a file ending with .noexe is not allowed.');
 }
 
 // Security: Delete string ../ or ..\ into $original_file
@@ -231,12 +231,12 @@ $refname = basename(dirname($original_file)."/");
 
 // Check that file is allowed for view with viewimage.php
 if (!empty($original_file) && !dolIsAllowedForPreview($original_file)) {
-	accessforbidden('This file is not qualified for preview', 0, 0, 1);
+	httponly_accessforbidden('This file is not qualified for preview', 403);
 }
 
 // Security check
 if (empty($modulepart)) {
-	accessforbidden('Bad value for parameter modulepart', 0, 0, 1);
+	httponly_accessforbidden('Bad value for parameter modulepart', 400);
 }
 
 // When logged in a different entity, medias cannot be accessed because $conf->$module->multidir_output
diff --git a/htdocs/webhook/target_card.php b/htdocs/webhook/target_card.php
index 2b79fd3fced..a2251d7d4a9 100644
--- a/htdocs/webhook/target_card.php
+++ b/htdocs/webhook/target_card.php
@@ -191,7 +191,7 @@ llxHeader('', $title, $help_url);
 // Part to create
 if ($action == 'create') {
 	if (empty($permissiontoadd)) {
-		accessforbidden($langs->trans('NotEnoughPermissions'), 0, 1);
+		accessforbidden('NotEnoughPermissions', 0, 1);
 		exit;
 	}
 

From f60ea48d75c6dd9a7421cbe7642445ae0e9a68c7 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 9 Sep 2022 14:02:55 +0200
Subject: [PATCH 833/974] Update doc

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

diff --git a/COPYRIGHT b/COPYRIGHT
index 83d054d63be..8c8a1f56355 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -33,6 +33,7 @@ PEAR Mail_MIME         1.8.9         BSD                         Yes
 ParseDown              1.6           MIT License                 Yes             Markdown parser
 PCLZip                 2.8.4         LGPL-3+                     Yes             Library to zip/unzip files             
 PHPDebugBar            1.15.1        MIT License                 Yes             Used only by the module "debugbar" for developers
+PHP-Imap               2.7.2         MIT License                 Yes             Library to use IMAP with OAuth
 PHPSpreadSheet         1.8.2         LGPL-2.1+                   Yes             Read/Write XLS files, read ODS files
 php-iban               4.1           LGPL-3+                     Yes             Parse and validate IBAN (and IIBAN) bank account information in PHP
 PHPoAuthLib            0.8.2         MIT License                 Yes             Library to provide oauth1 and oauth2 to different service

From 26ad6199e55d56a22ccf43f4693aa3732271bd64 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 9 Sep 2022 15:33:55 +0200
Subject: [PATCH 834/974] NEW The purge of iles can purge only if older than a
 number of seconds

---
 htdocs/admin/tools/purge.php      | 15 ++++++++----
 htdocs/core/class/utils.class.php | 36 +++++++++++++++++++----------
 htdocs/core/lib/files.lib.php     | 38 +++++++++++++++++--------------
 3 files changed, 55 insertions(+), 34 deletions(-)

diff --git a/htdocs/admin/tools/purge.php b/htdocs/admin/tools/purge.php
index f6ce58a40c0..4b31d98490e 100644
--- a/htdocs/admin/tools/purge.php
+++ b/htdocs/admin/tools/purge.php
@@ -33,7 +33,7 @@ $langs->load("admin");
 $action = GETPOST('action', 'aZ09');
 $confirm = GETPOST('confirm', 'alpha');
 $choice = GETPOST('choice', 'aZ09');
-
+$nbsecondsold = GETPOSTINT('nbsecondsold');
 
 // Define filelog to discard it from purge
 $filelog = '';
@@ -42,6 +42,7 @@ if (!empty($conf->syslog->enabled)) {
 	$filelog = preg_replace('/DOL_DATA_ROOT/i', DOL_DATA_ROOT, $filelog);
 }
 
+// Security
 if (!$user->admin) {
 	accessforbidden();
 }
@@ -64,7 +65,8 @@ if ($action == 'purge' && !preg_match('/^confirm/i', $choice) && ($choice != 'al
 
 	require_once DOL_DOCUMENT_ROOT.'/core/class/utils.class.php';
 	$utils = new Utils($db);
-	$result = $utils->purgeFiles($choice);
+
+	$result = $utils->purgeFiles($choice, $nbsecondsold);
 
 	$mesg = $utils->output;
 	setEventMessages($mesg, null, 'mesgs');
@@ -114,8 +116,11 @@ print '> <label for="choicetempfiles">'.$langs->trans("PurgeDeleteTemporaryFiles
 
 print '<input type="radio" name="choice" id="choiceallfiles" value="confirm_allfiles"';
 print ($choice && $choice == 'confirm_allfiles') ? ' checked' : '';
-print '> <label for="choiceallfiles">'.$langs->trans("PurgeDeleteAllFilesInDocumentsDir", $dolibarr_main_data_root).'</label><br>';
-
+print '> <label for="choiceallfiles">'.$langs->trans("PurgeDeleteAllFilesInDocumentsDir", $dolibarr_main_data_root).'</label>';
+print '<br>';
+if (getDolGlobalInt('MAIN_PURGE_ACCEPT_NBSECONDSOLD')) {
+	print 'NbSecondsOld = <input class="width50 right" type="text" name="nbsecondsold" value="'.$nbsecondsold.'">';
+}
 print '</td></tr></table>';
 
 //if ($choice != 'confirm_allfiles')
@@ -129,7 +134,7 @@ print '</form>';
 if (preg_match('/^confirm/i', $choice)) {
 	print '<br>';
 	$formquestion = array();
-	print $form->formconfirm($_SERVER["PHP_SELF"].'?choice=allfiles', $langs->trans('Purge'), $langs->trans('ConfirmPurge').img_warning().' ', 'purge', $formquestion, 'no', 2);
+	print $form->formconfirm($_SERVER["PHP_SELF"].'?choice=allfiles&nbsecondsold='.$nbsecondsold, $langs->trans('Purge'), $langs->trans('ConfirmPurge').img_warning().' ', 'purge', $formquestion, 'no', 2);
 }
 
 // End of page
diff --git a/htdocs/core/class/utils.class.php b/htdocs/core/class/utils.class.php
index cd1ea12bb40..f15d9f4d732 100644
--- a/htdocs/core/class/utils.class.php
+++ b/htdocs/core/class/utils.class.php
@@ -52,8 +52,8 @@ class Utils
 	 *  Purge files into directory of data files.
 	 *  CAN BE A CRON TASK
 	 *
-	 *  @param	string      $choices	   Choice of purge mode ('tempfiles', 'tempfilesold' to purge temp older than $nbsecondsold seconds, 'logfiles', or mix of this). Note 'allfiles' is possible too but very dangerous.
-	 *  @param  int         $nbsecondsold  Nb of seconds old to accept deletion of a directory if $choice is 'tempfilesold'
+	 *  @param	string      $choices	   Choice of purge mode ('tempfiles', 'tempfilesold' to purge temp older than $nbsecondsold seconds, 'logfiles', or mix of this). Note that 'allfiles' is also possible but very dangerous.
+	 *  @param  int         $nbsecondsold  Nb of seconds old to accept deletion of a directory if $choice is 'tempfilesold', or deletion of file if $choice is 'allfiles'
 	 *  @return	int						   0 if OK, < 0 if KO (this function is used also by cron so only 0 is OK)
 	 */
 	public function purgeFiles($choices = 'tempfilesold+logfiles', $nbsecondsold = 86400)
@@ -67,6 +67,9 @@ class Utils
 		if (empty($choices)) {
 			$choices = 'tempfilesold+logfiles';
 		}
+		if ($choices == 'allfiles' && $nbsecondsold > 0) {
+			$choices = 'allfilesold';
+		}
 
 		dol_syslog("Utils::purgeFiles choice=".$choices, LOG_DEBUG);
 
@@ -77,6 +80,7 @@ class Utils
 
 		$choicesarray = preg_split('/[\+,]/', $choices);
 		foreach ($choicesarray as $choice) {
+			$now = dol_now();
 			$filesarray = array();
 
 			if ($choice == 'tempfiles' || $choice == 'tempfilesold') {
@@ -85,7 +89,6 @@ class Utils
 					$filesarray = dol_dir_list($dolibarr_main_data_root, "directories", 1, '^temp$', '', 'name', SORT_ASC, 2, 0, '', 1); // Do not follow symlinks
 
 					if ($choice == 'tempfilesold') {
-						$now = dol_now();
 						foreach ($filesarray as $key => $val) {
 							if ($val['date'] > ($now - ($nbsecondsold))) {
 								unset($filesarray[$key]); // Discard temp dir not older than $nbsecondsold
@@ -98,7 +101,14 @@ class Utils
 			if ($choice == 'allfiles') {
 				// Delete all files (except install.lock, do not follow symbolic links)
 				if ($dolibarr_main_data_root) {
-					$filesarray = dol_dir_list($dolibarr_main_data_root, "all", 0, '', 'install\.lock$', 'name', SORT_ASC, 0, 0, '', 1);
+					$filesarray = dol_dir_list($dolibarr_main_data_root, "all", 0, '', 'install\.lock$', 'name', SORT_ASC, 0, 0, '', 1);	// No need to use recursive, we will delete directory
+				}
+			}
+
+			if ($choice == 'allfilesold') {
+				// Delete all files (except install.lock, do not follow symbolic links)
+				if ($dolibarr_main_data_root) {
+					$filesarray = dol_dir_list($dolibarr_main_data_root, "files", 1, '', 'install\.lock$', 'name', SORT_ASC, 0, 0, '', 1, $nbsecondsold);	// No need to use recursive, we will delete directory
 				}
 			}
 
@@ -138,14 +148,16 @@ class Utils
 							$countdeleted += $tmpcountdeleted;
 						}
 					} elseif ($filesarray[$key]['type'] == 'file') {
-						// If (file that is not logfile) or (if mode is logfile)
-						if ($filesarray[$key]['fullname'] != $filelog || $choice == 'logfile' || $choice == 'logfiles') {
-							$result = dol_delete_file($filesarray[$key]['fullname'], 1, 1);
-							if ($result) {
-								$count++;
-								$countdeleted++;
-							} else {
-								$counterror++;
+						if ($choice != 'allfilesold' || $filesarray[$key]['date'] < ($now - $nbsecondsold)) {
+							// If (file that is not logfile) or (if mode is logfile)
+							if ($filesarray[$key]['fullname'] != $filelog || $choice == 'logfile' || $choice == 'logfiles') {
+								$result = dol_delete_file($filesarray[$key]['fullname'], 1, 1);
+								if ($result) {
+									$count++;
+									$countdeleted++;
+								} else {
+									$counterror++;
+								}
 							}
 						}
 					}
diff --git a/htdocs/core/lib/files.lib.php b/htdocs/core/lib/files.lib.php
index 2b53fbbf230..3b3077425a5 100644
--- a/htdocs/core/lib/files.lib.php
+++ b/htdocs/core/lib/files.lib.php
@@ -54,10 +54,11 @@ function dol_basename($pathfile)
  *  @param	int			$nohook			Disable all hooks
  *  @param	string		$relativename	For recursive purpose only. Must be "" at first call.
  *  @param	string		$donotfollowsymlinks	Do not follow symbolic links
+ *  @param	string		$nbsecondsold	Only files older than $nbsecondsold
  *  @return	array						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($path, $types = "all", $recursive = 0, $filter = "", $excludefilter = null, $sortcriteria = "name", $sortorder = SORT_ASC, $mode = 0, $nohook = 0, $relativename = "", $donotfollowsymlinks = 0)
+function dol_dir_list($path, $types = "all", $recursive = 0, $filter = "", $excludefilter = null, $sortcriteria = "name", $sortorder = SORT_ASC, $mode = 0, $nohook = 0, $relativename = "", $donotfollowsymlinks = 0, $nbsecondsold = 0)
 {
 	global $db, $hookmanager;
 	global $object;
@@ -67,13 +68,14 @@ function dol_dir_list($path, $types = "all", $recursive = 0, $filter = "", $excl
 		//print 'xxx'."files.lib.php::dol_dir_list path=".$path." types=".$types." recursive=".$recursive." filter=".$filter." excludefilter=".json_encode($excludefilter);
 	}
 
-	$loaddate = ($mode == 1 || $mode == 2) ?true:false;
-	$loadsize = ($mode == 1 || $mode == 3) ?true:false;
-	$loadperm = ($mode == 1 || $mode == 4) ?true:false;
+	$loaddate = ($mode == 1 || $mode == 2 || $nbsecondsold) ? true : false;
+	$loadsize = ($mode == 1 || $mode == 3) ?true : false;
+	$loadperm = ($mode == 1 || $mode == 4) ?true : false;
 
 	// Clean parameters
 	$path = preg_replace('/([\\/]+)$/i', '', $path);
 	$newpath = dol_osencode($path);
+	$now = dol_now();
 
 	$reshook = 0;
 	$file_list = array();
@@ -170,7 +172,7 @@ function dol_dir_list($path, $types = "all", $recursive = 0, $filter = "", $excl
 						if ($recursive > 0) {
 							if (empty($donotfollowsymlinks) || !is_link($path."/".$file)) {
 								//var_dump('eee '. $path."/".$file. ' '.is_dir($path."/".$file).' '.is_link($path."/".$file));
-								$file_list = array_merge($file_list, dol_dir_list($path."/".$file, $types, $recursive + 1, $filter, $excludefilter, $sortcriteria, $sortorder, $mode, $nohook, ($relativename != '' ? $relativename.'/' : '').$file, $donotfollowsymlinks));
+								$file_list = array_merge($file_list, dol_dir_list($path."/".$file, $types, $recursive + 1, $filter, $excludefilter, $sortcriteria, $sortorder, $mode, $nohook, ($relativename != '' ? $relativename.'/' : '').$file, $donotfollowsymlinks, $nbsecondsold));
 							}
 						}
 					} elseif (!$isdir && (($types == "files") || ($types == "all"))) {
@@ -183,18 +185,20 @@ function dol_dir_list($path, $types = "all", $recursive = 0, $filter = "", $excl
 						}
 
 						if (!$filter || preg_match('/'.$filter.'/i', $file)) {	// We do not search key $filter into $path, only into $file
-							preg_match('/([^\/]+)\/[^\/]+$/', $path.'/'.$file, $reg);
-							$level1name = (isset($reg[1]) ? $reg[1] : '');
-							$file_list[] = array(
-								"name" => $file,
-								"path" => $path,
-								"level1name" => $level1name,
-								"relativename" => ($relativename ? $relativename.'/' : '').$file,
-								"fullname" => $path.'/'.$file,
-								"date" => $filedate,
-								"size" => $filesize,
-								"type" => 'file'
-							);
+							if (empty($nbsecondsold) || $filedate <= ($now - $nbsecondsold)) {
+								preg_match('/([^\/]+)\/[^\/]+$/', $path.'/'.$file, $reg);
+								$level1name = (isset($reg[1]) ? $reg[1] : '');
+								$file_list[] = array(
+									"name" => $file,
+									"path" => $path,
+									"level1name" => $level1name,
+									"relativename" => ($relativename ? $relativename.'/' : '').$file,
+									"fullname" => $path.'/'.$file,
+									"date" => $filedate,
+									"size" => $filesize,
+									"type" => 'file'
+								);
+							}
 						}
 					}
 				}

From 6b4bd6c09eef238300a87ba418c9b21a6ac34f9c Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Fri, 9 Sep 2022 15:56:17 +0200
Subject: [PATCH 835/974] FIX #21859 - Don't show html balise on list for
 private/public note

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

diff --git a/htdocs/comm/propal/list.php b/htdocs/comm/propal/list.php
index 7a8fe187570..037ce5f26f8 100644
--- a/htdocs/comm/propal/list.php
+++ b/htdocs/comm/propal/list.php
@@ -1915,7 +1915,7 @@ if ($resql) {
 		// Note public
 		if (!empty($arrayfields['p.note_public']['checked'])) {
 			print '<td class="center">';
-			print dol_escape_htmltag($obj->note_public);
+			print dol_string_nohtmltag($obj->note_public);
 			print '</td>';
 			if (!$i) {
 				$totalarray['nbfield']++;
@@ -1924,7 +1924,7 @@ if ($resql) {
 		// Note private
 		if (!empty($arrayfields['p.note_private']['checked'])) {
 			print '<td class="center">';
-			print dol_escape_htmltag($obj->note_private);
+			print dol_string_nohtmltag($obj->note_private);
 			print '</td>';
 			if (!$i) {
 				$totalarray['nbfield']++;
diff --git a/htdocs/commande/list.php b/htdocs/commande/list.php
index 2033b5626b2..07db0c6077c 100644
--- a/htdocs/commande/list.php
+++ b/htdocs/commande/list.php
@@ -1762,7 +1762,7 @@ if ($resql) {
 		// Note public
 		if (!empty($arrayfields['c.note_public']['checked'])) {
 			print '<td align="center" class="nowrap">';
-			print dol_escape_htmltag($obj->note_public);
+			print dol_string_nohtmltag($obj->note_public);
 			print '</td>';
 			if (!$i) {
 				$totalarray['nbfield']++;
@@ -1772,7 +1772,7 @@ if ($resql) {
 		// Note private
 		if (!empty($arrayfields['c.note_private']['checked'])) {
 			print '<td align="center" class="nowrap">';
-			print dol_escape_htmltag($obj->note_private);
+			print dol_string_nohtmltag($obj->note_private);
 			print '</td>';
 			if (!$i) {
 				$totalarray['nbfield']++;
diff --git a/htdocs/compta/facture/list.php b/htdocs/compta/facture/list.php
index f2cc5943e7a..f847d633ba0 100644
--- a/htdocs/compta/facture/list.php
+++ b/htdocs/compta/facture/list.php
@@ -2103,7 +2103,7 @@ if ($resql) {
 			// Note public
 			if (!empty($arrayfields['f.note_public']['checked'])) {
 				print '<td class="center">';
-				print dol_escape_htmltag($obj->note_public);
+				print dol_string_nohtmltag($obj->note_public);
 				print '</td>';
 				if (!$i) {
 					$totalarray['nbfield']++;
@@ -2112,7 +2112,7 @@ if ($resql) {
 			// Note private
 			if (!empty($arrayfields['f.note_private']['checked'])) {
 				print '<td class="center">';
-				print dol_escape_htmltag($obj->note_private);
+				print dol_string_nohtmltag($obj->note_private);
 				print '</td>';
 				if (!$i) {
 					$totalarray['nbfield']++;
diff --git a/htdocs/fichinter/list.php b/htdocs/fichinter/list.php
index 508eb984307..c1e01db6a79 100644
--- a/htdocs/fichinter/list.php
+++ b/htdocs/fichinter/list.php
@@ -698,7 +698,7 @@ if ($resql) {
 		// Note public
 		if (!empty($arrayfields['f.note_public']['checked'])) {
 			print '<td class="center">';
-			print dol_escape_htmltag($obj->note_public);
+			print dol_string_nohtmltag($obj->note_public);
 			print '</td>';
 			if (!$i) {
 				$totalarray['nbfield']++;
@@ -707,7 +707,7 @@ if ($resql) {
 		// Note private
 		if (!empty($arrayfields['f.note_private']['checked'])) {
 			print '<td class="center">';
-			print dol_escape_htmltag($obj->note_private);
+			print dol_string_nohtmltag($obj->note_private);
 			print '</td>';
 			if (!$i) {
 				$totalarray['nbfield']++;

From 7f2b797a7b72322ef42f855536679977503f17e5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Fri, 9 Sep 2022 16:02:39 +0200
Subject: [PATCH 836/974] remove multiples tabs added by error

---
 htdocs/admin/supplier_order.php | 354 ++++++++++++++++----------------
 1 file changed, 177 insertions(+), 177 deletions(-)

diff --git a/htdocs/admin/supplier_order.php b/htdocs/admin/supplier_order.php
index 905721128ad..43bb3118acd 100644
--- a/htdocs/admin/supplier_order.php
+++ b/htdocs/admin/supplier_order.php
@@ -1,63 +1,63 @@
 <?php
-																																/* Copyright (C) 2003-2007 Rodolphe Quiedeville    <rodolphe@quiedeville.org>
-																																* 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>
-																																* 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>
-																																*
-																																* This 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/>.
-																																*/
+/* Copyright (C) 2003-2007 Rodolphe Quiedeville    <rodolphe@quiedeville.org>
+* 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>
+* 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>
+*
+* This 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/admin/supplier_order.php
-																																 *  \ingroup    fournisseur
-																																 *  \brief      Page d'administration-configuration du module Fournisseur
-																																 */
+/**
+ *  \file       htdocs/admin/supplier_order.php
+ *  \ingroup    fournisseur
+ *  \brief      Page d'administration-configuration du module Fournisseur
+ */
 
-																																require '../main.inc.php';
-																																require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
-																																require_once DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php';
-																																require_once DOL_DOCUMENT_ROOT.'/core/lib/fourn.lib.php';
-																																require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.class.php';
-																																require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.commande.class.php';
+require '../main.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/fourn.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.class.php';
+require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.commande.class.php';
 
-																																// Load translation files required by the page
-																																$langs->loadLangs(array("admin", "other", "orders", "stocks"));
+// Load translation files required by the page
+$langs->loadLangs(array("admin", "other", "orders", "stocks"));
 
 if (!$user->admin) {
 	accessforbidden();
 }
 
-																																$type = GETPOST('type', 'alpha');
-																																$value = GETPOST('value', 'alpha');
-																																$modulepart = GETPOST('modulepart', 'aZ09');	// Used by actions_setmoduleoptions.inc.php
+$type = GETPOST('type', 'alpha');
+$value = GETPOST('value', 'alpha');
+$modulepart = GETPOST('modulepart', 'aZ09');	// Used by actions_setmoduleoptions.inc.php
 
-																																$label = GETPOST('label', 'alpha');
-																																$action = GETPOST('action', 'aZ09');
-																																$scandir = GETPOST('scan_dir', 'alpha');
+$label = GETPOST('label', 'alpha');
+$action = GETPOST('action', 'aZ09');
+$scandir = GETPOST('scan_dir', 'alpha');
 
-																																$specimenthirdparty = new Societe($db);
-																																$specimenthirdparty->initAsSpecimen();
+$specimenthirdparty = new Societe($db);
+$specimenthirdparty->initAsSpecimen();
 
 
-																																/*
-																																* Actions
-																																*/
+/*
+* Actions
+*/
 
-																																include DOL_DOCUMENT_ROOT.'/core/actions_setmoduleoptions.inc.php';
+include DOL_DOCUMENT_ROOT.'/core/actions_setmoduleoptions.inc.php';
 
 if ($action == 'updateMask') {
 	$maskconstorder = GETPOST('maskconstorder', 'alpha');
@@ -193,40 +193,40 @@ if ($action == 'updateMask') {
 }
 
 
-																																/*
-																																* View
-																																*/
+/*
+* View
+*/
 
-																																$form = new Form($db);
+$form = new Form($db);
 
-																																$dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
+$dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
 
-																																llxHeader("", "");
+llxHeader("", "");
 
-																																$linkback = '<a href="'.DOL_URL_ROOT.'/admin/modules.php?restore_lastsearch_values=1">'.$langs->trans("BackToModuleList").'</a>';
-																																print load_fiche_titre($langs->trans("SuppliersSetup"), $linkback, 'title_setup');
+$linkback = '<a href="'.DOL_URL_ROOT.'/admin/modules.php?restore_lastsearch_values=1">'.$langs->trans("BackToModuleList").'</a>';
+print load_fiche_titre($langs->trans("SuppliersSetup"), $linkback, 'title_setup');
 
-																																print "<br>";
+print "<br>";
 
-																																$head = supplierorder_admin_prepare_head();
+$head = supplierorder_admin_prepare_head();
 
-																																print dol_get_fiche_head($head, 'order', $langs->trans("Suppliers"), -1, 'company');
+print dol_get_fiche_head($head, 'order', $langs->trans("Suppliers"), -1, 'company');
 
 
-																																// Supplier order numbering module
+// Supplier order numbering module
 
-																																print load_fiche_titre($langs->trans("OrdersNumberingModules"), '', '');
+print load_fiche_titre($langs->trans("OrdersNumberingModules"), '', '');
 
-																																print '<table class="noborder centpercent">';
-																																print '<tr class="liste_titre">';
-																																print '<td width="100">'.$langs->trans("Name").'</td>';
-																																print '<td>'.$langs->trans("Description").'</td>';
-																																print '<td>'.$langs->trans("Example").'</td>';
-																																print '<td align="center" width="60">'.$langs->trans("Status").'</td>';
-																																print '<td align="center" width="16">'.$langs->trans("ShortInfo").'</td>';
-																																print "</tr>\n";
+print '<table class="noborder centpercent">';
+print '<tr class="liste_titre">';
+print '<td width="100">'.$langs->trans("Name").'</td>';
+print '<td>'.$langs->trans("Description").'</td>';
+print '<td>'.$langs->trans("Example").'</td>';
+print '<td align="center" width="60">'.$langs->trans("Status").'</td>';
+print '<td align="center" width="16">'.$langs->trans("ShortInfo").'</td>';
+print "</tr>\n";
 
-																																clearstatcache();
+clearstatcache();
 
 foreach ($dirmodels as $reldir) {
 	$dir = dol_buildpath($reldir."core/modules/supplier_order/");
@@ -309,24 +309,24 @@ foreach ($dirmodels as $reldir) {
 	}
 }
 
-																																print '</table><br>';
+print '</table><br>';
 
 
-																																/*
-																																*  Documents models for supplier orders
-																																*/
+/*
+*  Documents models for supplier orders
+*/
 
-																																print load_fiche_titre($langs->trans("OrdersModelModule"), '', '');
+print load_fiche_titre($langs->trans("OrdersModelModule"), '', '');
 
-																																// Defini tableau def de modele
-																																$def = array();
+// Defini tableau def de modele
+$def = array();
 
-																																$sql = "SELECT nom";
-																																$sql .= " FROM ".MAIN_DB_PREFIX."document_model";
-																																$sql .= " WHERE type = 'order_supplier'";
-																																$sql .= " AND entity = ".$conf->entity;
+$sql = "SELECT nom";
+$sql .= " FROM ".MAIN_DB_PREFIX."document_model";
+$sql .= " WHERE type = 'order_supplier'";
+$sql .= " AND entity = ".$conf->entity;
 
-																																$resql = $db->query($sql);
+$resql = $db->query($sql);
 if ($resql) {
 	$i = 0;
 	$num_rows = $db->num_rows($resql);
@@ -339,17 +339,17 @@ if ($resql) {
 	dol_print_error($db);
 }
 
-																																print '<table class="noborder centpercent">'."\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 align="center" width="60">'.$langs->trans("Status").'</td>'."\n";
-																																print '<td align="center" width="60">'.$langs->trans("Default").'</td>'."\n";
-																																print '<td align="center" width="40">'.$langs->trans("ShortInfo").'</td>';
-																																print '<td align="center" width="40">'.$langs->trans("Preview").'</td>';
-																																print '</tr>'."\n";
+print '<table class="noborder centpercent">'."\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 align="center" width="60">'.$langs->trans("Status").'</td>'."\n";
+print '<td align="center" width="60">'.$langs->trans("Default").'</td>'."\n";
+print '<td align="center" width="40">'.$langs->trans("ShortInfo").'</td>';
+print '<td align="center" width="40">'.$langs->trans("Preview").'</td>';
+print '</tr>'."\n";
 
-																																clearstatcache();
+clearstatcache();
 
 foreach ($dirmodels as $reldir) {
 	$realpath = $reldir."core/modules/supplier_order/doc";
@@ -434,76 +434,76 @@ foreach ($dirmodels as $reldir) {
 	}
 }
 
-																																print '</table><br>';
+print '</table><br>';
 
-																																/*
-																																* Other options
-																																*/
+/*
+* Other options
+*/
 
-																																print '<form action="'.$_SERVER["PHP_SELF"].'" method="post">';
-																																print '<input type="hidden" name="token" value="'.newToken().'">';
-																																print '<input type="hidden" name="action" value="set_SUPPLIER_ORDER_OTHER">';
+print '<form action="'.$_SERVER["PHP_SELF"].'" method="post">';
+print '<input type="hidden" name="token" value="'.newToken().'">';
+print '<input type="hidden" name="action" value="set_SUPPLIER_ORDER_OTHER">';
 
-																																print load_fiche_titre($langs->trans("OtherOptions"), '', '');
-																																print '<table class="noborder centpercent">';
-																																print '<tr class="liste_titre">';
-																																print '<td>'.$langs->trans("Parameter").'</td>';
-																																print '<td align="center" width="60">'.$langs->trans("Value").'</td>';
-																																print '<td width="80">&nbsp;</td>';
-																																print "</tr>\n";
+print load_fiche_titre($langs->trans("OtherOptions"), '', '');
+print '<table class="noborder centpercent">';
+print '<tr class="liste_titre">';
+print '<td>'.$langs->trans("Parameter").'</td>';
+print '<td align="center" width="60">'.$langs->trans("Value").'</td>';
+print '<td width="80">&nbsp;</td>';
+print "</tr>\n";
 
-																																print '<tr class="oddeven"><td>';
-																																print $form->textwithpicto($langs->trans("UseDoubleApproval"), $langs->trans("Use3StepsApproval"), 1, 'help').'<br>';
-																																print $langs->trans("IfSetToYesDontForgetPermission");
-																																print '</td><td>';
-																																print '<input type="text" size="6" name="SUPPLIER_ORDER_3_STEPS_TO_BE_APPROVED" value="'.getDolGlobalString("SUPPLIER_ORDER_3_STEPS_TO_BE_APPROVED").'">';
-																																print '</td><td class="right">';
-																																print '<input type="submit" class="button button-edit" value="'.$langs->trans("Modify").'">';
-																																print "</td></tr>\n";
+print '<tr class="oddeven"><td>';
+print $form->textwithpicto($langs->trans("UseDoubleApproval"), $langs->trans("Use3StepsApproval"), 1, 'help').'<br>';
+print $langs->trans("IfSetToYesDontForgetPermission");
+print '</td><td>';
+print '<input type="text" size="6" name="SUPPLIER_ORDER_3_STEPS_TO_BE_APPROVED" value="'.getDolGlobalString("SUPPLIER_ORDER_3_STEPS_TO_BE_APPROVED").'">';
+print '</td><td class="right">';
+print '<input type="submit" class="button button-edit" value="'.$langs->trans("Modify").'">';
+print "</td></tr>\n";
 
 
-																																// Ask for payment bank during supplier order
-																																/* Kept as hidden for the moment
-																																if (isModEnabled('banque')) {
+// Ask for payment bank during supplier order
+/* Kept as hidden for the moment
+if (isModEnabled('banque')) {
 
-																																print '<tr class="oddeven"><td>';
-																																print $langs->trans("BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDER").'</td><td>&nbsp;</td><td align="center">';
-																																if (!empty($conf->use_javascript_ajax))
-																																{
-																																print ajax_constantonoff('BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDER');
-																																}
-																																else
-																																{
-																																if (empty($conf->global->BANK_ASK_PAYMENT_BANK_DURING_ORDER))
-																																{
-																																print '<a href="'.$_SERVER['PHP_SELF'].'?action=set_BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDER&token='.newToken().'&value=1">'.img_picto($langs->trans("Disabled"),'switch_off').'</a>';
-																																}
-																																else
-																																{
-																																print '<a href="'.$_SERVER['PHP_SELF'].'?action=set_BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDER&token='.newToken().'&value=0">'.img_picto($langs->trans("Enabled"),'switch_on').'</a>';
-																																}
-																																}
-																																print '</td></tr>';
-																																}
-																																else
-																																{
+print '<tr class="oddeven"><td>';
+print $langs->trans("BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDER").'</td><td>&nbsp;</td><td align="center">';
+if (!empty($conf->use_javascript_ajax))
+{
+print ajax_constantonoff('BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDER');
+}
+else
+{
+if (empty($conf->global->BANK_ASK_PAYMENT_BANK_DURING_ORDER))
+{
+print '<a href="'.$_SERVER['PHP_SELF'].'?action=set_BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDER&token='.newToken().'&value=1">'.img_picto($langs->trans("Disabled"),'switch_off').'</a>';
+}
+else
+{
+print '<a href="'.$_SERVER['PHP_SELF'].'?action=set_BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDER&token='.newToken().'&value=0">'.img_picto($langs->trans("Enabled"),'switch_on').'</a>';
+}
+}
+print '</td></tr>';
+}
+else
+{
 
-																																print '<tr class="oddeven"><td>';
-																																print $langs->trans("BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDER").'</td><td>&nbsp;</td><td align="center">'.$langs->trans('NotAvailable').'</td></tr>';
-																																}
-																																*/
+print '<tr class="oddeven"><td>';
+print $langs->trans("BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDER").'</td><td>&nbsp;</td><td align="center">'.$langs->trans('NotAvailable').'</td></tr>';
+}
+*/
 
-																																$substitutionarray = pdf_getSubstitutionArray($langs, null, null, 2);
-																																$substitutionarray['__(AnyTranslationKey)__'] = $langs->trans("Translation");
-																																$htmltext = '<i>'.$langs->trans("AvailableVariables").':<br>';
+$substitutionarray = pdf_getSubstitutionArray($langs, null, null, 2);
+$substitutionarray['__(AnyTranslationKey)__'] = $langs->trans("Translation");
+$htmltext = '<i>'.$langs->trans("AvailableVariables").':<br>';
 foreach ($substitutionarray as $key => $val) {
 	$htmltext .= $key.'<br>';
 }
-																																$htmltext .= '</i>';
+$htmltext .= '</i>';
 
-																																print '<tr class="oddeven"><td colspan="2">';
-																																print $form->textwithpicto($langs->trans("FreeLegalTextOnOrders"), $langs->trans("AddCRIfTooLong").'<br><br>'.$htmltext, 1, 'help', '', 0, 2, 'freetexttooltip').'<br>';
-																																$variablename = 'SUPPLIER_ORDER_FREE_TEXT';
+print '<tr class="oddeven"><td colspan="2">';
+print $form->textwithpicto($langs->trans("FreeLegalTextOnOrders"), $langs->trans("AddCRIfTooLong").'<br><br>'.$htmltext, 1, 'help', '', 0, 2, 'freetexttooltip').'<br>';
+$variablename = 'SUPPLIER_ORDER_FREE_TEXT';
 if (empty($conf->global->PDF_ALLOW_HTML_FOR_FREE_TEXT)) {
 	print '<textarea name="'.$variablename.'" class="flat" cols="120">'.getDolGlobalString($variablename).'</textarea>';
 } else {
@@ -511,15 +511,15 @@ if (empty($conf->global->PDF_ALLOW_HTML_FOR_FREE_TEXT)) {
 	$doleditor = new DolEditor($variablename, getDolGlobalString($variablename), '', 80, 'dolibarr_notes');
 	print $doleditor->Create();
 }
-																																print '</td><td class="right">';
-																																print '<input type="submit" class="button button-edit" value="'.$langs->trans("Modify").'">';
-																																print "</td></tr>\n";
+print '</td><td class="right">';
+print '<input type="submit" class="button button-edit" value="'.$langs->trans("Modify").'">';
+print "</td></tr>\n";
 
-																																// Option to add a quality/validation step, on products, after reception.
-																																print '<tr class="oddeven">';
-																																print '<td>'.$langs->trans("UseDispatchStatus").'</td>';
-																																print '<td></td>';
-																																print '<td class="center">';
+// Option to add a quality/validation step, on products, after reception.
+print '<tr class="oddeven">';
+print '<td>'.$langs->trans("UseDispatchStatus").'</td>';
+print '<td></td>';
+print '<td class="center">';
 if (isModEnabled('reception')) {
 	print '<span class="opacitymedium">'.$langs->trans("FeatureNotAvailableWithReceptionModule").'</span>';
 } else {
@@ -530,33 +530,33 @@ if (isModEnabled('reception')) {
 		print $form->selectarray("SUPPLIER_ORDER_USE_DISPATCH_STATUS", $arrval, $conf->global->SUPPLIER_ORDER_USE_DISPATCH_STATUS);
 	}
 }
-																																print "</td>\n";
-																																print "</tr>\n";
+print "</td>\n";
+print "</tr>\n";
 
-																																print '</table><br>';
+print '</table><br>';
 
-																																print '</form>';
+print '</form>';
 
 
-																																/*
-																																* Notifications
-																																*/
+/*
+* Notifications
+*/
 
-																																print load_fiche_titre($langs->trans("Notifications"), '', '');
-																																print '<table class="noborder centpercent">';
-																																print '<tr class="liste_titre">';
-																																print '<td>'.$langs->trans("Parameter").'</td>';
-																																print '<td align="center" width="60"></td>';
-																																print '<td width="80">&nbsp;</td>';
-																																print "</tr>\n";
+print load_fiche_titre($langs->trans("Notifications"), '', '');
+print '<table class="noborder centpercent">';
+print '<tr class="liste_titre">';
+print '<td>'.$langs->trans("Parameter").'</td>';
+print '<td align="center" width="60"></td>';
+print '<td width="80">&nbsp;</td>';
+print "</tr>\n";
 
-																																print '<tr class="oddeven"><td colspan="2">';
-																																print $langs->trans("YouMayFindNotificationsFeaturesIntoModuleNotification").'<br>';
-																																print '</td><td class="right">';
-																																print "</td></tr>\n";
+print '<tr class="oddeven"><td colspan="2">';
+print $langs->trans("YouMayFindNotificationsFeaturesIntoModuleNotification").'<br>';
+print '</td><td class="right">';
+print "</td></tr>\n";
 
-																																print '</table>';
+print '</table>';
 
-																																// End of page
-																																llxFooter();
-																																$db->close();
+// End of page
+llxFooter();
+$db->close();

From 52586e5c37a0a37ec7c8ff678b49142f2941a30e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Fri, 9 Sep 2022 16:03:22 +0200
Subject: [PATCH 837/974] remove multiples tabs added by error

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

diff --git a/htdocs/admin/supplier_order.php b/htdocs/admin/supplier_order.php
index 43bb3118acd..37036824ff1 100644
--- a/htdocs/admin/supplier_order.php
+++ b/htdocs/admin/supplier_order.php
@@ -84,7 +84,9 @@ if ($action == 'updateMask') {
 	$commande->thirdparty = $specimenthirdparty;
 
 	// Search template files
-	$file = ''; $classname = ''; $filefound = 0;
+	$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);
@@ -369,7 +371,7 @@ foreach ($dirmodels as $reldir) {
 
 					print "<tr class=\"oddeven\">\n";
 					print "<td>";
-					print (empty($module->name) ? $name : $module->name);
+					print(empty($module->name) ? $name : $module->name);
 					print "</td>\n";
 					print "<td>\n";
 					require_once $dir.'/'.$file;

From 1012da6d4754095c499d9aab4acc20a5d1521272 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 9 Sep 2022 16:38:24 +0200
Subject: [PATCH 838/974] Fix sql

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

diff --git a/htdocs/core/class/commoninvoice.class.php b/htdocs/core/class/commoninvoice.class.php
index 190e3a3fc62..fed9c810573 100644
--- a/htdocs/core/class/commoninvoice.class.php
+++ b/htdocs/core/class/commoninvoice.class.php
@@ -856,7 +856,7 @@ abstract class CommonInvoice extends CommonObject
 
 			$sql = 'SELECT count(*)';
 			$sql .= ' FROM '.MAIN_DB_PREFIX.'prelevement_facture_demande';
-			$sql .= ' WHERE fk_facture = '.$this->id;
+			$sql .= ' WHERE fk_facture = '.((int) $this->id);
 			$sql .= ' AND ext_payment_id IS NULL'; // To exclude record done for some online payments
 			$sql .= ' AND traite = 0';
 
@@ -1039,7 +1039,7 @@ abstract class CommonInvoice extends CommonObject
 										// if (!$error && empty($nocancelifpaymenterror)) {	// If we are not in a mode that ask to avoid cancelation, we cancel payment.
 										// 	// Test if last AC_PAYMENT_STRIPE_KO event is an old error lower than $nbhoursbetweentries hours.
 										// 	$recentfailedpayment = false;
-										// 	$sqlonevents = 'SELECT COUNT(*) as nb FROM ' . MAIN_DB_PREFIX . 'actioncomm WHERE fk_soc = ' . $thirdparty->id . " AND code ='AC_PAYMENT_STRIPE_KO' AND datep > '" . $this->db->idate($now - ($nbhoursbetweentries * 3600)) . "'";
+										// 	$sqlonevents = 'SELECT COUNT(*) as nb FROM ' . MAIN_DB_PREFIX . 'actioncomm WHERE fk_soc = ' . ((int) $thirdparty->id) . " AND code ='AC_PAYMENT_STRIPE_KO' AND datep > '" . $this->db->idate($now - ($nbhoursbetweentries * 3600)) . "'";
 										// 	$resqlonevents = $this->db->query($sqlonevents);
 										// 	if ($resqlonevents) {
 										// 		$obj = $this->db->fetch_object($resqlonevents);

From de9c12359533023c0ba93dfa0ee41925c95ce985 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 9 Sep 2022 16:40:53 +0200
Subject: [PATCH 839/974] Fix bad var

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

diff --git a/htdocs/supplier_proposal/class/supplier_proposal.class.php b/htdocs/supplier_proposal/class/supplier_proposal.class.php
index 057b32e89ca..ae31004869e 100644
--- a/htdocs/supplier_proposal/class/supplier_proposal.class.php
+++ b/htdocs/supplier_proposal/class/supplier_proposal.class.php
@@ -2917,7 +2917,7 @@ class SupplierProposalLine extends CommonObjectLine
 			$this->product_label	= $objp->product_label;
 			$this->product_desc		= $objp->product_desc;
 
-			$this->ref_fourn = $objp->ref_produit_forun;
+			$this->ref_fourn = $objp->ref_produit_fourn;
 
 			// Multicurrency
 			$this->fk_multicurrency = $objp->fk_multicurrency;

From 792fe32fee3695a8d91827bc7a4cb1169074fb85 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 9 Sep 2022 17:08:16 +0200
Subject: [PATCH 840/974] Doc

---
 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 a18e3a761a9..aae7853ffbd 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -1443,7 +1443,7 @@ function dol_escape_json($stringtoescape)
  *  @param      string		$stringtoescape			String to escape
  *  @param		int			$keepb					1=Keep b tags, 0=remove them completely
  *  @param      int         $keepn              	1=Preserve \r\n strings (otherwise, replace them with escaped value). Set to 1 when escaping for a <textarea>.
- *  @param		string		$noescapetags			'' or 'common' or list of tags to not escape. TODO Does not works yet when there is attributes to tag.
+ *  @param		string		$noescapetags			'' or 'common' or list of tags to not escape. TODO Does not works yet when there is attributes into tag.
  *  @param		int			$escapeonlyhtmltags		1=Escape only html tags, not the special chars like accents.
  *  @return     string     				 			Escaped string
  *  @see		dol_string_nohtmltag(), dol_string_nospecial(), dol_string_unaccent()
@@ -1471,7 +1471,7 @@ function dol_escape_htmltag($stringtoescape, $keepb = 0, $keepn = 0, $noescapeta
 		return htmlspecialchars($tmp, ENT_COMPAT, 'UTF-8');
 	} else {
 		// Escape tags to keep
-		// TODO Does not works yet when there is attributes to tag
+		// TODO Does not works yet when there is attributes into tag
 		$tmparrayoftags = array();
 		if ($noescapetags) {
 			$tmparrayoftags = explode(',', $noescapetags);

From a7eb336084795f258849dfe5e198acd82f003787 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 9 Sep 2022 17:11:39 +0200
Subject: [PATCH 841/974] Update list.php

---
 htdocs/bookmarks/list.php | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/htdocs/bookmarks/list.php b/htdocs/bookmarks/list.php
index e01dfcbe1e6..23964a9f006 100644
--- a/htdocs/bookmarks/list.php
+++ b/htdocs/bookmarks/list.php
@@ -60,9 +60,7 @@ if (!$sortorder) {
 $object = new Bookmark($db);
 
 // Security check
-if (empty($user->rights->bookmark->lire)) {
-	restrictedArea($user, 'bookmarks');
-}
+restrictedArea($user, 'bookmarks');
 
 // Permissions
 $permissiontoread = !empty($user->rights->bookmark->lire);

From 2903af6d9095b0a8966fed1afb81555098df3ab4 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 9 Sep 2022 17:14:39 +0200
Subject: [PATCH 842/974] Fix regression in perms

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

diff --git a/htdocs/bookmarks/list.php b/htdocs/bookmarks/list.php
index 23964a9f006..47f97e17bbe 100644
--- a/htdocs/bookmarks/list.php
+++ b/htdocs/bookmarks/list.php
@@ -60,7 +60,7 @@ if (!$sortorder) {
 $object = new Bookmark($db);
 
 // Security check
-restrictedArea($user, 'bookmarks');
+restrictedArea($user, 'bookmark');
 
 // Permissions
 $permissiontoread = !empty($user->rights->bookmark->lire);

From 3b62935435beff2de56e78e98b0e8925312c792a Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 9 Sep 2022 18:08:43 +0200
Subject: [PATCH 843/974] Fix bad perm

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

diff --git a/htdocs/core/lib/product.lib.php b/htdocs/core/lib/product.lib.php
index 117871b4712..17f5c829cd6 100644
--- a/htdocs/core/lib/product.lib.php
+++ b/htdocs/core/lib/product.lib.php
@@ -59,7 +59,7 @@ function product_prepare_head($object)
 
 	if (!empty($object->status_buy) || (!empty($conf->margin->enabled) && !empty($object->status))) {   // If margin is on and product on sell, we may need the cost price even if product os not on purchase
 		if ((((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD)) || !empty($conf->supplier_order->enabled) || !empty($conf->supplier_invoice->enabled)) && $user->rights->fournisseur->lire)
-		|| (!empty($conf->margin->enabled) && $user->rights->margin->liretous)
+		|| (!empty($conf->margin->enabled) && $user->rights->margins->liretous)
 		) {
 			$head[$h][0] = DOL_URL_ROOT."/product/fournisseurs.php?id=".$object->id;
 			$head[$h][1] = $langs->trans("BuyingPrices");

From 8b2fca8cca27990a60bbd11bfe18f2144031f3eb Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 9 Sep 2022 18:10:31 +0200
Subject: [PATCH 844/974] Try a fix for margin hasRights

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

diff --git a/htdocs/user/class/user.class.php b/htdocs/user/class/user.class.php
index cb61ab6c1b1..f7c28d7ebd9 100644
--- a/htdocs/user/class/user.class.php
+++ b/htdocs/user/class/user.class.php
@@ -733,6 +733,7 @@ class User extends CommonObject
 
 		$moduleRightsMapping = array(
 			'product' => 'produit',	// We must check $user->rights->produit...
+			'margin' => 'margins'
 		);
 
 		$rightsPath = $module;

From 38676b6c0452dba23f8eaadd726b221933ac59b7 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 10 Sep 2022 00:54:16 +0200
Subject: [PATCH 845/974] Fix phpunit

---
 htdocs/compta/facture/prelevement.php     |  43 +++++++---
 htdocs/core/class/commoninvoice.class.php | 100 +++++++---------------
 htdocs/expedition/list.php                |  36 +++++---
 htdocs/langs/en_US/errors.lang            |   1 +
 htdocs/langs/en_US/withdrawals.lang       |   7 +-
 htdocs/societe/paymentmodes.php           |  12 ++-
 test/phpunit/CodingPhpTest.php            |   2 +-
 7 files changed, 102 insertions(+), 99 deletions(-)

diff --git a/htdocs/compta/facture/prelevement.php b/htdocs/compta/facture/prelevement.php
index 1476fba8009..c36b205b8fb 100644
--- a/htdocs/compta/facture/prelevement.php
+++ b/htdocs/compta/facture/prelevement.php
@@ -719,7 +719,7 @@ if ($object->id > 0) {
 	 * Buttons
 	 */
 
-	print "\n<div class=\"tabsAction\">\n";
+	print "\n".'<div class="tabsAction">'."\n";
 
 	$buttonlabel = $langs->trans("MakeWithdrawRequest");
 	$user_perms = $user->rights->prelevement->bons->creer;
@@ -744,7 +744,8 @@ if ($object->id > 0) {
 				print '<input type="submit" class="butAction" value="'.$buttonlabel.'" />';
 				print '</form>';
 
-				if (!empty($conf->global->STRIPE_SEPA_DIRECT_DEBIT)) {
+				if (!empty($conf->global->STRIPE_SEPA_DIRECT_DEBIT_SHOW_BUTTON)) {
+					// TODO Replace this with a checkbox for each payment mode: "Send request to PaymentModeManager immediatly..."
 					print "<br>";
 					//add stripe sepa button
 					$buttonlabel = $langs->trans("MakeWithdrawRequestStripe");
@@ -777,13 +778,23 @@ if ($object->id > 0) {
 		}
 	}
 
-	print "</div><br>\n";
+	print "</div>\n";
 
 
 	if ($type == 'bank-transfer') {
-		print '<div class="opacitymedium">'.$langs->trans("DoCreditTransferBeforePayments").'</div><br>';
+		print '<div class="opacitymedium">'.$langs->trans("DoCreditTransferBeforePayments");
+		if (isModEnabled('stripe')) {
+			print ' '.$langs->trans("DoStandingOrdersBeforePayments2");
+		}
+		print ' '.$langs->trans("DoStandingOrdersBeforePayments3");
+		print '</div><br>';
 	} else {
-		print '<div class="opacitymedium">'.$langs->trans("DoStandingOrdersBeforePayments").'</div><br>';
+		print '<div class="opacitymedium">'.$langs->trans("DoStandingOrdersBeforePayments");
+		if (isModEnabled('stripe')) {
+			print ' '.$langs->trans("DoStandingOrdersBeforePayments2");
+		}
+		print ' '.$langs->trans("DoStandingOrdersBeforePayments3");
+		print '</div><br>';
 	}
 
 	/*
@@ -797,14 +808,14 @@ if ($object->id > 0) {
 	print '<td class="left">'.$langs->trans("DateRequest").'</td>';
 	print '<td class="center">'.$langs->trans("User").'</td>';
 	print '<td class="center">'.$langs->trans("Amount").'</td>';
+	print '<td class="center">'.$langs->trans("DateProcess").'</td>';
+	print '<td>&nbsp;</td>';
 	if ($type == 'bank-transfer') {
 		print '<td class="center">'.$langs->trans("BankTransferReceipt").'</td>';
 	} else {
 		print '<td class="center">'.$langs->trans("WithdrawalReceipt").'</td>';
 	}
 	print '<td>&nbsp;</td>';
-	print '<td class="center">'.$langs->trans("DateProcess").'</td>';
-	print '<td>&nbsp;</td>';
 	print '</tr>';
 
 	$sql = "SELECT pfd.rowid, pfd.traite, pfd.date_demande as date_demande,";
@@ -844,17 +855,27 @@ if ($object->id > 0) {
 
 			print '<tr class="oddeven">';
 
+			// Date
 			print '<td class="left">'.dol_print_date($db->jdate($obj->date_demande), 'dayhour')."</td>\n";
 
+			// User
 			print '<td align="center">';
 			print $tmpuser->getNomUrl(1, '', 0, 0, 0, 0, 'login');
 			print '</td>';
 
-			print '<td class="center">'.price($obj->amount).'</td>';
-			print '<td align="center">-</td>';
-			print '<td>&nbsp;</td>';
+			// Amount
+			print '<td class="center"><span class="amount">'.price($obj->amount).'</span></td>';
 
-			print '<td class="center">'.$langs->trans("OrderWaiting").'</td>';
+			// Ref of SEPA request
+			print '<td class="center"><span class="opacitymedium">'.$langs->trans("OrderWaiting").'</span></td>';
+
+			print '<td>';
+			if (!empty($conf->global->STRIPE_SEPA_DIRECT_DEBIT)) {
+				print '<a href="'.$_SERVER["PHP_SELF"].'?action=new&paymentservice=stripesepa&token='.newToken().'&did='.$obj->rowid.'&id='.$object->id.'&type='.urlencode($type).'">'.img_picto('', 'stripe', 'class="pictofixedwidth"').$langs->trans("SendToStripe").'</a>';
+			}
+			print '</td>';
+
+			print '<td align="center">-</td>';
 
 			print '<td class="right">';
 			print '<a href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&action=delete&token='.newToken().'&did='.$obj->rowid.'&type='.$type.'">';
diff --git a/htdocs/core/class/commoninvoice.class.php b/htdocs/core/class/commoninvoice.class.php
index fed9c810573..84eed4f432c 100644
--- a/htdocs/core/class/commoninvoice.class.php
+++ b/htdocs/core/class/commoninvoice.class.php
@@ -854,11 +854,11 @@ abstract class CommonInvoice extends CommonObject
 			$bac = new CompanyBankAccount($this->db);
 			$bac->fetch(0, $this->socid);
 
-			$sql = 'SELECT count(*)';
-			$sql .= ' FROM '.MAIN_DB_PREFIX.'prelevement_facture_demande';
-			$sql .= ' WHERE fk_facture = '.((int) $this->id);
-			$sql .= ' AND ext_payment_id IS NULL'; // To exclude record done for some online payments
-			$sql .= ' AND traite = 0';
+			$sql = "SELECT count(*)";
+			$sql .= " FROM ".$this->db->prefix()."prelevement_facture_demande";
+			$sql .= " WHERE fk_facture = ".((int) $this->id);
+			$sql .= " AND ext_payment_id IS NULL"; // To exclude record done for some online payments
+			$sql .= " AND traite = 0";
 
 			dol_syslog(get_class($this)."::demande_prelevement_stripe 1", LOG_DEBUG);
 			$resql = $this->db->query($sql);
@@ -1025,38 +1025,6 @@ abstract class CommonInvoice extends CommonObject
 										$errorforinvoice++;
 										$this->errors[] = $errmsg;
 									}
-									// if (!$error && ($this->date < ($now - ($nbdaysbeforeendoftries * 24 * 3600)))                                 // We try until we reach $nbdaysbeforeendoftries
-									// 	&& ($this->date < ($now - (62 * 24 * 3600)) || $this->date > ($now - (60 * 24 * 3600)))     // or when we have 60 days
-									// 	&& ($this->date < ($now - (92 * 24 * 3600)) || $this->date > ($now - (90 * 24 * 3600)))     // or when we have 90 days
-									// 	&& empty($nocancelifpaymenterror)) {
-									// 	$errmsg = 'Payment try was canceled (invoice date is older than ' . $nbdaysbeforeendoftries . ' days and not 60 days old and not 90 days old) - You can still take payment from backoffice.';
-										// 	dol_syslog($errmsg, LOG_DEBUG);
-
-										// 	$error++;
-										// 	$errorforinvoice++;
-										// 	$this->errors[] = $errmsg;
-										// }
-										// if (!$error && empty($nocancelifpaymenterror)) {	// If we are not in a mode that ask to avoid cancelation, we cancel payment.
-										// 	// Test if last AC_PAYMENT_STRIPE_KO event is an old error lower than $nbhoursbetweentries hours.
-										// 	$recentfailedpayment = false;
-										// 	$sqlonevents = 'SELECT COUNT(*) as nb FROM ' . MAIN_DB_PREFIX . 'actioncomm WHERE fk_soc = ' . ((int) $thirdparty->id) . " AND code ='AC_PAYMENT_STRIPE_KO' AND datep > '" . $this->db->idate($now - ($nbhoursbetweentries * 3600)) . "'";
-										// 	$resqlonevents = $this->db->query($sqlonevents);
-										// 	if ($resqlonevents) {
-										// 		$obj = $this->db->fetch_object($resqlonevents);
-										// 		if ($obj && $obj->nb > 0) {
-										// 			$recentfailedpayment = true;
-										// 		}
-										// 	}
-
-										// 	if ($recentfailedpayment) {
-										// 		$errmsg = 'Payment try was canceled (recent payment, in last ' . $nbhoursbetweentries . ' hours, with error AC_PAYMENT_STRIPE_KO for this customer)';
-										// 		dol_syslog($errmsg, LOG_DEBUG);
-
-										// 		$error++;
-										// 		$errorforinvoice++;
-										// 		$this->errors[] = $errmsg;
-										// 	}
-										// }
 
 									if (!$error) {	// Payment was not canceled
 										//erics card or sepa ?
@@ -1107,15 +1075,17 @@ abstract class CommonInvoice extends CommonObject
 													$stripefailuremessage = $e->getMessage();
 												}
 											} else { // Using new SCA method
-												if ($sepaMode)
+												if ($sepaMode) {
 													dol_syslog("* Create payment on SEPA " . $stripecard->id . ", amounttopay=" . $amounttopay . ", amountstripe=" . $amountstripe . ", FULLTAG=" . $FULLTAG, LOG_DEBUG);
-												else dol_syslog("* Create payment on card " . $stripecard->id . ", amounttopay=" . $amounttopay . ", amountstripe=" . $amountstripe . ", FULLTAG=" . $FULLTAG, LOG_DEBUG);
+												} else {
+													dol_syslog("* Create payment on card " . $stripecard->id . ", amounttopay=" . $amounttopay . ", amountstripe=" . $amountstripe . ", FULLTAG=" . $FULLTAG, LOG_DEBUG);
+												}
 
-														// Create payment intent and charge payment (confirmnow = true)
-														$paymentintent = $stripe->getPaymentIntent($amounttopay, $currency, $FULLTAG, $description, $invoice, $customer->id, $stripeacc, $servicestatus, 0, 'automatic', true, $stripecard->id, 1);
+												// Create payment intent and charge payment (confirmnow = true)
+												$paymentintent = $stripe->getPaymentIntent($amounttopay, $currency, $FULLTAG, $description, $invoice, $customer->id, $stripeacc, $servicestatus, 0, 'automatic', true, $stripecard->id, 1);
 
-														$charge = new stdClass();
-														//erics add processing sepa is like success ?
+												$charge = new stdClass();
+												//erics add processing sepa is like success ?
 												if ($paymentintent->status === 'succeeded' || $paymentintent->status === 'processing') {
 													$charge->status = 'ok';
 													$charge->id = $paymentintent->id;
@@ -1145,8 +1115,8 @@ abstract class CommonInvoice extends CommonObject
 													$stripefailuredeclinecode = $stripe->declinecode;
 												}
 
-														//var_dump("stripefailurecode=".$stripefailurecode." stripefailuremessage=".$stripefailuremessage." stripefailuredeclinecode=".$stripefailuredeclinecode);
-														//exit;
+												//var_dump("stripefailurecode=".$stripefailurecode." stripefailuremessage=".$stripefailuremessage." stripefailuredeclinecode=".$stripefailuredeclinecode);
+												//exit;
 											}
 
 											// Return $charge = array('id'=>'ch_XXXX', 'status'=>'succeeded|pending|failed', 'failure_code'=>, 'failure_message'=>...)
@@ -1412,7 +1382,7 @@ abstract class CommonInvoice extends CommonObject
 									$extraparams = '';
 								}
 
-									// Send email + create action after
+								// Send email + create action after
 								if ($sendemailtocustomer && $labeltouse) {
 									dol_syslog("* Send email with result of payment - " . $labeltouse);
 
@@ -1558,8 +1528,8 @@ abstract class CommonInvoice extends CommonObject
 									$actioncomm->create($user);
 								}
 
-									$this->description = $description;
-									$this->postactionmessages = $postactionmessages;
+								$this->description = $description;
+								$this->postactionmessages = $postactionmessages;
 							} catch (Exception $e) {
 								$error++;
 								$errorforinvoice++;
@@ -1573,25 +1543,21 @@ abstract class CommonInvoice extends CommonObject
 							$this->errors[] = "Remain to pay is null for the invoice " . $this->id . " " . $this->ref . ". Why is the invoice not classified 'Paid' ?";
 						}
 
-							//end copy
-							// print json_encode($stripecard);
-							// exit;
+						$sql = "INSERT INTO '.MAIN_DB_PREFIX.'prelevement_facture_demande(";
+						$sql .= "fk_facture, ";
+						$sql .= " amount, date_demande, fk_user_demande, ext_payment_id, ext_payment_site, sourcetype, entity)";
+						$sql .= " VALUES (".$this->id;
+						$sql .= ",".((float) price2num($amount));
+						$sql .= ",'".$this->db->idate($now)."'";
+						$sql .= ",".((int) $fuser->id);
+						$sql .= ",'".$this->db->escape($stripe_id)."'";
+						$sql .= ",'".$this->db->escape($stripe_uri)."'";
+						$sql .= ",'".$this->db->escape($sourcetype)."'";
+						$sql .= ",".$conf->entity;
+						$sql .= ")";
 
-							$sql = 'INSERT INTO '.MAIN_DB_PREFIX.'prelevement_facture_demande(';
-							$sql .= 'fk_facture, ';
-							$sql .= ' amount, date_demande, fk_user_demande, ext_payment_id, ext_payment_site, sourcetype, entity)';
-							$sql .= ' VALUES ('.$this->id;
-							$sql .= ",'".price2num($amount)."'";
-							$sql .= ",'".$this->db->idate($now)."'";
-							$sql .= ",".$fuser->id;
-							$sql .= ",'".$this->db->escape($stripe_id)."'";
-							$sql .= ",'".$this->db->escape($stripe_uri)."'";
-							$sql .= ",'".$this->db->escape($sourcetype)."'";
-							$sql .= ",".$conf->entity;
-							$sql .= ")";
-
-							dol_syslog(get_class($this)."::demande_prelevement_stripe", LOG_DEBUG);
-							$resql = $this->db->query($sql);
+						dol_syslog(get_class($this)."::demande_prelevement_stripe", LOG_DEBUG);
+						$resql = $this->db->query($sql);
 						if (!$resql) {
 							$this->error = $this->db->lasterror();
 							dol_syslog(get_class($this).'::demande_prelevement_stripe Erreur');
@@ -1614,7 +1580,7 @@ abstract class CommonInvoice extends CommonObject
 					if ($error) {
 						return -1;
 					}
-						return 1;
+					return 1;
 				} else {
 					$this->error = "A request already exists";
 					dol_syslog(get_class($this).'::demande_prelevement_stripe Impossible de creer une demande, demande deja en cours');
diff --git a/htdocs/expedition/list.php b/htdocs/expedition/list.php
index 6e5e01f893e..e697c0be6c3 100644
--- a/htdocs/expedition/list.php
+++ b/htdocs/expedition/list.php
@@ -262,7 +262,10 @@ if ($sall || $search_product_category > 0 || $search_user > 0) {
 	$sql = 'SELECT DISTINCT';
 }
 $sql .= " e.rowid, e.ref, e.ref_customer, e.date_expedition as date_expedition, e.weight, e.weight_units, e.date_delivery as delivery_date, e.fk_statut, e.billed, e.tracking_number, e.fk_shipping_method,";
-$sql .= " l.date_delivery as date_reception,";
+if (getDolGlobalInt('MAIN_SUBMODULE_DELIVERY')) {
+	// Link for delivery fields ref and date. Does not duplicate the line because we should always have ony 1 link or 0 per shipment
+	$sql .= " l.date_delivery as date_reception,";
+}
 $sql .= " s.rowid as socid, s.nom as name, s.town, s.zip, s.fk_pays, s.client, s.code_client, ";
 $sql .= " typent.code as typent_code,";
 $sql .= " state.code_departement as state_code, state.nom as state_name,";
@@ -299,8 +302,11 @@ if (($search_categ_cus > 0) || ($search_categ_cus == -2)) {
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_country as country on (country.rowid = s.fk_pays)";
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_typent as typent on (typent.id = s.fk_typent)";
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_departements as state on (state.rowid = s.fk_departement)";
-$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."element_element as ee ON e.rowid = ee.fk_source AND ee.sourcetype = 'shipping' AND ee.targettype = 'delivery'";
-$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."delivery as l ON l.rowid = ee.fk_target";
+if (getDolGlobalInt('MAIN_SUBMODULE_DELIVERY')) {
+	// Link for delivery fields ref and date. Does not duplicate the line because we should always have ony 1 link or 0 per shipment
+	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."element_element as ee ON e.rowid = ee.fk_source AND ee.sourcetype = 'shipping' AND ee.targettype = 'delivery'";
+	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."delivery as l ON l.rowid = ee.fk_target";
+}
 $sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'user as u ON e.fk_user_author = u.rowid';
 if ($search_user > 0) {		// Get link to order to get the order id in eesource.fk_source
 	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."element_element as eesource ON eesource.fk_target = e.rowid AND eesource.targettype = 'shipping' AND eesource.sourcetype = 'commande'";
@@ -370,26 +376,28 @@ if ($search_user > 0) {
 	// The contact on a shipment is also the contact of the order.
 	$sql .= " AND ec.fk_c_type_contact = tc.rowid AND tc.element='commande' AND tc.source='internal' AND ec.element_id = eesource.fk_source AND ec.fk_socpeople = ".((int) $search_user);
 }
-if ($search_ref_exp) {
-	$sql .= natural_search('e.ref', $search_ref_exp);
-}
-if ($search_ref_liv) {
-	$sql .= natural_search('l.ref', $search_ref_liv);
-}
 if ($search_company) {
 	$sql .= natural_search('s.nom', $search_company);
 }
+if ($search_ref_exp) {
+	$sql .= natural_search('e.ref', $search_ref_exp);
+}
 if ($search_datedelivery_start) {
 	$sql .= " AND e.date_delivery >= '".$db->idate($search_datedelivery_start)."'";
 }
 if ($search_datedelivery_end) {
 	$sql .= " AND e.date_delivery <= '".$db->idate($search_datedelivery_end)."'";
 }
-if ($search_datereceipt_start) {
-	$sql .= " AND l.date_delivery >= '".$db->idate($search_datereceipt_start)."'";
-}
-if ($search_datereceipt_end) {
-	$sql .= " AND l.date_delivery <= '".$db->idate($search_datereceipt_end)."'";
+if (getDolGlobalInt('MAIN_SUBMODULE_DELIVERY')) {
+	if ($search_ref_liv) {
+		$sql .= natural_search('l.ref', $search_ref_liv);
+	}
+	if ($search_datereceipt_start) {
+		$sql .= " AND l.date_delivery >= '".$db->idate($search_datereceipt_start)."'";
+	}
+	if ($search_datereceipt_end) {
+		$sql .= " AND l.date_delivery <= '".$db->idate($search_datereceipt_end)."'";
+	}
 }
 if ($sall) {
 	$sql .= natural_search(array_keys($fieldstosearchall), $sall);
diff --git a/htdocs/langs/en_US/errors.lang b/htdocs/langs/en_US/errors.lang
index fba4f286b62..afcc12e9362 100644
--- a/htdocs/langs/en_US/errors.lang
+++ b/htdocs/langs/en_US/errors.lang
@@ -293,6 +293,7 @@ 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
 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.
 
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Your PHP parameter upload_max_filesize (%s) is higher than PHP parameter post_max_size (%s). This is not a consistent setup.
diff --git a/htdocs/langs/en_US/withdrawals.lang b/htdocs/langs/en_US/withdrawals.lang
index c2d9a042ece..1ed8148f6f2 100644
--- a/htdocs/langs/en_US/withdrawals.lang
+++ b/htdocs/langs/en_US/withdrawals.lang
@@ -101,8 +101,11 @@ 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.
+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 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 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
 SetToStatusSent=Set to status "File Sent"
diff --git a/htdocs/societe/paymentmodes.php b/htdocs/societe/paymentmodes.php
index 7e3c916ec27..8fa907389c3 100644
--- a/htdocs/societe/paymentmodes.php
+++ b/htdocs/societe/paymentmodes.php
@@ -435,6 +435,7 @@ if (empty($reshook)) {
 			$result = $companypaymentmode->delete($user);
 			if ($result > 0) {
 				$url = $_SERVER['PHP_SELF']."?socid=".$object->id;
+
 				header('Location: '.$url);
 				exit;
 			} else {
@@ -458,8 +459,10 @@ if (empty($reshook)) {
 			}*/
 
 			$result = $companybankaccount->delete($user);
+
 			if ($result > 0) {
 				$url = $_SERVER['PHP_SELF']."?socid=".$object->id;
+
 				header('Location: '.$url);
 				exit;
 			} else {
@@ -545,11 +548,11 @@ if (empty($reshook)) {
 				// Get the Stripe customer
 				$cu = $stripe->customerStripe($object, $stripeacc, $servicestatus);
 				// print json_encode($cu);
-				if (!$cu) {
+				if (empty($cu)) {
 					$error++;
-					setEventMessages($stripe->error, $stripe->errors, 'errors');
+					$langs->load("errors");
+					setEventMessages($langs->trans("ErrorStripeCustomerNotFoundCreateFirst"), null, 'errors');
 				}
-
 				if (!$error) {
 					// Creation of Stripe SEPA + update of llx_societe_rib
 					$card = $stripe->sepaStripe($cu, $companypaymentmode, $stripeacc, $servicestatus, 1);
@@ -1587,8 +1590,9 @@ if ($socid && $action != 'edit' && $action != 'create' && $action != 'editcard'
 			print '<td class="right nowraponall">';
 			if ($permissiontoaddupdatepaymentinformation) {
 				if (empty($rib->stripe_card_ref)) {
+					// Add link to create BAN on Stripe
 					print '<a class="editfielda marginrightonly marginleftonly" href="'.$_SERVER["PHP_SELF"].'?socid='.$object->id.'&id='.$rib->id.'&action=syncsepatostripe">';
-					print img_picto($langs->trans("CreateBAN"), 'stripe');
+					print img_picto($langs->trans("CreateBANOnStripe"), 'stripe');
 					print '</a>';
 				}
 
diff --git a/test/phpunit/CodingPhpTest.php b/test/phpunit/CodingPhpTest.php
index e8631c5b28b..979be4d8604 100644
--- a/test/phpunit/CodingPhpTest.php
+++ b/test/phpunit/CodingPhpTest.php
@@ -343,7 +343,7 @@ class CodingPhpTest extends PHPUnit\Framework\TestCase
 				//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 = "SELET ".$myvar...');
+			$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

From c601abeff1b0230f418b11c9d48d4de599650b19 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 10 Sep 2022 01:09:32 +0200
Subject: [PATCH 846/974] Fix missing key for donation module

---
 .../install/mysql/migration/16.0.0-17.0.0.sql |  8 +++++
 .../install/mysql/tables/llx_don-don.key.sql  | 29 +++++++++++++++++++
 2 files changed, 37 insertions(+)
 create mode 100644 htdocs/install/mysql/tables/llx_don-don.key.sql

diff --git a/htdocs/install/mysql/migration/16.0.0-17.0.0.sql b/htdocs/install/mysql/migration/16.0.0-17.0.0.sql
index 8121b94494d..0a8241d355d 100644
--- a/htdocs/install/mysql/migration/16.0.0-17.0.0.sql
+++ b/htdocs/install/mysql/migration/16.0.0-17.0.0.sql
@@ -149,3 +149,11 @@ UPDATE llx_c_effectif SET code='EF101-500', libelle='101 - 500' WHERE code='EF10
 
 ALTER TABLE llx_rights_def ADD COLUMN tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP;
 
+
+ALTER TABLE llx_don ADD UNIQUE INDEX idx_don_uk_ref (ref, entity);
+
+ALTER TABLE llx_don ADD INDEX idx_don_fk_soc (fk_soc);
+ALTER TABLE llx_don ADD INDEX idx_don_fk_project (fk_project);
+ALTER TABLE llx_don ADD INDEX idx_don_fk_user_author (fk_user_author);
+ALTER TABLE llx_don ADD INDEX idx_don_fk_user_valid (fk_user_valid);
+
diff --git a/htdocs/install/mysql/tables/llx_don-don.key.sql b/htdocs/install/mysql/tables/llx_don-don.key.sql
new file mode 100644
index 00000000000..2aef1dbd5be
--- /dev/null
+++ b/htdocs/install/mysql/tables/llx_don-don.key.sql
@@ -0,0 +1,29 @@
+-- ===================================================================
+-- Copyright (C) 2022      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/>.
+--
+-- ===================================================================
+
+
+ALTER TABLE llx_don ADD UNIQUE INDEX idx_don_uk_ref (ref, entity);
+
+ALTER TABLE llx_don ADD INDEX idx_don_fk_soc (fk_soc);
+ALTER TABLE llx_don ADD INDEX idx_don_fk_project (fk_project);
+ALTER TABLE llx_don ADD INDEX idx_don_fk_user_author (fk_user_author);
+ALTER TABLE llx_don ADD INDEX idx_don_fk_user_valid (fk_user_valid);
+
+--ALTER TABLE llx_don ADD CONSTRAINT fk_don_fk_soc			FOREIGN KEY (fk_soc)			REFERENCES llx_societe (rowid);
+--ALTER TABLE llx_don ADD CONSTRAINT fk_don_fk_user_author	FOREIGN KEY (fk_user_author)	REFERENCES llx_user (rowid);
+--ALTER TABLE llx_don ADD CONSTRAINT fk_don_fk_user_valid	    FOREIGN KEY (fk_user_valid)	    REFERENCES llx_user (rowid);

From 860d0ebe083c77faf7ae64f808b4f039453aaf28 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 10 Sep 2022 01:16:56 +0200
Subject: [PATCH 847/974] FIX #22164

---
 htdocs/projet/class/project.class.php | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/htdocs/projet/class/project.class.php b/htdocs/projet/class/project.class.php
index f395173b327..7ee71bc1569 100644
--- a/htdocs/projet/class/project.class.php
+++ b/htdocs/projet/class/project.class.php
@@ -854,11 +854,24 @@ class Project extends CommonObject
 		$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'=>'fk_projet',
-			'actioncomm'=>'fk_project', 'mrp_mo'=>'fk_project', 'entrepot'=>'fk_project'
+			'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) {
-			$sql = "UPDATE ".MAIN_DB_PREFIX.$key." SET ".$value." = NULL where ".$value." = ".((int) $this->id);
+			if (is_array($value)) {
+				if (!isModEnabled($value['module'])) {
+					continue;
+				}
+				$fieldname = $value['field'];
+			} else {
+				$fieldname = $value;
+			}
+			$sql = "UPDATE ".MAIN_DB_PREFIX.$key." SET ".$fieldname." = NULL where ".$fieldname." = ".((int) $this->id);
+
 			$resql = $this->db->query($sql);
 			if (!$resql) {
 				$this->errors[] = $this->db->lasterror();

From c1b6d6eb11310525bb19f281e3135d5e002b25f4 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 10 Sep 2022 01:21:41 +0200
Subject: [PATCH 848/974] FIX warning

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

diff --git a/htdocs/website/index.php b/htdocs/website/index.php
index 4ab8f99029e..65a4bdc92a6 100644
--- a/htdocs/website/index.php
+++ b/htdocs/website/index.php
@@ -3747,7 +3747,17 @@ if ($action == 'editmeta' || $action == 'createcontainer') {	// Edit properties
 		$pagestatus = $objectpage->status;
 	} else {
 		$type_container = 'page';
+		$pageurl = '';
+		$pagealiasalt = '';
+		$pagetitle = '';
+		$pagedescription = '';
+		$pageimage = '';
+		$pagekeywords = '';
+		$pagelang = '';
+		$pageallowedinframes = 0;
+		$pagehtmlheader = '';
 		$pagedatecreation = dol_now();
+		$pagedatemodification = '';
 		$pageauthorid = $user->id;
 		$pageusermodifid = 0;
 		$pageauthoralias = '';

From 2ebd78d980aebab7074894c3104e2a61dd317208 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 10 Sep 2022 02:15:15 +0200
Subject: [PATCH 849/974] Fix date

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

diff --git a/htdocs/compta/recap-compta.php b/htdocs/compta/recap-compta.php
index 4bd79a3c0d5..6f68444359d 100644
--- a/htdocs/compta/recap-compta.php
+++ b/htdocs/compta/recap-compta.php
@@ -266,12 +266,12 @@ if ($id > 0) {
 
 				print '<tr class="oddeven '.$html_class.'">';
 
-				print "<td class=\"center\">";
+				$datedetail = dol_print_date($data['date'], 'dayhour');
 				if (!empty($data['fk_facture'])) {
-					print dol_print_date($data['date'], 'day');
-				} elseif (!empty($data['fk_paiement'])) {
-					print dol_print_date($data['date'], 'dayhour');
+					$datedetail = dol_print_date($data['date'], 'day');
 				}
+				print '<td class="center" title="'.dol_escape_htmltag($datedetail).'">';
+				print dol_print_date($data['date'], 'day');
 				print "</td>\n";
 
 				print '<td>'.$data['link']."</td>\n";

From a538609c9cabc84eedc66dbf5910a9401390e895 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 10 Sep 2022 02:26:49 +0200
Subject: [PATCH 850/974] Fix more complete filters supported in
 fetchAllBalance

---
 htdocs/accountancy/class/bookkeeping.class.php | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/htdocs/accountancy/class/bookkeeping.class.php b/htdocs/accountancy/class/bookkeeping.class.php
index 0cc8ab4e8d9..0b2a060d7a2 100644
--- a/htdocs/accountancy/class/bookkeeping.class.php
+++ b/htdocs/accountancy/class/bookkeeping.class.php
@@ -1123,14 +1123,13 @@ 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)
-	 *
-	 * @return int <0 if KO, >0 if OK
+	 * @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 					<0 if KO, >0 if OK
 	 */
 	public function fetchAllBalance($sortorder = '', $sortfield = '', $limit = 0, $offset = 0, array $filter = array(), $filtermode = 'AND')
 	{
@@ -1151,7 +1150,7 @@ class BookKeeping extends CommonObject
 			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<=') {
+				} elseif ($key == 't.doc_date>=' || $key == 't.doc_date<=' || $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)."'";

From 5521cb6afcea120e4643ddc666158b2f17803b73 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 10 Sep 2022 02:45:25 +0200
Subject: [PATCH 851/974] Fix picto multicompany

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

diff --git a/htdocs/user/group/list.php b/htdocs/user/group/list.php
index bf8bd407093..efdc2957ec8 100644
--- a/htdocs/user/group/list.php
+++ b/htdocs/user/group/list.php
@@ -213,14 +213,14 @@ if ($resql) {
 		print '<tr class="oddeven">';
 		print '<td>';
 		print $grouptemp->getNomUrl(1);
-		if (!$obj->entity) {
+		if (isModEnabled('multicompany') && !$obj->entity) {
 			print img_picto($langs->trans("GlobalGroup"), 'redstar');
 		}
 		print "</td>";
 		//multicompany
-		if (!empty($conf->multicompany->enabled) && is_object($mc) && empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE) && $conf->entity == 1) {
+		if (isModEnabled('multicompany') && is_object($mc) && empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE) && $conf->entity == 1) {
 			$mc->getInfo($obj->entity);
-			print '<td class="center">'.$mc->label.'</td>';
+			print '<td class="center">'.dol_escape_htmltag($mc->label).'</td>';
 		}
 		print '<td class="center">'.$obj->nb.'</td>';
 		print '<td class="center">';

From 4490f0615e22d74fed64e1dbbf4e9d022fa63be8 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 10 Sep 2022 02:47:43 +0200
Subject: [PATCH 852/974] doc

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

diff --git a/ChangeLog b/ChangeLog
index 891e445ab39..49a782e1264 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -10,8 +10,8 @@ For users:
 ---------------
 
 NEW: PHP 8.1 compatibility:
-     Warning: Application works correctly with PHP8 and 8.1 but you may experience a lot of PHP warning into the PHP server log files (depending 
-     on the PHP setup). Removal of all PHP warnings on server side is planned for v17.
+     Warning!! Application works correctly with PHP8 and 8.1 but you will experience a lot of PHP warnings into the PHP server
+     log files (depending on your PHP setup). Removal of all PHP warnings on server side is planned for v17.
 NEW: Support for recurring purchase invoices.
 NEW: #20292 Include German public holidays
 NEW: Can show ZATCA QRCode on PDFs

From b0209ad827a73110e237d84c0c75c562e927a71a Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 10 Sep 2022 02:59:19 +0200
Subject: [PATCH 853/974] Fix sql

---
 htdocs/install/mysql/migration/16.0.0-17.0.0.sql | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/install/mysql/migration/16.0.0-17.0.0.sql b/htdocs/install/mysql/migration/16.0.0-17.0.0.sql
index 0a8241d355d..3353b91fb9a 100644
--- a/htdocs/install/mysql/migration/16.0.0-17.0.0.sql
+++ b/htdocs/install/mysql/migration/16.0.0-17.0.0.sql
@@ -153,7 +153,7 @@ ALTER TABLE llx_rights_def ADD COLUMN tms timestamp DEFAULT CURRENT_TIMESTAMP ON
 ALTER TABLE llx_don ADD UNIQUE INDEX idx_don_uk_ref (ref, entity);
 
 ALTER TABLE llx_don ADD INDEX idx_don_fk_soc (fk_soc);
-ALTER TABLE llx_don ADD INDEX idx_don_fk_project (fk_project);
+ALTER TABLE llx_don ADD INDEX idx_don_fk_project (fk_projet);
 ALTER TABLE llx_don ADD INDEX idx_don_fk_user_author (fk_user_author);
 ALTER TABLE llx_don ADD INDEX idx_don_fk_user_valid (fk_user_valid);
 

From 69bd28ff316068b3aef4fe3ffa3c5fa209a43869 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 10 Sep 2022 03:04:24 +0200
Subject: [PATCH 854/974] fix count

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

diff --git a/htdocs/societe/paymentmodes.php b/htdocs/societe/paymentmodes.php
index 8fa907389c3..30b19e59d8b 100644
--- a/htdocs/societe/paymentmodes.php
+++ b/htdocs/societe/paymentmodes.php
@@ -1616,8 +1616,6 @@ if ($socid && $action != 'edit' && $action != 'create' && $action != 'editcard'
 				continue; // Already in previous list
 			}
 
-			$nbremote++;
-
 			$imgline = '';
 			if ($src->object == 'source' && $src->type == 'sepa_debit') {
 				$imgline = '<span class="fa fa-university fa-2x fa-fw"></span>';
@@ -1627,6 +1625,8 @@ if ($socid && $action != 'edit' && $action != 'create' && $action != 'editcard'
 				continue;
 			}
 
+			$nbremote++;
+
 			print '<tr class="oddeven">';
 			print '<td>';
 			print '</td>';
@@ -1715,7 +1715,7 @@ if ($socid && $action != 'edit' && $action != 'create' && $action != 'editcard'
 
 		if ($nbremote == 0 && $nblocal == 0) {
 			$colspan = 10;
-			if (!empty($conf->prelevement->enabled)) {
+			if (isModEnabled('prelevement')) {
 				$colspan += 3;
 			}
 			print '<tr><td colspan="'.$colspan.'"><span class="opacitymedium">'.$langs->trans("NoBANRecord").'</span></td></tr>';

From 5b2b5e6a583aeac6c22752341383c5aaac8ac532 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 10 Sep 2022 08:33:36 +0200
Subject: [PATCH 855/974] Fix picto multicompany

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

diff --git a/htdocs/user/group/card.php b/htdocs/user/group/card.php
index 1acfa858663..3e6e6eb1231 100644
--- a/htdocs/user/group/card.php
+++ b/htdocs/user/group/card.php
@@ -443,7 +443,7 @@ if ($action == 'create') {
 						print '<tr class="oddeven">';
 						print '<td class="tdoverflowmax150">';
 						print $useringroup->getNomUrl(-1, '', 0, 0, 24, 0, 'login');
-						if ($useringroup->admin && !$useringroup->entity) {
+						if (isModEnabled('multicompany') && $useringroup->admin && empty($useringroup->entity)) {
 							print img_picto($langs->trans("SuperAdministrator"), 'redstar');
 						} elseif ($useringroup->admin) {
 							print img_picto($langs->trans("Administrator"), 'star');

From c8fe13e2ca6642f1d4af8144ee412c0dcc120b62 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 10 Sep 2022 09:19:01 +0200
Subject: [PATCH 856/974] css

---
 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 80e69a39532..3fe5578bfd3 100644
--- a/htdocs/core/class/html.formmail.class.php
+++ b/htdocs/core/class/html.formmail.class.php
@@ -511,7 +511,7 @@ class FormMail extends Form
 				}
 
 				$out .= ' &nbsp; ';
-				$out .= '<input type="submit" class="button reposition" value="'.$langs->trans('Apply').'" name="modelselected" id="modelselected">';
+				$out .= '<input type="submit" class="button reposition smallpaddingimp" value="'.$langs->trans('Apply').'" name="modelselected" id="modelselected">';
 				$out .= ' &nbsp; ';
 				$out .= '</div>';
 			} elseif (!empty($this->param['models']) && in_array($this->param['models'], array(
@@ -847,7 +847,7 @@ class FormMail extends Form
 							$out .= '<input type="file" class="flat" id="addedfile" name="addedfile" value="'.$langs->trans("Upload").'" />';
 						}
 						$out .= ' ';
-						$out .= '<input type="submit" class="button" id="'.$addfileaction.'" name="'.$addfileaction.'" value="'.$langs->trans("MailingAddFile").'" />';
+						$out .= '<input type="submit" class="button small" id="'.$addfileaction.'" name="'.$addfileaction.'" value="'.$langs->trans("MailingAddFile").'" />';
 					}
 				} else {
 					$out .= $this->withfile;

From 857646ed364b9fc252343aa4d3fa78eec18d2fba Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Sat, 10 Sep 2022 11:00:38 +0200
Subject: [PATCH 857/974] update code toward php8 compliance

---
 htdocs/accountancy/bookkeeping/list.php          | 2 +-
 htdocs/accountancy/bookkeeping/listbyaccount.php | 2 +-
 htdocs/api/class/api_documents.class.php         | 2 +-
 htdocs/categories/class/api_categories.class.php | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/htdocs/accountancy/bookkeeping/list.php b/htdocs/accountancy/bookkeeping/list.php
index a76fa1945c2..36d268a06cf 100644
--- a/htdocs/accountancy/bookkeeping/list.php
+++ b/htdocs/accountancy/bookkeeping/list.php
@@ -480,7 +480,7 @@ if (empty($reshook)) {
 	// Mass actions
 	$objectclass = 'Bookkeeping';
 	$objectlabel = 'Bookkeeping';
-	$permissiontoread = $user->rights->societe->lire;
+	$permissiontoread = $user->hasRight('societe', 'lire');
 	$permissiontodelete = $user->rights->societe->supprimer;
 	$permissiontoadd = $user->rights->societe->creer;
 	$uploaddir = $conf->societe->dir_output;
diff --git a/htdocs/accountancy/bookkeeping/listbyaccount.php b/htdocs/accountancy/bookkeeping/listbyaccount.php
index ba94415782f..786c3914b92 100644
--- a/htdocs/accountancy/bookkeeping/listbyaccount.php
+++ b/htdocs/accountancy/bookkeeping/listbyaccount.php
@@ -395,7 +395,7 @@ if (empty($reshook)) {
 	// Mass actions
 	$objectclass = 'Bookkeeping';
 	$objectlabel = 'Bookkeeping';
-	$permissiontoread = $user->rights->societe->lire;
+	$permissiontoread = $user->hasRight('societe', 'lire');
 	$permissiontodelete = $user->rights->societe->supprimer;
 	$permissiontoadd = $user->rights->societe->creer;
 	$uploaddir = $conf->societe->dir_output;
diff --git a/htdocs/api/class/api_documents.class.php b/htdocs/api/class/api_documents.class.php
index d4d652f3e74..2c7653c3bb3 100644
--- a/htdocs/api/class/api_documents.class.php
+++ b/htdocs/api/class/api_documents.class.php
@@ -272,7 +272,7 @@ class Documents extends DolibarrApi
 		if ($modulepart == 'societe' || $modulepart == 'thirdparty') {
 			require_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
 
-			if (!DolibarrApiAccess::$user->rights->societe->lire) {
+			if (!DolibarrApiAccess::$user->hasRight('societe', 'lire')) {
 				throw new RestException(401);
 			}
 
diff --git a/htdocs/categories/class/api_categories.class.php b/htdocs/categories/class/api_categories.class.php
index 76381c0d53d..e59ff070aec 100644
--- a/htdocs/categories/class/api_categories.class.php
+++ b/htdocs/categories/class/api_categories.class.php
@@ -315,7 +315,7 @@ class Categories extends DolibarrApi
 			throw new RestException(401);
 		} elseif ($type == Categorie::TYPE_CONTACT && !DolibarrApiAccess::$user->rights->contact->lire) {
 			throw new RestException(401);
-		} elseif ($type == Categorie::TYPE_CUSTOMER && !DolibarrApiAccess::$user->rights->societe->lire) {
+		} elseif ($type == Categorie::TYPE_CUSTOMER && !DolibarrApiAccess::$user->hasRight('societe', 'lire')) {
 			throw new RestException(401);
 		} elseif ($type == Categorie::TYPE_SUPPLIER && !DolibarrApiAccess::$user->rights->fournisseur->lire) {
 			throw new RestException(401);

From 3f2faf466768471729ec95054b26a549b080aa64 Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Sat, 10 Sep 2022 11:02:48 +0200
Subject: [PATCH 858/974] update code toward php8 compliance

---
 htdocs/comm/index.php             | 4 ++--
 htdocs/contact/list.php           | 2 +-
 htdocs/core/ajax/objectonoff.php  | 2 +-
 htdocs/core/boxes/box_clients.php | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/htdocs/comm/index.php b/htdocs/comm/index.php
index ed6184e0cd4..01f3bba9eff 100644
--- a/htdocs/comm/index.php
+++ b/htdocs/comm/index.php
@@ -594,7 +594,7 @@ print '</div><div class="fichetwothirdright">';
 /*
  * Last modified customers or prospects
  */
-if (isModEnabled("societe") && $user->rights->societe->lire) {
+if (isModEnabled("societe") && $user->hasRight('societe', 'lire')) {
 	$sql = "SELECT s.rowid as socid, s.nom as name, s.name_alias";
 	$sql .= ", s.code_client, s.code_compta, s.client";
 	$sql .= ", s.code_fournisseur, s.code_compta_fournisseur, s.fournisseur";
@@ -700,7 +700,7 @@ if (isModEnabled("societe") && $user->rights->societe->lire) {
 /*
  * Last suppliers
  */
-if (((isModEnabled("fournisseur") && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD)) || isModEnabled("supplier_order") || isModEnabled("supplier_invoice")) && $user->rights->societe->lire) {
+if (((isModEnabled("fournisseur") && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD)) || isModEnabled("supplier_order") || isModEnabled("supplier_invoice")) && $user->hasRight('societe', 'lire')) {
 	$sql = "SELECT s.rowid as socid, s.nom as name, s.name_alias";
 	$sql .= ", s.code_client, s.code_compta, s.client";
 	$sql .= ", s.code_fournisseur, s.code_compta_fournisseur, s.fournisseur";
diff --git a/htdocs/contact/list.php b/htdocs/contact/list.php
index 1070c9e0b9d..c2b0120790b 100644
--- a/htdocs/contact/list.php
+++ b/htdocs/contact/list.php
@@ -312,7 +312,7 @@ if (empty($reshook)) {
 	// Mass actions
 	$objectclass = 'Contact';
 	$objectlabel = 'Contact';
-	$permissiontoread = $user->rights->societe->lire;
+	$permissiontoread = $user->hasRight('societe', 'lire');
 	$permissiontodelete = $user->rights->societe->supprimer;
 	$permissiontoadd = $user->rights->societe->creer;
 	$uploaddir = $conf->societe->dir_output;
diff --git a/htdocs/core/ajax/objectonoff.php b/htdocs/core/ajax/objectonoff.php
index c66a49557d0..77cd3234cd8 100644
--- a/htdocs/core/ajax/objectonoff.php
+++ b/htdocs/core/ajax/objectonoff.php
@@ -67,7 +67,7 @@ if (!empty($user->socid)) {
 	$socid = $user->socid;
 }
 
-//$user->rights->societe->lire = 0;$user->rights->fournisseur->lire = 0;
+//$user->hasRight('societe', 'lire') = 0;$user->rights->fournisseur->lire = 0;
 //restrictedArea($user, 'societe', $id);
 
 if (in_array($field, array('status'))) {
diff --git a/htdocs/core/boxes/box_clients.php b/htdocs/core/boxes/box_clients.php
index 364b79932ef..cb934debef3 100644
--- a/htdocs/core/boxes/box_clients.php
+++ b/htdocs/core/boxes/box_clients.php
@@ -86,7 +86,7 @@ class box_clients extends ModeleBoxes
 
 		$this->info_box_head = array('text' => $langs->trans("BoxTitleLastModifiedCustomers", $max));
 
-		if ($user->rights->societe->lire) {
+		if ($user->hasRight('societe', 'lire')) {
 			$sql = "SELECT s.rowid as socid, s.nom as name, s.name_alias";
 			$sql .= ", s.code_client, s.code_compta, s.client";
 			$sql .= ", s.logo, s.email, s.entity";

From 4ccc79f253a93ce423d36ef99a66ff2189da3c63 Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Sat, 10 Sep 2022 11:04:37 +0200
Subject: [PATCH 859/974] update code toward php8 compliance

---
 htdocs/core/boxes/box_customers_outstanding_bill_reached.php | 2 +-
 htdocs/core/boxes/box_dolibarr_state_board.php               | 4 ++--
 htdocs/core/boxes/box_fournisseurs.php                       | 2 +-
 htdocs/core/boxes/box_goodcustomers.php                      | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/htdocs/core/boxes/box_customers_outstanding_bill_reached.php b/htdocs/core/boxes/box_customers_outstanding_bill_reached.php
index 2bf5a2c0693..ec82f1a57e4 100644
--- a/htdocs/core/boxes/box_customers_outstanding_bill_reached.php
+++ b/htdocs/core/boxes/box_customers_outstanding_bill_reached.php
@@ -86,7 +86,7 @@ class box_customers_outstanding_bill_reached extends ModeleBoxes
 
 		$this->info_box_head = array('text' => $langs->trans("BoxTitleLastOutstandingBillReached", $max));
 
-		if ($user->rights->societe->lire) {
+		if ($user->hasRight('societe', 'lire')) {
 			$sql = "SELECT s.rowid as socid, s.nom as name, s.name_alias";
 			$sql .= ", s.code_client, s.code_compta, s.client";
 			$sql .= ", s.logo, s.email, s.entity";
diff --git a/htdocs/core/boxes/box_dolibarr_state_board.php b/htdocs/core/boxes/box_dolibarr_state_board.php
index a60d5c20a93..0f63582370c 100644
--- a/htdocs/core/boxes/box_dolibarr_state_board.php
+++ b/htdocs/core/boxes/box_dolibarr_state_board.php
@@ -114,8 +114,8 @@ class box_dolibarr_state_board extends ModeleBoxes
 			$conditions = array(
 				'users' => $user->hasRight('user', 'user', 'lire'),
 				'members' => isModEnabled('adherent') && $user->rights->adherent->lire,
-				'customers' => isModEnabled('societe') && $user->rights->societe->lire && empty($conf->global->SOCIETE_DISABLE_CUSTOMERS) && empty($conf->global->SOCIETE_DISABLE_CUSTOMERS_STATS),
-				'prospects' => isModEnabled('societe') && $user->rights->societe->lire && empty($conf->global->SOCIETE_DISABLE_PROSPECTS) && empty($conf->global->SOCIETE_DISABLE_PROSPECTS_STATS),
+				'customers' => isModEnabled('societe') && $user->hasRight('societe', 'lire') && empty($conf->global->SOCIETE_DISABLE_CUSTOMERS) && empty($conf->global->SOCIETE_DISABLE_CUSTOMERS_STATS),
+				'prospects' => isModEnabled('societe') && $user->hasRight('societe', 'lire') && empty($conf->global->SOCIETE_DISABLE_PROSPECTS) && empty($conf->global->SOCIETE_DISABLE_PROSPECTS_STATS),
 				'suppliers' => ((isModEnabled("fournisseur") && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD) && $user->rights->fournisseur->lire)
 								 || (isModEnabled("supplier_order") && $user->rights->supplier_order->lire)
 								 || (isModEnabled("supplier_invoice") && $user->rights->supplier_invoice->lire)
diff --git a/htdocs/core/boxes/box_fournisseurs.php b/htdocs/core/boxes/box_fournisseurs.php
index 59280aeec62..1c14ac0be4f 100644
--- a/htdocs/core/boxes/box_fournisseurs.php
+++ b/htdocs/core/boxes/box_fournisseurs.php
@@ -81,7 +81,7 @@ class box_fournisseurs extends ModeleBoxes
 
 		$this->info_box_head = array('text' => $langs->trans("BoxTitleLastModifiedSuppliers", $max));
 
-		if ($user->rights->societe->lire) {
+		if ($user->hasRight('societe', 'lire')) {
 			$sql = "SELECT s.rowid as socid, s.nom as name, s.name_alias";
 			$sql .= ", s.code_fournisseur, s.code_compta_fournisseur, s.fournisseur";
 			$sql .= ", s.logo, s.email, s.entity";
diff --git a/htdocs/core/boxes/box_goodcustomers.php b/htdocs/core/boxes/box_goodcustomers.php
index 3341e08107d..90ffc82a5d8 100644
--- a/htdocs/core/boxes/box_goodcustomers.php
+++ b/htdocs/core/boxes/box_goodcustomers.php
@@ -69,7 +69,7 @@ class box_goodcustomers extends ModeleBoxes
 			$this->enabled = 0; // not enabled by default. Very slow on large database
 		}
 
-		$this->hidden = empty($user->rights->societe->lire);
+		$this->hidden = !$user->hasRight('societe', 'lire');
 	}
 
 	/**
@@ -90,7 +90,7 @@ class box_goodcustomers extends ModeleBoxes
 
 		$this->info_box_head = array('text' => $langs->trans("BoxTitleGoodCustomers", $max));
 
-		if ($user->rights->societe->lire) {
+		if ($user->hasRight('societe', 'lire')) {
 			$sql = "SELECT s.rowid, s.nom as name, s.logo, s.code_client, s.code_fournisseur, s.client, s.fournisseur, s.tms as datem, s.status as status,";
 			$sql .= " count(*) as nbfact, sum(".$this->db->ifsql('f.paye=1', '1', '0').") as nbfactpaye";
 			$sql .= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."facture as f";

From e73b8983bf4f1c0b95614cd43e2fb8725e820010 Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Sat, 10 Sep 2022 11:07:00 +0200
Subject: [PATCH 860/974] update code toward php8 compliance

---
 htdocs/core/boxes/box_contacts.php | 2 +-
 htdocs/core/boxes/box_prospect.php | 2 +-
 htdocs/core/lib/security.lib.php   | 4 ++--
 htdocs/hrm/position_card.php       | 2 +-
 htdocs/margin/index.php            | 2 +-
 htdocs/margin/lib/margins.lib.php  | 2 +-
 6 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/htdocs/core/boxes/box_contacts.php b/htdocs/core/boxes/box_contacts.php
index f257d7db18d..f051fe5ade3 100644
--- a/htdocs/core/boxes/box_contacts.php
+++ b/htdocs/core/boxes/box_contacts.php
@@ -85,7 +85,7 @@ class box_contacts extends ModeleBoxes
 
 		$this->info_box_head = array('text' => $langs->trans("BoxTitleLastModifiedContacts", $max));
 
-		if ($user->rights->societe->lire && $user->rights->societe->contact->lire) {
+		if ($user->hasRight('societe', 'lire') && $user->rights->societe->contact->lire) {
 			$sql = "SELECT sp.rowid as id, sp.lastname, sp.firstname, sp.civility as civility_id, sp.datec, sp.tms, sp.fk_soc, sp.statut as status";
 
 			$sql .= ", sp.address, sp.zip, sp.town, sp.phone, sp.phone_perso, sp.phone_mobile, sp.email as spemail";
diff --git a/htdocs/core/boxes/box_prospect.php b/htdocs/core/boxes/box_prospect.php
index 205cf09419c..69e8432a879 100644
--- a/htdocs/core/boxes/box_prospect.php
+++ b/htdocs/core/boxes/box_prospect.php
@@ -86,7 +86,7 @@ class box_prospect extends ModeleBoxes
 
 		$this->info_box_head = array('text' => $langs->trans("BoxTitleLastModifiedProspects", $max));
 
-		if ($user->rights->societe->lire) {
+		if ($user->hasRight('societe', 'lire')) {
 			$sql = "SELECT s.rowid as socid, s.nom as name, s.name_alias";
 			$sql .= ", s.code_client, s.code_compta, s.client";
 			$sql .= ", s.logo, s.email, s.entity";
diff --git a/htdocs/core/lib/security.lib.php b/htdocs/core/lib/security.lib.php
index ce6f9b38320..f4f1d1be5cd 100644
--- a/htdocs/core/lib/security.lib.php
+++ b/htdocs/core/lib/security.lib.php
@@ -831,7 +831,7 @@ function checkUserAccessToObject($user, array $featuresarray, $object = 0, $tabl
 				if ($user->socid != $objectid) {
 					return false;
 				}
-			} elseif (isModEnabled("societe") && ($user->rights->societe->lire && empty($user->rights->societe->client->voir))) {
+			} elseif (isModEnabled("societe") && ($user->hasRight('societe', 'lire') && empty($user->rights->societe->client->voir))) {
 				// If internal user: Check permission for internal users that are restricted on their objects
 				$sql = "SELECT COUNT(sc.fk_soc) as nb";
 				$sql .= " FROM (".MAIN_DB_PREFIX."societe_commerciaux as sc";
@@ -857,7 +857,7 @@ function checkUserAccessToObject($user, array $featuresarray, $object = 0, $tabl
 				$sql .= " FROM ".MAIN_DB_PREFIX.$dbtablename." as dbt";
 				$sql .= " WHERE dbt.".$dbt_select." IN (".$db->sanitize($objectid, 1).")";
 				$sql .= " AND dbt.fk_soc = ".((int) $user->socid);
-			} elseif (isModEnabled("societe") && ($user->rights->societe->lire && empty($user->rights->societe->client->voir))) {
+			} elseif (isModEnabled("societe") && ($user->hasRight('societe', 'lire') && empty($user->rights->societe->client->voir))) {
 				// If internal user: Check permission for internal users that are restricted on their objects
 				$sql = "SELECT COUNT(dbt.".$dbt_select.") as nb";
 				$sql .= " FROM ".MAIN_DB_PREFIX.$dbtablename." as dbt";
diff --git a/htdocs/hrm/position_card.php b/htdocs/hrm/position_card.php
index 746e1265a0b..168756d9851 100644
--- a/htdocs/hrm/position_card.php
+++ b/htdocs/hrm/position_card.php
@@ -337,7 +337,7 @@ function displayPositionCard(&$object)
 //		 */
 //		$filedir = $conf->societe->multidir_output[$object->entity].'/'.$object->id;
 //		$urlsource = $_SERVER["PHP_SELF"]."?socid=".$object->id;
-//		$genallowed = $user->rights->societe->lire;
+//		$genallowed = $user->hasRight('societe', 'lire');
 //		$delallowed = $user->rights->societe->creer;
 //
 //		print $formfile->showdocuments('company', $object->id, $filedir, $urlsource, $genallowed, $delallowed, $object->model_pdf, 0, 0, 0, 28, 0, 'entity='.$object->entity, 0, '', $object->default_lang);
diff --git a/htdocs/margin/index.php b/htdocs/margin/index.php
index 8363cd331c4..79595d5a8ee 100644
--- a/htdocs/margin/index.php
+++ b/htdocs/margin/index.php
@@ -27,7 +27,7 @@ require '../main.inc.php';
 
 if ($user->rights->produit->lire) {
 	$page = 'productMargins';
-} elseif ($user->rights->societe->lire) {
+} elseif ($user->hasRight('societe', 'lire')) {
 	$page = 'customerMargins';
 } else {
 	$page = 'agentMargins';
diff --git a/htdocs/margin/lib/margins.lib.php b/htdocs/margin/lib/margins.lib.php
index 802541b98ca..10e449026fa 100644
--- a/htdocs/margin/lib/margins.lib.php
+++ b/htdocs/margin/lib/margins.lib.php
@@ -71,7 +71,7 @@ function marges_prepare_head()
 		$h++;
 	}
 
-	if ($user->rights->societe->lire) {
+	if ($user->hasRight('societe', 'lire')) {
 		$head[$h][0] = DOL_URL_ROOT."/margin/customerMargins.php";
 		$head[$h][1] = $langs->trans("CustomerMargins");
 		$head[$h][2] = 'customerMargins';

From b52bcf191fbc6be8f5baa73aee2158bc17527729 Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Sat, 10 Sep 2022 11:08:36 +0200
Subject: [PATCH 861/974] update code toward php8 compliance

---
 htdocs/societe/card.php         |  4 ++--
 htdocs/societe/index.php        | 12 ++++++------
 htdocs/societe/list.php         |  2 +-
 htdocs/societe/paymentmodes.php |  2 +-
 htdocs/societe/website.php      |  2 +-
 5 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/htdocs/societe/card.php b/htdocs/societe/card.php
index bdc48872c03..ab3ce495872 100644
--- a/htdocs/societe/card.php
+++ b/htdocs/societe/card.php
@@ -137,7 +137,7 @@ if (!empty($canvas)) {
 }
 
 // Permissions
-$permissiontoread 	= $user->rights->societe->lire;
+$permissiontoread 	= $user->hasRight('societe', 'lire');
 $permissiontoadd 	= $user->rights->societe->creer; // Used by the include of actions_addupdatedelete.inc.php and actions_lineupdown.inc.php
 $permissiontodelete = $user->rights->societe->supprimer || ($permissiontoadd && isset($object->status) && $object->status == 0);
 $permissionnote 	= $user->rights->societe->creer; // Used by the include of actions_setnotes.inc.php
@@ -3277,7 +3277,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 				 */
 				$filedir = $conf->societe->multidir_output[$object->entity].'/'.$object->id;
 				$urlsource = $_SERVER["PHP_SELF"]."?socid=".$object->id;
-				$genallowed = $user->rights->societe->lire;
+				$genallowed = $user->hasRight('societe', 'lire');
 				$delallowed = $user->rights->societe->creer;
 
 				print $formfile->showdocuments('company', $object->id, $filedir, $urlsource, $genallowed, $delallowed, $object->model_pdf, 0, 0, 0, 28, 0, 'entity='.$object->entity, 0, '', $object->default_lang);
diff --git a/htdocs/societe/index.php b/htdocs/societe/index.php
index 1d0bdfe39a1..e161cd8668c 100644
--- a/htdocs/societe/index.php
+++ b/htdocs/societe/index.php
@@ -124,10 +124,10 @@ $result = $db->query($sql);
 if ($result) {
 	while ($objp = $db->fetch_object($result)) {
 		$found = 0;
-		if (isModEnabled('societe') && $user->rights->societe->lire && empty($conf->global->SOCIETE_DISABLE_PROSPECTS) && empty($conf->global->SOCIETE_DISABLE_PROSPECTS_STATS) && ($objp->client == 2 || $objp->client == 3)) {
+		if (isModEnabled('societe') && $user->hasRight('societe', 'lire') && empty($conf->global->SOCIETE_DISABLE_PROSPECTS) && empty($conf->global->SOCIETE_DISABLE_PROSPECTS_STATS) && ($objp->client == 2 || $objp->client == 3)) {
 			$found = 1; $third['prospect']++;
 		}
-		if (isModEnabled('societe') && $user->rights->societe->lire && empty($conf->global->SOCIETE_DISABLE_CUSTOMERS) && empty($conf->global->SOCIETE_DISABLE_CUSTOMERS_STATS) && ($objp->client == 1 || $objp->client == 3)) {
+		if (isModEnabled('societe') && $user->hasRight('societe', 'lire') && empty($conf->global->SOCIETE_DISABLE_CUSTOMERS) && empty($conf->global->SOCIETE_DISABLE_CUSTOMERS_STATS) && ($objp->client == 1 || $objp->client == 3)) {
 			$found = 1; $third['customer']++;
 		}
 		if (((isModEnabled('fournisseur') && $user->rights->fournisseur->facture->lire && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD)) || (isModEnabled('supplier_order') && $user->rights->supplier_order->lire) || (isModEnabled('supplier_invoice') && $user->rights->supplier_invoice->lire)) && empty($conf->global->SOCIETE_DISABLE_SUPPLIERS_STATS) && $objp->fournisseur) {
@@ -150,10 +150,10 @@ $thirdpartygraph .= '<tr class="liste_titre"><th colspan="2">'.$langs->trans("St
 if (!empty($conf->use_javascript_ajax) && ((round($third['prospect']) ? 1 : 0) + (round($third['customer']) ? 1 : 0) + (round($third['supplier']) ? 1 : 0) + (round($third['other']) ? 1 : 0) >= 2)) {
 	$thirdpartygraph .= '<tr><td class="center" colspan="2">';
 	$dataseries = array();
-	if (isModEnabled('societe') && $user->rights->societe->lire && empty($conf->global->SOCIETE_DISABLE_PROSPECTS) && empty($conf->global->SOCIETE_DISABLE_PROSPECTS_STATS)) {
+	if (isModEnabled('societe') && $user->hasRight('societe', 'lire') && empty($conf->global->SOCIETE_DISABLE_PROSPECTS) && empty($conf->global->SOCIETE_DISABLE_PROSPECTS_STATS)) {
 		$dataseries[] = array($langs->trans("Prospects"), round($third['prospect']));
 	}
-	if (isModEnabled('societe') && $user->rights->societe->lire && empty($conf->global->SOCIETE_DISABLE_CUSTOMERS) && empty($conf->global->SOCIETE_DISABLE_CUSTOMERS_STATS)) {
+	if (isModEnabled('societe') && $user->hasRight('societe', 'lire') && empty($conf->global->SOCIETE_DISABLE_CUSTOMERS) && empty($conf->global->SOCIETE_DISABLE_CUSTOMERS_STATS)) {
 		$dataseries[] = array($langs->trans("Customers"), round($third['customer']));
 	}
 	if (((isModEnabled('fournisseur') && $user->rights->fournisseur->facture->lire && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD)) || (isModEnabled('supplier_order') && $user->rights->supplier_order->lire) || (isModEnabled('supplier_invoice') && $user->rights->supplier_invoice->lire)) && empty($conf->global->SOCIETE_DISABLE_SUPPLIERS_STATS)) {
@@ -173,12 +173,12 @@ if (!empty($conf->use_javascript_ajax) && ((round($third['prospect']) ? 1 : 0) +
 	$thirdpartygraph .= $dolgraph->show();
 	$thirdpartygraph .= '</td></tr>'."\n";
 } else {
-	if (isModEnabled('societe') && $user->rights->societe->lire && empty($conf->global->SOCIETE_DISABLE_PROSPECTS) && empty($conf->global->SOCIETE_DISABLE_PROSPECTS_STATS)) {
+	if (isModEnabled('societe') && $user->hasRight('societe', 'lire') && empty($conf->global->SOCIETE_DISABLE_PROSPECTS) && empty($conf->global->SOCIETE_DISABLE_PROSPECTS_STATS)) {
 		$statstring = "<tr>";
 		$statstring .= '<td><a href="'.DOL_URL_ROOT.'/societe/list.php?type=p">'.$langs->trans("Prospects").'</a></td><td class="right">'.round($third['prospect']).'</td>';
 		$statstring .= "</tr>";
 	}
-	if (isModEnabled('societe') && $user->rights->societe->lire && empty($conf->global->SOCIETE_DISABLE_CUSTOMERS) && empty($conf->global->SOCIETE_DISABLE_CUSTOMERS_STATS)) {
+	if (isModEnabled('societe') && $user->hasRight('societe', 'lire') && empty($conf->global->SOCIETE_DISABLE_CUSTOMERS) && empty($conf->global->SOCIETE_DISABLE_CUSTOMERS_STATS)) {
 		$statstring .= "<tr>";
 		$statstring .= '<td><a href="'.DOL_URL_ROOT.'/societe/list.php?type=c">'.$langs->trans("Customers").'</a></td><td class="right">'.round($third['customer']).'</td>';
 		$statstring .= "</tr>";
diff --git a/htdocs/societe/list.php b/htdocs/societe/list.php
index ff6de888284..6ebd9e3336d 100644
--- a/htdocs/societe/list.php
+++ b/htdocs/societe/list.php
@@ -383,7 +383,7 @@ if (empty($reshook)) {
 	// Mass actions
 	$objectclass = 'Societe';
 	$objectlabel = 'ThirdParty';
-	$permissiontoread = $user->rights->societe->lire;
+	$permissiontoread = $user->hasRight('societe', 'lire');
 	$permissiontodelete = $user->rights->societe->supprimer;
 	$permissiontoadd = $user->rights->societe->creer;
 	$uploaddir = $conf->societe->dir_output;
diff --git a/htdocs/societe/paymentmodes.php b/htdocs/societe/paymentmodes.php
index 30b19e59d8b..fe5654a0d06 100644
--- a/htdocs/societe/paymentmodes.php
+++ b/htdocs/societe/paymentmodes.php
@@ -79,7 +79,7 @@ $extrafields->fetch_name_optionals_label($object->table_element);
 $hookmanager->initHooks(array('thirdpartybancard', 'globalcard'));
 
 // Permissions
-$permissiontoread = $user->rights->societe->lire;
+$permissiontoread = $user->hasRight('societe', 'lire');
 $permissiontoadd = $user->rights->societe->creer; // Used by the include of actions_addupdatedelete.inc.php and actions_builddoc.inc.php
 
 $permissiontoaddupdatepaymentinformation = ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && $permissiontoadd) || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->societe->thirdparty_paymentinformation_advance->write)));
diff --git a/htdocs/societe/website.php b/htdocs/societe/website.php
index 8de63dfeffc..17ebb6d7988 100644
--- a/htdocs/societe/website.php
+++ b/htdocs/societe/website.php
@@ -161,7 +161,7 @@ if (empty($reshook)) {
 	// Mass actions
 	$objectclass = 'WebsiteAccount';
 	$objectlabel = 'WebsiteAccount';
-	$permissiontoread = $user->rights->societe->lire;
+	$permissiontoread = $user->hasRight('societe', 'lire');
 	$permissiontodelete = $user->rights->societe->supprimer;
 	$uploaddir = $conf->societe->multidir_output[$object->entity];
 	include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php';

From 1485e3bd7934ade1ad4629f12fa6967f21a3f35d Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Sat, 10 Sep 2022 11:10:33 +0200
Subject: [PATCH 862/974] update code toward php8 compliance

---
 .../societe/canvas/company/tpl/card_view.tpl.php |  2 +-
 .../canvas/individual/tpl/card_view.tpl.php      |  2 +-
 htdocs/societe/class/api_thirdparties.class.php  | 16 ++++++++--------
 htdocs/ticket/list.php                           |  2 +-
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/htdocs/societe/canvas/company/tpl/card_view.tpl.php b/htdocs/societe/canvas/company/tpl/card_view.tpl.php
index d1ba18f82fd..48fd3374322 100644
--- a/htdocs/societe/canvas/company/tpl/card_view.tpl.php
+++ b/htdocs/societe/canvas/company/tpl/card_view.tpl.php
@@ -283,7 +283,7 @@ for ($i = 1; $i <= 4; $i++) {
  */
 $filedir = $conf->societe->multidir_output[$this->control->tpl['entity']].'/'.$socid;
 $urlsource = $_SERVER["PHP_SELF"]."?socid=".$socid;
-$genallowed = $user->rights->societe->lire;
+$genallowed = $user->hasRight('societe', 'lire');
 $delallowed = $user->rights->societe->creer;
 
 print $formfile->showdocuments('company', $socid, $filedir, $urlsource, $genallowed, $delallowed, '', 0, 0, 0, 28, 0, '', 0, '', $objcanvas->control->object->default_lang);
diff --git a/htdocs/societe/canvas/individual/tpl/card_view.tpl.php b/htdocs/societe/canvas/individual/tpl/card_view.tpl.php
index 98979c917d4..5ae12a3c501 100644
--- a/htdocs/societe/canvas/individual/tpl/card_view.tpl.php
+++ b/htdocs/societe/canvas/individual/tpl/card_view.tpl.php
@@ -209,7 +209,7 @@ if ($this->control->tpl['action_delete']) {
  */
 $filedir = $conf->societe->multidir_output[$this->control->tpl['entity']].'/'.$socid;
 $urlsource = $_SERVER["PHP_SELF"]."?socid=".$socid;
-$genallowed = $user->rights->societe->lire;
+$genallowed = $user->hasRight('societe', 'lire');
 $delallowed = $user->rights->societe->creer;
 
 print $formfile->showdocuments('company', $socid, $filedir, $urlsource, $genallowed, $delallowed, '', 0, 0, 0, 28, 0, '', 0, '', $objcanvas->control->object->default_lang);
diff --git a/htdocs/societe/class/api_thirdparties.class.php b/htdocs/societe/class/api_thirdparties.class.php
index f197a1b7024..db85884c68d 100644
--- a/htdocs/societe/class/api_thirdparties.class.php
+++ b/htdocs/societe/class/api_thirdparties.class.php
@@ -132,7 +132,7 @@ class Thirdparties extends DolibarrApi
 	{
 		$obj_ret = array();
 
-		if (!DolibarrApiAccess::$user->rights->societe->lire) {
+		if (!DolibarrApiAccess::$user->hasRight('societe', 'lire')) {
 			throw new RestException(401);
 		}
 
@@ -848,7 +848,7 @@ class Thirdparties extends DolibarrApi
 	 */
 	public function getOutStandingProposals($id, $mode = 'customer')
 	{
-		if (!DolibarrApiAccess::$user->rights->societe->lire) {
+		if (!DolibarrApiAccess::$user->hasRight('societe', 'lire')) {
 			throw new RestException(401);
 		}
 
@@ -890,7 +890,7 @@ class Thirdparties extends DolibarrApi
 	 */
 	public function getOutStandingOrder($id, $mode = 'customer')
 	{
-		if (!DolibarrApiAccess::$user->rights->societe->lire) {
+		if (!DolibarrApiAccess::$user->hasRight('societe', 'lire')) {
 			throw new RestException(401);
 		}
 
@@ -931,7 +931,7 @@ class Thirdparties extends DolibarrApi
 	 */
 	public function getOutStandingInvoices($id, $mode = 'customer')
 	{
-		if (!DolibarrApiAccess::$user->rights->societe->lire) {
+		if (!DolibarrApiAccess::$user->hasRight('societe', 'lire')) {
 			throw new RestException(401);
 		}
 
@@ -972,7 +972,7 @@ class Thirdparties extends DolibarrApi
 	 */
 	public function getSalesRepresentatives($id, $mode = 0)
 	{
-		if (!DolibarrApiAccess::$user->rights->societe->lire) {
+		if (!DolibarrApiAccess::$user->hasRight('societe', 'lire')) {
 			throw new RestException(401);
 		}
 
@@ -1015,7 +1015,7 @@ class Thirdparties extends DolibarrApi
 	{
 		$obj_ret = array();
 
-		if (!DolibarrApiAccess::$user->rights->societe->lire) {
+		if (!DolibarrApiAccess::$user->hasRight('societe', 'lire')) {
 			throw new RestException(401);
 		}
 
@@ -1439,7 +1439,7 @@ class Thirdparties extends DolibarrApi
 	 */
 	public function getSocieteAccounts($id, $site = null)
 	{
-		if (!DolibarrApiAccess::$user->rights->societe->lire) {
+		if (!DolibarrApiAccess::$user->hasRight('societe', 'lire')) {
 			throw new RestException(401);
 		}
 
@@ -1870,7 +1870,7 @@ class Thirdparties extends DolibarrApi
 	{
 		global $conf;
 
-		if (!DolibarrApiAccess::$user->rights->societe->lire) {
+		if (!DolibarrApiAccess::$user->hasRight('societe', 'lire')) {
 			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login.'. No read permission on thirdparties.');
 		}
 
diff --git a/htdocs/ticket/list.php b/htdocs/ticket/list.php
index 80656681015..0551532b00f 100644
--- a/htdocs/ticket/list.php
+++ b/htdocs/ticket/list.php
@@ -491,7 +491,7 @@ if ($num == 1 && !empty($conf->global->MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE) && $
 
 llxHeader('', $title, $help_url, '', 0, 0, $morejs, $morecss, '', '');
 
-if ($socid && !$projectid && !$project_ref && $user->rights->societe->lire) {
+if ($socid && !$projectid && !$project_ref && $user->hasRight('societe', 'lire')) {
 	$socstat = new Societe($db);
 	$res = $socstat->fetch($socid);
 	if ($res > 0) {

From a2b8dd446b79f69f8d67b72ead644c3f1a8caf91 Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Sat, 10 Sep 2022 11:13:02 +0200
Subject: [PATCH 863/974] update code toward php8 compliance

---
 htdocs/admin/mails_templates.php | 2 +-
 htdocs/barcode/printsheet.php    | 2 +-
 htdocs/core/lib/agenda.lib.php   | 2 +-
 htdocs/core/lib/company.lib.php  | 2 +-
 htdocs/societe/website.php       | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/htdocs/admin/mails_templates.php b/htdocs/admin/mails_templates.php
index 3d8d7f3db4f..86f8752d91f 100644
--- a/htdocs/admin/mails_templates.php
+++ b/htdocs/admin/mails_templates.php
@@ -186,7 +186,7 @@ if (isModEnabled('adherent') && !empty($user->rights->adherent->lire)) {
 if (isModEnabled('recruitment') && !empty($user->rights->recruitment->recruitmentjobposition->read)) {
 	$elementList['recruitmentcandidature_send'] = img_picto('', 'recruitmentcandidature', 'class="pictofixedwidth"').dol_escape_htmltag($langs->trans('RecruitmentCandidatures'));
 }
-if (isModEnabled("societe") && !empty($user->rights->societe->lire)) {
+if (isModEnabled("societe") && $user->hasRight('societe', 'lire')) {
 	$elementList['thirdparty'] = img_picto('', 'company', 'class="pictofixedwidth"').dol_escape_htmltag($langs->trans('MailToThirdparty'));
 }
 if (isModEnabled('project')) {
diff --git a/htdocs/barcode/printsheet.php b/htdocs/barcode/printsheet.php
index 96caac1dbb4..373effecbe8 100644
--- a/htdocs/barcode/printsheet.php
+++ b/htdocs/barcode/printsheet.php
@@ -397,7 +397,7 @@ if (!empty($user->rights->produit->lire) || !empty($user->rights->service->lire)
 	print '</div>';
 }
 
-if (!empty($user->rights->societe->lire)) {
+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">';
diff --git a/htdocs/core/lib/agenda.lib.php b/htdocs/core/lib/agenda.lib.php
index 96bd34143c7..cb5a7f41f8f 100644
--- a/htdocs/core/lib/agenda.lib.php
+++ b/htdocs/core/lib/agenda.lib.php
@@ -104,7 +104,7 @@ function print_actions_filter($form, $canedit, $status, $year, $month, $day, $sh
 		}
 	}
 
-	if (isModEnabled('societe') && !empty($user->rights->societe->lire)) {
+	if (isModEnabled('societe') && $user->hasRight('societe', 'lire')) {
 		print '<div class="divsearchfield">';
 		print img_picto($langs->trans("ThirdParty"), 'company', 'class="pictofixedwidth inline-block"');
 		print $form->select_company($socid, 'search_socid', '', '&nbsp;', 0, 0, null, 0, 'minwidth100 maxwidth500');
diff --git a/htdocs/core/lib/company.lib.php b/htdocs/core/lib/company.lib.php
index 9cadb431ec5..b4ae935677b 100644
--- a/htdocs/core/lib/company.lib.php
+++ b/htdocs/core/lib/company.lib.php
@@ -242,7 +242,7 @@ function societe_prepare_head(Societe $object)
 		$h++;
 	}
 
-	if (isModEnabled('website') && (!empty($conf->global->WEBSITE_USE_WEBSITE_ACCOUNTS)) && (!empty($user->rights->societe->lire))) {
+	if (isModEnabled('website') && (!empty($conf->global->WEBSITE_USE_WEBSITE_ACCOUNTS)) && ($user->hasRight('societe', 'lire'))) {
 		$head[$h][0] = DOL_URL_ROOT.'/societe/website.php?id='.urlencode($object->id);
 		$head[$h][1] = $langs->trans("WebSiteAccounts");
 		$nbNote = 0;
diff --git a/htdocs/societe/website.php b/htdocs/societe/website.php
index 17ebb6d7988..5dc25da93a5 100644
--- a/htdocs/societe/website.php
+++ b/htdocs/societe/website.php
@@ -250,7 +250,7 @@ print dol_get_fiche_end();
 
 $newcardbutton = '';
 if (isModEnabled('website')) {
-	if (!empty($user->rights->societe->lire)) {
+	if ($user->hasRight('societe', 'lire')) {
 		$newcardbutton .= dolGetButtonTitle($langs->trans("AddWebsiteAccount"), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/website/websiteaccount_card.php?action=create&fk_soc='.$object->id.'&backtopage='.urlencode($_SERVER["PHP_SELF"].'?id='.$object->id));
 	} else {
 		$newcardbutton .= dolGetButtonTitle($langs->trans("AddAction"), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/website/websiteaccount_card.php?action=create&fk_soc='.$object->id.'&backtopage='.urlencode($_SERVER["PHP_SELF"].'?id='.$object->id), '', 0);

From c8a70ba221d922c9e52c00bc11441551349ccac2 Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Sat, 10 Sep 2022 11:14:25 +0200
Subject: [PATCH 864/974] update code toward php8 compliance

---
 htdocs/comm/card.php                              | 2 +-
 htdocs/core/class/html.formcontract.class.php     | 2 +-
 htdocs/core/class/html.formintervention.class.php | 2 +-
 htdocs/core/class/html.formprojet.class.php       | 2 +-
 htdocs/core/lib/security.lib.php                  | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/htdocs/comm/card.php b/htdocs/comm/card.php
index 67df6af0298..1eca4555e91 100644
--- a/htdocs/comm/card.php
+++ b/htdocs/comm/card.php
@@ -131,7 +131,7 @@ if ($id > 0 && empty($object->id)) {
 	}
 }
 if ($object->id > 0) {
-	if (!($object->client > 0) || empty($user->rights->societe->lire)) {
+	if (!($object->client > 0) || !$user->hasRight('societe', 'lire')) {
 		accessforbidden();
 	}
 }
diff --git a/htdocs/core/class/html.formcontract.class.php b/htdocs/core/class/html.formcontract.class.php
index 6267c6ff390..c763bc1a04e 100644
--- a/htdocs/core/class/html.formcontract.class.php
+++ b/htdocs/core/class/html.formcontract.class.php
@@ -104,7 +104,7 @@ class FormContract
 				while ($i < $num) {
 					$obj = $this->db->fetch_object($resql);
 					// If we ask to filter on a company and user has no permission to see all companies and project is linked to another company, we hide project.
-					if ($socid > 0 && (empty($obj->fk_soc) || $obj->fk_soc == $socid) && empty($user->rights->societe->lire)) {
+					if ($socid > 0 && (empty($obj->fk_soc) || $obj->fk_soc == $socid) && !$user->hasRight('societe', 'lire')) {
 						// Do nothing
 					} else {
 						$labeltoshow = dol_trunc($obj->ref, 18);
diff --git a/htdocs/core/class/html.formintervention.class.php b/htdocs/core/class/html.formintervention.class.php
index 107e9ba378a..751e77eafe1 100644
--- a/htdocs/core/class/html.formintervention.class.php
+++ b/htdocs/core/class/html.formintervention.class.php
@@ -99,7 +99,7 @@ class FormIntervention
 				while ($i < $num) {
 					$obj = $this->db->fetch_object($resql);
 					// If we ask to filter on a company and user has no permission to see all companies and project is linked to another company, we hide project.
-					if ($socid > 0 && (empty($obj->fk_soc) || $obj->fk_soc == $socid) && empty($user->rights->societe->lire)) {
+					if ($socid > 0 && (empty($obj->fk_soc) || $obj->fk_soc == $socid) && !$user->hasRight('societe', 'lire')) {
 						// Do nothing
 					} else {
 						$labeltoshow = dol_trunc($obj->ref, 18);
diff --git a/htdocs/core/class/html.formprojet.class.php b/htdocs/core/class/html.formprojet.class.php
index 4d34211ed17..d4c3b1aa21f 100644
--- a/htdocs/core/class/html.formprojet.class.php
+++ b/htdocs/core/class/html.formprojet.class.php
@@ -206,7 +206,7 @@ class FormProjets
 				while ($i < $num) {
 					$obj = $this->db->fetch_object($resql);
 					// If we ask to filter on a company and user has no permission to see all companies and project is linked to another company, we hide project.
-					if ($socid > 0 && (empty($obj->fk_soc) || $obj->fk_soc == $socid) && empty($user->rights->societe->lire)) {
+					if ($socid > 0 && (empty($obj->fk_soc) || $obj->fk_soc == $socid) && !$user->hasRight('societe', 'lire')) {
 						// Do nothing
 					} else {
 						if ($discard_closed == 1 && $obj->fk_statut == 2 && $obj->rowid != $selected) { // We discard closed except if selected
diff --git a/htdocs/core/lib/security.lib.php b/htdocs/core/lib/security.lib.php
index f4f1d1be5cd..1c0d7d1aab1 100644
--- a/htdocs/core/lib/security.lib.php
+++ b/htdocs/core/lib/security.lib.php
@@ -421,7 +421,7 @@ function restrictedArea(User $user, $features, $objectid = 0, $tableandshare = '
 		}
 
 		if ($feature == 'societe') {
-			if (empty($user->rights->societe->lire) && empty($user->rights->fournisseur->lire)) {
+			if (!$user->hasRight('societe', 'lire') && empty($user->rights->fournisseur->lire)) {
 				$readok = 0;
 				$nbko++;
 			}

From 236b86bdd3f0a968e8f3d88560212576c7178b76 Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Sat, 10 Sep 2022 11:18:31 +0200
Subject: [PATCH 865/974] update code toward php8 compliance

---
 htdocs/accountancy/bookkeeping/listbyaccount.php | 2 +-
 htdocs/contact/list.php                          | 4 ++--
 htdocs/societe/card.php                          | 6 +++---
 htdocs/societe/list.php                          | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/htdocs/accountancy/bookkeeping/listbyaccount.php b/htdocs/accountancy/bookkeeping/listbyaccount.php
index 786c3914b92..e417f21832c 100644
--- a/htdocs/accountancy/bookkeeping/listbyaccount.php
+++ b/htdocs/accountancy/bookkeeping/listbyaccount.php
@@ -396,7 +396,7 @@ if (empty($reshook)) {
 	$objectclass = 'Bookkeeping';
 	$objectlabel = 'Bookkeeping';
 	$permissiontoread = $user->hasRight('societe', 'lire');
-	$permissiontodelete = $user->rights->societe->supprimer;
+	$permissiontodelete = $user->hasRight('societe', 'supprimer');
 	$permissiontoadd = $user->rights->societe->creer;
 	$uploaddir = $conf->societe->dir_output;
 	include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php';
diff --git a/htdocs/contact/list.php b/htdocs/contact/list.php
index c2b0120790b..387fc2c06e6 100644
--- a/htdocs/contact/list.php
+++ b/htdocs/contact/list.php
@@ -313,7 +313,7 @@ if (empty($reshook)) {
 	$objectclass = 'Contact';
 	$objectlabel = 'Contact';
 	$permissiontoread = $user->hasRight('societe', 'lire');
-	$permissiontodelete = $user->rights->societe->supprimer;
+	$permissiontodelete = $user->hasRight('societe', 'supprimer');
 	$permissiontoadd = $user->rights->societe->creer;
 	$uploaddir = $conf->societe->dir_output;
 	include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php';
@@ -690,7 +690,7 @@ $arrayofmassactions = array(
 //    'builddoc'=>img_picto('', 'pdf', 'class="pictofixedwidth"').$langs->trans("PDFMerge"),
 );
 //if($user->rights->societe->creer) $arrayofmassactions['createbills']=$langs->trans("CreateInvoiceForThisCustomer");
-if ($user->rights->societe->supprimer) {
+if ($user->hasRight('societe', 'supprimer')) {
 	$arrayofmassactions['predelete'] = img_picto('', 'delete', 'class="pictofixedwidth"').$langs->trans("Delete");
 }
 if ($user->rights->societe->creer) {
diff --git a/htdocs/societe/card.php b/htdocs/societe/card.php
index ab3ce495872..4b612df0c00 100644
--- a/htdocs/societe/card.php
+++ b/htdocs/societe/card.php
@@ -139,7 +139,7 @@ if (!empty($canvas)) {
 // Permissions
 $permissiontoread 	= $user->hasRight('societe', 'lire');
 $permissiontoadd 	= $user->rights->societe->creer; // Used by the include of actions_addupdatedelete.inc.php and actions_lineupdown.inc.php
-$permissiontodelete = $user->rights->societe->supprimer || ($permissiontoadd && isset($object->status) && $object->status == 0);
+$permissiontodelete = $user->hasRight('societe', 'supprimer') || ($permissiontoadd && isset($object->status) && $object->status == 0);
 $permissionnote 	= $user->rights->societe->creer; // Used by the include of actions_setnotes.inc.php
 $permissiondellink 	= $user->rights->societe->creer; // Used by the include of actions_dellink.inc.php
 $upload_dir 		= $conf->societe->multidir_output[isset($object->entity) ? $object->entity : 1];
@@ -914,7 +914,7 @@ if (empty($reshook)) {
 	}
 
 	// Delete third party
-	if ($action == 'confirm_delete' && $confirm == 'yes' && $user->rights->societe->supprimer) {
+	if ($action == 'confirm_delete' && $confirm == 'yes' && $user->hasRight('societe', 'supprimer')) {
 		$object->fetch($socid);
 		$object->oldcopy = clone $object;
 		$result = $object->delete($socid, $user);
@@ -3247,7 +3247,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 
 				print dolGetButtonAction($langs->trans('MergeThirdparties'), $langs->trans('Merge'), 'danger', $_SERVER["PHP_SELF"].'?socid='.$object->id.'&action=merge&token='.newToken(), '', $permissiontodelete);
 
-				if ($user->rights->societe->supprimer) {
+				if ($user->hasRight('societe', 'supprimer')) {
 					$deleteUrl = $_SERVER["PHP_SELF"].'?socid='.$object->id.'&action=delete&token='.newToken();
 					$buttonId = 'action-delete-no-ajax';
 					if ($conf->use_javascript_ajax && empty($conf->dol_use_jmobile)) {	// We can't use preloaded confirm form with jmobile
diff --git a/htdocs/societe/list.php b/htdocs/societe/list.php
index 6ebd9e3336d..680ab8aff82 100644
--- a/htdocs/societe/list.php
+++ b/htdocs/societe/list.php
@@ -384,7 +384,7 @@ if (empty($reshook)) {
 	$objectclass = 'Societe';
 	$objectlabel = 'ThirdParty';
 	$permissiontoread = $user->hasRight('societe', 'lire');
-	$permissiontodelete = $user->rights->societe->supprimer;
+	$permissiontodelete = $user->hasRight('societe', 'supprimer');
 	$permissiontoadd = $user->rights->societe->creer;
 	$uploaddir = $conf->societe->dir_output;
 	include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php';
@@ -898,7 +898,7 @@ if ($user->rights->societe->creer) {
 if (GETPOST('nomassaction', 'int') || in_array($massaction, array('presend', 'predelete', 'preaffecttag', 'preenable', 'preclose'))) {
 	$arrayofmassactions = array();
 }
-if ($user->rights->societe->supprimer) {
+if ($user->hasRight('societe', 'supprimer')) {
 	$arrayofmassactions['predelete'] = img_picto('', 'delete', 'class="pictofixedwidth"').$langs->trans("Delete");
 }
 $massactionbutton = $form->selectMassAction('', $arrayofmassactions);

From 1b5465d7d0bc76747a906b91d67e623b1b12137d Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Sat, 10 Sep 2022 11:19:54 +0200
Subject: [PATCH 866/974] update code toward php8 compliance

---
 htdocs/accountancy/bookkeeping/list.php                | 2 +-
 htdocs/societe/canvas/company/tpl/card_view.tpl.php    | 2 +-
 htdocs/societe/canvas/individual/tpl/card_view.tpl.php | 2 +-
 htdocs/societe/class/api_thirdparties.class.php        | 2 +-
 htdocs/societe/website.php                             | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/htdocs/accountancy/bookkeeping/list.php b/htdocs/accountancy/bookkeeping/list.php
index 36d268a06cf..71e80f703af 100644
--- a/htdocs/accountancy/bookkeeping/list.php
+++ b/htdocs/accountancy/bookkeeping/list.php
@@ -481,7 +481,7 @@ if (empty($reshook)) {
 	$objectclass = 'Bookkeeping';
 	$objectlabel = 'Bookkeeping';
 	$permissiontoread = $user->hasRight('societe', 'lire');
-	$permissiontodelete = $user->rights->societe->supprimer;
+	$permissiontodelete = $user->hasRight('societe', 'supprimer');
 	$permissiontoadd = $user->rights->societe->creer;
 	$uploaddir = $conf->societe->dir_output;
 	include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php';
diff --git a/htdocs/societe/canvas/company/tpl/card_view.tpl.php b/htdocs/societe/canvas/company/tpl/card_view.tpl.php
index 48fd3374322..fb9a38ed442 100644
--- a/htdocs/societe/canvas/company/tpl/card_view.tpl.php
+++ b/htdocs/societe/canvas/company/tpl/card_view.tpl.php
@@ -263,7 +263,7 @@ for ($i = 1; $i <= 4; $i++) {
 <a class="butAction" href="<?php echo $_SERVER["PHP_SELF"].'?socid='.$this->control->tpl['id'].'&action=edit&token='.newToken().'&canvas='.urlencode($canvas); ?>"><?php echo $langs->trans("Modify"); ?></a>
 <?php } ?>
 
-<?php if ($user->rights->societe->supprimer) { ?>
+<?php if ($user->hasRight('societe', 'supprimer')) { ?>
 	<?php if ($conf->use_javascript_ajax) { ?>
 		<span id="action-delete" class="butActionDelete"><?php echo $langs->trans('Delete'); ?></span>
 	<?php } else { ?>
diff --git a/htdocs/societe/canvas/individual/tpl/card_view.tpl.php b/htdocs/societe/canvas/individual/tpl/card_view.tpl.php
index 5ae12a3c501..369ef413fc1 100644
--- a/htdocs/societe/canvas/individual/tpl/card_view.tpl.php
+++ b/htdocs/societe/canvas/individual/tpl/card_view.tpl.php
@@ -190,7 +190,7 @@ if ($this->control->tpl['action_delete']) {
 <a class="butAction" href="<?php echo $_SERVER["PHP_SELF"].'?socid='.$this->control->tpl['id'].'&action=edit&token='.newToken().'&canvas='.urlencode($canvas); ?>"><?php echo $langs->trans("Modify"); ?></a>
 <?php } ?>
 
-<?php if ($user->rights->societe->supprimer) { ?>
+<?php if ($user->hasRight('societe', 'supprimer')) { ?>
 	<?php if ($conf->use_javascript_ajax) { ?>
 		<span id="action-delete" class="butActionDelete"><?php echo $langs->trans('Delete'); ?></span>
 	<?php } else { ?>
diff --git a/htdocs/societe/class/api_thirdparties.class.php b/htdocs/societe/class/api_thirdparties.class.php
index db85884c68d..7fe72779c6c 100644
--- a/htdocs/societe/class/api_thirdparties.class.php
+++ b/htdocs/societe/class/api_thirdparties.class.php
@@ -527,7 +527,7 @@ class Thirdparties extends DolibarrApi
 	 */
 	public function delete($id)
 	{
-		if (!DolibarrApiAccess::$user->rights->societe->supprimer) {
+		if (!DolibarrApiAccess::$user->hasRight('societe', 'supprimer')) {
 			throw new RestException(401);
 		}
 		$result = $this->company->fetch($id);
diff --git a/htdocs/societe/website.php b/htdocs/societe/website.php
index 5dc25da93a5..9ca58ab0bf4 100644
--- a/htdocs/societe/website.php
+++ b/htdocs/societe/website.php
@@ -162,7 +162,7 @@ if (empty($reshook)) {
 	$objectclass = 'WebsiteAccount';
 	$objectlabel = 'WebsiteAccount';
 	$permissiontoread = $user->hasRight('societe', 'lire');
-	$permissiontodelete = $user->rights->societe->supprimer;
+	$permissiontodelete = $user->hasRight('societe', 'supprimer');
 	$uploaddir = $conf->societe->multidir_output[$object->entity];
 	include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php';
 }

From 740d2b418db9c88214cbd6afd3032bf00ddfc3e2 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 10 Sep 2022 13:31:20 +0200
Subject: [PATCH 867/974] Can modify creation date

---
 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 f95eb6682e3..9237a752d99 100644
--- a/htdocs/recruitment/class/recruitmentjobposition.class.php
+++ b/htdocs/recruitment/class/recruitmentjobposition.class.php
@@ -115,7 +115,7 @@ class RecruitmentJobPosition extends CommonObject
 		'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'=>-2,),
+		'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,),

From f6d2033a242feb7c30be12bdb3fe03087901e540 Mon Sep 17 00:00:00 2001
From: ptibogxiv <support@ptibogxiv.net>
Date: Sat, 10 Sep 2022 15:00:34 +0200
Subject: [PATCH 868/974] Fix php / token error

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

diff --git a/htdocs/recruitment/recruitmentcandidature_card.php b/htdocs/recruitment/recruitmentcandidature_card.php
index 0d2cc848aaa..f06fc476883 100644
--- a/htdocs/recruitment/recruitmentcandidature_card.php
+++ b/htdocs/recruitment/recruitmentcandidature_card.php
@@ -574,7 +574,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 			// Contract refused / accepted
 			if ($object->status == $object::STATUS_CONTRACT_PROPOSED) {
 				if ($permissiontoadd) {
-					print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&action=closeas">'.$langs->trans("Accept").' / '.$langs->trans("Decline").'</a>';
+					print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&action=closeas&token='.newToken().'">'.$langs->trans("Accept").' / '.$langs->trans("Decline").'</a>';
 				}
 			}
 

From 4c74687c1032946fe88f68b2197b1365438a9ae6 Mon Sep 17 00:00:00 2001
From: ptibogxiv <support@ptibogxiv.net>
Date: Sat, 10 Sep 2022 15:01:36 +0200
Subject: [PATCH 869/974] Update recruitmentjobposition_card.php

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

diff --git a/htdocs/recruitment/recruitmentjobposition_card.php b/htdocs/recruitment/recruitmentjobposition_card.php
index b2172aca80d..44a65e90271 100644
--- a/htdocs/recruitment/recruitmentjobposition_card.php
+++ b/htdocs/recruitment/recruitmentjobposition_card.php
@@ -446,7 +446,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 			// Close as recruited/canceled
 			if ($object->status == $object::STATUS_VALIDATED) {
 				if ($usercanclose) {
-					print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=closeas'.(empty($conf->global->MAIN_JUMP_TAG) ? '' : '#close').'"';
+					print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=closeas&token='.newToken()'.(empty($conf->global->MAIN_JUMP_TAG) ? '' : '#close').'"';
 					print '>'.$langs->trans('Close').'</a>';
 				} else {
 					print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NotEnoughPermissions")).'">'.$langs->trans('Close').'</a>';

From 4f45c89ecb53252e3e29f51461546193769c2028 Mon Sep 17 00:00:00 2001
From: stickler-ci <support@stickler-ci.com>
Date: Sat, 10 Sep 2022 13:02:21 +0000
Subject: [PATCH 870/974] Fixing style errors.

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

diff --git a/htdocs/recruitment/recruitmentjobposition_card.php b/htdocs/recruitment/recruitmentjobposition_card.php
index 44a65e90271..a20d631e3f2 100644
--- a/htdocs/recruitment/recruitmentjobposition_card.php
+++ b/htdocs/recruitment/recruitmentjobposition_card.php
@@ -446,7 +446,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 			// Close as recruited/canceled
 			if ($object->status == $object::STATUS_VALIDATED) {
 				if ($usercanclose) {
-					print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=closeas&token='.newToken()'.(empty($conf->global->MAIN_JUMP_TAG) ? '' : '#close').'"';
+					print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=closeas&token='.newToken()'.(empty($conf->global->MAIN_JUMP_TAG) ? '' : '// close').'"';
 					print '>'.$langs->trans('Close').'</a>';
 				} else {
 					print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NotEnoughPermissions")).'">'.$langs->trans('Close').'</a>';

From 4ec58d76544989c6f3cc77e7139cc4ec529a70dc Mon Sep 17 00:00:00 2001
From: ptibogxiv <support@ptibogxiv.net>
Date: Sat, 10 Sep 2022 15:20:31 +0200
Subject: [PATCH 871/974] Update recruitmentjobposition_card.php

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

diff --git a/htdocs/recruitment/recruitmentjobposition_card.php b/htdocs/recruitment/recruitmentjobposition_card.php
index a20d631e3f2..85100f992bd 100644
--- a/htdocs/recruitment/recruitmentjobposition_card.php
+++ b/htdocs/recruitment/recruitmentjobposition_card.php
@@ -446,7 +446,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 			// Close as recruited/canceled
 			if ($object->status == $object::STATUS_VALIDATED) {
 				if ($usercanclose) {
-					print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=closeas&token='.newToken()'.(empty($conf->global->MAIN_JUMP_TAG) ? '' : '// close').'"';
+					print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=closeas&token='.newToken().(empty($conf->global->MAIN_JUMP_TAG) ? '' : '// close').'"';
 					print '>'.$langs->trans('Close').'</a>';
 				} else {
 					print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NotEnoughPermissions")).'">'.$langs->trans('Close').'</a>';

From 439bef8e0e753b62be5d990e858105b7ee2d331f Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 10 Sep 2022 15:55:36 +0200
Subject: [PATCH 872/974] NEW Add substitution key __SENDEREMAIL_SIGNATURE__

---
 htdocs/admin/defaultvalues.php            |  1 +
 htdocs/admin/mails.php                    |  1 +
 htdocs/admin/mails_emailing.php           |  1 +
 htdocs/admin/mails_senderprofile_list.php | 14 +++++---
 htdocs/admin/mails_ticket.php             |  1 +
 htdocs/comm/mailing/card.php              |  1 +
 htdocs/contrat/card.php                   | 10 +++---
 htdocs/core/class/html.formmail.class.php | 21 +++++-------
 htdocs/core/lib/functions.lib.php         | 11 ++++---
 htdocs/core/tpl/card_presend.tpl.php      | 40 ++++++++++++++++++++++-
 10 files changed, 75 insertions(+), 26 deletions(-)

diff --git a/htdocs/admin/defaultvalues.php b/htdocs/admin/defaultvalues.php
index ed8936ee3ee..6903571d394 100644
--- a/htdocs/admin/defaultvalues.php
+++ b/htdocs/admin/defaultvalues.php
@@ -295,6 +295,7 @@ if ($mode != 'focus' && $mode != 'mandatory') {
 	if ($mode != 'sortorder') {
 		$substitutionarray = getCommonSubstitutionArray($langs, 2, array('object', 'objectamount')); // Must match list into GETPOST
 		unset($substitutionarray['__USER_SIGNATURE__']);
+		unset($substitutionarray['__SENDEREMAIL_SIGNATURE__']);
 		$texthelp = $langs->trans("FollowingConstantsWillBeSubstituted").'<br>';
 		foreach ($substitutionarray as $key => $val) {
 			$texthelp .= $key.' -> '.$val.'<br>';
diff --git a/htdocs/admin/mails.php b/htdocs/admin/mails.php
index 208c81c794f..ff24a708797 100644
--- a/htdocs/admin/mails.php
+++ b/htdocs/admin/mails.php
@@ -51,6 +51,7 @@ $substitutionarrayfortest = array(
 	'__USER_LOGIN__' => $user->login,
 	'__USER_EMAIL__' => $user->email,
 	'__USER_SIGNATURE__' => (($user->signature && empty($conf->global->MAIN_MAIL_DO_NOT_USE_SIGN)) ? $usersignature : ''), // Done into actions_sendmails
+	'__SENDEREMAIL_SIGNATURE__' => (($user->signature && empty($conf->global->MAIN_MAIL_DO_NOT_USE_SIGN)) ? $usersignature : ''), // Done into actions_sendmails
 	'__ID__' => 'RecipientIdRecord',
 	//'__EMAIL__' => 'RecipientEMail',				// Done into actions_sendmails
 	'__LASTNAME__' => 'RecipientLastname',
diff --git a/htdocs/admin/mails_emailing.php b/htdocs/admin/mails_emailing.php
index f3a1506a771..d2eabd95e2b 100644
--- a/htdocs/admin/mails_emailing.php
+++ b/htdocs/admin/mails_emailing.php
@@ -50,6 +50,7 @@ $substitutionarrayfortest = array(
 	//'__EMAIL__' => 'RecipientEMail',				// Done into actions_sendmails
 	'__CHECK_READ__' => (!empty($object) && is_object($object) && is_object($object->thirdparty)) ? '<img src="'.DOL_MAIN_URL_ROOT.'/public/emailing/mailing-read.php?tag='.$object->thirdparty->tag.'&securitykey='.urlencode($conf->global->MAILING_EMAIL_UNSUBSCRIBE_KEY).'" width="1" height="1" style="width:1px;height:1px" border="0"/>' : '',
 	'__USER_SIGNATURE__' => (($user->signature && empty($conf->global->MAIN_MAIL_DO_NOT_USE_SIGN)) ? $usersignature : ''), // Done into actions_sendmails
+	'__SENDEREMAIL_SIGNATURE__' => (($user->signature && empty($conf->global->MAIN_MAIL_DO_NOT_USE_SIGN)) ? $usersignature : ''), // Done into actions_sendmails
 	'__LOGIN__' => $user->login,
 	'__LASTNAME__' => 'RecipientLastname',
 	'__FIRSTNAME__' => 'RecipientFirstname',
diff --git a/htdocs/admin/mails_senderprofile_list.php b/htdocs/admin/mails_senderprofile_list.php
index cf83ad2cfbe..95f57d5dfc5 100644
--- a/htdocs/admin/mails_senderprofile_list.php
+++ b/htdocs/admin/mails_senderprofile_list.php
@@ -381,14 +381,17 @@ if ($action != 'create') {
 
 	if ($action == 'edit') {
 		print '<table class="border centpercent tableforfield">';
-		print '<tr><td class="fieldrequired">'.$langs->trans("Label").'</td><td><input type="text" name="label" value="'.(GETPOSTISSET('label') ? GETPOST('label', 'alphanohtml') : $object->label).'"></td></tr>';
-		print '<tr><td>'.$langs->trans("Email").'</td><td><input type="text" name="email" value="'.(GETPOSTISSET('email') ? GETPOST('email', 'alphanohtml') : $object->email).'"></td></tr>';
+		print '<tr><td class="fieldrequired">'.$langs->trans("Label").'</td><td><input type="text" name="label" class="width300" value="'.(GETPOSTISSET('label') ? GETPOST('label', 'alphanohtml') : $object->label).'"></td></tr>';
+		print '<tr><td>'.$langs->trans("Email").'</td><td>';
+		print img_picto('', 'email', 'class="pictofixedwidth"');
+		print '<input type="text" name="email" value="'.(GETPOSTISSET('email') ? GETPOST('email', 'alphanohtml') : $object->email).'"></td></tr>';
 		print '<tr><td>'.$langs->trans("Signature").'</td><td>';
 		require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
 		$doleditor = new DolEditor('signature', (GETPOSTISSET('signature') ? GETPOST('signature', 'restricthtml') : $object->signature), '', 138, 'dolibarr_notes', 'In', true, true, empty($conf->global->FCKEDITOR_ENABLE_USERSIGN) ? 0 : 1, ROWS_4, '90%');
 		print $doleditor->Create(1);
 		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 '</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>';
@@ -410,14 +413,17 @@ if ($action != 'create') {
 	print '<input type="hidden" name="contextpage" value="'.$contextpage.'">';
 	*/
 	print '<table class="border centpercent tableforfield">';
-	print '<tr><td class="fieldrequired">'.$langs->trans("Label").'</td><td><input type="text" name="label" value="'.GETPOST('label', 'alphanohtml').'" autofocus></td></tr>';
-	print '<tr><td class="fieldrequired">'.$langs->trans("Email").'</td><td><input type="text" name="email" value="'.GETPOST('email', 'alphanohtml').'"></td></tr>';
+	print '<tr><td class="fieldrequired">'.$langs->trans("Label").'</td><td><input type="text" name="label" class="width300" value="'.GETPOST('label', 'alphanohtml').'" autofocus></td></tr>';
+	print '<tr><td class="fieldrequired">'.$langs->trans("Email").'</td><td>';
+	print img_picto('', 'email', 'class="pictofixedwidth"');
+	print '<input type="text" name="email" value="'.GETPOST('email', 'alphanohtml').'"></td></tr>';
 	print '<tr><td>'.$langs->trans("Signature").'</td><td>';
 	require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
 	$doleditor = new DolEditor('signature', GETPOST('signature'), '', 138, 'dolibarr_notes', 'In', true, true, empty($conf->global->FCKEDITOR_ENABLE_USERSIGN) ? 0 : 1, ROWS_4, '90%');
 	print $doleditor->Create(1);
 	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 '</td></tr>';
 	print '<tr><td>'.$langs->trans("Position").'</td><td><input type="text" name="position" class="maxwidth50" value="'.GETPOST('position', 'int').'"></td></tr>';
diff --git a/htdocs/admin/mails_ticket.php b/htdocs/admin/mails_ticket.php
index b78b3e43857..c48146fc937 100644
--- a/htdocs/admin/mails_ticket.php
+++ b/htdocs/admin/mails_ticket.php
@@ -47,6 +47,7 @@ $substitutionarrayfortest = array(
 '__LASTNAME__' => 'TESTLastname',
 '__FIRSTNAME__' => 'TESTFirstname',
 '__USER_SIGNATURE__' => (($user->signature && empty($conf->global->MAIN_MAIL_DO_NOT_USE_SIGN)) ? $usersignature : ''),
+'__SENDEREMAIL_SIGNATURE__' => (($user->signature && empty($conf->global->MAIN_MAIL_DO_NOT_USE_SIGN)) ? $usersignature : ''), // Done into actions_sendmails
 //'__PERSONALIZED__' => 'TESTPersonalized'	// Hiden because not used yet
 );
 complete_substitutions_array($substitutionarrayfortest, $langs);
diff --git a/htdocs/comm/mailing/card.php b/htdocs/comm/mailing/card.php
index 633e881030c..81e36c006ca 100644
--- a/htdocs/comm/mailing/card.php
+++ b/htdocs/comm/mailing/card.php
@@ -221,6 +221,7 @@ if (empty($reshook)) {
 						$substitutionarray['__OTHER4__'] = $other4;
 						$substitutionarray['__OTHER5__'] = $other5;
 						$substitutionarray['__USER_SIGNATURE__'] = $signature; // Signature is empty when ran from command line or taken from user in parameter)
+						$substitutionarray['__SENDEREMAIL_SIGNATURE__'] = $signature; // Signature is empty when ran from command line or taken from user in parameter)
 						$substitutionarray['__CHECK_READ__'] = '<img src="'.DOL_MAIN_URL_ROOT.'/public/emailing/mailing-read.php?tag='.urlencode($obj->tag).'&securitykey='.urlencode($conf->global->MAILING_EMAIL_UNSUBSCRIBE_KEY).'&email='.urlencode($obj->email).'&mtid='.$obj->rowid.'" width="1" height="1" style="width:1px;height:1px" border="0"/>';
 						$substitutionarray['__UNSUBSCRIBE__'] = '<a href="'.DOL_MAIN_URL_ROOT.'/public/emailing/mailing-unsubscribe.php?tag='.urlencode($obj->tag).'&unsuscrib=1&securitykey='.urlencode($conf->global->MAILING_EMAIL_UNSUBSCRIBE_KEY).'&email='.urlencode($obj->email).'&mtid='.$obj->rowid.'" target="_blank" rel="noopener noreferrer">'.$langs->trans("MailUnsubcribe").'</a>';
 						$substitutionarray['__UNSUBSCRIBE_URL__'] = DOL_MAIN_URL_ROOT.'/public/emailing/mailing-unsubscribe.php?tag='.urlencode($obj->tag).'&unsuscrib=1&securitykey='.urlencode($conf->global->MAILING_EMAIL_UNSUBSCRIBE_KEY).'&email='.urlencode($obj->email).'&mtid='.$obj->rowid;
diff --git a/htdocs/contrat/card.php b/htdocs/contrat/card.php
index 9cbe8b5c686..9a1e4aed2e1 100644
--- a/htdocs/contrat/card.php
+++ b/htdocs/contrat/card.php
@@ -2101,7 +2101,7 @@ if ($action == 'create') {
 
 				if ($object->statut == 0 && $nbofservices) {
 					if ($user->rights->contrat->creer) {
-						print dolGetButtonAction($langs->trans('Validate'), '', 'default', $_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=valid&amp;token='.newToken(), '', true, $params);
+						print dolGetButtonAction($langs->trans('Validate'), '', 'default', $_SERVER["PHP_SELF"].'?id='.$object->id.'&action=valid&token='.newToken(), '', true, $params);
 					} else {
 						$params['attr']['title'] = $langs->trans("NotEnoughPermissions");
 						print dolGetButtonAction($langs->trans('Validate'), '', 'default', '#', '', false, $params);
@@ -2129,7 +2129,7 @@ if ($action == 'create') {
 				if (isModEnabled('facture') && $object->statut > 0) {
 					$langs->load("bills");
 					if ($user->rights->facture->creer) {
-						print dolGetButtonAction($langs->trans('CreateBill'), '', 'default', DOL_URL_ROOT.'/compta/facture/card.php?action=create&amp;origin='.$object->element.'&amp;originid='.$object->id.'&amp;socid='.$object->thirdparty->id, '', true, $params);
+						print dolGetButtonAction($langs->trans('CreateBill'), '', 'default', DOL_URL_ROOT.'/compta/facture/card.php?action=create&origin='.$object->element.'&originid='.$object->id.'&socid='.$object->thirdparty->id, '', true, $params);
 					} else {
 						$params['attr']['title'] = $langs->trans("NotEnoughPermissions");
 						print dolGetButtonAction($langs->trans('CreateBill'), '', 'default', '#', '', false, $params);
@@ -2138,14 +2138,14 @@ if ($action == 'create') {
 
 				if ($object->nbofservicesclosed > 0 || $object->nbofserviceswait > 0) {
 					if ($user->rights->contrat->activer) {
-						print dolGetButtonAction($langs->trans('ActivateAllContracts'), '', 'default', $_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=activate&amp;token='.newToken(), '', true, $params);
+						print dolGetButtonAction($langs->trans('ActivateAllContracts'), '', 'default', $_SERVER["PHP_SELF"].'?id='.$object->id.'&action=activate&token='.newToken(), '', true, $params);
 					} else {
 						print dolGetButtonAction($langs->trans('ActivateAllContracts'), '', 'default', '#', '', false, $params);
 					}
 				}
 				if ($object->nbofservicesclosed < $nbofservices) {
 					if ($user->rights->contrat->desactiver) {
-						print dolGetButtonAction($langs->trans('CloseAllContracts'), '', 'default', $_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=close&amp;token='.newToken(), '', true, $params);
+						print dolGetButtonAction($langs->trans('CloseAllContracts'), '', 'default', $_SERVER["PHP_SELF"].'?id='.$object->id.'&action=close&token='.newToken(), '', true, $params);
 					} else {
 						print dolGetButtonAction($langs->trans('CloseAllContracts'), '', 'default', '#', '', false, $params);
 					}
@@ -2169,7 +2169,7 @@ if ($action == 'create') {
 
 				// Clone
 				if ($user->rights->contrat->creer) {
-					print dolGetButtonAction($langs->trans('ToClone'), '', 'default', $_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;socid='.$object->socid.'&amp;action=clone&amp;token='.newToken(), '', true, $params);
+					print dolGetButtonAction($langs->trans('ToClone'), '', 'default', $_SERVER['PHP_SELF'].'?id='.$object->id.'&socid='.$object->socid.'&action=clone&token='.newToken(), '', true, $params);
 				}
 
 				// On peut supprimer entite si
diff --git a/htdocs/core/class/html.formmail.class.php b/htdocs/core/class/html.formmail.class.php
index 3fe5578bfd3..48e6eab2484 100644
--- a/htdocs/core/class/html.formmail.class.php
+++ b/htdocs/core/class/html.formmail.class.php
@@ -648,19 +648,9 @@ class FormMail extends Form
 							}
 						}
 
-						// Set the default "From"
-						$defaultfrom = '';
-						$reshook = $hookmanager->executeHooks('getDefaultFromEmail', $parameters, $this);
-						if (empty($reshook)) {
-							$defaultfrom = $this->fromtype;
-						}
-						if (!empty($hookmanager->resArray['defaultfrom'])) {
-							$defaultfrom = $hookmanager->resArray['defaultfrom'];
-						}
-
 						// Using combo here make the '<email>' no more visible on list.
 						//$out.= ' '.$form->selectarray('fromtype', $liste, $this->fromtype, 0, 0, 0, '', 0, 0, 0, '', 'fromforsendingprofile maxwidth200onsmartphone', 1, '', $disablebademails);
-						$out .= ' '.$form->selectarray('fromtype', $liste, $defaultfrom, 0, 0, 0, '', 0, 0, 0, '', 'fromforsendingprofile maxwidth200onsmartphone', 0, '', $disablebademails);
+						$out .= ' '.$form->selectarray('fromtype', $liste, $this->fromtype, 0, 0, 0, '', 0, 0, 0, '', 'fromforsendingprofile maxwidth200onsmartphone', 0, '', $disablebademails);
 					}
 
 					$out .= "</td></tr>\n";
@@ -920,6 +910,9 @@ class FormMail extends Form
 				if (strpos($defaultmessage, '__USER_SIGNATURE__') !== false && dol_textishtml($this->substit['__USER_SIGNATURE__'])) {
 					$atleastonecomponentishtml++;
 				}
+				if (strpos($defaultmessage, '__SENDEREMAIL_SIGNATURE__') !== false && dol_textishtml($this->substit['__SENDEREMAIL_SIGNATURE__'])) {
+					$atleastonecomponentishtml++;
+				}
 				if (strpos($defaultmessage, '__ONLINE_PAYMENT_TEXT_AND_URL__') !== false && dol_textishtml($this->substit['__ONLINE_PAYMENT_TEXT_AND_URL__'])) {
 					$atleastonecomponentishtml++;
 				}
@@ -933,6 +926,9 @@ class FormMail extends Form
 					if (!dol_textishtml($this->substit['__USER_SIGNATURE__'])) {
 						$this->substit['__USER_SIGNATURE__'] = dol_nl2br($this->substit['__USER_SIGNATURE__']);
 					}
+					if (!dol_textishtml($this->substit['__SENDEREMAIL_SIGNATURE__'])) {
+						$this->substit['__SENDEREMAIL_SIGNATURE__'] = dol_nl2br($this->substit['__SENDEREMAIL_SIGNATURE__']);
+					}
 					if (!dol_textishtml($this->substit['__ONLINE_PAYMENT_TEXT_AND_URL__'])) {
 						$this->substit['__ONLINE_PAYMENT_TEXT_AND_URL__'] = dol_nl2br($this->substit['__ONLINE_PAYMENT_TEXT_AND_URL__']);
 					}
@@ -1612,7 +1608,8 @@ class FormMail extends Form
 			$tmparray['__OTHER3__'] = 'Other3';
 			$tmparray['__OTHER4__'] = 'Other4';
 			$tmparray['__OTHER5__'] = 'Other5';
-			$tmparray['__USER_SIGNATURE__'] = 'TagSignature';
+			$tmparray['__USER_SIGNATURE__'] = 'TagUserSignature';
+			$tmparray['__SENDEREMAIL_SIGNATURE__'] = 'TagEmailSenderSignature';
 			$tmparray['__CHECK_READ__'] = 'TagCheckMail';
 			$tmparray['__UNSUBSCRIBE__'] = 'TagUnsubscribe';
 			//,'__PERSONALIZED__' => 'Personalized'	// Hidden because not used yet in mass emailing
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index b27553b17f2..a4ee4e5b802 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -7295,9 +7295,12 @@ function getCommonSubstitutionArray($outputlangs, $onlykey = 0, $exclude = null,
 	if (empty($exclude) || !in_array('user', $exclude)) {
 		// Add SIGNATURE into substitutionarray first, so, when we will make the substitution,
 		// this will include signature content first and then replace var found into content of signature
-		$signature = $user->signature;
+		//var_dump($onlykey);
+		$emailsendersignature = $user->signature; //  dy default, we use the signature of current user. We must complete substitution with signature in c_email_senderprofile of array after calling getCommonSubstitutionArray()
+		$usersignature = $user->signature;
 		$substitutionarray = array_merge($substitutionarray, array(
-			'__USER_SIGNATURE__' => (string) (($signature && empty($conf->global->MAIN_MAIL_DO_NOT_USE_SIGN)) ? ($onlykey == 2 ? dol_trunc(dol_string_nohtmltag($signature), 30) : $signature) : '')
+			'__SENDEREMAIL_SIGNATURE__' => (string) ((empty($conf->global->MAIN_MAIL_DO_NOT_USE_SIGN)) ? ($onlykey == 2 ? dol_trunc('SignatureFromTheSelectedSenderProfile', 30) : $emailsendersignature) : ''),
+			'__USER_SIGNATURE__' => (string) (($usersignature && empty($conf->global->MAIN_MAIL_DO_NOT_USE_SIGN)) ? ($onlykey == 2 ? dol_trunc(dol_string_nohtmltag($usersignature), 30) : $usersignature) : '')
 		));
 
 		if (is_object($user)) {
@@ -7928,13 +7931,13 @@ function make_substitutions($text, $substitutionarray, $outputlangs = null, $con
 		}
 	}
 
-	// Make substitition for array $substitutionarray
+	// Make substitution for array $substitutionarray
 	foreach ($substitutionarray as $key => $value) {
 		if (!isset($value)) {
 			continue; // If value is null, it same than not having substitution key at all into array, we do not replace.
 		}
 
-		if ($key == '__USER_SIGNATURE__' && (!empty($conf->global->MAIN_MAIL_DO_NOT_USE_SIGN))) {
+		if (($key == '__USER_SIGNATURE__' || $key == '__SENDEREMAIL_SIGNATURE__') && (!empty($conf->global->MAIN_MAIL_DO_NOT_USE_SIGN))) {
 			$value = ''; // Protection
 		}
 
diff --git a/htdocs/core/tpl/card_presend.tpl.php b/htdocs/core/tpl/card_presend.tpl.php
index 826a8e0a12a..7e55b5b20f0 100644
--- a/htdocs/core/tpl/card_presend.tpl.php
+++ b/htdocs/core/tpl/card_presend.tpl.php
@@ -156,6 +156,22 @@ if ($action == 'presend') {
 		$formmail->fromtype = 'special';
 	}
 
+	// Set the default "From"
+	$defaultfrom = '';
+	if (GETPOSTISSET('fromtype')) {
+		$defaultfrom = GETPOST('fromtype');
+	} else {
+		$parameters = array();
+		$reshook = $hookmanager->executeHooks('getDefaultFromEmail', $parameters, $formmail);
+		if (empty($reshook)) {
+			$defaultfrom = $formmail->fromtype;
+		}
+		if (!empty($hookmanager->resArray['defaultfrom'])) {
+			$defaultfrom = $hookmanager->resArray['defaultfrom'];
+		}
+	}
+	$formmail->fromtype = $defaultfrom;
+
 	$formmail->trackid = empty($trackid) ? '' : $trackid;
 	$formmail->inreplyto = empty($inreplyto) ? '' : $inreplyto;
 	$formmail->withfrom = 1;
@@ -212,11 +228,33 @@ if ($action == 'presend') {
 	}
 
 	// Make substitution in email content
-	if ($object) {
+	if (!empty($object)) {
 		// First we set ->substit (useless, it will be erased later) and ->substit_lines
 		$formmail->setSubstitFromObject($object, $langs);
 	}
 	$substitutionarray = getCommonSubstitutionArray($outputlangs, 0, $arrayoffamiliestoexclude, $object);
+
+	// Overwrite __SENDEREMAIL_SIGNATURE__ with value select into form
+	if ($formmail->fromtype) {
+		$reg = array();
+		if (preg_match('/user/', $formmail->fromtype, $reg)) {
+			$emailsendersignature = $user->signature;
+		} elseif (preg_match('/company/', $formmail->fromtype, $reg)) {
+			$emailsendersignature = '';
+		} elseif (preg_match('/senderprofile_(\d+)/', $formmail->fromtype, $reg)) {
+			$sql = "SELECT rowid, label, email FROM ".$db->prefix()."c_email_senderprofile";
+			$sql .= " WHERE rowid = ".((int) $reg[1]);
+			$resql = $db->query($sql);
+			if ($resql) {
+				$obj = $db->fetch_object($resql);
+				if ($obj) {
+					$emailsendersignature = $obj->label;
+				}
+			}
+		}
+	}
+	$substitutionarray['__SENDEREMAIL_SIGNATURE__'] = $emailsendersignature;
+
 	$substitutionarray['__CHECK_READ__'] = "";
 	if (is_object($object) && is_object($object->thirdparty)) {
 		$checkRead= '<img src="'.DOL_MAIN_URL_ROOT.'/public/emailing/mailing-read.php';

From e3421f42556fcbe84f7c5dc16a04e0e6569b05e5 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 10 Sep 2022 16:05:33 +0200
Subject: [PATCH 873/974] FIX Missing reposition

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

diff --git a/htdocs/admin/mails_templates.php b/htdocs/admin/mails_templates.php
index 3d8d7f3db4f..b02d05ca478 100644
--- a/htdocs/admin/mails_templates.php
+++ b/htdocs/admin/mails_templates.php
@@ -1243,7 +1243,7 @@ if ($num) {
 				// Status / Active
 				print '<td class="center nowrap">';
 				if ($canbedisabled) {
-					print '<a href="'.$url.'&action='.$acts[$obj->active].'&token='.newToken().'">'.$actl[$obj->active].'</a>';
+					print '<a class="reposition" href="'.$url.'&action='.$acts[$obj->active].'&token='.newToken().'">'.$actl[$obj->active].'</a>';
 				} else {
 					print '<span class="opacitymedium">'.$actl[$obj->active].'</span>';
 				}

From 07a640adfd6e14bf866755b16820d958e1397b43 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 10 Sep 2022 16:24:55 +0200
Subject: [PATCH 874/974] Fix used label instead of signature

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

diff --git a/htdocs/core/tpl/card_presend.tpl.php b/htdocs/core/tpl/card_presend.tpl.php
index 7e55b5b20f0..888cb1d7026 100644
--- a/htdocs/core/tpl/card_presend.tpl.php
+++ b/htdocs/core/tpl/card_presend.tpl.php
@@ -242,13 +242,13 @@ if ($action == 'presend') {
 		} elseif (preg_match('/company/', $formmail->fromtype, $reg)) {
 			$emailsendersignature = '';
 		} elseif (preg_match('/senderprofile_(\d+)/', $formmail->fromtype, $reg)) {
-			$sql = "SELECT rowid, label, email FROM ".$db->prefix()."c_email_senderprofile";
+			$sql = "SELECT rowid, label, email, signature FROM ".$db->prefix()."c_email_senderprofile";
 			$sql .= " WHERE rowid = ".((int) $reg[1]);
 			$resql = $db->query($sql);
 			if ($resql) {
 				$obj = $db->fetch_object($resql);
 				if ($obj) {
-					$emailsendersignature = $obj->label;
+					$emailsendersignature = $obj->signature;
 				}
 			}
 		}

From 7a97fc8989d366e5be5493de080174fb7c817e0b Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 10 Sep 2022 16:44:32 +0200
Subject: [PATCH 875/974] Fix missing trans

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

diff --git a/htdocs/langs/en_US/install.lang b/htdocs/langs/en_US/install.lang
index dd451200c11..27e1792edac 100644
--- a/htdocs/langs/en_US/install.lang
+++ b/htdocs/langs/en_US/install.lang
@@ -211,3 +211,5 @@ 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
+NodoUpgradeAfterDB=No action requested by external modules after upgrade of database
+NodoUpgradeAfterFiles=No action requested by external modules after upgrade of files or directories

From 0b944e62ee86b77b292abc78667bb1bccd093ebf Mon Sep 17 00:00:00 2001
From: ptibogxiv <support@ptibogxiv.net>
Date: Sat, 10 Sep 2022 17:01:21 +0200
Subject: [PATCH 876/974] Update recruitmentjobposition_card.php

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

diff --git a/htdocs/recruitment/recruitmentjobposition_card.php b/htdocs/recruitment/recruitmentjobposition_card.php
index 85100f992bd..d7d115b04b0 100644
--- a/htdocs/recruitment/recruitmentjobposition_card.php
+++ b/htdocs/recruitment/recruitmentjobposition_card.php
@@ -446,7 +446,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 			// Close as recruited/canceled
 			if ($object->status == $object::STATUS_VALIDATED) {
 				if ($usercanclose) {
-					print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=closeas&token='.newToken().(empty($conf->global->MAIN_JUMP_TAG) ? '' : '// close').'"';
+					print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=closeas&token='.newToken().(empty($conf->global->MAIN_JUMP_TAG) ? '' : '#close').'"';
 					print '>'.$langs->trans('Close').'</a>';
 				} else {
 					print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NotEnoughPermissions")).'">'.$langs->trans('Close').'</a>';

From cc4bb9b40f233213e27afb1c850b2e9a55c988b7 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 10 Sep 2022 19:28:48 +0200
Subject: [PATCH 877/974] Add column revenuestamp into order for profroma to
 match invoice

---
 htdocs/install/mysql/migration/16.0.0-17.0.0.sql | 2 ++
 htdocs/install/mysql/tables/llx_commande.sql     | 7 +++++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/htdocs/install/mysql/migration/16.0.0-17.0.0.sql b/htdocs/install/mysql/migration/16.0.0-17.0.0.sql
index 3353b91fb9a..d97f92fcc5e 100644
--- a/htdocs/install/mysql/migration/16.0.0-17.0.0.sql
+++ b/htdocs/install/mysql/migration/16.0.0-17.0.0.sql
@@ -157,3 +157,5 @@ ALTER TABLE llx_don ADD INDEX idx_don_fk_project (fk_projet);
 ALTER TABLE llx_don ADD INDEX idx_don_fk_user_author (fk_user_author);
 ALTER TABLE llx_don ADD INDEX idx_don_fk_user_valid (fk_user_valid);
 
+ALTER TABLE llx_commande ADD COLUMN revenuestamp double(24,8) DEFAULT 0 after localtax2;
+
diff --git a/htdocs/install/mysql/tables/llx_commande.sql b/htdocs/install/mysql/tables/llx_commande.sql
index 94b1f38227d..862d3c733fc 100644
--- a/htdocs/install/mysql/tables/llx_commande.sql
+++ b/htdocs/install/mysql/tables/llx_commande.sql
@@ -47,11 +47,14 @@ create table llx_commande
   remise_percent			real      default 0,
   remise_absolue			real      default 0,
   remise					real      default 0,
+  
   total_tva                 double(24,8)     default 0,
-  localtax1					double(24,8)     default 0,	-- total localtax1 
-  localtax2					double(24,8)     default 0,	-- total localtax2
+  localtax1					double(24,8)     default 0,		-- total localtax1 
+  localtax2					double(24,8)     default 0,		-- total localtax2
+  revenuestamp              double(24,8)     DEFAULT 0,		-- amount total revenuestamp (usefull for proforma that must match invoice)
   total_ht					double(24,8)     default 0,
   total_ttc					double(24,8)     default 0,
+
   note_private				text,
   note_public				text,
   model_pdf					varchar(255),

From 2acfa41b1661fda3e49083dc85fef49bdec6d350 Mon Sep 17 00:00:00 2001
From: UT from dolibit <45215329+dolibit-ut@users.noreply.github.com>
Date: Sun, 11 Sep 2022 10:20:51 +0200
Subject: [PATCH 878/974] Update bom_card.php

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

diff --git a/htdocs/bom/bom_card.php b/htdocs/bom/bom_card.php
index 2801b8e3d66..ddb45b6e0bd 100644
--- a/htdocs/bom/bom_card.php
+++ b/htdocs/bom/bom_card.php
@@ -335,7 +335,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 		}
 
 		$text = $langs->trans('ConfirmValidateBom', $numref);
-		/*if (! empty($conf->notification->enabled))
+		/*if (!empty($conf->notification->enabled))
 		{
 			require_once DOL_DOCUMENT_ROOT . '/core/class/notify.class.php';
 			$notify = new Notify($db);

From 9e0a4988abf0a3839edc931f21a0e2eca4a0cb02 Mon Sep 17 00:00:00 2001
From: UT from dolibit <45215329+dolibit-ut@users.noreply.github.com>
Date: Sun, 11 Sep 2022 10:53:39 +0200
Subject: [PATCH 879/974] Update job_agenda.php

---
 htdocs/hrm/job_agenda.php | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/htdocs/hrm/job_agenda.php b/htdocs/hrm/job_agenda.php
index b6ce99c9801..808ceea430f 100644
--- a/htdocs/hrm/job_agenda.php
+++ b/htdocs/hrm/job_agenda.php
@@ -20,24 +20,24 @@
  */
 
 /**
- *  \file       job_agenda.php
- *  \ingroup    hrm
- *  \brief      Tab of events on Job
+ *    \file       htdocs/hrm/job_agenda.php
+ *    \ingroup    hrm
+ *    \brief      Tab of events on Job
  */
 
 
 // Load Dolibarr environment
 require '../main.inc.php';
 
-require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
+require_once DOL_DOCUMENT_ROOT . '/contact/class/contact.class.php';
+require_once DOL_DOCUMENT_ROOT . '/core/lib/company.lib.php';
+require_once DOL_DOCUMENT_ROOT . '/core/lib/functions2.lib.php';
 require_once DOL_DOCUMENT_ROOT . '/hrm/class/job.class.php';
 require_once DOL_DOCUMENT_ROOT . '/hrm/lib/hrm_job.lib.php';
 
 
 // Load translation files required by the page
-$langs->loadLangs(array("hrm", "other"));
+$langs->loadLangs(array('hrm', 'other'));
 
 // Get parameters
 $id = GETPOST('id', 'int');
@@ -87,8 +87,9 @@ if ($id > 0 || !empty($ref)) {
 	$upload_dir = $conf->hrm->multidir_output[$object->entity]."/".$object->id;
 }
 
+// Permissions
 $permissiontoread = $user->rights->hrm->all->read;
-$permissiontoadd = $user->rights->hrm->all->write; // Used by the include of actions_addupdatedelete.inc.php
+$permissiontoadd  = $user->rights->hrm->all->write; // Used by the include of actions_addupdatedelete.inc.php
 
 // Security check (enable the most restrictive one)
 //if ($user->socid > 0) accessforbidden();

From c78c08bf1c139ebe797f5aa1ed64961dd13425cd Mon Sep 17 00:00:00 2001
From: UT from dolibit <45215329+dolibit-ut@users.noreply.github.com>
Date: Sun, 11 Sep 2022 11:20:54 +0200
Subject: [PATCH 880/974] Update position_document.php

---
 htdocs/hrm/position_document.php | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/htdocs/hrm/position_document.php b/htdocs/hrm/position_document.php
index c51f2204441..30f33453c03 100644
--- a/htdocs/hrm/position_document.php
+++ b/htdocs/hrm/position_document.php
@@ -20,9 +20,9 @@
  */
 
 /**
- *  \file       position_document.php
- *  \ingroup    hrm
- *  \brief      Tab for documents linked to Position
+ *    \file       htdocs/hrm/position_document.php
+ *    \ingroup    hrm
+ *    \brief      Tab for documents linked to Position
  */
 
 // Load Dolibarr environment
@@ -39,13 +39,13 @@ require_once DOL_DOCUMENT_ROOT . '/hrm/class/job.class.php';
 // Load translation files required by the page
 $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'));
 $ref = GETPOST('ref', 'alpha');
 
-// Get parameters
+// Get parameters for pagination
 $limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
@@ -79,8 +79,9 @@ if ($id > 0 || !empty($ref)) {
 	$upload_dir = $conf->hrm->multidir_output[$object->entity ? $object->entity : $conf->entity]."/position/".get_exdir(0, 0, 0, 1, $object);
 }
 
+// Permissions
 $permissiontoread = $user->rights->hrm->all->read;
-$permissiontoadd = $user->rights->hrm->all->write; // Used by the include of actions_addupdatedelete.inc.php and actions_linkedfiles.inc.php
+$permissiontoadd  = $user->rights->hrm->all->write; // Used by the include of actions_addupdatedelete.inc.php and actions_linkedfiles.inc.php
 
 // Security check (enable the most restrictive one)
 //if ($user->socid > 0) accessforbidden();

From 06ec607f22d89e60e594976484fe3047f3173fad Mon Sep 17 00:00:00 2001
From: UT from dolibit <45215329+dolibit-ut@users.noreply.github.com>
Date: Sun, 11 Sep 2022 11:27:02 +0200
Subject: [PATCH 881/974] Update skill_agenda.php

---
 htdocs/hrm/skill_agenda.php | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/htdocs/hrm/skill_agenda.php b/htdocs/hrm/skill_agenda.php
index 23f98d75f3f..9646aaccb88 100644
--- a/htdocs/hrm/skill_agenda.php
+++ b/htdocs/hrm/skill_agenda.php
@@ -20,24 +20,24 @@
  */
 
 /**
- *  \file       skill_agenda.php
- *  \ingroup    hrm
- *  \brief      Tab of events on skill
+ *    \file       htdocs/hrm/skill_agenda.php
+ *    \ingroup    hrm
+ *    \brief      Tab of events on skill
  */
 
 
 // Load Dolibarr environment
 require '../main.inc.php';
 
-require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
+require_once DOL_DOCUMENT_ROOT . '/contact/class/contact.class.php';
+require_once DOL_DOCUMENT_ROOT . '/core/lib/company.lib.php';
+require_once DOL_DOCUMENT_ROOT . '/core/lib/functions2.lib.php';
 require_once DOL_DOCUMENT_ROOT . '/hrm/class/skill.class.php';
 require_once DOL_DOCUMENT_ROOT . '/hrm/lib/hrm_skill.lib.php';
 
 
 // Load translation files required by the page
-$langs->loadLangs(array("hrm", "other"));
+$langs->loadLangs(array('hrm', 'other'));
 
 // Get parameters
 $id = GETPOST('id', 'int');
@@ -56,6 +56,7 @@ if (GETPOST('actioncode', 'array')) {
 }
 $search_agenda_label = GETPOST('search_agenda_label');
 
+// Get Parameters for Pagination
 $limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
@@ -87,6 +88,7 @@ if ($id > 0 || !empty($ref)) {
 	$upload_dir = $conf->hrm->multidir_output[$object->entity]."/".$object->id;
 }
 
+// Permissions
 $permissiontoread = $user->rights->hrm->all->read;
 $permissiontoadd = $user->rights->hrm->all->write; // Used by the include of actions_addupdatedelete.inc.php
 

From 95a94a7c899e8882057fd2a57ec0dabbe30b27c3 Mon Sep 17 00:00:00 2001
From: UT from dolibit <45215329+dolibit-ut@users.noreply.github.com>
Date: Sun, 11 Sep 2022 11:29:11 +0200
Subject: [PATCH 882/974] Update skill_card.php

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

diff --git a/htdocs/hrm/skill_card.php b/htdocs/hrm/skill_card.php
index 4fd3a0bc28b..c057d0e0e31 100644
--- a/htdocs/hrm/skill_card.php
+++ b/htdocs/hrm/skill_card.php
@@ -20,9 +20,9 @@
  */
 
 /**
- *    \file       skill_card.php
+ *    \file       htdocs/hrm/skill_card.php
  *    \ingroup    hrm
- *    \brief      Page to create/edit/view skill
+ *    \brief      Page to create/edit/view skills
  */
 
 
@@ -36,7 +36,7 @@ require_once DOL_DOCUMENT_ROOT . '/hrm/lib/hrm_skill.lib.php';
 
 
 // Load translation files required by the page
-$langs->loadLangs(array("hrm", "other", 'products'));
+$langs->loadLangs(array('hrm', 'other', 'products'));  // why products?
 
 // Get parameters
 $id = GETPOST('id', 'int');
@@ -77,9 +77,9 @@ if (empty($action) && empty($id) && empty($ref)) {
 // Load object
 include DOL_DOCUMENT_ROOT . '/core/actions_fetchobject.inc.php'; // Must be include, not include_once.
 
-
-$permissiontoread = $user->rights->hrm->all->read;
-$permissiontoadd = $user->rights->hrm->all->write; // Used by the include of actions_addupdatedelete.inc.php and actions_lineupdown.inc.php
+// Permissions
+$permissiontoread   = $user->rights->hrm->all->read;
+$permissiontoadd    = $user->rights->hrm->all->write; // Used by the include of actions_addupdatedelete.inc.php and actions_lineupdown.inc.php
 $permissiontodelete = $user->rights->hrm->all->delete;
 $upload_dir = $conf->hrm->multidir_output[isset($object->entity) ? $object->entity : 1] . '/skill';
 

From c44725b080e34eecd382d4f01100278b73fb224b Mon Sep 17 00:00:00 2001
From: UT from dolibit <45215329+dolibit-ut@users.noreply.github.com>
Date: Sun, 11 Sep 2022 11:32:08 +0200
Subject: [PATCH 883/974] Update skill_contact.php

---
 htdocs/hrm/skill_contact.php | 22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/htdocs/hrm/skill_contact.php b/htdocs/hrm/skill_contact.php
index c5fe154557c..562421a5272 100644
--- a/htdocs/hrm/skill_contact.php
+++ b/htdocs/hrm/skill_contact.php
@@ -20,22 +20,25 @@
  */
 
 /**
- *  \file       skill_contact.php
- *  \ingroup    hrm
- *  \brief      Tab for contacts linked to Skill
+ *    \file       htdocs/hrm/skill_contact.php
+ *    \ingroup    hrm
+ *    \brief      Tab for contacts linked to Skill
  */
 
 // Load Dolibarr environment
 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';
+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 . '/hrm/class/skill.class.php';
 require_once DOL_DOCUMENT_ROOT . '/hrm/lib/hrm_skill.lib.php';
 
-// Load translation files required by the page
-$langs->loadLangs(array("hrm", "companies", "other", "mails"));
 
+// Load translation files required by the page
+$langs->loadLangs(array('hrm', 'companies', 'other', 'mails'));
+
+
+// Get Parameters
 $id     = (GETPOST('id') ?GETPOST('id', 'int') : GETPOST('facid', 'int')); // For backward compatibility
 $ref    = GETPOST('ref', 'alpha');
 $lineid = GETPOST('lineid', 'int');
@@ -53,6 +56,7 @@ $extrafields->fetch_name_optionals_label($object->table_element);
 // Load object
 include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be include, not include_once  // Must be include, not include_once. Include fetch and fetch_thirdparty but not fetch_optionals
 
+// Permissions
 $permission = $user->rights->hrm->skill->write;
 
 // Security check (enable the most restrictive one)
@@ -65,9 +69,11 @@ $permission = $user->rights->hrm->skill->write;
 
 
 /*
- * Add a new contact
+ * Action
  */
 
+// Add a new contact
+
 if ($action == 'addcontact' && $permission) {
 	$contactid = (GETPOST('userid') ? GETPOST('userid', 'int') : GETPOST('contactid', 'int'));
 	$typeid = (GETPOST('typecontact') ? GETPOST('typecontact') : GETPOST('type'));

From fa3451fb7474c4ff93021f109a041f48feebce0c Mon Sep 17 00:00:00 2001
From: UT from dolibit <45215329+dolibit-ut@users.noreply.github.com>
Date: Sun, 11 Sep 2022 11:34:40 +0200
Subject: [PATCH 884/974] Update skill_document.php

---
 htdocs/hrm/skill_document.php | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/htdocs/hrm/skill_document.php b/htdocs/hrm/skill_document.php
index c0fe492be06..2f9f8e0db81 100644
--- a/htdocs/hrm/skill_document.php
+++ b/htdocs/hrm/skill_document.php
@@ -20,9 +20,9 @@
  */
 
 /**
- *  \file       skill_document.php
- *  \ingroup    hrm
- *  \brief      Tab for documents linked to skill
+ *    \file       htdocs/hrm/skill_document.php
+ *    \ingroup    hrm
+ *    \brief      Tab for documents linked to skill
  */
 
 
@@ -37,15 +37,15 @@ require_once DOL_DOCUMENT_ROOT . '/hrm/class/skill.class.php';
 require_once DOL_DOCUMENT_ROOT . '/hrm/lib/hrm_skill.lib.php';
 
 // Load translation files required by the page
-$langs->loadLangs(array("hrm", "companies", "other", "mails"));
-
+$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'));
 $ref = GETPOST('ref', 'alpha');
 
-// Get parameters
+// Get Parameters for Pagination
 $limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
@@ -79,8 +79,9 @@ if ($id > 0 || !empty($ref)) {
 	$upload_dir = $conf->hrm->multidir_output[$object->entity ? $object->entity : $conf->entity]."/skill/".get_exdir(0, 0, 0, 1, $object);
 }
 
+// Permissions
 $permissiontoread = $user->rights->hrm->all->read;
-$permissiontoadd = $user->rights->hrm->all->write; // Used by the include of actions_addupdatedelete.inc.php and actions_linkedfiles.inc.php
+$permissiontoadd  = $user->rights->hrm->all->write; // Used by the include of actions_addupdatedelete.inc.php and actions_linkedfiles.inc.php
 
 // Security check (enable the most restrictive one)
 //if ($user->socid > 0) accessforbidden();

From 710f755efe126377b0e1d88d591e8c7dce67fa81 Mon Sep 17 00:00:00 2001
From: UT from dolibit <45215329+dolibit-ut@users.noreply.github.com>
Date: Sun, 11 Sep 2022 11:37:16 +0200
Subject: [PATCH 885/974] Update skill_list.php

---
 htdocs/hrm/skill_list.php | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/htdocs/hrm/skill_list.php b/htdocs/hrm/skill_list.php
index 65a3cac0ecf..032dbcacdcd 100644
--- a/htdocs/hrm/skill_list.php
+++ b/htdocs/hrm/skill_list.php
@@ -20,9 +20,9 @@
  */
 
 /**
- *   	\file       skill_list.php
- *		\ingroup    hrm
- *		\brief      List page for skill
+ *    \file       htdocs/hrm/skill_list.php
+ *    \ingroup    hrm
+ *    \brief      List page for skill
  */
 
 
@@ -40,8 +40,11 @@ require_once __DIR__.'/class/skill.class.php';
 //dol_include_once('/othermodule/class/otherobject.class.php');
 
 // Load translation files required by the page
-$langs->loadLangs(array("hrm", "other"));
+$langs->loadLangs(array('hrm', 'other'));
 
+
+// Get Parameters
+$id         = GETPOST('id', 'int');
 $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 ?
@@ -49,10 +52,8 @@ $confirm    = GETPOST('confirm', 'alpha'); // Result of a confirmation
 $cancel     = GETPOST('cancel', 'alpha'); // We click on a Cancel button
 $toselect   = GETPOST('toselect', 'array'); // Array of ids of elements selected into a list
 $contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'skilllist'; // 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')
-
-$id = GETPOST('id', 'int');
+$backtopage  = GETPOST('backtopage', 'alpha'); // Go back to a dedicated page
+$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;
@@ -130,8 +131,9 @@ include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_array_fields.tpl.php';
 $object->fields = dol_sort_array($object->fields, 'position');
 $arrayfields = dol_sort_array($arrayfields, 'position');
 
-$permissiontoread = $user->rights->hrm->all->read;
-$permissiontoadd = $user->rights->hrm->all->write;
+// Permissions 
+$permissiontoread   = $user->rights->hrm->all->read;
+$permissiontoadd    = $user->rights->hrm->all->write;
 $permissiontodelete = $user->rights->hrm->all->delete;
 
 // Security check

From 6d57f4f0c70c6bc38b005b2f5816795fcfb6d3cf Mon Sep 17 00:00:00 2001
From: stickler-ci <support@stickler-ci.com>
Date: Sun, 11 Sep 2022 09:38:05 +0000
Subject: [PATCH 886/974] Fixing style errors.

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

diff --git a/htdocs/hrm/skill_list.php b/htdocs/hrm/skill_list.php
index 032dbcacdcd..664d54212a3 100644
--- a/htdocs/hrm/skill_list.php
+++ b/htdocs/hrm/skill_list.php
@@ -131,7 +131,7 @@ 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');
 
-// Permissions 
+// Permissions
 $permissiontoread   = $user->rights->hrm->all->read;
 $permissiontoadd    = $user->rights->hrm->all->write;
 $permissiontodelete = $user->rights->hrm->all->delete;

From e617c2678b3f9ae088b03afa35bc5a9a7df3fa87 Mon Sep 17 00:00:00 2001
From: UT from dolibit <45215329+dolibit-ut@users.noreply.github.com>
Date: Sun, 11 Sep 2022 11:38:33 +0200
Subject: [PATCH 887/974] Update skill_note.php

---
 htdocs/hrm/skill_note.php | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/htdocs/hrm/skill_note.php b/htdocs/hrm/skill_note.php
index 45a0690f176..3b892e0694e 100644
--- a/htdocs/hrm/skill_note.php
+++ b/htdocs/hrm/skill_note.php
@@ -20,9 +20,9 @@
  */
 
 /**
- *  \file       skill_note.php
- *  \ingroup    hrm
- *  \brief      Tab for notes on skill
+ *    \file       htdocs/hrm/skill_note.php
+ *    \ingroup    hrm
+ *    \brief      Tab for notes on skill
  */
 
 
@@ -33,12 +33,12 @@ require_once DOL_DOCUMENT_ROOT . '/hrm/class/skill.class.php';
 require_once DOL_DOCUMENT_ROOT . '/hrm/lib/hrm_skill.lib.php';
 
 // Load translation files required by the page
-$langs->loadLangs(array("hrm", "companies"));
+$langs->loadLangs(array('hrm', 'companies'));
 
 // Get parameters
-$id = GETPOST('id', 'int');
+$id         = GETPOST('id', 'int');
 $ref        = GETPOST('ref', 'alpha');
-$action = GETPOST('action', 'aZ09');
+$action     = GETPOST('action', 'aZ09');
 $cancel     = GETPOST('cancel', 'aZ09');
 $backtopage = GETPOST('backtopage', 'alpha');
 
@@ -56,7 +56,8 @@ if ($id > 0 || !empty($ref)) {
 	$upload_dir = $conf->hrm->multidir_output[$object->entity]."/".$object->id;
 }
 
-$permissionnote = $user->rights->hrm->all->write;
+// Permissions
+$permissionnote   = $user->rights->hrm->all->write;
 $permissiontoread = $user->rights->hrm->all->read; // Used by the include of actions_addupdatedelete.inc.php
 
 // Security check (enable the most restrictive one)

From 3752272f1b3cc0463dde249ec3b598e7f7d7d9a9 Mon Sep 17 00:00:00 2001
From: UT from dolibit <45215329+dolibit-ut@users.noreply.github.com>
Date: Sun, 11 Sep 2022 11:41:00 +0200
Subject: [PATCH 888/974] Update skill_tab.php

---
 htdocs/hrm/skill_tab.php | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/htdocs/hrm/skill_tab.php b/htdocs/hrm/skill_tab.php
index 393e20ba3c4..d479a843776 100644
--- a/htdocs/hrm/skill_tab.php
+++ b/htdocs/hrm/skill_tab.php
@@ -20,13 +20,12 @@
  */
 
 /**
- *    \file       skill_tab.php
- *        \ingroup    hrm
- *        \brief      Page to add/delete/view skill to jobs/users
+ *    \file       htdocs/hrm/skill_tab.php
+ *    \ingroup    hrm
+ *    \brief      Page to add/delete/view skill to jobs/users
  */
 
 
-
 // Load Dolibarr environment
 require '../main.inc.php';
 
@@ -39,8 +38,9 @@ require_once DOL_DOCUMENT_ROOT . '/hrm/class/skillrank.class.php';
 require_once DOL_DOCUMENT_ROOT . '/hrm/lib/hrm_skill.lib.php';
 
 // Load translation files required by the page
-$langs->loadLangs(array("hrm", "other"));
+$langs->loadLangs(array('hrm', 'other'));
 
+// Get Parameters
 $id = GETPOST('id', 'int');
 $TSkillsToAdd = GETPOST('fk_skill', 'array');
 $objecttype = GETPOST('objecttype', 'alpha');
@@ -73,8 +73,9 @@ $hookmanager->initHooks(array('skilltab', 'globalcard')); // Note that conf->hoo
 // Load object
 include DOL_DOCUMENT_ROOT . '/core/actions_fetchobject.inc.php'; // Must be include, not include_once.
 
+// Permissions
 $permissiontoread = $user->rights->hrm->all->read;
-$permissiontoadd = $user->rights->hrm->all->write; // Used by the include of actions_addupdatedelete.inc.php and actions_lineupdown.inc.php
+$permissiontoadd  = $user->rights->hrm->all->write; // Used by the include of actions_addupdatedelete.inc.php and actions_lineupdown.inc.php
 
 // Security check (enable the most restrictive one)
 if ($user->socid > 0) accessforbidden();

From 733a7d2c81e62c756adc00a0b13a02ddf495caef Mon Sep 17 00:00:00 2001
From: UT from dolibit <45215329+dolibit-ut@users.noreply.github.com>
Date: Sun, 11 Sep 2022 11:42:59 +0200
Subject: [PATCH 889/974] Update skill_extrafields.php

---
 htdocs/hrm/admin/skill_extrafields.php | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/htdocs/hrm/admin/skill_extrafields.php b/htdocs/hrm/admin/skill_extrafields.php
index adcf6277dd0..1ca37038e93 100644
--- a/htdocs/hrm/admin/skill_extrafields.php
+++ b/htdocs/hrm/admin/skill_extrafields.php
@@ -21,9 +21,9 @@
  */
 
 /**
- *      \file       admin/skill_extrafields.php
- *		\ingroup    hrm
- *		\brief      Page to setup extra fields of hrm
+ *    \file       htdocs/hrm/admin/skill_extrafields.php
+ *    \ingroup    hrm
+ *    \brief      Page to setup extra fields of hrm skills
  */
 
 // Load Dolibarr environment
@@ -48,6 +48,7 @@ $action = GETPOST('action', 'aZ09');
 $attrname = GETPOST('attrname', 'alpha');
 $elementtype = 'hrm_skill'; //Must be the $table_element of the class that manage extrafield
 
+// Security check
 if (!$user->admin) {
 	accessforbidden();
 }

From a5c216e16a4dd82f8e35aae9659de15834e5b43a Mon Sep 17 00:00:00 2001
From: UT from dolibit <45215329+dolibit-ut@users.noreply.github.com>
Date: Sun, 11 Sep 2022 11:44:31 +0200
Subject: [PATCH 890/974] Update job_extrafields.php

---
 htdocs/hrm/admin/job_extrafields.php | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/htdocs/hrm/admin/job_extrafields.php b/htdocs/hrm/admin/job_extrafields.php
index 5d6ea5d6990..6af5f1ffc67 100644
--- a/htdocs/hrm/admin/job_extrafields.php
+++ b/htdocs/hrm/admin/job_extrafields.php
@@ -21,9 +21,9 @@
  */
 
 /**
- *      \file       admin/job_extrafields.php
- *		\ingroup    hrm
- *		\brief      Page to setup extra fields of hrm
+ *    \file       htdocs/hrm/admin/job_extrafields.php
+ *    \ingroup    hrm
+ *    \brief      Page to setup extra fields of hrm jobs
  */
 
 // Load Dolibarr environment
@@ -44,10 +44,12 @@ foreach ($tmptype2label as $key => $val) {
 	$type2label[$key] = $langs->transnoentitiesnoconv($val);
 }
 
+// Get Parameters
 $action = GETPOST('action', 'aZ09');
 $attrname = GETPOST('attrname', 'alpha');
 $elementtype = 'hrm_job'; //Must be the $table_element of the class that manage extrafield
 
+// Security Check
 if (!$user->admin) {
 	accessforbidden();
 }

From f911e79b1cb0404a0434a1b89ed82579ba187fb5 Mon Sep 17 00:00:00 2001
From: UT from dolibit <45215329+dolibit-ut@users.noreply.github.com>
Date: Sun, 11 Sep 2022 11:46:13 +0200
Subject: [PATCH 891/974] Update evaluation_extrafields.php

---
 htdocs/hrm/admin/evaluation_extrafields.php | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/htdocs/hrm/admin/evaluation_extrafields.php b/htdocs/hrm/admin/evaluation_extrafields.php
index 6513ea311e3..ddf20696ff7 100644
--- a/htdocs/hrm/admin/evaluation_extrafields.php
+++ b/htdocs/hrm/admin/evaluation_extrafields.php
@@ -21,9 +21,9 @@
  */
 
 /**
- *      \file       admin/evaluation_extrafields.php
- *		\ingroup    hrm
- *		\brief      Page to setup extra fields of hrm
+ *    \file       htdocs/hrm/admin/evaluation_extrafields.php
+ *    \ingroup    hrm
+ *    \brief      Page to setup extra fields of hrm evaluation
  */
 
 // Load Dolibarr environment
@@ -44,10 +44,12 @@ foreach ($tmptype2label as $key => $val) {
 	$type2label[$key] = $langs->transnoentitiesnoconv($val);
 }
 
+// Get Parameters
 $action = GETPOST('action', 'aZ09');
 $attrname = GETPOST('attrname', 'alpha');
 $elementtype = 'hrm_evaluation'; //Must be the $table_element of the class that manage extrafield
 
+// Security Check
 if (!$user->admin) {
 	accessforbidden();
 }

From 97018db06dd15dcb7a7b2729c27d636296cd3a13 Mon Sep 17 00:00:00 2001
From: UT from dolibit <45215329+dolibit-ut@users.noreply.github.com>
Date: Sun, 11 Sep 2022 11:48:30 +0200
Subject: [PATCH 892/974] Update admin_hrm.php

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

diff --git a/htdocs/hrm/admin/admin_hrm.php b/htdocs/hrm/admin/admin_hrm.php
index 6763fb43f8e..dc8d20403a3 100644
--- a/htdocs/hrm/admin/admin_hrm.php
+++ b/htdocs/hrm/admin/admin_hrm.php
@@ -16,10 +16,12 @@
  */
 
 /**
- * \file 	htdocs/hrm/admin/admin_hrm.php
- * \ingroup HRM
- * \brief 	HRM module setup page
+ *    \file       htdocs/hrm/admin/admin_hrm.php
+ *    \ingroup    HRM
+ *    \brief      HRM module setup page
  */
+
+// Load Dolibarr environment
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/hrm.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
@@ -27,6 +29,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
 // Load translation files required by the page
 $langs->loadLangs(array('admin', 'hrm'));
 
+// Get Parameters
 $action = GETPOST('action', 'aZ09');
 
 // Other parameters HRM_*
@@ -34,8 +37,9 @@ $list = array(
 //		'HRM_EMAIL_EXTERNAL_SERVICE'   // To prevent your public accountant for example
 );
 
+// Permissions
 $permissiontoread = $user->admin;
-$permissiontoadd = $user->admin;
+$permissiontoadd  = $user->admin;
 
 // Security check - Protection if external user
 //if ($user->socid > 0) accessforbidden();

From e43a86521a79767ad5d85ae36ba6030200f11fc7 Mon Sep 17 00:00:00 2001
From: UT from dolibit <45215329+dolibit-ut@users.noreply.github.com>
Date: Sun, 11 Sep 2022 11:50:37 +0200
Subject: [PATCH 893/974] Update admin_establishment.php

---
 htdocs/hrm/admin/admin_establishment.php | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/htdocs/hrm/admin/admin_establishment.php b/htdocs/hrm/admin/admin_establishment.php
index f28c0285e1f..00722526e9d 100644
--- a/htdocs/hrm/admin/admin_establishment.php
+++ b/htdocs/hrm/admin/admin_establishment.php
@@ -16,10 +16,12 @@
  */
 
 /**
- * \file 	htdocs/hrm/admin/admin_establishment.php
- * \ingroup HRM
- * \brief 	HRM Establishment module setup page
+ *    \file       htdocs/hrm/admin/admin_establishment.php
+ *    \ingroup    HRM
+ *    \brief      HRM Establishment module setup page
  */
+
+// Load Dolibarr environment
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/hrm/lib/hrm.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/hrm/class/establishment.class.php';
@@ -29,8 +31,9 @@ $langs->loadLangs(array('admin', 'hrm'));
 
 $error = 0;
 
+// Permissions
 $permissiontoread = $user->admin;
-$permissiontoadd = $user->admin;
+$permissiontoadd  = $user->admin;
 
 // Security check - Protection if external user
 //if ($user->socid > 0) accessforbidden();

From 9c2d4fa2d3032b9246d1c3bffeeb3a0800359b6e Mon Sep 17 00:00:00 2001
From: UT from dolibit <45215329+dolibit-ut@users.noreply.github.com>
Date: Sun, 11 Sep 2022 11:53:37 +0200
Subject: [PATCH 894/974] Update evaluation.class.php

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

diff --git a/htdocs/hrm/class/evaluation.class.php b/htdocs/hrm/class/evaluation.class.php
index 4915d44fb6f..879acff61fa 100644
--- a/htdocs/hrm/class/evaluation.class.php
+++ b/htdocs/hrm/class/evaluation.class.php
@@ -20,9 +20,9 @@
  */
 
 /**
- * \file        class/evaluation.class.php
- * \ingroup     hrm
- * \brief       This file is a CRUD class file for Evaluation (Create/Read/Update/Delete)
+ *    \file        htdocs/hrm/class/evaluation.class.php
+ *    \ingroup     hrm
+ *    \brief       This file is a CRUD class file for Evaluation (Create/Read/Update/Delete)
  */
 
 // Put here all includes required by your class file

From 994603f009a00c6e0eff782e98b30e2a0a7a9dae Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 11 Sep 2022 12:17:49 +0200
Subject: [PATCH 895/974] FIX Missing token

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

diff --git a/htdocs/admin/security.php b/htdocs/admin/security.php
index 795a0557f16..a1281351176 100644
--- a/htdocs/admin/security.php
+++ b/htdocs/admin/security.php
@@ -356,7 +356,7 @@ if ($conf->global->USER_PASSWORD_GENERATED == "Perso") {
 	print '	}';
 
 	print '	function generatelink(){';
-	print '		return "security.php?action=updatepattern&pattern="+getStringArg();';
+	print '		return "security.php?action=updatepattern&token='.newToken().'&pattern="+getStringArg();';
 	print '	}';
 
 	print '	function valuePatternChange(){';

From 2293d826078416ef86f3b19e513808aaf975abbc Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 11 Sep 2022 12:18:43 +0200
Subject: [PATCH 896/974] NEW Add picto property on sub-module for paswword
 generation

---
 htdocs/admin/security.php                     | 16 ++++---
 htdocs/admin/security_file.php                |  2 +-
 htdocs/admin/system/security.php              | 44 +++++++++++++++++--
 .../generate/modGeneratePassNone.class.php    |  2 +
 .../generate/modGeneratePassPerso.class.php   |  2 +
 .../modGeneratePassStandard.class.php         |  2 +
 .../security/generate/modules_genpassword.php |  2 +
 htdocs/langs/en_US/admin.lang                 |  3 +-
 8 files changed, 62 insertions(+), 11 deletions(-)

diff --git a/htdocs/admin/security.php b/htdocs/admin/security.php
index 14975f8c68a..de404916fb4 100644
--- a/htdocs/admin/security.php
+++ b/htdocs/admin/security.php
@@ -216,6 +216,8 @@ print '<td>'.$langs->trans("Example").'</td>';
 print '<td class="center">'.$langs->trans("Activated").'</td>';
 print '</tr>';
 
+$tabConf = explode(";", getDolGlobalString('USER_PASSWORD_PATTERN'));
+
 foreach ($arrayhandler as $key => $module) {
 	// Show modules according to features level
 	if (!empty($module->version) && $module->version == 'development' && $conf->global->MAIN_FEATURES_LEVEL < 2) {
@@ -226,15 +228,16 @@ foreach ($arrayhandler as $key => $module) {
 	}
 
 	if ($module->isEnabled()) {
-		print '<tr class="oddeven"><td width="100">';
+		print '<tr class="oddeven"><td>';
+		print img_picto('', $module->picto, 'class="width25 size15x opacitymedium"').' ';
 		print ucfirst($key);
 		print "</td><td>\n";
 		print $module->getDescription().'<br>';
-		print $langs->trans("MinLength").': '.$module->length;
+		print $langs->trans("MinLength").': <span class="opacitymedium">'.$module->length.'</span>';
 		print '</td>';
 
 		// Show example of numbering module
-		print '<td class="nowrap">';
+		print '<td class="nowraponall">';
 		$tmp = $module->getExample();
 		if (preg_match('/^Error/', $tmp)) {
 			$langs->load("errors");
@@ -246,7 +249,7 @@ foreach ($arrayhandler as $key => $module) {
 		}
 		print '</td>'."\n";
 
-		print '<td width="100" align="center">';
+		print '<td class="center">';
 		if ($conf->global->USER_PASSWORD_GENERATED == $key) {
 			//print img_picto('', 'tick');
 			print img_picto($langs->trans("Enabled"), 'switch_on');
@@ -267,7 +270,6 @@ print '</form>';
 //if($conf->global->MAIN_SECURITY_DISABLEFORGETPASSLINK == 1)
 // Patter for Password Perso
 if ($conf->global->USER_PASSWORD_GENERATED == "Perso") {
-	$tabConf = explode(";", $conf->global->USER_PASSWORD_PATTERN);
 	print '<br>';
 
 	print '<div class="div-table-responsive-no-min">';
@@ -346,7 +348,7 @@ if ($conf->global->USER_PASSWORD_GENERATED == "Perso") {
 	print '	}';
 
 	print '	function generatelink(){';
-	print '		return "security.php?action=updatepattern&pattern="+getStringArg();';
+	print '		return "security.php?action=updatepattern&token='.newToken().'&pattern="+getStringArg();';
 	print '	}';
 
 	print '	function valuePatternChange(){';
@@ -470,7 +472,9 @@ print '</tr>';
 
 
 print '</table>';
+
 print '</form>';
+
 print '<br>';
 
 if (GETPOST('info', 'int') > 0) {
diff --git a/htdocs/admin/security_file.php b/htdocs/admin/security_file.php
index b20287ce19b..ff0d5780ad4 100644
--- a/htdocs/admin/security_file.php
+++ b/htdocs/admin/security_file.php
@@ -113,7 +113,7 @@ print '<br>';
 // Upload options
 
 print '<div class="div-table-responsive-no-min">';
-print '<table class="noborder centpercent">';
+print '<table class="noborder centpercent nomarginbottom">';
 print '<tr class="liste_titre">';
 print '<td colspan="2">'.$langs->trans("Parameters").'</td>';
 print '<td>'.$langs->trans("Value").'</td>';
diff --git a/htdocs/admin/system/security.php b/htdocs/admin/system/security.php
index 4ba5bec5b11..7ee7c93a97d 100644
--- a/htdocs/admin/system/security.php
+++ b/htdocs/admin/system/security.php
@@ -1,5 +1,5 @@
 <?php
-/* Copyright (C) 2013-2019	Laurent Destailleur		<eldy@users.sourceforge.net>
+/* Copyright (C) 2013-2022	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
@@ -312,11 +312,48 @@ print yn(empty($conf->global->MAIN_SECURITY_ENABLECAPTCHA) ? 0 : 1);
 print '<br>';
 print '<br>';
 
+print '<strong>'.$langs->trans("DoNotStoreClearPassword").'</strong>: ';
+print empty($conf->global->DATABASE_PWD_ENCRYPTED) ? '' : img_picto('', 'tick').' ';
+print yn(empty($conf->global->DATABASE_PWD_ENCRYPTED) ? 0 : 1);
+if (empty($conf->global->DATABASE_PWD_ENCRYPTED)) {
+	print ' <span class="opacitymedium">('.$langs->trans("Recommended").' '.yn(1).')</span>';
+}
+print '<br>';
+print '<br>';
+
+/* Already into section conf file */
+/*
+$usepassinconfencrypted = 0;
+global $dolibarr_main_db_pass, $dolibarr_main_db_encrypted_pass;
+if (preg_match('/crypted:/i', $dolibarr_main_db_pass) || !empty($dolibarr_main_db_encrypted_pass)) {
+	$usepassinconfencrypted = 1;
+}
+print '<strong>'.$langs->trans("MainDbPasswordFileConfEncrypted").'</strong>: ';
+print $usepassinconfencrypted ? img_picto('', 'tick').' ' : img_warning().' ';
+print yn($usepassinconfencrypted);
+if (empty($usepassinconfencrypted)) {
+	print ' <span class="opacitymedium">('.$langs->trans("Recommended").' '.yn(1).')</span>';
+}
+print '<br>';
+print '<br>';
+*/
+
+print '<strong>'.$langs->trans("PasswordLength").'</strong>: ';
+print empty($conf->global->DATABASE_PWD_ENCRYPTED) ? '' : img_picto('', 'tick').' ';
+print yn(empty($conf->global->DATABASE_PWD_ENCRYPTED) ? 0 : 1);
+if (empty($conf->global->DATABASE_PWD_ENCRYPTED)) {
+	print ' <span class="opacitymedium">('.$langs->trans("Recommended").' '.yn(1).')</span>';
+}
+print '<br>';
+print '<br>';
+
 
 print '<strong>'.$langs->trans("AntivirusEnabledOnUpload").'</strong>: ';
-print empty($conf->global->MAIN_ANTIVIRUS_COMMAND) ? '' : img_picto('', 'tick').' ';
+print empty($conf->global->MAIN_ANTIVIRUS_COMMAND) ? img_warning().' ' : img_picto('', 'tick').' ';
 print yn(empty($conf->global->MAIN_ANTIVIRUS_COMMAND) ? 0 : 1);
-if (!empty($conf->global->MAIN_ANTIVIRUS_COMMAND)) {
+if (empty($conf->global->MAIN_ANTIVIRUS_COMMAND)) {
+	print ' - <span class="opacitymedium">'.$langs->trans("Recommended").': '.$langs->trans("DefinedAPathForAntivirusCommandIntoSetup", $langs->transnoentitiesnoconv("Home")." - ".$langs->transcountrynoentities("Setup")." - ".$langs->transnoentitiesnoconv("Security")).'</span>';
+} else {
 	print ' &nbsp; - '.$conf->global->MAIN_ANTIVIRUS_COMMAND;
 	if (defined('MAIN_ANTIVIRUS_COMMAND') && !defined('MAIN_ANTIVIRUS_BYPASS_COMMAND_AND_PARAM')) {
 		print ' - <span class="opacitymedium">'.$langs->trans("ValueIsForcedBySystem").'</span>';
@@ -325,6 +362,7 @@ if (!empty($conf->global->MAIN_ANTIVIRUS_COMMAND)) {
 print '<br>';
 print '<br>';
 
+
 $securityevent = new Events($db);
 $eventstolog = $securityevent->eventstolog;
 
diff --git a/htdocs/core/modules/security/generate/modGeneratePassNone.class.php b/htdocs/core/modules/security/generate/modGeneratePassNone.class.php
index c6cfb733f73..3ec764c6ab2 100644
--- a/htdocs/core/modules/security/generate/modGeneratePassNone.class.php
+++ b/htdocs/core/modules/security/generate/modGeneratePassNone.class.php
@@ -35,6 +35,8 @@ class modGeneratePassNone extends ModeleGenPassword
 	 */
 	public $id;
 
+	public $picto = 'fa-keyboard';
+
 	/**
 	 * Minimum length (text visible by end user)
 	 *
diff --git a/htdocs/core/modules/security/generate/modGeneratePassPerso.class.php b/htdocs/core/modules/security/generate/modGeneratePassPerso.class.php
index 02b970ee2aa..e0dd2046020 100644
--- a/htdocs/core/modules/security/generate/modGeneratePassPerso.class.php
+++ b/htdocs/core/modules/security/generate/modGeneratePassPerso.class.php
@@ -37,6 +37,8 @@ class modGeneratePassPerso extends ModeleGenPassword
 	 */
 	public $id;
 
+	public $picto = 'fa-shield-alt';
+
 	/**
 	 * Minimum length (text visible by end user)
 	 *
diff --git a/htdocs/core/modules/security/generate/modGeneratePassStandard.class.php b/htdocs/core/modules/security/generate/modGeneratePassStandard.class.php
index f0e6fcf2a7f..b2d0b260ccb 100644
--- a/htdocs/core/modules/security/generate/modGeneratePassStandard.class.php
+++ b/htdocs/core/modules/security/generate/modGeneratePassStandard.class.php
@@ -35,6 +35,8 @@ class modGeneratePassStandard extends ModeleGenPassword
 	 */
 	public $id;
 
+	public $picto = 'fa-shield-alt';
+
 	/**
 	 * Minimum length (text visible by end user)
 	 *
diff --git a/htdocs/core/modules/security/generate/modules_genpassword.php b/htdocs/core/modules/security/generate/modules_genpassword.php
index 4d397605240..bb1e02774c6 100644
--- a/htdocs/core/modules/security/generate/modules_genpassword.php
+++ b/htdocs/core/modules/security/generate/modules_genpassword.php
@@ -29,6 +29,8 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/functions.lib.php';
  */
 abstract class ModeleGenPassword
 {
+	public $picto = 'generic';
+
 	/**
 	 * Flag to 1 if we must clean ambiguous charaters for the autogeneration of password (List of ambiguous char is in $this->Ambi)
 	 *
diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index a24dd69cc71..d3b2f251a6c 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -2309,4 +2309,5 @@ UseOauth=Use a OAUTH token
 Images=Images
 MaxNumberOfImagesInGetPost=Max number of images allowed in a HTML field submitted in a form
 ScriptIsEmpty=The script is empty
-ShowHideTheNRequests=Show/hide the %s SQL request(s)
\ No newline at end of file
+ShowHideTheNRequests=Show/hide the %s SQL request(s)
+DefinedAPathForAntivirusCommandIntoSetup=Define a path for an antivirus program into <b>%s</b>
\ No newline at end of file

From a0dda0ed7794dc1ed6ad9b1dd7e421e7ca56457a Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 11 Sep 2022 12:35:40 +0200
Subject: [PATCH 897/974] NEW Add more advices into the Setup security page

---
 htdocs/admin/security.php        |  2 +-
 htdocs/admin/system/security.php | 26 ++++++++++++++++++++++----
 2 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/htdocs/admin/security.php b/htdocs/admin/security.php
index de404916fb4..02cddbd5d70 100644
--- a/htdocs/admin/security.php
+++ b/htdocs/admin/security.php
@@ -229,7 +229,7 @@ foreach ($arrayhandler as $key => $module) {
 
 	if ($module->isEnabled()) {
 		print '<tr class="oddeven"><td>';
-		print img_picto('', $module->picto, 'class="width25 size15x opacitymedium"').' ';
+		print img_picto('', $module->picto, 'class="width25 size15x"').' ';
 		print ucfirst($key);
 		print "</td><td>\n";
 		print $module->getDescription().'<br>';
diff --git a/htdocs/admin/system/security.php b/htdocs/admin/system/security.php
index 7ee7c93a97d..c2e486fc940 100644
--- a/htdocs/admin/system/security.php
+++ b/htdocs/admin/system/security.php
@@ -297,7 +297,7 @@ if (empty($conf->global->SECURITY_DISABLE_TEST_ON_OBFUSCATED_CONF)) {
 
 
 
-// Menu security
+// Menu Home - Setup - Security
 
 print '<br>';
 print '<br>';
@@ -338,6 +338,11 @@ print '<br>';
 print '<br>';
 */
 
+/* Password length
+
+// Stored into $tabconf[0] if module generator is "Perso" or specific to the module generator.
+$tabConf = explode(";", getDolGlobalString('USER_PASSWORD_PATTERN'));
+
 print '<strong>'.$langs->trans("PasswordLength").'</strong>: ';
 print empty($conf->global->DATABASE_PWD_ENCRYPTED) ? '' : img_picto('', 'tick').' ';
 print yn(empty($conf->global->DATABASE_PWD_ENCRYPTED) ? 0 : 1);
@@ -346,7 +351,7 @@ if (empty($conf->global->DATABASE_PWD_ENCRYPTED)) {
 }
 print '<br>';
 print '<br>';
-
+*/
 
 print '<strong>'.$langs->trans("AntivirusEnabledOnUpload").'</strong>: ';
 print empty($conf->global->MAIN_ANTIVIRUS_COMMAND) ? img_warning().' ' : img_picto('', 'tick').' ';
@@ -362,6 +367,19 @@ if (empty($conf->global->MAIN_ANTIVIRUS_COMMAND)) {
 print '<br>';
 print '<br>';
 
+$umask = getDolGlobalString('MAIN_UMASK');
+
+print '<strong>'.$langs->trans("UMask").'</strong>: ';
+if (! in_array($umask, array('600', '660', '0600', '0660'))) {
+	print img_warning().' ';
+}
+print $umask;
+if (! in_array($umask, array('600', '660', '0600', '0660'))) {
+	print ' &nbsp; <span class="opacitymedium">('.$langs->trans("Recommended").': 0600 | 0660'.')</span>';
+}
+print '<br>';
+print '<br>';
+
 
 $securityevent = new Events($db);
 $eventstolog = $securityevent->eventstolog;
@@ -527,10 +545,10 @@ print '<br>';
 print '<strong>MAIN_SECURITY_FORCECSP</strong> = '.(empty($conf->global->MAIN_SECURITY_FORCECSP) ? '<span class="opacitymedium">'.$langs->trans("Undefined").'</span>' : $conf->global->MAIN_SECURITY_FORCECSP).' &nbsp; <span class="opacitymedium">('.$langs->trans("Example").": \"default-src 'self'; img-src *;\")</span><br>";
 print '<br>';
 
-print '<strong>WEBSITE_MAIN_SECURITY_FORCECSP</strong> = '.(empty($conf->global->WEBSITE_MAIN_SECURITY_FORCECSP) ? '<span class="opacitymedium">'.$langs->trans("Undefined").'</span>' : $conf->global->WEBSITE_MAIN_SECURITY_FORCECSP).' &nbsp; <span class="opacitymedium">('.$langs->trans("Example").": \"default-src 'self'; style-src: https://cdnjs.cloudflare.com https://fonts.googleapis.com; script-src: https://cdn.transifex.com https://www.googletagmanager.com; object-src https://youtube.com; frame-src https://youtube.com; img-src: *;\")</span><br>";
+print '<strong>MAIN_SECURITY_FORCERP</strong> = '.(empty($conf->global->MAIN_SECURITY_FORCERP) ? '<span class="opacitymedium">'.$langs->trans("Undefined").'</span>' : $conf->global->MAIN_SECURITY_FORCERP).' &nbsp; <span class="opacitymedium">('.$langs->trans("Recommended").': '.$langs->trans("Undefined").' '.$langs->trans("or")." \"same-origin\")</span><br>";
 print '<br>';
 
-print '<strong>MAIN_SECURITY_FORCERP</strong> = '.(empty($conf->global->MAIN_SECURITY_FORCERP) ? '<span class="opacitymedium">'.$langs->trans("Undefined").'</span>' : $conf->global->MAIN_SECURITY_FORCERP).' &nbsp; <span class="opacitymedium">('.$langs->trans("Recommended").': '.$langs->trans("Undefined").' '.$langs->trans("or")." \"same-origin\")</span><br>";
+print '<strong>WEBSITE_MAIN_SECURITY_FORCECSP</strong> = '.(empty($conf->global->WEBSITE_MAIN_SECURITY_FORCECSP) ? '<span class="opacitymedium">'.$langs->trans("Undefined").'</span>' : $conf->global->WEBSITE_MAIN_SECURITY_FORCECSP).' &nbsp; <span class="opacitymedium">('.$langs->trans("Example").": \"default-src 'self'; style-src: https://cdnjs.cloudflare.com https://fonts.googleapis.com; script-src: https://cdn.transifex.com https://www.googletagmanager.com; object-src https://youtube.com; frame-src https://youtube.com; img-src: *;\")</span><br>";
 print '<br>';
 
 print '<strong>WEBSITE_MAIN_SECURITY_FORCERP</strong> = '.(empty($conf->global->WEBSITE_MAIN_SECURITY_FORCERP) ? '<span class="opacitymedium">'.$langs->trans("Undefined").'</span>' : $conf->global->WEBSITE_MAIN_SECURITY_FORCERP).' &nbsp; <span class="opacitymedium">('.$langs->trans("Recommended").': '.$langs->trans("Undefined").' '.$langs->trans("or")." \"strict-origin-when-cross-origin\")</span><br>";

From 60c39933d4d306f807ebba3bd7019b288b9727b0 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 11 Sep 2022 13:26:24 +0200
Subject: [PATCH 898/974] Clean code

---
 htdocs/admin/dav.php             | 14 +++++++-------
 htdocs/admin/system/security.php |  2 +-
 htdocs/dav/fileserver.php        |  5 ++---
 3 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/htdocs/admin/dav.php b/htdocs/admin/dav.php
index d70356650d9..d0fd21c80a0 100644
--- a/htdocs/admin/dav.php
+++ b/htdocs/admin/dav.php
@@ -77,14 +77,14 @@ print '<input type="hidden" name="token" value="'.newToken().'">';
 
 $head = dav_admin_prepare_head();
 
-print dol_get_fiche_head($head, 'webdav', '', -1, 'action');
+print dol_get_fiche_head($head, 'webdav', '', -1, '');
 
 if ($action == 'edit') {
 	print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">';
 	print '<input type="hidden" name="token" value="'.newToken().'">';
 	print '<input type="hidden" name="action" value="update">';
 
-	print '<table class="noborder centpercent">';
+	print '<table class="noborder centpercent nomarginbottom">';
 	print '<tr class="liste_titre"><td>'.$langs->trans("Parameter").'</td><td>'.$langs->trans("Value").'</td></tr>';
 
 	foreach ($arrayofparameters as $key => $val) {
@@ -97,7 +97,7 @@ if ($action == 'edit') {
 		$label = $langs->trans($key);
 		if ($key == 'DAV_RESTICT_ON_IP') {
 			$label = $langs->trans("RESTRICT_ON_IP");
-			$label .= ' '.$langs->trans("Example").': '.$langs->trans("IPListExample");
+			$tooltiphelp .= ' '.$langs->trans("Example").': '.$langs->trans("IPListExample");
 		}
 		print $form->textwithpicto($label, $tooltiphelp);
 		print '</td><td>';
@@ -120,19 +120,19 @@ if ($action == 'edit') {
 	print '</form>';
 	print '<br>';
 } else {
-	print '<table class="noborder centpercent">';
+	print '<table class="noborder centpercent nomarginbottom">';
 	print '<tr class="liste_titre"><td>'.$langs->trans("Parameter").'</td><td>'.$langs->trans("Value").'</td></tr>';
 
 	foreach ($arrayofparameters as $key => $val) {
-		print '<tr class="oddeven"><td class="titlefieldmiddle">';
+		print '<tr class="oddeven"><td>';
 		$tooltiphelp = (($langs->trans($key.'Tooltip') != $key.'Tooltip') ? $langs->trans($key.'Tooltip') : '');
 		$label = $langs->trans($key);
 		if ($key == 'DAV_RESTICT_ON_IP') {
 			$label = $langs->trans("RESTRICT_ON_IP");
-			$label .= ' <span class="opacitymedium">'.$langs->trans("Example").': '.$langs->trans("IPListExample").'</span>';
+			$tooltiphelp .= ' <span class="opacitymedium">'.$langs->trans("Example").': '.$langs->trans("IPListExample").'</span>';
 		}
 		print $form->textwithpicto($label, $tooltiphelp);
-		print '</td><td>';
+		print '</td><td class="minwidth200">';
 		if ($key == 'DAV_ALLOW_PRIVATE_DIR') {
 			print $langs->trans("AlwaysActive");
 		} elseif ($key == 'DAV_ALLOW_PUBLIC_DIR' || $key == 'DAV_ALLOW_ECM_DIR') {
diff --git a/htdocs/admin/system/security.php b/htdocs/admin/system/security.php
index c2e486fc940..5b3b8c9f280 100644
--- a/htdocs/admin/system/security.php
+++ b/htdocs/admin/system/security.php
@@ -375,7 +375,7 @@ if (! in_array($umask, array('600', '660', '0600', '0660'))) {
 }
 print $umask;
 if (! in_array($umask, array('600', '660', '0600', '0660'))) {
-	print ' &nbsp; <span class="opacitymedium">('.$langs->trans("Recommended").': 0600 | 0660'.')</span>';
+	print ' &nbsp; <span class="opacitymedium">('.$langs->trans("Recommended").': 0600 | 0660)</span>';
 }
 print '<br>';
 print '<br>';
diff --git a/htdocs/dav/fileserver.php b/htdocs/dav/fileserver.php
index c77d4d02226..dd46992d211 100644
--- a/htdocs/dav/fileserver.php
+++ b/htdocs/dav/fileserver.php
@@ -66,7 +66,6 @@ if (empty($conf->dav->enabled)) {
 	accessforbidden();
 }
 
-
 // Restrict API to some IPs
 if (!empty($conf->global->DAV_RESTRICT_ON_IP)) {
 	$allowedip = explode(' ', $conf->global->DAV_RESTRICT_ON_IP);
@@ -136,7 +135,7 @@ $authBackend = new \Sabre\DAV\Auth\Backend\BasicCallBack(function ($username, $p
 	return true;
 });
 
-$authBackend->setRealm(constant('DOL_APPLICATION_TITLE'));
+$authBackend->setRealm(constant('DOL_APPLICATION_TITLE').' - WebDAV');
 
 
 
@@ -200,7 +199,7 @@ $lockBackend = new \Sabre\DAV\Locks\Backend\File($tmpDir.'/.locksdb');
 $lockPlugin = new \Sabre\DAV\Locks\Plugin($lockBackend);
 $server->addPlugin($lockPlugin);
 
-// Support for html frontend
+// Support for the html browser
 if (empty($conf->global->DAV_DISABLE_BROWSER)) {
 	$browser = new \Sabre\DAV\Browser\Plugin();
 	$server->addPlugin($browser);

From 85605408fa6ac5b181a815713f0280adaec6262b Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 11 Sep 2022 14:26:35 +0200
Subject: [PATCH 899/974] FIX CSS

---
 htdocs/contact/list.php | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/htdocs/contact/list.php b/htdocs/contact/list.php
index 1070c9e0b9d..59e57d03a60 100644
--- a/htdocs/contact/list.php
+++ b/htdocs/contact/list.php
@@ -1099,7 +1099,7 @@ while ($i < min($num, $limit)) {
 	// ID
 	if (!empty($arrayfields['p.rowid']['checked'])) {
 		print '<td class="tdoverflowmax50">';
-		print $obj->rowid;
+		print dol_escape_htmltag($obj->rowid);
 		print "</td>\n";
 		if (!$i) {
 			$totalarray['nbfield']++;
@@ -1107,7 +1107,7 @@ while ($i < min($num, $limit)) {
 	}
 	// Name
 	if (!empty($arrayfields['p.lastname']['checked'])) {
-		print '<td class="middle tdoverflowmax200">';
+		print '<td class="middle tdoverflowmax150">';
 		print $contactstatic->getNomUrl(1);
 		print '</td>';
 		if (!$i) {
@@ -1116,35 +1116,35 @@ while ($i < min($num, $limit)) {
 	}
 	// Firstname
 	if (!empty($arrayfields['p.firstname']['checked'])) {
-		print '<td class="tdoverflowmax200">'.$obj->firstname.'</td>';
+		print '<td class="tdoverflowmax150" title="'.dol_escape_htmltag($obj->firstname).'">'.dol_escape_htmltag($obj->firstname).'</td>';
 		if (!$i) {
 			$totalarray['nbfield']++;
 		}
 	}
 	// Job position
 	if (!empty($arrayfields['p.poste']['checked'])) {
-		print '<td class="tdoverflowmax100">'.$obj->poste.'</td>';
+		print '<td class="tdoverflowmax100">'.dol_escape_htmltag($obj->poste).'</td>';
 		if (!$i) {
 			$totalarray['nbfield']++;
 		}
 	}
 	// Address
 	if (!empty($arrayfields['p.address']['checked'])) {
-		print '<td>'.$obj->address.'</td>';
+		print '<td>'.dol_escape_htmltag($obj->address).'</td>';
 		if (!$i) {
 			$totalarray['nbfield']++;
 		}
 	}
 	// Zip
 	if (!empty($arrayfields['p.zip']['checked'])) {
-		print '<td>'.$obj->zip.'</td>';
+		print '<td>'.dol_escape_htmltag($obj->zip).'</td>';
 		if (!$i) {
 			$totalarray['nbfield']++;
 		}
 	}
 	// Town
 	if (!empty($arrayfields['p.town']['checked'])) {
-		print '<td>'.$obj->town.'</td>';
+		print '<td class="tdoverflowmax100" title="'.dol_escape_htmltag($obj->town).'">'.dol_escape_htmltag($obj->town).'</td>';
 		if (!$i) {
 			$totalarray['nbfield']++;
 		}
@@ -1165,7 +1165,7 @@ while ($i < min($num, $limit)) {
 	if (!empty($arrayfields['country.code_iso']['checked'])) {
 		print '<td class="center">';
 		$tmparray = getCountry($obj->fk_pays, 'all');
-		print $tmparray['label'];
+		print dol_escape_htmltag($tmparray['label']);
 		print '</td>';
 		if (!$i) {
 			$totalarray['nbfield']++;
@@ -1222,7 +1222,7 @@ while ($i < min($num, $limit)) {
 	if (isModEnabled('socialnetworks')) {
 		foreach ($socialnetworks as $key => $value) {
 			if ($value['active'] && !empty($arrayfields['p.'.$key]['checked'])) {
-				print '<td>'.dol_print_socialnetworks($arraysocialnetworks[$key], $obj->rowid, $obj->socid, $key, $socialnetworks).'</td>';
+				print '<td class="tdoverflowmax100">'.dol_print_socialnetworks($arraysocialnetworks[$key], $obj->rowid, $obj->socid, $key, $socialnetworks).'</td>';
 				if (!$i) {
 					$totalarray['nbfield']++;
 				}
@@ -1291,7 +1291,7 @@ while ($i < min($num, $limit)) {
 	print $hookmanager->resPrint;
 	// Date creation
 	if (!empty($arrayfields['p.datec']['checked'])) {
-		print '<td class="center">';
+		print '<td class="center nowraponall">';
 		print dol_print_date($db->jdate($obj->date_creation), 'dayhour', 'tzuser');
 		print '</td>';
 		if (!$i) {
@@ -1300,7 +1300,7 @@ while ($i < min($num, $limit)) {
 	}
 	// Date modification
 	if (!empty($arrayfields['p.tms']['checked'])) {
-		print '<td class="center">';
+		print '<td class="center nowraponall">';
 		print dol_print_date($db->jdate($obj->date_update), 'dayhour', 'tzuser');
 		print '</td>';
 		if (!$i) {

From 271150e1e64c2e4638c5d0c828642918cdcf2bd4 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 11 Sep 2022 14:26:35 +0200
Subject: [PATCH 900/974] FIX CSS

---
 htdocs/contact/list.php | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/htdocs/contact/list.php b/htdocs/contact/list.php
index 0bb902f7ca1..d41b6829bb2 100644
--- a/htdocs/contact/list.php
+++ b/htdocs/contact/list.php
@@ -1072,7 +1072,7 @@ while ($i < min($num, $limit)) {
 	// ID
 	if (!empty($arrayfields['p.rowid']['checked'])) {
 		print '<td class="tdoverflowmax50">';
-		print $obj->rowid;
+		print dol_escape_htmltag($obj->rowid);
 		print "</td>\n";
 		if (!$i) {
 			$totalarray['nbfield']++;
@@ -1080,7 +1080,7 @@ while ($i < min($num, $limit)) {
 	}
 	// Name
 	if (!empty($arrayfields['p.lastname']['checked'])) {
-		print '<td class="middle tdoverflowmax200">';
+		print '<td class="middle tdoverflowmax150">';
 		print $contactstatic->getNomUrl(1);
 		print '</td>';
 		if (!$i) {
@@ -1089,35 +1089,35 @@ while ($i < min($num, $limit)) {
 	}
 	// Firstname
 	if (!empty($arrayfields['p.firstname']['checked'])) {
-		print '<td class="tdoverflowmax200">'.$obj->firstname.'</td>';
+		print '<td class="tdoverflowmax150" title="'.dol_escape_htmltag($obj->firstname).'">'.dol_escape_htmltag($obj->firstname).'</td>';
 		if (!$i) {
 			$totalarray['nbfield']++;
 		}
 	}
 	// Job position
 	if (!empty($arrayfields['p.poste']['checked'])) {
-		print '<td class="tdoverflowmax100">'.$obj->poste.'</td>';
+		print '<td class="tdoverflowmax100">'.dol_escape_htmltag($obj->poste).'</td>';
 		if (!$i) {
 			$totalarray['nbfield']++;
 		}
 	}
 	// Address
 	if (!empty($arrayfields['p.address']['checked'])) {
-		print '<td>'.$obj->address.'</td>';
+		print '<td>'.dol_escape_htmltag($obj->address).'</td>';
 		if (!$i) {
 			$totalarray['nbfield']++;
 		}
 	}
 	// Zip
 	if (!empty($arrayfields['p.zip']['checked'])) {
-		print '<td>'.$obj->zip.'</td>';
+		print '<td>'.dol_escape_htmltag($obj->zip).'</td>';
 		if (!$i) {
 			$totalarray['nbfield']++;
 		}
 	}
 	// Town
 	if (!empty($arrayfields['p.town']['checked'])) {
-		print '<td>'.$obj->town.'</td>';
+		print '<td class="tdoverflowmax100" title="'.dol_escape_htmltag($obj->town).'">'.dol_escape_htmltag($obj->town).'</td>';
 		if (!$i) {
 			$totalarray['nbfield']++;
 		}
@@ -1138,7 +1138,7 @@ while ($i < min($num, $limit)) {
 	if (!empty($arrayfields['country.code_iso']['checked'])) {
 		print '<td class="center">';
 		$tmparray = getCountry($obj->fk_pays, 'all');
-		print $tmparray['label'];
+		print dol_escape_htmltag($tmparray['label']);
 		print '</td>';
 		if (!$i) {
 			$totalarray['nbfield']++;
@@ -1195,7 +1195,7 @@ while ($i < min($num, $limit)) {
 	if (!empty($conf->socialnetworks->enabled)) {
 		foreach ($socialnetworks as $key => $value) {
 			if ($value['active'] && !empty($arrayfields['p.'.$key]['checked'])) {
-				print '<td>'.dol_print_socialnetworks($arraysocialnetworks[$key], $obj->rowid, $obj->socid, $key, $socialnetworks).'</td>';
+				print '<td class="tdoverflowmax100">'.dol_print_socialnetworks($arraysocialnetworks[$key], $obj->rowid, $obj->socid, $key, $socialnetworks).'</td>';
 				if (!$i) {
 					$totalarray['nbfield']++;
 				}
@@ -1264,7 +1264,7 @@ while ($i < min($num, $limit)) {
 	print $hookmanager->resPrint;
 	// Date creation
 	if (!empty($arrayfields['p.datec']['checked'])) {
-		print '<td class="center">';
+		print '<td class="center nowraponall">';
 		print dol_print_date($db->jdate($obj->date_creation), 'dayhour', 'tzuser');
 		print '</td>';
 		if (!$i) {
@@ -1273,7 +1273,7 @@ while ($i < min($num, $limit)) {
 	}
 	// Date modification
 	if (!empty($arrayfields['p.tms']['checked'])) {
-		print '<td class="center">';
+		print '<td class="center nowraponall">';
 		print dol_print_date($db->jdate($obj->date_update), 'dayhour', 'tzuser');
 		print '</td>';
 		if (!$i) {

From c22db758324f2fbafe66019fc0ec12dab0dbb635 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 10 Sep 2022 16:05:33 +0200
Subject: [PATCH 901/974] FIX Missing reposition

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

diff --git a/htdocs/admin/mails_templates.php b/htdocs/admin/mails_templates.php
index 58a694726bc..f9fe30ef6d7 100644
--- a/htdocs/admin/mails_templates.php
+++ b/htdocs/admin/mails_templates.php
@@ -1242,7 +1242,7 @@ if ($num) {
 				// Status / Active
 				print '<td class="center nowrap">';
 				if ($canbedisabled) {
-					print '<a href="'.$url.'&action='.$acts[$obj->active].'&token='.newToken().'">'.$actl[$obj->active].'</a>';
+					print '<a class="reposition" href="'.$url.'&action='.$acts[$obj->active].'&token='.newToken().'">'.$actl[$obj->active].'</a>';
 				} else {
 					print '<span class="opacitymedium">'.$actl[$obj->active].'</span>';
 				}

From 8d05c98701153f693e11dc779edb631f08f06fa7 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 10 Sep 2022 13:31:20 +0200
Subject: [PATCH 902/974] Can modify creation date

---
 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 cc56b1c9cd7..97ec05d6985 100644
--- a/htdocs/recruitment/class/recruitmentjobposition.class.php
+++ b/htdocs/recruitment/class/recruitmentjobposition.class.php
@@ -115,7 +115,7 @@ class RecruitmentJobPosition extends CommonObject
 		'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'=>-2,),
+		'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,),

From ebc90af5ed7990740d97f1bfcf1e7d85fb05350f Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 11 Sep 2022 14:43:25 +0200
Subject: [PATCH 903/974] Fix css

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

diff --git a/htdocs/contact/list.php b/htdocs/contact/list.php
index 59e57d03a60..eea44ab7387 100644
--- a/htdocs/contact/list.php
+++ b/htdocs/contact/list.php
@@ -938,7 +938,7 @@ if (!empty($arrayfields['p.tms']['checked'])) {
 // Status
 if (!empty($arrayfields['p.statut']['checked'])) {
 	print '<td class="liste_titre center">';
-	print $form->selectarray('search_status', array('-1'=>'', '0'=>$langs->trans('ActivityCeased'), '1'=>$langs->trans('InActivity')), $search_status);
+	print $form->selectarray('search_status', array('-1'=>'', '0'=>$langs->trans('ActivityCeased'), '1'=>$langs->trans('InActivity')), $search_status, 0, 0, 0, '', 0, 0, 0, '', 'minwidth75');
 	print '</td>';
 }
 if (!empty($arrayfields['p.import_key']['checked'])) {
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 42fa3a1a6b6..ea2d941be3d 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -7859,7 +7859,7 @@ class Form
 	 * 	@return	string								HTML select string.
 	 *  @see multiselectarray(), selectArrayAjax(), selectArrayFilter()
 	 */
-	public static function selectarray($htmlname, $array, $id = '', $show_empty = 0, $key_in_label = 0, $value_as_key = 0, $moreparam = '', $translate = 0, $maxlen = 0, $disabled = 0, $sort = '', $morecss = '', $addjscombo = 1, $moreparamonempty = '', $disablebademail = 0, $nohtmlescape = 0)
+	public static function selectarray($htmlname, $array, $id = '', $show_empty = 0, $key_in_label = 0, $value_as_key = 0, $moreparam = '', $translate = 0, $maxlen = 0, $disabled = 0, $sort = '', $morecss = 'minwidth75', $addjscombo = 1, $moreparamonempty = '', $disablebademail = 0, $nohtmlescape = 0)
 	{
 		global $conf, $langs;
 

From d8b6a670644c42884ebe7c95887edf887ddcc9b7 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 11 Sep 2022 15:05:28 +0200
Subject: [PATCH 904/974] Fix picto

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

diff --git a/htdocs/core/triggers/interface_99_modWebhook_WebhookTriggers.class.php b/htdocs/core/triggers/interface_99_modWebhook_WebhookTriggers.class.php
index 335024554fc..a8932934bd1 100644
--- a/htdocs/core/triggers/interface_99_modWebhook_WebhookTriggers.class.php
+++ b/htdocs/core/triggers/interface_99_modWebhook_WebhookTriggers.class.php
@@ -52,7 +52,7 @@ class InterfaceWebhookTriggers extends DolibarrTriggers
 		$this->description = "Webhook triggers.";
 		// 'development', 'experimental', 'dolibarr' or version
 		$this->version = 'development';
-		$this->picto = 'webhook@webhook';
+		$this->picto = 'webhook';
 	}
 
 	/**

From 62cc9c2482e4553c1a9a8214fce590b2fca762c4 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 11 Sep 2022 15:11:56 +0200
Subject: [PATCH 905/974] No trigger with a number higher than 95

---
 ...ss.php => interface_95_modWebhook_WebhookTriggers.class.php} | 0
 ...lass.php => interface_95_modZapier_ZapierTriggers.class.php} | 0
 htdocs/install/upgrade2.php                                     | 2 ++
 3 files changed, 2 insertions(+)
 rename htdocs/core/triggers/{interface_99_modWebhook_WebhookTriggers.class.php => interface_95_modWebhook_WebhookTriggers.class.php} (100%)
 rename htdocs/core/triggers/{interface_99_modZapier_ZapierTriggers.class.php => interface_95_modZapier_ZapierTriggers.class.php} (100%)

diff --git a/htdocs/core/triggers/interface_99_modWebhook_WebhookTriggers.class.php b/htdocs/core/triggers/interface_95_modWebhook_WebhookTriggers.class.php
similarity index 100%
rename from htdocs/core/triggers/interface_99_modWebhook_WebhookTriggers.class.php
rename to htdocs/core/triggers/interface_95_modWebhook_WebhookTriggers.class.php
diff --git a/htdocs/core/triggers/interface_99_modZapier_ZapierTriggers.class.php b/htdocs/core/triggers/interface_95_modZapier_ZapierTriggers.class.php
similarity index 100%
rename from htdocs/core/triggers/interface_99_modZapier_ZapierTriggers.class.php
rename to htdocs/core/triggers/interface_95_modZapier_ZapierTriggers.class.php
diff --git a/htdocs/install/upgrade2.php b/htdocs/install/upgrade2.php
index 01e89bf51ff..94eeb6d6243 100644
--- a/htdocs/install/upgrade2.php
+++ b/htdocs/install/upgrade2.php
@@ -4094,6 +4094,8 @@ function migrate_delete_old_files($db, $langs, $conf)
 		'/core/triggers/interface_modCommande_Ecotax.class.php',
 		'/core/triggers/interface_modCommande_fraisport.class.php',
 		'/core/triggers/interface_modPropale_PropalWorkflow.class.php',
+		'/core/triggers/interface_99_modWebhook_WebhookTriggers.class.php',
+		'/core/triggers/interface_99_modZapier_ZapierTriggers.class.php',
 		'/core/menus/smartphone/iphone.lib.php',
 		'/core/menus/smartphone/iphone_backoffice.php',
 		'/core/menus/smartphone/iphone_frontoffice.php',

From 3ac93040552394395f5cb5a8e01718e3a4587f0d Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 11 Sep 2022 15:17:10 +0200
Subject: [PATCH 906/974] css

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

diff --git a/htdocs/admin/system/database.php b/htdocs/admin/system/database.php
index 9a0a1e4d850..8cd1ad3d597 100644
--- a/htdocs/admin/system/database.php
+++ b/htdocs/admin/system/database.php
@@ -65,7 +65,7 @@ print '<br>';
 print '<div class="div-table-responsive-no-min">';
 print '<table class="noborder centpercent">';
 print '<tr class="liste_titre"><td colspan="2">'.$langs->trans("Tables").'</td></tr>'."\n";
-print '<tr class="oddeven"><td width="300"><a href="'.DOL_URL_ROOT.'/admin/system/database-tables.php?mainmenu=home">'.$langs->trans("List").'</a></td></tr>'."\n";
+print '<tr class="oddeven"><td class=""><a href="'.DOL_URL_ROOT.'/admin/system/database-tables.php?mainmenu=home">'.img_picto('', 'list', 'class="pictofixedwidth"').$langs->trans("List").'</a></td></tr>'."\n";
 print '</table>';
 print '</div>';
 

From e7ea57d183a7c881cba94949641e13d498620740 Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis.houssin@inodbox.com>
Date: Sun, 11 Sep 2022 19:22:51 +0200
Subject: [PATCH 907/974] FIX avoid warning (php7+)

---
 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 b63bb68c4a5..e6c69cadc96 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -1448,9 +1448,9 @@ function dol_escape_htmltag($stringtoescape, $keepb = 0, $keepn = 0, $noescapeta
 
 	// escape quotes and backslashes, newlines, etc.
 	if ($escapeonlyhtmltags) {
-		$tmp = htmlspecialchars_decode($stringtoescape, ENT_COMPAT);
+		$tmp = htmlspecialchars_decode((string) $stringtoescape, ENT_COMPAT);
 	} else {
-		$tmp = html_entity_decode($stringtoescape, ENT_COMPAT, 'UTF-8');
+		$tmp = html_entity_decode((string) $stringtoescape, ENT_COMPAT, 'UTF-8');
 	}
 	if (!$keepb) {
 		$tmp = strtr($tmp, array("<b>"=>'', '</b>'=>''));

From 4a17fae9af464b21a64e708769f36108055e88b9 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 11 Sep 2022 20:48:23 +0200
Subject: [PATCH 908/974] Add info on mitigation

---
 htdocs/admin/system/security.php | 15 +++++++++++++++
 htdocs/core/tpl/login.tpl.php    |  2 ++
 2 files changed, 17 insertions(+)

diff --git a/htdocs/admin/system/security.php b/htdocs/admin/system/security.php
index 5b3b8c9f280..b7074c51095 100644
--- a/htdocs/admin/system/security.php
+++ b/htdocs/admin/system/security.php
@@ -563,6 +563,21 @@ print '<br>';
 print '<br>';
 
 
+print load_fiche_titre($langs->trans("LimitsAndMitigation"), '', 'folder');
+
+print '<span class="opacitymedium">';
+print 'For a higher security, we also recommend to implement limits and mitigation on number of endpoints per minutes for the following URL'."<br>";
+print '</span>';
+
+print '<br>';
+print 'Login process -> This can be done using a fail2ban rule (see example into dev/setup)'."<br>";
+print DOL_URL_ROOT.'/passwordforgotten.php (see example into dev/setup)'."<br>";
+print DOL_URL_ROOT.'/public/* (see example into dev/setup)'."<br>";
+
+
+
+
+
 // End of page
 llxFooter();
 $db->close();
diff --git a/htdocs/core/tpl/login.tpl.php b/htdocs/core/tpl/login.tpl.php
index f179ea9ed36..b7e6fd15dcb 100644
--- a/htdocs/core/tpl/login.tpl.php
+++ b/htdocs/core/tpl/login.tpl.php
@@ -137,9 +137,11 @@ $(document).ready(function () {
 <div class="login_vertical_align">
 
 <form id="login" name="login" method="post" action="<?php echo $php_self; ?>">
+
 <input type="hidden" name="token" value="<?php echo newToken(); ?>" />
 <input type="hidden" name="actionlogin" value="login">
 <input type="hidden" name="loginfunction" value="loginfunction" />
+<input type="hidden" name="backtopage" value="<?php echo GETPOST('backtopage'); ?>" />
 <!-- Add fields to store and send local user information. This fields are filled by the core/js/dst.js -->
 <input type="hidden" name="tz" id="tz" value="" />
 <input type="hidden" name="tz_string" id="tz_string" value="" />

From 34106d2b3ea679e0ca608d10a2a4cac726af2456 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 11 Sep 2022 21:30:12 +0200
Subject: [PATCH 909/974] FIX Test that web dir is correct in install

---
 htdocs/install/step1.php | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/htdocs/install/step1.php b/htdocs/install/step1.php
index 7235e564275..24b5dba4d01 100644
--- a/htdocs/install/step1.php
+++ b/htdocs/install/step1.php
@@ -199,6 +199,14 @@ if (!empty($main_url) && substr($main_url, dol_strlen($main_url) - 1) == "/") {
 	$main_url = substr($main_url, 0, dol_strlen($main_url) - 1);
 }
 
+if (!dol_is_dir($main_dir.'/core/db/')) {
+	print '<div class="error">'.$langs->trans("ErrorBadValueForParameter", $main_dir, $langs->transnoentitiesnoconv("WebPagesDirectory")).'</div>';
+	print '<br>';
+	//print $langs->trans("BecauseConnectionFailedParametersMayBeWrong").'<br><br>';
+	print $langs->trans("ErrorGoBackAndCorrectParameters");
+	$error++;
+}
+
 // Test database connection
 if (!$error) {
 	$result = @include_once $main_dir."/core/db/".$db_type.'.class.php';

From e4faf16c564b12899911275eee69b59f85fb865b Mon Sep 17 00:00:00 2001
From: Faustin <faustin.boitel@bordeaux-inp.fr>
Date: Sun, 11 Sep 2022 21:53:25 +0200
Subject: [PATCH 910/974] scrutinizer: multiple attribute errors considered as
 boolean instead of string[] in if()

---
 htdocs/public/ticket/create_ticket.php | 4 ++--
 htdocs/ticket/class/ticket.class.php   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/htdocs/public/ticket/create_ticket.php b/htdocs/public/ticket/create_ticket.php
index b4df70e3dd8..e982a4507b8 100644
--- a/htdocs/public/ticket/create_ticket.php
+++ b/htdocs/public/ticket/create_ticket.php
@@ -368,7 +368,7 @@ if (empty($reshook)) {
 					}
 					include_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php';
 					$mailfile = new CMailFile($subject, $sendto, $from, $message, $filepath, $mimetype, $filename, $sendtocc, '', $deliveryreceipt, -1, '', '', 'tic'.$object->id, '', 'ticket');
-					if ($mailfile->error || $mailfile->errors) {
+					if ($mailfile->error || !empty($mailfile->errors)) {
 						setEventMessages($mailfile->error, $mailfile->errors, 'errors');
 					} else {
 						$result = $mailfile->sendfile();
@@ -409,7 +409,7 @@ if (empty($reshook)) {
 						}
 						include_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php';
 						$mailfile = new CMailFile($subject, $sendto, $from, $message_admin, $filepath, $mimetype, $filename, $sendtocc, '', $deliveryreceipt, -1, '', '', 'tic'.$object->id, '', 'ticket');
-						if ($mailfile->error || $mailfile->errors) {
+						if ($mailfile->error || !empty($mailfile->errors)) {
 							setEventMessages($mailfile->error, $mailfile->errors, 'errors');
 						} else {
 							$result = $mailfile->sendfile();
diff --git a/htdocs/ticket/class/ticket.class.php b/htdocs/ticket/class/ticket.class.php
index 5306b0c0141..df581d96fdc 100644
--- a/htdocs/ticket/class/ticket.class.php
+++ b/htdocs/ticket/class/ticket.class.php
@@ -1654,7 +1654,7 @@ class Ticket extends CommonObject
 				$sendtocc = '';
 				$deliveryreceipt = 0;
 				$mailfile = new CMailFile($subject, $info_sendto['email'], $from, $tmpmessage, $filepath, $mimetype, $filename, $sendtocc, '', $deliveryreceipt, 0);
-				if ($mailfile->error || $mailfile->errors) {
+				if ($mailfile->error || !empty($mailfile->errors)) {
 					setEventMessages($mailfile->error, $mailfile->errors, 'errors');
 				} else {
 					$result = $mailfile->sendfile();

From 8742e457aa6c2eff9ea6911efb773c52ca38835c Mon Sep 17 00:00:00 2001
From: Faustin <faustin.boitel@bordeaux-inp.fr>
Date: Sun, 11 Sep 2022 22:08:38 +0200
Subject: [PATCH 911/974] scrutinizer on ftp/index.php : type result compared
 with 'false'

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

diff --git a/htdocs/ftp/index.php b/htdocs/ftp/index.php
index 857d41fc85b..74a459328f4 100644
--- a/htdocs/ftp/index.php
+++ b/htdocs/ftp/index.php
@@ -709,7 +709,7 @@ print '<br>';
 if (!empty($conn_id)) {
 	$disconnect = dol_ftp_close($conn_id);
 
-	if ($disconnect == false) {
+	if (!$disconnect) {
 		setEventMessages($langs->trans("ErrorFTPNodisconnect"), null, 'errors');
 	}
 }

From 003723bcf29555d199a76b8e9c77f8e79fa9cf8c Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 11 Sep 2022 22:17:07 +0200
Subject: [PATCH 912/974] Fix missing include

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

diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index 3cbef0d799e..e00c1887fa7 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -1428,6 +1428,7 @@ function top_httphead($contenttype = 'text/html', $forcenocache = 0)
 		$contentsecuritypolicy = empty($conf->global->MAIN_HTTP_CONTENT_SECURITY_POLICY) ? '' : $conf->global->MAIN_HTTP_CONTENT_SECURITY_POLICY;
 
 		if (!is_object($hookmanager)) {
+			include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
 			$hookmanager = new HookManager($db);
 		}
 		$hookmanager->initHooks(array("main"));

From dc7329679457a6cf75069bc3f4dee823ddf74da2 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 11 Sep 2022 21:30:12 +0200
Subject: [PATCH 913/974] FIX Test that web dir is correct in install

---
 htdocs/install/step1.php | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/htdocs/install/step1.php b/htdocs/install/step1.php
index 7235e564275..24b5dba4d01 100644
--- a/htdocs/install/step1.php
+++ b/htdocs/install/step1.php
@@ -199,6 +199,14 @@ if (!empty($main_url) && substr($main_url, dol_strlen($main_url) - 1) == "/") {
 	$main_url = substr($main_url, 0, dol_strlen($main_url) - 1);
 }
 
+if (!dol_is_dir($main_dir.'/core/db/')) {
+	print '<div class="error">'.$langs->trans("ErrorBadValueForParameter", $main_dir, $langs->transnoentitiesnoconv("WebPagesDirectory")).'</div>';
+	print '<br>';
+	//print $langs->trans("BecauseConnectionFailedParametersMayBeWrong").'<br><br>';
+	print $langs->trans("ErrorGoBackAndCorrectParameters");
+	$error++;
+}
+
 // Test database connection
 if (!$error) {
 	$result = @include_once $main_dir."/core/db/".$db_type.'.class.php';

From 0ac45a01ffd4dab83cf8b563763b4f8e056030ee Mon Sep 17 00:00:00 2001
From: Faustin <faustin.boitel@bordeaux-inp.fr>
Date: Sun, 11 Sep 2022 22:21:52 +0200
Subject: [PATCH 914/974] scrutinizer on
 product/stock/stocktransfer/class/stocktransferline.class.php: unset a
 non-existent var

---
 .../stock/stocktransfer/class/stocktransferline.class.php        | 1 -
 1 file changed, 1 deletion(-)

diff --git a/htdocs/product/stock/stocktransfer/class/stocktransferline.class.php b/htdocs/product/stock/stocktransfer/class/stocktransferline.class.php
index a5d49dcc3a7..14febad09d4 100644
--- a/htdocs/product/stock/stocktransfer/class/stocktransferline.class.php
+++ b/htdocs/product/stock/stocktransfer/class/stocktransferline.class.php
@@ -232,7 +232,6 @@ class StockTransferLine extends CommonObjectLine
 
 		// Reset some properties
 		unset($object->id);
-		unset($object->fk_user_creat);
 		unset($object->import_key);
 
 

From da10379090a5365bc63a1620192daa739595e252 Mon Sep 17 00:00:00 2001
From: Faustin <faustin.boitel@bordeaux-inp.fr>
Date: Sun, 11 Sep 2022 22:26:02 +0200
Subject: [PATCH 915/974] scrutinizer on
 product/stock/stocktransfer/class/stocktransferline.class.php: unset a
 non-existent var

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

diff --git a/htdocs/product/stock/stocktransfer/class/stocktransfer.class.php b/htdocs/product/stock/stocktransfer/class/stocktransfer.class.php
index d0f27eb46f4..da21a95cdb7 100644
--- a/htdocs/product/stock/stocktransfer/class/stocktransfer.class.php
+++ b/htdocs/product/stock/stocktransfer/class/stocktransfer.class.php
@@ -140,6 +140,7 @@ class StockTransfer extends CommonObject
 	public $note_private;
 	public $date_creation;
 	public $tms;
+	public $lead_time_for_warning;
 	public $fk_user_creat;
 	public $fk_user_modif;
 	public $import_key;

From 07128e3d686d2e2e5d6f2496eb1ebd3768a9084a Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 11 Sep 2022 22:29:54 +0200
Subject: [PATCH 916/974] Fix sql for llx_element_categorie

---
 htdocs/install/mysql/tables/llx_element_categorie.key.sql | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/htdocs/install/mysql/tables/llx_element_categorie.key.sql b/htdocs/install/mysql/tables/llx_element_categorie.key.sql
index 0367eddc0a1..5ad41616d38 100644
--- a/htdocs/install/mysql/tables/llx_element_categorie.key.sql
+++ b/htdocs/install/mysql/tables/llx_element_categorie.key.sql
@@ -17,6 +17,6 @@
 -- ============================================================================
 
 
-ALTER TABLE llx_element_categorie ADD UNIQUE INDEX idx_element_categorie_idx1 (fk_element, fk_categorie);
-	
-ALTER TABLE llx_element_contact ADD CONSTRAINT fk_element_categorie_fk_categorie FOREIGN KEY (fk_categorie)     REFERENCES llx_fk_categorie(rowid);
+ALTER TABLE llx_element_categorie ADD UNIQUE INDEX idx_element_categorie_idx (fk_element, fk_categorie);
+
+ALTER TABLE llx_element_categorie ADD CONSTRAINT fk_element_categorie_fk_categorie FOREIGN KEY (fk_categorie)     REFERENCES llx_fk_categorie(rowid);

From 605db7d7925c50f937ce810cb7b9bf898cbd80f6 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 11 Sep 2022 22:31:30 +0200
Subject: [PATCH 917/974] Fix missing creation of table

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

diff --git a/htdocs/install/mysql/migration/16.0.0-17.0.0.sql b/htdocs/install/mysql/migration/16.0.0-17.0.0.sql
index d97f92fcc5e..01cbb851d51 100644
--- a/htdocs/install/mysql/migration/16.0.0-17.0.0.sql
+++ b/htdocs/install/mysql/migration/16.0.0-17.0.0.sql
@@ -159,3 +159,14 @@ ALTER TABLE llx_don ADD INDEX idx_don_fk_user_valid (fk_user_valid);
 
 ALTER TABLE llx_commande ADD COLUMN revenuestamp double(24,8) DEFAULT 0 after localtax2;
 
+create table llx_element_categorie
+(
+  rowid integer AUTO_INCREMENT PRIMARY KEY,
+  fk_categorie  integer NOT NULL,
+  fk_element  integer NOT NULL,
+  import_key    varchar(14)
+)ENGINE=innodb;
+
+ALTER TABLE llx_element_categorie ADD UNIQUE INDEX idx_element_categorie_idx (fk_element, fk_categorie);
+
+ALTER TABLE llx_element_categorie ADD CONSTRAINT fk_element_categorie_fk_categorie FOREIGN KEY (fk_categorie)     REFERENCES llx_fk_categorie(rowid);

From 9cdcac7c1c773b51322cf5be19ba645a7ef529a3 Mon Sep 17 00:00:00 2001
From: Faustin <faustin.boitel@bordeaux-inp.fr>
Date: Sun, 11 Sep 2022 22:38:51 +0200
Subject: [PATCH 918/974] scrutinizer on
 product/stock/stocktransfer/class/stocktransfer.class.php: var ref_client
 undefined on object, so added it and added also ref_customer because
 ref_client is deprecated

---
 .../stocktransfer/class/stocktransfer.class.php     | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/htdocs/product/stock/stocktransfer/class/stocktransfer.class.php b/htdocs/product/stock/stocktransfer/class/stocktransfer.class.php
index da21a95cdb7..a71098fc2bf 100644
--- a/htdocs/product/stock/stocktransfer/class/stocktransfer.class.php
+++ b/htdocs/product/stock/stocktransfer/class/stocktransfer.class.php
@@ -57,6 +57,19 @@ class StockTransfer extends CommonObject
 	 */
 	public $isextrafieldmanaged = 1;
 
+	/**
+	* @var string Customer ref
+	* @deprecated
+	* @see $ref_customer
+	*/
+	public $ref_client;
+
+	/**
+	 * @var string Customer ref
+	 */
+	public $ref_customer;
+
+
 	/**
 	 * @var string String with name of icon for stocktransfer. Must be the part after the 'object_' into object_stocktransfer.png
 	 */

From 4cde1e89910ffede6de44461d709f0e0631e919e Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 11 Sep 2022 22:45:02 +0200
Subject: [PATCH 919/974] Doc

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

diff --git a/htdocs/conf/conf.php.example b/htdocs/conf/conf.php.example
index 487576ed058..cb4aad1660c 100644
--- a/htdocs/conf/conf.php.example
+++ b/htdocs/conf/conf.php.example
@@ -162,8 +162,9 @@ $dolibarr_main_db_readonly=0;
 
 // dolibarr_main_instance_unique_id
 // An secret ID that is unique for each installation.
-// This value is also visible and never propagated outside of Dolibarr, so it can be used as a salt / key for some encryption.
-// To propagate a unique key, you propagate the value concatenated with a string with a hash function. Example: md5('dolibarr'+dolibarr_main_instance_unique_id)
+// This value is also visible and never propagated outside of Dolibarr, so it can be used as a salt / key for some encryption (For example to get
+//  a unique hashed key, application will hash the value concatenated with a string. Example: md5('dolibarr'+dolibarr_main_instance_unique_id)
+// WARNING: Changing this value will also make some sensitive values encrypted in database wrong.
 // Default value: randomly defined during installation
 // Examples:
 // $dolibarr_main_instance_unique_id='84b5bc91f83b56e458db71e0adac2b62';

From f5adbf798365022c225f2ca706f5d0677c85dd47 Mon Sep 17 00:00:00 2001
From: Faustin <faustin.boitel@bordeaux-inp.fr>
Date: Sun, 11 Sep 2022 22:57:00 +0200
Subject: [PATCH 920/974] scrutinizer on
 core/modules/import/import_xlsx.modules.php : array $where not always defined

---
 htdocs/core/modules/import/import_xlsx.modules.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/htdocs/core/modules/import/import_xlsx.modules.php b/htdocs/core/modules/import/import_xlsx.modules.php
index 6d7c5bf82fd..6b2c02de197 100644
--- a/htdocs/core/modules/import/import_xlsx.modules.php
+++ b/htdocs/core/modules/import/import_xlsx.modules.php
@@ -876,11 +876,12 @@ class ImportXlsx extends ModeleImports
 						if (!empty($updatekeys)) {
 							// We do SELECT to get the rowid, if we already have the rowid, it's to be used below for related tables (extrafields)
 
+							$where = array();
+
 							if (empty($lastinsertid)) {	// No insert done yet for a parent table
 								$sqlSelect = "SELECT ".$fname." FROM " . $tablename;
 
 								$data = array_combine($listfields, $listvalues);
-								$where = array();
 								$filters = array();
 								foreach ($updatekeys as $key) {
 									$col = $objimport->array_import_updatekeys[0][$key];
@@ -929,6 +930,7 @@ class ImportXlsx extends ModeleImports
 								// Note: For extrafield tablename, we have in importfieldshidden_array an enty 'extra.fk_object'=>'lastrowid-tableparent' so $keyfield is 'fk_object'
 								$sqlSelect = "SELECT rowid FROM " . $tablename;
 
+
 								if (empty($keyfield)) {
 									$keyfield = 'rowid';
 								}

From 0016e7c5e84b075a3e6b79d003f215b48f93334d Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 11 Sep 2022 23:47:32 +0200
Subject: [PATCH 921/974] Fix section with root pass restored when required if
 hidden

---
 htdocs/install/fileconf.php | 62 +++++++++++++++++++++++--------------
 htdocs/install/inc.php      |  2 +-
 2 files changed, 40 insertions(+), 24 deletions(-)

diff --git a/htdocs/install/fileconf.php b/htdocs/install/fileconf.php
index 14f1ee2a1cd..f8dcdfe230b 100644
--- a/htdocs/install/fileconf.php
+++ b/htdocs/install/fileconf.php
@@ -448,7 +448,10 @@ if (!empty($force_install_noedit)) {
 			<input type="checkbox"
 				   id="db_create_database"
 				   name="db_create_database"
-				<?php if ($force_install_createdatabase) {
+				<?php
+				$checked = 0;
+				if ($force_install_createdatabase) {
+					$checked = 1;
 					print ' checked';
 				} ?>
 				<?php if ($force_install_noedit == 2 && $force_install_createdatabase !== null) {
@@ -456,7 +459,8 @@ if (!empty($force_install_noedit)) {
 				} ?>
 			>
 		</td>
-		<td class="comment"><?php echo $langs->trans("CheckToCreateDatabase"); ?>
+		<td class="comment">
+		<?php echo $langs->trans("CheckToCreateDatabase"); ?>
 		</td>
 	</tr>
 
@@ -503,7 +507,10 @@ if (!empty($force_install_noedit)) {
 			<input type="checkbox"
 				   id="db_create_user"
 				   name="db_create_user"
-				<?php if (!empty($force_install_createuser)) {
+				<?php
+				$checked = 0;
+				if (!empty($force_install_createuser)) {
+					$checked = 1;
 					print ' checked';
 				} ?>
 				<?php if ($force_install_noedit == 2 && $force_install_createuser !== null) {
@@ -511,7 +518,8 @@ if (!empty($force_install_noedit)) {
 				} ?>
 			>
 		</td>
-		<td class="comment"><?php echo $langs->trans("CheckToCreateUser"); ?>
+		<td class="comment">
+		<?php echo $langs->trans("CheckToCreateUser"); ?>
 		</td>
 	</tr>
 
@@ -613,30 +621,13 @@ jQuery(document).ready(function() {
 
 	});
 
-	function init_needroot()
-	{
-		console.log("init_needroot force_install_noedit=<?php echo $force_install_noedit?>");
-		/*alert(jQuery("#db_create_database").prop("checked")); */
-		if (jQuery("#db_create_database").is(":checked") || jQuery("#db_create_user").is(":checked"))
-		{
-			jQuery(".hideroot").show();
-			<?php
-			if (empty($force_install_noedit)) { ?>
-				jQuery(".needroot").removeAttr('disabled');
-			<?php } ?>
-		}
-		else
-		{
-			jQuery(".hideroot").hide();
-			jQuery(".needroot").prop('disabled', true);
-		}
-	}
-
 	init_needroot();
 	jQuery("#db_create_database").click(function() {
+		console.log("click on db_create_database");
 		init_needroot();
 	});
 	jQuery("#db_create_user").click(function() {
+		console.log("click on db_create_user");
 		init_needroot();
 	});
 	<?php if ($force_install_noedit == 2 && empty($force_install_databasepass)) { ?>
@@ -644,6 +635,27 @@ jQuery(document).ready(function() {
 	<?php } ?>
 });
 
+function init_needroot()
+{
+	console.log("init_needroot force_install_noedit=<?php echo $force_install_noedit?>");
+	/*alert(jQuery("#db_create_database").prop("checked")); */
+	if (jQuery("#db_create_database").is(":checked") || jQuery("#db_create_user").is(":checked"))
+	{
+		console.log("init_needroot show root section");
+		jQuery(".hideroot").show();
+		<?php
+		if (empty($force_install_noedit)) { ?>
+			jQuery(".needroot").removeAttr('disabled');
+		<?php } ?>
+	}
+	else
+	{
+		console.log("init_needroot hide root section");
+		jQuery(".hideroot").hide();
+		jQuery(".needroot").prop('disabled', true);
+	}
+}
+
 function checkDatabaseName(databasename) {
 	if (databasename.match(/[;\.]/)) { return false; }
 	return true;
@@ -651,6 +663,8 @@ function checkDatabaseName(databasename) {
 
 function jscheckparam()
 {
+	console.log("Click on jscheckparam");
+
 	ok=true;
 
 	if (document.forminstall.main_dir.value == '')
@@ -688,12 +702,14 @@ function jscheckparam()
 	{
 		ok=false;
 		alert('<?php echo dol_escape_js($langs->transnoentities("YouAskToCreateDatabaseSoRootRequired")); ?>');
+		init_needroot();
 	}
 	// If create user asked
 	else if (document.forminstall.db_create_user.checked == true && (document.forminstall.db_user_root.value == ''))
 	{
 		ok=false;
 		alert('<?php echo dol_escape_js($langs->transnoentities("YouAskToCreateDatabaseUserSoRootRequired")); ?>');
+		init_needroot();
 	}
 
 	return ok;
diff --git a/htdocs/install/inc.php b/htdocs/install/inc.php
index a20c3489866..657e9841100 100644
--- a/htdocs/install/inc.php
+++ b/htdocs/install/inc.php
@@ -530,7 +530,7 @@ function pFooter($nonext = 0, $setuplang = '', $jscheckfunction = '', $withpleas
 		print '<input type="hidden" name="selectlang" value="'.dol_escape_htmltag($setuplang).'">';
 	}
 
-	print '</form>'."\n";
+	print '</form><br>'."\n";
 
 	// If there is some logs in buffer to show
 	if (isset($conf->logbuffer) && count($conf->logbuffer)) {

From 472602121d0ea84f232507e776519f794a3496fd Mon Sep 17 00:00:00 2001
From: UT from dolibit <45215329+dolibit-ut@users.noreply.github.com>
Date: Mon, 12 Sep 2022 09:57:58 +0200
Subject: [PATCH 922/974] Update note.php

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

diff --git a/htdocs/fourn/commande/note.php b/htdocs/fourn/commande/note.php
index ee5c0335ce9..167c506b651 100644
--- a/htdocs/fourn/commande/note.php
+++ b/htdocs/fourn/commande/note.php
@@ -20,11 +20,12 @@
  */
 
 /**
- *       \file       htdocs/fourn/commande/note.php
- *       \ingroup    commande
- *       \brief      Fiche note commande
+ *    \file       htdocs/fourn/commande/note.php
+ *    \ingroup    commande
+ *    \brief      page for notes on supplier orders
  */
 
+
 // Load Dolibarr environment
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/fourn.lib.php';
@@ -36,6 +37,7 @@ if (isModEnabled('project')) {
 // Load translation files required by the page
 $langs->loadLangs(array("suppliers", "orders", "companies", "stocks"));
 
+// Get Parameters
 $id = GETPOST('facid', 'int') ?GETPOST('facid', 'int') : GETPOST('id', 'int');
 $ref = GETPOST('ref');
 $action = GETPOST('action', 'aZ09');
@@ -45,12 +47,14 @@ if ($user->socid) {
 	$socid = $user->socid;
 }
 
+// Init Objects
 $hookmanager->initHooks(array('ordersuppliercardnote'));
 $result = restrictedArea($user, 'fournisseur', $id, 'commande_fournisseur', 'commande');
 
 $object = new CommandeFournisseur($db);
 $object->fetch($id, $ref);
 
+// Permissions
 $permissionnote = ($user->rights->fournisseur->commande->creer || $user->rights->supplier_order->creer); // Used by the include of actions_setnotes.inc.php
 
 
@@ -70,6 +74,7 @@ if (empty($reshook)) {
 /*
  * View
  */
+
 $title = $object->ref." - ".$langs->trans('Notes');
 $help_url = 'EN:Module_Suppliers_Orders|FR:CommandeFournisseur|ES:Módulo_Pedidos_a_proveedores';
 llxHeader('', $title, $help_url);

From 4d21d7664422299da1d351fd73bd8a5ba5880206 Mon Sep 17 00:00:00 2001
From: UT from dolibit <45215329+dolibit-ut@users.noreply.github.com>
Date: Mon, 12 Sep 2022 10:01:47 +0200
Subject: [PATCH 923/974] Update list.php

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

diff --git a/htdocs/fourn/commande/list.php b/htdocs/fourn/commande/list.php
index 4b8c1cffc6d..b08396706d4 100644
--- a/htdocs/fourn/commande/list.php
+++ b/htdocs/fourn/commande/list.php
@@ -26,27 +26,30 @@
  */
 
 /**
- *   \file       htdocs/fourn/commande/list.php
- *   \ingroup    fournisseur
- *   \brief      List of purchase orders
+ *    \file       htdocs/fourn/commande/list.php
+ *    \ingroup    fournisseur
+ *    \brief      List of purchase orders
  */
 
+
 // Load Dolibarr environment
 require '../../main.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formorder.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.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.'/fourn/class/fournisseur.class.php';
 require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.commande.class.php';
 require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php';
-require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
-require_once DOL_DOCUMENT_ROOT.'/core/class/html.formorder.class.php';
-require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
-require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php';
 require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
 require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 
+// Load translation files required by the page
 $langs->loadLangs(array("orders", "sendings", 'deliveries', 'companies', 'compta', 'bills', 'projects', 'suppliers', 'products'));
 
+// Get Parameters
 $action = GETPOST('action', 'aZ09');
 $massaction = GETPOST('massaction', 'alpha');
 $show_files = GETPOST('show_files', 'int');
@@ -54,6 +57,7 @@ $confirm = GETPOST('confirm', 'alpha');
 $toselect = GETPOST('toselect', 'array');
 $contextpage = GETPOST('contextpage', 'aZ') ?GETPOST('contextpage', 'aZ') : 'supplierorderlist';
 
+// 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');
@@ -62,6 +66,7 @@ $search_date_order_endmonth = GETPOST('search_date_order_endmonth', 'int');
 $search_date_order_endyear = GETPOST('search_date_order_endyear', 'int');
 $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');
@@ -79,6 +84,7 @@ $search_date_valid_endmonth = GETPOST('search_date_valid_endmonth', 'int');
 $search_date_valid_endyear = GETPOST('search_date_valid_endyear', 'int');
 $search_date_valid_start = dol_mktime(0, 0, 0, $search_date_valid_startmonth, $search_date_valid_startday, $search_date_valid_startyear);	// 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');

From 32ebee39ff6e38bd25fc13380d3a328f3f7f83b6 Mon Sep 17 00:00:00 2001
From: UT from dolibit <45215329+dolibit-ut@users.noreply.github.com>
Date: Mon, 12 Sep 2022 10:04:48 +0200
Subject: [PATCH 924/974] Update info.php

---
 htdocs/fourn/commande/info.php | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/htdocs/fourn/commande/info.php b/htdocs/fourn/commande/info.php
index 017818e3e6b..698fead1a43 100644
--- a/htdocs/fourn/commande/info.php
+++ b/htdocs/fourn/commande/info.php
@@ -19,17 +19,18 @@
  */
 
 /**
- *       \file       htdocs/fourn/commande/info.php
- *       \ingroup    commande
- *       \brief      Fiche commande
+ *    \file       htdocs/fourn/commande/info.php
+ *    \ingroup    commande
+ *    \brief      Info page for Purchase Order / Supplier Order
  */
 
+
 // Load Dolibarr environment
 require '../../main.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/fourn.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.commande.class.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
 if (isModEnabled('project')) {
 	require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 }
@@ -37,8 +38,9 @@ if (isModEnabled('project')) {
 // Load translation files required by the page
 $langs->loadLangs(array("suppliers", "orders", "companies", "stocks"));
 
-$id = GETPOST('id', 'int');
-$ref = GETPOST('ref', 'alpha');
+// Get Paramters
+$id     = GETPOST('id', 'int');
+$ref    = GETPOST('ref', 'alpha');
 $action = GETPOST('action', 'aZ09');
 
 $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
@@ -79,6 +81,7 @@ if (empty($user->rights->fournisseur->commande->lire)) {
 	accessforbidden();
 }
 
+// Init Hooks
 $hookmanager->initHooks(array('ordersuppliercardinfo'));
 
 

From 0a7d535f342b0678f2570551bdc1b12f638048ac Mon Sep 17 00:00:00 2001
From: UT from dolibit <45215329+dolibit-ut@users.noreply.github.com>
Date: Mon, 12 Sep 2022 10:08:04 +0200
Subject: [PATCH 925/974] Update index.php

---
 htdocs/fourn/commande/index.php | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/htdocs/fourn/commande/index.php b/htdocs/fourn/commande/index.php
index 5fc4d46072e..dc30d1296f9 100644
--- a/htdocs/fourn/commande/index.php
+++ b/htdocs/fourn/commande/index.php
@@ -3,7 +3,7 @@
  * Copyright (C) 2004-2012	Laurent Destailleur	<eldy@users.sourceforge.net>
  * Copyright (C) 2005-2012	Regis Houssin		<regis.houssin@inodbox.com>
  * Copyright (C) 2012		Vinicius Nogueira	<viniciusvgn@gmail.com>
- * Copyright (C) 2019           Nicolas ZABOURI         <info@inovea-conseil.com>
+ * Copyright (C) 2019		Nicolas ZABOURI         <info@inovea-conseil.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -20,16 +20,22 @@
  */
 
 /**
- *	 \file	   htdocs/fourn/commande/index.php
- *	 \ingroup	commande fournisseur
- *	 \brief	  Home page of supplier's orders area
+ *    \file	      htdocs/fourn/commande/index.php
+ *    \ingroup    commande fournisseur
+ *    \brief      Home page of supplier's orders area
  */
 
+
 // Load Dolibarr environment
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
-require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.commande.class.php';
 require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
+require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.commande.class.php';
+
+
+// Load translation files required by the page
+$langs->loadLangs(array("suppliers", "orders"));
+
 
 // Security check
 $orderid = GETPOST('orderid');
@@ -43,8 +49,6 @@ $hookmanager = new HookManager($db);
 // Initialize technical object to manage hooks. Note that conf->hooks_modules contains array
 $hookmanager->initHooks(array('orderssuppliersindex'));
 
-// Load translation files required by the page
-$langs->loadLangs(array("suppliers", "orders"));
 
 
 /*

From f47893bfd9c012cbca2f75f5f510cc8a0caa5686 Mon Sep 17 00:00:00 2001
From: UT from dolibit <45215329+dolibit-ut@users.noreply.github.com>
Date: Mon, 12 Sep 2022 10:12:27 +0200
Subject: [PATCH 926/974] Update card.php

---
 htdocs/fourn/commande/card.php | 38 ++++++++++++++++++++--------------
 1 file changed, 22 insertions(+), 16 deletions(-)

diff --git a/htdocs/fourn/commande/card.php b/htdocs/fourn/commande/card.php
index 3a0568c8fbe..470525102cc 100644
--- a/htdocs/fourn/commande/card.php
+++ b/htdocs/fourn/commande/card.php
@@ -28,22 +28,24 @@
  */
 
 /**
- *	\file		htdocs/fourn/commande/card.php
- *	\ingroup	supplier, order
- *	\brief		Card supplier order
+ *    \file       htdocs/fourn/commande/card.php
+ *    \ingroup    supplier, order
+ *    \brief      Card supplier order
  */
 
+
 // Load Dolibarr environment
 require '../../main.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formorder.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/fourn.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/modules/supplier_order/modules_commandefournisseur.php';
 require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.commande.class.php';
 require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.product.class.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/fourn.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
+
 if (isModEnabled('supplier_proposal')) {
 	require_once DOL_DOCUMENT_ROOT.'/supplier_proposal/class/supplier_proposal.class.php';
 }
@@ -60,29 +62,33 @@ if (!empty($conf->variants->enabled)) {
 	require_once DOL_DOCUMENT_ROOT.'/variants/class/ProductCombination.class.php';
 }
 
+
+// Load translation files required by the page
 $langs->loadLangs(array('admin', 'orders', 'sendings', 'companies', 'bills', 'propal', 'receptions', 'supplier_proposal', 'deliveries', 'products', 'stocks', 'productbatch'));
 if (!empty($conf->incoterm->enabled)) {
 	$langs->load('incoterm');
 }
 
+
+// Get Parameters
 $id = GETPOST('id', 'int');
 $ref = GETPOST('ref', 'alpha');
-$action 		= GETPOST('action', 'alpha');
-$confirm		= GETPOST('confirm', 'alpha');
+$action      = GETPOST('action', 'alpha');
+$confirm     = GETPOST('confirm', 'alpha');
 $contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'purchaseordercard'; // To manage different context of search
 
 $backtopage = GETPOST('backtopage', 'alpha');
 $backtopageforcancel = GETPOST('backtopageforcancel', 'alpha');
 
-$socid = GETPOST('socid', 'int');
+$socid     = GETPOST('socid', 'int');
 $projectid = GETPOST('projectid', 'int');
-$cancel         = GETPOST('cancel', 'alpha');
-$lineid         = GETPOST('lineid', 'int');
-$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;
+$cancel    = GETPOST('cancel', 'alpha');
+$lineid    = GETPOST('lineid', 'int');
+$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;
 
-//PDF
+// PDF
 $hidedetails = (GETPOST('hidedetails', 'int') ? GETPOST('hidedetails', 'int') : (!empty($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_DETAILS) ? 1 : 0));
 $hidedesc = (GETPOST('hidedesc', 'int') ? GETPOST('hidedesc', 'int') : (!empty($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_DESC) ? 1 : 0));
 $hideref = (GETPOST('hideref', 'int') ? GETPOST('hideref', 'int') : (!empty($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_REF) ? 1 : 0));

From e1eb25ab457286f937ea26db5dd6117a35a9cf10 Mon Sep 17 00:00:00 2001
From: UT from dolibit <45215329+dolibit-ut@users.noreply.github.com>
Date: Mon, 12 Sep 2022 10:22:59 +0200
Subject: [PATCH 927/974] Update ChangeLog

---
 ChangeLog | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 7a87f3fbc2d..8b4c9cf871d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -53,14 +53,11 @@ NEW: Add column "Total HT" to products array on document creation card
 NEW: Add configuration for text color of button action
 NEW: Add entity filter in exports
 NEW: Show the event block on recurring invoices #20870
-NEW: Add filter "opportunity status" on statistics of projects.
 NEW: Add firstname, lastname and max number of attendees for module "Event Organization"
 NEW: Add margin info in proposal and order list
 NEW: Add massaction "Edit Extrafield" for Product
 NEW: Add more fields to detect duplicate during import of thirdparties
 NEW: Add option to foce delivery on email for purchase order receipt to yes
-NEW: Add param border table for md theme
-NEW: Add param color button action
 NEW: Add possibility to create contract from invoice
 NEW: Add possibility with constant MAIN_LOGIN_BADCHARUNAUTHORIZED to define bad character unauthorized into login name
 NEW: Add private and public notes on tax files.
@@ -70,12 +67,10 @@ NEW: allow cut&paste as real numeric value to excel
 NEW: A public form to send a message and create a lead is available
 NEW: automatically set totally received status in reception
 NEW: Auto set invoice paid when adding credit not and remain to pay is 0
-NEW: Can change value of AWP during the inventory
 NEW: Can enter price with tax for predefined products on purchase objects
 NEW: Can filter on a thirdparty on product statistics
 NEW: Can removed doc templates from setup page of thirdparty
 NEW: Can use ! to make a search that exclude a string
-NEW: Change in theme colors does not need to use the refresh button
 NEW: clean values and amount in FEC import
 NEW: const MAIL_MASS_ACTION_ADD_LAST_IF_MAIN_DOC_NOT_FOUND for mailing mass action
 NEW: Contact filter project list
@@ -94,25 +89,26 @@ NEW: JS inventory autocalc input
 NEW: language support for more emailing target selectors
 NEW: leave requests: add field into type dictionary to block request if balance is negative
 NEW: Mass action "Close shipments"
-NEW: Module BOM - Add tabs for nets Bom
-NEW: Module BOM - Add the possibility to add sub-BOMs to BOM
+NEW: Module BOM - add tabs for nets Bom
+NEW: Module BOM - add the possibility to add sub-BOMs to BOM
 NEW: Module Recruitment - Add a public page with list of all open job positions.
 NEW: Module Recruitment - Add a tab with list of application on the jobposition file.
-NEW: More mode for THEME_TOPMENU_DISABLE_IMAGE (2, 3, ...)
 NEW: Add option to move checkbox column as first column on Thirdparty list (only few screens)
 NEW: payment conditions enabling semi-automatic deposit creation (Issue #18439)
 NEW: possibility to consume multiple batch
 NEW: Reverse movement product consumption
 NEW: Send email to the supplier order contact
 NEW: add permission to report time on timesheet
-NEW: Knowledge Management - Add status "Obsolete" to KM articles
+NEW: Knowledge Management - add status "Obsolete" to KM articles
 NEW: MRP - split consumption line on MO
-NEW: MRP - Display physical and virtual stock of the products when creating OF from a BOM
-NEW: MRP - Display product ref in "Object link" product tab for BOM
+NEW: MRP - display physical and virtual stock of the products when creating OF from a BOM
+NEW: MRP - display product ref in "Object link" product tab for BOM
+NEW: Projects - add filter "opportunity status" on statistics of projects.
 NEW: Proposals - option update prices on proposal cloning
 NEW: SEPA XML - option to place payment Type Info at Credit transfer Transaction level
 NEW: Stocks - stock filter in reassort lists
 NEW: Stocks - stock limit in stock export CSV
+NEW: Stocks - Inventory - can change value of AWP during the inventory
 NEW: Supplier order - Show ref supplier of reception in linked object block
 NEW: support user_modif in order
 NEW: Surveys - Show number of votes into the label of tab "Results" of a survey
@@ -122,6 +118,10 @@ NEW: TakePOS - show product reference
 NEW: TakePOS - add constant to hide categories
 NEW: TakePOS - add constant to show category description
 NEW: TakePOS - add constant to show only the products in stock
+NEW: Themes - add param color button action
+NEW: Themes - Change in theme colors does not need to use the refresh button
+NEW: Themes - more mode for THEME_TOPMENU_DISABLE_IMAGE (2, 3, ...)
+NEW: Themes - MD - add param border table for md theme
 NEW: Third-Parties - Add rules "customer accountancy code" is mandatory to validate invoice
 NEW: Third-Parties - Can set the parent company during the creation of thirdparty (action=add of societe/card.php)
 NEW: Tickets - create Third-party with contact if not found on public ticket

From 8ac625f03bbccb4925032894270e8b0a95ca2e3c Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 12 Sep 2022 10:26:20 +0200
Subject: [PATCH 928/974] FIX reading of trackid in emailcollector (when on
 recipient suffix)

---
 htdocs/comm/mailing/card.php                  |  2 +-
 htdocs/core/class/notify.class.php            |  2 +-
 .../class/emailcollector.class.php            | 44 ++++++++++++++-----
 3 files changed, 35 insertions(+), 13 deletions(-)

diff --git a/htdocs/comm/mailing/card.php b/htdocs/comm/mailing/card.php
index 748c5fabf10..63e79685311 100644
--- a/htdocs/comm/mailing/card.php
+++ b/htdocs/comm/mailing/card.php
@@ -475,7 +475,7 @@ if (empty($reshook)) {
 				}
 			}
 
-			$trackid = 'emailingtest';
+			$trackid = 'emailing-test';
 			$mailfile = new CMailFile($tmpsujet, $object->sendto, $object->email_from, $tmpbody, $arr_file, $arr_mime, $arr_name, '', '', 0, $msgishtml, $object->email_errorsto, $arr_css, $trackid, '', 'emailing');
 
 			$result = $mailfile->sendfile();
diff --git a/htdocs/core/class/notify.class.php b/htdocs/core/class/notify.class.php
index 3f26a98c728..5e12a30ba0e 100644
--- a/htdocs/core/class/notify.class.php
+++ b/htdocs/core/class/notify.class.php
@@ -456,7 +456,7 @@ class Notify
 					$notifcodedefid = $obj->adid;
 					$trackid = '';
 					if ($obj->type_target == 'tocontactid') {
-						$trackid = 'con'.$obj->cid;
+						$trackid = 'ctc'.$obj->cid;
 					}
 					if ($obj->type_target == 'touserid') {
 						$trackid = 'use'.$obj->cid;
diff --git a/htdocs/emailcollector/class/emailcollector.class.php b/htdocs/emailcollector/class/emailcollector.class.php
index 47e3c1303da..1c8c0b8698f 100644
--- a/htdocs/emailcollector/class/emailcollector.class.php
+++ b/htdocs/emailcollector/class/emailcollector.class.php
@@ -1236,22 +1236,38 @@ class EmailCollector extends CommonObject
 
 				$headers['Subject'] = $this->decodeSMTPSubject($headers['Subject']);
 
+				$emailto = $this->decodeSMTPSubject($overview[0]->to);
+
 
 				dol_syslog("** Process email ".$iforemailloop." References: ".$headers['References']." Subject: ".$headers['Subject']);
 				//print "Process mail ".$iforemailloop." Subject: ".dol_escape_htmltag($headers['Subject'])." References: ".dol_escape_htmltag($headers['References'])." In-Reply-To: ".dol_escape_htmltag($headers['In-Reply-To'])."<br>\n";
 
+				$trackidfoundintorecipienttype = '';
+				$trackidfoundintorecipientid = 0;
+				$reg = array();
+				// See also later list of all supported tags...
+				if (preg_match('/\+(thi|ctc|use|mem|sub|proj|tas|con|tic|job|pro|ord|inv|spro|sor|sin|leav|stockinv|job|surv|salary)([0-9]+)@/', $emailto, $reg)) {
+					$trackidfoundintorecipienttype = $reg[1];
+					$trackidfoundintorecipientid = $reg[2];
+				} elseif (preg_match('/\+emailing-(\w+)@/', $emailto, $reg)) {	// Can be 'emailing-test' or 'emailing-IdMailing-IdRecipient'
+					$trackidfoundintorecipienttype = 'emailing';
+					$trackidfoundintorecipientid = $reg[1];
+				}
+
 				// If there is a filter on trackid
 				if ($searchfilterdoltrackid > 0) {
-					if (empty($headers['References']) || !preg_match('/@'.preg_quote($host, '/').'/', $headers['References'])) {
-						$nbemailprocessed++;
-						dol_syslog(" Discarded - No header References found");
-						continue; // Exclude email
+					if (empty($trackidfoundintorecipienttype)) {
+						if (empty($headers['References']) || !preg_match('/@'.preg_quote($host, '/').'/', $headers['References'])) {
+							$nbemailprocessed++;
+							dol_syslog(" Discarded - No suffix in email recipient and no Header References found matching signature of application so with a trackid");
+							continue; // Exclude email
+						}
 					}
 				}
 				if ($searchfilternodoltrackid > 0) {
-					if (!empty($headers['References']) && preg_match('/@'.preg_quote($host, '/').'/', $headers['References'])) {
+					if (!empty($trackidfoundintorecipienttype) || (!empty($headers['References']) && preg_match('/@'.preg_quote($host, '/').'/', $headers['References']))) {
 						$nbemailprocessed++;
-						dol_syslog(" Discarded - Header References found and matching signature of application");
+						dol_syslog(" Discarded - Suffix found into email or Header References found and matching signature of application so with a trackid");
 						continue; // Exclude email
 					}
 				}
@@ -1431,13 +1447,19 @@ class EmailCollector extends CommonObject
 
 					foreach ($arrayofreferences as $reference) {
 						//print "Process mail ".$iforemailloop." email_msgid ".$msgid.", date ".dol_print_date($date, 'dayhour').", subject ".$subject.", reference ".dol_escape_htmltag($reference)."<br>\n";
-						$resultsearchtrackid = preg_match('/dolibarr-([a-z]+)([0-9]+)@'.preg_quote($host, '/').'/', $reference, $reg);
-						if (empty($resultsearchtrackid) && getDolGlobalString('EMAIL_ALTERNATIVE_HOST_SIGNATURE')) {
-							$resultsearchtrackid = preg_match('/dolibarr-([a-z]+)([0-9]+)@'.preg_quote(getDolGlobalString('EMAIL_ALTERNATIVE_HOST_SIGNATURE'), '/').'/', $reference, $reg);
+						if (!empty($trackidfoundintorecipienttype)) {
+							$resultsearchtrackid = -1;
+							$reg[1] = $trackidfoundintorecipienttype;
+							$reg[2] = $trackidfoundintorecipientid;
+						} else {
+							$resultsearchtrackid = preg_match('/dolibarr-([a-z]+)([0-9]+)@'.preg_quote($host, '/').'/', $reference, $reg);
+							if (empty($resultsearchtrackid) && getDolGlobalString('EMAIL_ALTERNATIVE_HOST_SIGNATURE')) {
+								$resultsearchtrackid = preg_match('/dolibarr-([a-z]+)([0-9]+)@'.preg_quote(getDolGlobalString('EMAIL_ALTERNATIVE_HOST_SIGNATURE'), '/').'/', $reference, $reg);
+							}
 						}
 
-						if ($resultsearchtrackid) {
-							// This is a Dolibarr reference of the server
+						if (!empty($resultsearchtrackid)) {
+							// We found a tracker (in recipient email or into a Reference matching the Dolibarr server)
 							$trackid = $reg[1].$reg[2];
 
 							$objectid = $reg[2];

From 9dd96b2a03dcec22bc814581416daab41ab2aea9 Mon Sep 17 00:00:00 2001
From: lmarcouiller <lucas.marcouiller@gmail.com>
Date: Mon, 12 Sep 2022 10:50:59 +0200
Subject: [PATCH 929/974] better fix

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

diff --git a/htdocs/install/mysql/migration/16.0.0-17.0.0.sql b/htdocs/install/mysql/migration/16.0.0-17.0.0.sql
index c70cb16af3c..1a4629d7445 100644
--- a/htdocs/install/mysql/migration/16.0.0-17.0.0.sql
+++ b/htdocs/install/mysql/migration/16.0.0-17.0.0.sql
@@ -149,7 +149,8 @@ UPDATE llx_c_effectif SET code='EF101-500', libelle='101 - 500' WHERE code='EF10
 
 ALTER TABLE llx_rights_def ADD COLUMN tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP;
 
-ALTER TABLE llx_establishment ADD COLUMN label varchar(255) NOT NULL AFTER entity;
+UPDATE llx_establishment SET name='' WHERE name IS NULL;
+ALTER TABLE llx_establishment CHANGE name label varchar(255) NOT NULL;
 
 ALTER TABLE llx_don ADD UNIQUE INDEX idx_don_uk_ref (ref, entity);
 

From 404bfd8b7b36a31e469c37afd79aabf828be626c Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 12 Sep 2022 11:06:55 +0200
Subject: [PATCH 930/974] Fix var not defined

---
 htdocs/admin/index.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/htdocs/admin/index.php b/htdocs/admin/index.php
index 3218f673fd5..87b49c95468 100644
--- a/htdocs/admin/index.php
+++ b/htdocs/admin/index.php
@@ -28,6 +28,8 @@ require '../main.inc.php';
 // Load translation files required by the page
 $langs->loadLangs(array('admin', 'companies'));
 
+$action = '';
+
 if (!$user->admin) {
 	accessforbidden();
 }
@@ -120,11 +122,12 @@ print '<br>';
 
 // Add hook to add information
 $parameters = array();
+$object = new stdClass();
 $reshook = $hookmanager->executeHooks('addHomeSetup', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
 print $hookmanager->resPrint;
 if (empty($reshook)) {
 	// Show into other
-	print '<span class="opacitymedium hideonsmartphone">'.$langs->trans("SetupDescription5")."</span><br>";
+	//print '<span class="opacitymedium hideonsmartphone">'.$langs->trans("SetupDescription5")."</span><br>";
 	print '<br class="hideonsmartphone">';
 
 	// Show logo

From dde3b71cadee16baa42c98656b29dde6b147b92f Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 12 Sep 2022 11:33:43 +0200
Subject: [PATCH 931/974] FIX tooltip of technical tables added of a module

---
 htdocs/admin/modulehelp.php | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/htdocs/admin/modulehelp.php b/htdocs/admin/modulehelp.php
index 0c53bebfc52..63a1ff214c1 100644
--- a/htdocs/admin/modulehelp.php
+++ b/htdocs/admin/modulehelp.php
@@ -382,15 +382,16 @@ if ($mode == 'feature') {
 	$text .= '<br><br>';
 
 	$text .= '<br><strong>'.$langs->trans("AddDataTables").':</strong> ';
-	$sqlfiles = dol_dir_list(dol_buildpath($moduledir.'/sql/'), 'files', 0, 'llx.*\.sql', array('\.key\.sql', '\.sql\.back'));
+	$sqlfiles1 = dol_dir_list(DOL_DOCUMENT_ROOT.'/install/mysql/tables/', 'files', 0, 'llx.*-'.$moduledir.'\.sql', array('\.key\.sql', '\.sql\.back'));
+	$sqlfiles2 = dol_dir_list(dol_buildpath($moduledir.'/sql/'), 'files', 0, 'llx.*\.sql', array('\.key\.sql', '\.sql\.back'));
+	$sqlfiles = array_merge($sqlfiles1, $sqlfiles2);
+
 	if (count($sqlfiles) > 0) {
-		$text .= $langs->trans("Yes").' (';
 		$i = 0;
 		foreach ($sqlfiles as $val) {
-			$text .= ($i ? ', ' : '').preg_replace('/\.sql$/', '', preg_replace('/llx_/', '', $val['name']));
+			$text .= ($i ? ', ' : '').preg_replace('/\-'.$moduledir.'$/', '', preg_replace('/\.sql$/', '', preg_replace('/llx_/', '', $val['name'])));
 			$i++;
 		}
-		$text .= ')';
 	} else {
 		$text .= $langs->trans("No");
 	}
@@ -413,7 +414,7 @@ if ($mode == 'feature') {
 	$text .= '<br><strong>'.$langs->trans("AddData").':</strong> ';
 	$filedata = dol_buildpath($moduledir.'/sql/data.sql');
 	if (dol_is_file($filedata)) {
-		$text .= $langs->trans("Yes").' ('.$moduledir.'/sql/data.sql)';
+		$text .= $langs->trans("Yes").' <span class="opacitymedium">('.$moduledir.'/sql/data.sql)</span>';
 	} else {
 		$text .= $langs->trans("No");
 	}

From 4566342d59f8b3d57a75e3468f85e4e04dca5c2f Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 12 Sep 2022 11:47:06 +0200
Subject: [PATCH 932/974] FIX #yogosha12439 Remove define('NOCSRFCHECK', '1')

---
 htdocs/compta/ajaxpayment.php                       |  3 ---
 htdocs/expensereport/ajax/ajaxik.php                |  3 ---
 htdocs/modulebuilder/template/css/mymodule.css.php  | 10 ++++------
 htdocs/mrp/ajax/ajax_bom.php                        |  3 ---
 htdocs/product/ajax/products.php                    |  3 ---
 htdocs/product/inventory/ajax/searchfrombarcode.php |  3 ---
 htdocs/salaries/ajax/ajaxsalaries.php               |  3 ---
 htdocs/societe/ajax/ajaxcompanies.php               |  3 ---
 htdocs/societe/ajax/company.php                     |  3 ---
 htdocs/stripe/ajax/ajax.php                         |  3 ---
 htdocs/takepos/ajax/ajax.php                        |  3 ---
 htdocs/takepos/css/pos.css.php                      |  3 ---
 htdocs/takepos/floors.php                           |  3 ---
 htdocs/takepos/freezone.php                         |  3 ---
 htdocs/takepos/genimg/index.php                     |  3 ---
 htdocs/takepos/genimg/qr.php                        |  3 ---
 htdocs/takepos/index.php                            |  3 ---
 htdocs/takepos/invoice.php                          |  3 ---
 htdocs/takepos/pay.php                              |  3 ---
 htdocs/takepos/phone.php                            |  3 ---
 htdocs/takepos/printbox.php                         |  3 ---
 htdocs/takepos/reduction.php                        |  3 ---
 htdocs/takepos/send.php                             |  3 ---
 htdocs/takepos/smpcb.php                            |  3 ---
 htdocs/takepos/split.php                            |  3 ---
 25 files changed, 4 insertions(+), 78 deletions(-)

diff --git a/htdocs/compta/ajaxpayment.php b/htdocs/compta/ajaxpayment.php
index f9dec6d0f19..aeb8d164928 100644
--- a/htdocs/compta/ajaxpayment.php
+++ b/htdocs/compta/ajaxpayment.php
@@ -23,9 +23,6 @@
 if (!defined('NOREQUIRESOC')) {
 	define('NOREQUIRESOC', '1');
 }
-if (!defined('NOCSRFCHECK')) {
-	define('NOCSRFCHECK', '1');
-}
 if (!defined('NOTOKENRENEWAL')) {
 	define('NOTOKENRENEWAL', '1');
 }
diff --git a/htdocs/expensereport/ajax/ajaxik.php b/htdocs/expensereport/ajax/ajaxik.php
index 9abd767e1f9..209eb3cdde7 100644
--- a/htdocs/expensereport/ajax/ajaxik.php
+++ b/htdocs/expensereport/ajax/ajaxik.php
@@ -37,9 +37,6 @@ if (!defined('NOREQUIREAJAX')) {
 if (!defined('NOREQUIRESOC')) {
 	define('NOREQUIRESOC', '1');
 }
-if (!defined('NOCSRFCHECK')) {
-	define('NOCSRFCHECK', '1');
-}
 
 $res = 0;
 require '../../main.inc.php';
diff --git a/htdocs/modulebuilder/template/css/mymodule.css.php b/htdocs/modulebuilder/template/css/mymodule.css.php
index 6d38c782184..260868a10bf 100644
--- a/htdocs/modulebuilder/template/css/mymodule.css.php
+++ b/htdocs/modulebuilder/template/css/mymodule.css.php
@@ -21,15 +21,13 @@
  * \brief   CSS file for module MyModule.
  */
 
-//if (! defined('NOREQUIREUSER')) define('NOREQUIREUSER','1');	// Not disabled because need to load personalized language
-//if (! defined('NOREQUIREDB'))   define('NOREQUIREDB','1');	// Not disabled. Language code is found on url.
+//if (!defined('NOREQUIREUSER')) define('NOREQUIREUSER','1');	// Not disabled because need to load personalized language
+//if (!defined('NOREQUIREDB'))   define('NOREQUIREDB','1');	// Not disabled. Language code is found on url.
 if (!defined('NOREQUIRESOC')) {
 	define('NOREQUIRESOC', '1');
 }
-//if (! defined('NOREQUIRETRAN')) define('NOREQUIRETRAN','1');	// Not disabled because need to do translations
-if (!defined('NOCSRFCHECK')) {
-	define('NOCSRFCHECK', 1);
-}
+//if (!defined('NOREQUIRETRAN')) define('NOREQUIRETRAN','1');	// Not disabled because need to do translations
+//if (!defined('NOCSRFCHECK'))   define('NOCSRFCHECK', 1);		// Should be disable only for special situation
 if (!defined('NOTOKENRENEWAL')) {
 	define('NOTOKENRENEWAL', 1);
 }
diff --git a/htdocs/mrp/ajax/ajax_bom.php b/htdocs/mrp/ajax/ajax_bom.php
index a46563e02c8..050385246b5 100644
--- a/htdocs/mrp/ajax/ajax_bom.php
+++ b/htdocs/mrp/ajax/ajax_bom.php
@@ -26,9 +26,6 @@ if (!defined('NOREQUIRESOC')) {
 	define('NOREQUIRESOC', '1');
 }
 //if (! defined('NOREQUIRETRAN'))		define('NOREQUIRETRAN','1');
-if (!defined('NOCSRFCHECK')) {
-	define('NOCSRFCHECK', '1');
-}
 if (!defined('NOTOKENRENEWAL')) {
 	define('NOTOKENRENEWAL', '1');
 }
diff --git a/htdocs/product/ajax/products.php b/htdocs/product/ajax/products.php
index 8fb1ce8f060..1896c801c50 100644
--- a/htdocs/product/ajax/products.php
+++ b/htdocs/product/ajax/products.php
@@ -38,9 +38,6 @@ if (!defined('NOREQUIREAJAX')) {
 if (!defined('NOREQUIRESOC')) {
 	define('NOREQUIRESOC', '1');
 }
-if (!defined('NOCSRFCHECK')) {
-	define('NOCSRFCHECK', '1');
-}
 if (empty($_GET['keysearch']) && !defined('NOREQUIREHTML')) {
 	define('NOREQUIREHTML', '1');
 }
diff --git a/htdocs/product/inventory/ajax/searchfrombarcode.php b/htdocs/product/inventory/ajax/searchfrombarcode.php
index d8f4ecf2ed2..efe4d65f2d3 100644
--- a/htdocs/product/inventory/ajax/searchfrombarcode.php
+++ b/htdocs/product/inventory/ajax/searchfrombarcode.php
@@ -34,9 +34,6 @@ if (!defined('NOREQUIREAJAX')) {
 if (!defined('NOREQUIRESOC')) {
 	define('NOREQUIRESOC', '1');
 }
-if (!defined('NOCSRFCHECK')) {
-	define('NOCSRFCHECK', '1');
-}
 require '../../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT."/product/stock/class/entrepot.class.php";
 $warehouse = new Entrepot($db);
diff --git a/htdocs/salaries/ajax/ajaxsalaries.php b/htdocs/salaries/ajax/ajaxsalaries.php
index e8641f3a39a..1cbecf840d2 100644
--- a/htdocs/salaries/ajax/ajaxsalaries.php
+++ b/htdocs/salaries/ajax/ajaxsalaries.php
@@ -38,9 +38,6 @@ if (!defined('NOREQUIREAJAX')) {
 if (!defined('NOREQUIRESOC')) {
 	define('NOREQUIRESOC', '1');
 }
-if (!defined('NOCSRFCHECK')) {
-	define('NOCSRFCHECK', '1');
-}
 
 // Load Dolibarr environment
 require '../../main.inc.php';
diff --git a/htdocs/societe/ajax/ajaxcompanies.php b/htdocs/societe/ajax/ajaxcompanies.php
index 6aff1842d0f..08d914d562a 100644
--- a/htdocs/societe/ajax/ajaxcompanies.php
+++ b/htdocs/societe/ajax/ajaxcompanies.php
@@ -38,9 +38,6 @@ if (!defined('NOREQUIREAJAX')) {
 if (!defined('NOREQUIRESOC')) {
 	define('NOREQUIRESOC', '1');
 }
-if (!defined('NOCSRFCHECK')) {
-	define('NOCSRFCHECK', '1');
-}
 
 // Load Dolibarr environment
 require '../../main.inc.php';
diff --git a/htdocs/societe/ajax/company.php b/htdocs/societe/ajax/company.php
index a2e3e793fae..7bdfe6e0e34 100644
--- a/htdocs/societe/ajax/company.php
+++ b/htdocs/societe/ajax/company.php
@@ -37,9 +37,6 @@ if (!defined('NOREQUIREAJAX')) {
 if (!defined('NOREQUIRESOC')) {
 	define('NOREQUIRESOC', '1');
 }
-if (!defined('NOCSRFCHECK')) {
-	define('NOCSRFCHECK', '1');
-}
 
 // Load Dolibarr environment
 require '../../main.inc.php';
diff --git a/htdocs/stripe/ajax/ajax.php b/htdocs/stripe/ajax/ajax.php
index 33927aa291d..5fa4da88ae7 100644
--- a/htdocs/stripe/ajax/ajax.php
+++ b/htdocs/stripe/ajax/ajax.php
@@ -20,9 +20,6 @@
  *	\brief      Ajax action for Stipe ie: Terminal
  */
 
-if (!defined('NOCSRFCHECK')) {
-	define('NOCSRFCHECK', '1');
-}
 if (!defined('NOTOKENRENEWAL')) {
 	define('NOTOKENRENEWAL', '1');
 }
diff --git a/htdocs/takepos/ajax/ajax.php b/htdocs/takepos/ajax/ajax.php
index 857e8249f21..1ee27c51f8b 100644
--- a/htdocs/takepos/ajax/ajax.php
+++ b/htdocs/takepos/ajax/ajax.php
@@ -21,9 +21,6 @@
  *	\brief      Ajax search component for TakePos. It search products of a category.
  */
 
-if (!defined('NOCSRFCHECK')) {
-	define('NOCSRFCHECK', '1');
-}
 if (!defined('NOTOKENRENEWAL')) {
 	define('NOTOKENRENEWAL', '1');
 }
diff --git a/htdocs/takepos/css/pos.css.php b/htdocs/takepos/css/pos.css.php
index acb195af15c..1ffe5c63db3 100644
--- a/htdocs/takepos/css/pos.css.php
+++ b/htdocs/takepos/css/pos.css.php
@@ -31,9 +31,6 @@ if (!defined('NOREQUIRESOC')) {
 	define('NOREQUIRESOC', '1');
 }
 //if (! defined('NOREQUIRETRAN')) define('NOREQUIRETRAN','1');	// Not disabled because need to do translations
-if (!defined('NOCSRFCHECK')) {
-	define('NOCSRFCHECK', 1);
-}
 if (!defined('NOTOKENRENEWAL')) {
 	define('NOTOKENRENEWAL', 1);
 }
diff --git a/htdocs/takepos/floors.php b/htdocs/takepos/floors.php
index 46fe0f3529d..01f022a94cd 100644
--- a/htdocs/takepos/floors.php
+++ b/htdocs/takepos/floors.php
@@ -25,9 +25,6 @@
 //if (! defined('NOREQUIREDB'))		define('NOREQUIREDB','1');		// Not disabled cause need to load personalized language
 //if (! defined('NOREQUIRESOC'))	define('NOREQUIRESOC','1');
 //if (! defined('NOREQUIRETRAN'))	define('NOREQUIRETRAN','1');
-if (!defined('NOCSRFCHECK')) {
-	define('NOCSRFCHECK', '1');
-}
 if (!defined('NOTOKENRENEWAL')) {
 	define('NOTOKENRENEWAL', '1');
 }
diff --git a/htdocs/takepos/freezone.php b/htdocs/takepos/freezone.php
index 952c867ae47..2402c24acca 100644
--- a/htdocs/takepos/freezone.php
+++ b/htdocs/takepos/freezone.php
@@ -26,9 +26,6 @@
 //if (! defined('NOREQUIREDB'))		define('NOREQUIREDB','1');		// Not disabled cause need to load personalized language
 //if (! defined('NOREQUIRESOC'))	define('NOREQUIRESOC','1');
 //if (! defined('NOREQUIRETRAN'))	define('NOREQUIRETRAN','1');
-if (!defined('NOCSRFCHECK')) {
-	define('NOCSRFCHECK', '1');
-}
 if (!defined('NOTOKENRENEWAL')) {
 	define('NOTOKENRENEWAL', '1');
 }
diff --git a/htdocs/takepos/genimg/index.php b/htdocs/takepos/genimg/index.php
index dcb8c1fe487..84ce27868ae 100644
--- a/htdocs/takepos/genimg/index.php
+++ b/htdocs/takepos/genimg/index.php
@@ -23,9 +23,6 @@ if (!defined('NOREQUIRESOC')) {
 	define('NOREQUIRESOC', '1');
 }
 //if (! defined('NOREQUIRETRAN'))		define('NOREQUIRETRAN','1');
-if (!defined('NOCSRFCHECK')) {
-	define('NOCSRFCHECK', '1');
-}
 if (!defined('NOTOKENRENEWAL')) {
 	define('NOTOKENRENEWAL', '1');
 }
diff --git a/htdocs/takepos/genimg/qr.php b/htdocs/takepos/genimg/qr.php
index eb33a08e370..b289814f9e1 100644
--- a/htdocs/takepos/genimg/qr.php
+++ b/htdocs/takepos/genimg/qr.php
@@ -26,9 +26,6 @@ if (!defined('NOIPCHECK')) {
 if (!defined('NOREQUIRESOC')) {
 	define('NOREQUIRESOC', '1');
 }
-if (!defined('NOCSRFCHECK')) {
-	define('NOCSRFCHECK', '1');
-}
 if (!defined('NOTOKENRENEWAL')) {
 	define('NOTOKENRENEWAL', '1');
 }
diff --git a/htdocs/takepos/index.php b/htdocs/takepos/index.php
index dd7eb27178f..e612d4cd8ee 100644
--- a/htdocs/takepos/index.php
+++ b/htdocs/takepos/index.php
@@ -28,9 +28,6 @@
 // if (! defined('NOREQUIRESOC')) 		define('NOREQUIRESOC','1');
 // if (! defined('NOREQUIRETRAN')) 		define('NOREQUIRETRAN','1');
 
-if (!defined('NOCSRFCHECK')) {
-	define('NOCSRFCHECK', '1');
-}
 if (!defined('NOTOKENRENEWAL')) {
 	define('NOTOKENRENEWAL', '1');
 }
diff --git a/htdocs/takepos/invoice.php b/htdocs/takepos/invoice.php
index f383b630275..6ec6f11ffc7 100644
--- a/htdocs/takepos/invoice.php
+++ b/htdocs/takepos/invoice.php
@@ -28,9 +28,6 @@
 // if (! defined('NOREQUIRESOC')) 		define('NOREQUIRESOC', '1');
 // if (! defined('NOREQUIRETRAN')) 		define('NOREQUIRETRAN', '1');
 
-if (!defined('NOCSRFCHECK')) {
-	define('NOCSRFCHECK', '1');
-}
 if (!defined('NOTOKENRENEWAL')) {
 	define('NOTOKENRENEWAL', '1');
 }
diff --git a/htdocs/takepos/pay.php b/htdocs/takepos/pay.php
index 9cea11073ba..e9188aabfdc 100644
--- a/htdocs/takepos/pay.php
+++ b/htdocs/takepos/pay.php
@@ -27,9 +27,6 @@
 // if (! defined('NOREQUIRESOC'))		define('NOREQUIRESOC', '1');
 // if (! defined('NOREQUIRETRAN'))		define('NOREQUIRETRAN', '1');
 
-if (!defined('NOCSRFCHECK')) {
-	define('NOCSRFCHECK', '1');
-}
 if (!defined('NOTOKENRENEWAL')) {
 	define('NOTOKENRENEWAL', '1');
 }
diff --git a/htdocs/takepos/phone.php b/htdocs/takepos/phone.php
index fa12487763e..4d89ce23f66 100644
--- a/htdocs/takepos/phone.php
+++ b/htdocs/takepos/phone.php
@@ -25,9 +25,6 @@
 //if (! defined('NOREQUIREDB'))		define('NOREQUIREDB','1');		// Not disabled cause need to load personalized language
 //if (! defined('NOREQUIRESOC'))		define('NOREQUIRESOC','1');
 //if (! defined('NOREQUIRETRAN'))		define('NOREQUIRETRAN','1');
-if (!defined('NOCSRFCHECK')) {
-	define('NOCSRFCHECK', '1');
-}
 if (!defined('NOTOKENRENEWAL')) {
 	define('NOTOKENRENEWAL', '1');
 }
diff --git a/htdocs/takepos/printbox.php b/htdocs/takepos/printbox.php
index 176805662a5..dfceab9bbc4 100644
--- a/htdocs/takepos/printbox.php
+++ b/htdocs/takepos/printbox.php
@@ -26,9 +26,6 @@
 //if (! defined('NOREQUIREDB'))		define('NOREQUIREDB','1');		// Not disabled cause need to load personalized language
 //if (! defined('NOREQUIRESOC'))	define('NOREQUIRESOC','1');
 //if (! defined('NOREQUIRETRAN'))	define('NOREQUIRETRAN','1');
-if (!defined('NOCSRFCHECK')) {
-	define('NOCSRFCHECK', '1');
-}
 if (!defined('NOTOKENRENEWAL')) {
 	define('NOTOKENRENEWAL', '1');
 }
diff --git a/htdocs/takepos/reduction.php b/htdocs/takepos/reduction.php
index e02884d810c..67829003954 100644
--- a/htdocs/takepos/reduction.php
+++ b/htdocs/takepos/reduction.php
@@ -25,9 +25,6 @@
 //if (! defined('NOREQUIREDB'))		define('NOREQUIREDB', '1');		// Not disabled cause need to load personalized language
 //if (! defined('NOREQUIRESOC'))		define('NOREQUIRESOC', '1');
 //if (! defined('NOREQUIRETRAN'))		define('NOREQUIRETRAN', '1');
-if (!defined('NOCSRFCHECK')) {
-	define('NOCSRFCHECK', '1');
-}
 if (!defined('NOTOKENRENEWAL')) {
 	define('NOTOKENRENEWAL', '1');
 }
diff --git a/htdocs/takepos/send.php b/htdocs/takepos/send.php
index 2003abaf1f1..31929a9c732 100644
--- a/htdocs/takepos/send.php
+++ b/htdocs/takepos/send.php
@@ -26,9 +26,6 @@
 //if (! defined('NOREQUIREDB'))		define('NOREQUIREDB', '1');		// Not disabled cause need to load personalized language
 //if (! defined('NOREQUIRESOC'))	define('NOREQUIRESOC', '1');
 //if (! defined('NOREQUIRETRAN'))	define('NOREQUIRETRAN', '1');
-if (!defined('NOCSRFCHECK')) {
-	define('NOCSRFCHECK', '1');
-}
 if (!defined('NOTOKENRENEWAL')) {
 	define('NOTOKENRENEWAL', '1');
 }
diff --git a/htdocs/takepos/smpcb.php b/htdocs/takepos/smpcb.php
index 26d058838e0..505ec27c1b0 100644
--- a/htdocs/takepos/smpcb.php
+++ b/htdocs/takepos/smpcb.php
@@ -21,9 +21,6 @@
  *	\brief      Page with the content for smpcb payment
  */
 
-if (!defined('NOCSRFCHECK')) {
-	define('NOCSRFCHECK', '1');
-}
 if (!defined('NOTOKENRENEWAL')) {
 	define('NOTOKENRENEWAL', '1');
 }
diff --git a/htdocs/takepos/split.php b/htdocs/takepos/split.php
index 68e2995f192..b39f9d1d215 100644
--- a/htdocs/takepos/split.php
+++ b/htdocs/takepos/split.php
@@ -25,9 +25,6 @@
 //if (! defined('NOREQUIREDB'))		define('NOREQUIREDB', '1');		// Not disabled cause need to load personalized language
 //if (! defined('NOREQUIRESOC'))		define('NOREQUIRESOC', '1');
 //if (! defined('NOREQUIRETRAN'))		define('NOREQUIRETRAN', '1');
-if (!defined('NOCSRFCHECK')) {
-	define('NOCSRFCHECK', '1');
-}
 if (!defined('NOTOKENRENEWAL')) {
 	define('NOTOKENRENEWAL', '1');
 }

From cad8b1ee7e84f704b3f66f3bda54940ee31e6cec Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 12 Sep 2022 12:25:15 +0200
Subject: [PATCH 933/974] Fix autoadd in basket after a search (only if search
 on barcode)

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

diff --git a/htdocs/takepos/index.php b/htdocs/takepos/index.php
index 004ce45c459..b567ff5fee9 100644
--- a/htdocs/takepos/index.php
+++ b/htdocs/takepos/index.php
@@ -684,8 +684,8 @@ function Search2(keyCodeForEnter, moreorless) {
 						console.log("There is only 1 answer with barcode matching the search, so we change the thirdparty "+data[0]['rowid']);
 						ChangeThirdparty(data[0]['rowid']);
 					}
-					else if ('product' == data[0]['object']) {
-						console.log("There is only 1 answer matching the search, so we add the product in basket, qty="+data[0]['qty']);
+					else if ($('#search').val() == data[0]['barcode'] && 'product' == data[0]['object']) {
+						console.log("There is only 1 answer and we found search on a barcode, so we add the product in basket, qty="+data[0]['qty']);
 						ClickProduct(0, data[0]['qty']);
 					}
 				}

From 45c9e6064eb5ec0e818180f58a19adaa10082748 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 12 Sep 2022 12:22:00 +0200
Subject: [PATCH 934/974] FIX #yogosha12439 Remove define('NOCSRFCHECK', '1')

---
 htdocs/asterisk/wrapper.php                   |  4 --
 htdocs/core/ajax/ajaxcompanies.php            |  1 -
 htdocs/core/ajax/check_notifications.php      |  3 -
 htdocs/core/ajax/fetchKnowledgeRecord.php     |  3 -
 htdocs/core/ajax/fileupload.php               |  3 -
 htdocs/core/ajax/locationincoterms.php        |  3 -
 htdocs/core/ajax/onlineSign.php               |  3 -
 htdocs/core/ajax/selectobject.php             |  3 -
 htdocs/core/ajax/ziptown.php                  |  3 -
 .../conferenceorboothattendee_note.php        |  1 -
 htdocs/hrm/position.php                       |  1 -
 .../modulebuilder/template/ajax/myobject.php  | 68 +++++++++++++++++++
 .../template/myobject_agenda.php              |  1 -
 .../modulebuilder/template/myobject_card.php  |  1 -
 .../template/myobject_document.php            |  1 -
 .../modulebuilder/template/myobject_list.php  |  1 -
 .../modulebuilder/template/myobject_note.php  |  1 -
 .../template/scripts/mymodule.php             |  1 -
 htdocs/projet/ajax/projects.php               |  5 +-
 htdocs/public/demo/index.php                  |  3 -
 htdocs/public/donations/donateurs_code.php    |  3 -
 htdocs/public/test/test_arrays.php            |  6 --
 htdocs/public/test/test_csrf.php              |  6 --
 htdocs/public/test/test_exec.php              |  6 --
 htdocs/public/test/test_sessionlock.php       |  6 --
 htdocs/public/ticket/ajax/ajax.php            |  3 -
 htdocs/takepos/admin/orderprinters.php        |  3 +
 htdocs/takepos/admin/other.php                |  1 -
 htdocs/takepos/floors.php                     |  5 +-
 htdocs/takepos/freezone.php                   |  2 +-
 htdocs/takepos/index.php                      | 33 ++++-----
 htdocs/takepos/invoice.php                    |  6 +-
 htdocs/takepos/pay.php                        | 22 +++---
 htdocs/takepos/phone.php                      | 20 +++---
 htdocs/takepos/printbox.php                   |  2 +-
 htdocs/takepos/reduction.php                  |  4 +-
 htdocs/takepos/send.php                       |  2 +-
 htdocs/takepos/split.php                      |  2 +-
 htdocs/theme/eldy/manifest.json.php           |  3 -
 htdocs/theme/md/manifest.json.php             |  3 -
 40 files changed, 121 insertions(+), 127 deletions(-)
 create mode 100644 htdocs/modulebuilder/template/ajax/myobject.php

diff --git a/htdocs/asterisk/wrapper.php b/htdocs/asterisk/wrapper.php
index 7313fdfd2d5..2f5096f6436 100644
--- a/htdocs/asterisk/wrapper.php
+++ b/htdocs/asterisk/wrapper.php
@@ -34,9 +34,6 @@ if (!defined('NOREQUIRESOC')) {
 if (!defined('NOREQUIRETRAN')) {
 	define('NOREQUIRETRAN', '1');
 }
-if (!defined('NOCSRFCHECK')) {
-	define('NOCSRFCHECK', '1');
-}
 if (!defined('NOTOKENRENEWAL')) {
 	define('NOTOKENRENEWAL', '1');
 }
@@ -75,7 +72,6 @@ function llxFooter()
 	print "\n".'</html>'."\n";
 }
 
-
 require_once '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/functions.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
diff --git a/htdocs/core/ajax/ajaxcompanies.php b/htdocs/core/ajax/ajaxcompanies.php
index 9f135d8cb42..ef0d7303715 100644
--- a/htdocs/core/ajax/ajaxcompanies.php
+++ b/htdocs/core/ajax/ajaxcompanies.php
@@ -28,7 +28,6 @@ if (!defined('NOREQUIREMENU'))  define('NOREQUIREMENU', '1');
 if (!defined('NOREQUIREHTML'))  define('NOREQUIREHTML', '1');
 if (!defined('NOREQUIREAJAX'))  define('NOREQUIREAJAX', '1');
 if (!defined('NOREQUIRESOC'))   define('NOREQUIRESOC', '1');
-if (!defined('NOCSRFCHECK'))    define('NOCSRFCHECK', '1');
 
 // Load Dolibarr environment
 require '../../main.inc.php';
diff --git a/htdocs/core/ajax/check_notifications.php b/htdocs/core/ajax/check_notifications.php
index df2db07d0ab..f48cb9bffe5 100644
--- a/htdocs/core/ajax/check_notifications.php
+++ b/htdocs/core/ajax/check_notifications.php
@@ -17,9 +17,6 @@
  * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
-if (!defined('NOCSRFCHECK')) {
-	define('NOCSRFCHECK', '1');
-}
 if (!defined('NOTOKENRENEWAL')) {
 	define('NOTOKENRENEWAL', '1'); // Do not roll the Anti CSRF token (used if MAIN_SECURITY_CSRF_WITH_TOKEN is on)
 }
diff --git a/htdocs/core/ajax/fetchKnowledgeRecord.php b/htdocs/core/ajax/fetchKnowledgeRecord.php
index 179d8169465..1816217cdef 100644
--- a/htdocs/core/ajax/fetchKnowledgeRecord.php
+++ b/htdocs/core/ajax/fetchKnowledgeRecord.php
@@ -31,9 +31,6 @@ if (!defined('NOREQUIREAJAX')) {
 if (!defined('NOREQUIRESOC')) {
 	define('NOREQUIRESOC', '1');
 }
-if (!defined('NOCSRFCHECK')) {
-	define('NOCSRFCHECK', '1');
-}
 // Do not check anti CSRF attack test
 if (!defined('NOREQUIREMENU')) {
 	define('NOREQUIREMENU', '1');
diff --git a/htdocs/core/ajax/fileupload.php b/htdocs/core/ajax/fileupload.php
index 0f6fac32338..67f95700976 100644
--- a/htdocs/core/ajax/fileupload.php
+++ b/htdocs/core/ajax/fileupload.php
@@ -21,9 +21,6 @@
  *       \brief      File to return Ajax response on file upload
  */
 
-if (!defined('NOCSRFCHECK')) {
-	define('NOCSRFCHECK', '1');
-}
 if (!defined('NOTOKENRENEWAL')) {
 	define('NOTOKENRENEWAL', '1');
 }
diff --git a/htdocs/core/ajax/locationincoterms.php b/htdocs/core/ajax/locationincoterms.php
index 34a7459c972..057322ec5fb 100644
--- a/htdocs/core/ajax/locationincoterms.php
+++ b/htdocs/core/ajax/locationincoterms.php
@@ -38,9 +38,6 @@ if (!defined('NOREQUIREAJAX')) {
 if (!defined('NOREQUIRESOC')) {
 	define('NOREQUIRESOC', '1');
 }
-if (!defined('NOCSRFCHECK')) {
-	define('NOCSRFCHECK', '1');
-}
 
 // Load Dolibarr environment
 require '../../main.inc.php';
diff --git a/htdocs/core/ajax/onlineSign.php b/htdocs/core/ajax/onlineSign.php
index f3a82783a2b..53eaf69aea1 100644
--- a/htdocs/core/ajax/onlineSign.php
+++ b/htdocs/core/ajax/onlineSign.php
@@ -31,9 +31,6 @@ if (!defined('NOREQUIREAJAX')) {
 if (!defined('NOREQUIRESOC')) {
 	define('NOREQUIRESOC', '1');
 }
-if (!defined('NOCSRFCHECK')) {
-	define('NOCSRFCHECK', '1');
-}
 // Do not check anti CSRF attack test
 if (!defined('NOREQUIREMENU')) {
 	define('NOREQUIREMENU', '1');
diff --git a/htdocs/core/ajax/selectobject.php b/htdocs/core/ajax/selectobject.php
index 1028ad69db4..31bc791dc10 100644
--- a/htdocs/core/ajax/selectobject.php
+++ b/htdocs/core/ajax/selectobject.php
@@ -35,9 +35,6 @@ if (!defined('NOREQUIREAJAX')) {
 if (!defined('NOREQUIRESOC')) {
 	define('NOREQUIRESOC', '1');
 }
-if (!defined('NOCSRFCHECK')) {
-	define('NOCSRFCHECK', '1');
-}
 
 // Load Dolibarr environment
 require '../../main.inc.php';
diff --git a/htdocs/core/ajax/ziptown.php b/htdocs/core/ajax/ziptown.php
index 6452bcec884..f6869e9ffcf 100644
--- a/htdocs/core/ajax/ziptown.php
+++ b/htdocs/core/ajax/ziptown.php
@@ -37,9 +37,6 @@ if (!defined('NOREQUIREAJAX')) {
 if (!defined('NOREQUIRESOC')) {
 	define('NOREQUIRESOC', '1');
 }
-if (!defined('NOCSRFCHECK')) {
-	define('NOCSRFCHECK', '1');
-}
 
 // Load Dolibarr environment
 require '../../main.inc.php';
diff --git a/htdocs/eventorganization/conferenceorboothattendee_note.php b/htdocs/eventorganization/conferenceorboothattendee_note.php
index adc4a1683b8..ea186041602 100644
--- a/htdocs/eventorganization/conferenceorboothattendee_note.php
+++ b/htdocs/eventorganization/conferenceorboothattendee_note.php
@@ -28,7 +28,6 @@
 //if (! defined('NOREQUIRETRAN'))            define('NOREQUIRETRAN', '1');				// Do not load object $langs
 //if (! defined('NOSCANGETFORINJECTION'))    define('NOSCANGETFORINJECTION', '1');		// Do not check injection attack on GET parameters
 //if (! defined('NOSCANPOSTFORINJECTION'))   define('NOSCANPOSTFORINJECTION', '1');		// Do not check injection attack on POST parameters
-//if (! defined('NOCSRFCHECK'))              define('NOCSRFCHECK', '1');				// Do not check CSRF attack (test on referer + on token if option MAIN_SECURITY_CSRF_WITH_TOKEN is on).
 //if (! defined('NOTOKENRENEWAL'))           define('NOTOKENRENEWAL', '1');				// Do not roll the Anti CSRF token (used if MAIN_SECURITY_CSRF_WITH_TOKEN is on)
 //if (! defined('NOSTYLECHECK'))             define('NOSTYLECHECK', '1');				// Do not check style html tag into posted data
 //if (! defined('NOREQUIREMENU'))            define('NOREQUIREMENU', '1');				// If there is no need to load and show top and left menu
diff --git a/htdocs/hrm/position.php b/htdocs/hrm/position.php
index 24ce9ec3b51..7a1114ac4a0 100644
--- a/htdocs/hrm/position.php
+++ b/htdocs/hrm/position.php
@@ -31,7 +31,6 @@
 //if (! defined('NOREQUIRETRAN'))            define('NOREQUIRETRAN', '1');				// Do not load object $langs
 //if (! defined('NOSCANGETFORINJECTION'))    define('NOSCANGETFORINJECTION', '1');		// Do not check injection attack on GET parameters
 //if (! defined('NOSCANPOSTFORINJECTION'))   define('NOSCANPOSTFORINJECTION', '1');		// Do not check injection attack on POST parameters
-//if (! defined('NOCSRFCHECK'))              define('NOCSRFCHECK', '1');				// Do not check CSRF attack (test on referer + on token if option MAIN_SECURITY_CSRF_WITH_TOKEN is on).
 //if (! defined('NOTOKENRENEWAL'))           define('NOTOKENRENEWAL', '1');				// Do not roll the Anti CSRF token (used if MAIN_SECURITY_CSRF_WITH_TOKEN is on)
 //if (! defined('NOSTYLECHECK'))             define('NOSTYLECHECK', '1');				// Do not check style html tag into posted data
 //if (! defined('NOREQUIREMENU'))            define('NOREQUIREMENU', '1');				// If there is no need to load and show top and left menu
diff --git a/htdocs/modulebuilder/template/ajax/myobject.php b/htdocs/modulebuilder/template/ajax/myobject.php
new file mode 100644
index 00000000000..3e22eb25f22
--- /dev/null
+++ b/htdocs/modulebuilder/template/ajax/myobject.php
@@ -0,0 +1,68 @@
+<?php
+/* Copyright (C) 2022 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       htdocs/mymodule/ajax/myobject.php
+ *       \brief      File to return Ajax response on product list request
+ */
+
+if (!defined('NOTOKENRENEWAL')) {
+	define('NOTOKENRENEWAL', 1); // Disables token renewal
+}
+if (!defined('NOREQUIREMENU')) {
+	define('NOREQUIREMENU', '1');
+}
+if (!defined('NOREQUIREHTML')) {
+	define('NOREQUIREHTML', '1');
+}
+if (!defined('NOREQUIREAJAX')) {
+	define('NOREQUIREAJAX', '1');
+}
+if (!defined('NOREQUIRESOC')) {
+	define('NOREQUIRESOC', '1');
+}
+if (!defined('NOCSRFCHECK')) {
+	define('NOCSRFCHECK', '1');
+}
+if (!defined('NOREQUIREHTML')) {
+	define('NOREQUIREHTML', '1');
+}
+
+// Load Dolibarr environment
+require '../../main.inc.php';
+
+$mode = GETPOST('mode', 'aZ09');
+
+// Security check
+restrictedArea($user, 'mymodule', 0, 'myobject');
+
+
+/*
+ * View
+ */
+
+dol_syslog("Call ajax mymodule/ajax/myobject.php");
+
+top_httphead('application/json');
+
+$arrayresult = array();
+
+// ....
+
+$db->close();
+
+print json_encode($arrayresult);
diff --git a/htdocs/modulebuilder/template/myobject_agenda.php b/htdocs/modulebuilder/template/myobject_agenda.php
index 0a397dceaa6..f0d7ffa1439 100644
--- a/htdocs/modulebuilder/template/myobject_agenda.php
+++ b/htdocs/modulebuilder/template/myobject_agenda.php
@@ -28,7 +28,6 @@
 //if (! defined('NOREQUIRETRAN'))            define('NOREQUIRETRAN', '1');				// Do not load object $langs
 //if (! defined('NOSCANGETFORINJECTION'))    define('NOSCANGETFORINJECTION', '1');		// Do not check injection attack on GET parameters
 //if (! defined('NOSCANPOSTFORINJECTION'))   define('NOSCANPOSTFORINJECTION', '1');		// Do not check injection attack on POST parameters
-//if (! defined('NOCSRFCHECK'))              define('NOCSRFCHECK', '1');				// Do not check CSRF attack (test on referer + on token if option MAIN_SECURITY_CSRF_WITH_TOKEN is on).
 //if (! defined('NOTOKENRENEWAL'))           define('NOTOKENRENEWAL', '1');				// Do not roll the Anti CSRF token (used if MAIN_SECURITY_CSRF_WITH_TOKEN is on)
 //if (! defined('NOSTYLECHECK'))             define('NOSTYLECHECK', '1');				// Do not check style html tag into posted data
 //if (! defined('NOREQUIREMENU'))            define('NOREQUIREMENU', '1');				// If there is no need to load and show top and left menu
diff --git a/htdocs/modulebuilder/template/myobject_card.php b/htdocs/modulebuilder/template/myobject_card.php
index aa2680ea568..4bc0b797b47 100644
--- a/htdocs/modulebuilder/template/myobject_card.php
+++ b/htdocs/modulebuilder/template/myobject_card.php
@@ -28,7 +28,6 @@
 //if (! defined('NOREQUIRETRAN'))            define('NOREQUIRETRAN', '1');				// Do not load object $langs
 //if (! defined('NOSCANGETFORINJECTION'))    define('NOSCANGETFORINJECTION', '1');		// Do not check injection attack on GET parameters
 //if (! defined('NOSCANPOSTFORINJECTION'))   define('NOSCANPOSTFORINJECTION', '1');		// Do not check injection attack on POST parameters
-//if (! defined('NOCSRFCHECK'))              define('NOCSRFCHECK', '1');				// Do not check CSRF attack (test on referer + on token).
 //if (! 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
diff --git a/htdocs/modulebuilder/template/myobject_document.php b/htdocs/modulebuilder/template/myobject_document.php
index 4a4b68391bc..6aed7382b7d 100644
--- a/htdocs/modulebuilder/template/myobject_document.php
+++ b/htdocs/modulebuilder/template/myobject_document.php
@@ -28,7 +28,6 @@
 //if (! defined('NOREQUIRETRAN'))            define('NOREQUIRETRAN', '1');				// Do not load object $langs
 //if (! defined('NOSCANGETFORINJECTION'))    define('NOSCANGETFORINJECTION', '1');		// Do not check injection attack on GET parameters
 //if (! defined('NOSCANPOSTFORINJECTION'))   define('NOSCANPOSTFORINJECTION', '1');		// Do not check injection attack on POST parameters
-//if (! defined('NOCSRFCHECK'))              define('NOCSRFCHECK', '1');				// Do not check CSRF attack (test on referer + on token if option MAIN_SECURITY_CSRF_WITH_TOKEN is on).
 //if (! defined('NOTOKENRENEWAL'))           define('NOTOKENRENEWAL', '1');				// Do not roll the Anti CSRF token (used if MAIN_SECURITY_CSRF_WITH_TOKEN is on)
 //if (! defined('NOSTYLECHECK'))             define('NOSTYLECHECK', '1');				// Do not check style html tag into posted data
 //if (! defined('NOREQUIREMENU'))            define('NOREQUIREMENU', '1');				// If there is no need to load and show top and left menu
diff --git a/htdocs/modulebuilder/template/myobject_list.php b/htdocs/modulebuilder/template/myobject_list.php
index 789a5d2312d..276e709019d 100644
--- a/htdocs/modulebuilder/template/myobject_list.php
+++ b/htdocs/modulebuilder/template/myobject_list.php
@@ -28,7 +28,6 @@
 //if (! defined('NOREQUIRETRAN'))            define('NOREQUIRETRAN', '1');				// Do not load object $langs
 //if (! defined('NOSCANGETFORINJECTION'))    define('NOSCANGETFORINJECTION', '1');		// Do not check injection attack on GET parameters
 //if (! defined('NOSCANPOSTFORINJECTION'))   define('NOSCANPOSTFORINJECTION', '1');		// Do not check injection attack on POST parameters
-//if (! defined('NOCSRFCHECK'))              define('NOCSRFCHECK', '1');				// Do not check CSRF attack (test on referer + on token if option MAIN_SECURITY_CSRF_WITH_TOKEN is on).
 //if (! defined('NOTOKENRENEWAL'))           define('NOTOKENRENEWAL', '1');				// Do not roll the Anti CSRF token (used if MAIN_SECURITY_CSRF_WITH_TOKEN is on)
 //if (! defined('NOSTYLECHECK'))             define('NOSTYLECHECK', '1');				// Do not check style html tag into posted data
 //if (! defined('NOREQUIREMENU'))            define('NOREQUIREMENU', '1');				// If there is no need to load and show top and left menu
diff --git a/htdocs/modulebuilder/template/myobject_note.php b/htdocs/modulebuilder/template/myobject_note.php
index e97d131551a..f7859cfb217 100644
--- a/htdocs/modulebuilder/template/myobject_note.php
+++ b/htdocs/modulebuilder/template/myobject_note.php
@@ -28,7 +28,6 @@
 //if (! defined('NOREQUIRETRAN'))            define('NOREQUIRETRAN', '1');				// Do not load object $langs
 //if (! defined('NOSCANGETFORINJECTION'))    define('NOSCANGETFORINJECTION', '1');		// Do not check injection attack on GET parameters
 //if (! defined('NOSCANPOSTFORINJECTION'))   define('NOSCANPOSTFORINJECTION', '1');		// Do not check injection attack on POST parameters
-//if (! defined('NOCSRFCHECK'))              define('NOCSRFCHECK', '1');				// Do not check CSRF attack (test on referer + on token if option MAIN_SECURITY_CSRF_WITH_TOKEN is on).
 //if (! defined('NOTOKENRENEWAL'))           define('NOTOKENRENEWAL', '1');				// Do not roll the Anti CSRF token (used if MAIN_SECURITY_CSRF_WITH_TOKEN is on)
 //if (! defined('NOSTYLECHECK'))             define('NOSTYLECHECK', '1');				// Do not check style html tag into posted data
 //if (! defined('NOREQUIREMENU'))            define('NOREQUIREMENU', '1');				// If there is no need to load and show top and left menu
diff --git a/htdocs/modulebuilder/template/scripts/mymodule.php b/htdocs/modulebuilder/template/scripts/mymodule.php
index 2d9b3aac79c..e335eb0ea46 100644
--- a/htdocs/modulebuilder/template/scripts/mymodule.php
+++ b/htdocs/modulebuilder/template/scripts/mymodule.php
@@ -29,7 +29,6 @@
 //if (! defined('NOREQUIRETRAN'))            define('NOREQUIRETRAN', '1');				// Do not load object $langs
 //if (! defined('NOSCANGETFORINJECTION'))    define('NOSCANGETFORINJECTION', '1');		// Do not check injection attack on GET parameters
 //if (! defined('NOSCANPOSTFORINJECTION'))   define('NOSCANPOSTFORINJECTION', '1');		// Do not check injection attack on POST parameters
-//if (! defined('NOCSRFCHECK'))              define('NOCSRFCHECK', '1');				// Do not check CSRF attack (test on referer + on token if option MAIN_SECURITY_CSRF_WITH_TOKEN is on).
 //if (! defined('NOTOKENRENEWAL'))           define('NOTOKENRENEWAL', '1');				// Do not roll the Anti CSRF token (used if MAIN_SECURITY_CSRF_WITH_TOKEN is on)
 //if (! defined('NOSTYLECHECK'))             define('NOSTYLECHECK', '1');				// Do not check style html tag into posted data
 //if (! defined('NOREQUIREMENU'))            define('NOREQUIREMENU', '1');				// If there is no need to load and show top and left menu
diff --git a/htdocs/projet/ajax/projects.php b/htdocs/projet/ajax/projects.php
index e9e8f85ddf3..03d118dc9b9 100644
--- a/htdocs/projet/ajax/projects.php
+++ b/htdocs/projet/ajax/projects.php
@@ -38,9 +38,6 @@ if (!defined('NOREQUIREAJAX')) {
 if (!defined('NOREQUIRESOC')) {
 	define('NOREQUIRESOC', '1');
 }
-if (!defined('NOCSRFCHECK')) {
-	define('NOCSRFCHECK', '1');
-}
 if (!defined('NOREQUIREHTML')) {
 	define('NOREQUIREHTML', '1');
 }
@@ -65,7 +62,7 @@ dol_syslog("Call ajax projet/ajax/projects.php");
 
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php';
 
-top_httphead();
+top_httphead('application/json');
 
 if (empty($htmlname) && !GETPOST('mode', 'aZ09')) {
 	return;
diff --git a/htdocs/public/demo/index.php b/htdocs/public/demo/index.php
index 2762a57eced..f7274d5b06b 100644
--- a/htdocs/public/demo/index.php
+++ b/htdocs/public/demo/index.php
@@ -27,9 +27,6 @@
 if (!defined('NOLOGIN')) {
 	define('NOLOGIN', '1');
 }
-if (!defined('NOCSRFCHECK')) {
-	define('NOCSRFCHECK', '1');
-}
 if (!defined('NOBROWSERNOTIF')) {
 	define('NOBROWSERNOTIF', 1);
 }
diff --git a/htdocs/public/donations/donateurs_code.php b/htdocs/public/donations/donateurs_code.php
index 5fb3798f428..4acbaa5a256 100644
--- a/htdocs/public/donations/donateurs_code.php
+++ b/htdocs/public/donations/donateurs_code.php
@@ -25,9 +25,6 @@
 if (!defined('NOLOGIN')) {
 	define('NOLOGIN', '1');
 }
-if (!defined('NOCSRFCHECK')) {
-	define('NOCSRFCHECK', '1');
-}
 if (!defined('NOBROWSERNOTIF')) {
 	define('NOBROWSERNOTIF', '1');
 }
diff --git a/htdocs/public/test/test_arrays.php b/htdocs/public/test/test_arrays.php
index 15f54b646a5..693b7eed59d 100644
--- a/htdocs/public/test/test_arrays.php
+++ b/htdocs/public/test/test_arrays.php
@@ -9,12 +9,6 @@ if (!defined('NOREQUIRESOC')) {
 if (!defined('NOSTYLECHECK')) {
 	define('NOSTYLECHECK', '1'); // Do not check style html tag into posted data
 }
-if (!defined('NOCSRFCHECK')) {
-	define('NOCSRFCHECK', '1'); // Do not check anti CSRF attack test
-}
-if (!defined('NOTOKENRENEWAL')) {
-	define('NOTOKENRENEWAL', '1'); // Do not check anti POST attack test
-}
 //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
diff --git a/htdocs/public/test/test_csrf.php b/htdocs/public/test/test_csrf.php
index eb2527bb62d..6bb9679d404 100644
--- a/htdocs/public/test/test_csrf.php
+++ b/htdocs/public/test/test_csrf.php
@@ -9,12 +9,6 @@ if (!defined('NOREQUIRESOC')) {
 if (!defined('NOSTYLECHECK')) {
 	define('NOSTYLECHECK', '1'); // Do not check style html tag into posted data
 }
-if (!defined('NOCSRFCHECK')) {
-	define('NOCSRFCHECK', '1'); // Do not check anti CSRF attack test
-}
-if (!defined('NOTOKENRENEWAL')) {
-	define('NOTOKENRENEWAL', '1'); // Do not check anti POST attack test
-}
 //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
diff --git a/htdocs/public/test/test_exec.php b/htdocs/public/test/test_exec.php
index 59259d0ac49..1c477c31295 100644
--- a/htdocs/public/test/test_exec.php
+++ b/htdocs/public/test/test_exec.php
@@ -14,12 +14,6 @@ if (!defined('NOREQUIRETRAN')) {
 if (!defined('NOSTYLECHECK')) {
 	define('NOSTYLECHECK', '1'); // Do not check style html tag into posted data
 }
-if (!defined('NOCSRFCHECK')) {
-	define('NOCSRFCHECK', '1'); // Do not check anti CSRF attack test
-}
-if (!defined('NOTOKENRENEWAL')) {
-	define('NOTOKENRENEWAL', '1'); // Do not check anti POST attack test
-}
 if (!defined('NOREQUIREMENU')) {
 	define('NOREQUIREMENU', '1'); // If there is no need to load and show top and left menu
 }
diff --git a/htdocs/public/test/test_sessionlock.php b/htdocs/public/test/test_sessionlock.php
index ce764d5daed..6e022358ba2 100644
--- a/htdocs/public/test/test_sessionlock.php
+++ b/htdocs/public/test/test_sessionlock.php
@@ -14,12 +14,6 @@ if (!defined('NOREQUIRETRAN')) {
 if (!defined('NOSTYLECHECK')) {
 	define('NOSTYLECHECK', '1'); // Do not check style html tag into posted data
 }
-if (!defined('NOCSRFCHECK')) {
-	define('NOCSRFCHECK', '1'); // Do not check anti CSRF attack test
-}
-if (!defined('NOTOKENRENEWAL')) {
-	define('NOTOKENRENEWAL', '1'); // Do not check anti POST attack test
-}
 if (!defined('NOREQUIREMENU')) {
 	define('NOREQUIREMENU', '1'); // If there is no need to load and show top and left menu
 }
diff --git a/htdocs/public/ticket/ajax/ajax.php b/htdocs/public/ticket/ajax/ajax.php
index a75c796539c..2b637ce3647 100644
--- a/htdocs/public/ticket/ajax/ajax.php
+++ b/htdocs/public/ticket/ajax/ajax.php
@@ -33,9 +33,6 @@ if (!defined('NOREQUIREAJAX')) {
 if (!defined('NOREQUIRESOC')) {
 	define('NOREQUIRESOC', '1');
 }
-if (!defined('NOCSRFCHECK')) {
-	define('NOCSRFCHECK', '1');
-}
 // Do not check anti CSRF attack test
 if (!defined('NOREQUIREMENU')) {
 	define('NOREQUIREMENU', '1');
diff --git a/htdocs/takepos/admin/orderprinters.php b/htdocs/takepos/admin/orderprinters.php
index f01f3d4de66..2b4ac9e594c 100644
--- a/htdocs/takepos/admin/orderprinters.php
+++ b/htdocs/takepos/admin/orderprinters.php
@@ -175,6 +175,7 @@ print '<tr class="liste_titre"><td>'.$langs->trans("Printer").' 1</td><td></td><
 print '</td></tr>';
 $nbofentries = (count($data) - 1);
 print '<form action="orderprinters.php">';
+print '<input type="hidden" name="token" value="'.newToken().'">';
 if ($nbofentries > 0) {
 	print '<tr class="pair"><td colspan="3">';
 	print '<input type="hidden" name="action" value="SavePrinter1">';
@@ -208,6 +209,7 @@ print '<tr class="liste_titre"><td>'.$langs->trans("Printer").' 2</td><td></td><
 print '</td></tr>';
 $nbofentries = (count($data) - 1);
 print '<form action="orderprinters.php">';
+print '<input type="hidden" name="token" value="'.newToken().'">';
 if ($nbofentries > 0) {
 	print '<tr class="pair"><td colspan="3">';
 	print '<input type="hidden" name="action" value="SavePrinter2">';
@@ -241,6 +243,7 @@ print '<tr class="liste_titre"><td>'.$langs->trans("Printer").' 3</td><td></td><
 print '</td></tr>';
 $nbofentries = (count($data) - 1);
 print '<form action="orderprinters.php">';
+print '<input type="hidden" name="token" value="'.newToken().'">';
 if ($nbofentries > 0) {
 	print '<tr class="pair"><td colspan="3">';
 	print '<input type="hidden" name="action" value="SavePrinter3">';
diff --git a/htdocs/takepos/admin/other.php b/htdocs/takepos/admin/other.php
index 6200fce8768..7f07b214085 100644
--- a/htdocs/takepos/admin/other.php
+++ b/htdocs/takepos/admin/other.php
@@ -82,7 +82,6 @@ print '<form action="'.$_SERVER["PHP_SELF"].'" method="post">';
 print '<input type="hidden" name="token" value="'.newToken().'">';
 print '<input type="hidden" name="action" value="set">';
 
-
 print '<div class="div-table-responsive-no-min">';
 
 // Marketplace
diff --git a/htdocs/takepos/floors.php b/htdocs/takepos/floors.php
index 01f022a94cd..85aab47528f 100644
--- a/htdocs/takepos/floors.php
+++ b/htdocs/takepos/floors.php
@@ -25,9 +25,6 @@
 //if (! defined('NOREQUIREDB'))		define('NOREQUIREDB','1');		// Not disabled cause need to load personalized language
 //if (! defined('NOREQUIRESOC'))	define('NOREQUIRESOC','1');
 //if (! defined('NOREQUIRETRAN'))	define('NOREQUIRETRAN','1');
-if (!defined('NOTOKENRENEWAL')) {
-	define('NOTOKENRENEWAL', '1');
-}
 if (!defined('NOREQUIREMENU')) {
 	define('NOREQUIREMENU', '1');
 }
@@ -182,7 +179,7 @@ function LoadPlace(place){
 
 
 $( document ).ready(function() {
-	$.getJSON('./floors.php?action=getTables&floor=<?php echo $floor; ?>', function(data) {
+	$.getJSON('./floors.php?action=getTables&token=<?php echo newToken();?>&floor=<?php echo $floor; ?>', function(data) {
 		$.each(data, function(key, val) {
 			<?php if ($mode == "edit") {?>
 			$('body').append('<div class="tablediv" contenteditable onblur="updatename('+val.rowid+');" style="position: absolute; left: '+val.leftpos+'%; top: '+val.toppos+'%;" id="tablename'+val.rowid+'">'+val.label+'</div>');
diff --git a/htdocs/takepos/freezone.php b/htdocs/takepos/freezone.php
index 2402c24acca..e1b24ec286d 100644
--- a/htdocs/takepos/freezone.php
+++ b/htdocs/takepos/freezone.php
@@ -109,7 +109,7 @@ top_htmlhead($head, '', 0, 0, $arrayofjs, $arrayofcss);
 	 */
 	function Save() {
 		console.log("We click so we call page invoice.php with place=<?php echo $place; ?> tva_tx="+vatRate);
-		parent.$("#poslines").load("invoice.php?action=freezone&place=<?php echo $place; ?>&number="+$('#number').val()+"&tva_tx="+vatRate, {desc:$('#desc').val()});
+		parent.$("#poslines").load("invoice.php?action=freezone&token=<?php echo newToken(); ?>&place=<?php echo $place; ?>&number="+$('#number').val()+"&tva_tx="+vatRate, {desc:$('#desc').val()});
 		parent.$.colorbox.close();
 	}
 
diff --git a/htdocs/takepos/index.php b/htdocs/takepos/index.php
index e612d4cd8ee..5e1bd1350fb 100644
--- a/htdocs/takepos/index.php
+++ b/htdocs/takepos/index.php
@@ -28,9 +28,6 @@
 // if (! defined('NOREQUIRESOC')) 		define('NOREQUIRESOC','1');
 // if (! defined('NOREQUIRETRAN')) 		define('NOREQUIRETRAN','1');
 
-if (!defined('NOTOKENRENEWAL')) {
-	define('NOTOKENRENEWAL', '1');
-}
 if (!defined('NOREQUIREMENU')) {
 	define('NOREQUIREMENU', '1');
 }
@@ -325,7 +322,7 @@ function LoadProducts(position, issubcat) {
 	});
 
 	idata=0; //product data counter
-	$.getJSON('<?php echo DOL_URL_ROOT ?>/takepos/ajax/ajax.php?action=getProducts&category='+currentcat, function(data) {
+	$.getJSON('<?php echo DOL_URL_ROOT ?>/takepos/ajax/ajax.php?action=getProducts&token=<?php echo newToken();?>&category='+currentcat, function(data) {
 		console.log("Call ajax.php (in LoadProducts) to get Products of category "+currentcat+" then loop on result to fill image thumbs");
 		console.log(data);
 		while (ishow < maxproduct) {
@@ -415,7 +412,7 @@ function MoreProducts(moreorless) {
 		if (pageproducts==0) return; //Return if no less pages
 		pageproducts=pageproducts-1;
 	}
-	$.getJSON('<?php echo DOL_URL_ROOT ?>/takepos/ajax/ajax.php?action=getProducts&category='+currentcat, function(data) {
+	$.getJSON('<?php echo DOL_URL_ROOT ?>/takepos/ajax/ajax.php?action=getProducts&token=<?php echo newToken();?>&category='+currentcat, function(data) {
 		console.log("Call ajax.php (in MoreProducts) to get Products of category "+currentcat);
 
 		if (typeof (data[(maxproduct * pageproducts)]) == "undefined" && moreorless=="more"){ // Return if no more pages
@@ -490,7 +487,7 @@ function ClickProduct(position, qty = 1) {
 function ChangeThirdparty(idcustomer) {
 	 console.log("ChangeThirdparty");
 		// Call page list.php to change customer
-		$("#poslines").load("../societe/list.php?action=change&type=t&contextpage=poslist&idcustomer="+idcustomer+"&place="+place+"", function() {
+		$("#poslines").load("../societe/list.php?action=change&token=<?php echo newToken();?>&type=t&contextpage=poslist&idcustomer="+idcustomer+"&place="+place+"", function() {
 		});
 
 	ClearSearch();
@@ -540,7 +537,7 @@ function Floors() {
 
 function FreeZone() {
 	console.log("Open box to enter a free product");
-	$.colorbox({href:"freezone.php?action=freezone&place="+place, width:"80%", height:"200px", transition:"none", iframe:"true", title:"<?php echo $langs->trans("FreeZone"); ?>"});
+	$.colorbox({href:"freezone.php?action=freezone&token=<?php echo newToken(); ?>&place="+place, width:"80%", height:"200px", transition:"none", iframe:"true", title:"<?php echo $langs->trans("FreeZone"); ?>"});
 }
 
 function TakeposOrderNotes() {
@@ -562,7 +559,7 @@ function New() {
 
 	console.log("New with place = <?php echo $place; ?>, js place="+place+", invoiceid="+invoiceid);
 
-	$.getJSON('<?php echo DOL_URL_ROOT ?>/takepos/ajax/ajax.php?action=getInvoice&id='+invoiceid, function(data) {
+	$.getJSON('<?php echo DOL_URL_ROOT ?>/takepos/ajax/ajax.php?action=getInvoice&token=<?php echo newToken();?>&id='+invoiceid, function(data) {
 		var r;
 
 		if (parseInt(data['paye']) === 1) {
@@ -628,7 +625,7 @@ function Search2(keyCodeForEnter, moreorless) {
 			pageproducts = 0;
 			jQuery(".wrapper2 .catwatermark").hide();
 			var nbsearchresults = 0;
-			$.getJSON('<?php echo DOL_URL_ROOT ?>/takepos/ajax/ajax.php?action=search&term=' + search_term + '&search_start=' + search_start + '&search_limit=' + search_limit, function (data) {
+			$.getJSON('<?php echo DOL_URL_ROOT ?>/takepos/ajax/ajax.php?action=search&token=<?php echo newToken();?>&term=' + search_term + '&search_start=' + search_start + '&search_limit=' + search_limit, function (data) {
 				for (i = 0; i < <?php echo $MAXPRODUCT ?>; i++) {
 					if (typeof (data[i]) == "undefined") {
 						$("#prowatermark" + i).html("");
@@ -746,7 +743,7 @@ function Edit(number) {
 		return;
 	} else if (number=='qty') {
 		if (editaction=='qty' && editnumber != '') {
-			$("#poslines").load("invoice.php?action=updateqty&place="+place+"&idline="+selectedline+"&number="+editnumber, function() {
+			$("#poslines").load("invoice.php?action=updateqty&token=<?php echo newToken(); ?>&place="+place+"&idline="+selectedline+"&number="+editnumber, function() {
 				editnumber="";
 				//$('#poslines').scrollTop($('#poslines')[0].scrollHeight);
 				$("#qty").html("<?php echo $langs->trans("Qty"); ?>").removeClass('clicked');
@@ -760,7 +757,7 @@ function Edit(number) {
 		}
 	} else if (number=='p') {
 		if (editaction=='p' && editnumber!="") {
-			$("#poslines").load("invoice.php?action=updateprice&place="+place+"&idline="+selectedline+"&number="+editnumber, function() {
+			$("#poslines").load("invoice.php?action=updateprice&token=<?php echo newToken(); ?>&place="+place+"&idline="+selectedline+"&number="+editnumber, function() {
 				editnumber="";
 				//$('#poslines').scrollTop($('#poslines')[0].scrollHeight);
 				$("#price").html("<?php echo $langs->trans("Price"); ?>").removeClass('clicked');
@@ -774,7 +771,7 @@ function Edit(number) {
 		}
 	} else if (number=='r') {
 		if (editaction=='r' && editnumber!="") {
-			$("#poslines").load("invoice.php?action=updatereduction&place="+place+"&idline="+selectedline+"&number="+editnumber, function() {
+			$("#poslines").load("invoice.php?action=updatereduction&token=<?php echo newToken(); ?>&place="+place+"&idline="+selectedline+"&number="+editnumber, function() {
 				editnumber="";
 				//$('#poslines').scrollTop($('#poslines')[0].scrollHeight);
 				$("#reduction").html("<?php echo $langs->trans("ReductionShort"); ?>").removeClass('clicked');
@@ -814,14 +811,14 @@ function Edit(number) {
 
 function TakeposPrintingOrder(){
 	console.log("TakeposPrintingOrder");
-	$("#poslines").load("invoice.php?action=order&place="+place, function() {
+	$("#poslines").load("invoice.php?action=order&token=<?php echo newToken();?>&place="+place, function() {
 		//$('#poslines').scrollTop($('#poslines')[0].scrollHeight);
 	});
 }
 
 function TakeposPrintingTemp(){
 	console.log("TakeposPrintingTemp");
-	$("#poslines").load("invoice.php?action=temp&place="+place, function() {
+	$("#poslines").load("invoice.php?action=temp&token=<?php echo newToken();?>&place="+place, function() {
 		//$('#poslines').scrollTop($('#poslines')[0].scrollHeight);
 	});
 }
@@ -843,11 +840,11 @@ function OpenDrawer(){
 }
 
 function DolibarrOpenDrawer() {
-	console.log("DolibarrOpenDrawer call ajax url /takepos/ajax/ajax.php?action=opendrawer&term=<?php print urlencode($_SESSION["takeposterminal"]); ?>");
+	console.log("DolibarrOpenDrawer call ajax url /takepos/ajax/ajax.php?action=opendrawer&token=<?php echo newToken();?>&term=<?php print urlencode($_SESSION["takeposterminal"]); ?>");
 	$.ajax({
 		type: "GET",
 		data: { token: '<?php echo currentToken(); ?>' },
-		url: "<?php print DOL_URL_ROOT.'/takepos/ajax/ajax.php?action=opendrawer&term='.urlencode($_SESSION["takeposterminal"]); ?>",
+		url: "<?php print DOL_URL_ROOT.'/takepos/ajax/ajax.php?action=opendrawer&token='.newToken().'&term='.urlencode($_SESSION["takeposterminal"]); ?>",
 	});
 }
 
@@ -892,7 +889,7 @@ function ModalBox(ModalID)
 
 function DirectPayment(){
 	console.log("DirectPayment");
-	$("#poslines").load("invoice.php?place="+place+"&action=valid&pay=LIQ", function() {
+	$("#poslines").load("invoice.php?place="+place+"&action=valid&token=<?php echo newToken(); ?>&pay=LIQ", function() {
 	});
 }
 
@@ -908,7 +905,7 @@ function WeighingScale(){
 		url: '<?php print getDolGlobalString('TAKEPOS_PRINT_SERVER'); ?>/scale/index.php',
 	})
 	.done(function( editnumber ) {
-		$("#poslines").load("invoice.php?action=updateqty&place="+place+"&idline="+selectedline+"&number="+editnumber, function() {
+		$("#poslines").load("invoice.php?&token=<?php echo newToken(); ?>&place="+place+"&idline="+selectedline+"&number="+editnumber, function() {
 				editnumber="";
 			});
 	});
diff --git a/htdocs/takepos/invoice.php b/htdocs/takepos/invoice.php
index 6ec6f11ffc7..523a6ad2986 100644
--- a/htdocs/takepos/invoice.php
+++ b/htdocs/takepos/invoice.php
@@ -1083,7 +1083,7 @@ function SendTicket(id)
 
 function PrintBox(id, action) {
 	console.log("Open box before printing");
-	$.colorbox({href:"printbox.php?facid="+id+"&action="+action, width:"80%", height:"200px", transition:"none", iframe:"true", title:"<?php echo $langs->trans("PrintWithoutDetails"); ?>"});
+	$.colorbox({href:"printbox.php?facid="+id+"&action="+action+"&token=<?php echo newToken(); ?>", width:"80%", height:"200px", transition:"none", iframe:"true", title:"<?php echo $langs->trans("PrintWithoutDetails"); ?>"});
 }
 
 function Print(id, gift){
@@ -1106,7 +1106,7 @@ function TakeposPrinting(id){
 
 function TakeposConnector(id){
 	console.log("TakeposConnector" + id);
-	$.get("<?php echo DOL_URL_ROOT; ?>/takepos/ajax/ajax.php?action=printinvoiceticket&term=<?php echo urlencode(isset($_SESSION["takeposterminal"]) ? $_SESSION["takeposterminal"] : ''); ?>&id="+id+"&token=<?php echo currentToken(); ?>", function(data, status) {
+	$.get("<?php echo DOL_URL_ROOT; ?>/takepos/ajax/ajax.php?action=printinvoiceticket&token=<?php echo newToken(); ?>&term=<?php echo urlencode(isset($_SESSION["takeposterminal"]) ? $_SESSION["takeposterminal"] : ''); ?>&id="+id+"&token=<?php echo currentToken(); ?>", function(data, status) {
 		$.ajax({
 			type: "POST",
 			url: '<?php print getDolGlobalString('TAKEPOS_PRINT_SERVER'); ?>/printer/index.php',
@@ -1120,7 +1120,7 @@ function DolibarrTakeposPrinting(id) {
 	$.ajax({
 		type: "GET",
 		data: { token: '<?php echo currentToken(); ?>' },
-		url: "<?php print DOL_URL_ROOT.'/takepos/ajax/ajax.php?action=printinvoiceticket&term='.urlencode(isset($_SESSION["takeposterminal"]) ? $_SESSION["takeposterminal"] : '').'&id='; ?>" + id,
+		url: "<?php print DOL_URL_ROOT.'/takepos/ajax/ajax.php?action=printinvoiceticket&token='.newToken().'&term='.urlencode(isset($_SESSION["takeposterminal"]) ? $_SESSION["takeposterminal"] : '').'&id='; ?>" + id,
 	});
 }
 
diff --git a/htdocs/takepos/pay.php b/htdocs/takepos/pay.php
index e9188aabfdc..1222ccd1786 100644
--- a/htdocs/takepos/pay.php
+++ b/htdocs/takepos/pay.php
@@ -110,9 +110,13 @@ function unexpectedDisconnect() {
 }
 function fetchConnectionToken() {
 	<?php
-	$urlconnexiontoken = DOL_URL_ROOT.'/stripe/ajax/ajax.php?action=getConnexionToken&servicestatus='.$servicestatus;
-	if (!empty($conf->global->STRIPE_LOCATION)) $urlconnexiontoken .= '&location='.$conf->global->STRIPE_LOCATION;
-	if (!empty($stripeacc)) $urlconnexiontoken .= '&stripeacc='.$stripeacc;
+	$urlconnexiontoken = DOL_URL_ROOT.'/stripe/ajax/ajax.php?action=getConnexionToken&token='.newToken().'&servicestatus='.urlencode($servicestatus);
+	if (!empty($conf->global->STRIPE_LOCATION)) {
+		$urlconnexiontoken .= '&location='.urlencode($conf->global->STRIPE_LOCATION);
+	}
+	if (!empty($stripeacc)) {
+		$urlconnexiontoken .= '&stripeacc='.urlencode($stripeacc);
+	}
 	?>
   // Do not cache or hardcode the ConnectionToken. The SDK manages the ConnectionToken's lifecycle.
   return fetch('<?php echo $urlconnexiontoken; ?>', { method: "POST" })
@@ -318,7 +322,7 @@ if ($conf->global->TAKEPOS_NUMPAD == 0) {
 			amountpayed = <?php echo $invoice->total_ttc; ?>;
 		}
 		console.log("We click on the payment mode to pay amount = "+amountpayed);
-		parent.$("#poslines").load("invoice.php?place=<?php echo $place; ?>&action=valid&pay="+payment+"&amount="+amountpayed+"&excess="+excess+"&invoiceid="+invoiceid+"&accountid="+accountid, function() {
+		parent.$("#poslines").load("invoice.php?place=<?php echo $place; ?>&action=valid&token=<?php echo newToken(); ?>&pay="+payment+"&amount="+amountpayed+"&excess="+excess+"&invoiceid="+invoiceid+"&accountid="+accountid, function() {
 			if (amountpayed > <?php echo $remaintopay; ?> || amountpayed == <?php echo $remaintopay; ?> || amountpayed==0 ) {
 				console.log("Close popup");
 				parent.$.colorbox.close();
@@ -355,8 +359,10 @@ if ($conf->global->TAKEPOS_NUMPAD == 0) {
 	function capturePaymentIntent(paymentIntentId) {
 	const bodyContent = JSON.stringify({"id": paymentIntentId})
   <?php
-	$urlpaymentintent = DOL_URL_ROOT.'/stripe/ajax/ajax.php?action=capturePaymentIntent&servicestatus='.$servicestatus;
-	if (!empty($stripeacc)) $urlpaymentintent .= '&stripeacc='.$stripeacc;
+	$urlpaymentintent = DOL_URL_ROOT.'/stripe/ajax/ajax.php?action=capturePaymentIntent&token='.newToken().'&servicestatus='.urlencode($servicestatus);
+	if (!empty($stripeacc)) {
+		$urlpaymentintent .= '&stripeacc='.urlencode($stripeacc);
+	}
 	?>
   return fetch('<?php echo $urlpaymentintent; ?>', {
 	method: "POST",
@@ -416,7 +422,7 @@ if ($conf->global->TAKEPOS_NUMPAD == 0) {
 			  } else {
 				document.getElementById("card-present-alert").innerHTML = '<div class="warning clearboth"><?php echo $langs->trans('PaymentValidated'); ?></div>';
 				console.log("Capture paymentIntent successfull "+paymentIntentId);
-				  parent.$("#poslines").load("invoice.php?place=<?php echo $place; ?>&action=valid&pay=CB&amount="+amountpayed+"&excess="+excess+"&invoiceid="+invoiceid+"&accountid="+accountid, function() {
+				  parent.$("#poslines").load("invoice.php?place=<?php echo $place; ?>&action=valid&token=<?php echo newToken(); ?>&pay=CB&amount="+amountpayed+"&excess="+excess+"&invoiceid="+invoiceid+"&accountid="+accountid, function() {
 			if (amountpayed > <?php echo $remaintopay; ?> || amountpayed == <?php echo $remaintopay; ?> || amountpayed==0 ) {
 				console.log("Close popup");
 				parent.$.colorbox.close();
@@ -455,7 +461,7 @@ if ($conf->global->TAKEPOS_NUMPAD == 0) {
 				url: '<?php echo DOL_URL_ROOT ?>/takepos/smpcb.php?status' }).done(function (data) {
 				console.log(data);
 				if (data === "SUCCESS") {
-					parent.$("#poslines").load("invoice.php?place=<?php echo $place; ?>&action=valid&pay=CB&amount=" + amountpayed + "&invoiceid=" + invoiceid, function () {
+					parent.$("#poslines").load("invoice.php?place=<?php echo $place; ?>&action=valid&token=<?php echo newToken(); ?>&pay=CB&amount=" + amountpayed + "&invoiceid=" + invoiceid, function () {
 						//parent.$("#poslines").scrollTop(parent.$("#poslines")[0].scrollHeight);
 						parent.$.colorbox.close();
 						//parent.setFocusOnSearchField();	// This does not have effect
diff --git a/htdocs/takepos/phone.php b/htdocs/takepos/phone.php
index 4d89ce23f66..f1e633d994d 100644
--- a/htdocs/takepos/phone.php
+++ b/htdocs/takepos/phone.php
@@ -225,7 +225,7 @@ function AddProduct(placeid, productid){
 	// If is a public terminal first show product information
 	if (defined('INCLUDE_PHONEPAGE_FROM_PUBLIC_PAGE')) {
 		print 'place=placeid;
-		$("#phonediv1").load("auto_order.php?action=productinfo&place="+place+"&idproduct="+productid, function() {
+		$("#phonediv1").load("auto_order.php?action=productinfo&token='.newToken().'&place="+place+"&idproduct="+productid, function() {
 		});';
 	} else {
 		print 'AddProductConfirm(placeid, productid);';
@@ -234,7 +234,7 @@ function AddProduct(placeid, productid){
 }
 
 function PublicPreOrder(){
-	$("#phonediv1").load("auto_order.php?action=publicpreorder&place="+place, function() {
+	$("#phonediv1").load("auto_order.php?action=publicpreorder&token=<?php echo newToken(); ?>&place="+place, function() {
 	});
 }
 
@@ -260,7 +260,7 @@ function SetQty(place, selectedline, qty){
 		});
 	}
 	else{
-		$("#phonediv2").load("auto_order.php?mobilepage=invoice&action=updateqty&place="+place+"&idline="+selectedline+"&number="+qty, function() {
+		$("#phonediv2").load("auto_order.php?mobilepage=invoice&action=updateqty&token=<?php echo newToken(); ?>&place="+place+"&idline="+selectedline+"&number="+qty, function() {
 		});
 	}
 		<?php
@@ -271,7 +271,7 @@ function SetQty(place, selectedline, qty){
 		});
 	}
 	else{
-		$("#phonediv2").load("invoice.php?mobilepage=invoice&action=updateqty&place="+place+"&idline="+selectedline+"&number="+qty, function() {
+		$("#phonediv2").load("invoice.php?mobilepage=invoice&action=updateqty&token=<?php echo newToken(); ?>&place="+place+"&idline="+selectedline+"&number="+qty, function() {
 		});
 	}
 		<?php
@@ -282,7 +282,7 @@ function SetQty(place, selectedline, qty){
 
 function SetNote(place, selectedline){
 	var note = prompt("<?php $langs->trans('Note'); ?>", "");
-	$("#phonediv2").load("auto_order.php?mobilepage=invoice&action=updateqty&place="+place+"&idline="+selectedline+"&number="+qty, function() {
+	$("#phonediv2").load("auto_order.php?mobilepage=invoice&action=updateqty&token=<?php echo newToken(); ?>&place="+place+"&idline="+selectedline+"&number="+qty, function() {
 	});
 	LoadCats();
 }
@@ -321,12 +321,12 @@ function TakeposPrintingOrder(){
 	console.log("TakeposPrintingOrder");
 	<?php
 	if (defined('INCLUDE_PHONEPAGE_FROM_PUBLIC_PAGE')) {
-		echo '$("#phonediv2").load("auto_order.php?action=order&mobilepage=order&place="+place, function() {
+		echo '$("#phonediv2").load("auto_order.php?action=order&token='.newToken().'&mobilepage=order&place="+place, function() {
 		});';
-		echo '$("#phonediv1").load("auto_order.php?action=publicpayment&place="+place, function() {
+		echo '$("#phonediv1").load("auto_order.php?action=publicpayment&token='.newToken().'&place="+place, function() {
 		});';
 	} else {
-		echo '$("#phonediv2").load("invoice.php?action=order&place="+place, function() {
+		echo '$("#phonediv2").load("invoice.php?action=order&token='.newToken().'&place="+place, function() {
 		});';
 	}
 	?>
@@ -338,12 +338,12 @@ function Exit(){
 
 function CheckPlease(payment){
 	if (payment==undefined){
-		$("#phonediv1").load("auto_order.php?action=checkplease&place="+place, function() {
+		$("#phonediv1").load("auto_order.php?action=checkplease&token=<?php echo newToken(); ?>&place="+place, function() {
 		});
 	}
 	else{
 		console.log("Request the check to the waiter");
-		$("#phonediv1").load("auto_order.php?action=checkplease&place=<?php echo $place; ?>&payment="+payment, function() {
+		$("#phonediv1").load("auto_order.php?action=checkplease&token=<?php echo newToken(); ?>&place=<?php echo $place; ?>&payment="+payment, function() {
 		});
 	}
 }
diff --git a/htdocs/takepos/printbox.php b/htdocs/takepos/printbox.php
index dfceab9bbc4..53c07bcf1d7 100644
--- a/htdocs/takepos/printbox.php
+++ b/htdocs/takepos/printbox.php
@@ -75,7 +75,7 @@ top_htmlhead($head, '', 0, 0, $arrayofjs, $arrayofcss);
 	function Save() {
 		console.log("We click so we call page receipt.php with facid=<?php echo $facid; ?>");
 		parent.$.colorbox.close();
-		$.colorbox({href:"receipt.php?facid=<?php echo $facid; ?>&action=<?php echo $action; ?>&label="+$('#label').val()+"&qty="+$('#qty').val(), width:"40%", height:"90%", transition:"none", iframe:"true", title:'<?php echo dol_escape_js($langs->trans("PrintTicket")); ?>'});
+		$.colorbox({ href:"receipt.php?facid=<?php echo $facid; ?>&action=<?php echo $action; ?>&token=<?php echo newToken(); ?>&label="+$('#label').val()+"&qty="+$('#qty').val(), width:"40%", height:"90%", transition:"none", iframe:"true", title:'<?php echo dol_escape_js($langs->trans("PrintTicket")); ?>'});
 	}
 
 	jQuery(document).ready(function(){
diff --git a/htdocs/takepos/reduction.php b/htdocs/takepos/reduction.php
index 67829003954..5d80acb0f81 100644
--- a/htdocs/takepos/reduction.php
+++ b/htdocs/takepos/reduction.php
@@ -185,13 +185,13 @@ if (!isset($conf->global->TAKEPOS_NUMPAD_USE_PAYMENT_ICON) || !empty($conf->glob
 
 		if (reductionType === 'percent') {
 			var invoiceid = <?php echo ($invoiceid > 0 ? $invoiceid : 0); ?>;
-			parent.$("#poslines").load("invoice.php?action=update_reduction_global&place=<?php echo $place; ?>&number="+reductionNumber+"&invoiceid="+invoiceid, function() {
+			parent.$("#poslines").load("invoice.php?action=update_reduction_global&token=<?php echo newToken(); ?>&place=<?php echo $place; ?>&number="+reductionNumber+"&invoiceid="+invoiceid, function() {
 				Reset();
 				parent.$.colorbox.close();
 			});
 		} else if (reductionType === 'amount') {
 			var desc = "<?php echo dol_escape_js($langs->transnoentities('Reduction')); ?>";
-			parent.$("#poslines").load("invoice.php?action=freezone&place=<?php echo $place; ?>&number=-"+reductionNumber+"&desc="+desc, function() {
+			parent.$("#poslines").load("invoice.php?action=freezone&token=<?php echo newToken(); ?>&place=<?php echo $place; ?>&number=-"+reductionNumber+"&desc="+desc, function() {
 				Reset();
 				parent.$.colorbox.close();
 			});
diff --git a/htdocs/takepos/send.php b/htdocs/takepos/send.php
index 31929a9c732..21252da1d26 100644
--- a/htdocs/takepos/send.php
+++ b/htdocs/takepos/send.php
@@ -107,7 +107,7 @@ function SendMail() {
 	$.ajax({
 		type: "GET",
 		data: { token: '<?php echo currentToken(); ?>' },
-		url: "<?php print DOL_URL_ROOT.'/takepos/send.php?action=send&facid='.$facid.'&email='; ?>" + $("#email"). val(),
+		url: "<?php print DOL_URL_ROOT.'/takepos/send.php?action=send&token='.newToken().'&facid='.$facid.'&email='; ?>" + $("#email"). val(),
 	});
 	parent.$.colorbox.close();
 }
diff --git a/htdocs/takepos/split.php b/htdocs/takepos/split.php
index b39f9d1d215..0391e911ba5 100644
--- a/htdocs/takepos/split.php
+++ b/htdocs/takepos/split.php
@@ -164,7 +164,7 @@ $arrayOfValidBankAccount = array();
 <script>
 function Split(selectedline, split) {
 	$.ajax({
-		url: "split.php?action=split&line="+selectedline+"&split="+split+"&place=<?php echo $place;?>",
+		url: "split.php?action=split&token=<?php echo newToken(); ?>&line="+selectedline+"&split="+split+"&place=<?php echo $place;?>",
 		context: document.body
 	}).done(function() {
 		$("#currentplace").load("invoice.php?place="+parent.place+"&invoiceid="+parent.invoiceid, function() {
diff --git a/htdocs/theme/eldy/manifest.json.php b/htdocs/theme/eldy/manifest.json.php
index d468f685814..2a3de7dda79 100644
--- a/htdocs/theme/eldy/manifest.json.php
+++ b/htdocs/theme/eldy/manifest.json.php
@@ -34,9 +34,6 @@ if (!defined('NOREQUIRESOC')) {
 if (!defined('NOREQUIRETRAN')) {
 	define('NOREQUIRETRAN', '1');
 }
-if (!defined('NOCSRFCHECK')) {
-	define('NOCSRFCHECK', '1');
-}
 if (!defined('NOTOKENRENEWAL')) {
 	define('NOTOKENRENEWAL', '1');
 }
diff --git a/htdocs/theme/md/manifest.json.php b/htdocs/theme/md/manifest.json.php
index 5d8736a0fad..6d489f2b7b8 100644
--- a/htdocs/theme/md/manifest.json.php
+++ b/htdocs/theme/md/manifest.json.php
@@ -37,9 +37,6 @@ if (!defined('NOREQUIRESOC')) {
 if (!defined('NOREQUIRETRAN')) {
 	define('NOREQUIRETRAN', '1');
 }
-if (!defined('NOCSRFCHECK')) {
-	define('NOCSRFCHECK', '1');
-}
 if (!defined('NOTOKENRENEWAL')) {
 	define('NOTOKENRENEWAL', '1');
 }

From 95e1b97f42350375af61e1d9c45fe9714f163c88 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 12 Sep 2022 13:09:21 +0200
Subject: [PATCH 935/974] Fix missing inventory code in reception

---
 htdocs/fourn/class/fournisseur.commande.class.php | 4 +++-
 htdocs/fourn/commande/dispatch.php                | 1 +
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/htdocs/fourn/class/fournisseur.commande.class.php b/htdocs/fourn/class/fournisseur.commande.class.php
index f350c4f3640..08126bf5974 100644
--- a/htdocs/fourn/class/fournisseur.commande.class.php
+++ b/htdocs/fourn/class/fournisseur.commande.class.php
@@ -2006,6 +2006,8 @@ class CommandeFournisseur extends CommonOrder
 
 		$now = dol_now();
 
+		$inventorycode = $langs->trans("Reception").' '.$this->ref;
+
 		if (($this->statut == self::STATUS_ORDERSENT || $this->statut == self::STATUS_RECEIVED_PARTIALLY || $this->statut == self::STATUS_RECEIVED_COMPLETELY)) {
 			$this->db->begin();
 
@@ -2039,7 +2041,7 @@ class CommandeFournisseur extends CommonOrder
 					// $price should take into account discount (except if option STOCK_EXCLUDE_DISCOUNT_FOR_PMP is on)
 					$mouv->origin = &$this;
 					$mouv->setOrigin($this->element, $this->id);
-					$result = $mouv->reception($user, $product, $entrepot, $qty, $price, $comment, $eatby, $sellby, $batch);
+					$result = $mouv->reception($user, $product, $entrepot, $qty, $price, $comment, $eatby, $sellby, $batch, $inventorycode);
 					if ($result < 0) {
 						$this->error = $mouv->error;
 						$this->errors = $mouv->errors;
diff --git a/htdocs/fourn/commande/dispatch.php b/htdocs/fourn/commande/dispatch.php
index a1ddef959a0..acb9766a318 100644
--- a/htdocs/fourn/commande/dispatch.php
+++ b/htdocs/fourn/commande/dispatch.php
@@ -221,6 +221,7 @@ if ($action == 'denydispatchline' && $permissiontocontrol) {
 
 if ($action == 'dispatch' && $permissiontoreceive) {
 	$error = 0;
+	$notrigger = 0;
 
 	$db->begin();
 

From f48752fc1693c792951a5fd2d194f4ccf9ea1315 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 12 Sep 2022 13:25:07 +0200
Subject: [PATCH 936/974] FIX inventory code must be different at each
 transation

---
 htdocs/fourn/class/fournisseur.commande.class.php | 2 +-
 htdocs/mrp/mo_production.php                      | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/htdocs/fourn/class/fournisseur.commande.class.php b/htdocs/fourn/class/fournisseur.commande.class.php
index 08126bf5974..ad666573b18 100644
--- a/htdocs/fourn/class/fournisseur.commande.class.php
+++ b/htdocs/fourn/class/fournisseur.commande.class.php
@@ -2006,7 +2006,7 @@ class CommandeFournisseur extends CommonOrder
 
 		$now = dol_now();
 
-		$inventorycode = $langs->trans("Reception").' '.$this->ref;
+		$inventorycode = dol_print_date(dol_now(), 'dayhourlog');
 
 		if (($this->statut == self::STATUS_ORDERSENT || $this->statut == self::STATUS_RECEIVED_PARTIALLY || $this->statut == self::STATUS_RECEIVED_COMPLETELY)) {
 			$this->db->begin();
diff --git a/htdocs/mrp/mo_production.php b/htdocs/mrp/mo_production.php
index 1c6f3f7ec39..34b9191db94 100644
--- a/htdocs/mrp/mo_production.php
+++ b/htdocs/mrp/mo_production.php
@@ -660,8 +660,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 
 		if (in_array($action, array('consumeorproduce', 'consumeandproduceall'))) {
 			$defaultstockmovementlabel = GETPOST('inventorylabel', 'alphanohtml') ? GETPOST('inventorylabel', 'alphanohtml') : $langs->trans("ProductionForRef", $object->ref);
-			//$defaultstockmovementcode = GETPOST('inventorycode', 'alphanohtml') ? GETPOST('inventorycode', 'alphanohtml') : $object->ref.'_'.dol_print_date(dol_now(), 'dayhourlog');
-			$defaultstockmovementcode = GETPOST('inventorycode', 'alphanohtml') ? GETPOST('inventorycode', 'alphanohtml') : $langs->trans("ProductionForRef", $object->ref);
+			$defaultstockmovementcode = GETPOST('inventorycode', 'alphanohtml') ? GETPOST('inventorycode', 'alphanohtml') : dol_print_date(dol_now(), 'dayhourlog');
 
 			print '<div class="center'.(in_array($action, array('consumeorproduce', 'consumeandproduceall')) ? ' formconsumeproduce' : '').'">';
 			print '<div class="opacitymedium hideonsmartphone paddingbottom">'.$langs->trans("ConfirmProductionDesc", $langs->transnoentitiesnoconv("Confirm")).'<br></div>';

From a35d7f8a4b1199add41780d23765ad4e857c996b Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 12 Sep 2022 14:17:14 +0200
Subject: [PATCH 937/974] Fix must not overwrite the var that is an object of
 cache

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

diff --git a/htdocs/fourn/commande/dispatch.php b/htdocs/fourn/commande/dispatch.php
index acb9766a318..ccf95de4232 100644
--- a/htdocs/fourn/commande/dispatch.php
+++ b/htdocs/fourn/commande/dispatch.php
@@ -1202,10 +1202,6 @@ if ($id > 0 || !empty($ref)) {
 			while ($i < $num) {
 				$objp = $db->fetch_object($resql);
 
-				$tmpproduct->id = $objp->fk_product;
-				$tmpproduct->ref = $objp->ref;
-				$tmpproduct->label = $objp->label;
-
 				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">
 					<input type="hidden" name="token" value="'.newToken().'">

From dfb7c5ea48566138b4721269e514a61eb27a6af4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Mon, 12 Sep 2022 14:50:55 +0200
Subject: [PATCH 938/974] clean aurore model

---
 .../doc/pdf_aurore.modules.php                | 78 +++----------------
 1 file changed, 12 insertions(+), 66 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 8ca9a36b0f8..b1129bbb1ed 100644
--- a/htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php
+++ b/htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php
@@ -140,10 +140,10 @@ class pdf_aurore extends ModelePDFSupplierProposal
 		$this->page_largeur = $formatarray['width'];
 		$this->page_hauteur = $formatarray['height'];
 		$this->format = array($this->page_largeur, $this->page_hauteur);
-		$this->marge_gauche = isset($conf->global->MAIN_PDF_MARGIN_LEFT) ? $conf->global->MAIN_PDF_MARGIN_LEFT : 10;
-		$this->marge_droite = isset($conf->global->MAIN_PDF_MARGIN_RIGHT) ? $conf->global->MAIN_PDF_MARGIN_RIGHT : 10;
-		$this->marge_haute = isset($conf->global->MAIN_PDF_MARGIN_TOP) ? $conf->global->MAIN_PDF_MARGIN_TOP : 10;
-		$this->marge_basse = isset($conf->global->MAIN_PDF_MARGIN_BOTTOM) ? $conf->global->MAIN_PDF_MARGIN_BOTTOM : 10;
+		$this->marge_gauche = getDolGlobalInt('MAIN_PDF_MARGIN_LEFT', 10);
+		$this->marge_droite = getDolGlobalInt('MAIN_PDF_MARGIN_RIGHT', 10);
+		$this->marge_haute = getDolGlobalInt('MAIN_PDF_MARGIN_TOP', 10);
+		$this->marge_basse = getDolGlobalInt('MAIN_PDF_MARGIN_BOTTOM', 10);
 
 		$this->option_logo = 1; // Display logo
 		$this->option_tva = 1; // Manage the vat option FACTURE_TVAOPTION
@@ -168,24 +168,18 @@ class pdf_aurore extends ModelePDFSupplierProposal
 		$this->postotalht = 174;
 
 		if (!empty($conf->global->PRODUCT_USE_UNITS)) {
-			$this->posxtva = 101;
-			$this->posxup = 118;
+			$this->posxup = 112;
 			$this->posxqty = 135;
 			$this->posxunit = 151;
 		} else {
-			$this->posxtva = 102;
-			$this->posxup = 126;
+			$this->posxup = 120;
 			$this->posxqty = 145;
 			$this->posxunit = 162;
 		}
 
-		if (!empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT) || !empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT_COLUMN)) {
-			$this->posxup = $this->posxtva;
-		}
-		$this->posxpicture = $this->posxtva - (empty($conf->global->MAIN_DOCUMENTS_WITH_PICTURE_WIDTH) ? 20 : $conf->global->MAIN_DOCUMENTS_WITH_PICTURE_WIDTH); // width of images
+		$this->posxpicture = $this->posxup - (empty($conf->global->MAIN_DOCUMENTS_WITH_PICTURE_WIDTH) ? 20 : $conf->global->MAIN_DOCUMENTS_WITH_PICTURE_WIDTH); // width of images
 		if ($this->page_largeur < 210) { // To work with US executive format
 			$this->posxpicture -= 20;
-			$this->posxtva -= 20;
 			$this->posxup -= 20;
 			$this->posxqty -= 20;
 			$this->posxunit -= 20;
@@ -276,7 +270,7 @@ class pdf_aurore extends ModelePDFSupplierProposal
 			}
 		}
 		if (count($realpatharray) == 0) {
-			$this->posxpicture = $this->posxtva;
+			$this->posxpicture = $this->posxup;
 		}
 
 		if ($conf->supplier_proposal->dir_output) {
@@ -358,7 +352,6 @@ class pdf_aurore extends ModelePDFSupplierProposal
 				if (empty($this->atleastonediscount)) {
 					$delta = ($this->postotalht - $this->posxdiscount);
 					$this->posxpicture += $delta;
-					$this->posxtva += $delta;
 					$this->posxup += $delta;
 					$this->posxqty += $delta;
 					$this->posxunit += $delta;
@@ -460,7 +453,7 @@ class pdf_aurore extends ModelePDFSupplierProposal
 
 					if (!empty($imglinesize['width']) && !empty($imglinesize['height'])) {
 						$curX = $this->posxpicture - 1;
-						$pdf->Image($realpatharray[$i], $curX + (($this->posxtva - $this->posxpicture - $imglinesize['width']) / 2), $curY, $imglinesize['width'], $imglinesize['height'], '', '', '', 2, 300); // Use 300 dpi
+						$pdf->Image($realpatharray[$i], $curX + (($this->posxup - $this->posxpicture - $imglinesize['width']) / 2), $curY, $imglinesize['width'], $imglinesize['height'], '', '', '', 2, 300); // Use 300 dpi
 						// $pdf->Image does not increase value return by getY, so we save it manually
 						$posYAfterImage = $curY + $imglinesize['height'];
 					}
@@ -472,7 +465,7 @@ class pdf_aurore extends ModelePDFSupplierProposal
 					if ($posYAfterImage > 0) {
 						$descWidth = $this->posxpicture - $curX;
 					} else {
-						$descWidth = $this->posxtva - $curX;
+						$descWidth = $this->posxup - $curX;
 					}
 					pdf_writelinedesc($pdf, $object, $i, $outputlangs, $descWidth, 3, $curX, $curY, $hideref, $hidedesc, 1);
 
@@ -528,22 +521,6 @@ class pdf_aurore extends ModelePDFSupplierProposal
 
 					$pdf->SetFont('', '', $default_font_size - 1); // On repositionne la police par defaut
 
-					// VAT Rate
-					/*
-					if (empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT))
-					{
-						$vat_rate = pdf_getlinevatrate($object, $i, $outputlangs, $hidedetails);
-						$pdf->SetXY($this->posxtva, $curY);
-						$pdf->MultiCell($this->posxup-$this->posxtva-3, 3, $vat_rate, 0, 'R');
-					}
-
-					// Unit price before discount
-					$up_excl_tax = pdf_getlineupexcltax($object, $i, $outputlangs, $hidedetails);
-					$pdf->SetXY($this->posxup, $curY);
-					if ($up_excl_tax > 0)
-						$pdf->MultiCell($this->posxqty-$this->posxup-0.8, 3, $up_excl_tax, 0, 'R', 0);
-					*/
-
 					// Quantity
 					$qty = pdf_getlineqty($object, $i, $outputlangs, $hidedetails);
 					$pdf->SetXY($this->posxqty, $curY);
@@ -805,7 +782,7 @@ class pdf_aurore extends ModelePDFSupplierProposal
 
 			$posy = $pdf->GetY() + 1;
 		}
-		/* PHFAVRE
+		/*
 		elseif ($object->availability_code || $object->availability)    // Show availability conditions
 		{
 			$pdf->SetFont('','B', $default_font_size - 2);
@@ -1138,22 +1115,6 @@ class pdf_aurore extends ModelePDFSupplierProposal
 			$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
 			$pdf->MultiCell($largcol2, $tab2_hl, price($deja_regle, 0, $outputlangs), 0, 'R', 0);
 
-			/*
-			if ($object->close_code == 'discount_vat')
-			{
-				$index++;
-				$pdf->SetFillColor(255,255,255);
-
-				$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
-				$pdf->MultiCell($col2x-$col1x, $tab2_hl, $outputlangs->transnoentities("EscompteOfferedShort"), $useborder, 'L', 1);
-
-				$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
-				$pdf->MultiCell($largcol2, $tab2_hl, price($object->total_ttc - $deja_regle, 0, $outputlangs), $useborder, 'R', 1);
-
-				$resteapayer=0;
-			}
-			*/
-
 			$index++;
 			$pdf->SetTextColor(0, 0, 60);
 			$pdf->SetFillColor(224, 224, 224);
@@ -1226,16 +1187,7 @@ class pdf_aurore extends ModelePDFSupplierProposal
 			$pdf->MultiCell(108, 2, $outputlangs->transnoentities("Designation"), '', 'L');
 		}
 
-		if (empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT)) {
-			$pdf->line($this->posxtva, $tab_top, $this->posxtva, $tab_top + $tab_height);
-			//$pdf->line($this->posxtva-2, $tab_top, $this->posxtva-2, $tab_top + $tab_height);
-			if (empty($hidetop)) {
-				$pdf->SetXY($this->posxtva - 5, $tab_top + 1);
-				$pdf->MultiCell($this->posxup - $this->posxtva + 3, 2, $outputlangs->transnoentities("VAT"), '', 'C');
-			}
-		}
-
-		$pdf->line($this->posxup - 3, $tab_top, $this->posxup - 3, $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->posxqty - $this->posxup - 1, 2, $outputlangs->transnoentities("PriceUHT"), '', 'C');
@@ -1349,12 +1301,6 @@ class pdf_aurore extends ModelePDFSupplierProposal
 			$pdf->SetTextColor(0, 0, 60);
 			$pdf->MultiCell(100, 3, $outputlangs->transnoentities("RefSupplier")." : ".dol_trunc($outputlangs->convToOutputCharset($object->ref_fourn), 65), '', 'R');
 		}
-		/* PHFAVRE
-		$posy+=4;
-		$pdf->SetXY($posx,$posy);
-		$pdf->SetTextColor(0,0,60);
-		$pdf->MultiCell(100, 3, $outputlangs->transnoentities("SupplierProposalDate")." : " . dol_print_date($object->delivery_date, "day", false, $outputlangs, true), '', 'R');
-		*/
 
 		if ($object->thirdparty->code_fournisseur) {
 			$posy += 4;

From 59e86f4a6ba6a58ae1e2c9a334e707b67a3cc846 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 12 Sep 2022 15:16:38 +0200
Subject: [PATCH 939/974] NEW Make module WebservicesClient deprecated. Use
 module WebHook instead

---
 htdocs/core/modules/modWebServicesClient.class.php              | 2 +-
 .../modulebuilder/template/core/modules/modMyModule.class.php   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/core/modules/modWebServicesClient.class.php b/htdocs/core/modules/modWebServicesClient.class.php
index d44d48ef13a..f2b75119523 100644
--- a/htdocs/core/modules/modWebServicesClient.class.php
+++ b/htdocs/core/modules/modWebServicesClient.class.php
@@ -46,7 +46,7 @@ class modWebServicesClient extends DolibarrModules
 		$this->name = preg_replace('/^mod/i', '', get_class($this));
 		$this->description = "Enable the web service client to call external supplier web services";
 		// Possible values for version are: 'development', 'experimental', 'dolibarr' or version
-		$this->version = 'experimental';
+		$this->version = 'experimental_deprecated';
 		// Key used in llx_const table to save module status enabled/disabled (where MYMODULE is value of property name of module in uppercase)
 		$this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
 		// Name of image file used for this module.
diff --git a/htdocs/modulebuilder/template/core/modules/modMyModule.class.php b/htdocs/modulebuilder/template/core/modules/modMyModule.class.php
index 973eb6ba915..169d764b80b 100644
--- a/htdocs/modulebuilder/template/core/modules/modMyModule.class.php
+++ b/htdocs/modulebuilder/template/core/modules/modMyModule.class.php
@@ -71,7 +71,7 @@ class modMyModule extends DolibarrModules
 		$this->editor_name = 'Editor name';
 		$this->editor_url = 'https://www.example.com';
 
-		// Possible values for version are: 'development', 'experimental', 'dolibarr', 'dolibarr_deprecated' or a version string like 'x.y.z'
+		// Possible values for version are: 'development', 'experimental', 'dolibarr', 'dolibarr_deprecated', 'experimental_deprecated' or a version string like 'x.y.z'
 		$this->version = '1.0';
 		// Url to the file with your last numberversion of this module
 		//$this->url_last_version = 'http://www.example.com/versionmodule.txt';

From 56c2b8b7758a031b0f5462a03b4088bb89031418 Mon Sep 17 00:00:00 2001
From: Thomas Negre <tnegre@open-dsi.fr>
Date: Mon, 12 Sep 2022 15:12:36 +0200
Subject: [PATCH 940/974] Product: display TTC price on price card

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

diff --git a/htdocs/product/price.php b/htdocs/product/price.php
index 787cc034f68..d6d64ecf347 100644
--- a/htdocs/product/price.php
+++ b/htdocs/product/price.php
@@ -1193,7 +1193,11 @@ if (!empty($conf->global->PRODUIT_MULTIPRICES) || !empty($conf->global->PRODUIT_
 		print price($object->price_ttc).' '.$langs->trans($object->price_base_type);
 	} else {
 		print price($object->price).' '.$langs->trans($object->price_base_type);
+		if (!empty($conf->global->PRODUCT_DISPLAY_VAT_INCL_PRICES) && !empty($object->price_ttc)) {
+			print '<i class="opacitymedium"> - ' . price($object->price_ttc).' '.$langs->trans('TTC') . '</i>';
+		}
 	}
+
 	print '</td></tr>';
 
 	// Price minimum
@@ -1202,7 +1206,11 @@ if (!empty($conf->global->PRODUIT_MULTIPRICES) || !empty($conf->global->PRODUIT_
 		print price($object->price_min_ttc).' '.$langs->trans($object->price_base_type);
 	} else {
 		print price($object->price_min).' '.$langs->trans($object->price_base_type);
+		if (!empty($conf->global->PRODUCT_DISPLAY_VAT_INCL_PRICES) && !empty($object->price_min_ttc)) {
+			print '<i class="opacitymedium"> - ' . price($object->price_min_ttc).' '.$langs->trans('TTC') . '</i>';
+		}
 	}
+
 	print '</td></tr>';
 
 	// Price by quantity

From 3d88e8cc0ecf47a301c48ceeab7a28474640c828 Mon Sep 17 00:00:00 2001
From: Thomas Negre <tnegre@open-dsi.fr>
Date: Mon, 12 Sep 2022 15:14:01 +0200
Subject: [PATCH 941/974] add tr ids

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

diff --git a/htdocs/product/price.php b/htdocs/product/price.php
index d6d64ecf347..f0bdf563546 100644
--- a/htdocs/product/price.php
+++ b/htdocs/product/price.php
@@ -1188,7 +1188,7 @@ if (!empty($conf->global->PRODUIT_MULTIPRICES) || !empty($conf->global->PRODUIT_
 	print '</td></tr>';
 
 	// Price
-	print '<tr><td>'.$langs->trans("SellingPrice").'</td><td>';
+	print '<tr id="selling_price"><td>'.$langs->trans("SellingPrice").'</td><td>';
 	if ($object->price_base_type == 'TTC') {
 		print price($object->price_ttc).' '.$langs->trans($object->price_base_type);
 	} else {
@@ -1201,7 +1201,7 @@ if (!empty($conf->global->PRODUIT_MULTIPRICES) || !empty($conf->global->PRODUIT_
 	print '</td></tr>';
 
 	// Price minimum
-	print '<tr><td>'.$langs->trans("MinPrice").'</td><td>';
+	print '<tr id="min_price"><td>'.$langs->trans("MinPrice").'</td><td>';
 	if ($object->price_base_type == 'TTC') {
 		print price($object->price_min_ttc).' '.$langs->trans($object->price_base_type);
 	} else {

From 3c5f3f7b858d57a82be46c08b4999a96cd4ba7a7 Mon Sep 17 00:00:00 2001
From: Atm-Gregr <greg.rastklan@atm-consulting.fr>
Date: Mon, 12 Sep 2022 16:28:06 +0200
Subject: [PATCH 942/974] fix

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

diff --git a/htdocs/projet/tasks/list.php b/htdocs/projet/tasks/list.php
index 4af49c7a3d5..181ae20589d 100644
--- a/htdocs/projet/tasks/list.php
+++ b/htdocs/projet/tasks/list.php
@@ -988,7 +988,7 @@ while ($i < min($num, $limit)) {
 		// Description
 		if (!empty($arrayfields['t.description']['checked'])) {
 			print '<td>';
-			print dol_escape_htmltag($object->description);
+			print $object->description;
 			print '</td>';
 			if (!$i) {
 				$totalarray['nbfield']++;

From 527cfadf0f168e61918c1e1a8aa3215cc4236934 Mon Sep 17 00:00:00 2001
From: Atm-Gregr <greg.rastklan@atm-consulting.fr>
Date: Mon, 12 Sep 2022 16:31:00 +0200
Subject: [PATCH 943/974] nl2br like on the card

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

diff --git a/htdocs/projet/tasks/list.php b/htdocs/projet/tasks/list.php
index 181ae20589d..65ceda08242 100644
--- a/htdocs/projet/tasks/list.php
+++ b/htdocs/projet/tasks/list.php
@@ -988,7 +988,7 @@ while ($i < min($num, $limit)) {
 		// Description
 		if (!empty($arrayfields['t.description']['checked'])) {
 			print '<td>';
-			print $object->description;
+			print nl2br($object->description);
 			print '</td>';
 			if (!$i) {
 				$totalarray['nbfield']++;

From 209bf00b69e3d734a7f7007f3c06f48531e790c6 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 13 Sep 2022 00:11:00 +0200
Subject: [PATCH 944/974] Trans

---
 htdocs/commande/class/commande.class.php | 5 ++++-
 htdocs/langs/en_US/admin.lang            | 4 +++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/htdocs/commande/class/commande.class.php b/htdocs/commande/class/commande.class.php
index 301bbe761be..8b0967c64b6 100644
--- a/htdocs/commande/class/commande.class.php
+++ b/htdocs/commande/class/commande.class.php
@@ -3662,7 +3662,10 @@ class Commande extends CommonOrder
 		} elseif ($status == self::STATUS_SHIPMENTONPROCESS) {
 			$labelStatus = $langs->transnoentitiesnoconv('StatusOrderSent').$billedtext;
 			$labelStatusShort = $langs->transnoentitiesnoconv('StatusOrderSentShort').$billedtext;
-			$labelTooltip = $langs->transnoentitiesnoconv("StatusOrderSent").' - '.$langs->transnoentitiesnoconv("DateDeliveryPlanned").dol_print_date($this->date_livraison).$billedtext;
+			$labelTooltip = $langs->transnoentitiesnoconv("StatusOrderSent");
+			if (!empty($this->delivery_date)) {
+				$labelTooltip .= ' - '.$langs->transnoentitiesnoconv("DateDeliveryPlanned").dol_print_date($this->delivery_date, 'day').$billedtext;
+			}
 			$statusType = 'status4';
 		} elseif ($status == self::STATUS_CLOSED && (!$billed && empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) {
 			$labelStatus = $langs->transnoentitiesnoconv('StatusOrderToBill');
diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index d3b2f251a6c..46af4f95355 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -2310,4 +2310,6 @@ Images=Images
 MaxNumberOfImagesInGetPost=Max number of images allowed in a HTML field submitted in a form
 ScriptIsEmpty=The script is empty
 ShowHideTheNRequests=Show/hide the %s SQL request(s)
-DefinedAPathForAntivirusCommandIntoSetup=Define a path for an antivirus program into <b>%s</b>
\ No newline at end of file
+DefinedAPathForAntivirusCommandIntoSetup=Define a path for an antivirus program into <b>%s</b>
+TriggerCodes=Triggerable events
+TriggerCodeInfo=Enter here the list of trigger codes that must generate a post of a web request
\ No newline at end of file

From f10338293513b75cecb02d97977945881ead18bc Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 13 Sep 2022 00:16:38 +0200
Subject: [PATCH 945/974] Debug webhook

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

diff --git a/htdocs/core/triggers/interface_95_modWebhook_WebhookTriggers.class.php b/htdocs/core/triggers/interface_95_modWebhook_WebhookTriggers.class.php
index a8932934bd1..94b4b861e86 100644
--- a/htdocs/core/triggers/interface_95_modWebhook_WebhookTriggers.class.php
+++ b/htdocs/core/triggers/interface_95_modWebhook_WebhookTriggers.class.php
@@ -104,7 +104,7 @@ class InterfaceWebhookTriggers extends DolibarrTriggers
 			$actionarray = explode(",", $tmpobject->trigger_codes);
 			if (is_array($actionarray) && in_array($action, $actionarray)) {
 				$jsonstr = '{"triggercode":'.json_encode($action).',"object":'.json_encode($object).'}';
-				$response = getURLContent($tmpobject->url, 'POST', $jsonstr);
+				$response = getURLContent($tmpobject->url, 'POST', $jsonstr, 1, array(), array('http', 'https'), 0, -1);
 				if (empty($response['curl_error_no']) && $response['http_code'] >= 200 && $response['http_code'] < 300) {
 					$nbPosts ++;
 				} else {
diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index 46af4f95355..704d9ed238e 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -2312,4 +2312,4 @@ ScriptIsEmpty=The script is empty
 ShowHideTheNRequests=Show/hide the %s SQL request(s)
 DefinedAPathForAntivirusCommandIntoSetup=Define a path for an antivirus program into <b>%s</b>
 TriggerCodes=Triggerable events
-TriggerCodeInfo=Enter here the list of trigger codes that must generate a post of a web request
\ No newline at end of file
+TriggerCodeInfo=Enter here the trigger code(s) that must generate a post of a web request (only external URL are allowed). You can enter several trigger codes separated by a comma.

From 39b89143cc3ac63a7e7a67626187bfb7aadd9686 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 13 Sep 2022 00:52:11 +0200
Subject: [PATCH 946/974] Fix colspan

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

diff --git a/htdocs/holiday/month_report.php b/htdocs/holiday/month_report.php
index a3b8171cc62..735f8892129 100644
--- a/htdocs/holiday/month_report.php
+++ b/htdocs/holiday/month_report.php
@@ -335,7 +335,7 @@ print getTitleFieldOfList($selectedfields, 0, $_SERVER["PHP_SELF"], '', '', '',
 print '</tr>';
 
 if ($num == 0) {
-	print '<tr><td colspan="10" class="opacitymedium">'.$langs->trans('None').'</td></tr>';
+	print '<tr><td colspan="11" class="opacitymedium">'.$langs->trans('None').'</td></tr>';
 } else {
 	while ($obj = $db->fetch_object($resql)) {
 		$user = new User($db);

From 7485188b49562607504827bbe92bb504d1873ede Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 13 Sep 2022 01:11:09 +0200
Subject: [PATCH 947/974] Update price.php

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

diff --git a/htdocs/product/price.php b/htdocs/product/price.php
index f0bdf563546..aa9a34336b0 100644
--- a/htdocs/product/price.php
+++ b/htdocs/product/price.php
@@ -1188,7 +1188,7 @@ if (!empty($conf->global->PRODUIT_MULTIPRICES) || !empty($conf->global->PRODUIT_
 	print '</td></tr>';
 
 	// Price
-	print '<tr id="selling_price"><td>'.$langs->trans("SellingPrice").'</td><td>';
+	print '<tr class="field_selling_price"><td>'.$langs->trans("SellingPrice").'</td><td>';
 	if ($object->price_base_type == 'TTC') {
 		print price($object->price_ttc).' '.$langs->trans($object->price_base_type);
 	} else {
@@ -1201,7 +1201,7 @@ if (!empty($conf->global->PRODUIT_MULTIPRICES) || !empty($conf->global->PRODUIT_
 	print '</td></tr>';
 
 	// Price minimum
-	print '<tr id="min_price"><td>'.$langs->trans("MinPrice").'</td><td>';
+	print '<tr class="field_min_price"><td>'.$langs->trans("MinPrice").'</td><td>';
 	if ($object->price_base_type == 'TTC') {
 		print price($object->price_min_ttc).' '.$langs->trans($object->price_base_type);
 	} else {

From d911f13ca001ffa85ef831d843bf400a2e586659 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 13 Sep 2022 01:40:37 +0200
Subject: [PATCH 948/974] Update ajax.php

---
 htdocs/bom/ajax/ajax.php | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/htdocs/bom/ajax/ajax.php b/htdocs/bom/ajax/ajax.php
index 444ce9beeb2..9a55c609252 100644
--- a/htdocs/bom/ajax/ajax.php
+++ b/htdocs/bom/ajax/ajax.php
@@ -33,20 +33,9 @@ if (!defined('NOREQUIREAJAX')) {
 if (!defined('NOREQUIRESOC')) {
 	define('NOREQUIRESOC', '1');
 }
-if (!defined('NOCSRFCHECK')) {
-	define('NOCSRFCHECK', '1');
-}
-// Do not check anti CSRF attack test
 if (!defined('NOREQUIREMENU')) {
 	define('NOREQUIREMENU', '1');
 }
-// If there is no need to load and show top and left menu
-if (!defined("NOLOGIN")) {
-	define("NOLOGIN", '1');
-}
-if (!defined('NOIPCHECK')) {
-	define('NOIPCHECK', '1'); // Do not check IP defined into conf $dolibarr_main_restrict_ip
-}
 if (!defined('NOBROWSERNOTIF')) {
 	define('NOBROWSERNOTIF', '1');
 }

From 3a8e66bfad76cc532a23b3d2f5e60318daabaada Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 13 Sep 2022 02:30:15 +0200
Subject: [PATCH 949/974] Fix phpunit

---
 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 63a1ff214c1..01c29b48a26 100644
--- a/htdocs/admin/modulehelp.php
+++ b/htdocs/admin/modulehelp.php
@@ -382,9 +382,9 @@ if ($mode == 'feature') {
 	$text .= '<br><br>';
 
 	$text .= '<br><strong>'.$langs->trans("AddDataTables").':</strong> ';
-	$sqlfiles1 = dol_dir_list(DOL_DOCUMENT_ROOT.'/install/mysql/tables/', 'files', 0, 'llx.*-'.$moduledir.'\.sql', array('\.key\.sql', '\.sql\.back'));
-	$sqlfiles2 = dol_dir_list(dol_buildpath($moduledir.'/sql/'), 'files', 0, 'llx.*\.sql', array('\.key\.sql', '\.sql\.back'));
-	$sqlfiles = array_merge($sqlfiles1, $sqlfiles2);
+	$listofsqlfiles1 = dol_dir_list(DOL_DOCUMENT_ROOT.'/install/mysql/tables/', 'files', 0, 'llx.*-'.$moduledir.'\.sql', array('\.key\.sql', '\.sql\.back'));
+	$listofsqlfiles2 = dol_dir_list(dol_buildpath($moduledir.'/sql/'), 'files', 0, 'llx.*\.sql', array('\.key\.sql', '\.sql\.back'));
+	$sqlfiles = array_merge($listofsqlfiles1, $listofsqlfiles2);
 
 	if (count($sqlfiles) > 0) {
 		$i = 0;

From 6cf5c51f0b6b18ba4c76f0440c7a6c8ce25aefba Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 13 Sep 2022 02:33:49 +0200
Subject: [PATCH 950/974] Fix phpunit

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

diff --git a/htdocs/bom/class/bom.class.php b/htdocs/bom/class/bom.class.php
index ddb589a567d..ef99f9f7bb7 100644
--- a/htdocs/bom/class/bom.class.php
+++ b/htdocs/bom/class/bom.class.php
@@ -567,6 +567,7 @@ class BOM extends CommonObject
 	 * @param	int		$position				Position of BOM-Line in BOM-Lines
 	 * @param	int		$fk_bom_child			Id of BOM Child
 	 * @param	string	$import_key				Import Key
+	 * @param	string	$fk_unit				Unit
 	 * @return	int								<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 = '')
@@ -740,7 +741,9 @@ class BOM extends CommonObject
 			$this->line->efficiency = $efficiency;
 			$this->line->import_key = $import_key;
 			$this->line->position = $rankToUse;
-			if(!empty($fk_unit)) $this->line->fk_unit = $fk_unit;
+			if (!empty($fk_unit)) {
+				$this->line->fk_unit = $fk_unit;
+			}
 
 			$result = $this->line->update($user);
 

From d90ca726f48cda5d0fafacd74c30eb787cdaff8e Mon Sep 17 00:00:00 2001
From: UT from dolibit <45215329+dolibit-ut@users.noreply.github.com>
Date: Tue, 13 Sep 2022 08:53:02 +0200
Subject: [PATCH 951/974] Update setup.php

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

diff --git a/htdocs/modulebuilder/template/admin/setup.php b/htdocs/modulebuilder/template/admin/setup.php
index 1c46028b142..8e60b2a296c 100644
--- a/htdocs/modulebuilder/template/admin/setup.php
+++ b/htdocs/modulebuilder/template/admin/setup.php
@@ -97,7 +97,7 @@ if (!class_exists('FormSetup')) {
 $formSetup = new FormSetup($db);
 
 
-// Hôte
+// HTTP HOST
 $item = $formSetup->newItem('NO_PARAM_JUST_TEXT');
 $item->fieldOverride = (empty($_SERVER['HTTPS']) ? 'http://' : 'https://') . $_SERVER['HTTP_HOST'];
 $item->cssClass = 'minwidth500';
@@ -106,7 +106,7 @@ $item->cssClass = 'minwidth500';
 $item = $formSetup->newItem('MYMODULE_MYPARAM1');
 $item->defaultFieldValue = 'default value';
 
-// Setup conf MYMODULE_MYPARAM1 as a simple textarea input but we replace the text of field title
+// Setup conf MYMODULE_MYPARAM2 as a simple textarea input but we replace the text of field title
 $item = $formSetup->newItem('MYMODULE_MYPARAM2');
 $item->nameText = $item->getNameText().' more html text ';
 

From 77ec9ee669275b8125b49057f8d45a249736409c Mon Sep 17 00:00:00 2001
From: ksar <35605507+ksar-ksar@users.noreply.github.com>
Date: Tue, 13 Sep 2022 11:26:37 +0200
Subject: [PATCH 952/974] FIX : ToOfferALinkForOnlinePayment not translated

ToOfferALinkForOnlinePayment is defined on stripe.lang
---
 htdocs/core/modules/facture/doc/pdf_sponge.modules.php | 2 +-
 1 file changed, 1 insertion(+), 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 72eb041f873..c47e9fc7c60 100644
--- a/htdocs/core/modules/facture/doc/pdf_sponge.modules.php
+++ b/htdocs/core/modules/facture/doc/pdf_sponge.modules.php
@@ -1265,7 +1265,7 @@ class pdf_sponge extends ModelePDFFactures
 					require_once DOL_DOCUMENT_ROOT.'/core/lib/payments.lib.php';
 					global $langs;
 
-					$langs->loadLangs(array('payment', 'paybox'));
+					$langs->loadLangs(array('payment', 'paybox', 'stripe'));
 					$servicename = $langs->transnoentities('Online');
 					$paiement_url = getOnlinePaymentUrl('', 'invoice', $object->ref, '', '', '');
 					$linktopay = $langs->trans("ToOfferALinkForOnlinePayment", $servicename).' <a href="'.$paiement_url.'">'.$outputlangs->transnoentities("ClickHere").'</a>';

From 7aa8fa98ec0b8bd8d1f7146296dea140ac8b651c Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 13 Sep 2022 13:43:44 +0200
Subject: [PATCH 953/974] Update doc

---
 build/exe/doliwamp/README.md | 2 ++
 build/makepack-howto.txt     | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/build/exe/doliwamp/README.md b/build/exe/doliwamp/README.md
index be8cf1f3ac5..8f9878bfa29 100644
--- a/build/exe/doliwamp/README.md
+++ b/build/exe/doliwamp/README.md
@@ -9,3 +9,5 @@ The build of .exe files need to have some windows executable files already insta
 
 If you have technical knowledge in web administration and plan to share your server instance (Apache, Mysql or PHP) with other projects than Dolibarr or want to use Dolibarr other components (PostgreSQL), you should not use this assistant and make a manual installation of Dolibarr on your existing server by downloading the standard package (.tgz or .zip file).
 
+
+!!! See file ../makepack-howto.txt
diff --git a/build/makepack-howto.txt b/build/makepack-howto.txt
index be88302cd1d..988471e3c53 100644
--- a/build/makepack-howto.txt
+++ b/build/makepack-howto.txt
@@ -25,9 +25,9 @@ Prerequisites to build autoexe DoliWamp package:
 
 ***** Prerequisites For Windows *****
 
-Install Perl
+Install Perl.
 Install WampServer-3.2.*-64.exe
-isetup-5.5.8.exe
+Install isetup-5.5.8.exe
 
 
 ***** Actions to do a BETA *****

From 4f9c273c644f2ccc157674144ec9a87cd9102db4 Mon Sep 17 00:00:00 2001
From: Atm-Gregr <greg.rastklan@atm-consulting.fr>
Date: Tue, 13 Sep 2022 14:19:28 +0200
Subject: [PATCH 954/974] retours

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

diff --git a/htdocs/projet/tasks/list.php b/htdocs/projet/tasks/list.php
index 65ceda08242..4f7c4bf7a42 100644
--- a/htdocs/projet/tasks/list.php
+++ b/htdocs/projet/tasks/list.php
@@ -988,7 +988,7 @@ while ($i < min($num, $limit)) {
 		// Description
 		if (!empty($arrayfields['t.description']['checked'])) {
 			print '<td>';
-			print nl2br($object->description);
+            print dolGetFirstLineOfText($object->description, 5);
 			print '</td>';
 			if (!$i) {
 				$totalarray['nbfield']++;

From 7d4c7e0f6b7090a98838366da9df4049efb27f88 Mon Sep 17 00:00:00 2001
From: Atm-Gregr <greg.rastklan@atm-consulting.fr>
Date: Tue, 13 Sep 2022 14:28:57 +0200
Subject: [PATCH 955/974] stickler

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

diff --git a/htdocs/projet/tasks/list.php b/htdocs/projet/tasks/list.php
index 4f7c4bf7a42..d74b84dd7ba 100644
--- a/htdocs/projet/tasks/list.php
+++ b/htdocs/projet/tasks/list.php
@@ -988,7 +988,7 @@ while ($i < min($num, $limit)) {
 		// Description
 		if (!empty($arrayfields['t.description']['checked'])) {
 			print '<td>';
-            print dolGetFirstLineOfText($object->description, 5);
+			print dolGetFirstLineOfText($object->description, 5);
 			print '</td>';
 			if (!$i) {
 				$totalarray['nbfield']++;

From 6ecd862a88cf8a256b79d14d8daa4f803ebe07f4 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 13 Sep 2022 15:37:54 +0200
Subject: [PATCH 956/974] Fix restore option MAIN_OPTIMIZEFORCOLORBLIND

---
 htdocs/core/class/html.form.class.php | 2 +-
 htdocs/core/lib/usergroups.lib.php    | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index ea2d941be3d..0d400274557 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -6634,7 +6634,7 @@ class Form
 		}
 
 		// Add a "Now" link
-		if ($conf->use_javascript_ajax && $addnowlink) {
+		if (!empty($conf->use_javascript_ajax) && $addnowlink) {
 			// Script which will be inserted in the onClick of the "Now" link
 			$reset_scripts = "";
 			if ($addnowlink == 2) { // local computer time
diff --git a/htdocs/core/lib/usergroups.lib.php b/htdocs/core/lib/usergroups.lib.php
index bbfef844bb6..4b524f66b3e 100644
--- a/htdocs/core/lib/usergroups.lib.php
+++ b/htdocs/core/lib/usergroups.lib.php
@@ -1099,8 +1099,8 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
 	}
 
 
-	// Use MAIN_OPTIMIZEFORTEXTBROWSER
-	if ($foruserprofile && !empty($fuser->conf->MAIN_OPTIMIZEFORCOLORBLIND)) {
+	// Use MAIN_OPTIMIZEFORCOLORBLIND
+	if ($foruserprofile) {
 		//$default=yn($conf->global->MAIN_OPTIMIZEFORCOLORBLIND);
 		$default = $langs->trans('No');
 		print '<tr class="oddeven">';

From a8b47261326987188bb34ed3d8f8247b079d84ef Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 13 Sep 2022 15:39:15 +0200
Subject: [PATCH 957/974] Test the "now" link on date selection for smartphone

---
 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 0d400274557..5bf6cec8192 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -6713,7 +6713,7 @@ class Form
 				}
 			}
 			// If reset_scripts is not empty, print the link with the reset_scripts in the onClick
-			if ($reset_scripts && empty($conf->dol_optimize_smallscreen)) {
+			if ($reset_scripts && empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {
 				$retstring .= ' <button class="dpInvisibleButtons datenowlink" id="'.$prefix.'ButtonNow" type="button" name="_useless" value="now" onClick="'.$reset_scripts.'">';
 				$retstring .= $langs->trans("Now");
 				$retstring .= '</button> ';

From 0fe65591e80bfcc498a7be55bf9f73275e901ff6 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 14 Sep 2022 14:01:41 +0200
Subject: [PATCH 958/974] Fix message avec import simulation Fix suggested name
 of import profile avec a save. Fix trans

---
 htdocs/core/modules/modSociete.class.php |  2 +-
 htdocs/imports/import.php                | 11 ++++++-----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/htdocs/core/modules/modSociete.class.php b/htdocs/core/modules/modSociete.class.php
index 327262ce39f..7f7624b167f 100644
--- a/htdocs/core/modules/modSociete.class.php
+++ b/htdocs/core/modules/modSociete.class.php
@@ -747,7 +747,7 @@ class modSociete extends DolibarrModules
 			's.fk_departement' => "StateCode",
 			's.fk_pays' => "CountryCode",
 			's.birthday' => "DateOfBirth",
-			's.poste' => "Role",
+			's.poste' => "PostOrFunction",
 			's.phone' => "Phone",
 			's.phone_perso' => "PhonePerso",
 			's.phone_mobile' => "PhoneMobile",
diff --git a/htdocs/imports/import.php b/htdocs/imports/import.php
index a66814ce1b1..8916041520d 100644
--- a/htdocs/imports/import.php
+++ b/htdocs/imports/import.php
@@ -235,6 +235,7 @@ if ($action == 'add_import_model') {
 		$result = $objimport->create($user);
 		if ($result >= 0) {
 			setEventMessages($langs->trans("ImportModelSaved", $objimport->model_name), null, 'mesgs');
+			$import_name = '';
 		} else {
 			$langs->load("errors");
 			if ($objimport->errno == 'DB_ERROR_RECORD_ALREADY_EXISTS') {
@@ -1286,7 +1287,7 @@ if ($step == 4 && $datatoimport) {
 	print '</td></tr>';
 
 	// Lines for remark
-	print '<tr class="liste_titre"><td colspan="2">'.$langs->trans("Remark").'</td></tr>';
+	print '<tr class="liste_titre"><td colspan="2">'.$langs->trans("Note").'</td></tr>';
 	print '<tr><td colspan="2"><div id="div-mandatory-target-fields-not-mapped"></div></td></tr>';
 
 	print '</table>';
@@ -1470,8 +1471,8 @@ if ($step == 4 && $datatoimport) {
 		print '</tr>';
 
 		$nameofimportprofile = str_replace(' ', '-', $langs->trans("ImportProfile").' '.$titleofmodule.' '.dol_print_date(dol_now('gmt'), 'dayxcard'));
-		if (is_object($objimport) && !empty($objimport->model_name)) {
-			$nameofimportprofile = $objimport->model_name;
+		if (GETPOST('import_name')) {	// If we have submited a form, we take value used fot the update try
+			$nameofimportprofile = $import_name;
 		}
 
 		print '<tr class="oddeven">';
@@ -1966,9 +1967,9 @@ if ($step == 5 && $datatoimport) {
 
 		print '<div class="center">';
 		print '<span class="opacitymedium">'.$langs->trans("NowClickToRunTheImport", $langs->transnoentitiesnoconv("RunImportFile")).'</span><br>';
-		if (empty($nboferrors)) {
+		/*if (empty($nboferrors)) {
 			print $langs->trans("DataLoadedWithId", $importid).'<br>';
-		}
+		}*/
 		print '</div>';
 
 		print '<br>';

From 7d5d04a30d5f7d08e5e3610f53d35c53154ade7e Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 14 Sep 2022 15:24:07 +0200
Subject: [PATCH 959/974] Doc

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

diff --git a/htdocs/core/lib/json.lib.php b/htdocs/core/lib/json.lib.php
index fe50503ed99..9e3a5bb6126 100644
--- a/htdocs/core/lib/json.lib.php
+++ b/htdocs/core/lib/json.lib.php
@@ -39,6 +39,8 @@ if (!function_exists('json_encode')) {
 /**
  * Implement json_encode for PHP that does not support it.
  * Use json_encode and json_decode in your code !
+ * Note: We can found some special chars into a json string:
+ * Quotation mark (") = \", Backslash (\) = \\, Slash (/) =	\/, Backspace = \b, Form feed = \f, New line =\n, Carriage return =\r, Horizontal tab = \t
  *
  * @param	mixed	$elements		PHP Object to json encode
  * @return 	string					Json encoded string

From 34da698537c5360164ca14acc0a0e4640ee5441b Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 14 Sep 2022 16:01:45 +0200
Subject: [PATCH 960/974] FIX Import in upgrade when using a socialnetwork
 field.

---
 htdocs/core/db/Database.interface.php              |  9 +++++++++
 htdocs/core/db/mysqli.class.php                    | 12 ++++++++++++
 htdocs/core/db/pgsql.class.php                     | 14 +++++++++++++-
 htdocs/core/db/sqlite3.class.php                   | 14 +++++++++++++-
 htdocs/core/lib/website.lib.php                    |  6 +++---
 htdocs/core/modules/import/import_csv.modules.php  | 12 ++++++++----
 htdocs/core/modules/import/import_xlsx.modules.php |  8 ++++++--
 htdocs/debugbar/class/TraceableDB.php              | 12 ++++++++++++
 8 files changed, 76 insertions(+), 11 deletions(-)

diff --git a/htdocs/core/db/Database.interface.php b/htdocs/core/db/Database.interface.php
index 1d24b058614..faff7ff5172 100644
--- a/htdocs/core/db/Database.interface.php
+++ b/htdocs/core/db/Database.interface.php
@@ -182,9 +182,18 @@ interface Database
 	 *
 	 * @param   string $stringtoencode String to escape
 	 * @return  string                        String escaped
+	 * @deprecated
 	 */
 	public function escapeunderscore($stringtoencode);
 
+	/**
+	 *	Escape a string to insert data into a like
+	 *
+	 *	@param	string	$stringtoencode		String to escape
+	 *	@return	string						String escaped
+	 */
+	public function escapeforlike($stringtoencode);
+
 	/**
 	 * Sanitize a string for SQL forging
 	 *
diff --git a/htdocs/core/db/mysqli.class.php b/htdocs/core/db/mysqli.class.php
index 29c2d30df2f..f2c5f9f3a03 100644
--- a/htdocs/core/db/mysqli.class.php
+++ b/htdocs/core/db/mysqli.class.php
@@ -479,12 +479,24 @@ class DoliDBMysqli extends DoliDB
 	 *
 	 *	@param	string	$stringtoencode		String to escape
 	 *	@return	string						String escaped
+	 *  @deprecated
 	 */
 	public function escapeunderscore($stringtoencode)
 	{
 		return str_replace('_', '\_', (string) $stringtoencode);
 	}
 
+	/**
+	 *	Escape a string to insert data into a like
+	 *
+	 *	@param	string	$stringtoencode		String to escape
+	 *	@return	string						String escaped
+	 */
+	public function escapeforlike($stringtoencode)
+	{
+		return str_replace(array('_', '\\', '%'), array('\_', '\\\\', '\%'), (string) $stringtoencode);
+	}
+
 	/**
 	 *	Return generic error code of last operation.
 	 *
diff --git a/htdocs/core/db/pgsql.class.php b/htdocs/core/db/pgsql.class.php
index fe3269867a9..e259933cd07 100644
--- a/htdocs/core/db/pgsql.class.php
+++ b/htdocs/core/db/pgsql.class.php
@@ -726,10 +726,22 @@ class DoliDBPgsql extends DoliDB
 	 *
 	 *	@param	string	$stringtoencode		String to escape
 	 *	@return	string						String escaped
+	 *  @deprecated
 	 */
 	public function escapeunderscore($stringtoencode)
 	{
-		return str_replace('_', '\_', $stringtoencode);
+		return str_replace('_', '\_', (string) $stringtoencode);
+	}
+
+	/**
+	 *	Escape a string to insert data into a like
+	 *
+	 *	@param	string	$stringtoencode		String to escape
+	 *	@return	string						String escaped
+	 */
+	public function escapeforlike($stringtoencode)
+	{
+		return str_replace(array('_', '\\', '%'), array('\_', '\\\\', '\%'), (string) $stringtoencode);
 	}
 
 	/**
diff --git a/htdocs/core/db/sqlite3.class.php b/htdocs/core/db/sqlite3.class.php
index 8d0141e8ca6..e31eeffe457 100644
--- a/htdocs/core/db/sqlite3.class.php
+++ b/htdocs/core/db/sqlite3.class.php
@@ -654,10 +654,22 @@ class DoliDBSqlite3 extends DoliDB
 	 *
 	 *	@param	string	$stringtoencode		String to escape
 	 *	@return	string						String escaped
+	 *  @deprecated
 	 */
 	public function escapeunderscore($stringtoencode)
 	{
-		return str_replace('_', '\_', $stringtoencode);
+		return str_replace('_', '\_', (string) $stringtoencode);
+	}
+
+	/**
+	 *	Escape a string to insert data into a like
+	 *
+	 *	@param	string	$stringtoencode		String to escape
+	 *	@return	string						String escaped
+	 */
+	public function escapeforlike($stringtoencode)
+	{
+		return str_replace(array('_', '\\', '%'), array('\_', '\\\\', '\%'), (string) $stringtoencode);
 	}
 
 	/**
diff --git a/htdocs/core/lib/website.lib.php b/htdocs/core/lib/website.lib.php
index e9de957e4a8..e9ea4dbcf09 100644
--- a/htdocs/core/lib/website.lib.php
+++ b/htdocs/core/lib/website.lib.php
@@ -947,11 +947,11 @@ function getPagesFromSearchCriterias($type, $algo, $searchstring, $max = 25, $so
 		$sql .= " AND (";
 		$searchalgo = '';
 		if (preg_match('/meta/', $algo)) {
-			$searchalgo .= ($searchalgo ? ' OR ' : '')."wp.title LIKE '%".$db->escapeunderscore($db->escape($searchstring))."%' OR wp.description LIKE '%".$db->escapeunderscore($db->escape($searchstring))."%'";
-			$searchalgo .= ($searchalgo ? ' OR ' : '')."wp.keywords LIKE '".$db->escapeunderscore($db->escape($searchstring)).",%' OR wp.keywords LIKE '% ".$db->escapeunderscore($db->escape($searchstring))."%'"; // TODO Use a better way to scan keywords
+			$searchalgo .= ($searchalgo ? ' OR ' : '')."wp.title LIKE '%".$db->escapeforlike($db->escape($searchstring))."%' OR wp.description LIKE '%".$db->escapeforlike($db->escape($searchstring))."%'";
+			$searchalgo .= ($searchalgo ? ' OR ' : '')."wp.keywords LIKE '".$db->escapeforlike($db->escape($searchstring)).",%' OR wp.keywords LIKE '% ".$db->escapeforlike($db->escape($searchstring))."%'"; // TODO Use a better way to scan keywords
 		}
 		if (preg_match('/content/', $algo)) {
-			$searchalgo .= ($searchalgo ? ' OR ' : '')."wp.content LIKE '%".$db->escapeunderscore($db->escape($searchstring))."%'";
+			$searchalgo .= ($searchalgo ? ' OR ' : '')."wp.content LIKE '%".$db->escapeforlike($db->escape($searchstring))."%'";
 		}
 		$sql .= $searchalgo;
 		if (is_array($otherfilters) && !empty($otherfilters['category'])) {
diff --git a/htdocs/core/modules/import/import_csv.modules.php b/htdocs/core/modules/import/import_csv.modules.php
index 32284a2cbd1..0bea7d1d739 100644
--- a/htdocs/core/modules/import/import_csv.modules.php
+++ b/htdocs/core/modules/import/import_csv.modules.php
@@ -835,8 +835,8 @@ class ImportCsv extends ModeleImports
 								$sqlSelect = "SELECT ".$fname." FROM ".$tablename;
 
 								$data = array_combine($listfields, $listvalues);
-								$where = array();
-								$filters = array();
+								$where = array();	// filters to forge SQL request
+								$filters = array();	// filters to forge output error message
 								foreach ($updatekeys as $key) {
 									$col = $objimport->array_import_updatekeys[0][$key];
 									$key = preg_replace('/^.*\./i', '', $key);
@@ -846,8 +846,12 @@ class ImportCsv extends ModeleImports
 										$socialnetwork = $tmp[1];
 										$jsondata = $data[$key];
 										$json = json_decode($jsondata);
-										$where[] = $key." LIKE '%\"".$socialnetwork."\":\"".$this->db->escape($json->$socialnetwork)."\"%'";
-										$filters[] = $col." LIKE '%\"".$socialnetwork."\":\"".$this->db->escape($json->$socialnetwork)."\"%'";
+										$stringtosearch = json_encode($socialnetwork).':'.json_encode($json->$socialnetwork);
+										//var_dump($stringtosearch);
+										//var_dump($this->db->escape($stringtosearch));	// This provide a value for sql string (but not for a like)
+										$where[] = $key." LIKE '%".$this->db->escapeforlike($this->db->escape($stringtosearch))."%'";
+										$filters[] = $col." LIKE '%".$this->db->escapeforlike($this->db->escape($stringtosearch))."%'";
+										//var_dump($where[1]); // This provide a value for sql string inside a like
 									} else {
 										$where[] = $key.' = '.$data[$key];
 										$filters[] = $col.' = '.$data[$key];
diff --git a/htdocs/core/modules/import/import_xlsx.modules.php b/htdocs/core/modules/import/import_xlsx.modules.php
index d8a9d77a98e..8652f106ca2 100644
--- a/htdocs/core/modules/import/import_xlsx.modules.php
+++ b/htdocs/core/modules/import/import_xlsx.modules.php
@@ -891,8 +891,12 @@ class ImportXlsx extends ModeleImports
 										$socialnetwork = $tmp[1];
 										$jsondata = $data[$key];
 										$json = json_decode($jsondata);
-										$where[] = $key." LIKE '%\"".$socialnetwork."\":\"".$this->db->escape($json->$socialnetwork)."\"%'";
-										$filters[] = $col." LIKE '%\"".$socialnetwork."\":\"".$this->db->escape($json->$socialnetwork)."\"%'";
+										$stringtosearch = json_encode($socialnetwork).':'.json_encode($json->$socialnetwork);
+										//var_dump($stringtosearch);
+										//var_dump($this->db->escape($stringtosearch));	// This provide a value for sql string (but not for a like)
+										$where[] = $key." LIKE '%".$this->db->escapeforlike($this->db->escape($stringtosearch))."%'";
+										$filters[] = $col." LIKE '%".$this->db->escapeforlike($this->db->escape($stringtosearch))."%'";
+										//var_dump($where[1]); // This provide a value for sql string inside a like
 									} else {
 										$where[] = $key.' = '.$data[$key];
 										$filters[] = $col.' = '.$data[$key];
diff --git a/htdocs/debugbar/class/TraceableDB.php b/htdocs/debugbar/class/TraceableDB.php
index 082e45e4f43..785af37fc94 100644
--- a/htdocs/debugbar/class/TraceableDB.php
+++ b/htdocs/debugbar/class/TraceableDB.php
@@ -255,12 +255,24 @@ class TraceableDB extends DoliDB
 	 *
 	 * @param   string $stringtoencode String to escape
 	 * @return  string                        String escaped
+	 * @deprecated
 	 */
 	public function escapeunderscore($stringtoencode)
 	{
 		return $this->db->escapeunderscore($stringtoencode);
 	}
 
+	/**
+	 *	Escape a string to insert data into a like
+	 *
+	 *	@param	string	$stringtoencode		String to escape
+	 *	@return	string						String escaped
+	 */
+	public function escapeforlike($stringtoencode)
+	{
+		return str_replace(array('_', '\\', '%'), array('\_', '\\\\', '\%'), (string) $stringtoencode);
+	}
+
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 * Get last ID after an insert INSERT

From 5f27435ffcf7f61c14d9982c6eb3ab44b17bac42 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 14 Sep 2022 16:06:42 +0200
Subject: [PATCH 961/974] Fix position of import

---
 htdocs/core/modules/modAccounting.class.php | 36 ++++++++++-----------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/htdocs/core/modules/modAccounting.class.php b/htdocs/core/modules/modAccounting.class.php
index 5e30978693e..737d2831db6 100644
--- a/htdocs/core/modules/modAccounting.class.php
+++ b/htdocs/core/modules/modAccounting.class.php
@@ -272,6 +272,24 @@ class modAccounting extends DolibarrModules
 		//--------
 		$r = 0;
 
+		// Chart of accounts
+		$r++;
+		$this->import_code[$r] = $this->rights_class.'_'.$r;
+		$this->import_label[$r] = "Chartofaccounts"; // 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('aa'=>MAIN_DB_PREFIX.'accounting_account');
+		$this->import_tables_creator_array[$r] = array('aa'=>'fk_user_author'); // Fields to store import user id
+		$this->import_fields_array[$r] = array('aa.fk_pcg_version'=>"Chartofaccounts*", 'aa.account_number'=>"AccountAccounting*", 'aa.label'=>"Label*", 'aa.account_parent'=>"Accountparent", "aa.fk_accounting_category"=>"AccountingCategory", "aa.pcg_type"=>"Pcgtype*", 'aa.active'=>'Status*', 'aa.datec'=>"DateCreation");
+		$this->import_regex_array[$r] = array('aa.fk_pcg_version'=>'pcg_version@'.MAIN_DB_PREFIX.'accounting_system', 'aa.account_number'=>'^.{1,32}$', 'aa.label'=>'^.{1,255}$', 'aa.account_parent'=>'^.{0,32}$', 'aa.fk_accounting_category'=>'rowid@'.MAIN_DB_PREFIX.'c_accounting_category', 'aa.pcg_type'=>'^.{1,20}$', 'aa.active'=>'^0|1$', 'aa.datec'=>'^\d{4}-\d{2}-\d{2}$');
+		$this->import_convertvalue_array[$r] = array(
+			'aa.account_number'=>array('rule'=>'accountingaccount'),
+			'aa.account_parent'=>array('rule'=>'fetchidfromref', 'classfile'=>'/accountancy/class/accountingaccount.class.php', 'class'=>'AccountingAccount', 'method'=>'fetch', 'element'=>'AccountingAccount'),
+			'aa.fk_accounting_category'=>array('rule'=>'fetchidfromcodeorlabel', 'classfile'=>'/accountancy/class/accountancycategory.class.php', 'class'=>'AccountancyCategory', 'method'=>'fetch', 'dict'=>'DictionaryAccountancyCategory'),
+		);
+		$this->import_examplevalues_array[$r] = array('aa.fk_pcg_version'=>"PCG99-ABREGE", 'aa.account_number'=>"707", 'aa.label'=>"Product sales", 'aa.account_parent'=>"ref:7 or id:1407", "aa.fk_accounting_category"=>"", "aa.pcg_type"=>"PROD", 'aa.active'=>'1', 'aa.datec'=>"2017-04-28");
+		$this->import_updatekeys_array[$r] = array('aa.fk_pcg_version'=>'Chartofaccounts', 'aa.account_number'=>'AccountAccounting');
+
 		// General ledger
 		$r++;
 		$this->import_code[$r] = $this->rights_class.'_'.$r;
@@ -393,23 +411,5 @@ class modAccounting extends DolibarrModules
 			'b.multicurrency_amount'=>"90 (Necessary if devise is different than EUR)",
 			'b.multicurrency_code'=>"US (Necessary if devise is different than EUR)",
 		);
-
-		// Chart of accounts
-		$r++;
-		$this->import_code[$r] = $this->rights_class.'_'.$r;
-		$this->import_label[$r] = "Chartofaccounts"; // 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('aa'=>MAIN_DB_PREFIX.'accounting_account');
-		$this->import_tables_creator_array[$r] = array('aa'=>'fk_user_author'); // Fields to store import user id
-		$this->import_fields_array[$r] = array('aa.fk_pcg_version'=>"Chartofaccounts*", 'aa.account_number'=>"AccountAccounting*", 'aa.label'=>"Label*", 'aa.account_parent'=>"Accountparent", "aa.fk_accounting_category"=>"AccountingCategory", "aa.pcg_type"=>"Pcgtype*", 'aa.active'=>'Status*', 'aa.datec'=>"DateCreation");
-		$this->import_regex_array[$r] = array('aa.fk_pcg_version'=>'pcg_version@'.MAIN_DB_PREFIX.'accounting_system', 'aa.account_number'=>'^.{1,32}$', 'aa.label'=>'^.{1,255}$', 'aa.account_parent'=>'^.{0,32}$', 'aa.fk_accounting_category'=>'rowid@'.MAIN_DB_PREFIX.'c_accounting_category', 'aa.pcg_type'=>'^.{1,20}$', 'aa.active'=>'^0|1$', 'aa.datec'=>'^\d{4}-\d{2}-\d{2}$');
-		$this->import_convertvalue_array[$r] = array(
-			'aa.account_number'=>array('rule'=>'accountingaccount'),
-			'aa.account_parent'=>array('rule'=>'fetchidfromref', 'classfile'=>'/accountancy/class/accountingaccount.class.php', 'class'=>'AccountingAccount', 'method'=>'fetch', 'element'=>'AccountingAccount'),
-			'aa.fk_accounting_category'=>array('rule'=>'fetchidfromcodeorlabel', 'classfile'=>'/accountancy/class/accountancycategory.class.php', 'class'=>'AccountancyCategory', 'method'=>'fetch', 'dict'=>'DictionaryAccountancyCategory'),
-		);
-		$this->import_examplevalues_array[$r] = array('aa.fk_pcg_version'=>"PCG99-ABREGE", 'aa.account_number'=>"707", 'aa.label'=>"Product sales", 'aa.account_parent'=>"ref:7 or id:1407", "aa.fk_accounting_category"=>"", "aa.pcg_type"=>"PROD", 'aa.active'=>'1', 'aa.datec'=>"2017-04-28");
-		$this->import_updatekeys_array[$r] = array('aa.fk_pcg_version'=>'Chartofaccounts', 'aa.account_number'=>'AccountAccounting');
 	}
 }

From 337cc7553ddef8137e9ed7d3ff1c0b217d8e858b Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 14 Sep 2022 17:44:47 +0200
Subject: [PATCH 962/974] Fix rounding

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

diff --git a/htdocs/core/lib/price.lib.php b/htdocs/core/lib/price.lib.php
index 6b85e837b07..f85e78865ed 100644
--- a/htdocs/core/lib/price.lib.php
+++ b/htdocs/core/lib/price.lib.php
@@ -372,16 +372,16 @@ function calcul_price_total($qty, $pu, $remise_percent_ligne, $txtva, $uselocalt
 	// If rounding is not using base 10 (rare)
 	if (!empty($conf->global->MAIN_ROUNDING_RULE_TOT)) {
 		if ($price_base_type == 'HT') {
-			$result[0] = round($result[0] / $conf->global->MAIN_ROUNDING_RULE_TOT, 0) * $conf->global->MAIN_ROUNDING_RULE_TOT;
-			$result[1] = round($result[1] / $conf->global->MAIN_ROUNDING_RULE_TOT, 0) * $conf->global->MAIN_ROUNDING_RULE_TOT;
-			$result[9] = round($result[9] / $conf->global->MAIN_ROUNDING_RULE_TOT, 0) * $conf->global->MAIN_ROUNDING_RULE_TOT;
-			$result[10] = round($result[10] / $conf->global->MAIN_ROUNDING_RULE_TOT, 0) * $conf->global->MAIN_ROUNDING_RULE_TOT;
+			$result[0] = price2num(round($result[0] / $conf->global->MAIN_ROUNDING_RULE_TOT, 0) * $conf->global->MAIN_ROUNDING_RULE_TOT, 'MT');
+			$result[1] = price2num(round($result[1] / $conf->global->MAIN_ROUNDING_RULE_TOT, 0) * $conf->global->MAIN_ROUNDING_RULE_TOT, 'MT');
+			$result[9] = price2num(round($result[9] / $conf->global->MAIN_ROUNDING_RULE_TOT, 0) * $conf->global->MAIN_ROUNDING_RULE_TOT, 'MT');
+			$result[10] = price2num(round($result[10] / $conf->global->MAIN_ROUNDING_RULE_TOT, 0) * $conf->global->MAIN_ROUNDING_RULE_TOT, 'MT');
 			$result[2] = price2num($result[0] + $result[1] + $result[9] + $result[10], 'MT');
 		} else {
-			$result[1] = round($result[1] / $conf->global->MAIN_ROUNDING_RULE_TOT, 0) * $conf->global->MAIN_ROUNDING_RULE_TOT;
-			$result[2] = round($result[2] / $conf->global->MAIN_ROUNDING_RULE_TOT, 0) * $conf->global->MAIN_ROUNDING_RULE_TOT;
-			$result[9] = round($result[9] / $conf->global->MAIN_ROUNDING_RULE_TOT, 0) * $conf->global->MAIN_ROUNDING_RULE_TOT;
-			$result[10] = round($result[10] / $conf->global->MAIN_ROUNDING_RULE_TOT, 0) * $conf->global->MAIN_ROUNDING_RULE_TOT;
+			$result[1] = price2num(round($result[1] / $conf->global->MAIN_ROUNDING_RULE_TOT, 0) * $conf->global->MAIN_ROUNDING_RULE_TOT, 'MT');
+			$result[2] = price2num(round($result[2] / $conf->global->MAIN_ROUNDING_RULE_TOT, 0) * $conf->global->MAIN_ROUNDING_RULE_TOT, 'MT');
+			$result[9] = price2num(round($result[9] / $conf->global->MAIN_ROUNDING_RULE_TOT, 0) * $conf->global->MAIN_ROUNDING_RULE_TOT, 'MT');
+			$result[10] = price2num(round($result[10] / $conf->global->MAIN_ROUNDING_RULE_TOT, 0) * $conf->global->MAIN_ROUNDING_RULE_TOT, 'MT');
 			$result[0] = price2num($result[2] - $result[1] - $result[9] - $result[10], 'MT');
 		}
 	}

From 3a078ec77dd2c8872b12c043c784fd0ced0ee011 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 14 Sep 2022 18:12:05 +0200
Subject: [PATCH 963/974] Fix type of var

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

diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index 7b78d9bbcb9..02c38e9a89e 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -3553,8 +3553,8 @@ abstract class CommonObject
 		}
 
 		$forcedroundingmode = $roundingadjust;
-		if ($forcedroundingmode == 'auto' && isset($conf->global->MAIN_ROUNDOFTOTAL_NOT_TOTALOFROUND)) {
-			$forcedroundingmode = $conf->global->MAIN_ROUNDOFTOTAL_NOT_TOTALOFROUND;
+		if ($forcedroundingmode == 'auto' && getDolGlobalString('MAIN_ROUNDOFTOTAL_NOT_TOTALOFROUND')) {
+			$forcedroundingmode = getDolGlobalString('MAIN_ROUNDOFTOTAL_NOT_TOTALOFROUND');
 		} elseif ($forcedroundingmode == 'auto') {
 			$forcedroundingmode = '0';
 		}
@@ -3679,14 +3679,17 @@ abstract class CommonObject
 						}
 						$sqlfix = "UPDATE ".$this->db->prefix().$this->table_element_line." SET ".$fieldtva." = ".price2num($obj->total_tva - $diff).", total_ttc = ".price2num($obj->total_ttc - $diff)." WHERE rowid = ".((int) $obj->rowid);
 						dol_syslog('We found a difference of '.$diff.' for line rowid = '.$obj->rowid.". We fix the total_vat and total_ttc of line by running sqlfix = ".$sqlfix);
-								$resqlfix = $this->db->query($sqlfix);
+
+						$resqlfix = $this->db->query($sqlfix);
+
 						if (!$resqlfix) {
 							dol_print_error($this->db, 'Failed to update line');
 						}
-								$this->total_tva -= $diff;
-								$this->total_ttc -= $diff;
-								$total_tva_by_vats[$obj->vatrate] -= $diff;
-								$total_ttc_by_vats[$obj->vatrate] -= $diff;
+
+						$this->total_tva = (float) price2num($this->total_tva - $diff);
+						$this->total_ttc = (float) price2num($this->total_ttc - $diff);
+						$total_tva_by_vats[$obj->vatrate] = (float) price2num($total_tva_by_vats[$obj->vatrate] - $diff);
+						$total_ttc_by_vats[$obj->vatrate] = (float) price2num($total_ttc_by_vats[$obj->vatrate] - $diff);
 					}
 				}
 

From 8f7f104806cef5197260b35c21bd638ac8780dad Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 14 Sep 2022 18:34:13 +0200
Subject: [PATCH 964/974] Fix test on MAIN_ROUNDOFTOTAL_NOT_TOTALOFROUND

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

diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index 02c38e9a89e..94d6e039477 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -3553,7 +3553,7 @@ abstract class CommonObject
 		}
 
 		$forcedroundingmode = $roundingadjust;
-		if ($forcedroundingmode == 'auto' && getDolGlobalString('MAIN_ROUNDOFTOTAL_NOT_TOTALOFROUND')) {
+		if ($forcedroundingmode == 'auto' && isset($conf->global->MAIN_ROUNDOFTOTAL_NOT_TOTALOFROUND)) {
 			$forcedroundingmode = getDolGlobalString('MAIN_ROUNDOFTOTAL_NOT_TOTALOFROUND');
 		} elseif ($forcedroundingmode == 'auto') {
 			$forcedroundingmode = '0';
@@ -3686,10 +3686,10 @@ abstract class CommonObject
 							dol_print_error($this->db, 'Failed to update line');
 						}
 
-						$this->total_tva = (float) price2num($this->total_tva - $diff);
-						$this->total_ttc = (float) price2num($this->total_ttc - $diff);
-						$total_tva_by_vats[$obj->vatrate] = (float) price2num($total_tva_by_vats[$obj->vatrate] - $diff);
-						$total_ttc_by_vats[$obj->vatrate] = (float) price2num($total_ttc_by_vats[$obj->vatrate] - $diff);
+						$this->total_tva = (float) price2num($this->total_tva - $diff, '', 1);
+						$this->total_ttc = (float) price2num($this->total_ttc - $diff, '', 1);
+						$total_tva_by_vats[$obj->vatrate] = (float) price2num($total_tva_by_vats[$obj->vatrate] - $diff, '', 1);
+						$total_ttc_by_vats[$obj->vatrate] = (float) price2num($total_ttc_by_vats[$obj->vatrate] - $diff, '', 1);
 					}
 				}
 

From 90dbb933883aa1306946f19123236913ae1d5d0f Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 14 Sep 2022 18:51:07 +0200
Subject: [PATCH 965/974] Try fix rounding

---
 htdocs/core/class/commonobject.class.php | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index 94d6e039477..fd71e78afc6 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -3716,6 +3716,13 @@ abstract class CommonObject
 				}
 			}
 
+			// Clean total
+			$this->total_ht = (float) price2num($this->total_ht);
+			$this->total_tva = (float) price2num($this->total_tva);
+			$this->total_localtax1 = (float) price2num($this->total_localtax1);
+			$this->total_localtax2 = (float) price2num($this->total_localtax2);
+			$this->total_ttc = (float) price2num($this->total_ttc);
+
 			$this->db->free($resql);
 
 			// Now update global field total_ht, total_ttc, total_tva, total_localtax1, total_localtax2, multicurrency_total_*
@@ -3749,11 +3756,11 @@ abstract class CommonObject
 
 			if (empty($nodatabaseupdate)) {
 				$sql = "UPDATE ".$this->db->prefix().$this->table_element.' SET';
-				$sql .= " ".$fieldht." = ".((float) price2num($this->total_ht)).",";
-				$sql .= " ".$fieldtva." = ".((float) price2num($this->total_tva)).",";
-				$sql .= " ".$fieldlocaltax1." = ".((float) price2num($this->total_localtax1)).",";
-				$sql .= " ".$fieldlocaltax2." = ".((float) price2num($this->total_localtax2)).",";
-				$sql .= " ".$fieldttc." = ".((float) price2num($this->total_ttc));
+				$sql .= " ".$fieldht." = ".((float) price2num($this->total_ht, 'MT', 1)).",";
+				$sql .= " ".$fieldtva." = ".((float) price2num($this->total_tva, 'MT', 1)).",";
+				$sql .= " ".$fieldlocaltax1." = ".((float) price2num($this->total_localtax1, 'MT', 1)).",";
+				$sql .= " ".$fieldlocaltax2." = ".((float) price2num($this->total_localtax2, 'MT', 1)).",";
+				$sql .= " ".$fieldttc." = ".((float) price2num($this->total_ttc, 'MT', 1));
 				$sql .= ", multicurrency_total_ht = ".((float) price2num($this->multicurrency_total_ht, 'MT', 1));
 				$sql .= ", multicurrency_total_tva = ".((float) price2num($this->multicurrency_total_tva, 'MT', 1));
 				$sql .= ", multicurrency_total_ttc = ".((float) price2num($this->multicurrency_total_ttc, 'MT', 1));

From 094c2c3027e6e769996fb58f621aedb93ae316b2 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 15 Sep 2022 01:02:49 +0200
Subject: [PATCH 966/974] Fix condition on a field

---
 htdocs/projet/class/project.class.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/htdocs/projet/class/project.class.php b/htdocs/projet/class/project.class.php
index 7ee71bc1569..849c1c53398 100644
--- a/htdocs/projet/class/project.class.php
+++ b/htdocs/projet/class/project.class.php
@@ -345,6 +345,7 @@ class Project extends CommonObject
 			$this->fields['accept_booth_suggestions']['enabled'] = 0;
 			$this->fields['price_registration']['enabled'] = 0;
 			$this->fields['price_booth']['enabled'] = 0;
+			$this->fields['max_attendees']['enabled'] = 0;
 		}
 	}
 

From 9881e7753d0fa9d638e8c9326968e4529cfd4ac0 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 15 Sep 2022 01:35:54 +0200
Subject: [PATCH 967/974] Fix regression

---
 .../societe/mod_codeclient_elephant.php       | 23 ++++++++++---------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/htdocs/core/modules/societe/mod_codeclient_elephant.php b/htdocs/core/modules/societe/mod_codeclient_elephant.php
index 820dfafdc7e..100799dff95 100644
--- a/htdocs/core/modules/societe/mod_codeclient_elephant.php
+++ b/htdocs/core/modules/societe/mod_codeclient_elephant.php
@@ -172,27 +172,32 @@ class mod_codeclient_elephant extends ModeleThirdPartyCode
 			"ErrorBadMaskBadRazMonth",
 			"ErrorCantUseRazWithYearOnOneDigit",
 		);
+
+		$cssforerror = (getDolGlobalString('SOCIETE_CODECLIENT_ADDON') == 'mod_codeclient_elephant' ? 'error' : 'opacitymedium');
+
 		if ($type != 1) {
 			$examplecust = $this->getNextValue($objsoc, 0);
-			if (!$examplecust) {
-				$examplecust = '<div class="error">'.$langs->trans('NotConfigured').'</div>';
+			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 = '<div class="error">'.$langs->trans($examplecust).'</div>';
+				$examplecust = '<span class="'.$cssforerror.'">'.$langs->trans($examplecust).'</span>';
 				$error = 1;
 			}
 		}
 		if ($type != 0) {
 			$examplesup = $this->getNextValue($objsoc, 1);
-			if (!$examplesup) {
-				$examplesup = '<div class="error">'.$langs->trans('NotConfigured').'</div>';
+			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 = '<div class="error">'.$langs->trans($examplesup).'</div>';
+				$examplesup = '<span class="'.$cssforerror.'">'.$langs->trans($examplesup).'</span>';
 				$error = 1;
 			}
 		}
@@ -202,11 +207,7 @@ class mod_codeclient_elephant extends ModeleThirdPartyCode
 		} elseif ($type == 1) {
 			return $examplesup;
 		} else {
-			if ($error == 1) {
-				return $examplecust.' '.$examplesup;
-			} else {
-				return $examplecust.'<br>'.$examplesup;
-			}
+			return $examplecust.'<br>'.$examplesup;
 		}
 	}
 

From 91bdaae8986d0338927da071a0d445ce2390a13f Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 15 Sep 2022 03:08:33 +0200
Subject: [PATCH 968/974] Look and feel v17

---
 htdocs/comm/propal/card.php                   |  2 +-
 htdocs/comm/propal/list.php                   | 45 ++++++++++++---
 htdocs/commande/card.php                      |  2 +-
 htdocs/commande/list.php                      | 12 ++--
 htdocs/compta/facture/card.php                |  6 +-
 htdocs/compta/facture/class/facture.class.php | 13 +----
 htdocs/compta/facture/list.php                | 21 ++++---
 htdocs/core/class/commoninvoice.class.php     | 56 +++++++++++++------
 htdocs/fourn/commande/card.php                |  2 +-
 htdocs/fourn/commande/list.php                |  6 +-
 htdocs/fourn/facture/card.php                 |  2 +-
 htdocs/langs/en_US/bills.lang                 |  2 +
 htdocs/societe/class/societe.class.php        |  5 ++
 13 files changed, 114 insertions(+), 60 deletions(-)

diff --git a/htdocs/comm/propal/card.php b/htdocs/comm/propal/card.php
index 0a1d1bdbc06..0f019c80f4b 100644
--- a/htdocs/comm/propal/card.php
+++ b/htdocs/comm/propal/card.php
@@ -1742,7 +1742,7 @@ if ($action == 'create') {
 		//$warehouse_id       = $soc->warehouse_id;
 	} else {
 		print '<td class="valuefieldcreate">';
-		print img_picto('', 'company').$form->select_company('', 'socid', '(s.client = 1 OR s.client = 2 OR s.client = 3) AND status=1', 'SelectThirdParty', 0, 0, null, 0, 'minwidth300 maxwidth500 widthcentpercentminusxx');
+		print img_picto('', 'company').$form->select_company('', 'socid', '(s.client = 1 OR s.client = 2 OR s.client = 3) AND status=1', 'SelectThirdParty', 1, 0, null, 0, 'minwidth300 maxwidth500 widthcentpercentminusxx');
 		// reload page to retrieve customer informations
 		if (empty($conf->global->RELOAD_PAGE_ON_CUSTOMER_CHANGE_DISABLED)) {
 			print '<script type="text/javascript">
diff --git a/htdocs/comm/propal/list.php b/htdocs/comm/propal/list.php
index 9ba246171f3..576c4ed31fa 100644
--- a/htdocs/comm/propal/list.php
+++ b/htdocs/comm/propal/list.php
@@ -204,7 +204,7 @@ if (empty($user->socid)) {
 $checkedtypetiers = 0;
 $arrayfields = array(
 	'p.ref'=>array('label'=>"Ref", 'checked'=>1),
-	'p.ref_client'=>array('label'=>"RefCustomer", 'checked'=>1),
+	'p.ref_client'=>array('label'=>"RefCustomer", 'checked'=>-1),
 	'pr.ref'=>array('label'=>"ProjectRef", 'checked'=>1, 'enabled'=>(!isModEnabled('project') ? 0 : 1)),
 	'pr.title'=>array('label'=>"ProjectLabel", 'checked'=>0, 'enabled'=>(!isModEnabled('project') ? 0 : 1)),
 	's.nom'=>array('label'=>"ThirdParty", 'checked'=>1),
@@ -249,6 +249,28 @@ $arrayfields = array(
 	'p.fk_statut'=>array('label'=>"Status", 'checked'=>1, 'position'=>1000),
 );
 
+// List of fields to search into when doing a "search in all"
+/*$fieldstosearchall = array();
+foreach ($object->fields as $key => $val) {
+	if (!empty($val['searchall'])) {
+		$fieldstosearchall['t.'.$key] = $val['label'];
+	}
+}*/
+// Definition of array of fields for columns
+/*$arrayfields = array();
+foreach ($object->fields as $key => $val) {
+	// If $val['visible']==0, then we never show the field
+	if (!empty($val['visible'])) {
+		$visible = (int) dol_eval($val['visible'], 1);
+		$arrayfields['t.'.$key] = array(
+			'label'=>$val['label'],
+			'checked'=>(($visible < 0) ? 0 : 1),
+			'enabled'=>(abs($visible) != 3 && dol_eval($val['enabled'], 1)),
+			'position'=>$val['position'],
+			'help'=> isset($val['help']) ? $val['help'] : ''
+		);
+	}
+}*/
 // Extra fields
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_array_fields.tpl.php';
 
@@ -529,7 +551,7 @@ $sql = 'SELECT';
 if ($sall || $search_product_category > 0 || $search_user > 0) {
 	$sql = 'SELECT DISTINCT';
 }
-$sql .= ' s.rowid as socid, s.nom as name, s.name_alias as alias, s.email, s.phone, s.fax , s.address, s.town, s.zip, s.fk_pays, s.client, s.code_client, ';
+$sql .= ' s.rowid as socid, s.nom as name, s.name_alias as alias, s.email, s.phone, s.fax , s.address, s.town, s.zip, s.fk_pays, s.client, s.fournisseur, s.code_client, ';
 $sql .= " typent.code as typent_code,";
 $sql .= " ava.rowid as availability,";
 $sql .= " country.code as country_code,";
@@ -1520,6 +1542,7 @@ if ($resql) {
 		'sortorder' => $sortorder,
 		'totalarray' => &$totalarray,
 	);
+
 	$reshook = $hookmanager->executeHooks('printFieldListTitle', $parameters); // Note that $action and $object may have been modified by hook
 	print $hookmanager->resPrint;
 	if (!empty($arrayfields['p.datec']['checked'])) {
@@ -1562,8 +1585,11 @@ if ($resql) {
 	$total_ht = 0;
 	$total_margin = 0;
 
-	$last_num = min($num, $limit);
-	while ($i < $last_num) {
+	$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;
@@ -1578,6 +1604,7 @@ if ($resql) {
 		$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;
@@ -1671,7 +1698,7 @@ if ($resql) {
 		if (!empty($arrayfields['p.ref_client']['checked'])) {
 			// Customer ref
 			print '<td class="nowrap tdoverflowmax200">';
-			print $obj->ref_client;
+			print dol_escape_htmltag($obj->ref_client);
 			print '</td>';
 			if (!$i) {
 				$totalarray['nbfield']++;
@@ -1694,7 +1721,7 @@ if ($resql) {
 			// Project label
 			print '<td class="nowrap">';
 			if ($obj->project_id > 0) {
-				print $projectstatic->title;
+				print dol_escape_htmltag($projectstatic->title);
 			}
 			print '</td>';
 			if (!$i) {
@@ -1704,7 +1731,7 @@ if ($resql) {
 
 		// Thirdparty
 		if (!empty($arrayfields['s.nom']['checked'])) {
-			print '<td class="tdoverflowmax200">';
+			print '<td class="tdoverflowmax150">';
 			print $companystatic->getNomUrl(1, 'customer');
 			print '</td>';
 			if (!$i) {
@@ -1988,7 +2015,7 @@ if ($resql) {
 
 		// Author
 		if (!empty($arrayfields['u.login']['checked'])) {
-			print '<td class="tdoverflowmax200">';
+			print '<td class="tdoverflowmax150">';
 			if ($userstatic->id) {
 				print $userstatic->getNomUrl(-1);
 			}
@@ -2080,7 +2107,7 @@ if ($resql) {
 			if (!$i) {
 				$totalarray['pos'][$totalarray['nbfield']] = 'total_mark_rate';
 			}
-			if ($i >= $last_num - 1) {
+			if ($i >= $imaxinloop - 1) {
 				if (!empty($total_ht)) {
 					$totalarray['val']['total_mark_rate'] = price2num($total_margin * 100 / $total_ht, 'MT');
 				} else {
diff --git a/htdocs/commande/card.php b/htdocs/commande/card.php
index 47da6a86e13..d189eb22851 100644
--- a/htdocs/commande/card.php
+++ b/htdocs/commande/card.php
@@ -1751,7 +1751,7 @@ if ($action == 'create' && $usercancreate) {
 		print '</td>';
 	} else {
 		print '<td>';
-		print img_picto('', 'company').$form->select_company('', 'socid', '(s.client = 1 OR s.client = 2 OR s.client = 3)', 'SelectThirdParty', 0, 0, null, 0, 'minwidth175 maxwidth500 widthcentpercentminusxx');
+		print img_picto('', 'company').$form->select_company('', 'socid', '(s.client = 1 OR s.client = 2 OR s.client = 3)', 'SelectThirdParty', 1, 0, null, 0, 'minwidth175 maxwidth500 widthcentpercentminusxx');
 		// reload page to retrieve customer informations
 		if (empty($conf->global->RELOAD_PAGE_ON_CUSTOMER_CHANGE_DISABLED)) {
 			print '<script type="text/javascript">
diff --git a/htdocs/commande/list.php b/htdocs/commande/list.php
index 7578f75cc1f..89831fbd929 100644
--- a/htdocs/commande/list.php
+++ b/htdocs/commande/list.php
@@ -792,7 +792,7 @@ $sql = 'SELECT';
 if ($sall || $search_product_category > 0 || $search_user > 0) {
 	$sql = 'SELECT DISTINCT';
 }
-$sql .= ' s.rowid as socid, s.nom as name, s.name_alias as alias, s.email, s.phone, s.fax, s.address, s.town, s.zip, s.fk_pays, s.client, s.code_client,';
+$sql .= ' s.rowid as socid, s.nom as name, s.name_alias as alias, s.email, s.phone, s.fax, s.address, s.town, s.zip, s.fk_pays, s.client, s.fournisseur, s.code_client,';
 $sql .= " typent.code as typent_code,";
 $sql .= " state.code_departement as state_code, state.nom as state_name,";
 $sql .= " country.code as country_code,";
@@ -1862,8 +1862,10 @@ if ($resql) {
 	$total_ht = 0;
 	$total_margin = 0;
 
+	$savnbfield = $totalarray['nbfield'];
+	$totalarray = array();
+	$totalarray['nbfield'] = 0;
 	$imaxinloop = ($limit ? min($num, $limit) : $num);
-	$last_num = min($num, $limit);
 	while ($i < $imaxinloop) {
 		$obj = $db->fetch_object($resql);
 
@@ -1877,6 +1879,7 @@ if ($resql) {
 		$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;
@@ -1893,7 +1896,6 @@ if ($resql) {
 		$generic_commande->statut = $obj->fk_statut;
 		$generic_commande->billed = $obj->billed;
 		$generic_commande->date = $db->jdate($obj->date_commande);
-		$generic_commande->date_livraison = $db->jdate($obj->date_delivery); // deprecated
 		$generic_commande->delivery_date = $db->jdate($obj->date_delivery);
 		$generic_commande->ref_client = $obj->ref_client;
 		$generic_commande->total_ht = $obj->total_ht;
@@ -1978,7 +1980,7 @@ if ($resql) {
 
 		// Third party
 		if (!empty($arrayfields['s.nom']['checked'])) {
-			print '<td class="tdoverflowmax200">';
+			print '<td class="tdoverflowmax150">';
 			print $getNomUrl_cache[$obj->socid];
 
 			// If module invoices enabled and user with invoice creation permissions
@@ -2314,7 +2316,7 @@ if ($resql) {
 			if (!$i) {
 				$totalarray['pos'][$totalarray['nbfield']] = 'total_mark_rate';
 			}
-			if ($i >= $last_num - 1) {
+			if ($i >= $imaxinloop - 1) {
 				if (!empty($total_ht)) {
 					$totalarray['val']['total_mark_rate'] = price2num($total_margin * 100 / $total_ht, 'MT');
 				} else {
diff --git a/htdocs/compta/facture/card.php b/htdocs/compta/facture/card.php
index 3edefe8f159..9062d98ae93 100644
--- a/htdocs/compta/facture/card.php
+++ b/htdocs/compta/facture/card.php
@@ -3192,7 +3192,7 @@ if ($action == 'create') {
 	} else {
 		print '<tr><td class="fieldrequired">'.$langs->trans('Customer').'</td>';
 		print '<td colspan="2">';
-		print img_picto('', 'company').$form->select_company($soc->id, 'socid', '((s.client = 1 OR s.client = 3) AND s.status=1)', 'SelectThirdParty', 0, 0, null, 0, 'minwidth300 widthcentpercentminusxx maxwidth500');
+		print img_picto('', 'company').$form->select_company($soc->id, 'socid', '((s.client = 1 OR s.client = 3) AND s.status=1)', 'SelectThirdParty', 1, 0, null, 0, 'minwidth300 widthcentpercentminusxx maxwidth500');
 		// Option to reload page to retrieve customer informations.
 		if (empty($conf->global->RELOAD_PAGE_ON_CUSTOMER_CHANGE_DISABLED)) {
 			print '<script type="text/javascript">
@@ -4410,9 +4410,7 @@ if ($action == 'create') {
 
 	// Type
 	print '<tr><td class="titlefield fieldname_type">'.$langs->trans('Type').'</td><td class="valuefield fieldname_type">';
-	print '<span class="badgeneutral">';
-	print $object->getLibType();
-	print '</span>';
+	print $object->getLibType(2);
 	if ($object->module_source) {
 		print ' <span class="opacitymediumbycolor paddingleft">('.$langs->trans("POS").' '.ucfirst($object->module_source).' - '.$langs->trans("Terminal").' '.$object->pos_source.')</span>';
 	}
diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php
index 0a8995a3d40..f1e7ddd4bc2 100644
--- a/htdocs/compta/facture/class/facture.class.php
+++ b/htdocs/compta/facture/class/facture.class.php
@@ -1821,21 +1821,10 @@ class Facture extends CommonInvoice
 
 		if ($user->rights->facture->lire) {
 			$label = img_picto('', $picto).' <u class="paddingrightonly">'.$langs->trans("Invoice").'</u>';
-			if ($this->type == self::TYPE_REPLACEMENT) {
-				$label = img_picto('', $picto).' <u class="paddingrightonly">'.$langs->transnoentitiesnoconv("ReplacementInvoice").'</u>';
-			}
-			if ($this->type == self::TYPE_CREDIT_NOTE) {
-				$label = img_picto('', $picto).' <u class="paddingrightonly">'.$langs->transnoentitiesnoconv("CreditNote").'</u>';
-			}
-			if ($this->type == self::TYPE_DEPOSIT) {
-				$label = img_picto('', $picto).' <u class="paddingrightonly">'.$langs->transnoentitiesnoconv("Deposit").'</u>';
-			}
-			if ($this->type == self::TYPE_SITUATION) {
-				$label = img_picto('', $picto).' <u class="paddingrightonly">'.$langs->transnoentitiesnoconv("InvoiceSituation").'</u>';
-			}
 			if (isset($this->statut) && isset($this->alreadypaid)) {
 				$label .= ' '.$this->getLibStatut(5, $this->alreadypaid);
 			}
+			$label .= ' &nbsp; '.$this->getLibType(1);
 			if (!empty($this->ref)) {
 				$label .= '<br><b>'.$langs->trans('Ref').':</b> '.$this->ref;
 			}
diff --git a/htdocs/compta/facture/list.php b/htdocs/compta/facture/list.php
index 56b8943f5ad..ddfe7e5429f 100644
--- a/htdocs/compta/facture/list.php
+++ b/htdocs/compta/facture/list.php
@@ -1273,15 +1273,15 @@ if ($resql) {
 		print '<td class="liste_titre maxwidthonsmartphone">';
 		$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_CREDIT_NOTE=>$langs->trans("InvoiceAvoir"),
+			Facture::TYPE_REPLACEMENT=>$langs->trans("InvoiceReplacement"),
 		);
 		if (!empty($conf->global->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.
-		print $form->selectarray('search_type', $listtype, $search_type, 1, 0, 0, '', 0, 0, 0, 'ASC', 'maxwidth100');
+		print $form->selectarray('search_type', $listtype, $search_type, 1, 0, 0, '', 0, 0, 0, '', 'maxwidth100');
 		print '</td>';
 	}
 	// Date invoice
@@ -1734,8 +1734,11 @@ if ($resql) {
 		$total_ht = 0;
 		$total_margin = 0;
 
-		$last_num = min($num, $limit);
-		while ($i < $last_num) {
+		$savnbfield = $totalarray['nbfield'];
+		$totalarray = array();
+		$totalarray['nbfield'] = 0;
+		$imaxinloop = ($limit ? min($num, $limit) : $num);
+		while ($i < $imaxinloop) {
 			$obj = $db->fetch_object($resql);
 
 			$datelimit = $db->jdate($obj->datelimite);
@@ -1752,7 +1755,8 @@ if ($resql) {
 			$facturestatic->multicurrency_total_ht = $obj->multicurrency_total_ht;
 			$facturestatic->multicurrency_total_tva = $obj->multicurrency_total_vat;
 			$facturestatic->multicurrency_total_ttc = $obj->multicurrency_total_ttc;
-			$facturestatic->statut = $obj->fk_statut;
+			$facturestatic->statut = $obj->fk_statut;	// deprecated
+			$facturestatic->status = $obj->fk_statut;
 			$facturestatic->close_code = $obj->close_code;
 			$facturestatic->total_ttc = $obj->total_ttc;
 			$facturestatic->paye = $obj->paye;
@@ -1764,6 +1768,7 @@ if ($resql) {
 
 			$facturestatic->note_public = $obj->note_public;
 			$facturestatic->note_private = $obj->note_private;
+
 			if (!empty($conf->global->INVOICE_USE_SITUATION) && !empty($conf->global->INVOICE_USE_RETAINED_WARRANTY)) {
 				$facturestatic->retained_warranty = $obj->retained_warranty;
 				$facturestatic->retained_warranty_date_limit = $obj->retained_warranty_date_limit;
@@ -1899,7 +1904,7 @@ if ($resql) {
 			// Type
 			if (!empty($arrayfields['f.type']['checked'])) {
 				print '<td class="nowraponall tdoverflowmax100" title="'.$facturestatic->getLibType().'">';
-				print $facturestatic->getLibType();
+				print $facturestatic->getLibType(2);
 				print "</td>";
 				if (!$i) {
 					$totalarray['nbfield']++;
@@ -2340,7 +2345,7 @@ if ($resql) {
 				if (!$i) {
 					$totalarray['pos'][$totalarray['nbfield']] = 'total_mark_rate';
 				}
-				if ($i >= $last_num - 1) {
+				if ($i >= $imaxinloop - 1) {
 					if (!empty($total_ht)) {
 						$totalarray['val']['total_mark_rate'] = price2num($total_margin * 100 / $total_ht, 'MT');
 					} else {
diff --git a/htdocs/core/class/commoninvoice.class.php b/htdocs/core/class/commoninvoice.class.php
index 84eed4f432c..2d79aa298b6 100644
--- a/htdocs/core/class/commoninvoice.class.php
+++ b/htdocs/core/class/commoninvoice.class.php
@@ -131,8 +131,8 @@ abstract class CommonInvoice extends CommonObject
 	 * 	Return amount of payments already done. This must include ONLY the record into the payment table.
 	 *  Payments dones using discounts, credit notes, etc are not included.
 	 *
-	 *  @param 		int 	$multicurrency 		Return multicurrency_amount instead of amount
-	 *	@return		float						Amount of payment already done, <0 and set ->error if KO
+	 *  @param 		int 		$multicurrency 		Return multicurrency_amount instead of amount
+	 *	@return		float|int						Amount of payment already done, <0 and set ->error if KO
 	 */
 	public function getSommePaiement($multicurrency = 0)
 	{
@@ -148,17 +148,23 @@ abstract class CommonInvoice extends CommonObject
 		$sql .= " WHERE ".$field." = ".((int) $this->id);
 
 		dol_syslog(get_class($this)."::getSommePaiement", LOG_DEBUG);
+
 		$resql = $this->db->query($sql);
 		if ($resql) {
 			$obj = $this->db->fetch_object($resql);
 
 			$this->db->free($resql);
-			if ($multicurrency) {
-				$this->sumpayed_multicurrency = $obj->multicurrency_amount;
-				return $obj->multicurrency_amount;
+
+			if ($obj) {
+				if ($multicurrency) {
+					$this->sumpayed_multicurrency = $obj->multicurrency_amount;
+					return (float) $obj->multicurrency_amount;
+				} else {
+					$this->sumpayed = $obj->amount;
+					return (float) $obj->amount;
+				}
 			} else {
-				$this->sumpayed = $obj->amount;
-				return $obj->amount;
+				return 0;
 			}
 		} else {
 			$this->error = $this->db->lasterror();
@@ -513,25 +519,43 @@ abstract class CommonInvoice extends CommonObject
 	/**
 	 *	Return label of type of invoice
 	 *
-	 *	@return     string        Label of type of invoice
+	 *	@param		int			$withbadge		1=Add span for badge css, 2=Add span and show short label
+	 *	@return     string        				Label of type of invoice
 	 */
-	public function getLibType()
+	public function getLibType($withbadge = 0)
 	{
 		global $langs;
+
+		$labellong = "Unknown";
 		if ($this->type == CommonInvoice::TYPE_STANDARD) {
-			return $langs->trans("InvoiceStandard");
+			$labellong = "InvoiceStandard";
+			$labelshort = "InvoiceStandardShort";
 		} elseif ($this->type == CommonInvoice::TYPE_REPLACEMENT) {
-			return $langs->trans("InvoiceReplacement");
+			$labellong = "InvoiceReplacement";
+			$labelshort = "InvoiceReplacementShort";
 		} elseif ($this->type == CommonInvoice::TYPE_CREDIT_NOTE) {
-			return $langs->trans("InvoiceAvoir");
+			$labellong = "InvoiceAvoir";
+			$labelshort = "CreditNote";
 		} elseif ($this->type == CommonInvoice::TYPE_DEPOSIT) {
-			return $langs->trans("InvoiceDeposit");
+			$labellong = "InvoiceDeposit";
+			$labelshort = "Deposit";
 		} elseif ($this->type == CommonInvoice::TYPE_PROFORMA) {
-			return $langs->trans("InvoiceProForma"); // Not used.
+			$labellong = "InvoiceProForma"; // Not used.
+			$labelshort = "ProForma";
 		} elseif ($this->type == CommonInvoice::TYPE_SITUATION) {
-			return $langs->trans("InvoiceSituation");
+			$labellong = "InvoiceSituation";
+			$labelshort = "Situation";
 		}
-		return $langs->trans("Unknown");
+
+		$out = '';
+		if ($withbadge) {
+			$out .= '<span class="badgeneutral" title="'.dol_escape_htmltag($langs->trans($labellong)).'">';
+		}
+		$out .= $langs->trans($withbadge == 2 ? $labelshort : $labellong);
+		if ($withbadge) {
+			$out .= '</span>';
+		}
+		return $out;
 	}
 
 	/**
diff --git a/htdocs/fourn/commande/card.php b/htdocs/fourn/commande/card.php
index 470525102cc..5125b758b9f 100644
--- a/htdocs/fourn/commande/card.php
+++ b/htdocs/fourn/commande/card.php
@@ -1698,7 +1698,7 @@ if ($action == 'create') {
 		print $societe->getNomUrl(1, 'supplier');
 		print '<input type="hidden" name="socid" value="'.$societe->id.'">';
 	} else {
-		print img_picto('', 'company').$form->select_company((empty($socid) ? '' : $socid), 'socid', 's.fournisseur=1', 'SelectThirdParty', 0, 0, null, 0, 'minwidth300');
+		print img_picto('', 'company').$form->select_company((empty($socid) ? '' : $socid), 'socid', 's.fournisseur=1', 'SelectThirdParty', 1, 0, null, 0, 'minwidth175 maxwidth500 widthcentpercentminusxx');
 		// reload page to retrieve customer informations
 		if (!empty($conf->global->RELOAD_PAGE_ON_SUPPLIER_CHANGE)) {
 			print '<script>
diff --git a/htdocs/fourn/commande/list.php b/htdocs/fourn/commande/list.php
index b08396706d4..82e36af6943 100644
--- a/htdocs/fourn/commande/list.php
+++ b/htdocs/fourn/commande/list.php
@@ -755,7 +755,7 @@ $sql = 'SELECT';
 if ($sall || $search_product_category > 0) {
 	$sql = 'SELECT DISTINCT';
 }
-$sql .= ' s.rowid as socid, s.nom as name, s.name_alias as alias, s.town, s.zip, s.fk_pays, s.client, s.code_client, s.email,';
+$sql .= ' s.rowid as socid, s.nom as name, s.name_alias as alias, s.town, s.zip, s.fk_pays, s.client, s.fournisseur, s.code_client, s.email,';
 $sql .= " typent.code as typent_code,";
 $sql .= " state.code_departement as state_code, state.nom as state_name,";
 $sql .= " cf.rowid, cf.ref, cf.ref_supplier, cf.fk_statut, cf.billed, cf.total_ht, cf.total_tva, cf.total_ttc, cf.fk_user_author, cf.date_commande as date_commande, cf.date_livraison as date_livraison,cf.date_valid, cf.date_approve,";
@@ -1627,7 +1627,7 @@ if ($resql) {
 		}
 		// Ref Supplier
 		if (!empty($arrayfields['cf.ref_supplier']['checked'])) {
-			print '<td>'.$obj->ref_supplier.'</td>'."\n";
+			print '<td class="tdoverflowmax150" title="'.dol_escape_htmltag($obj->ref_supplier).'">'.dol_escape_htmltag($obj->ref_supplier).'</td>'."\n";
 			if (!$i) {
 				$totalarray['nbfield']++;
 			}
@@ -1671,6 +1671,8 @@ if ($resql) {
 			$thirdpartytmp->name = $obj->name;
 			$thirdpartytmp->email = $obj->email;
 			$thirdpartytmp->name_alias = $obj->alias;
+			$thirdpartytmp->client = $obj->client;
+			$thirdpartytmp->fournisseur = $obj->fournisseur;
 			print $thirdpartytmp->getNomUrl(1, 'supplier', 0, 0, -1, empty($arrayfields['s.name_alias']['checked']) ? 0 : 1);
 			print '</td>'."\n";
 			if (!$i) {
diff --git a/htdocs/fourn/facture/card.php b/htdocs/fourn/facture/card.php
index 5069842a7fd..0c041a0c1be 100644
--- a/htdocs/fourn/facture/card.php
+++ b/htdocs/fourn/facture/card.php
@@ -2053,7 +2053,7 @@ if ($action == 'create') {
 		print $societe->getNomUrl(1, 'supplier');
 		print '<input type="hidden" name="socid" value="'.$societe->id.'">';
 	} else {
-		print img_picto('', 'company').$form->select_company(!empty($societe->id) ? $societe->id : 0, 'socid', 's.fournisseur=1', 'SelectThirdParty', 0, 0, null, 0, 'minwidth300 widthcentpercentminusxx maxwidth500');
+		print img_picto('', 'company').$form->select_company(!empty($societe->id) ? $societe->id : 0, 'socid', 's.fournisseur=1', 'SelectThirdParty', 1, 0, null, 0, 'minwidth175 widthcentpercentminusxx maxwidth500');
 		// reload page to retrieve supplier informations
 		if (!empty($conf->global->RELOAD_PAGE_ON_SUPPLIER_CHANGE)) {
 			print '<script type="text/javascript">
diff --git a/htdocs/langs/en_US/bills.lang b/htdocs/langs/en_US/bills.lang
index 7af765216d9..7ea8295a346 100644
--- a/htdocs/langs/en_US/bills.lang
+++ b/htdocs/langs/en_US/bills.lang
@@ -17,6 +17,7 @@ DisabledBecauseNotErasable=Disabled because cannot be erased
 InvoiceStandard=Standard invoice
 InvoiceStandardAsk=Standard invoice
 InvoiceStandardDesc=This kind of invoice is the common invoice.
+InvoiceStandardShort=Standard
 InvoiceDeposit=Down payment invoice
 InvoiceDepositAsk=Down payment invoice
 InvoiceDepositDesc=This kind of invoice is done when a down payment has been received.
@@ -24,6 +25,7 @@ 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
+InvoiceReplacementShort=Replacement
 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
diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php
index f17efa089e3..717278379e4 100644
--- a/htdocs/societe/class/societe.class.php
+++ b/htdocs/societe/class/societe.class.php
@@ -2658,11 +2658,16 @@ class Societe extends CommonObject
 		if (isset($this->status)) {
 			$label .= ' '.$this->getLibStatut(5);
 		}
+		if (isset($this->client) && isset($this->fournisseur)) {
+			$label .= ' &nbsp; ';
+			$label .= $this->getTypeUrl(1);
+		}
 
 		$label .= '<br><b>'.$langs->trans('Name').':</b> '.dol_escape_htmltag($this->name);
 		if (!empty($this->name_alias)) {
 			$label .= ' ('.dol_escape_htmltag($this->name_alias).')';
 		}
+
 		if ($this->email) {
 			$label .= '<br>'.img_picto('', 'email', 'class="pictofixedwidth"').$this->email;
 		}

From 27f817d94061c433e8e916a1336717160b8aa9b7 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 15 Sep 2022 05:00:13 +0200
Subject: [PATCH 969/974] Revert "FIX: Preview button position on documents
 list (case when the file is too long)"

This reverts commit 88b5594af31f54bed54d0c89e61930f78c48404e.
---
 htdocs/core/class/html.formfile.class.php | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/htdocs/core/class/html.formfile.class.php b/htdocs/core/class/html.formfile.class.php
index ba9ebfd81c4..a01f15c5479 100644
--- a/htdocs/core/class/html.formfile.class.php
+++ b/htdocs/core/class/html.formfile.class.php
@@ -838,7 +838,6 @@ class FormFile
 
 					// Show file name with link to download
 					$out .= '<td class="minwidth200 tdoverflowmax300">';
-					$out .= $this->showPreview($file, $modulepart, $relativepath, 0, $param, 'paddingright')."\n";
 					$out .= '<a class="documentdownload paddingright" href="'.$documenturl.'?modulepart='.$modulepart.'&amp;file='.urlencode($relativepath).($param ? '&'.$param : '').'"';
 
 					$mime = dol_mimetype($relativepath, '', 0);
@@ -848,7 +847,8 @@ class FormFile
 					$out .= '>';
 					$out .= img_mime($file["name"], $langs->trans("File").': '.$file["name"]);
 					$out .= dol_trunc($file["name"], 150);
-					$out .= '</a>';
+					$out .= '</a>'."\n";
+					$out .= $this->showPreview($file, $modulepart, $relativepath, 0, $param);
 					$out .= '</td>';
 
 					// Show file size
@@ -1300,11 +1300,6 @@ class FormFile
 					// File name
 					print '<td class="minwith200 tdoverflowmax500">';
 
-					// Preview link
-					if (!$editline) {
-						print $this->showPreview($file, $modulepart, $filepath, 0, '&entity='.(!empty($object->entity) ? $object->entity : $conf->entity), 'paddingright') . "\n";
-					}
-
 					// Show file name with link to download
 					//print "XX".$file['name'];	//$file['name'] must be utf8
 					print '<a class="paddingright valignmiddle" href="'.DOL_URL_ROOT.'/document.php?modulepart='.$modulepart;
@@ -1336,6 +1331,10 @@ class FormFile
 						print dol_escape_htmltag(dol_trunc($filenametoshow, 200));
 						print '</a>';
 					}
+					// Preview link
+					if (!$editline) {
+						print $this->showPreview($file, $modulepart, $filepath, 0, '&entity='.(!empty($object->entity) ? $object->entity : $conf->entity));
+					}
 
 					print "</td>\n";
 
@@ -2073,10 +2072,9 @@ class FormFile
 	 * @param   string    $relativepath   Relative path of docs
 	 * @param   integer   $ruleforpicto   Rule for picto: 0=Use the generic preview picto, 1=Use the picto of mime type of file). Use a negative value to show a generic picto even if preview not available.
 	 * @param	string	  $param		  More param on http links
-	 * @param	string	  $moreclass	  Add more class to class style
 	 * @return  string    $out            Output string with HTML
 	 */
-	public function showPreview($file, $modulepart, $relativepath, $ruleforpicto = 0, $param = '', $moreclass = '')
+	public function showPreview($file, $modulepart, $relativepath, $ruleforpicto = 0, $param = '')
 	{
 		global $langs, $conf;
 
@@ -2084,7 +2082,7 @@ class FormFile
 		if ($conf->browser->layout != 'phone' && !empty($conf->use_javascript_ajax)) {
 			$urladvancedpreview = getAdvancedPreviewUrl($modulepart, $relativepath, 1, $param); // Return if a file is qualified for preview.
 			if (count($urladvancedpreview)) {
-				$out .= '<a class="pictopreview '.$urladvancedpreview['css'].(!empty($moreclass)?' '.$moreclass:'').'" href="'.$urladvancedpreview['url'].'"'.(empty($urladvancedpreview['mime']) ? '' : ' mime="'.$urladvancedpreview['mime'].'"').' '.(empty($urladvancedpreview['target']) ? '' : ' target="'.$urladvancedpreview['target'].'"').'>';
+				$out .= '<a class="pictopreview '.$urladvancedpreview['css'].'" href="'.$urladvancedpreview['url'].'"'.(empty($urladvancedpreview['mime']) ? '' : ' mime="'.$urladvancedpreview['mime'].'"').' '.(empty($urladvancedpreview['target']) ? '' : ' target="'.$urladvancedpreview['target'].'"').'>';
 				//$out.= '<a class="pictopreview">';
 				if (empty($ruleforpicto)) {
 					//$out.= img_picto($langs->trans('Preview').' '.$file['name'], 'detail');

From 2ac4103af8ea42b422a572b87afad10025a5aa7f Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 15 Sep 2022 10:20:31 +0200
Subject: [PATCH 970/974] Fix css

---
 htdocs/compta/sociales/list.php | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/htdocs/compta/sociales/list.php b/htdocs/compta/sociales/list.php
index 365cdf93a2f..4772b9c45bd 100644
--- a/htdocs/compta/sociales/list.php
+++ b/htdocs/compta/sociales/list.php
@@ -451,7 +451,8 @@ if (!empty($arrayfields['p.ref']['checked'])) {
 if (!empty($arrayfields['cs.fk_user']['checked'])) {
 	// Employee
 	print '<td class="liste_titre">';
-	print $form->select_dolusers($search_users, 'search_users', 1, null, 0, '', '', '0', '0', 0, '', 0, '', '', 0, 0, true);
+	print $form->select_dolusers($search_users, 'search_users', 1, null, 0, '', '', '0', 0, 0, '', 0, '', 'maxwidth150', 0, 0, true);
+	print '</td>';
 }
 
 // Filter: Type
@@ -592,7 +593,7 @@ while ($i < min($num, $limit)) {
 		if (isModEnabled('accounting')) {
 			$typelabelpopup .= ' - '.$langs->trans("AccountancyCode").': '.$obj->type_accountancy_code;
 		}
-		print '<td class="tdoverflowmax200" title="'.dol_escape_htmltag($typelabelpopup).'">'.dol_escape_htmltag($typelabeltoshow).'</td>';
+		print '<td class="tdoverflowmax150" title="'.dol_escape_htmltag($typelabelpopup).'">'.dol_escape_htmltag($typelabeltoshow).'</td>';
 		if (!$i) {
 			$totalarray['nbfield']++;
 		}
@@ -600,7 +601,7 @@ while ($i < min($num, $limit)) {
 
 	// Date
 	if (!empty($arrayfields['cs.date_ech']['checked'])) {
-		print '<td class="center">'.dol_print_date($db->jdate($obj->date_ech), 'day').'</td>';
+		print '<td class="center nowraponall">'.dol_print_date($db->jdate($obj->date_ech), 'day').'</td>';
 		if (!$i) {
 			$totalarray['nbfield']++;
 		}
@@ -608,7 +609,7 @@ while ($i < min($num, $limit)) {
 
 	// Date end period
 	if (!empty($arrayfields['cs.periode']['checked'])) {
-		print '<td class="center">'.dol_print_date($db->jdate($obj->periode), 'day').'</td>';
+		print '<td class="center nowraponall">'.dol_print_date($db->jdate($obj->periode), 'day').'</td>';
 		if (!$i) {
 			$totalarray['nbfield']++;
 		}
@@ -616,7 +617,7 @@ while ($i < min($num, $limit)) {
 
 	// Project ref
 	if (!empty($arrayfields['p.ref']['checked'])) {
-		print '<td class="nowrap">';
+		print '<td class="nowraponall">';
 		if ($obj->project_id > 0) {
 			print $projectstatic->getNomUrl(1);
 		}
@@ -628,7 +629,7 @@ while ($i < min($num, $limit)) {
 
 	if (!empty($arrayfields['cs.fk_user']['checked'])) {
 		// Employee
-		print "<td>";
+		print '<td class="tdoverflowmax150">';
 		if (!empty($obj->fk_user)) {
 			if (!empty($TLoadedUsers[$obj->fk_user])) {
 				$ustatic = $TLoadedUsers[$obj->fk_user];
@@ -647,7 +648,7 @@ while ($i < min($num, $limit)) {
 
 	// Type
 	if (!empty($arrayfields['cs.fk_mode_reglement']['checked'])) {
-		print '<td>';
+		print '<td class="tdoverflowmax150" title="'.dol_escape_htmltag($langs->trans("PaymentTypeShort".$obj->payment_code)).'">';
 		if (!empty($obj->payment_code)) {
 			print $langs->trans("PaymentTypeShort".$obj->payment_code);
 		}
@@ -659,7 +660,7 @@ while ($i < min($num, $limit)) {
 
 	// Account
 	if (!empty($arrayfields['cs.fk_account']['checked'])) {
-		print '<td>';
+		print '<td class="toverflowmax150">';
 		if ($obj->fk_account > 0) {
 			$bankstatic->id = $obj->fk_account;
 			$bankstatic->ref = $obj->bref;
@@ -682,7 +683,7 @@ while ($i < min($num, $limit)) {
 
 	// Amount
 	if (!empty($arrayfields['cs.amount']['checked'])) {
-		print '<td class="nowrap amount right">'.price($obj->amount).'</td>';
+		print '<td class="nowraponall amount right">'.price($obj->amount).'</td>';
 		if (!$i) {
 			$totalarray['nbfield']++;
 		}
@@ -694,7 +695,7 @@ while ($i < min($num, $limit)) {
 
 	// Status
 	if (!empty($arrayfields['cs.paye']['checked'])) {
-		print '<td class="nowrap right">'.$chargesociale_static->LibStatut($obj->paye, 5, $obj->alreadypayed).'</td>';
+		print '<td class="nowraponall right">'.$chargesociale_static->LibStatut($obj->paye, 5, $obj->alreadypayed).'</td>';
 		if (!$i) {
 			$totalarray['nbfield']++;
 		}

From e0f76fd8f93a37559e67af32b1a485b73be751c9 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 15 Sep 2022 11:53:52 +0200
Subject: [PATCH 971/974] Fix modify cursor on submit after a confirmation.

---
 htdocs/core/class/html.form.class.php | 19 ++++++++++++++-----
 htdocs/theme/eldy/global.inc.php      |  3 +++
 htdocs/theme/md/style.css.php         |  3 +++
 3 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 0107dd8641d..5729b87cc6f 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -5152,7 +5152,8 @@ class Form
                         	var options = "&token='.urlencode(newToken()).'";
                         	var inputok = '.json_encode($inputok).';	/* List of fields into form */
                          	var pageyes = "'.dol_escape_js(!empty($pageyes) ? $pageyes : '').'";
-                         	if (inputok.length>0) {
+
+                         	if (inputok.length > 0) {
                          		$.each(inputok, function(i, inputname) {
                          			var more = "";
 									var inputvalue;
@@ -5168,14 +5169,19 @@ class Form
                          		});
                          	}
                          	var urljump = pageyes + (pageyes.indexOf("?") < 0 ? "?" : "") + options;
-            				if (pageyes.length > 0) { location.href = urljump; }
-                            $(this).dialog("close");
+            				if (pageyes.length > 0) {
+								// The call to urljump can be slow, so we set the wait cursor
+								jQuery("html,body,#id-container").addClass("cursorwait");
+								location.href = urljump;
+								console.log("after location.href");
+							}
+	                        $(this).dialog("close");
                         },
                         "'.dol_escape_js($langs->transnoentities($labelbuttonno)).'": function() {
                         	var options = "&token='.urlencode(newToken()).'";
                          	var inputko = '.json_encode($inputko).';	/* List of fields into form */
                          	var pageno="'.dol_escape_js(!empty($pageno) ? $pageno : '').'";
-                         	if (inputko.length>0) {
+                         	if (inputko.length > 0) {
                          		$.each(inputko, function(i, inputname) {
                          			var more = "";
                          			if ($("#" + inputname).attr("type") == "checkbox") { more = ":checked"; }
@@ -5186,7 +5192,10 @@ class Form
                          	}
                          	var urljump=pageno + (pageno.indexOf("?") < 0 ? "?" : "") + options;
                          	//alert(urljump);
-            				if (pageno.length > 0) { location.href = urljump; }
+            				if (pageno.length > 0) {
+								location.href = urljump;
+								console.log("after location.href");
+							}
                             $(this).dialog("close");
                         }
                     }
diff --git a/htdocs/theme/eldy/global.inc.php b/htdocs/theme/eldy/global.inc.php
index 90cc6b420f8..fc4fafc60af 100644
--- a/htdocs/theme/eldy/global.inc.php
+++ b/htdocs/theme/eldy/global.inc.php
@@ -887,6 +887,9 @@ textarea.centpercent {
 .cursornotallowed {
 	cursor: not-allowed;
 }
+.cursorwait {
+	cursor: wait;
+}
 .backgroundblank {
 	background-color: #fff;
 }
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index f1c314426a2..7521172121f 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -1032,6 +1032,9 @@ textarea.centpercent {
 .cursormove {
 	cursor: move;
 }
+.cursorwait {
+	cursor: wait;
+}
 .cursornotallowed {
 	cursor: not-allowed;
 }

From 3abff910357a033f28e14475488b4681a7c01eca Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 15 Sep 2022 12:01:15 +0200
Subject: [PATCH 972/974] Fix alternative name not visible in tooltip

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

diff --git a/htdocs/societe/list.php b/htdocs/societe/list.php
index 137ddd1c7cb..18999ed9a1f 100644
--- a/htdocs/societe/list.php
+++ b/htdocs/societe/list.php
@@ -1445,24 +1445,19 @@ while ($i < min($num, $limit)) {
 		}
 	}
 	if (!empty($arrayfields['s.nom']['checked'])) {
-		$savalias = $obj->name_alias;
-		if (!empty($arrayfields['s.name_alias']['checked'])) {
-			$companystatic->name_alias = '';
-		}
 		print '<td'.(empty($conf->global->MAIN_SOCIETE_SHOW_COMPLETE_NAME) ? ' class="tdoverflowmax200"' : '').' data-key="ref">';
 		if ($contextpage == 'poslist') {
-			print $obj->name;
+			print dol_escape_htmltag($obj->name);
 		} else {
-			print $companystatic->getNomUrl(1, '', 100, 0, 1);
+			print $companystatic->getNomUrl(1, '', 100, 0, 1, empty($arrayfields['s.name_alias']['checked']) ? 0 : 1);
 		}
 		print "</td>\n";
-		$companystatic->name_alias = $savalias;
 		if (!$i) {
 			$totalarray['nbfield']++;
 		}
 	}
 	if (!empty($arrayfields['s.name_alias']['checked'])) {
-		print '<td class="tdoverflowmax200">';
+		print '<td class="tdoverflowmax150" title="'.dol_escape_htmltag($companystatic->name_alias).'">';
 		print dol_escape_htmltag($companystatic->name_alias);
 		print "</td>\n";
 		if (!$i) {
@@ -1471,7 +1466,7 @@ while ($i < min($num, $limit)) {
 	}
 	// Barcode
 	if (!empty($arrayfields['s.barcode']['checked'])) {
-		print '<td>'.dol_escape_htmltag($obj->barcode).'</td>';
+		print '<td class="tdoverflowmax150" title="'.dol_escape_htmltag($obj->barcode).'">'.dol_escape_htmltag($obj->barcode).'</td>';
 		if (!$i) {
 			$totalarray['nbfield']++;
 		}

From 6f0bf07fbe56e45faf37afc58402fa6b1a5ea849 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 15 Sep 2022 16:55:52 +0200
Subject: [PATCH 973/974] Move tabs of external modules at end

---
 htdocs/core/lib/company.lib.php         | 12 ++++++------
 htdocs/core/lib/functions.lib.php       | 19 +++++++++++++++++--
 htdocs/core/modules/modTicket.class.php |  4 ++--
 3 files changed, 25 insertions(+), 10 deletions(-)

diff --git a/htdocs/core/lib/company.lib.php b/htdocs/core/lib/company.lib.php
index b4ae935677b..288f3e236ac 100644
--- a/htdocs/core/lib/company.lib.php
+++ b/htdocs/core/lib/company.lib.php
@@ -281,7 +281,7 @@ function societe_prepare_head(Societe $object)
 	// Entries must be declared in modules descriptor with line
 	// $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab
 	// $this->tabs = array('entity:-tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to remove a tab
-	complete_head_from_modules($conf, $langs, $object, $head, $h, 'thirdparty');
+	complete_head_from_modules($conf, $langs, $object, $head, $h, 'thirdparty', 'add', 'core');
 
 	if ($user->socid == 0) {
 		// Notifications
@@ -392,11 +392,11 @@ function societe_prepare_head(Societe $object)
 	$head[$h][2] = 'agenda';
 	$h++;
 
-	// Log
-	/*$head[$h][0] = DOL_URL_ROOT.'/societe/info.php?socid='.$object->id;
-	$head[$h][1] = $langs->trans("Info");
-	$head[$h][2] = 'info';
-	$h++;*/
+	// Show more tabs from modules
+	// Entries must be declared in modules descriptor with line
+	// $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab
+	// $this->tabs = array('entity:-tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to remove a tab
+	complete_head_from_modules($conf, $langs, $object, $head, $h, 'thirdparty', 'add', 'external');
 
 	complete_head_from_modules($conf, $langs, $object, $head, $h, 'thirdparty', 'remove');
 
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index a3c538954dc..0009ba93240 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -9042,9 +9042,10 @@ function getLanguageCodeFromCountryCode($countrycode)
  *      									'ecm'			   to add a tab for another ecm view
  *                                          'stock'            to add a tab for warehouse view
  *  @param  string		$mode  	        	'add' to complete head, 'remove' to remove entries
+ *  @param	string		$filterorigmodule	Filter on module origin. 'external' will show only external modules. 'core' only core modules. No filter by default.
  *	@return	void
  */
-function complete_head_from_modules($conf, $langs, $object, &$head, &$h, $type, $mode = 'add')
+function complete_head_from_modules($conf, $langs, $object, &$head, &$h, $type, $mode = 'add', $filterorigmodule = '')
 {
 	global $hookmanager, $db;
 
@@ -9064,15 +9065,29 @@ function complete_head_from_modules($conf, $langs, $object, &$head, &$h, $type,
 
 					if (verifCond($values[4])) {
 						if ($values[3]) {
+							if ($filterorigmodule) {	// If a filter of module origin has been requested
+								if (strpos($values[3], '@')) {	// This is an external module
+									if ($filterorigmodule != 'external') {
+										continue;
+									}
+								} else {	// This looks a core module
+									if ($filterorigmodule != 'core') {
+										continue;
+									}
+								}
+							}
 							$langs->load($values[3]);
 						}
 						if (preg_match('/SUBSTITUTION_([^_]+)/i', $values[2], $reg)) {
+							// If label is "SUBSTITUION_..."
 							$substitutionarray = array();
 							complete_substitutions_array($substitutionarray, $langs, $object, array('needforkey'=>$values[2]));
 							$label = make_substitutions($reg[1], $substitutionarray);
 						} else {
+							// If label is "Label,Class,File,Method", we call the method to show content inside the badge
 							$labeltemp = explode(',', $values[2]);
 							$label = $langs->trans($labeltemp[0]);
+
 							if (!empty($labeltemp[1]) && is_object($object) && !empty($object->id)) {
 								dol_include_once($labeltemp[2]);
 								$classtoload = $labeltemp[1];
@@ -9092,7 +9107,7 @@ function complete_head_from_modules($conf, $langs, $object, &$head, &$h, $type,
 						$head[$h][2] = str_replace('+', '', $values[1]);
 						$h++;
 					}
-				} elseif (count($values) == 5) {       // deprecated
+				} 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);
 
 					if ($values[0] != $type) {
diff --git a/htdocs/core/modules/modTicket.class.php b/htdocs/core/modules/modTicket.class.php
index 13967fc4096..22e2bed3ee9 100644
--- a/htdocs/core/modules/modTicket.class.php
+++ b/htdocs/core/modules/modTicket.class.php
@@ -122,8 +122,8 @@ class modTicket extends DolibarrModules
 
 
 		$this->tabs = array(
-			'thirdparty:+ticket:Tickets:@ticket:$user->rights->ticket->read:/ticket/list.php?socid=__ID__',
-			'project:+ticket:Tickets:@ticket:$user->rights->ticket->read:/ticket/list.php?projectid=__ID__',
+			'thirdparty:+ticket:Tickets:ticket:$user->rights->ticket->read:/ticket/list.php?socid=__ID__',
+			'project:+ticket:Tickets:ticket:$user->rights->ticket->read:/ticket/list.php?projectid=__ID__',
 		);
 
 		// Dictionaries

From 08be53494f58c33d29c3ac690710d8978db20168 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 15 Sep 2022 17:43:34 +0200
Subject: [PATCH 974/974] trans

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

diff --git a/htdocs/admin/system/perf.php b/htdocs/admin/system/perf.php
index f43bc3bf49a..fba5f9efb75 100644
--- a/htdocs/admin/system/perf.php
+++ b/htdocs/admin/system/perf.php
@@ -27,7 +27,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/geturl.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 
 // Load translation files required by the page
-$langs->loadLangs(array("install", "other", "admin"));
+$langs->loadLangs(array("install", "other", "admin", "products"));
 
 if (!$user->admin) {
 	accessforbidden();